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

Add alternative TERN macros

Browse Source
This commit is contained in:
Scott Lahteine
2020-11-07 18:28:29 -06:00
parent dcb0f5dc3b
commit 06bf3ccfb7
15 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/module/settings.cpp
View File

@ -1497,7 +1497,7 @@ void MarlinSettings::postprocess() {
}
DEBUG_ECHO_START();
DEBUG_ECHOLNPAIR("EEPROM version mismatch (EEPROM=", stored_ver, " Marlin=" EEPROM_VERSION ")");
TERN(EEPROM_AUTO_INIT,,ui.eeprom_alert_version());
IF_DISABLED(EEPROM_AUTO_INIT, ui.eeprom_alert_version());
eeprom_error = true;
}
else {
@ -2325,13 +2325,13 @@ void MarlinSettings::postprocess() {
if (eeprom_error) {
DEBUG_ECHO_START();
DEBUG_ECHOLNPAIR("Index: ", int(eeprom_index - (EEPROM_OFFSET)), " Size: ", datasize());
TERN(EEPROM_AUTO_INIT,,ui.eeprom_alert_index());
IF_DISABLED(EEPROM_AUTO_INIT, ui.eeprom_alert_index());
}
else if (working_crc != stored_crc) {
eeprom_error = true;
DEBUG_ERROR_START();
DEBUG_ECHOLNPAIR("EEPROM CRC mismatch - (stored) ", stored_crc, " != ", working_crc, " (calculated)!");
TERN(EEPROM_AUTO_INIT,,ui.eeprom_alert_crc());
IF_DISABLED(EEPROM_AUTO_INIT, ui.eeprom_alert_crc());
}
else if (!validating) {
DEBUG_ECHO_START();