Colin Stearns
/
qcControl
QC Control software
Fork of dgps by
Diff: handle/handleGPS.cpp
- Revision:
- 51:d6b64ac3c30d
- Parent:
- 49:06721139d298
- Child:
- 64:d4818fb7813c
--- a/handle/handleGPS.cpp Sat Apr 26 04:26:48 2014 +0000 +++ b/handle/handleGPS.cpp Sat Apr 26 06:49:37 2014 +0000 @@ -17,7 +17,7 @@ } char GPSHandle::readWaypoints(){ - USB::getSerial().printf("getting waypoitns\r\n"); + //USB::getSerial().printf("getting waypoitns\r\n"); PacketStruct pack; char rx_status = getPS().receivePacket(&pack); if(rx_status != 1){ @@ -27,10 +27,10 @@ Point* points = (Point*)pack.data; unsigned int num_points = pack.size; for(int i=0;i<num_points;i++){ - USB::getSerial().printf("Adding Waypoint: %f, %f\r\n",points[i].lat,points[i].lon); + //USB::getSerial().printf("Adding Waypoint: %f, %f\r\n",points[i].lat,points[i].lon); DH::Locs().add(LHType_targ,DataLocation(points[i].lat,points[i].lon,6.0f)); } - USB::getSerial().printf("Waypoints size: %d\r\n",DH::Locs().getI(LHType_targ,LHIType_size)); + //USB::getSerial().printf("Waypoints size: %d\r\n",DH::Locs().getI(LHType_targ,LHIType_size)); for(int i=0;i<DH::Locs().getI(LHType_targ,LHIType_size);i++){ DataLocation thisData=DH::Locs().getC(LHType_targ,i); USB::getSerial().printf("Waypoint %d: %f,%f\r\n",i,thisData.getLat(),thisData.getLon()); @@ -119,7 +119,7 @@ latitude = degrees + minutes/60; degrees = (int)(longitude/100); minutes = longitude - degrees*100; - longitude = degrees + minutes/60; + longitude = -1*(degrees + minutes/60); USB::getSerial().printf("\nMy GPS data: Lat: %f, Lon: %f, Alt: %f, Time:%f\r\n",latitude,longitude,altitude,timeS); DH::Locs().add(LHType_locs,DataLocation(latitude,longitude,altitude,timeS)); // USB::getSerial().printf("Current Time:%f\r\n",DH::Locs().getC().getTime());