diff --git a/thorpy/stages/MG17APTServer.ini b/thorpy/stages/MG17APTServer.ini index ba073e8..35a64b3 100644 --- a/thorpy/stages/MG17APTServer.ini +++ b/thorpy/stages/MG17APTServer.ini @@ -1,5 +1,5 @@ [Stepper Stages] -Num Stepper Stages=150 +Num Stepper Stages=164 StepperStage1=APT600R X Axis StepperStage2=APT600R Y Axis StepperStage3=APT600R Z Axis @@ -55,8 +55,8 @@ StepperStage52=BMS 17DRV113 Enc LNR 25mm StepperStage53=BMS 17DRV114 Enc LNR 50mm StepperStage54=NRT150E Enc Stage 150mm StepperStage55=NRT100E Enc Stage 100mm -StepperStage56=NRT150 Enc Stage 150mm -StepperStage57=NRT100 Enc Stage 100mm +StepperStage56=NRT150 Stage 150mm +StepperStage57=NRT100 Stage 100mm StepperStage58=Z606(B) StepperStage59=Z612(B) StepperStage60=Z625(B) @@ -118,8 +118,8 @@ StepperStage115=HS 17DRV014 50mm StepperStage116=HS NanoRotator StepperStage117=HS 17DRV013 Enc LNR 25mm StepperStage118=HS 17DRV014 Enc LNR 50mm -StepperStage119=HS NRT150 Enc Stage 150mm -StepperStage120=HS NRT100 Enc Stage 100mm +StepperStage119=HS NRT150 Stage 150mm +StepperStage120=HS NRT100 Stage 100mm StepperStage121=HS BSC FW103 Filter Wheel StepperStage122=ZST DT-34 StepperStage123=MVS005MZ @@ -147,9 +147,23 @@ StepperStage144=TST 17DRV013 25mm StepperStage145=HS TST 17DRV014 50mm StepperStage146=HS TST 17DRV013 25mm StepperStage147=DDR100 -StepperStage148=K100CR1 Rotation Stage +StepperStage148=K10CR1 Rotation Stage StepperStage149=HS TST NanoRotator StepperStage150=HS TST MVS025 +StepperStage151=HS TST FW103 Filter Wheel +StepperStage152=PY004Z8 Pitch +StepperStage153=PY004Z8 Yaw +StepperStage154=PLS2 +StepperStage155=PLS3 +StepperStage156=LNR50SE +StepperStage157=VA-LNR/E +StepperStage158=VA-LNR/E Hi Res +StepperStage159=DDR05 +StepperStage160=DDS220 +StepperStage161=DDS300 +StepperStage162=DDS600 +StepperStage163=DDSM50 +StepperStage164=PRMTZ8 [APT600R X Axis] Stage ID=2 @@ -2192,7 +2206,7 @@ Encoder Calib Step=0.2 Encoder Calib Dwell=50 Encoder QEP Sense=1 -[NRT150 Enc Stage 150mm] +[NRT150 Stage 150mm] Stage ID=67 Axis ID=2 Units=1 @@ -2227,7 +2241,7 @@ Steps Per Rev=200 Gearbox Ratio=1 Encoder Fitted=0 -[NRT100 Enc Stage 100mm] +[NRT100 Stage 100mm] Stage ID=67 Axis ID=2 Units=1 @@ -3482,9 +3496,9 @@ Min Pos=0.00 Max Pos=6.00 Def Min Vel=0.0 Def Accn=1.5 -Def Max Vel=2.5 +Def Max Vel=2.3 Max Accn=5.0 -Max Vel=5.0 +Max Vel=2.6 Backlash Dist=0.025 Move Factor=100 Rest Factor=20 @@ -3517,9 +3531,9 @@ Pot Vel 1=0.5 Pot Wnd 1=50 Pot Vel 2=1.0 Pot Wnd 2=80 -Pot Vel 3=2.0 +Pot Vel 3=1.5 Pot Wnd 3=100 -Pot Vel 4=2.5 +Pot Vel 4=2.3 Button Mode=1 Button Pos 1=1.0 Button Pos 2=5.0 @@ -3534,9 +3548,9 @@ Min Pos=0.00 Max Pos=12.00 Def Min Vel=0.0 Def Accn=1.5 -Def Max Vel=2.5 +Def Max Vel=2.3 Max Accn=5.0 -Max Vel=5.0 +Max Vel=2.6 Backlash Dist=0.025 Move Factor=100 Rest Factor=20 @@ -3569,9 +3583,9 @@ Pot Vel 1=0.5 Pot Wnd 1=50 Pot Vel 2=1.0 Pot Wnd 2=80 -Pot Vel 3=2.0 +Pot Vel 3=1.5 Pot Wnd 3=100 -Pot Vel 4=2.5 +Pot Vel 4=2.3 Button Mode=1 Button Pos 1=1.0 Button Pos 2=5.0 @@ -3586,9 +3600,9 @@ Min Pos=0.00 Max Pos=25.00 Def Min Vel=0.0 Def Accn=1.5 -Def Max Vel=2.2 +Def Max Vel=2.3 Max Accn=5.0 -Max Vel=5.0 +Max Vel=2.6 Backlash Dist=0.025 Move Factor=100 Rest Factor=20 @@ -3621,9 +3635,9 @@ Pot Vel 1=0.5 Pot Wnd 1=50 Pot Vel 2=1.0 Pot Wnd 2=80 -Pot Vel 3=2.0 +Pot Vel 3=1.5 Pot Wnd 3=100 -Pot Vel 4=2.2 +Pot Vel 4=2.3 Button Mode=1 Button Pos 1=1.0 Button Pos 2=5.0 @@ -3779,9 +3793,9 @@ Min Pos=-8.00 Max Pos=8.00 Def Min Vel=0.0 Def Accn=2.0 -Def Max Vel=2.0 +Def Max Vel=2.3 Max Accn=5.0 -Max Vel=5.0 +Max Vel=2.6 Backlash Dist=0.05 Move Factor=100 Rest Factor=20 @@ -3816,7 +3830,7 @@ Pot Vel 2=1.0 Pot Wnd 2=80 Pot Vel 3=1.5 Pot Wnd 3=100 -Pot Vel 4=2.0 +Pot Vel 4=2.3 Button Mode=1 Button Pos 1=1.0 Button Pos 2=5.0 @@ -3831,9 +3845,9 @@ Min Pos=-5.00 Max Pos=5.00 Def Min Vel=0.0 Def Accn=2.0 -Def Max Vel=2.0 +Def Max Vel=2.3 Max Accn=5.0 -Max Vel=5.0 +Max Vel=2.6 Backlash Dist=0.05 Move Factor=100 Rest Factor=20 @@ -3868,7 +3882,7 @@ Pot Vel 2=1.0 Pot Wnd 2=80 Pot Vel 3=1.5 Pot Wnd 3=100 -Pot Vel 4=2.0 +Pot Vel 4=2.3 Button Mode=1 Button Pos 1=1.0 Button Pos 2=2.0 @@ -3935,9 +3949,9 @@ Min Pos=0.00 Max Pos=25.00 Def Min Vel=0.0 Def Accn=1.5 -Def Max Vel=2.8 +Def Max Vel=2.3 Max Accn=5.0 -Max Vel=5.0 +Max Vel=2.4 Backlash Dist=0.05 Move Factor=100 Rest Factor=20 @@ -3954,7 +3968,7 @@ Jog Mode=2 Jog Step Size=0.5 Jog Min Vel=0.0 Jog Accn=1.5 -Jog Max Vel=2.8 +Jog Max Vel=2.4 Jog Stop Mode=2 Steps Per Rev=512 Gearbox Ratio=67 @@ -3972,7 +3986,7 @@ Pot Vel 2=1.0 Pot Wnd 2=80 Pot Vel 3=1.5 Pot Wnd 3=100 -Pot Vel 4=2.0 +Pot Vel 4=2.3 Button Mode=1 Button Pos 1=1.0 Button Pos 2=5.0 @@ -3987,9 +4001,9 @@ Min Pos=0.00 Max Pos=50.00 Def Min Vel=0.0 Def Accn=1.5 -Def Max Vel=2.8 +Def Max Vel=2.3 Max Accn=5.0 -Max Vel=5.0 +Max Vel=2.4 Backlash Dist=0.05 Move Factor=100 Rest Factor=20 @@ -4006,7 +4020,7 @@ Jog Mode=2 Jog Step Size=0.5 Jog Min Vel=0.0 Jog Accn=1.5 -Jog Max Vel=2.8 +Jog Max Vel=2.4 Jog Stop Mode=2 Steps Per Rev=512 Gearbox Ratio=67 @@ -4024,7 +4038,7 @@ Pot Vel 2=1.0 Pot Wnd 2=80 Pot Vel 3=1.5 Pot Wnd 3=100 -Pot Vel 4=2.0 +Pot Vel 4=2.3 Button Mode=1 Button Pos 1=1.0 Button Pos 2=5.0 @@ -4275,9 +4289,9 @@ Min Pos=0.00 Max Pos=12.00 Def Min Vel=0.0 Def Accn=1.5 -Def Max Vel=2.8 +Def Max Vel=2.3 Max Accn=5.0 -Max Vel=5.0 +Max Vel=2.4 Backlash Dist=0.025 Move Factor=100 Rest Factor=20 @@ -4310,13 +4324,53 @@ Pot Vel 1=0.5 Pot Wnd 1=50 Pot Vel 2=1.0 Pot Wnd 2=80 -Pot Vel 3=2.0 +Pot Vel 3=1.5 Pot Wnd 3=100 -Pot Vel 4=2.8 +Pot Vel 4=2.3 Button Mode=1 Button Pos 1=1.0 Button Pos 2=5.0 +[DDSM50] +Stage ID=19 +Axis ID=2 +Units=1 +Pitch=1.0 +Dir Sense=1 +Min Pos=0.00 +Max Pos=50.00 +Def Min Vel=0.0 +Def Accn=500.0 +Def Max Vel=100.0 +Max Accn=2000.0 +Max Vel=250.0 +Backlash Dist=0.01 +Move Factor=100 +Rest Factor=20 +CW Hard Limit=3 +CCW Hard Limit=3 +CW Soft Limit=3.0 +CCW Soft Limit=1.0 +Soft Limit Mode=1 +Home Dir=2 +Home Limit Switch=4 +Home Vel=1 +Home Zero Offset=1.0 +Jog Mode=2 +Jog Step Size=0.5 +Jog Min Vel=0.0 +Jog Accn=50.0 +Jog Max Vel=50.0 +Jog Stop Mode=2 +Steps Per Rev=2000 +Gearbox Ratio=1 +Encoder Fitted=0 +DC Servo=1 +DC Prop=75 +DC Int=1 +DC Diff=0 +DC IntLim=0 + [DDSM100] Stage ID=19 Axis ID=2 @@ -4417,7 +4471,7 @@ Soft Limit Mode=1 Home Dir=2 Home Limit Switch=1 Home Vel=1.0 -Home Zero Offset=0.2 +Home Zero Offset=0.1 Jog Mode=2 Jog Step Size=0.5 Jog Min Vel=0.0 @@ -5019,7 +5073,7 @@ JS GearLow Accn=2.5 JS GearHigh Accn=5.0 JS Dir Sense=1 -[HS NRT150 Enc Stage 150mm] +[HS NRT150 Stage 150mm] Stage ID=67 Axis ID=2 Units=1 @@ -5060,7 +5114,7 @@ JS GearLow Accn=5.0 JS GearHigh Accn=10.0 JS Dir Sense=1 -[HS NRT100 Enc Stage 100mm] +[HS NRT100 Stage 100mm] Stage ID=67 Axis ID=2 Units=1 @@ -6360,7 +6414,7 @@ DC Int=150 DC Diff=2720 DC IntLim=50 -[K100CR1 Rotation Stage] +[K10CR1 Rotation Stage] Stage ID=116 Axis ID=3 Units=2 @@ -6453,7 +6507,7 @@ Max Pos=25.00 Def Min Vel=0.0 Def Accn=3.0 Def Max Vel=5.0 -Max Accn=5.0 +Max Accn=15.0 Max Vel=10.0 Backlash Dist=0.01 Move Factor=100 @@ -6480,4 +6534,600 @@ DC Servo=1 DC Prop=75 DC Int=1 DC Diff=0 -DC IntLim=0 \ No newline at end of file +DC IntLim=0 + +[HS TST FW103 Filter Wheel] +Stage ID=114 +Axis ID=3 +Units=2 +Pitch=360.0 +Dir Sense=1 +Min Pos=0.00 +Max Pos=360.00 +Def Min Vel=0.0 +Def Accn=2000.0 +Def Max Vel=2000.0 +Max Accn=3600.0 +Max Vel=3600.0 +Backlash Dist=0.0 +Move Factor=100 +Rest Factor=20 +CW Hard Limit=2 +CCW Hard Limit=2 +CW Soft Limit=3.0 +CCW Soft Limit=1.0 +Soft Limit Mode=65 +Home Dir=2 +Home Limit Switch=1 +Home Vel=60.0 +Home Zero Offset=50.0062 +Jog Mode=2 +Jog Step Size=60.0 +Jog Min Vel=0.0 +Jog Accn=2000.0 +Jog Max Vel=2000.0 +Jog Stop Mode=2 +Steps Per Rev=200 +Gearbox Ratio=1 +Encoder Fitted=0 +FP Controls=1 +Pot Zero Wnd=20 +Pot Vel 1=0.1 +Pot Wnd 1=50 +Pot Vel 2=0.2 +Pot Wnd 2=80 +Pot Vel 3=0.3 +Pot Wnd 3=100 +Pot Vel 4=720.0 +Button Mode=1 +Button Pos 1=0.0 +Button Pos 2=60.0 + +[PY004Z8 Pitch] +Stage ID=99 +Axis ID=2 +Units=1 +Pitch=1.0 +Dir Sense=1 +Min Pos=-5.1 +Max Pos=5.1 +Def Min Vel=0.0 +Def Accn=1 +Def Max Vel=1 +Max Accn=1 +Max Vel=1 +Backlash Dist=0.025 +Move Factor=100 +Rest Factor=20 +CW Hard Limit=2 +CCW Hard Limit=2 +CW Soft Limit=3.0 +CCW Soft Limit=1.0 +Soft Limit Mode=1 +Home Dir=2 +Home Limit Switch=1 +Home Vel=1.0 +Home Zero Offset=7.47 +Jog Mode=2 +Jog Step Size=0.1 +Jog Min Vel=0.0 +Jog Accn=1 +Jog Max Vel=1 +Jog Stop Mode=2 +Steps Per Rev=512 +Gearbox Ratio=67 +Encoder Fitted=0 +DC Servo=1 +DC Prop=435 +DC Int=195 +DC Diff=993 +DC IntLim=195 +FP Controls=1 +Pot Zero Wnd=20 +Pot Vel 1=0.25 +Pot Wnd 1=50 +Pot Vel 2=0.5 +Pot Wnd 2=80 +Pot Vel 3=0.75 +Pot Wnd 3=100 +Pot Vel 4=1.0 +Button Mode=1 +Button Pos 1=1.0 +Button Pos 2=5.0 + +[PY004Z8 Yaw] +Stage ID=99 +Axis ID=2 +Units=1 +Pitch=1.0 +Dir Sense=1 +Min Pos=-5.1 +Max Pos=5.1 +Def Min Vel=0.0 +Def Accn=1 +Def Max Vel=1 +Max Accn=1.0 +Max Vel=1.0 +Backlash Dist=0.025 +Move Factor=100 +Rest Factor=20 +CW Hard Limit=2 +CCW Hard Limit=2 +CW Soft Limit=3.0 +CCW Soft Limit=1.0 +Soft Limit Mode=1 +Home Dir=2 +Home Limit Switch=1 +Home Vel=1.0 +Home Zero Offset=8.13 +Jog Mode=2 +Jog Step Size=0.1 +Jog Min Vel=0.0 +Jog Accn=1.0 +Jog Max Vel=1.0 +Jog Stop Mode=2 +Steps Per Rev=512 +Gearbox Ratio=67 +Encoder Fitted=0 +DC Servo=1 +DC Prop=435 +DC Int=195 +DC Diff=993 +DC IntLim=195 +FP Controls=1 +Pot Zero Wnd=20 +Pot Vel 1=0.25 +Pot Wnd 1=50 +Pot Vel 2=0.5 +Pot Wnd 2=80 +Pot Vel 3=0.75 +Pot Wnd 3=100 +Pot Vel 4=1.0 +Button Mode=1 +Button Pos 1=1.0 +Button Pos 2=5.0 + +[PLS2] +Stage ID=100 +Axis ID=2 +Units=1 +Pitch=0.3048 +Dir Sense=1 +Min Pos=-12.7 +Max Pos=12.7 +Def Min Vel=0.0 +Def Accn=2.0 +Def Max Vel=2.0 +Max Accn=4.0 +Max Vel=4.0 +Backlash Dist=.01 +Move Factor=30 +Rest Factor=10 +CW Hard Limit=2 +CCW Hard Limit=2 +CW Soft Limit=3.0 +CCW Soft Limit=1.0 +Soft Limit Mode=1 +Home Dir=2 +Home Limit Switch=1 +Home Vel=1 +Home Zero Offset=12.7 +Jog Mode=2 +Jog Step Size=0.5 +Jog Min Vel=0.0 +Jog Accn=0.5 +Jog Max Vel=1.0 +Jog Stop Mode=2 +Steps Per Rev=200 +Gearbox Ratio=1 +Encoder Fitted=1 +FP Controls=1 +Pot Zero Wnd=20 +Pot Vel 1=1.0 +Pot Wnd 1=50 +Pot Vel 2=0.5 +Pot Wnd 2=80 +Pot Vel 3=0.75 +Pot Wnd 3=100 +Pot Vel 4=1.0 +Button Mode=1 +Button Pos 1=0.0 +Button Pos 2=3.0 + +[PLS3] +Stage ID=100 +Axis ID=2 +Units=1 +Pitch=0.3048 +Dir Sense=1 +Min Pos=-12.7 +Max Pos=12.7 +Def Min Vel=0.0 +Def Accn=2.0 +Def Max Vel=2.0 +Max Accn=4.0 +Max Vel=4.0 +Backlash Dist=.01 +Move Factor=30 +Rest Factor=10 +CW Hard Limit=2 +CCW Hard Limit=2 +CW Soft Limit=3.0 +CCW Soft Limit=1.0 +Soft Limit Mode=1 +Home Dir=2 +Home Limit Switch=1 +Home Vel=1 +Home Zero Offset=12.7 +Jog Mode=2 +Jog Step Size=0.5 +Jog Min Vel=0.0 +Jog Accn=0.5 +Jog Max Vel=1.0 +Jog Stop Mode=2 +Steps Per Rev=200 +Gearbox Ratio=1 +Encoder Fitted=1 +FP Controls=1 +Pot Zero Wnd=20 +Pot Vel 1=1.0 +Pot Wnd 1=50 +Pot Vel 2=0.5 +Pot Wnd 2=80 +Pot Vel 3=0.75 +Pot Wnd 3=100 +Pot Vel 4=1.0 +Button Mode=1 +Button Pos 1=0.0 +Button Pos 2=3.0 + +[LNR50SE] +Stage ID=67 +Axis ID=2 +Units=1 +Pitch=1.0 +Dir Sense=1 +Min Pos=0.00 +Max Pos=50.00 +Def Min Vel=0.0 +Def Accn=0.5 +Def Max Vel=2.0 +Max Accn=10.0 +Max Vel=12.0 +Backlash Dist=0.0 +Move Factor=100 +Rest Factor=20 +CW Hard Limit=3 +CCW Hard Limit=3 +CW Soft Limit=3.0 +CCW Soft Limit=1.0 +Soft Limit Mode=1 +Home Dir=2 +Home Limit Switch=1 +Home Vel=1 +Home Zero Offset=0.1 +Jog Mode=2 +Jog Step Size=0.5 +Jog Min Vel=0.0 +Jog Accn=0.5 +Jog Max Vel=1.0 +Jog Stop Mode=2 +Steps Per Rev=200 +Gearbox Ratio=1 +JS Params=1 +JS GearLow MaxVel=2.5 +JS GearHigh MaxVel=5.0 +JS GearLow Accn=2.5 +JS GearHigh Accn=5.0 +JS Dir Sense=1 +Trinamic Enc Const=22222222 +Trinamic lProp=20000 +Trinamic lInt=1000 +Trinamic lDiff=100 +Trinamic lPIDClip=100000000 +Trinamic lPIDTol=200 + +[VA-LNR/E] +Stage ID=67 +Axis ID=2 +Units=1 +Pitch=1.0 +Dir Sense=1 +Min Pos=0.00 +Max Pos=50.00 +Def Min Vel=0.0 +Def Accn=0.5 +Def Max Vel=2.0 +Max Accn=10.0 +Max Vel=12.0 +Backlash Dist=0.0 +Move Factor=100 +Rest Factor=20 +CW Hard Limit=3 +CCW Hard Limit=3 +CW Soft Limit=3.0 +CCW Soft Limit=1.0 +Soft Limit Mode=1 +Home Dir=2 +Home Limit Switch=1 +Home Vel=1 +Home Zero Offset=0.1 +Jog Mode=2 +Jog Step Size=0.5 +Jog Min Vel=0.0 +Jog Accn=0.5 +Jog Max Vel=1.0 +Jog Stop Mode=2 +Steps Per Rev=200 +Gearbox Ratio=1 +JS Params=1 +JS GearLow MaxVel=2.5 +JS GearHigh MaxVel=5.0 +JS GearLow Accn=2.5 +JS GearHigh Accn=5.0 +JS Dir Sense=1 +Trinamic Enc Const=22222222 +Trinamic lProp=20000 +Trinamic lInt=1000 +Trinamic lDiff=100 +Trinamic lPIDClip=100000000 +Trinamic lPIDTol=200 + + +[VA-LNR/E Hi Res] +Stage ID=67 +Axis ID=2 +Units=1 +Pitch=1.0 +Dir Sense=1 +Min Pos=0.00 +Max Pos=50.00 +Def Min Vel=0.0 +Def Accn=0.5 +Def Max Vel=2.0 +Max Accn=10.0 +Max Vel=12.0 +Backlash Dist=0.0 +Move Factor=100 +Rest Factor=20 +CW Hard Limit=3 +CCW Hard Limit=3 +CW Soft Limit=3.0 +CCW Soft Limit=1.0 +Soft Limit Mode=1 +Home Dir=2 +Home Limit Switch=1 +Home Vel=1 +Home Zero Offset=0.1 +Jog Mode=2 +Jog Step Size=0.5 +Jog Min Vel=0.0 +Jog Accn=0.5 +Jog Max Vel=1.0 +Jog Stop Mode=2 +Steps Per Rev=200 +Gearbox Ratio=1 +JS Params=1 +JS GearLow MaxVel=2.5 +JS GearHigh MaxVel=5.0 +JS GearLow Accn=2.5 +JS GearHigh Accn=5.0 +JS Dir Sense=1 +Trinamic Enc Const=22222222 +Trinamic lProp=20000 +Trinamic lInt=1000 +Trinamic lDiff=100 +Trinamic lPIDClip=100000000 +Trinamic lPIDTol=200 + +[DDR05] +Stage ID=118 +Axis ID=3 +Units=2 +Pitch=1.0 +Dir Sense=1 +Min Pos=-193273.5 +Max Pos=193273.5 +Def Min Vel=0.0 +Def Accn=5000.0 +Def Max Vel=1800.0 +Max Accn=10000.0 +Max Vel=1800.0 +Backlash Dist=1.0 +Move Factor=100 +Rest Factor=20 +CW Hard Limit=4 +CCW Hard Limit=1 +CW Soft Limit=1.0 +CCW Soft Limit=1.0 +Soft Limit Mode=1 +Home Dir=2 +Home Limit Switch=1 +Home Vel=10.0 +Home Zero Offset=0.18 +Jog Mode=2 +Jog Step Size=5.0 +Jog Min Vel=0.0 +Jog Accn=5000.0 +Jog Max Vel=900.0 +Jog Stop Mode=2 +Steps Per Rev=2000000 +Gearbox Ratio=1 +Encoder Fitted=0 +DC Servo=1 +DC Prop=850 +DC Int=150 +DC Diff=2720 +DC IntLim=50 + +[DDS220] +Stage ID=19 +Axis ID=2 +Units=1 +Pitch=1.0 +Dir Sense=1 +Min Pos=0.00 +Max Pos=220.00 +Def Min Vel=0.0 +Def Accn=1000.0 +Def Max Vel=100.0 +Max Accn=2000.0 +Max Vel=250.0 +Backlash Dist=0.01 +Move Factor=100 +Rest Factor=20 +CW Hard Limit=3 +CCW Hard Limit=3 +CW Soft Limit=3.0 +CCW Soft Limit=1.0 +Soft Limit Mode=1 +Home Dir=2 +Home Limit Switch=4 +Home Vel=1 +Home Zero Offset=1.0 +Jog Mode=2 +Jog Step Size=0.5 +Jog Min Vel=0.0 +Jog Accn=50.0 +Jog Max Vel=50.0 +Jog Stop Mode=2 +Steps Per Rev=2000 +Gearbox Ratio=1 +Encoder Fitted=0 +DC Servo=1 +DC Prop=75 +DC Int=1 +DC Diff=0 +DC IntLim=0 + +[DDS300] +Stage ID=19 +Axis ID=2 +Units=1 +Pitch=1.0 +Dir Sense=1 +Min Pos=0.00 +Max Pos=300.00 +Def Min Vel=0.0 +Def Accn=1000.0 +Def Max Vel=100.0 +Max Accn=2000.0 +Max Vel=250.0 +Backlash Dist=0.01 +Move Factor=100 +Rest Factor=20 +CW Hard Limit=3 +CCW Hard Limit=3 +CW Soft Limit=3.0 +CCW Soft Limit=1.0 +Soft Limit Mode=1 +Home Dir=2 +Home Limit Switch=4 +Home Vel=1 +Home Zero Offset=1.0 +Jog Mode=2 +Jog Step Size=0.5 +Jog Min Vel=0.0 +Jog Accn=50.0 +Jog Max Vel=50.0 +Jog Stop Mode=2 +Steps Per Rev=2000 +Gearbox Ratio=1 +Encoder Fitted=0 +DC Servo=1 +DC Prop=75 +DC Int=1 +DC Diff=0 +DC IntLim=0 + +[DDS600] +Stage ID=19 +Axis ID=2 +Units=1 +Pitch=1.0 +Dir Sense=1 +Min Pos=0.00 +Max Pos=600.00 +Def Min Vel=0.0 +Def Accn=1000.0 +Def Max Vel=100.0 +Max Accn=2000.0 +Max Vel=250.0 +Backlash Dist=0.01 +Move Factor=100 +Rest Factor=20 +CW Hard Limit=3 +CCW Hard Limit=3 +CW Soft Limit=3.0 +CCW Soft Limit=1.0 +Soft Limit Mode=1 +Home Dir=2 +Home Limit Switch=4 +Home Vel=1 +Home Zero Offset=1.0 +Jog Mode=2 +Jog Step Size=0.5 +Jog Min Vel=0.0 +Jog Accn=50.0 +Jog Max Vel=50.0 +Jog Stop Mode=2 +Steps Per Rev=2000 +Gearbox Ratio=1 +Encoder Fitted=0 +DC Servo=1 +DC Prop=75 +DC Int=1 +DC Diff=0 +DC IntLim=0 + +[PRMTZ8] +Stage ID=116 +Axis ID=3 +Units=2 +Pitch=17.87 +Dir Sense=1 +Min Pos=0.00 +Max Pos=360.00 +Def Min Vel=0.0 +Def Accn=10.0 +Def Max Vel=10.0 +Max Accn=25.0 +Max Vel=25.0 +Backlash Dist=1.0 +Move Factor=100 +Rest Factor=20 +CW Hard Limit=4 +CCW Hard Limit=1 +CW Soft Limit=1.0 +CCW Soft Limit=1.0 +Soft Limit Mode=1 +Home Dir=2 +Home Limit Switch=1 +Home Vel=10.0 +Home Zero Offset=4.0 +Jog Mode=2 +Jog Step Size=5.0 +Jog Min Vel=0.0 +Jog Accn=15.0 +Jog Max Vel=15.0 +Jog Stop Mode=2 +Steps Per Rev=512 +Gearbox Ratio=67 +Encoder Fitted=0 +DC Servo=1 +DC Prop=850 +DC Int=150 +DC Diff=2720 +DC IntLim=50 +FP Controls=1 +Pot Zero Wnd=20 +Pot Vel 1=1 +Pot Wnd 1=50 +Pot Vel 2=5 +Pot Wnd 2=80 +Pot Vel 3=10 +Pot Wnd 3=100 +Pot Vel 4=20 +Button Mode=1 +Button Pos 1=10.0 +Button Pos 2=20.0 \ No newline at end of file diff --git a/thorpy/stages/__init__.py b/thorpy/stages/__init__.py index fe212d0..c25bf03 100644 --- a/thorpy/stages/__init__.py +++ b/thorpy/stages/__init__.py @@ -15,6 +15,7 @@ def stage_name_from_get_hw_info(m): stage_type = m['empty_space'][-2] #Reverse engineered hw_version = m['hw_version'] model_number = m['model_number'].decode('ascii').strip('\x00') + mod_state=m['mod_state'] # new version 2019, required for controller_type 26, 4294 if controller_type in (60, 80): if hw_version == 3: return 'HS ZST6(B)' @@ -52,6 +53,42 @@ def stage_name_from_get_hw_info(m): #This is reverse engineered... _print_stage_detection_improve_message(m) return 'Z606(B)' + elif controller_type in (26, 4294, ): + #Obtained by testing out all the options of a Thorlabs KST101. Until now only verified for ZST225(B), ZST213(B) and ZFS25. + if mod_state == 115: + return 'PLS3' + elif mod_state == 114: + return 'PLS2' + elif mod_state == 117: + return 'FW103' + elif mod_state == 112: + return 'NR360' + elif mod_state == 81: + return 'DRV014' + elif mod_state == 80: + return 'DRV013' + elif mod_state == 66: + return 'ZFS25(B)' + elif mod_state == 65: + return 'ZFS13(B)' + elif mod_state == 64: + return 'ZFS6(B)' + elif mod_state == 50: + return 'ZST225(B)' + elif mod_state == 49: + return 'ZST213(B)' + elif mod_state == 48: + return 'ZST206(B)' + elif mod_state == 34: + return 'ZST25(B)' + elif mod_state == 33: + return 'ZST13(B)' + elif mod_state == 32: + return 'ZST6(B)' + else: + #This is reverse engineered... + _print_stage_detection_improve_message(m) + return 'Z606(B)' elif controller_type in (43, 93): return 'DRV414' elif controller_type in (94, ):