Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-enable exclusion notification on pyluos side by the gate #454

Merged
merged 3 commits into from
Dec 8, 2023
Merged

Re-enable exclusion notification on pyluos side by the gate #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66957d7
[Gate] Add exclusion management back.
nicolas-rabault Nov 22, 2023
b54b942
Remove the need of BOOTLADER define when BOOTLOADER_UPDATE is set
nicolas-rabault Dec 8, 2023
a33c399
Remove the newboot linker script config
nicolas-rabault Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion engine/HAL/ARDUINO/luos_hal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion engine/HAL/ATSAMD21_ARDUINO/luos_hal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion engine/HAL/ATSAMD21_MBED/luos_hal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion engine/HAL/ESP32/luos_hal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,5 +174,5 @@ void LuosHAL_Reboot(void)
{
}

#ifdef BOOTLOADER
#if defined(BOOTLOADER) || defined(BOOTLOADER_UPDATER)
#endif
2 changes: 1 addition & 1 deletion engine/HAL/STM32F0/luos_hal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion engine/HAL/STM32F0/luos_hal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion engine/HAL/STM32F4/luos_hal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion engine/HAL/STM32F4/luos_hal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion engine/HAL/STM32G4/luos_hal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion engine/HAL/STM32G4/luos_hal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion engine/HAL/STM32L0/luos_hal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion engine/HAL/STM32L0/luos_hal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion engine/HAL/STM32L4/luos_hal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion engine/HAL/STM32L4/luos_hal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion engine/HAL/template/luos_hal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion engine/bootloader/luos_bootloader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
189 changes: 0 additions & 189 deletions examples/projects/NUCLEO-F072RB/bootloader/linker/custom_new_bootloader_script.ld
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions examples/projects/NUCLEO-F072RB/bootloader/platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
1 change: 0 additions & 1 deletion examples/projects/NUCLEO-F401RE/bootloader/platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ build_unflags = -Os
build_flags =
-O1
-include node_config.h
-DBOOTLOADER
-DBOOTLOADER_UPDATER
-DUSE_HAL_DRIVER
-DUSE_FULL_LL_DRIVER
Expand Down
1 change: 0 additions & 1 deletion examples/projects/NUCLEO-F410RB/bootloader/platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ build_unflags = -Os
build_flags =
-O1
-include node_config.h
-DBOOTLOADER
-DBOOTLOADER_UPDATER
-DUSE_HAL_DRIVER
-DUSE_FULL_LL_DRIVER
Expand Down
1 change: 0 additions & 1 deletion examples/projects/NUCLEO-G431KB/bootloader/platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion examples/projects/NUCLEO-G474RE/bootloader/platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading