From d3614feb45923db028a57d7beebf5984b3640460 Mon Sep 17 00:00:00 2001 From: "Hood, Jonathan D" Date: Fri, 10 Sep 2021 10:21:23 -0400 Subject: [PATCH] routine --- .../picomotor_driver.cpython-38.pyc | Bin 3729 -> 3779 bytes picomotor_repo/picomotor/picomotor_driver.py | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/picomotor_repo/picomotor/__pycache__/picomotor_driver.cpython-38.pyc b/picomotor_repo/picomotor/__pycache__/picomotor_driver.cpython-38.pyc index 76e1c82a06d658db88232e585f105b0d12d416e5..856e60a5ecc10ce4f266646471c80f924694d36b 100644 GIT binary patch delta 262 zcmYk1Jx;?w5Jq?H#90U1RS2Olgz#&^Phya0kvIaP*(M+!0t&QFpn!@d61C-)iUZJ4 z(8DbdhhbMNIBqJb(~pC*vW#E)p$v!8x37W=Wi`rrXgqvs)Cp){ z2%nAh%kRa<7PFTg|M|PB(PnO{Y@H7C;(%RJ7N*)Z7|>-&l3_@XWl13`tjblBHP*#5 zY>>R5s{|bxib9dwJ+{9K_I*qJ9+{*>~d1k67J!n~Tsmjg delta 199 zcmWlTJ8r^I6hz;(!8V3R5fOsKHwix{F<}X;0Yvi}gme&1nusm10n05y3R|E~l`T-w zXCGXyH22I%Q_NpGYulx@vC+Hyj@D^rPid%OrrI6#ZHyC)^AJ3I3KR(l4}tTEC~dv$ z+Fjpcff|o{@Oz6;67x77tXLTiBc-2-+pMkQ>kdd;&m_%uL<6T+h fV_}kM{w0Z*1o@9l&;PQj#2sB0$%8Z`pI5(cw@xjK 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):