Changeset 8835 for trunk/MagicSoft/Cosy/candrv/network.cc

Timestamp:

01/24/08 16:38:40 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Cosy/candrv/network.cc (modified) (16 diffs)

trunk/MagicSoft/Cosy/candrv/network.cc

@@ -32 +32 @@
 #include "network.h"
 
-#include <iostream> // cout
-#include <iomanip>  // setw, setfill
+#include "MLog.h"
+#include "MLogManip.h"
 
 ClassImp(Network);
@@ -46 +46 @@
 void Network::Start()
 {
-    gLog << "- Starting network." << endl;
+    gLog << inf << "- Starting network." << endl;
 
     CanOpen::Start();
     InitNodes();
 
-    gLog << "- Network started." << endl;
+    gLog << inf << "- Network started." << endl;
 }
 
@@ -60 +60 @@
 void Network::Stop()
 {
-    gLog << "- Stopping network." << endl;
+    gLog << inf << "- Stopping network." << endl;
 
     StopNodes();
     CanOpen::Stop();
 
-    gLog << "- Network stopped." << endl;
+    gLog << inf << "- Network stopped." << endl;
 }
 
@@ -77 +77 @@
     memset(fNodeInitialized, 0, 32*sizeof(*fNodeInitialized));
 
-    gLog << "- Network initialized." << endl;
+    gLog << inf << "- Network initialized." << endl;
 }
 
@@ -115 +115 @@
         }
 
-    cout << dec << setfill('0');
-    cout << "Network::HandleSDO: Node=" << (int)node  << " Cmd=0x" << hex << (int)cmd << ": ";
-    cout << "Sdo=" << idx  << "/" << (int)subidx << ": 0x" << setw(8) << data;
-    cout << endl;
+    gLog << warn << dec << setfill('0');
+    gLog << "Network::HandleSDO: Node=" << (int)node  << " Cmd=0x" << hex << (int)cmd << ": ";
+    gLog << "Sdo=" << idx  << "/" << (int)subidx << ": 0x" << setw(8) << data;
+    gLog << endl;
 }
 
@@ -129 +129 @@
     if (!fNodes[node])
     {
-        cout << "Network::HandlePDO1: Node #" << dec << (int)node << " not found - PDO1: " << hex;
+        gLog << err << "ERROR - Network::HandlePDO1: Node #" << dec << (int)node << " not found - PDO1: " << hex;
         for (int i=0; i<8; i++)
-            cout << " 0x" << (int)data[i];
-        cout << endl;
+            gLog << " 0x" << (int)data[i];
+        gLog << endl;
         return;
     }
@@ -147 +147 @@
     if (!fNodes[node])
     {
-        cout << "Network::HandlePDO2: Node #" << dec << (int)node << " not found - PDO2: " << hex;
+        gLog << err << "ERROR - Network::HandlePDO2: Node #" << dec << (int)node << " not found - PDO2: " << hex;
         for (int i=0; i<8; i++)
-            cout << " 0x" << (int)data[i];
-        cout << endl;
+            gLog << " 0x" << (int)data[i];
+        gLog << endl;
         return;
     }
@@ -165 +165 @@
     if (!fNodes[node])
     {
-        cout << "Network::HandlePDO3: Node #" << dec << (int)node << " not found - PDO3: " << hex;
+        gLog << err << "ERROR - Network::HandlePDO3: Node #" << dec << (int)node << " not found - PDO3: " << hex;
         for (int i=0; i<8; i++)
-            cout << " 0x" << (int)data[i];
-        cout << endl;
+            gLog << " 0x" << (int)data[i];
+        gLog << endl;
         return;
     }
@@ -183 +183 @@
     if (!fNodes[node])
     {
-        cout << "Network::HandlePDO4: Node #" << dec << (int)node << " not found - PDO4: " << hex;
+        gLog << err << "ERROR - Network::HandlePDO4: Node #" << dec << (int)node << " not found - PDO4: " << hex;
         for (int i=0; i<8; i++)
-            cout << " 0x" << (int)data[i];
-        cout << endl;
+            gLog << " 0x" << (int)data[i];
+        gLog << endl;
         return;
     }
@@ -202 +202 @@
     if (!fNodes[node])
     {
-        cout << "Network::HandleNodeguard: Node #" << dec << (int)node << " not found: Nodeguard." << endl;
+        gLog << err << "ERROR - Network::HandleNodeguard: Node #" << dec << (int)node << " not found: Nodeguard." << endl;
         return;
     }
@@ -218 +218 @@
     if (!fNodes[node])
     {
-        cout << "Network::HandleEmergency: Node #" << dec << (int)node << " not found: Emergency." << endl;
+        gLog << err << "ERROR - Network::HandleEmergency: Node #" << dec << (int)node << " not found: Emergency." << endl;
         return;
     }
@@ -236 +236 @@
     if (nodeid>31)
     {
-        cout << "SetNode - Error: Only node Numbers < 32 are allowed"<< endl;
+        gLog << err << "ERROR - Network::SetNode: Only node Numbers < 32 are allowed"<< endl;
         return;
     }
@@ -252 +252 @@
         if (fNodes[i])
         {
-            gLog << "- Setting up Node #" << dec << i << " (";
+            gLog << inf2 << "- Setting up Node #" << dec << i << " (";
             gLog << fNodes[i]->GetNodeName() << ")" << endl;
             if (fNodes[i]->InitDevice(this))
                 fNodeInitialized[i] = TRUE;
             else
-                gLog << "- " << fNodes[i]->GetNodeName() << ": InitDevice failed." << endl;
+                gLog << err << "- " << fNodes[i]->GetNodeName() << ": InitDevice failed." << endl;
         }
-    gLog << "- All Nodes setup." << endl;
+    gLog << inf << "- All Nodes setup." << endl;
 }
 
@@ -271 +271 @@
         if (fNodes[i] && fNodeInitialized[i])
         {
-            gLog << "- Stopping Node #" << dec << i;
+            gLog << inf2 << "- Stopping Node #" << dec << i;
             gLog << " (" << fNodes[i]->GetNodeName() << ")" << endl;
             fNodes[i]->StopDevice();
         }
-    gLog << "- All Nodes stopped." << endl;
+    gLog << inf << "- All Nodes stopped." << endl;
 }
 
@@ -292 +292 @@
             continue;
 
-        gLog << "- Node #" << dec << i << " '" << fNodes[i]->GetNodeName() << "' ";
+        gLog << err << "- Node #" << dec << i << " '" << fNodes[i]->GetNodeName() << "' ";
 
         if (fNodes[i]->GetError() <= 0)
@@ -362 +362 @@
                 }
 
-    if (rc)
-        gLog << "- All Zombies rebooted." << endl;
+//    if (rc)
+//        gLog << inf << "- All Zombies rebooted." << endl;
 
     return rc;