diff --git a/ESB_MX.subs b/ESB_MX.subs
index a8a439d..9126659 100644
--- a/ESB_MX.subs
+++ b/ESB_MX.subs
@@ -19,12 +19,13 @@
file PPMACMotor.template {
-pattern{ DESC , P , M , PORT , ADDR , DIR, VELO, ACCL, JAR, MRES , PREC, EGU , DHLM, DLLM}
- { "Rotation Y" , "$(P_M)", "MOTOR_ROT_Y", "$(PORT_M)", "$(M1)", 1 , 50 , 0.1 , 20 , -0.001, 3 , "deg", 0 , 0 }
- { "Sample F-Trans X", "$(P_M)", "MOTOR_FX" , "$(PORT_M)", "$(M2)", 1 , 2 , 0.1 , 20 , -0.001, 3 , "mm" , 0 , 0 }
- { "Sample F-Trans Y", "$(P_M)", "MOTOR_FY" , "$(PORT_M)", "$(M3)", 1 , 2 , 0.1 , 20 , -0.001, 3 , "mm" , 0 , 0 }
- { "CamBase X" , "$(P_M)", "MOTOR_CAMX" , "$(PORT_M)", "$(M4)", 1 , .3 , 0.1 , 20 , -0.001, 3 , "mm" , 0 , 0 }
- { "CamBase Y" , "$(P_M)", "MOTOR_CAMY" , "$(PORT_M)", "$(M5)", 0 , .3 , 0.1 , 20 , -0.001, 3 , "mm" , 0 , 0 }
- { "Sample C-Trans X", "$(P_M)", "MOTOR_CX" , "$(PORT_M)", "$(M7)", 1 , 2 , 0.1 , 20 , -0.001, 3 , "mm" , 0 , 0 }
- { "Sample C-Trans Z", "$(P_M)", "MOTOR_CZ" , "$(PORT_M)", "$(M8)", 1 , 2 , 0.1 , 20 , -0.001, 3 , "mm" , 0 , 0 }
+pattern{ DESC , P , M , PORT , ADDR , DIR, VELO, HVEL, ACCL, JAR, MRES , PREC, EGU , DHLM, DLLM}
+ { "Rotation Y" , "$(P_M)", "MOTOR_ROT_Y", "$(PORT_M)", "$(M1)", 1 , 50 , 50 , 0.1 , 20 , -0.001, 3 , "deg", 0 , 0 }
+ { "Sample F-Trans X", "$(P_M)", "MOTOR_FX" , "$(PORT_M)", "$(M2)", 1 , 2 , 2 , 0.1 , 20 , -0.001, 3 , "mm" , 0 , 0 }
+ { "Sample F-Trans Y", "$(P_M)", "MOTOR_FY" , "$(PORT_M)", "$(M3)", 1 , 2 , 2 , 0.1 , 20 , -0.001, 3 , "mm" , 0 , 0 }
+ { "CamBase X" , "$(P_M)", "MOTOR_CAMX" , "$(PORT_M)", "$(M4)", 1 , .3 , .3 , 0.1 , 20 , -0.001, 3 , "mm" , 0 , 0 }
+ { "CamBase Y" , "$(P_M)", "MOTOR_CAMY" , "$(PORT_M)", "$(M5)", 0 , .3 , .3 , 0.1 , 20 , -0.001, 3 , "mm" , 0 , 0 }
+ { "Backlight" , "$(P_M)", "MOTOR_BLGT" , "$(PORT_M)", "$(M6)", 1 , 40E3, 20E3, 0.1 , 20 , -1 , 0 , "usr", 0 , 0 }
+ { "Sample C-Trans X", "$(P_M)", "MOTOR_CX" , "$(PORT_M)", "$(M7)", 1 , 2 , 2 , 0.1 , 20 , -0.001, 3 , "mm" , 0 , 0 }
+ { "Sample C-Trans Z", "$(P_M)", "MOTOR_CZ" , "$(PORT_M)", "$(M8)", 1 , 2 , 2 , 0.1 , 20 , -0.001, 3 , "mm" , 0 , 0 }
}
diff --git a/PPMACMotor.template b/PPMACMotor.template
index 484e577..778f0ae 100644
--- a/PPMACMotor.template
+++ b/PPMACMotor.template
@@ -7,7 +7,7 @@ record(motor,"$(P):$(M)")
field(VMAX,$(VELO))
field(VELO,$(VELO))
field(JVEL,$(VELO))
- field(HVEL,$(VELO))
+ field(HVEL,$(HVEL))
field(ACCL,.1)
field(JAR, 20)
field(MRES,$(MRES))
diff --git a/Readme.md b/Readme.md
index 385b901..7c39909 100644
--- a/Readme.md
+++ b/Readme.md
@@ -180,3 +180,7 @@ cd /net/slsfs-crtl/export/sf/ioc/modules/ESB_MX/zamofing_t/R3.14.12/
```
+
+export EPICS_CA_ADDR_LIST="129.129.109.255"
+export EPICS_CA_ADDR_LIST="129.129.126.255"
+caQtDm -macro 'P=SAR-ESB_MX' ESB_MX_exp
diff --git a/cfg/torqueCtrl.cfg b/cfg/torqueCtrl.cfg
index d08622a..6002cd2 100644
--- a/cfg/torqueCtrl.cfg
+++ b/cfg/torqueCtrl.cfg
@@ -32,6 +32,8 @@
//Mot/Enc 5: camera base plate Y
// OBSOLETE Enc 5: Interferometer 2
+//Mot 6: Backlight 2.3A
+
//Mot 7: Stada Stepper: 670mA 200 poles 1 rev = 100*2048 phase_step (2 stepper motor)
//Enc 7: Renishaw absolute BiSS
@@ -111,6 +113,14 @@ Motor[4].Pos2Sf=0 // Pos2Sf set to 0 to avoid programming leak values
Motor[5].Pos2Sf=0 // Pos2Sf set to 0 to avoid programming leak values
+//Backlight
+//---------
+//#6j=0 //down
+//#6j=-31000 //up
+!encoder_sim(enc=6)
+!motor(mot=6,dirCur=1800,JogSpeed=40,invDir=False)
+
+
//Stada stage
//----------------------------------------------------
//512000 ustep == 50000 encCnt == 2500um
@@ -129,6 +139,6 @@ Motor[5].Pos2Sf=0 // Pos2Sf set to 0 to avoid programming leak values
#1,7,8hmz
//holding current
-!holding_current(m7=[0,200],m8=[0,200])
+!holding_current(m4=[0,240],m5=[0,240],m6=[1400,1800],m7=[0,200],m8=[0,200])
diff --git a/qt/ESB_MX_exp.ui b/qt/ESB_MX_exp.ui
index bf8c8a5..87fdc2f 100644
--- a/qt/ESB_MX_exp.ui
+++ b/qt/ESB_MX_exp.ui
@@ -7,7 +7,7 @@
0
0
776
- 298
+ 342
@@ -49,7 +49,7 @@
20
70
725
- 168
+ 192
@@ -60,13 +60,14 @@ P=$(P),M=MOTOR_ROT_Y;
P=$(P),M=MOTOR_FX;
P=$(P),M=MOTOR_FY;
P=$(P),M=MOTOR_CAMX;
-P=$(P),M=MOTOR_CAMY
+P=$(P),M=MOTOR_CAMY;
+P=$(P),M=MOTOR_BLGT
ESB_MX_motor.ui
- 7
+ 8
@@ -221,7 +222,7 @@ P=$(P),M=MOTOR_CAMY
620
- 250
+ 300
121
24
@@ -246,6 +247,47 @@ P=$(P),M=MOTOR_CAMY
P=SARES30-ESBMX
+
+
+
+ 460
+ 300
+ 100
+ 22
+
+
+
+ Backlight
+
+
+ $(P):MOTOR_BLGT
+
+
+ 28000
+
+
+ -2000
+
+
+
+
+
+ 110
+ 300
+ 100
+ 22
+
+
+
+ Home BkLight
+
+
+ $(P):MOTOR_BLGT.HOMF
+
+
+ 1
+
+
@@ -258,6 +300,11 @@ P=$(P),M=MOTOR_CAMY
QPushButton
+
+ caToggleButton
+ QCheckBox
+
+
caLabel
QLabel