From 95b9865313ecdd097b67ee5b5ce50687233487ab Mon Sep 17 00:00:00 2001 From: tteague Date: Tue, 18 Feb 2020 14:06:15 -0600 Subject: [PATCH] Updated payload to work with Cargo (#6) --- GPS/GPS.ino | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/GPS/GPS.ino b/GPS/GPS.ino index 293cfe9..8565f61 100644 --- a/GPS/GPS.ino +++ b/GPS/GPS.ino @@ -218,27 +218,25 @@ void do_send(osjob_t* j){ } if (GPS.fix) { - Serial.println(GPS.latitudeDegrees); - Serial.println(GPS.longitudeDegrees); - Serial.println(GPS.altitude + 0.5); - // decimal degree format and getting 7 decimals - data = (int)(GPS.latitude_fixed * (GPS.lat == 'N' ? 1 : -1) + 90 * 1E7); - payload[idx++] = data >> 24; - payload[idx++] = data >> 16; - payload[idx++] = data >> 8; - payload[idx++] = data; - // decimal degree format and getting 7 decimals - data = (int)(GPS.longitude_fixed * (GPS.lon == 'E' ? 1 : -1) + 180 * 1E7); - payload[idx++] = data >> 24; - payload[idx++] = data >> 16; - payload[idx++] = data >> 8; - payload[idx++] = data; - data = (int)(GPS.altitude + 0.5); // round the value - payload[idx++] = data >> 8; - payload[idx++] = data; - data = (int)(GPS.speed * 1E2); //getting 2 decimals - payload[idx++] = data >> 8; - payload[idx++] = data; + Serial.println(GPS.latitudeDegrees); + Serial.println(GPS.longitudeDegrees); + Serial.println(GPS.altitude + 0.5); + data = (int)(GPS.latitudeDegrees * 1E7); + payload[idx++] = data >> 24; + payload[idx++] = data >> 16; + payload[idx++] = data >> 8; + payload[idx++] = data; + data = (int)(GPS.longitudeDegrees * 1E7); + payload[idx++] = data >> 24; + payload[idx++] = data >> 16; + payload[idx++] = data >> 8; + payload[idx++] = data; + data = (int)(GPS.altitude + 0.5); + payload[idx++] = data >> 8; + payload[idx++] = data; + data = (int)(GPS.speed); + payload[idx++] = data >> 8; + payload[idx++] = data; } else { for (idx=0; idx<12; idx++) { payload[idx] = 0;