Changeset 1139 for trunk/MagicSoft

Timestamp:

12/21/01 12:24:24 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• .rootrc (added)
• Changelog (modified) (1 diff)
• candrv/canopen.h (modified) ( previous)
• candrv/network.h (modified) (1 diff)
• candrv/nodedrv.cc (modified) (3 diffs)
• candrv/nodedrv.h (modified) (3 diffs)
• candrv/vmodican.h (modified) (1 diff)
• macros (added)
• macros/dohtml.C (added)
• macros/rootlogon.C (added)

trunk/MagicSoft/Cosy/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
 
+ 2001/12/21 - Thomas Bretz:
+ 
+   * candrv/*.cc:
+     - added comments
+
+   * .rootrc:
+     - added
+     
+   * Makefile:
+     - changed to create a shared object (for html docu)
+   
+   * macros/dohtml.C:
+     - added
+     
+   * macros/rootlogon.C:
+     - added
+   
+   * subdir lib:
+     - added
+  
  2001/12/12 - Thomas Bretz:
  

trunk/MagicSoft/Cosy/candrv/network.h

@@ -33 +33 @@
     bool HasError() const;
 
-    ClassDef(Network, 0)
+    ClassDef(Network, 0) // collection of nodes (nodedrv)
 };
 

trunk/MagicSoft/Cosy/candrv/nodedrv.cc

@@ -29 +29 @@
 // Base class for a class describing the interface for the CAN nodes.
 //
+// to be overloaded:
+//  virtual void InitDevice(Network *net)
+//  virtual void StopDevice()
+//  virtual void HandleSDO(WORD_t idx, BYTE_t subidx, LWORD_t val, struct timeval *tv)
+//  virtual void HandleSDOOK(WORD_t idx, BYTE_t subidx)
+//  virtual void HandleSDOError(LWORD_t data)
+//  virtual void HandlePDO1(BYTE_t *data, struct timeval *tv)
+//  virtual void HandlePDO2(BYTE_t *data, struct timeval *tv)
+//  virtual void HandlePDO3(BYTE_t *data, struct timeval *tv)
+//  virtual void HandlePDO4(BYTE_t *data, struct timeval *tv)
+//
 ///////////////////////////////////////////////////////////////////////
 #include "nodedrv.h"
@@ -47 +58 @@
 NodeDrv::NodeDrv(BYTE_t nodeid, const char *name, MLog &out) : Log(out), fNetwork(NULL), fId(32), fError(0)
 {
-    if (nodeid>31)
+    if (nodeid>0x1f)
     {
         cout << "SetNode - Error: Only node Numbers < 32 are allowed"<< endl;
@@ -60 +71 @@
     {
         fName = "Node#";
-        fName += nodeid;
+        fName += (int)nodeid;
     }
 }

trunk/MagicSoft/Cosy/candrv/nodedrv.h

@@ -1 +1 @@
 #ifndef NODEDRV_H
 #define NODEDRV_H
+
+#include <TString.h>
 
 #include "log.h"
@@ -36 +38 @@
     virtual ~NodeDrv();
 
-    BYTE_t   GetId() const       { return fId;   }
-    char    *GetNodeName() const { return fName; }
-    Network *GetNetwork()        { return fNetwork; }
+    BYTE_t      GetId() const       { return fId;   }
+    const char *GetNodeName() const { return fName; }
+    Network    *GetNetwork()        { return fNetwork; }
 
     virtual void InitDevice(Network *net);
@@ -83 +85 @@
     void EnableCanMsg(BYTE_t fcode);
 
-    ClassDef(NodeDrv, 0)
+    ClassDef(NodeDrv, 0) // base class for an object describing hardware
 };
 

trunk/MagicSoft/Cosy/candrv/vmodican.h

@@ -76 +76 @@
                       BYTE_t m4=0, BYTE_t m5=0, BYTE_t m6=0, BYTE_t m7=0);
 
-    ClassDef(VmodIcan, 0)
+    ClassDef(VmodIcan, 0) // hardware interface to the vmodican can module (Janz)
 };