Use native gps library

.gitignore

@@ -117,3 +117,4 @@ ipch/
 :50003
 :50006
 .vscode/.cortex-debug.peripherals.state.json
+db_dump.txt

keil/B-L072Z-LRWAN1/loramac/periodic-uplink-lpp/periodic-uplink-lpp.uvprojx

@@ -528,6 +528,11 @@
               <FileType>1</FileType>
               <FilePath>..\..\..\..\src\boards\B-L072Z-LRWAN1\adc-board.c</FilePath>
             </File>
+            <File>
+              <FileName>gps-board.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\src\boards\B-L072Z-LRWAN1\gps-board.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -813,16 +818,6 @@
               <FileType>1</FileType>
               <FilePath>..\..\..\..\src\peripherals\LoRaWAN_config_switcher.c</FilePath>
             </File>
-            <File>
-              <FileName>SparkFun_Ublox_Arduino_Library.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\src\peripherals\SparkFun_Ublox_Arduino_Library.c</FilePath>
-            </File>
-            <File>
-              <FileName>ublox.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\src\peripherals\ublox.c</FilePath>
-            </File>
             <File>
               <FileName>playback.c</FileName>
               <FileType>1</FileType>
@@ -833,11 +828,6 @@
               <FileType>1</FileType>
               <FilePath>..\..\..\..\src\peripherals\struct.c</FilePath>
             </File>
-            <File>
-              <FileName>i2c_middleware.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\src\peripherals\i2c_middleware.c</FilePath>
-            </File>
             <File>
               <FileName>eeprom_settings_manager.c</FileName>
               <FileType>1</FileType>
@@ -928,6 +918,11 @@
               <FileType>1</FileType>
               <FilePath>..\..\..\..\src\system\adc.c</FilePath>
             </File>
+            <File>
+              <FileName>gps.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\src\system\gps.c</FilePath>
+            </File>
           </Files>
         </Group>
       </Groups>

src/apps/LoRaMac/common/callbacks.c

@@ -18,7 +18,6 @@
 #include <stdlib.h>
 #include "NvmDataMgmt.h"
 #include "string.h"
-#include "ublox.h"
 #include "soft-se-hal.h"
 #include "nvmm.h"
 #include "struct.h"
@@ -40,8 +39,10 @@ void OnNvmDataChange(LmHandlerNvmContextStates_t state, uint16_t size)
     DisplayNvmDataChange(state, size);
 
     /**
-     * @brief This is the last event in a Class A transmission, as the last
+     * @brief Only turn back on the GPS during the Store function call. This is the last
+     * event in a Class A transmission, so its now safe to turn back on the GPS. The last 
      * RX window has closed by now.
+     * 
      */
     if (state == LORAMAC_HANDLER_NVM_STORE)
     {

src/apps/LoRaMac/periodic-uplink-lpp/B-L072Z-LRWAN1/main.c

@@ -28,7 +28,6 @@
 #include "Commissioning.h"
 
 #include "config.h"
-#include "ublox.h"
 #include "geofence.h"
 #include "iwdg.h"
 #include "print_utils.h"
@@ -244,6 +243,7 @@ static void PrepareTxFrame( void )
         return;
     }
 
+    tx_count_on_this_credential ++;
     sensor_read_and_send( &AppData, LmHandlerParams.Region );
     uint32_t interval = read_tx_interval_in_eeprom( TX_INTERVAL_EEPROM_ADDRESS,
                                                     TX_INTERVAL_GPS_FIX_OK );

src/boards/B-L072Z-LRWAN1/board-config.h

@@ -72,7 +72,6 @@ extern "C"
 #define LED_3                                       PB_6
 #define LED_4                                       PB_7
 #define GPS_INT                                     PB_13
-#define LOAD_ENABLE                                 PA_11
 
 #define LED_GREEN                                   LED_1
 #define LED_RED1                                    LED_2
@@ -93,8 +92,13 @@ extern "C"
 #define I2C_SCL                                     PB_8
 #define I2C_SDA                                     PB_9
 
-#define UART_TX                                     PA_9
-#define UART_RX                                     PA_10
+#define GPS_POWER_ON                                PA_11
+#define GPS_PPS                                     PB_14
+#define GPS_UART_TX                                 PA_2
+#define GPS_UART_RX                                 PA_3
+
+#define UART1_TX                                    PA_9
+#define UART1_RX                                    PA_10
 
 // Debug pins definition.
 #define RADIO_DBG_PIN_TX                            PB_13

src/boards/B-L072Z-LRWAN1/board.c

@@ -41,6 +41,7 @@
 #include "delay.h"
 #include "iwdg.h"
 #include "string.h"
+#include "gps.h"
 
 #include "stm32l0xx_ll_adc.h"
 
@@ -63,7 +64,6 @@
 Gpio_t Led1;
 
 Gpio_t Gps_int;
-Gpio_t Load_enable;
 
 Gpio_t i2c_scl;
 Gpio_t i2c_sda;
@@ -72,6 +72,7 @@ Gpio_t i2c_sda;
  * MCU objects
  */
 Uart_t Uart1;
+Uart_t Uart2;
 I2c_t I2c;
 Adc_t Adc;
 
@@ -101,7 +102,6 @@ static void CalibrateSystemWakeupTime( void );
  */
 static void SystemClockReConfig( void );
 
-
 /*!
  * Timer used at first boot to calibrate the SystemWakeupTime
  */
@@ -121,7 +121,7 @@ static bool UsbIsConnected = false;
  * UART1 FIFO buffers size
  */
 #define UART1_FIFO_TX_SIZE                                1024
-#define UART1_FIFO_RX_SIZE                                50  // We should hardly expect any rx data at all. Max 2-3 bytes
+#define UART1_FIFO_RX_SIZE                                1024  // We should hardly expect any rx data at all. Max 2-3 bytes
 
 uint8_t Uart1TxBuffer[UART1_FIFO_TX_SIZE];
 uint8_t Uart1RxBuffer[UART1_FIFO_RX_SIZE];
@@ -153,6 +153,8 @@ void BoardCriticalSectionEnd( uint32_t *mask )
 
 void BoardInitPeriph( void )
 {
+
+    GpsInit( );
     BSP_sensor_Init();
 }
 
@@ -171,7 +173,6 @@ void BoardInitMcu( void )
         GpioInit( &Led1, LED_1, PIN_OUTPUT, PIN_PUSH_PULL, PIN_NO_PULL, 1 );
 
         // Load enable for sensors, GPS
-        GpioInit( &Load_enable, LOAD_ENABLE, PIN_OUTPUT, PIN_PUSH_PULL, PIN_NO_PULL, 1 );
         SystemClockConfig( );
 
 #if DEEP_SLEEP_ENABLE
@@ -182,9 +183,11 @@ void BoardInitMcu( void )
 
         FifoInit( &Uart1.FifoTx, Uart1TxBuffer, UART1_FIFO_TX_SIZE );
         FifoInit( &Uart1.FifoRx, Uart1RxBuffer, UART1_FIFO_RX_SIZE );
+        Uart1.IrqNotify = HostMcuIrqNotify;
+
         // Configure your terminal for 8 Bits data (7 data bit + 1 parity bit), no parity and no flow ctrl
-        UartInit( &Uart1, UART_1, UART_TX, UART_RX );
-        UartConfig( &Uart1, RX_TX, 2000000, UART_8_BIT, UART_1_STOP_BIT, NO_PARITY, NO_FLOW_CTRL );
+        UartInit( &Uart1, UART_1, UART1_TX, UART1_RX );
+        UartConfig( &Uart1, RX_TX, 9600, UART_8_BIT, UART_1_STOP_BIT, NO_PARITY, NO_FLOW_CTRL );
 
         I2cInit( &I2c, I2C_1, I2C_SCL, I2C_SDA );
 
@@ -546,3 +549,15 @@ void assert_failed( uint8_t* file, uint32_t line )
     }
 }
 #endif
+
+void HostMcuIrqNotify(UartNotifyId_t id)
+{
+    uint8_t data;
+    if (id == UART_NOTIFY_RX)
+    {
+        if (UartGetChar(&Uart1, &data) == 0)
+        {
+            UartPutChar(&Uart2, data);
+        }
+    }
+}

src/boards/B-L072Z-LRWAN1/gps-board.c

@@ -0,0 +1,160 @@
+/*!
+ * \file      gps-board.c
+ *
+ * \brief     Target board GPS driver implementation
+ *
+ * \copyright Revised BSD License, see section \ref LICENSE.
+ *
+ * \code
+ *                ______                              _
+ *               / _____)             _              | |
+ *              ( (____  _____ ____ _| |_ _____  ____| |__
+ *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
+ *               _____) ) ____| | | || |_| ____( (___| | | |
+ *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
+ *              (C)2013-2017 Semtech
+ *
+ * \endcode
+ *
+ * \author    Miguel Luis ( Semtech )
+ *
+ * \author    Gregory Cristian ( Semtech )
+ */
+#include "board-config.h"
+#include "board.h"
+#include "gpio.h"
+#include "gps.h"
+#include "uart.h"
+#include "lpm-board.h"
+#include "rtc-board.h"
+#include "gps-board.h"
+#include "delay.h"
+
+/*!
+ * FIFO buffers size
+ */
+#define FIFO_TX_SIZE                                128
+#define FIFO_RX_SIZE                                128
+
+static uint8_t TxBuffer[FIFO_TX_SIZE];
+static uint8_t RxBuffer[FIFO_RX_SIZE];
+
+/*!
+ * \brief Buffer holding the  raw data received from the gps
+ */
+static uint8_t NmeaString[128];
+
+/*!
+ * \brief Maximum number of data byte that we will accept from the GPS
+ */
+static volatile uint8_t NmeaStringSize = 0;
+
+static Gpio_t GpsPowerEn;
+static Gpio_t GpsPps;
+
+static volatile bool GpsPowerEnInverted = true;
+
+extern Uart_t Uart2;
+extern Uart_t Uart1;
+
+void GpsMcuOnPpsSignal( void* context )
+{
+    bool parseData = true;
+
+    // GpsPpsHandler( &parseData );
+
+    if( parseData == true )
+    {
+        // Disables lowest power modes
+        // LpmSetStopMode( LPM_GPS_ID , LPM_DISABLE );
+
+
+    }
+}
+
+void GpsMcuInvertPpsTrigger( void )
+{
+
+}
+#define STRING_SIZE 28
+uint8_t ubxOnlyString[STRING_SIZE] = {0xB5, 0x62, 0x06, 0x00, 0x14, 0x00, 0x01, 0x00, 0x00, 0x00, 0xD0, 0x08, 0x00, 0x00, 0x80, 0x25, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9A, 0x79};
+
+void GpsMcuInit( void )
+{
+    NmeaStringSize = 0;
+
+    GpioInit( &GpsPowerEn, GPS_POWER_ON, PIN_OUTPUT, PIN_PUSH_PULL, PIN_NO_PULL, 1 );
+
+    GpioInit( &GpsPps, GPS_PPS, PIN_INPUT, PIN_PUSH_PULL, PIN_NO_PULL, 0 );
+    GpioSetInterrupt( &GpsPps, IRQ_FALLING_EDGE, IRQ_VERY_LOW_PRIORITY, &GpsMcuOnPpsSignal );
+
+    FifoInit( &Uart2.FifoRx, RxBuffer, FIFO_RX_SIZE );
+    FifoInit( &Uart2.FifoTx, TxBuffer, FIFO_TX_SIZE );
+    Uart2.IrqNotify = GpsMcuIrqNotify;
+
+    UartInit( &Uart2, UART_2, GPS_UART_TX, GPS_UART_RX );
+    UartConfig( &Uart2, RX_TX, 9600, UART_8_BIT, UART_1_STOP_BIT, NO_PARITY, NO_FLOW_CTRL );
+    GpsMcuStart( );
+
+    DelayMs(1000);
+
+    while (UartPutBuffer(&Uart2, (uint8_t *)ubxOnlyString, (uint16_t)STRING_SIZE) != 0)
+    {
+    };
+}
+
+void GpsMcuStart( void )
+{
+    if( GpsPowerEnInverted == true )
+    {
+        GpioWrite( &GpsPowerEn, 0 );    // power up the GPS
+    }
+    else
+    {
+        GpioWrite( &GpsPowerEn, 1 );    // power up the GPS
+    }
+}
+
+void GpsMcuStop( void )
+{
+    if( GpsPowerEnInverted == true )
+    {
+        GpioWrite( &GpsPowerEn, 1 );    // power down the GPS
+    }
+    else
+    {
+        GpioWrite( &GpsPowerEn, 0 );    // power down the GPS
+    }
+}
+
+void GpsMcuProcess( void )
+{
+
+}
+
+void GpsMcuIrqNotify( UartNotifyId_t id )
+{
+    uint8_t data;
+    if( id == UART_NOTIFY_RX )
+    {
+        if( UartGetChar( &Uart2, &data ) == 0 )
+        {
+            UartPutChar( &Uart1, data );
+            if( ( data == '$' ) || ( NmeaStringSize >= 127 ) )
+            {
+                NmeaStringSize = 0;
+            }
+
+            NmeaString[NmeaStringSize++] = ( int8_t )data;
+
+            if( data == '\n' )
+            {
+                NmeaString[NmeaStringSize++] = '\0';
+                GpsParseGpsData( ( int8_t* )NmeaString, NmeaStringSize );
+                // UartDeInit( &Uart2 );
+                // Enables lowest power modes
+                // LpmSetStopMode( LPM_GPS_ID , LPM_ENABLE );
+            }
+        }
+    }
+}