diff --git a/sfy-buoy/sfy-ext-gps/ext-gps-mod/demo_gps.cpp b/sfy-buoy/sfy-ext-gps/ext-gps-mod/demo_gps.cpp index cf4ee06d..1bd42255 100644 --- a/sfy-buoy/sfy-ext-gps/ext-gps-mod/demo_gps.cpp +++ b/sfy-buoy/sfy-ext-gps/ext-gps-mod/demo_gps.cpp @@ -50,7 +50,7 @@ void setup_gps() { if (ok) ok = gnss.setI2CInput(COM_TYPE_UBX); if (ok) ok = gnss.setUART1Output(0); if (ok) ok = gnss.setUART1Input(0); - if (ok) ok = gnss.setNavigationFrequency(1); //Set output in Hz. + if (ok) ok = gnss.setNavigationFrequency(20); //Set output in Hz. Serial.print(F("GPS setup flag: ")); Serial.println(ok); @@ -61,8 +61,12 @@ void setup_gps() { void loop_gps() { // TODO: move these to PPS? - gnss.checkUblox(); - gnss.checkCallbacks(); + /* gnss.checkUblox(); */ + /* gnss.checkCallbacks(); */ + /* if (gnss.newdata()) { */ + /* data = gnss.getdata(); */ + /* getPVT(data); */ + /* } */ } @@ -71,8 +75,9 @@ void pps() { pps_ts = micros(); Serial.println("GNSS: PPS!"); + gnss.checkUblox(); + gnss.checkCallbacks(); - // TODO: checkUblox + checkCallbacks } # endif diff --git a/sfy-buoy/sfy-ext-gps/ext-gps-mod/ext-gps-mod.ino b/sfy-buoy/sfy-ext-gps/ext-gps-mod/ext-gps-mod.ino index 6d9acdc8..14acd197 100644 --- a/sfy-buoy/sfy-ext-gps/ext-gps-mod/ext-gps-mod.ino +++ b/sfy-buoy/sfy-ext-gps/ext-gps-mod/ext-gps-mod.ino @@ -4,7 +4,10 @@ // Serial to SFY // TX1: ~7 / 42 // RX1: ~8 / 38 -Uart sfy{1, 38, 42}; +// .. +// TX1: ~9 / 39 +// RX1: ~10 / 40 +Uart sfy{1, 40, 39}; void setup() { @@ -27,9 +30,17 @@ void setup() void loop() { + static int i = 0; + loop_gps(); Serial.print("."); - delay(50); + delay(100); + + JsonDocument doc; + doc["loop"] = i; + serializeJson(doc, sfy); + + i++; } void main_pps() {