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

Refs #712. Reset firmwareUpdateState to idle before function FileFirmwareUpdateErrorHook() is called, instead of after. 

git-svn-id: https://svn.code.sf.net/p/openblt/code/trunk@649 5dc33758-31d5-4daf-9ae8-b24bf3d40d73
This commit is contained in:
Frank Voorburg 2018-12-11 14:38:31 +00:00
parent c3955cd62e
commit 4f2f1bd71b
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Target/Source/file.c
View File

@ -203,6 +203,8 @@ void FileTask(void)
/* attempt to obtain a file object for the firmware file */ /* attempt to obtain a file object for the firmware file */
if (f_open(&fatFsObjects.file, FileGetFirmwareFilenameHook(), FA_OPEN_EXISTING | FA_READ) != FR_OK) if (f_open(&fatFsObjects.file, FileGetFirmwareFilenameHook(), FA_OPEN_EXISTING | FA_READ) != FR_OK)
{ {
/* cannot continue with firmware update so go back to idle state */
firmwareUpdateState = FIRMWARE_UPDATE_STATE_IDLE;
/* can't open file */ /* can't open file */
#if (BOOT_FILE_LOGGING_ENABLE > 0) #if (BOOT_FILE_LOGGING_ENABLE > 0)
FileFirmwareUpdateLogHook("ERROR\n\r"); FileFirmwareUpdateLogHook("ERROR\n\r");
@ -232,6 +234,8 @@ void FileTask(void)
/* check if an error occurred */ /* check if an error occurred */
if (f_error(&fatFsObjects.file) > 0) if (f_error(&fatFsObjects.file) > 0)
{ {
/* cannot continue with firmware update so go back to idle state */
firmwareUpdateState = FIRMWARE_UPDATE_STATE_IDLE;
#if (BOOT_FILE_LOGGING_ENABLE > 0) #if (BOOT_FILE_LOGGING_ENABLE > 0)
FileFirmwareUpdateLogHook("ERROR\n\r"); FileFirmwareUpdateLogHook("ERROR\n\r");
#endif #endif
@ -240,8 +244,6 @@ void FileTask(void)
#endif #endif
/* close the file */ /* close the file */
f_close(&fatFsObjects.file); f_close(&fatFsObjects.file);
/* cannot continue with firmware update so go back to idle state */
firmwareUpdateState = FIRMWARE_UPDATE_STATE_IDLE;
return; return;
} }
/* parse the S-Record line without copying the data values if the line is not empty */ /* parse the S-Record line without copying the data values if the line is not empty */
@ -251,6 +253,8 @@ void FileTask(void)
/* check parsing result */ /* check parsing result */
if (parse_result == ERROR_SREC_INVALID_CHECKSUM) if (parse_result == ERROR_SREC_INVALID_CHECKSUM)
{ {
/* cannot continue with firmware update so go back to idle state */
firmwareUpdateState = FIRMWARE_UPDATE_STATE_IDLE;
#if (BOOT_FILE_LOGGING_ENABLE > 0) #if (BOOT_FILE_LOGGING_ENABLE > 0)
FileFirmwareUpdateLogHook("ERROR\n\r"); FileFirmwareUpdateLogHook("ERROR\n\r");
#endif #endif
@ -259,8 +263,6 @@ void FileTask(void)
#endif #endif
/* close the file */ /* close the file */
f_close(&fatFsObjects.file); f_close(&fatFsObjects.file);
/* cannot continue with firmware update so go back to idle state */
firmwareUpdateState = FIRMWARE_UPDATE_STATE_IDLE;
return; return;
} }
} }
@ -306,6 +308,8 @@ void FileTask(void)
/* still here so we are ready to perform the memory erase operation */ /* still here so we are ready to perform the memory erase operation */
if (NvmErase(eraseInfo.start_address, eraseInfo.total_size) == BLT_FALSE) if (NvmErase(eraseInfo.start_address, eraseInfo.total_size) == BLT_FALSE)
{ {
/* cannot continue with firmware update so go back to idle state */
firmwareUpdateState = FIRMWARE_UPDATE_STATE_IDLE;
#if (BOOT_FILE_LOGGING_ENABLE > 0) #if (BOOT_FILE_LOGGING_ENABLE > 0)
FileFirmwareUpdateLogHook("ERROR\n\r"); FileFirmwareUpdateLogHook("ERROR\n\r");
#endif #endif
@ -314,8 +318,6 @@ void FileTask(void)
#endif #endif
/* close the file */ /* close the file */
f_close(&fatFsObjects.file); f_close(&fatFsObjects.file);
/* cannot continue with firmware update so go back to idle state */
firmwareUpdateState = FIRMWARE_UPDATE_STATE_IDLE;
return; return;
} }
#if (BOOT_FILE_LOGGING_ENABLE > 0) #if (BOOT_FILE_LOGGING_ENABLE > 0)
@ -335,6 +337,8 @@ void FileTask(void)
/* rewind the file in preparation for the programming state */ /* rewind the file in preparation for the programming state */
if (f_lseek(&fatFsObjects.file, 0) != FR_OK) if (f_lseek(&fatFsObjects.file, 0) != FR_OK)
{ {
/* cannot continue with firmware update so go back to idle state */
firmwareUpdateState = FIRMWARE_UPDATE_STATE_IDLE;
#if (BOOT_FILE_LOGGING_ENABLE > 0) #if (BOOT_FILE_LOGGING_ENABLE > 0)
FileFirmwareUpdateLogHook("ERROR\n\r"); FileFirmwareUpdateLogHook("ERROR\n\r");
#endif #endif
@ -343,8 +347,6 @@ void FileTask(void)
#endif #endif
/* close the file */ /* close the file */
f_close(&fatFsObjects.file); f_close(&fatFsObjects.file);
/* cannot continue with firmware update so go back to idle state */
firmwareUpdateState = FIRMWARE_UPDATE_STATE_IDLE;
return; return;
} }
/* still here so we are ready to perform the last memory erase operation, if there /* still here so we are ready to perform the last memory erase operation, if there
@ -369,6 +371,8 @@ void FileTask(void)
#endif #endif
if (NvmErase(eraseInfo.start_address, eraseInfo.total_size) == BLT_FALSE) if (NvmErase(eraseInfo.start_address, eraseInfo.total_size) == BLT_FALSE)
{ {
/* cannot continue with firmware update so go back to idle state */
firmwareUpdateState = FIRMWARE_UPDATE_STATE_IDLE;
#if (BOOT_FILE_LOGGING_ENABLE > 0) #if (BOOT_FILE_LOGGING_ENABLE > 0)
FileFirmwareUpdateLogHook("ERROR\n\r"); FileFirmwareUpdateLogHook("ERROR\n\r");
#endif #endif
@ -377,8 +381,6 @@ void FileTask(void)
#endif #endif
/* close the file */ /* close the file */
f_close(&fatFsObjects.file); f_close(&fatFsObjects.file);
/* cannot continue with firmware update so go back to idle state */
firmwareUpdateState = FIRMWARE_UPDATE_STATE_IDLE;
return; return;
} }
} }
@ -397,6 +399,8 @@ void FileTask(void)
/* check if an error occurred */ /* check if an error occurred */
if (f_error(&fatFsObjects.file) > 0) if (f_error(&fatFsObjects.file) > 0)
{ {
/* cannot continue with firmware update so go back to idle state */
firmwareUpdateState = FIRMWARE_UPDATE_STATE_IDLE;
#if (BOOT_FILE_LOGGING_ENABLE > 0) #if (BOOT_FILE_LOGGING_ENABLE > 0)
FileFirmwareUpdateLogHook("Reading line from file...ERROR\n\r"); FileFirmwareUpdateLogHook("Reading line from file...ERROR\n\r");
#endif #endif
@ -405,8 +409,6 @@ void FileTask(void)
#endif #endif
/* close the file */ /* close the file */
f_close(&fatFsObjects.file); f_close(&fatFsObjects.file);
/* cannot continue with firmware update so go back to idle state */
firmwareUpdateState = FIRMWARE_UPDATE_STATE_IDLE;
return; return;
} }
/* parse the S-Record line if the line is not empty */ /* parse the S-Record line if the line is not empty */
@ -416,6 +418,8 @@ void FileTask(void)
/* check parsing result */ /* check parsing result */
if (parse_result == ERROR_SREC_INVALID_CHECKSUM) if (parse_result == ERROR_SREC_INVALID_CHECKSUM)
{ {
/* cannot continue with firmware update so go back to idle state */
firmwareUpdateState = FIRMWARE_UPDATE_STATE_IDLE;
#if (BOOT_FILE_LOGGING_ENABLE > 0) #if (BOOT_FILE_LOGGING_ENABLE > 0)
FileFirmwareUpdateLogHook("Invalid checksum found...ERROR\n\r"); FileFirmwareUpdateLogHook("Invalid checksum found...ERROR\n\r");
#endif #endif
@ -424,8 +428,6 @@ void FileTask(void)
#endif #endif
/* close the file */ /* close the file */
f_close(&fatFsObjects.file); f_close(&fatFsObjects.file);
/* cannot continue with firmware update so go back to idle state */
firmwareUpdateState = FIRMWARE_UPDATE_STATE_IDLE;
return; return;
} }
} }
@ -449,6 +451,8 @@ void FileTask(void)
/* program the data */ /* program the data */
if (NvmWrite(lineParseObject.address, parse_result, lineParseObject.data) == BLT_FALSE) if (NvmWrite(lineParseObject.address, parse_result, lineParseObject.data) == BLT_FALSE)
{ {
/* cannot continue with firmware update so go back to idle state */
firmwareUpdateState = FIRMWARE_UPDATE_STATE_IDLE;
#if (BOOT_FILE_LOGGING_ENABLE > 0) #if (BOOT_FILE_LOGGING_ENABLE > 0)
FileFirmwareUpdateLogHook("ERROR\n\r"); FileFirmwareUpdateLogHook("ERROR\n\r");
#endif #endif
@ -457,8 +461,6 @@ void FileTask(void)
#endif #endif
/* close the file */ /* close the file */
f_close(&fatFsObjects.file); f_close(&fatFsObjects.file);
/* cannot continue with firmware update so go back to idle state */
firmwareUpdateState = FIRMWARE_UPDATE_STATE_IDLE;
return; return;
} }
#if (BOOT_FILE_LOGGING_ENABLE > 0) #if (BOOT_FILE_LOGGING_ENABLE > 0)
@ -474,6 +476,8 @@ void FileTask(void)
/* finish the programming by writing the checksum */ /* finish the programming by writing the checksum */
if (NvmDone() == BLT_FALSE) if (NvmDone() == BLT_FALSE)
{ {
/* cannot continue with firmware update so go back to idle state */
firmwareUpdateState = FIRMWARE_UPDATE_STATE_IDLE;
#if (BOOT_FILE_LOGGING_ENABLE > 0) #if (BOOT_FILE_LOGGING_ENABLE > 0)
FileFirmwareUpdateLogHook("ERROR\n\r"); FileFirmwareUpdateLogHook("ERROR\n\r");
#endif #endif
@ -482,8 +486,6 @@ void FileTask(void)
#endif #endif
/* close the file */ /* close the file */
f_close(&fatFsObjects.file); f_close(&fatFsObjects.file);
/* cannot continue with firmware update so go back to idle state */
firmwareUpdateState = FIRMWARE_UPDATE_STATE_IDLE;
return; return;
} }
#if (BOOT_FILE_LOGGING_ENABLE > 0) #if (BOOT_FILE_LOGGING_ENABLE > 0)