aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTeroK <tero.k@granitedevices.fi>2014-01-16 15:49:12 -0800
committerTeroK <tero.k@granitedevices.fi>2014-01-16 15:49:12 -0800
commitcfc6ec66763661a6257ac860be7d31cc5868a640 (patch)
treeaa3f5b5d1e3381c62ca1f85b0fa71a98724e8ad4
parent2ad7a9271d4336a988b78caf13252da3e0ff0f5a (diff)
downloadSimpleMotionV2-cfc6ec66763661a6257ac860be7d31cc5868a640.tar.gz
SimpleMotionV2-cfc6ec66763661a6257ac860be7d31cc5868a640.zip
fix control mode numbers CM_TORQUE etc
-rw-r--r--simplemotion_defs.h6
-rw-r--r--simplemotion_private.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/simplemotion_defs.h b/simplemotion_defs.h
index cc00b95..6abd046 100644
--- a/simplemotion_defs.h
+++ b/simplemotion_defs.h
@@ -230,9 +230,9 @@
//#define CFG_INPUT_FILTER_LEN 30
#define SMP_CONTROL_MODE 559
//control mode choices:
- #define CM_TORQUE 2
- #define CM_VELOCITY 1
- #define CM_POSITION 0
+ #define CM_TORQUE 3
+ #define CM_VELOCITY 2
+ #define CM_POSITION 1
#define SMP_INPUT_MULTIPLIER 560
#define SMP_INPUT_DIVIDER 561
#define SMP_INPUT_REFERENCE_MODE 562
diff --git a/simplemotion_private.h b/simplemotion_private.h
index e78ac42..9cfdabc 100644
--- a/simplemotion_private.h
+++ b/simplemotion_private.h
@@ -19,7 +19,7 @@
#include "busdevice.h"
#include <stdio.h>
-#define SM_VERSION 0x020000
+#define SM_VERSION 0x020001
//max number of simultaneously opened buses. change this and recompiple SMlib if
//necessary (to increase channels or reduce to save memory)
#define SM_MAX_BUSES 10