GPS - Fix TwoWire not being passed properly

Author: brentru

src/Wippersnapper_demo.ino.cpp

@@ -0,0 +1,21 @@
+# 1 "/var/folders/ff/dmzflvf52tq9kzvt6g8jglxw0000gn/T/tmp5gn0ambf"
+#include <Arduino.h>
+# 1 "/Users/brentrubell/Documents/Arduino/libraries/Adafruit_Wippersnapper_Arduino/src/Wippersnapper_demo.ino"
+# 11 "/Users/brentrubell/Documents/Arduino/libraries/Adafruit_Wippersnapper_Arduino/src/Wippersnapper_demo.ino"
+#include "ws_adapters.h"
+ws_adapter_wifi wipper;
+
+
+#define WS_DEBUG
+void setup();
+void loop();
+#line 17 "/Users/brentrubell/Documents/Arduino/libraries/Adafruit_Wippersnapper_Arduino/src/Wippersnapper_demo.ino"
+void setup() {
+  Serial.begin(115200);
+  while (!Serial)
+    delay(10);
+  wipper.provision();
+  wipper.connect();
+}
+
+void loop() { wipper.run(); }

src/components/gps/controller.cpp

@@ -92,6 +92,8 @@ bool GPSController::AddGPS(HardwareSerial *serial,
     delete gps_hw;
     return false;
   }
+  // Required - let the GPS spit out its initial data
+  delay(1000);
 
   if (!gps_hw->Handle_GPSConfig(gps_config)) {
     WS_DEBUG_PRINTLN("[gps] ERROR: Failed to configure GPS!");

src/components/gps/hardware.cpp

@@ -71,7 +71,7 @@ bool GPSHardware::Handle_GPSConfig(wippersnapper_gps_GPSConfig *gps_config) {
         // Flush the RX/TX buffers before sending
         _hw_serial->flush();
         while (_hw_serial->available() > 0) {
-            _hw_serial->read();
+          _hw_serial->read();
         }
       }
       WS_DEBUG_PRINT("[gps] Sending command to MediaTek GPS: ");
@@ -80,7 +80,8 @@ bool GPSHardware::Handle_GPSConfig(wippersnapper_gps_GPSConfig *gps_config) {
       _ada_gps->sendCommand(gps_config->commands[i]);
       WS_DEBUG_PRINTLN("[gps] Command sent, waiting for response...");
       // and wait for the corresponding response from the GPS module
-      if (! _ada_gps->waitForSentence(msg_resp)) {
+      if (!_ada_gps->waitForSentence(
+              "$PMTK705,AXN_5.1.7_3333_19020118,0027,PA1010D,1.0*76")) {
         WS_DEBUG_PRINT("[gps] ERROR: Failed to get response | cmd:");
         WS_DEBUG_PRINTLN(gps_config->commands[i]);
         return false;
@@ -179,16 +180,13 @@ bool GPSHardware::QueryModuleType() {
     if (_addr == PA1010D_I2C_ADDRESS) {
       WS_DEBUG_PRINT("[gps] Attempting to use PA1010D driver...");
       // Attempt to use Adafruit_GPS I2c interface
-      _ada_gps = new Adafruit_GPS(_hw_serial);
-      if (! _ada_gps->begin(_addr)) {
+      _ada_gps = new Adafruit_GPS(_wire);
+      if (!_ada_gps->begin(_addr)) {
         WS_DEBUG_PRINTLN("[gps] ERROR: Failed to initialize Mediatek!");
         return false;
       }
       WS_DEBUG_PRINTLN("ok!");
       _driver_type = GPS_DRV_MTK;
-      WS_DEBUG_PRINT("sending RMCGGA...");
-      _ada_gps->sendCommand(PMTK_SET_NMEA_OUTPUT_RMCGGA);
-      WS_DEBUG_PRINTLN("Sent command!");
       return true;
     } else {
       WS_DEBUG_PRINTLN(

src/components/i2c/controller.cpp

@@ -967,8 +967,6 @@ bool I2cController::Handle_I2cDeviceAddOrReplace(pb_istream_t *stream) {
     WS_DEBUG_PRINTLN("OK!");
   } else if (is_gps) {
     WS_DEBUG_PRINT("[i2c] Creating a GPS driver...");
-    // TODO: You were here!
-    // bool GPSController::AddGPS(TwoWire *wire, uint32_t i2c_addr, wippersnapper_gps_GPSConfig *gps_config) {
     if (!WsV2._gps_controller->AddGPS(bus, device_descriptor.i2c_device_address, &_i2c_model->GetI2cDeviceAddOrReplaceMsg()->gps_config)) {
       did_init = false;
       WS_DEBUG_PRINTLN("FAILURE!");