Changeset 926 for trunk/MagicSoft/Cosy/candrv

Timestamp:

09/10/01 14:32:27 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/candrv

Files:

• canopen.cc (modified) (3 diffs)
• canopen.h (modified) ( previous)
• nodedrv.cc (modified) (3 diffs)
• nodedrv.h (modified) (3 diffs)

trunk/MagicSoft/Cosy/candrv/canopen.cc

@@ -184 +184 @@
 }
   
-void CanOpen::SendSDO(BYTE_t node, WORD_t idx, BYTE_t subidx, BYTE_t val)
-{
-    fSdoList.Add(node, idx, subidx);
+void CanOpen::SendSDO(BYTE_t node, WORD_t idx, BYTE_t subidx, BYTE_t val, bool store)
+{
+    if (store)
+        fSdoList.Add(node, idx, subidx);
 
     SendCanFrame(CobId(node, kSDO_TX), kSDO_RX1,
@@ -192 +193 @@
 }
 
-void CanOpen::SendSDO(BYTE_t node, WORD_t idx, BYTE_t subidx, WORD_t val)
-{
-    fSdoList.Add(node, idx, subidx);
+void CanOpen::SendSDO(BYTE_t node, WORD_t idx, BYTE_t subidx, WORD_t val, bool store)
+{
+    if (store)
+        fSdoList.Add(node, idx, subidx);
 
     SendCanFrame(CobId(node, kSDO_TX), kSDO_RX2,
@@ -201 +203 @@
 }
 
-void CanOpen::SendSDO(BYTE_t node, WORD_t idx, BYTE_t subidx, LWORD_t val)
-{
-    fSdoList.Add(node, idx, subidx);
+void CanOpen::SendSDO(BYTE_t node, WORD_t idx, BYTE_t subidx, LWORD_t val, bool store)
+{
+    if (store)
+        fSdoList.Add(node, idx, subidx);
 
     SendCanFrame(CobId(node, kSDO_TX), kSDO_RX4,

trunk/MagicSoft/Cosy/candrv/nodedrv.cc

@@ -7 +7 @@
 #include "MLogManip.h"
 
-NodeDrv::NodeDrv(BYTE_t nodeid, MLog &out) : Log(out), fNetwork(NULL), fId(32), fError(0)
+NodeDrv::NodeDrv(BYTE_t nodeid, const char *name, MLog &out) : Log(out), fNetwork(NULL), fId(32), fError(0)
 {
     if (nodeid>31)
@@ -16 +16 @@
 
     fId = nodeid;
+
+    if (name)
+    {
+        fName = new char[strlen(name)+1];
+        strcpy(fName, name);
+    }
+    else
+    {
+        fName = new char[9];
+        sprintf(fName, "Node#%d", nodeid);
+    }
+}
+
+NodeDrv::~NodeDrv()
+{
+    delete fName;
 }
 
@@ -80 +96 @@
 }
 
-void NodeDrv::SendSDO(WORD_t idx, BYTE_t subidx, BYTE_t val)
+void NodeDrv::SendSDO(WORD_t idx, BYTE_t subidx, BYTE_t val, bool store)
 {
-    fNetwork->SendSDO(fId, idx, subidx, val);
+    fNetwork->SendSDO(fId, idx, subidx, val, store);
 }
 
-void NodeDrv::SendSDO(WORD_t idx, BYTE_t subidx, WORD_t val)
+void NodeDrv::SendSDO(WORD_t idx, BYTE_t subidx, WORD_t val, bool store)
 {
-    fNetwork->SendSDO(fId, idx, subidx, val);
+    fNetwork->SendSDO(fId, idx, subidx, val, store);
 }
 
-void NodeDrv::SendSDO(WORD_t idx, BYTE_t subidx, LWORD_t val)
+void NodeDrv::SendSDO(WORD_t idx, BYTE_t subidx, LWORD_t val, bool store)
 {
-    fNetwork->SendSDO(fId, idx, subidx, val);
+    fNetwork->SendSDO(fId, idx, subidx, val, store);
 }
 
 void NodeDrv::SendSDO(WORD_t idx, BYTE_t val)
 {
-    fNetwork->SendSDO(fId, idx, val);
+    fNetwork->SendSDO(fId, idx, val, true);
 }
 
 void NodeDrv::SendSDO(WORD_t idx, WORD_t val)
 {
-    fNetwork->SendSDO(fId, idx, val);
+    fNetwork->SendSDO(fId, idx, val, true);
 }
 
 void NodeDrv::SendSDO(WORD_t idx, LWORD_t val)
 {
-    fNetwork->SendSDO(fId, idx, val);
+    fNetwork->SendSDO(fId, idx, val, true);
 }
 
-void NodeDrv::RequestSDO(WORD_t idx, BYTE_t subidx=0)
+void NodeDrv::RequestSDO(WORD_t idx, BYTE_t subidx)
 {
     fNetwork->RequestSDO(fId, idx, subidx);

trunk/MagicSoft/Cosy/candrv/nodedrv.h

@@ -13 +13 @@
     BYTE_t   fId;
 
+    char *fName;
+
     int fError;
 
@@ -21 +23 @@
 
 public:
-    NodeDrv(BYTE_t nodeid, MLog &out=gLog);
+    NodeDrv(BYTE_t nodeid, const char *name=NULL, MLog &out=gLog);
+    virtual ~NodeDrv();
 
-    BYTE_t   GetId()      { return fId; }
-    Network *GetNetwork() { return fNetwork; }
+    BYTE_t   GetId() const       { return fId;   }
+    char    *GetNodeName() const { return fName; }
+    Network *GetNetwork()        { return fNetwork; }
 
     virtual void InitDevice(Network *net);
@@ -47 +51 @@
                   BYTE_t m4=0, BYTE_t m5=0, BYTE_t m6=0, BYTE_t m7=0);
 
-    void SendSDO(WORD_t idx, BYTE_t subidx, BYTE_t val);
-    void SendSDO(WORD_t idx, BYTE_t subidx, WORD_t val);
-    void SendSDO(WORD_t idx, BYTE_t subidx, LWORD_t val);
+    void SendSDO(WORD_t idx, BYTE_t subidx, BYTE_t val, bool store=true);
+    void SendSDO(WORD_t idx, BYTE_t subidx, WORD_t val, bool store=true);
+    void SendSDO(WORD_t idx, BYTE_t subidx, LWORD_t val, bool store=true);
 
     void SendSDO(WORD_t idx, BYTE_t val);