Changeset 1690 for trunk/MagicSoft/Cosy/devdrv

Timestamp:

12/18/02 17:48:44 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/devdrv

Files:

• macs.cc (modified) (10 diffs)
• macs.h (modified) (3 diffs)
• shaftencoder.cc (modified) (1 diff)
• shaftencoder.h (modified) (1 diff)

trunk/MagicSoft/Cosy/devdrv/macs.cc

@@ -113 +113 @@
         fVelRes = val;
         return;
+
+    case 0x6501:
+        lout << "- Encoder resolution " << GetNodeName() << ": " << dec << val << " ticks/min" << endl;
+        fRes = val;
+        return;
     }
     cout << "Macs: SDO, idx=0x"<< hex << idx << "/" << (int)subidx;
@@ -211 +216 @@
 void Macs::InitDevice(Network *net)
 {
+    lout << "- MAC Init device." << endl;
     NodeDrv::InitDevice(net);
+    lout << "- MAC Init device...done." << endl;
 
 //    SendSDO(0x4003, (LWORD_t)('E'<<24 | 'X'<<16 | 'I'<<8 'T'));
@@ -295 +302 @@
     RequestSDO(0x6004);
     WaitForSdo(0x6004);
+}
+
+void Macs::ReqRes()
+{
+    lout << "- Requesting Encoder Resolution of " << GetNodeName() << endl;
+    RequestSDO(0x6501);
+    WaitForSdo(0x6501);
 }
 
@@ -491 +505 @@
     case 100:
         lout << "Connection timed out." << endl;
+        EnableTimeout(false);
         return;
 
@@ -592 +607 @@
 void Macs::EnableTimeout(bool enable, LWORDS_t ms)
 {
+    lout << "- MAC " << (enable?"En":"Dis") << "able timeout, " << dec << ms << "ms." << endl;
     if (!enable)
     {
@@ -597 +613 @@
         WaitForSdo(0x4000, 1);
 
+        lout << "- Stopping handshake (PC)." << endl;
+
         fTimeout->Stop(); //kTRUE);
 
@@ -610 +628 @@
         fTimerOn = kTRUE;
         fTimeout->Start(fGuardTime/*/3*2*/, kTRUE); //kFALSE); //TRUE);
+
         //
         // Start with kFALSE would be a continous timer, but this
@@ -615 +634 @@
         // any reason
         //
-
-//        SendSDO(0x4000, 1, string('o', 'n'));
-//        WaitForSdo(0x4000, 1);
+        lout << "- MAC starting handshake." << endl;
+        SendSDO(0x4000, 1, string('o', 'n'));
+        WaitForSdo(0x4000, 1);
     }
     lout << "- Timeout timer of " << GetNodeName() << " turned "
@@ -666 +685 @@
     // --- lout << edev(MLog::eGui);
 
-    if (time.Now() > fTimeoutTime+0.5)
+    if (time.Now() > fTimeoutTime)
     {
         lout << ddev(MLog::eGui);
@@ -703 +722 @@
     fGuardTime = ms/3;      // how often do we send/request the handshake
 
-    SendSDO(0x4000, 2, ms); // How often do we check for the handshake
+    SendSDO(0x4000, 2, ms*2); // How often do we check for the handshake
     WaitForSdo(0x4000, 2);
 }

trunk/MagicSoft/Cosy/devdrv/macs.h

@@ -18 +18 @@
     Timer    fPosTime;
 
+    LWORD_t  fRes;      // Encoder resolution
+
     LWORDS_t fPdoPos;
     Timer    fPdoTime;
@@ -36 +38 @@
     void ResetTimeout();
     Bool_t HandleTimer(TTimer *t);
+
+    void ReqRes();
 
 public:
@@ -100 +104 @@
     LWORDS_t GetVel()    { return fVel; }
     LWORD_t  GetVelRes() { return fVelRes; } // Velocity units (would be 100 for %)
+    LWORD_t  GetRes()    { return fRes; }    // Encoder resolution
 
     void HandleError();

trunk/MagicSoft/Cosy/devdrv/shaftencoder.cc

@@ -200 +200 @@
     lout << "- Requesting Hardware Type (SDO 0x1000) of " << GetNodeName() << endl;
     RequestSDO(0x1000);
-    WaitForSdo(0x1000);
+    if (!WaitForSdo(0x1000))
+    {
+        lout << "  ... failed." << endl;
+        fIsZombie = true;
+        return;
+    }
 
     //

trunk/MagicSoft/Cosy/devdrv/shaftencoder.h

@@ -51 +51 @@
 
     LWORDS_t GetPos() { return fPos+fTurn*fTicks; }
+    LWORD_t  GetPhysRes() { return fTicks; }
 
     double GetTime();