From 82afa86fa04fdfeca00625daec4e2f789a75470a Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Mon, 29 Apr 2013 20:45:50 +1000 Subject: [PATCH] Cosmetic changes to the simulated fermi chopper controller. --- .../TEST_SICS/fakeFermi/SIM_FERMI.py | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/site_ansto/instrument/TEST_SICS/fakeFermi/SIM_FERMI.py b/site_ansto/instrument/TEST_SICS/fakeFermi/SIM_FERMI.py index 0fd3a0bb..41875ba1 100755 --- a/site_ansto/instrument/TEST_SICS/fakeFermi/SIM_FERMI.py +++ b/site_ansto/instrument/TEST_SICS/fakeFermi/SIM_FERMI.py @@ -85,32 +85,32 @@ class Fermi_Prot(LineReceiver): dir = RVAL['dir'][uid] sys_stat = _AVC_ON|_OK self.RegInfo = { - 10: ['U16', 'System Status Information'], - 12: ['U16', 'Interlock Status Information'], - 14: ['U16', 'Rotational Speed'], - 16: ['F32', 'Encoder Angle (MB350PC/R ONLY)'], - 18: ['U32', 'Phase Veto Count'], - 20: ['U32', 'Read and Clear Phase Veto Count'], - 22: ['U32', 'Read and Clear Phase Veto Count' ], - 24: ['F32', 'Read PHASE ACCURACY'], - 26: ['F32', 'Read PHASE REPEATABILITY'], - 28: ['F32', 'Read PHASE OK'], - 30: ['U32', 'Set VETO WINDOW 100ns'], - 32: ['U32', 'Set VETO WINDOW 50ns'], - 34: ['U32', 'Set MOTOR CONTROL MODE'], - 1000: ['U32', 'Set ROTATIONAL SPEED SETPOINT'], - 1002: ['F32', 'Set HOMING ANGLE SETPOINT (MB350PC/R ONLY)'], - 1004: ['F32', 'Set MOTOR KP'], - 1006: ['F32', 'Set MOTOR KI'], - 1008: ['F32', 'Set MOTOR KPhase'], - 1010: ['F32', 'Set REFERENCE DELAY'], - 1012: ['F32', 'Set REFERENCE PERIOD'], - 1014: ['U32', 'Set SYNC SOURCE'], - 1016: ['U32', 'Set MOTOR DIRECTION'] + 10: ['U16', 'System Status Information (R)'], + 12: ['U16', 'Interlock Status Information (R)'], + 14: ['U16', 'Rotational Speed (R)'], + 16: ['F32', 'Encoder Angle (MB350PC/R ONLY) (R)'], + 18: ['U32', 'Phase Veto Count (R)'], + 20: ['U32', 'Read and Clear Phase Veto Count (R)'], + 22: ['U32', 'Read and Clear Phase Veto Count (R)' ], + 24: ['F32', 'Read PHASE ACCURACY (R)'], + 26: ['F32', 'Read PHASE REPEATABILITY (R)'], + 28: ['F32', 'Read PHASE OK (R)'], + 30: ['U32', 'Set VETO WINDOW 100ns (RW)'], + 32: ['U32', 'Set VETO WINDOW 50ns (RW)'], + 34: ['U32', 'Set MOTOR CONTROL MODE (RW)'], + 1000: ['U32', 'Set ROTATIONAL SPEED SETPOINT (RW)'], + 1002: ['F32', 'Set HOMING ANGLE SETPOINT (MB350PC/R ONLY) (RW)'], + 1004: ['F32', 'Set MOTOR KP (RW)'], + 1006: ['F32', 'Set MOTOR KI (RW)'], + 1008: ['F32', 'Set MOTOR KPhase (RW)'], + 1010: ['F32', 'Set REFERENCE DELAY (RW)'], + 1012: ['F32', 'Set REFERENCE PERIOD (RW)'], + 1014: ['U32', 'Set SYNC SOURCE (RW)'], + 1016: ['U32', 'Set MOTOR DIRECTION (RW)'] } self.RegVal[uid] = { 10: sys_stat, - 12: 0, + 12: 0x0, 14: 1000, 16: 0, 18: 0,