Merge pull request #454 from Luos-io/feat/gate_exclusion

Re-enable exclusion notification on pyluos side by the gate
Luos-io · Dec 8, 2023 · 7773eb2 · 7773eb2
2 parents b1b445b + a33c399
commit 7773eb2
Show file tree

Hide file tree

Showing 31 changed files with 49 additions and 458 deletions.
diff --git a/engine/HAL/ARDUINO/luos_hal.c b/engine/HAL/ARDUINO/luos_hal.c
@@ -138,7 +138,7 @@ void LuosHAL_Reboot(void)
 {
 }
 
-#ifdef BOOTLOADER
+#if defined(BOOTLOADER) || defined(BOOTLOADER_UPDATER)
 /******************************************************************************
  * @brief Get node id saved in flash memory
  * @param Address

diff --git a/engine/HAL/ATSAMD21_ARDUINO/luos_hal.c b/engine/HAL/ATSAMD21_ARDUINO/luos_hal.c
@@ -159,7 +159,7 @@ void LuosHAL_Reboot(void)
 {
 }
 
-#ifdef BOOTLOADER
+#if defined(BOOTLOADER) || defined(BOOTLOADER_UPDATER)
 /******************************************************************************
  * @brief Get node id saved in flash memory
  * @param Address

diff --git a/engine/HAL/ATSAMD21_MBED/luos_hal.c b/engine/HAL/ATSAMD21_MBED/luos_hal.c
@@ -224,7 +224,7 @@ void LuosHAL_Reboot(void)
 {
 }
 
-#ifdef BOOTLOADER
+#if defined(BOOTLOADER) || defined(BOOTLOADER_UPDATER)
 /******************************************************************************
  * @brief Get node id saved in flash memory
  * @param Address

diff --git a/engine/HAL/ESP32/luos_hal.c b/engine/HAL/ESP32/luos_hal.c
@@ -174,5 +174,5 @@ void LuosHAL_Reboot(void)
 {
 }
 
-#ifdef BOOTLOADER
+#if defined(BOOTLOADER) || defined(BOOTLOADER_UPDATER)
 #endif
diff --git a/engine/HAL/STM32F0/luos_hal.c b/engine/HAL/STM32F0/luos_hal.c
@@ -262,7 +262,7 @@ uint8_t LuosHAL_GetMode(void)
     return (uint8_t)data;
 }
 
-#ifdef BOOTLOADER
+#if defined(BOOTLOADER) || defined(BOOTLOADER_UPDATER)
 /******************************************************************************
  * @brief DeInit Bootloader peripherals
  * @param None

diff --git a/engine/HAL/STM32F0/luos_hal.h b/engine/HAL/STM32F0/luos_hal.h
@@ -49,7 +49,7 @@ void LuosHAL_SaveNodeID(uint16_t);
 void LuosHAL_JumpToAddress(uint32_t);
 uint8_t LuosHAL_GetMode(void);
 
-#ifdef BOOTLOADER
+#if defined(BOOTLOADER) || defined(BOOTLOADER_UPDATER)
 void LuosHAL_DeInit(void);
 uint16_t LuosHAL_GetNodeID(void);
 void LuosHAL_EraseMemory(uint32_t, uint16_t);

diff --git a/engine/HAL/STM32F4/luos_hal.c b/engine/HAL/STM32F4/luos_hal.c
@@ -248,7 +248,7 @@ uint8_t LuosHAL_GetMode(void)
     return (uint8_t)data;
 }
 
-#ifdef BOOTLOADER
+#if defined(BOOTLOADER) || defined(BOOTLOADER_UPDATER)
 /******************************************************************************
  * @brief DeInit Bootloader peripherals
  * @param None

diff --git a/engine/HAL/STM32F4/luos_hal.h b/engine/HAL/STM32F4/luos_hal.h
@@ -48,7 +48,7 @@ void LuosHAL_SaveNodeID(uint16_t);
 void LuosHAL_JumpToAddress(uint32_t);
 uint8_t LuosHAL_GetMode(void);
 
-#ifdef BOOTLOADER
+#if defined(BOOTLOADER) || defined(BOOTLOADER_UPDATER)
 void LuosHAL_DeInit(void);
 uint16_t LuosHAL_GetNodeID(void);
 void LuosHAL_EraseMemory(uint32_t, uint16_t);

diff --git a/engine/HAL/STM32G4/luos_hal.c b/engine/HAL/STM32G4/luos_hal.c
@@ -249,7 +249,7 @@ uint8_t LuosHAL_GetMode(void)
     return (uint8_t)data;
 }
 
-#ifdef BOOTLOADER
+#if defined(BOOTLOADER) || defined(BOOTLOADER_UPDATER)
 /******************************************************************************
  * @brief DeInit Bootloader peripherals
  * @param None

diff --git a/engine/HAL/STM32G4/luos_hal.h b/engine/HAL/STM32G4/luos_hal.h
@@ -52,7 +52,7 @@ void LuosHAL_SaveNodeID(uint16_t);
 void LuosHAL_JumpToAddress(uint32_t);
 uint8_t LuosHAL_GetMode(void);
 
-#ifdef BOOTLOADER
+#if defined(BOOTLOADER) || defined(BOOTLOADER_UPDATER)
 void LuosHAL_DeInit(void);
 uint16_t LuosHAL_GetNodeID(void);
 void LuosHAL_EraseMemory(uint32_t, uint16_t);

diff --git a/engine/HAL/STM32L0/luos_hal.c b/engine/HAL/STM32L0/luos_hal.c
@@ -262,7 +262,7 @@ uint8_t LuosHAL_GetMode(void)
     return (uint8_t)data;
 }
 
-#ifdef BOOTLOADER
+#if defined(BOOTLOADER) || defined(BOOTLOADER_UPDATER)
 /******************************************************************************
  * @brief DeInit Bootloader peripherals
  * @param None

diff --git a/engine/HAL/STM32L0/luos_hal.h b/engine/HAL/STM32L0/luos_hal.h
@@ -49,7 +49,7 @@ void LuosHAL_SaveNodeID(uint16_t);
 void LuosHAL_JumpToAddress(uint32_t);
 uint8_t LuosHAL_GetMode(void);
 
-#ifdef BOOTLOADER
+#if defined(BOOTLOADER) || defined(BOOTLOADER_UPDATER)
 void LuosHAL_DeInit(void);
 uint16_t LuosHAL_GetNodeID(void);
 void LuosHAL_EraseMemory(uint32_t, uint16_t);

diff --git a/engine/HAL/STM32L4/luos_hal.c b/engine/HAL/STM32L4/luos_hal.c
@@ -246,7 +246,7 @@ uint8_t LuosHAL_GetMode(void)
     return (uint8_t)data;
 }
 
-#ifdef BOOTLOADER
+#if defined(BOOTLOADER) || defined(BOOTLOADER_UPDATER)
 /******************************************************************************
  * @brief DeInit Bootloader peripherals
  * @param None

diff --git a/engine/HAL/STM32L4/luos_hal.h b/engine/HAL/STM32L4/luos_hal.h
@@ -52,7 +52,7 @@ void LuosHAL_SaveNodeID(uint16_t);
 void LuosHAL_JumpToAddress(uint32_t);
 uint8_t LuosHAL_GetMode(void);
 
-#ifdef BOOTLOADER
+#if defined(BOOTLOADER) || defined(BOOTLOADER_UPDATER)
 void LuosHAL_DeInit(void);
 uint16_t LuosHAL_GetNodeID(void);
 void LuosHAL_EraseMemory(uint32_t, uint16_t);

diff --git a/engine/HAL/template/luos_hal.h b/engine/HAL/template/luos_hal.h
@@ -46,7 +46,7 @@ uint64_t LuosHAL_GetTimestamp(void);
 void LuosHAL_StartTimestamp(void);
 void LuosHAL_StopTimestamp(void);
 
-#ifdef BOOTLOADER
+#if defined(BOOTLOADER) || defined(BOOTLOADER_UPDATER)
 // bootloader functions
 void LuosHAL_SetMode(uint8_t mode);
 void LuosHAL_Reboot(void);

diff --git a/engine/bootloader/luos_bootloader.c b/engine/bootloader/luos_bootloader.c
@@ -16,7 +16,7 @@
 /*******************************************************************************
  * Definitions
  ******************************************************************************/
-#ifdef BOOTLOADER
+#if defined(BOOTLOADER) || defined(BOOTLOADER_UPDATER)
     #define MAX_FRAME_SIZE (MAX_DATA_MSG_SIZE - 1)
     #define BUFFER_SIZE    0x800 // 2kB buffer to store received data
 

diff --git a/examples/projects/NUCLEO-F072RB/bootloader/linker/custom_new_bootloader_script.ld b/examples/projects/NUCLEO-F072RB/bootloader/linker/custom_new_bootloader_script.ld
diff --git a/examples/projects/NUCLEO-F072RB/bootloader/platformio.ini b/examples/projects/NUCLEO-F072RB/bootloader/platformio.ini
@@ -39,7 +39,6 @@ board_build.ldscript = linker/custom_bootloader_updater_script.ld
 build_unflags = -Os
 build_flags =
     -include node_config.h
-    -DBOOTLOADER
     -DBOOTLOADER_UPDATER
     -DUSE_HAL_DRIVER
     -DUSE_FULL_LL_DRIVER
@@ -49,18 +48,3 @@ upload_protocol = custom
 upload_flags =
     -t2
 upload_command = pyluos-bootloader flash $UPLOAD_PORT $UPLOAD_FLAGS -b $SOURCE
-
-[env:nucleo_f072rb_new_boot]
-board_build.ldscript = linker/custom_new_bootloader_script.ld
-build_unflags = -Os
-build_flags =
-    -include node_config.h
-    -DBOOTLOADER
-    -DUSE_HAL_DRIVER
-    -DUSE_FULL_LL_DRIVER
-    -DLUOSHAL=STM32F0
-    -O1
-upload_protocol = custom
-upload_flags =
-    -t2
-upload_command = pyluos-bootloader flash $UPLOAD_PORT $UPLOAD_FLAGS -b $SOURCE
diff --git a/examples/projects/NUCLEO-F401RE/bootloader/platformio.ini b/examples/projects/NUCLEO-F401RE/bootloader/platformio.ini
@@ -40,7 +40,6 @@ build_unflags = -Os
 build_flags =
     -O1
     -include node_config.h
-    -DBOOTLOADER
     -DBOOTLOADER_UPDATER
     -DUSE_HAL_DRIVER
     -DUSE_FULL_LL_DRIVER

diff --git a/examples/projects/NUCLEO-F410RB/bootloader/platformio.ini b/examples/projects/NUCLEO-F410RB/bootloader/platformio.ini
@@ -40,7 +40,6 @@ build_unflags = -Os
 build_flags =
     -O1
     -include node_config.h
-    -DBOOTLOADER
     -DBOOTLOADER_UPDATER
     -DUSE_HAL_DRIVER
     -DUSE_FULL_LL_DRIVER

diff --git a/examples/projects/NUCLEO-G431KB/bootloader/platformio.ini b/examples/projects/NUCLEO-G431KB/bootloader/platformio.ini
@@ -39,7 +39,6 @@ board_build.ldscript = linker/custom_bootloader_updater_script.ld
 build_unflags = -Os
 build_flags =
     -O1
-    -DBOOTLOADER
     -DBOOTLOADER_UPDATER
     -include node_config.h
     -DUSE_HAL_DRIVER

diff --git a/examples/projects/NUCLEO-G474RE/bootloader/platformio.ini b/examples/projects/NUCLEO-G474RE/bootloader/platformio.ini
@@ -40,7 +40,6 @@ build_unflags = -Os
 build_flags =
     -O1
     -include node_config.h
-    -D BOOTLOADER
     -D BOOTLOADER_UPDATER
     -DUSE_HAL_DRIVER
     -DUSE_FULL_LL_DRIVER
-Original file line number
+Diff line change
@@ Expand Up / @@ -174,5 +174,5 @@ void LuosHAL_Reboot(void) @@
     {
     }
-    #ifdef BOOTLOADER
+    #if defined(BOOTLOADER) || defined(BOOTLOADER_UPDATER)
     #endif