Changeset 8856 for trunk/MagicSoft

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• Changelog (modified) (1 diff)
• candrv/ethernet.cc (modified) (2 diffs)
• candrv/ethernet.h (modified) (2 diffs)
• cosy.cc (modified) (1 diff)
• gui/MGCosy.cc (modified) (1 diff)
• main/MCosy.cc (modified) (1 diff)
• main/MStarguider.cc (modified) (12 diffs)
• tcpip/MCeCoCom.h (modified) (1 diff)
• tcpip/MTcpIpIO.cc (modified) (2 diffs)
• tcpip/MTcpIpIO.h (modified) (2 diffs)
• videodev/Camera.cc (modified) (1 diff)
• videodev/MVideo.cc (modified) (6 diffs)

trunk/MagicSoft/Cosy/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
 
+ 2008/02/05 Thomas Bretz (La Palma)
+
+   * cosy.cc:
+     - setup address and port in constructor of Ethernet
+
+   * candrv/ethernet.[h,cc]:
+     - added new data mebers fTxAddress and fTxPort
+     - get all io addresses in constructor
+
+   * gui/MGCosy.cc:
+     - switch off debug mode
+
+   * main/MCosy.cc, main/MStarguider.cc, videodev/Camera.cc:
+     - added missing stream manipulators
+
+   * tcpip/MCeCoCom.h:
+     - set address of CeCo in constructor of MTCpIpIO
+
+   * tcpip/MTcpIpIO.[h,cc]:
+     - moved setting of destination address into arguments of constructor
+
+   * videodev/MVideo.cc:
+     - tiny improfements to logging output
+
+
+
  2008/02/04 Thomas Bretz (La Palma)
 
-   * candrv/interface.[h,cc], candrv/ethernet.[h,cc]:
+   * candrv/interface.[h,cc], candrv/ethernet.[h,cc],
+     MIncl.h, MLinkDef.h:
      - added
+
+   * Makefile:
+     - removed readcam from list of programs
 
 

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();
 

trunk/MagicSoft/Cosy/cosy.cc

@@ -180 +180 @@
     MCosy *cosy = new MCosy();
 
-    Interface *interface = new Ethernet(cosy);
+    Interface *interface = new Ethernet("127.0.0.1", 5357, 5358, cosy);
     // Interface *interface = new VmodIcan(cosy, "/dev/dpm_00", 125);
 

trunk/MagicSoft/Cosy/gui/MGCosy.cc

@@ -35 +35 @@
 #include "SlaStars.h"
 
-#define DEBUG
-//#undef DEBUG
+//#define DEBUG
+#undef DEBUG
 //#define EXPERT
 //#define HAS_DEMO

trunk/MagicSoft/Cosy/main/MCosy.cc

@@ -549 +549 @@
     if (HasZombie())
     {
-        lout << "- Found Zombies in Network..." << endl;
+        gLog << warn << "- Found Zombies in Network..." << endl;
         if (!RebootZombies())
             return false;

trunk/MagicSoft/Cosy/main/MStarguider.cc

@@ -216 +216 @@
 
     TString disp=gVirtualX->DisplayName();
-    cout << "Display: " << disp << endl;
+    gLog << all << "Display: " << disp << endl;
     if (disp.First(':')>=0)
         disp=disp(0, disp.First(':'));
@@ -507 +507 @@
       fStatus(MDriveCom::kStandby)
 {
-    cout << " #### FIXME: Make MCaos Thread safe!" << endl;
+    gLog << warn << " #### FIXME: Make MCaos Thread safe!" << endl;
 
     // This means that all objects added with AddFrame are deleted
@@ -582 +582 @@
     delete fAmcSocket;
 
-    cout << "Camera Display destroyed." << endl;
+    gLog << inf2 << "Camera Display destroyed." << endl;
 }
 
@@ -596 +596 @@
     if (len<0)
     {
-        cout << "ERROR - Sending Trigger to Amc" << endl;
+        gLog << err << "ERROR - Sending Trigger to Amc" << endl;
         return false;
     }
     if (len!=txt.Length())
     {
-        cout << "Send wrong number (" << len << ") of Bytes to Amc." << endl;
+        gLog << err << "Send wrong number (" << len << ") of Bytes to Amc." << endl;
         return false;
     }
@@ -615 +615 @@
 void MStarguider::CloseWindow()
 {
-    cout << "EventDisplay::CloseWindow: Exit Application Loop." << endl;
+    gLog << inf2 << "EventDisplay::CloseWindow: Exit Application Loop." << endl;
 
     //fClient.ExitLoop();
@@ -817 +817 @@
                 {
                     const Float_t pixsize = atof(fPixSize->GetText());
-                    cout << "Pixel Size changed to " << pixsize << "\"/pix" << endl;
+                    gLog << all << "Pixel Size changed to " << pixsize << "\"/pix" << endl;
                     fSao->SetPixSize(pixsize);
                     return kTRUE;
@@ -824 +824 @@
                 {
                     const Float_t angle = atof(fAngle->GetText());
-                    cout << "Rotation Angle changed to " << angle << "deg" << endl;
+                    gLog << all << "Rotation Angle changed to " << angle << "deg" << endl;
                     fSao->SetRotationAngle(angle);
                     return kTRUE;
@@ -831 +831 @@
                 {
                     const Float_t cut = atof(fCut->GetText());
-                    cout << "Starguider cleaning level changed to " << cut << " sigma." << endl;
+                    gLog << all << "Starguider cleaning level changed to " << cut << " sigma." << endl;
                     return kTRUE;
                 }
@@ -1364 +1364 @@
     if (num < 3) //was 1
     {
-        cout << "Sorry, less than 3 detected spot in FOV!" << endl;
+        gLog << warn << "Sorry, less than 3 detected spot in FOV!" << endl;
         if (fStargTPoint->IsDown())
             fStargTPoint->SetDown(kFALSE);
@@ -1373 +1373 @@
     if (stars.GetRealEntries() < 3)
     {
-        cout << "Sorry, less than 3 stars in FOV!" << endl;
+        gLog << warn << "Sorry, less than 3 stars in FOV!" << endl;
         if (fStargTPoint->IsDown())
             fStargTPoint->SetDown(kFALSE);
@@ -1466 +1466 @@
         // open tpoint file
         const TString name = MCosy::GetFileName("tpoint", "starg", "txt");
-        cout << "TPoint-Starg File ********* " << name << " ********** " << endl;
+        gLog << all << "TPoint-Starg File ********* " << name << " ********** " << endl;
 
         fOutStargTp = new ofstream(name);
@@ -1579 +1579 @@
         {
             fTPoint->SetDown(kFALSE);
-            cout << "No star found. Couldn't take a tpoint." << endl;
+            gLog << warn << "No star found. Couldn't take a tpoint." << endl;
         }
         return ZdAz(.0,.0);

trunk/MagicSoft/Cosy/tcpip/MCeCoCom.h

@@ -49 +49 @@
 public:
     MCeCoCom(MLog *out)
-        : MTcpIpIO(7304, 7404), fOut(out), fStatus(0), fComStat(kNoCmdReceived),
+        : MTcpIpIO("ceco", 7304, 7404), fOut(out), fStatus(0), fComStat(kNoCmdReceived),
         fHumidity(0), fTemperature(0), fWindSpeed(0), fSolarRadiation(-1),
         fAlarmCounter(0)

trunk/MagicSoft/Cosy/tcpip/MTcpIpIO.cc

@@ -35 +35 @@
      */
 
-MTcpIpO::MTcpIpO(Int_t tx)
-{
-    fTxSocket = new TSocket("ceco", tx);
+MTcpIpO::MTcpIpO(const char *addr, Int_t tx)
+{
+    fTxSocket = new TSocket(addr, tx);
 }
 
@@ -46 +46 @@
 }
 
-MTcpIpIO::MTcpIpIO(Int_t tx, Int_t rx) : MTcpIpI(rx), MTcpIpO(tx)
+MTcpIpIO::MTcpIpIO(const char *addr, Int_t tx, Int_t rx) : MTcpIpI(rx), MTcpIpO(addr, tx)
 {
     RunThread();

trunk/MagicSoft/Cosy/tcpip/MTcpIpIO.h

@@ -37 +37 @@
 
 public:
-    MTcpIpO(Int_t tx);
+    MTcpIpO(const char *addr, Int_t tx);
     ~MTcpIpO();
 
@@ -53 +53 @@
 
 public:
-    MTcpIpIO(Int_t tx, Int_t rx);
+    MTcpIpIO(const char *addr, Int_t tx, Int_t rx);
     ~MTcpIpIO();
 

trunk/MagicSoft/Cosy/videodev/Camera.cc

@@ -102 +102 @@
     if (!fVideo->IsOpen())
     {
-        gLog << "ERROR - Process: Device not open." << endl;
+        gLog << err << "Camera::Thread: ERROR - Device not open." << endl;
         return kFALSE;
     }

trunk/MagicSoft/Cosy/videodev/MVideo.cc

@@ -104 +104 @@
                 return -4;
 
-            gLog << err << "ERROR - MVideo::Ioctl -ioctl returned rc=" << rc << " '";
-            gLog << strerror(errno) << "' (errno = " << errno << ")" << endl;
+            gLog << err << "ERROR - MVideo::Ioctl 0x" << hex << req << ": errno=" << dec << errno << " - ";
+            gLog << strerror(errno) << " (rc=" << rc << ")" << endl;
             usleep(10);
             continue;
         }
 
-        gLog << err << "ERROR - MVideo::Ioctl " << hex << req << ": errno=" << dec << errno << " - ";
+        gLog << err << "ERROR - MVideo::Ioctl 0x" << hex << req << ": errno=" << dec << errno << " - ";
         gLog << strerror(errno) << " (rc=" << rc << ")" << endl;
         return rc;
@@ -161 +161 @@
     }
 
-    gLog << all << "Opening " << fPath << "..." << flush;
+    gLog << all << "Opening " << fPath << "... " << flush;
     do
     {
@@ -171 +171 @@
     if (fFileDesc == -1)
     {
-        gLog << err << "ERROR!" << endl;
+        gLog << err << "ERROR: " << strerror(errno) << endl;
         return kFALSE;
     }
@@ -263 +263 @@
         fCaps.maxheight, fCaps.maxwidth, // height, width
         VIDEO_PALETTE_RGB24              // palette
+        //768, 576, 
+        //VIDEO_PALETTE_RGB555             // palette
     };
 
@@ -271 +273 @@
         return kTRUE;
 
-    if (errno == EAGAIN)
+//    if (errno == EAGAIN)
         gLog << err << "ERROR - Couldn't start capturing frame " << frame << " - unable to sync." << endl;
 
@@ -341 +343 @@
 
     memcpy(&fChannel, &ch, sizeof(fChannel));
+
+    gLog << all << "Switched to channel " << chan << endl;
 
     return kTRUE;