Changeset 8856 for trunk/MagicSoft/Cosy/candrv

Timestamp:

02/05/08 11:41:55 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/candrv

Files:

• ethernet.cc (modified) (2 diffs)
• ethernet.h (modified) (2 diffs)

trunk/MagicSoft/Cosy/candrv/ethernet.cc

@@ -53 +53 @@
 //  and switch the can bus communication on
 //
-Ethernet::Ethernet(CanOpen *rx) : MTcpIpI(5358), Interface(rx)
+Ethernet::Ethernet(const char *addr, const int tx, const int rx, CanOpen *receiver)
+    : MTcpIpI(rx), Interface(receiver), fTxAddress(addr), fTxPort(tx)
 {
     gLog << inf2 << "- Ethernet initialized." << endl;
@@ -191 +192 @@
     */
 
+    // FIXME: MUST BECOME NON-BLOCKING!!!!!
     cout << "*** Send CanFrame over IP" << endl;
-
-    // MUST BECOME NON-BLOCKING!!!!!
-
-//    MTcpIpO::SendFrame("192.168.0.2", 5357, (char*)(msg.data+1), msg.len-1);
-    MTcpIpO::SendFrame("192.168.1.1", 5357, (char*)(msg.data+1), msg.len-1);
+    // FIXME: MUST BECOME NON-BLOCKING!!!!!
+
+    MTcpIpO::SendFrame(fTxAddress, fTxPort, (char*)(msg.data+1), msg.len-1);
 
     /*

trunk/MagicSoft/Cosy/candrv/ethernet.h

@@ -13 +13 @@
 {
 private:
+    TString fTxAddress;
+    Int_t   fTxPort;
+
     // Send interface based on MTcpIpI
     void ReadSocket(TSocket &rx);
@@ -21 +24 @@
 
 public:
-    Ethernet(CanOpen *rx);
+    Ethernet(const char *addr, const int tx, const int rx, CanOpen *receiver);
     virtual ~Ethernet();