Changeset 920 for trunk/MagicSoft/Cosy/candrv

Timestamp:

08/29/01 16:44:38 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/candrv

Files:

• CandrvIncl.h (added)
• CandrvLinkDef.h (added)
• canopen.cc (modified) (1 diff)
• canopen.h (modified) ( previous)
• network.cc (modified) (1 diff)
• network.h (modified) (1 diff)
• nodedrv.cc (modified) (2 diffs)
• nodedrv.h (modified) (1 diff)
• vmodican.cc (modified) (1 diff)
• vmodican.h (modified) (1 diff)

trunk/MagicSoft/Cosy/candrv/canopen.cc

@@ -4 +4 @@
 #include <iomanip.h>  // setw, setfill
 
-CanOpen::CanOpen(const char *dev, const int baud, ostream &out=cout) : VmodIcan(dev, baud, out)
+CanOpen::CanOpen(const char *dev, const int baud, MLog &out) : VmodIcan(dev, baud, out)
 {
     for (int i=0; i<32; i++)

trunk/MagicSoft/Cosy/candrv/network.cc

@@ -24 +24 @@
 }
 
-Network::Network(const char *dev, const int baud, ostream &out) : CanOpen(dev, baud, out)
+Network::Network(const char *dev, const int baud, MLog &out) : CanOpen(dev, baud, out)
 {
     for (int i=0; i<32; i++)

trunk/MagicSoft/Cosy/candrv/network.h

@@ -21 +21 @@
 
 public:
-    Network(const char *dev, const int baud, ostream &out=cout);
+    Network(const char *dev, const int baud, MLog &out=gLog);
 
     void SetNode(NodeDrv *drv);

trunk/MagicSoft/Cosy/candrv/nodedrv.cc

@@ -5 +5 @@
 
 #include "network.h"
+#include "MLogManip.h"
 
-NodeDrv::NodeDrv(BYTE_t nodeid, ostream &out) : Log(out), fNetwork(NULL), fId(32), fError(0)
+NodeDrv::NodeDrv(BYTE_t nodeid, MLog &out) : Log(out), fNetwork(NULL), fId(32), fError(0)
 {
     if (nodeid>31)
@@ -31 +32 @@
 void NodeDrv::HandleSDOOK(WORD_t idx, BYTE_t subidx)
 {
+    const Bool_t gui = lout.IsOutputDeviceEnabled(MLog::eGui);
+
+    if (gui)
+        lout << ddev(MLog::eGui);
+
     lout << hex << setfill('0');
     lout << "Sdo=" << idx  << "/" << (int)subidx << " set.";
     lout << endl;
+
+    if (gui)
+        lout << edev(MLog::eGui);
 }
 

trunk/MagicSoft/Cosy/candrv/nodedrv.h

@@ -21 +21 @@
 
 public:
-    NodeDrv(BYTE_t nodeid, ostream &out=cout);
+    NodeDrv(BYTE_t nodeid, MLog &out=gLog);
 
     BYTE_t   GetId()      { return fId; }

trunk/MagicSoft/Cosy/candrv/vmodican.cc

@@ -758 +758 @@
 }
 
-VmodIcan::VmodIcan(const char *dev, const int baud, ostream &out) : Log(out), MThread(false)//: CanDriver(dev, baud)
+VmodIcan::VmodIcan(const char *dev, const int baud, MLog &out) : Log(out), MThread(false)//: CanDriver(dev, baud)
 {
     //

trunk/MagicSoft/Cosy/candrv/vmodican.h

@@ -56 +56 @@
 
 public:
-    VmodIcan(const char *dev, const int baud, ostream &out=cout);
+    VmodIcan(const char *dev, const int baud, MLog &out=gLog);
     virtual ~VmodIcan();