Binary-Coalescence/motorDSM
2
0
Fork 0
mirror of https://github.com/Binary-Coalescence/motorDSM.git synced 2025-08-04 21:55:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
Daniel Sissom
2024-05-24 16:18:07 -05:00
parent c11e11659b d412000373
commit 996439589a
3 changed files with 47 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
dsmApp/src/MD90Driver.cpp
View File

@@ -174,10 +174,12 @@ asynStatus MD90Axis::move(double position, int relative, double minVelocity, dou
status = sendAccelAndVelocity(acceleration, maxVelocity); status = sendAccelAndVelocity(acceleration, maxVelocity);
// Position specified in encoder steps (10 nm), but motor move commands are in nanometers
position = position * 10;
if (relative) { if (relative) {
sprintf(pC_->outString_, "#%02dI%+d", axisNo_, NINT(position)); sprintf(pC_->outString_, "CRM %d", NINT(position));
} else { } else {
sprintf(pC_->outString_, "#%02dG%+d", axisNo_, NINT(position)); sprintf(pC_->outString_, "CLM %d", NINT(position));
} }
status = pC_->writeReadController(); status = pC_->writeReadController();
return status; return status;
@@ -190,11 +192,7 @@ asynStatus MD90Axis::home(double minVelocity, double maxVelocity, double acceler
status = sendAccelAndVelocity(acceleration, maxVelocity); status = sendAccelAndVelocity(acceleration, maxVelocity);
if (forwards) { sprintf(pC_->outString_, "HOM");
sprintf(pC_->outString_, "#%02dH+", axisNo_);
} else {
sprintf(pC_->outString_, "#%02dH-", axisNo_);
}
status = pC_->writeReadController(); status = pC_->writeReadController();
return status; return status;
} }
@@ -271,7 +269,7 @@ asynStatus MD90Axis::poll(bool *moving)
// TODO: Will need to add some more error handling for the motor return codes. // TODO: Will need to add some more error handling for the motor return codes.
// Read the current motor position // Read the current motor position in encoder steps (10 nm)
sprintf(pC_->outString_, "GEC"); sprintf(pC_->outString_, "GEC");
comStatus = pC_->writeReadController(); comStatus = pC_->writeReadController();
if (comStatus) goto skip; if (comStatus) goto skip;
@@ -298,20 +296,31 @@ asynStatus MD90Axis::poll(bool *moving)
case 3: // Move stopped case 3: // Move stopped
break; break;
case 4: // Homing error case 4: // Homing error
setIntegerParam(pC_->motorStatusProblem_, 1);
break; break;
case 5: // Stance error case 5: // Stance error
setIntegerParam(pC_->motorStatusProblem_, 1);
break; break;
case 6: // Stance complete case 6: // Stance complete
break; break;
case 7: // Open loop move error case 7: // Open loop move error
setIntegerParam(pC_->motorStatusProblem_, 1);
break; break;
case 8: // Closed loop move error case 8: // Closed loop move error
setIntegerParam(pC_->motorStatusProblem_, 1);
break; break;
case 9: // Closed loop move complete case 9: // Closed loop move complete
break; break;
case 10: // End of travel error case 10: // End of travel error
setIntegerParam(pC_->motorStatusProblem_, 1);
if (position > 0) {
setIntegerParam(pC_->motorStatusHighLimit_, 1);
} else {
setIntegerParam(pC_->motorStatusLowLimit_, 1);
}
break; break;
case 11: // Ramp move error case 11: // Ramp move error
setIntegerParam(pC_->motorStatusProblem_, 1);
break; break;
default: default:
break; break;

24
iocs/dsmIOC/iocBoot/iocDsm/motor.substitutions.md90
View File

@@ -1,6 +1,26 @@
file "$(MOTOR)/db/basic_asyn_motor.db" file "$(MOTOR)/db/basic_asyn_motor.db"
{ {
pattern pattern
{P, N, M, DTYP, PORT, ADDR, DESC, EGU, DIR, VELO, VBAS, ACCL, BDST, BVEL, BACC, MRES, PREC, DHLM, DLLM, INIT} {P, N, M, DTYP, PORT, ADDR, DESC, EGU, DIR, VELO, VBAS, VMAX, ACCL, BDST, BVEL, BACC, MRES, PREC, DHLM, DLLM, INIT}
{DSM:, 0, "m$(N)", "asynMotor", MD900, 0, "Bottom", mm, Pos, 2.0, 0.1, .2, 0, 1, .2, -.001, 3, 16, 0, ""} {DSM:, 0, "m$(N)", "asynMotor", MD900, 0, "MD-90", mm, Pos, 0.5, 0.025, 0.625, 0, 0, 0.03, 0, .00001, 2, 20, -20, ""}
} }
# P IOC prefix
# N Port number
# M Record name pattern
# DTYP Datatype
# PORT Port
# ADDR Address
# DESC Description
# EGU Engineering units
# DIR Direction
# VELO Velocity (EGU / s)
# VBAS Minimum velocity (EGU / s)
# VMAX Maximum velocity (EGU / s) (not getting set here with basic_asyn_motor.db)
# ACCL Acceleration (time in seconds until VELO)
# BDST Backlash distance
# MRES Motor step size (EGU)
# PREC Display precision number of decimal places
# DHLM Dial high travel limit (EGU)
# DLLM Dial low travel limit (EGU)
# INIT Initialization string (seems to be unused/broken)

9
iocs/dsmIOC/iocBoot/iocDsm/st.cmd.md90
View File

@@ -5,7 +5,7 @@
dbLoadDatabase("../../dbd/dsm.dbd") dbLoadDatabase("../../dbd/dsm.dbd")
dsm_registerRecordDeviceDriver(pdbbase) dsm_registerRecordDeviceDriver(pdbbase)
# Port 2 on a Moxa # Network device
#!drvAsynIPPortConfigure("serial0", "192.168.1.16:4002",0,0,0) #!drvAsynIPPortConfigure("serial0", "192.168.1.16:4002",0,0,0)
# Local serial port # Local serial port
#!drvAsynSerialPortConfigure("serial0", "/dev/ttyS0", 0, 0, 0) #!drvAsynSerialPortConfigure("serial0", "/dev/ttyS0", 0, 0, 0)
@@ -24,6 +24,12 @@ asynOctetSetOutputEos("serial0", 0, "\r")
asynSetTraceIOMask("serial0", 0, 2) asynSetTraceIOMask("serial0", 0, 2)
#asynSetTraceMask("serial0", 0, 255) #asynSetTraceMask("serial0", 0, 255)
# Turn on the power supply and set the deadband
asynOctetConnect("initConnection", "serial0", 0)
asynOctetWrite("initConnection", "EPS")
asynOctetWrite("initConnection", "SDB 10")
asynOctetDisconnect('initConnection')
MD90CreateController("MD900", "serial0", 1, 100, 5000) MD90CreateController("MD900", "serial0", 1, 100, 5000)
### Motors ### Motors
@@ -36,3 +42,4 @@ iocInit
# This IOC does not use save/restore, so set values of some PVs # This IOC does not use save/restore, so set values of some PVs
dbpf("DSM:m0.RTRY", "0") dbpf("DSM:m0.RTRY", "0")
dbpf("DSM:m0.TWV", "0.1") dbpf("DSM:m0.TWV", "0.1")
dbpf("DSM:m0.VMAX", "0.625")