diff --git a/picomotor_repo/picomotor/__pycache__/picomotor_driver.cpython-38.pyc b/picomotor_repo/picomotor/__pycache__/picomotor_driver.cpython-38.pyc index 76e1c82..856e60a 100644 Binary files a/picomotor_repo/picomotor/__pycache__/picomotor_driver.cpython-38.pyc and b/picomotor_repo/picomotor/__pycache__/picomotor_driver.cpython-38.pyc differ diff --git a/picomotor_repo/picomotor/picomotor_driver.py b/picomotor_repo/picomotor/picomotor_driver.py index c67ceb1..967bdcc 100644 --- a/picomotor_repo/picomotor/picomotor_driver.py +++ b/picomotor_repo/picomotor/picomotor_driver.py @@ -9,9 +9,9 @@ # 'sipyco_rpctool ::1 3210 list-methods' will list the methods of this driver. use 'sipyco_rpctool ::1 3210 call ' e.g. sipyco_rpctool ::1 3210 call move 'MOTx_x' class picomotor: - axis_names = { "MOTz_x": "112", "MOTz_y": "122", "MOTy_x": "232", "MOTy_y": "242", "MOTx_x": "212", "MOTx_y": "222"} + axis_names = { "MOTz_x": "112", "MOTz_y": "122", "MOTy_x": "232", "MOTy_y": "242", "MOTx_x": "212", "MOTx_y": "222", "Coprop_y": "132", "Coprop_x": "142"} steps_in_turn = { "MOTz_x": [45650/3, 48500/3], "MOTz_y":[58000/3, 71400/3], "MOTy_x": [90150/3, 69000/3], "MOTy_y": [65500/3, 62500/3], - "MOTx_x": [45300/3, 51000/3], "MOTx_y": [51100/3, 51900/3]} # [CW, CCW] number of steps for 1 turn, using numbers from OneNote 2/8/20 calibration + "MOTx_x": [45300/3, 51000/3], "MOTx_y": [51100/3, 51900/3], "Coprop_y": [51100/3, 51900/3], "Coprop_x": [51100/3, 51900/3]} # [CW, CCW] number of steps for 1 turn, using numbers from OneNote 2/8/20 calibration # Original MOTY values: "MOTy_x": [90150/3, 69000/3], "MOTy_y": [87400/3, 62500/3], # "MOTz_y":[58000/3, 59400/3] [58000/3, 69400/3] def __init__(self, COM_port):