new readable remote controll commands

lindemann09 · Feb 15, 2017 · 7b21361 · 7b21361
1 parent 97a44c1
commit 7b21361
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 24 deletions.
diff --git a/forceDAQ/__init__.py b/forceDAQ/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "0.7.4"
+__version__ = "0.7.5"
 __author__ = "Oliver Lindemann"
 
 """

diff --git a/forceDAQ/base/types.py b/forceDAQ/base/types.py
@@ -195,29 +195,42 @@ class GUIRemoteControlCommands(object):
 
     #TODO DOCU REMOTECONTROL
 
-    COMMAND_STR = "$cmd"
-
-    FEEDBACK, \
-    START, \
-    PAUSE, \
-    QUIT, \
-    SET_THRESHOLDS,  \
-    GET_THRESHOLD_LEVEL, \
-    SET_LEVEL_CHANGE_DETECTION, \
-    CHANGED_LEVEL,\
-    VALUE, FILENAME, \
-    GET_FX, GET_FY, GET_FZ, GET_TX, GET_TY, GET_TZ, \
-    PING,\
-    SET_RESPONSE_MINMAX_DETECTION, \
-    RESPONSE_MINMAX,\
-    GET_VERSION, \
-    GET_FX2, GET_FY2, GET_FZ2, GET_TX2, GET_TY2, GET_TZ2,\
-    GET_THRESHOLD_LEVEL2, \
-    SET_LEVEL_CHANGE_DETECTION2, \
-    CHANGED_LEVEL2, \
-    SET_RESPONSE_MINMAX_DETECTION2, \
-    RESPONSE_MINMAX2\
-    = map(lambda x: "$cmd{0:02d}:".format(x), range(31))
+    COMMAND_STR = "$"
+    # BASIC
+    START = COMMAND_STR + "SRT"
+    PAUSE = COMMAND_STR + "PSE"
+    PING = COMMAND_STR + "PNG"
+    QUIT  = COMMAND_STR + "QUT"
+    #getter
+    GET_FX1 = COMMAND_STR + "gFX1"
+    GET_FX2 = COMMAND_STR + "gFX2"
+    GET_FY1 = COMMAND_STR + "gFY1"
+    GET_FY2 = COMMAND_STR + "gFY2"
+    GET_FZ1 = COMMAND_STR + "gFZ1"
+    GET_FZ2 = COMMAND_STR + "gFZ2"
+    GET_TX1 = COMMAND_STR + "gTX1"
+    GET_TX2 = COMMAND_STR + "gTX2"
+    GET_TY1 = COMMAND_STR + "gTY1"
+    GET_TY2 = COMMAND_STR + "gTY2"
+    GET_TZ1 = COMMAND_STR + "gTZ1"
+    GET_TZ2 = COMMAND_STR + "gTZ2"
+    GET_THRESHOLD_LEVEL =COMMAND_STR + "gTL"
+    GET_THRESHOLD_LEVEL2 = COMMAND_STR + "gTL2"
+    GET_VERSION = COMMAND_STR + "gVR"
+    # setter
+    FILENAME = COMMAND_STR + "sFN"
+    SET_THRESHOLDS = COMMAND_STR + "sTH"
+    SET_LEVEL_CHANGE_DETECTION = COMMAND_STR + "sCD1"
+    SET_LEVEL_CHANGE_DETECTION2 = COMMAND_STR + "sCD2"
+    SET_RESPONSE_MINMAX_DETECTION = COMMAND_STR + "sMD1"
+    SET_RESPONSE_MINMAX_DETECTION2 = COMMAND_STR + "sMD2"
+    #feedback
+    FEEDBACK = COMMAND_STR + "xFB"
+    VALUE = COMMAND_STR + "xVL"
+    RESPONSE_MINMAX = COMMAND_STR + "xRM1"
+    RESPONSE_MINMAX2 = COMMAND_STR + "xRM2"
+    CHANGED_LEVEL = COMMAND_STR + "xCL1"
+    CHANGED_LEVEL2 = COMMAND_STR + "xCL2"
 
     FEEDBACK_PAUSED = FEEDBACK + "paused"
     FEEDBACK_STARTED = FEEDBACK + "started"