Changeset 6923 for trunk/MagicSoft/Cosy/candrv

Timestamp:

04/11/05 10:58:30 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/candrv

Files:

• network.cc (modified) (2 diffs)
• network.h (modified) (1 diff)
• nodedrv.cc (modified) (1 diff)
• nodedrv.h (modified) (1 diff)

trunk/MagicSoft/Cosy/candrv/network.cc

@@ -278 +278 @@
 // --------------------------------------------------------------------------
 //
+// Print all errors which are currently set
+//
+void Network::PrintError() const
+{
+    for (int i=0; i<32; i++)
+    {
+        if (!fNodes[i])
+            continue;
+
+        if (!fNodes[i]->HasError())
+            continue;
+
+        lout << "- Node #" << dec << i << " '" << fNodes[i]->GetNodeName() << "' ";
+
+        if (fNodes[i]->GetError() <= 0)
+            lout << "Error occured." << endl;
+        else
+            lout << "has error #" << fNodes[i]->GetError() << endl;
+    }
+}
+
+// --------------------------------------------------------------------------
+//
 // returns true if one of the nodes has the error-flag set (HasError).
 //
@@ -354 +377 @@
             fNodes[i]->CheckConnection();
 }
-

trunk/MagicSoft/Cosy/candrv/network.h

@@ -37 +37 @@
     virtual void Stop();
 
+    void PrintError() const;
+
     bool HasError() const;
     bool HasZombie() const;

trunk/MagicSoft/Cosy/candrv/nodedrv.cc

@@ -416 +416 @@
 // queue and no waiting is done, false is returned..
 //
-bool NodeDrv::WaitForSdo(WORD_t idx, BYTE_t subidx, WORDS_t timeout)
+bool NodeDrv::WaitForSdo(WORD_t idx, BYTE_t subidx, WORDS_t timeout, bool zombie)
 {
     bool rc = fNetwork->WaitForSdo(fId, idx, subidx, fIsZombie?-1:timeout);
-
-    if (!rc)
-    {
-        lout << "NodeDrv::WaitForSdo: 0x" << hex << idx << "/" << dec << (int)subidx << " " << GetNodeName() << " --> ZOMBIE!" << endl;
+    if (rc)
+        return true;
+
+    lout << " + " << GetNodeName() << ": NodeDrv::WaitForSdo: 0x" << hex << idx << "/" << dec << (int)subidx << " --> ZOMBIE! " << MTime() << endl;
+    if (zombie)
         SetZombie();
-    }
-/*
-    if (HasError())
-    {
-        lout << "NodeDrv::WaitForSdo: HasError 0x" << hex << idx << "/" << dec << (int)subidx << " " << GetNodeName() << " --> ZOMBIE!" << endl;
-        fIsZombie = kTRUE;
-    }
-*/
-    return fIsZombie ? false : rc;
+    return false;
 }
 

trunk/MagicSoft/Cosy/candrv/nodedrv.h

@@ -106 +106 @@
 
     // void WaitForSdos();
-    bool WaitForSdo(WORD_t idx, BYTE_t subidx=0, WORDS_t timeout=500);
+    bool WaitForSdo(WORD_t idx, BYTE_t subidx=0, WORDS_t timeout=500, bool zombie=true);
 
     void EnableCanMsg(BYTE_t fcode);