From e5b4bf22d446de0781b5d0ca9faf67c472ae7a11 Mon Sep 17 00:00:00 2001 From: Christopher Pepper Date: Sat, 13 Oct 2018 20:05:03 +0100 Subject: [PATCH] Remove debug output from flash persistent store implementation --- .../HAL/HAL_LPC1768/persistent_store_flash.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/Marlin/src/HAL/HAL_LPC1768/persistent_store_flash.cpp b/Marlin/src/HAL/HAL_LPC1768/persistent_store_flash.cpp index 101cd7f105..ce6ab7de65 100644 --- a/Marlin/src/HAL/HAL_LPC1768/persistent_store_flash.cpp +++ b/Marlin/src/HAL/HAL_LPC1768/persistent_store_flash.cpp @@ -69,20 +69,15 @@ bool PersistentStore::access_start() { __disable_irq(); status = BlankCheckSector(EEPROM_SECTOR, EEPROM_SECTOR, &first_nblank_loc, &first_nblank_val); __enable_irq(); - SERIAL_PROTOCOLLNPAIR("Blank check status: ", status); + if (status == CMD_SUCCESS) { // sector is blank so nothing stored yet - SERIAL_PROTOCOLLNPGM("FLASH empty"); for (int i = 0; i < EEPROM_SIZE; i++) ram_eeprom[i] = EEPROM_ERASE; current_slot = EEPROM_SLOTS; - } - else { + } else { // current slot is the first non blank one current_slot = first_nblank_loc / EEPROM_SIZE; - SERIAL_PROTOCOLLNPAIR("Flash slot: ", current_slot); uint8_t *eeprom_data = SLOT_ADDRESS(EEPROM_SECTOR, current_slot); - SERIAL_PROTOCOLLNPAIR("Address: ", (int)eeprom_data); - // load current settings 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); status = EraseSector(EEPROM_SECTOR, EEPROM_SECTOR); __enable_irq(); - SERIAL_PROTOCOLLNPAIR("Erase status: ", status); + current_slot = EEPROM_SLOTS - 1; } - SERIAL_PROTOCOLLNPAIR("Writing data to: ", current_slot); + __disable_irq(); PrepareSector(EEPROM_SECTOR, EEPROM_SECTOR); status = CopyRAM2Flash(SLOT_ADDRESS(EEPROM_SECTOR, current_slot), ram_eeprom, IAP_WRITE_4096); __enable_irq(); - SERIAL_PROTOCOLLNPAIR("CopyRAM2Flash status: ", status); + if (status != CMD_SUCCESS) return false; eeprom_dirty = false; }