Changeset 42 in flair-src for trunk/lib/FlairSensorActuator/src

Timestamp:

Jul 5, 2016, 8:50:58 AM (8 years ago)

Author:

Sanahuja Guillaume

Message:

m

Location:

trunk/lib/FlairSensorActuator/src

Files:

• Gps.cpp (modified) (1 diff)
• Mb800.cpp (modified) (5 diffs)
• TargetController.cpp (modified) (2 diffs)

trunk/lib/FlairSensorActuator/src/Gps.cpp

@@ -216 +216 @@
   result = nmea_parse(&parser, frame, frame_size, &info);
   if (result != 1) {
-    Warn("unrecognized nmea sentence\n");
-    Warn("%s\n", frame);
+    Warn("unrecognized nmea sentence: %s\n",frame);
   }
 

trunk/lib/FlairSensorActuator/src/Mb800.cpp

@@ -53 +53 @@
       Thread::Err("erreur Write (%s)\n", strerror(-written));
   }
-/*
+
   {
     char to_send[] = "$PASHS,CPD,AFP,95.0\r\n";
@@ -68 +68 @@
     }
   }
-*/
+
   if ((NMEAFlags & GGA) != 0) {
     char to_send[] = "$PASHS,NME,GGA,A,ON,0.05\r\n";
@@ -99 +99 @@
 
   while (!ToBeStopped()) {
-    //Printf("loop\n");
     SleepMS(10);
-    size = 0;/*
+    size = 0;
     while (!ToBeStopped()) {
       ssize_t read = serialport->Read(&response[size], 1);
@@ -111 +110 @@
         break;
       size++;
-    }*/
+    }
     size++;
-    //parseFrame(response, size);
+    parseFrame(response, size);
   }
   /** fin running loop **/
@@ -122 +121 @@
   char data = 0;
   ssize_t read = 0;
-Printf("sync\n");
+
   // attente fin trame
   while (data != 0x0a && !ToBeStopped()) {
     read = serialport->Read(&data, 1);
     SleepMS(10);
-    Printf("%i %x\n",read,data);
+
     if (read < 0) {
       Thread::Err("erreur Read (%s)\n", strerror(-read));

trunk/lib/FlairSensorActuator/src/TargetController.cpp

@@ -39 +39 @@
     TabWidget* tab=new TabWidget(main_tab->NewRow(),name);
     setup_tab=new Tab(tab,"Reglages");
-    SetPeriodMS(20);; //50Hz
 }
 
@@ -115 +114 @@
 
 void TargetController::Run() {
+  SetPeriodMS(20);; //50Hz
+
   Message *message;