Changeset 9132 for trunk/MagicSoft/Cosy/candrv

Timestamp:

08/26/08 12:11:32 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/candrv

Files:

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

trunk/MagicSoft/Cosy/candrv/canopen.cc

@@ -78 +78 @@
     if (fInterface)
         fInterface->Stop();
+}
+
+Bool_t CanOpen::HasConnection() const
+{
+    return fInterface ? fInterface->HasConnection() : kFALSE;
 }
 

trunk/MagicSoft/Cosy/candrv/canopen.h

@@ -101 +101 @@
 
     void SetInterface(Interface *f) { fInterface=f; } // Set Handle to the interface
+    Bool_t HasConnection() const;
 
     // Send a Process Data Object (PDO) to the CanOpen bus

trunk/MagicSoft/Cosy/candrv/network.cc

@@ -356 +356 @@
 bool Network::RebootZombies()
 {
+    if (!HasConnection())
+    {
+        gLog << warn << "- No connection to network." << endl;
+        return false;
+    }
+
     bool rc = true;
 
-    gLog << "- Trying to reboot all Zombies..." << endl;
+    gLog << inf2 << "- Trying to reboot all Zombies..." << endl;
     for (int i=0; i<32; i++)
         if (fNodes[i])
@@ -364 +370 @@
                 if (!fNodes[i]->Reboot())
                 {
-                    gLog << "- Failed to reboot " << fNodes[i]->GetNodeName() << "." << endl;
+                    gLog << err << "- Failed to reboot " << fNodes[i]->GetNodeName() << "." << endl;
                     rc = false;
                 }

trunk/MagicSoft/Cosy/candrv/nodedrv.cc

@@ -427 +427 @@
         return true;
 
-    gLog << inf2 << " + " << GetNodeName() << ": NodeDrv::WaitForSdo: 0x" << hex << idx << "/" << dec << (int)subidx << " --> ZOMBIE! " << MTime(-1) << endl;
+    gLog << inf2 << " + " << GetNodeName() << ": NodeDrv::WaitForSdo: 0x" << hex << idx << "/" << dec << (int)subidx << " ";
     if (zombie)
+    {
+        gLog << "--> ZOMBIE! " << endl;
         SetZombie();
+     }
+
+    gLog << MTime(-1) << endl;
+
     return false;
 }