3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Read version data from progmem in eeprom_fw_version_older_than

Browse Source
This commit is contained in:
Yuri D'Elia 2022-12-29 15:26:15 +01:00 committed by DRracer
parent a8057e0d36
commit 05f37edad5
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Firmware/Marlin_main.cpp
View File

@ -1548,7 +1548,8 @@ void setup()
// calibrated printer upgraded from FW<3.12 // calibrated printer upgraded from FW<3.12
calibration_status |= (CALIBRATION_STATUS_SELFTEST | CALIBRATION_STATUS_XYZ | CALIBRATION_STATUS_Z | CALIBRATION_STATUS_LIVE_ADJUST); calibration_status |= (CALIBRATION_STATUS_SELFTEST | CALIBRATION_STATUS_XYZ | CALIBRATION_STATUS_Z | CALIBRATION_STATUS_LIVE_ADJUST);
if (eeprom_fw_version_older_than({3, 2, 0, 4})) { static const uint16_t v3_2_0_4[] PROGMEM = {3, 2, 0, 4};
if (eeprom_fw_version_older_than_p(v3_2_0_4)) {
// printer upgraded from FW<3.2.0.4 and requires re-running selftest // printer upgraded from FW<3.2.0.4 and requires re-running selftest
lcd_show_fullscreen_message_and_wait_P(_i("Selftest will be run to calibrate accurate sensorless rehoming."));////MSG_FORCE_SELFTEST c=20 r=8 lcd_show_fullscreen_message_and_wait_P(_i("Selftest will be run to calibrate accurate sensorless rehoming."));////MSG_FORCE_SELFTEST c=20 r=8
calibration_status &= ~CALIBRATION_STATUS_SELFTEST; calibration_status &= ~CALIBRATION_STATUS_SELFTEST;

8
Firmware/util.cpp
View File

@ -181,19 +181,19 @@ inline int8_t is_provided_version_newer(const char *version_string)
return 0; return 0;
} }
bool eeprom_fw_version_older_than(const uint16_t (&ver_req)[4]) bool eeprom_fw_version_older_than_p(const uint16_t (&ver_req)[4])
{ {
uint16_t ver_eeprom[4]; uint16_t ver_eeprom[4];
ver_eeprom[0] = eeprom_read_word((uint16_t*)EEPROM_FIRMWARE_VERSION_MAJOR); ver_eeprom[0] = eeprom_read_word((uint16_t*)EEPROM_FIRMWARE_VERSION_MAJOR);
ver_eeprom[1] = eeprom_read_word((uint16_t*)EEPROM_FIRMWARE_VERSION_MINOR); ver_eeprom[1] = eeprom_read_word((uint16_t*)EEPROM_FIRMWARE_VERSION_MINOR);
ver_eeprom[2] = eeprom_read_word((uint16_t*)EEPROM_FIRMWARE_VERSION_REVISION); ver_eeprom[2] = eeprom_read_word((uint16_t*)EEPROM_FIRMWARE_VERSION_REVISION);
ver_eeprom[3] = eeprom_read_word((uint16_t*)EEPROM_FIRMWARE_VERSION_FLAVOR); ver_eeprom[3] = eeprom_read_word((uint16_t*)EEPROM_FIRMWARE_VERSION_FLAVOR);
for (uint8_t i = 0; i < 4; ++i) { for (uint8_t i = 0; i < 4; ++i) {
if (ver_req[i] > ver_eeprom[i]) uint16_t v = pgm_read_word(&ver_req[i]);
if (v > ver_eeprom[i])
return true; return true;
else if (ver_req[i] < ver_eeprom[i]) else if (v < ver_eeprom[i])
break; break;
} }

2
Firmware/util.h
View File

@ -17,7 +17,7 @@ enum FirmwareRevisionFlavorType : uint16_t {
}; };
bool show_upgrade_dialog_if_version_newer(const char *version_string); bool show_upgrade_dialog_if_version_newer(const char *version_string);
bool eeprom_fw_version_older_than(const uint16_t (&req_ver)[4]); bool eeprom_fw_version_older_than_p(const uint16_t (&req_ver)[4]);
void update_current_firmware_version_to_eeprom(); void update_current_firmware_version_to_eeprom();