zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Adjust some HAL formatting

Browse source
This commit is contained in:
Scott Lahteine 2018-09-30 21:23:23 -05:00
parent fb8a07660a
commit 8489673cea
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Marlin/src/HAL/HAL_STM32F4/EEPROM_Emul/eeprom_emul.cpp
View file

@ -103,12 +103,10 @@ uint16_t EE_Initialize(void) {
case ERASED: case ERASED:
if (PageStatus1 == VALID_PAGE) { /* Page0 erased, Page1 valid */ if (PageStatus1 == VALID_PAGE) { /* Page0 erased, Page1 valid */
/* Erase Page0 */ /* Erase Page0 */
if(!EE_VerifyPageFullyErased(PAGE0_BASE_ADDRESS)) { if (!EE_VerifyPageFullyErased(PAGE0_BASE_ADDRESS)) {
FlashStatus = HAL_FLASHEx_Erase(&pEraseInit, &SectorError); FlashStatus = HAL_FLASHEx_Erase(&pEraseInit, &SectorError);
/* If erase operation was failed, a Flash error code is returned */ /* If erase operation was failed, a Flash error code is returned */
if (FlashStatus != HAL_OK) { if (FlashStatus != HAL_OK) return FlashStatus;
return FlashStatus;
}
} }
} }
else if (PageStatus1 == RECEIVE_DATA) { /* Page0 erased, Page1 receive */ else if (PageStatus1 == RECEIVE_DATA) { /* Page0 erased, Page1 receive */

6
Marlin/src/HAL/HAL_STM32F7/EEPROM_Emul/eeprom_emul.cpp
View file

@ -103,12 +103,10 @@ uint16_t EE_Initialize(void) {
case ERASED: case ERASED:
if (PageStatus1 == VALID_PAGE) { /* Page0 erased, Page1 valid */ if (PageStatus1 == VALID_PAGE) { /* Page0 erased, Page1 valid */
/* Erase Page0 */ /* Erase Page0 */
if(!EE_VerifyPageFullyErased(PAGE0_BASE_ADDRESS)) { if (!EE_VerifyPageFullyErased(PAGE0_BASE_ADDRESS)) {
FlashStatus = HAL_FLASHEx_Erase(&pEraseInit, &SectorError); FlashStatus = HAL_FLASHEx_Erase(&pEraseInit, &SectorError);
/* If erase operation was failed, a Flash error code is returned */ /* If erase operation was failed, a Flash error code is returned */
if (FlashStatus != HAL_OK) { if (FlashStatus != HAL_OK) return FlashStatus;
return FlashStatus;
}
} }
} }
else if (PageStatus1 == RECEIVE_DATA) { /* Page0 erased, Page1 receive */ else if (PageStatus1 == RECEIVE_DATA) { /* Page0 erased, Page1 receive */