Changeset 1273 for trunk/MagicSoft/Cosy/candrv

Timestamp:

04/11/02 13:20:10 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/candrv

Files:

• network.cc (modified) (1 diff)
• nodedrv.cc (modified) (1 diff)
• vmodican.cc (modified) (1 diff)

trunk/MagicSoft/Cosy/candrv/network.cc

@@ -263 +263 @@
 bool Network::HasError() const
 {
-    for (int i=0; i<32; i++)
-        if (fNodes[i] && fNodes[i]->HasError())
-            return true;
-
-    return false;
-}
+    bool rc = false;
+
+    for (int i=0; i<32; i++)
+    {
+        if (!fNodes[i])
+            continue;
+
+        if (!fNodes[i]->HasError())
+            continue;
+
+        rc = true;
+
+        if (fNodes[i]->GetError() <= 0)
+            continue;
+
+        lout << "- Node #" << dec << i << " '" << fNodes[i]->GetNodeName();
+        lout << "' has error #" << fNodes[i]->GetError() << endl;
+    }
+
+    return rc;
+}

trunk/MagicSoft/Cosy/candrv/nodedrv.cc

@@ -74 +74 @@
     }
 
-    lout << "- Node #" << nodeid << " (" << name << ") initialized." << endl;
+    lout << "- Node #" << (int)nodeid << " (" << name << ") initialized." << endl;
 }
 

trunk/MagicSoft/Cosy/candrv/vmodican.cc

@@ -915 +915 @@
 //  and switch the can bus communication on
 //
-VmodIcan::VmodIcan(const char *dev, const int baud, MLog &out) : Log(out), MThread(false)//: CanDriver(dev, baud)
+VmodIcan::VmodIcan(const char *dev, const int baud, MLog &out) : Log(out), MThread(false, -10)//: CanDriver(dev, baud)
 {
     //
     // Set priority of receiving thread and detach the receiving thread
     //
-    SetPriority(-10);
     Detach();