rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed FLASH boot loader option. (#8487) 

Fixed FLASH boot loader option.
This commit is contained in:
Michael Keller 2019-06-29 12:04:50 +12:00 committed by GitHub
parent 3695b123d9 0e35163ed2
commit e824b9021b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/drivers/persistent.h
View File

@ -37,11 +37,11 @@ typedef enum {
// Values for PERSISTENT_OBJECT_RESET_REASON // Values for PERSISTENT_OBJECT_RESET_REASON
#define RESET_NONE 0 #define RESET_NONE 0
#define RESET_BOOTLOADER_REQUEST 1 // Boot loader invocation was requested #define RESET_BOOTLOADER_REQUEST_ROM 1 // Boot loader invocation was requested
#define RESET_BOOTLOADER_POST 2 // Reset after boot loader activity #define RESET_BOOTLOADER_POST 2 // Reset after boot loader activity
#define RESET_MSC_REQUEST 3 // MSC invocation was requested #define RESET_MSC_REQUEST 3 // MSC invocation was requested
#define RESET_FORCED 4 // Reset due to unknown reset reason #define RESET_FORCED 4 // Reset due to unknown reset reason
#define RESET_FLASH_BOOTLOADER_REQUEST 5 #define RESET_BOOTLOADER_REQUEST_FLASH 5
void persistentObjectInit(void); void persistentObjectInit(void);
uint32_t persistentObjectRead(persistentObjectId_e id); uint32_t persistentObjectRead(persistentObjectId_e id);

4
src/main/drivers/system_stm32f4xx.c
View File

@ -44,7 +44,7 @@ void systemResetToBootloader(bootloaderRequestType_e requestType)
switch (requestType) { switch (requestType) {
case BOOTLOADER_REQUEST_ROM: case BOOTLOADER_REQUEST_ROM:
default: default:
persistentObjectWrite(PERSISTENT_OBJECT_RESET_REASON, RESET_BOOTLOADER_REQUEST); persistentObjectWrite(PERSISTENT_OBJECT_RESET_REASON, RESET_BOOTLOADER_REQUEST_ROM);
break; break;
} }
@ -65,7 +65,7 @@ void checkForBootLoaderRequest(void)
{ {
uint32_t bootloaderRequest = persistentObjectRead(PERSISTENT_OBJECT_RESET_REASON); uint32_t bootloaderRequest = persistentObjectRead(PERSISTENT_OBJECT_RESET_REASON);
if (bootloaderRequest != RESET_BOOTLOADER_REQUEST) { if (bootloaderRequest != RESET_BOOTLOADER_REQUEST_ROM) {
return; return;
} }
persistentObjectWrite(PERSISTENT_OBJECT_RESET_REASON, RESET_NONE); persistentObjectWrite(PERSISTENT_OBJECT_RESET_REASON, RESET_NONE);

4
src/main/drivers/system_stm32f7xx.c
View File

@ -52,7 +52,7 @@ void systemResetToBootloader(bootloaderRequestType_e requestType)
switch (requestType) { switch (requestType) {
case BOOTLOADER_REQUEST_ROM: case BOOTLOADER_REQUEST_ROM:
default: default:
persistentObjectWrite(PERSISTENT_OBJECT_RESET_REASON, RESET_BOOTLOADER_REQUEST); persistentObjectWrite(PERSISTENT_OBJECT_RESET_REASON, RESET_BOOTLOADER_REQUEST_ROM);
break; break;
} }
@ -167,7 +167,7 @@ static void checkForBootLoaderRequest(void)
{ {
uint32_t bootloaderRequest = persistentObjectRead(PERSISTENT_OBJECT_RESET_REASON); uint32_t bootloaderRequest = persistentObjectRead(PERSISTENT_OBJECT_RESET_REASON);
if (bootloaderRequest != RESET_BOOTLOADER_REQUEST) { if (bootloaderRequest != RESET_BOOTLOADER_REQUEST_ROM) {
return; return;
} }
persistentObjectWrite(PERSISTENT_OBJECT_RESET_REASON, RESET_NONE); persistentObjectWrite(PERSISTENT_OBJECT_RESET_REASON, RESET_NONE);

8
src/main/drivers/system_stm32h7xx.c
View File

@ -250,13 +250,13 @@ void systemResetToBootloader(bootloaderRequestType_e requestType)
switch (requestType) { switch (requestType) {
#if defined(USE_FLASH_BOOT_LOADER) #if defined(USE_FLASH_BOOT_LOADER)
case BOOTLOADER_REQUEST_FLASH: case BOOTLOADER_REQUEST_FLASH:
persistentObjectWrite(PERSISTENT_OBJECT_RESET_REASON, RESET_FLASH_BOOTLOADER_REQUEST); persistentObjectWrite(PERSISTENT_OBJECT_RESET_REASON, RESET_BOOTLOADER_REQUEST_FLASH);
break; break;
#endif #endif
case BOOTLOADER_REQUEST_ROM: case BOOTLOADER_REQUEST_ROM:
default: default:
persistentObjectWrite(PERSISTENT_OBJECT_RESET_REASON, RESET_BOOTLOADER_REQUEST); persistentObjectWrite(PERSISTENT_OBJECT_RESET_REASON, RESET_BOOTLOADER_REQUEST_ROM);
break; break;
} }
@ -273,9 +273,9 @@ void systemCheckResetReason(void)
switch (bootloaderRequest) { switch (bootloaderRequest) {
#if defined(USE_FLASH_BOOT_LOADER) #if defined(USE_FLASH_BOOT_LOADER)
case BOOTLOADER_REQUEST_FLASH: case RESET_BOOTLOADER_REQUEST_FLASH:
#endif #endif
case RESET_BOOTLOADER_REQUEST: case RESET_BOOTLOADER_REQUEST_ROM:
persistentObjectWrite(PERSISTENT_OBJECT_RESET_REASON, RESET_BOOTLOADER_POST); persistentObjectWrite(PERSISTENT_OBJECT_RESET_REASON, RESET_BOOTLOADER_POST);
break; break;

2
src/main/msp/msp.c
View File

@ -281,7 +281,7 @@ static void mspRebootFn(serialPort_t *serialPort)
#endif #endif
#if defined(USE_FLASH_BOOT_LOADER) #if defined(USE_FLASH_BOOT_LOADER)
case MSP_REBOOT_BOOTLOADER_FLASH: case MSP_REBOOT_BOOTLOADER_FLASH:
systemResetToBootloader(BOOTLOADER_REQUEST_FLASH); systemResetToBootloader(BOATLOADER_REQUEST_FLASH);
break; break;
#endif #endif

4
src/main/msp/msp_serial.c
View File

@ -451,8 +451,8 @@ static void mspProcessPendingRequest(mspPort_t * mspPort)
break; break;
#if defined(USE_FLASH_BOOT_LOADER) #if defined(USE_FLASH_BOOT_LOADER)
case MSP_PENDING_BOOTLOADER_ROM: case MSP_PENDING_BOOTLOADER_FLASH:
systemResetToBootloader(BOOTLOADER_REQUEST_FLASH); systemResetToBootloader(BOATLOADER_REQUEST_FLASH);
break; break;
#endif #endif