CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove debug output from flash persistent store implementation

Browse Source
This commit is contained in:
Christopher Pepper 2018-10-13 20:05:03 +01:00
parent 42fb7c14b0
commit e5b4bf22d4
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Marlin/src/HAL/HAL_LPC1768/persistent_store_flash.cpp
View File

@ -69,20 +69,15 @@ bool PersistentStore::access_start() {
__disable_irq(); __disable_irq();
status = BlankCheckSector(EEPROM_SECTOR, EEPROM_SECTOR, &first_nblank_loc, &first_nblank_val); status = BlankCheckSector(EEPROM_SECTOR, EEPROM_SECTOR, &first_nblank_loc, &first_nblank_val);
__enable_irq(); __enable_irq();
SERIAL_PROTOCOLLNPAIR("Blank check status: ", status);
if (status == CMD_SUCCESS) { if (status == CMD_SUCCESS) {
// sector is blank so nothing stored yet // sector is blank so nothing stored yet
SERIAL_PROTOCOLLNPGM("FLASH empty");
for (int i = 0; i < EEPROM_SIZE; i++) ram_eeprom[i] = EEPROM_ERASE; for (int i = 0; i < EEPROM_SIZE; i++) ram_eeprom[i] = EEPROM_ERASE;
current_slot = EEPROM_SLOTS; current_slot = EEPROM_SLOTS;
} } else {
else {
// current slot is the first non blank one // current slot is the first non blank one
current_slot = first_nblank_loc / EEPROM_SIZE; current_slot = first_nblank_loc / EEPROM_SIZE;
SERIAL_PROTOCOLLNPAIR("Flash slot: ", current_slot);
uint8_t *eeprom_data = SLOT_ADDRESS(EEPROM_SECTOR, current_slot); uint8_t *eeprom_data = SLOT_ADDRESS(EEPROM_SECTOR, current_slot);
SERIAL_PROTOCOLLNPAIR("Address: ", (int)eeprom_data);
// load current settings // load current settings
for (int i = 0; i < EEPROM_SIZE; i++) ram_eeprom[i] = eeprom_data[i]; for (int i = 0; i < EEPROM_SIZE; i++) ram_eeprom[i] = eeprom_data[i];
} }
@ -100,15 +95,15 @@ bool PersistentStore::access_finish() {
PrepareSector(EEPROM_SECTOR, EEPROM_SECTOR); PrepareSector(EEPROM_SECTOR, EEPROM_SECTOR);
status = EraseSector(EEPROM_SECTOR, EEPROM_SECTOR); status = EraseSector(EEPROM_SECTOR, EEPROM_SECTOR);
__enable_irq(); __enable_irq();
SERIAL_PROTOCOLLNPAIR("Erase status: ", status);
current_slot = EEPROM_SLOTS - 1; current_slot = EEPROM_SLOTS - 1;
} }
SERIAL_PROTOCOLLNPAIR("Writing data to: ", current_slot);
__disable_irq(); __disable_irq();
PrepareSector(EEPROM_SECTOR, EEPROM_SECTOR); PrepareSector(EEPROM_SECTOR, EEPROM_SECTOR);
status = CopyRAM2Flash(SLOT_ADDRESS(EEPROM_SECTOR, current_slot), ram_eeprom, IAP_WRITE_4096); status = CopyRAM2Flash(SLOT_ADDRESS(EEPROM_SECTOR, current_slot), ram_eeprom, IAP_WRITE_4096);
__enable_irq(); __enable_irq();
SERIAL_PROTOCOLLNPAIR("CopyRAM2Flash status: ", status);
if (status != CMD_SUCCESS) return false; if (status != CMD_SUCCESS) return false;
eeprom_dirty = false; eeprom_dirty = false;
} }