Changeset 180 in flair-src for trunk/lib/FlairCore/src/GpsData.cpp
- Timestamp:
- 05/31/17 15:53:32 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/lib/FlairCore/src/GpsData.cpp
r51 r180 49 49 case GpsData::EastVelocity: 50 50 case GpsData::NorthVelocity: 51 case GpsData::Pdop: 52 case GpsData::Hdop: 53 case GpsData::Vdop: 51 54 size=4; 52 55 break; … … 62 65 void CopyData(char *dst) const { 63 66 double latitude,longitude; 64 float altitude,east,north,up,eastVelocity,northVelocity ;67 float altitude,east,north,up,eastVelocity,northVelocity,pDop,hDop,vDop; 65 68 66 69 gpsdata->GetLla(latitude,longitude,altitude); … … 69 72 gpsdata->GetEnu(east,north,up); 70 73 gpsdata->GetVelocity(eastVelocity,northVelocity); 74 gpsdata->GetDop(pDop,hDop,vDop); 71 75 72 76 switch (plotableData) { … … 100 104 case GpsData::NorthVelocity: 101 105 memcpy(dst, &northVelocity, sizeof(northVelocity)); 106 break; 107 case GpsData::Pdop: 108 memcpy(dst, &pDop, sizeof(pDop)); 109 break; 110 case GpsData::Hdop: 111 memcpy(dst, &hDop, sizeof(hDop)); 112 break; 113 case GpsData::Vdop: 114 memcpy(dst, &vDop, sizeof(vDop)); 102 115 break; 103 116 default: … … 119 132 case GpsData::EastVelocity: 120 133 case GpsData::NorthVelocity: 134 case GpsData::Pdop: 135 case GpsData::Hdop: 136 case GpsData::Vdop: 121 137 return floatType; 122 138 break; … … 150 166 AppendLogDescription("east velocity", floatType); 151 167 AppendLogDescription("north velocity", floatType); 168 AppendLogDescription("pdop", floatType); 169 AppendLogDescription("hdop", floatType); 170 AppendLogDescription("vdop", floatType); 152 171 153 172 numberOfSatellites=0; … … 220 239 } 221 240 241 void GpsData::GetDop(float &inPdop, float &inHdop,float &inVdop) const { 242 inPdop=pDop; 243 inHdop=hDop; 244 inVdop=vDop; 245 } 246 247 void GpsData::SetDop(float inPdop, float inHdop,float inVdop) { 248 pDop=inPdop; 249 hDop=inHdop; 250 vDop=inVdop; 251 } 252 222 253 IODataElement *GpsData::Element(PlotableData_t data_type) const { 223 254 string name; … … 252 283 case GpsData::NorthVelocity: 253 284 name = "NorthVelocity"; 285 break; 286 case GpsData::Pdop: 287 name = "Pdop"; 288 break; 289 case GpsData::Hdop: 290 name = "Hdop"; 291 break; 292 case GpsData::Vdop: 293 name = "Vdop"; 254 294 break; 255 295 } … … 271 311 Queue(&dst, &eastVelocity, sizeof(eastVelocity)); 272 312 Queue(&dst, &northVelocity, sizeof(northVelocity)); 313 Queue(&dst, &pDop, sizeof(pDop)); 314 Queue(&dst, &hDop, sizeof(hDop)); 315 Queue(&dst, &vDop, sizeof(vDop)); 273 316 274 317 ReleaseMutex();
Note:
See TracChangeset
for help on using the changeset viewer.