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

Add SD Firmware Update capability (#12043)

Browse Source 
Co-Authored-By: timoxd7 <timoxd7@users.noreply.github.com>
This commit is contained in:
Scott Lahteine
2018-10-09 20:00:47 -05:00
committed by GitHub
parent 0bd54392b7
commit cf5284cdf2
64 changed files with 974 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Marlin/src/module/configuration_store.cpp
View File

@ -376,6 +376,32 @@ void MarlinSettings::postprocess() {
report_current_position();
}
#if ENABLED(SD_FIRMWARE_UPDATE)
#if ENABLED(EEPROM_SETTINGS)
static_assert(
!WITHIN(SD_FIRMWARE_UPDATE_EEPROM_ADDR, EEPROM_OFFSET, EEPROM_OFFSET + sizeof(SettingsData)),
"SD_FIRMWARE_UPDATE_EEPROM_ADDR collides with EEPROM settings storage."
);
#endif
bool MarlinSettings::sd_update_status() {
uint8_t val;
persistentStore.read_data(SD_FIRMWARE_UPDATE_EEPROM_ADDR, &val);
return (val == SD_FIRMWARE_UPDATE_ACTIVE_VALUE);
}
bool MarlinSettings::set_sd_update_status(const bool enable) {
if (enable != sd_update_status())
persistentStore.write_data(
SD_FIRMWARE_UPDATE_EEPROM_ADDR,
enable ? SD_FIRMWARE_UPDATE_ACTIVE_VALUE : SD_FIRMWARE_UPDATE_INACTIVE_VALUE
);
return true;
}
#endif // SD_FIRMWARE_UPDATE
#if ENABLED(EEPROM_SETTINGS)
#include "../HAL/shared/persistent_store_api.h"

5
Marlin/src/module/configuration_store.h
View File

@ -61,6 +61,11 @@ class MarlinSettings {
#endif
}
#if ENABLED(SD_FIRMWARE_UPDATE)
static bool sd_update_status(); // True if the SD-Firmware-Update EEPROM flag is set
static bool set_sd_update_status(const bool enable); // Return 'true' after EEPROM is set (-> always true)
#endif
#if ENABLED(EEPROM_SETTINGS)
static bool load(PORTINIT_SOLO); // Return 'true' if data was loaded ok
static bool validate(PORTINIT_SOLO); // Return 'true' if EEPROM data is ok