Changeset 8866 for trunk/MagicSoft

Timestamp:

02/20/08 20:32:28 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Cosy/devdrv/macs.cc (modified) (4 diffs)

trunk/MagicSoft/Cosy/devdrv/macs.cc

@@ -606 +606 @@
 void Macs::SetAcceleration(LWORD_t acc)
 {
-    gLog << dbg << "- Setting acceleration to: " << vel << endl;
+    gLog << dbg << "- Setting acceleration to: " << acc << endl;
     SendSDO(0x2003, 0, acc);  // acceleration
     WaitForSdo(0x2003, 0);
@@ -613 +613 @@
 void Macs::SetDeceleration(LWORD_t dec)
 {
-    gLog << dbg << "- Setting deceleration to: " << vel << endl;
+    gLog << dbg << "- Setting deceleration to: " << dec << endl;
     SendSDO(0x2003, 1, dec);
     WaitForSdo(0x2003, 1);
@@ -635 +635 @@
 void Macs::StartRelPos(LWORDS_t pos)
 {
-    if (!fIsArmed)
+    if (!fArmed)
     {
         gLog << err << GetNodeName() << ": ERROR - Moving without being armed is not allowed." << endl;
@@ -648 +648 @@
 void Macs::StartAbsPos(LWORDS_t pos)
 {
-    if (!fIsArmed)
+    if (!fArmed)
     {
         gLog << err << GetNodeName() << ": ERROR - Moving without being armed is not allowed." << endl;
         return;
     }
+
     gLog << dbg << GetNodeName() << ": Starting relative positioning by " << (LWORD_t)pos << " ticks." << endl;
     SendSDO(0x6004, 0, (LWORD_t)pos);