bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Tweaks to HAL codestyle

Browse Source
This commit is contained in:
Scott Lahteine
2018-02-25 00:13:46 -06:00
parent 0e0f17be30
commit f3dbe19669
5 changed files with 76 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Marlin/src/HAL/HAL_STM32F7/EmulatedEeprom.cpp
View File

@@ -80,23 +80,18 @@ static bool eeprom_initialised = false;
void eeprom_init() {
if(!eeprom_initialised) {
if (!eeprom_initialised) {
HAL_FLASH_Unlock();
__HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | FLASH_FLAG_OPERR | FLASH_FLAG_WRPERR |FLASH_FLAG_PGAERR | FLASH_FLAG_PGPERR | FLASH_FLAG_PGSERR);
/* EEPROM Init */
if(EE_Initialise() != EE_OK)
{
while(1) {
HAL_Delay(1);
}
}
if (EE_Initialise() != EE_OK)
for (;;) HAL_Delay(1); // Spin forever until watchdog reset
HAL_FLASH_Lock();
eeprom_initialised = true;
}
}
void eeprom_write_byte(unsigned char *pos, unsigned char value) {
@@ -106,39 +101,38 @@ void eeprom_write_byte(unsigned char *pos, unsigned char value) {
HAL_FLASH_Unlock();
__HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | FLASH_FLAG_OPERR | FLASH_FLAG_WRPERR |FLASH_FLAG_PGAERR | FLASH_FLAG_PGPERR | FLASH_FLAG_PGSERR);
if(EE_WriteVariable(eeprom_address, (uint16_t) value) != EE_OK) {
while(1) {
HAL_Delay(1);
}
}
if (EE_WriteVariable(eeprom_address, (uint16_t) value) != EE_OK)
for (;;) HAL_Delay(1); // Spin forever until watchdog reset
HAL_FLASH_Lock();
}
unsigned char eeprom_read_byte(unsigned char *pos) {
uint16_t data = 0xFF;
uint16_t eeprom_address = (unsigned) pos;
uint16_t eeprom_address = (unsigned)pos;
eeprom_init();
if(EE_ReadVariable(eeprom_address, &data) != EE_OK) {
return (char) data;
if (EE_ReadVariable(eeprom_address, &data) != EE_OK) {
return (unsigned char)data;
}
return (char)data;
return (unsigned char)data;
}
void eeprom_read_block (void *__dst, const void *__src, size_t __n) {
void eeprom_read_block(void *__dst, const void *__src, size_t __n) {
uint16_t data = 0xFF;
uint16_t eeprom_address = (unsigned) __src;
eeprom_init();
for(uint8_t c = 0; c < __n; c++) {
for (uint8_t c = 0; c < __n; c++) {
EE_ReadVariable(eeprom_address+c, &data);
*((uint8_t*)__dst + c) = data;
}
}
void eeprom_update_block (const void *__src, void *__dst, size_t __n) {
void eeprom_update_block(const void *__src, void *__dst, size_t __n) {
}