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

Timestamp:

01/09/18 11:43:37 (6 years ago)

Author:

Sanahuja Guillaume

Message:

m

Location:

trunk/lib/FlairSensorActuator/src

Files:

• NmeaGps.cpp (modified) (1 diff)
• SimuCamera.cpp (modified) (1 diff)
• SimuGps.cpp (modified) (3 diffs)
• SimuGps.h (modified) (1 diff)

trunk/lib/FlairSensorActuator/src/NmeaGps.cpp

@@ -176 +176 @@
 
   int result;
-//Printf("%s\n",frame);
+Printf("%s\n",frame);
+Printf("%x %x\n",&parser,parser.buffer);
   result = nmea_parse(&parser, frame, frame_size, &info);
+  Printf("%x %x\n",&parser,parser.buffer);
   if (result != 1) {
     Warn("unrecognized nmea sentence: %s\n",frame);
     return;
   }
-
+Printf("3\n");
+Printf("%x %x\n",&parser,parser.buffer);
   result = nmea_parse_GPGGA(frame, frame_size, &pack);
-
+Printf("%x %x\n",&parser,parser.buffer);
   if (result == 1) {
+    Printf("%x %x\n",&parser,parser.buffer);
     nmea_info2pos(&info, &pos);
-     
+     Printf("%x %x\n",&parser,parser.buffer);
    //  Printf("nb:%i fix:%i lat:%f long:%f alt:%f vel:%f angle:%f\n",pack.satinuse,pack.sig,info.lat,info.lon,info.elv,info.speed*1000./3600.,info.direction);
 //Printf("lat:%f long:%f\n",pos.lat,pos.lon);

trunk/lib/FlairSensorActuator/src/SimuCamera.cpp

@@ -97 +97 @@
                                                    // échange de pointeur sur
                                                    // double buffering
+                                            
     output->ReleaseMutex();
     memcpy(&time,shmemReadBuf+buf_size-sizeof(Time),sizeof(Time));

trunk/lib/FlairSensorActuator/src/SimuGps.cpp

@@ -48 +48 @@
   fixQuality = new SpinBox(GetGroupBox()->NewRow(), "fix quality", 1, 8, 1, 1);
   numberOfSatellites = new SpinBox(GetGroupBox()->NewRow(), "number of satellites", 1, 15, 1, 5);
-
+  magneticDeclination= new DoubleSpinBox(GetGroupBox()->NewRow(), "magnetic declination", " deg", -180, 180, .1, 2,0);
+  
   shmem = new SharedMem((Thread *)this, ShMemName(modelId, deviceId),
                         sizeof(gps_states_t));
@@ -152 +153 @@
 
     nmea_gen_GPGGA(buf,sizeof(buf),&gga);
+    Printf("1\n");
     parseFrame(buf,sizeof(buf));
 
@@ -157 +159 @@
     vtg.spk=sqrtf(state.ve*state.ve+state.vn*state.vn)*3600./1000.;
     nmea_gen_GPVTG(buf,sizeof(buf),&vtg);
+    Printf("2\n");
     parseFrame(buf,sizeof(buf));
   }

trunk/lib/FlairSensorActuator/src/SimuGps.h

@@ -99 +99 @@
   core::SharedMem *shmem;
   gui::SpinBox *dataRate,*fixQuality,*numberOfSatellites;
-  gui::DoubleSpinBox *latitudeRef,*longitudeRef,*altitudeRef;
+  gui::DoubleSpinBox *latitudeRef,*longitudeRef,*altitudeRef,*magneticDeclination;
 };
 } // end namespace sensor