Changeset 1266

Timestamp:

04/04/02 13:17:33 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft

Files:

• Cosy/Changelog (modified) (1 diff)
• Cosy/base/msgqueue.cc (modified) (3 diffs)
• Cosy/candrv/canopen.cc (modified) (1 diff)
• Cosy/candrv/network.cc (modified) (2 diffs)
• Cosy/candrv/nodedrv.cc (modified) (1 diff)
• Cosy/candrv/vmodican.cc (modified) (4 diffs)
• Cosy/cosy.cc (modified) (3 diffs)
• Cosy/videodev/Camera.cc (modified) (1 diff)
• Cosy/videodev/Camera.h (modified) (1 diff)
• Mars/Changelog (modified) (1 diff)
• Mars/mbase/MLog.cc (modified) (1 diff)

trunk/MagicSoft/Cosy/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+
+ 2002/04/04 - Thomas Bretz:
+ 
+   * cosy.cc:
+     - redirected logging output also to screen
+
+   * base/msgqueue.cc:
+     - qualified void-pointer in delete-statements
+
+   * candrv/canopen.cc, candrv/vmodican.cc, candrv/network.cc:
+     - added some more output
+
+   * candrv/vmodican.cc:
+     - added a more informative ouput in case of open fails and exit
+
+   * videodev/Camera.cc:
+     - qualified return value of mmap
+
+
 
  2001/12/21 - Thomas Bretz:

trunk/MagicSoft/Cosy/base/msgqueue.cc

@@ -3 +3 @@
 #include <iostream.h>
 
+#include <unistd.h>        // usleep
 #include <sys/resource.h>  // PRIO_PROCESS
 
@@ -14 +15 @@
 {
     pthread_cancel(fThread);
-    delete fMp;
+    delete (unsigned char*)fMp;
 }
 
@@ -87 +88 @@
     fMsg = msg;
 
-    delete fMp;
+    delete (unsigned char*)fMp;
     fMp = new unsigned char[size];
 

trunk/MagicSoft/Cosy/candrv/canopen.cc

@@ -51 +51 @@
             pthread_mutex_lock(&fPdoMux[i][j]);
         }
+
+    lout << "- CanOpen initialized." << endl;
 }
 

trunk/MagicSoft/Cosy/candrv/network.cc

@@ -74 +74 @@
     for (int i=0; i<32; i++)
         fNodes[i] = NULL;
+
+    lout << "- Network initialized." << endl;
 }
 
@@ -233 +235 @@
         if (fNodes[i])
         {
-            lout << "- Initializing Node #" << dec << i << endl;
+            lout << "- Setting up Node #" << dec << i << endl;
             fNodes[i]->InitDevice(this);
             fNodeInitialized[i] = TRUE;
         }
-    lout << "- All Nodes initialized." << endl;
+    lout << "- All Nodes setup." << endl;
 }
 

trunk/MagicSoft/Cosy/candrv/nodedrv.cc

@@ -73 +73 @@
         fName += (int)nodeid;
     }
+
+    lout << "- Node #" << nodeid << " (" << name << ") initialized." << endl;
 }
 

trunk/MagicSoft/Cosy/candrv/vmodican.cc

@@ -39 +39 @@
 #include <unistd.h>        // read
 #include <pthread.h>       // pthread_create
+#include <sys/time.h>      // gettimeofday
 #include <sys/ioctl.h>     // ioctl
 #include <sys/resource.h>  // PRIO_PROCESS
@@ -592 +593 @@
     {
         lout << "Error: Opening device '" << devname << "' (rc=" << fd << ")" << endl;
+        lout << strerror(errno) << endl;
         return FALSE;
     }
 
-    lout << "- Device " << devname << " open." << endl;
+    lout << "- Device " << devname << " #" << fd << " open." << endl;
 
     return TRUE;
@@ -921 +923 @@
     Detach();
 
-    Open(dev);                         // open module
+    if (!Open(dev))
+    {
+        cout << "Cannot open device '" << dev << "'... exit." << endl;
+        cout << strerror(errno) << endl;
+        exit(1);                       // open module
+    }
     Reset();
     EnableFifo();                      // connect to host (in interrupt mode)
@@ -931 +938 @@
      EnableFastCan(50, 50);
      SetTermination(0);
-    */
+     */
+
+    lout << "- VmodIcan initialized." << endl;
+
 }
 

trunk/MagicSoft/Cosy/cosy.cc

@@ -12 +12 @@
 
 #define clog(txt) \
-    lout << edev(MLog::eStdout) << txt << endl << ddev(MLog::eStdout)
+    { \
+    const Bool_t is = lout.IsOutputDeviceEnabled(MLog::eStdout); \
+    lout << edev(MLog::eStdout) << txt << endl; \
+    if (is) \
+    lout.EnableOutputDevice(MLog::eStdout); \
+    }
 
 int main(int argc, char **argv)
@@ -23 +28 @@
     //
     MLog lout("log/cosy.log", kTRUE);
+    lout.EnableOutputDevice(MLog::eStdout);
 
     clog("Starting Cosy at " << time.GetTimeStr() << " ...");
@@ -37 +43 @@
     // Create the Network. Device: /dev/dpm_00, Rate: 500kbps
     //
+    clog("- Constructing MCosy.");
     MCosy *cosy = new MCosy("/dev/dpm_00", 500, lout);
+
+    clog("- Starting MCosy.");
     cosy->Start();
 

trunk/MagicSoft/Cosy/videodev/Camera.cc

@@ -154 +154 @@
     // map file (device) into memory
     //
-    pMapBuffer = mmap(0, iBufferSize, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
+    pMapBuffer = (char*)mmap(0, iBufferSize, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
 
     if ((int)pMapBuffer == -1)

trunk/MagicSoft/Cosy/videodev/Camera.h

@@ -10 +10 @@
 #include <TROOT.h>
 #include <pthread.h>
+#include <unistd.h>
 #include <sys/time.h>
 #endif

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+
+ 2002/04/04: Thomas Bretz
+
+   * mbase/MLog.cc:
+     - stripped last character (CR) from output redirected to GUI    
+
+
 
  2002/03/21: Thomas Bretz

trunk/MagicSoft/Mars/mbase/MLog.cc

@@ -142 +142 @@
     if (fDevice&eGui && fgui)
     {
-        char *dummy = new char[len+1];
-        memcpy(dummy, fBase, len);
-        *(dummy+len)='\0';
+        char *dummy = new char[len];
+        memcpy(dummy, fBase, len-1);
+        *(dummy+len-1)='\0';
         fgui->AddEntry(dummy, fGuiLineId);
         fgui->SetTopEntry(fGuiLineId++);