From af5241623d8f29c39a546c69769f2d7adcf5ce9f Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Wed, 13 Dec 2017 13:14:25 +0100 Subject: [PATCH 1/4] version change --- Firmware/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index babbf4f99..34baa0b8e 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -9,7 +9,7 @@ // Firmware version #define FW_version "3.1.1-RC1" -#define FW_build 131 +#define FW_build 132 //#define FW_build --BUILD-NUMBER-- #define FW_version_build FW_version " b" STR(FW_build) From 889f4e49fb0d1b3eaaef95427973b0d0b3d0231f Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Wed, 13 Dec 2017 14:17:32 +0100 Subject: [PATCH 2/4] eeprom defines --- Firmware/Configuration.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 34baa0b8e..99222eb1f 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -79,7 +79,13 @@ #define EEPROM_FERROR_COUNT (EEPROM_UVLO_MESH_BED_LEVELING-16) // Power loss errors #define EEPROM_POWER_COUNT (EEPROM_UVLO_MESH_BED_LEVELING-17) -#define EEPROM_DIR_DEPTH (EEPROM_POWER_COUNT-1) + +#define EEPROM_XYZ_CAL_SKEW (EEPROM_POWER_COUNT - 4) //float for skew backup +#define EEPROM_WIZARD_ACTIVE (EEPROM_XYZ_CAL_SKEW - 1) +#define EEPROM_BELTSTATUS_X (EEPROM_WIZARD_ACTIVE - 2) //uint16 +#define EEPROM_BELTSTATUS_Y (EEPROM_BELTSTATUS_X - 2) //uint16 + +#define EEPROM_DIR_DEPTH (EEPROM_BELTSTATUS_Y-1) #define EEPROM_DIRS (EEPROM_DIR_DEPTH-80) //8 chars for each dir name, max 10 levels #define EEPROM_SD_SORT (EEPROM_DIRS - 1) //0 -time, 1-alpha, 2-none #define EEPROM_SECOND_SERIAL_ACTIVE (EEPROM_SD_SORT - 1) @@ -106,13 +112,6 @@ #define EEPROM_TMC_X_SG_THRS_LOW (EEPROM_TMC_X + 13) // 1byte, (-64..+63) #define EEPROM_TMC_X_SG_THRS_HIGH (EEPROM_TMC_X + 14) // 1byte, (-64..+63) -#define EEPROM_XYZ_CAL_SKEW (EEPROM_POWER_COUNT - 4) //float for skew backup - -#define EEPROM_WIZARD_ACTIVE (EEPROM_XYZ_CAL_SKEW - 1) - -#define EEPROM_BELTSTATUS_X (EEPROM_WIZARD_ACTIVE - 2) //uint16 -#define EEPROM_BELTSTATUS_Y (EEPROM_BELTSTATUS_X - 2) //uint16 - // Currently running firmware, each digit stored as uint16_t. // The flavor differentiates a dev, alpha, beta, release candidate or a release version. #define EEPROM_FIRMWARE_VERSION_END (FW_PRUSA3D_MAGIC_LEN+8) From ae8e84a6984653c5a5febfb8a7b3a99c05960e97 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Wed, 13 Dec 2017 14:44:53 +0100 Subject: [PATCH 3/4] build 133 --- Firmware/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 99222eb1f..e2000cf06 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -9,7 +9,7 @@ // Firmware version #define FW_version "3.1.1-RC1" -#define FW_build 132 +#define FW_build 133 //#define FW_build --BUILD-NUMBER-- #define FW_version_build FW_version " b" STR(FW_build) From 8c320d008968536c95fc165a3e13d0fce2c50c7b Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Wed, 13 Dec 2017 14:55:53 +0100 Subject: [PATCH 4/4] selftest delay -> delay_keep_alive --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f29a8063b..097eaa57c 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6193,7 +6193,7 @@ static int lcd_selftest_screen(int _step, int _progress, int _progress_scale, bo lcd_selftest_screen_step(3, 0, ((_step == _step_block) ? 1 : (_step < _step_block) ? 0 : 2), "Bed", _indicator); } - if (_delay > 0) delay(_delay); + if (_delay > 0) delay_keep_alive(_delay); _progress++; return (_progress > _progress_scale * 2) ? 0 : _progress;