From 45e8d7425548fb1020c8376ca8325d2ef335ff73 Mon Sep 17 00:00:00 2001 From: AJ Christensen Date: Tue, 25 Jun 2019 07:30:50 +1200 Subject: [PATCH] Fix BOATLOADER_ defines typo * Missed in review, sorry! * A-oooga I'm a boat --- src/main/cli/cli.c | 2 +- src/main/drivers/system.h | 2 +- src/main/drivers/system_stm32h7xx.c | 4 ++-- src/main/msp/msp_serial.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/cli/cli.c b/src/main/cli/cli.c index e12db68ff4..8c785618f2 100644 --- a/src/main/cli/cli.c +++ b/src/main/cli/cli.c @@ -3339,7 +3339,7 @@ static void cliRebootEx(rebootTarget_e rebootTarget) break; #if defined(USE_FLASH_BOOT_LOADER) case REBOOT_TARGET_BOOTLOADER_FLASH: - systemResetToBootloader(BOATLOADER_REQUEST_FLASH); + systemResetToBootloader(BOOTLOADER_REQUEST_FLASH); break; #endif diff --git a/src/main/drivers/system.h b/src/main/drivers/system.h index b98c6c647c..e4c7fe6aef 100644 --- a/src/main/drivers/system.h +++ b/src/main/drivers/system.h @@ -52,7 +52,7 @@ typedef enum { typedef enum { BOOTLOADER_REQUEST_ROM, - BOATLOADER_REQUEST_FLASH, + BOOTLOADER_REQUEST_FLASH, } bootloaderRequestType_e; // failure diff --git a/src/main/drivers/system_stm32h7xx.c b/src/main/drivers/system_stm32h7xx.c index 9ded27d7c8..7cc35c1b5c 100644 --- a/src/main/drivers/system_stm32h7xx.c +++ b/src/main/drivers/system_stm32h7xx.c @@ -249,7 +249,7 @@ void systemResetToBootloader(bootloaderRequestType_e requestType) { switch (requestType) { #if defined(USE_FLASH_BOOT_LOADER) - case BOATLOADER_REQUEST_FLASH: + case BOOTLOADER_REQUEST_FLASH: persistentObjectWrite(PERSISTENT_OBJECT_RESET_REASON, RESET_FLASH_BOOTLOADER_REQUEST); break; @@ -273,7 +273,7 @@ void systemCheckResetReason(void) switch (bootloaderRequest) { #if defined(USE_FLASH_BOOT_LOADER) - case BOATLOADER_REQUEST_FLASH: + case BOOTLOADER_REQUEST_FLASH: #endif case RESET_BOOTLOADER_REQUEST: persistentObjectWrite(PERSISTENT_OBJECT_RESET_REASON, RESET_BOOTLOADER_POST); diff --git a/src/main/msp/msp_serial.c b/src/main/msp/msp_serial.c index 75ce5a5b40..48792cd049 100644 --- a/src/main/msp/msp_serial.c +++ b/src/main/msp/msp_serial.c @@ -452,7 +452,7 @@ static void mspProcessPendingRequest(mspPort_t * mspPort) break; #if defined(USE_FLASH_BOOT_LOADER) case MSP_PENDING_BOOTLOADER_ROM: - systemResetToBootloader(BOATLOADER_REQUEST_FLASH); + systemResetToBootloader(BOOTLOADER_REQUEST_FLASH); break; #endif