Use interrupt driven GPS polling

.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

@@ -337,7 +337,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>USE_HAL_DRIVER STM32L072xx REGION_AS923 REGION_AU915 REGION_CN470 REGION_EU868 REGION_KR920 REGION_IN865 REGION_US915 REGION_RU864 LORAMAC_CLASSB_ENABLED USE_RADIO_DEBUG SOFT_SE</Define>
+              <Define>USE_HAL_DRIVER STM32L072xx REGION_AS923 REGION_AU915 REGION_CN470 REGION_EU868 REGION_KR920 REGION_IN865 REGION_US915 REGION_RU864 LORAMAC_CLASSB_ENABLED USE_RADIO_DEBUG SOFT_SE HARD_FAULT_HANDLER_ENABLED</Define>
               <Undefine></Undefine>
               <IncludePath>..\..\..\..\src;..\..\..\..\src\apps\LoRaMac\periodic-uplink-lpp\B-L072Z-LRWAN1;..\..\..\..\src\apps\LoRaMac\common;..\..\..\..\src\apps\LoRaMac\common\LmHandler;..\..\..\..\src\apps\LoRaMac\common\LmHandler\packages;..\..\..\..\src\boards;..\..\..\..\src\boards\B-L072Z-LRWAN1;..\..\..\..\src\boards\B-L072Z-LRWAN1\cmsis;..\..\..\..\src\boards\mcu\stm32;..\..\..\..\src\boards\mcu\stm32\cmsis;..\..\..\..\src\boards\mcu\stm32\STM32L0xx_HAL_Driver\inc;..\..\..\..\src\apps\LoRaMac\common;..\..\..\..\src\mac;..\..\..\..\src\mac\region;..\..\..\..\src\peripherals;..\..\..\..\src\peripherals\soft-se;..\..\..\..\src\radio;..\..\..\..\src\system;..\..\..\..\src\system\crypto</IncludePath>
             </VariousControls>
@@ -528,6 +528,21 @@
               <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>
+            <File>
+              <FileName>sysIrqHandlers.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\src\boards\B-L072Z-LRWAN1\sysIrqHandlers.c</FilePath>
+            </File>
+            <File>
+              <FileName>hard_fault_handler.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>..\..\..\..\src\boards\B-L072Z-LRWAN1\hard_fault_handler.s</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -813,16 +828,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>
@@ -834,14 +839,14 @@
               <FilePath>..\..\..\..\src\peripherals\struct.c</FilePath>
             </File>
             <File>
-              <FileName>i2c_middleware.c</FileName>
+              <FileName>eeprom_settings_manager.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\src\peripherals\i2c_middleware.c</FilePath>
+              <FilePath>..\..\..\..\src\peripherals\eeprom_settings_manager.c</FilePath>
             </File>
             <File>
-              <FileName>eeprom_settings_manager.c</FileName>
+              <FileName>ublox.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\src\peripherals\eeprom_settings_manager.c</FilePath>
+              <FilePath>..\..\..\..\src\peripherals\ublox.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -928,6 +933,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,19 +39,14 @@ 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)
     {
         tx_count_on_this_credential++;
-#if GPS_ENABLED
-        /**
-         * Setup GPS again after all radio events(TX, RX) are complete,
-         * just in case the GPS lost power during radio transmissions.
-         */
-        setup_GPS();
-#endif
     }
 }
 
@@ -225,8 +219,8 @@ void OnRxData(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params)
         printf("Received data to WIPE EEPROM:  ");
         print_bytes(appData->Buffer, appData->BufferSize);
 
-        uint32_t start = extractLong_from_buff(0, appData->Buffer);
-        uint32_t end = extractLong_from_buff(4, appData->Buffer);
+        uint32_t start = extractLong(0, appData->Buffer);
+        uint32_t end = extractLong(4, appData->Buffer);
 
         IWDG_reset();
         EEPROM_Wipe(start, end);

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"
@@ -38,6 +37,7 @@
 #include "message_sender.h"
 #include "eeprom_settings_manager.h"
 #include "nvmm.h"
+#include "ublox.h"
 
 #ifdef UNITTESTING_LORA
 #include "rtc_mock.h"
@@ -63,17 +63,29 @@ static LmHandlerAppData_t AppData =
  */
 static TimerEvent_t TxTimer;
 
+/*!
+ * Timer to handle the state of GpsChecker
+ */
+static TimerEvent_t GpsCheckerTimer;
+
 static void OnMacProcessNotify( void );
 static void timer_init( void );
 static void UplinkProcess( void );
 static void transmit_n_times_on_this_credential( void );
 static void setup_next_tx_alarm( uint32_t interval );
+static void GpsProcess( void );
 
 /*!
  * Function executed on TxTimer event
  */
 static void OnTxTimerEvent( void* context );
 
+/*!
+ * Function executed when its time to check GPS
+ */
+static void OnGpsCheckerTimerEvent( void* context );
+
+
 static LmHandlerCallbacks_t LmHandlerCallbacks =
 {
     .GetBatteryLevel = BoardGetBatteryLevel,
@@ -120,6 +132,7 @@ static volatile uint8_t IsMacProcessPending = 0;
 
 static volatile uint8_t IsTxFramePending = 0;
 
+static volatile uint8_t IsGpsCheckPending = 0;
 /*!
  * UART object used for command line interface handling
  */
@@ -145,6 +158,10 @@ int main( void )
     printf( "\n" );
 #endif
 
+    TimerInit( &GpsCheckerTimer, OnGpsCheckerTimerEvent );
+    TimerSetValue( &GpsCheckerTimer, 1000 );
+    TimerStart( &GpsCheckerTimer );
+
     /* Initialise timer */
     timer_init( );
 
@@ -212,6 +229,9 @@ static void transmit_n_times_on_this_credential( void )
         // Process application uplinks management
         UplinkProcess( );
 
+        // Process GPS
+        GpsProcess( );
+
         CRITICAL_SECTION_BEGIN( );
         if( IsMacProcessPending == 1 )
         {
@@ -291,3 +311,29 @@ static void timer_init( )
     TimerInit( &TxTimer, OnTxTimerEvent );
     TimerStop( &TxTimer );
 }
+
+static void GpsProcess( void )
+{
+    uint8_t isPending = 0;
+    CRITICAL_SECTION_BEGIN( );
+    isPending = IsGpsCheckPending;
+    IsGpsCheckPending = 0;
+    CRITICAL_SECTION_END( );
+    if( isPending == 1 )
+    {
+        request_gps_fix( );
+    }
+}
+
+/*!
+ * Function executed on GPS Check Timeout event
+ */
+static void OnGpsCheckerTimerEvent( void* context )
+{
+    TimerStop( &GpsCheckerTimer );
+
+    IsGpsCheckPending = 1;
+
+    TimerSetValue( &GpsCheckerTimer, 1000 );
+    TimerStart( &GpsCheckerTimer );
+}

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/cmsis/arm-std/startup_stm32l072xx.s

@@ -146,10 +146,23 @@ NMI_Handler     PROC
                 EXPORT  NMI_Handler                    [WEAK]
                 B       .
                 ENDP
+
 HardFault_Handler\
                 PROC
-                EXPORT  HardFault_Handler              [WEAK]
-                B       .
+                EXPORT  HardFault_Handler               [WEAK]
+                IMPORT  HardFault_Handler_C
+                MOVS    r0, #4
+                MOV     r1, LR
+                TST     r0, r1
+                BEQ     stacking_used_MSP
+                MRS     R0, PSP                         ; first parameter - stacking was using PSP
+                B       get_LR_and_branch
+stacking_used_MSP
+                MRS     R0, MSP                         ; first parameter - stacking was using MSP
+get_LR_and_branch
+                MOV     R1, LR                          ; second parameter is LR current value
+                LDR     R2,=HardFault_Handler_C
+                BX      R2
                 ENDP
 SVC_Handler     PROC
                 EXPORT  SVC_Handler                    [WEAK]