From 9f85165101008a87f37cb935591522e45910e848 Mon Sep 17 00:00:00 2001 From: Roxy-3D Date: Sat, 14 Mar 2020 18:12:29 -0500 Subject: [PATCH 01/14] Allow Tool Offset adjustments to have another digit of precision Some of the items in the Tool Offset Adjustment menu (in particular, the Z Offset!!!) were only adjustable with .1mm accuracy. This is not enough. So the edit menu is switched to float52 to fix the issue. --- Marlin/src/lcd/menu/menu_configuration.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp index ae0abbf746..25b253b261 100644 --- a/Marlin/src/lcd/menu/menu_configuration.cpp +++ b/Marlin/src/lcd/menu/menu_configuration.cpp @@ -138,12 +138,12 @@ void menu_advanced_settings(); START_MENU(); BACK_ITEM(MSG_CONFIGURATION); #if ENABLED(DUAL_X_CARRIAGE) - EDIT_ITEM_FAST(float51, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, float(X2_HOME_POS - 25), float(X2_HOME_POS + 25), _recalc_offsets); + EDIT_ITEM_FAST(float52, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, float(X2_HOME_POS - 25), float(X2_HOME_POS + 25), _recalc_offsets); #else - EDIT_ITEM_FAST(float41sign, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, -99.0, 99.0, _recalc_offsets); + EDIT_ITEM_FAST(float52, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, -99.0, 99.0, _recalc_offsets); #endif - EDIT_ITEM_FAST(float41sign, MSG_HOTEND_OFFSET_Y, &hotend_offset[1].y, -99.0, 99.0, _recalc_offsets); - EDIT_ITEM_FAST(float41sign, MSG_HOTEND_OFFSET_Z, &hotend_offset[1].z, Z_PROBE_LOW_POINT, 10.0, _recalc_offsets); + EDIT_ITEM_FAST(float52, MSG_HOTEND_OFFSET_Y, &hotend_offset[1].y, -99.0, 99.0, _recalc_offsets); + EDIT_ITEM_FAST(float52, MSG_HOTEND_OFFSET_Z, &hotend_offset[1].z, Z_PROBE_LOW_POINT, 10.0, _recalc_offsets); #if ENABLED(EEPROM_SETTINGS) ACTION_ITEM(MSG_STORE_EEPROM, lcd_store_settings); #endif From 5c1970a22978c405d4d945a3db5c6299f3783426 Mon Sep 17 00:00:00 2001 From: thinkyhead Date: Sun, 15 Mar 2020 00:04:39 +0000 Subject: [PATCH 02/14] [cron] Bump distribution date (2020-03-15) --- Marlin/src/inc/Version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h index 25748f7d31..7b8461567c 100644 --- a/Marlin/src/inc/Version.h +++ b/Marlin/src/inc/Version.h @@ -42,7 +42,7 @@ * version was tagged. */ #ifndef STRING_DISTRIBUTION_DATE - #define STRING_DISTRIBUTION_DATE "2020-03-14" + #define STRING_DISTRIBUTION_DATE "2020-03-15" #endif /** From 41ffe9851d3d902f450a5b1bd85b1197295dcd7a Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 14 Mar 2020 19:23:08 -0500 Subject: [PATCH 03/14] Fix LCD progress bar Fixes #17162 --- Marlin/Configuration_adv.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index f5d80a3eb3..6183711646 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -999,7 +999,7 @@ #define BOOTSCREEN_TIMEOUT 4000 // (ms) Total Duration to display the boot screen(s) #endif -#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS +#if HAS_GRAPHICAL_LCD && EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY) //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits //#define SHOW_REMAINING_TIME // Display estimated time to completion #if ENABLED(SHOW_REMAINING_TIME) @@ -1008,7 +1008,7 @@ #endif #endif -#if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS +#if HAS_CHARACTER_LCD && EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY) //#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing #if ENABLED(LCD_PROGRESS_BAR) #define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar From 095a1123c191db46040688daba4b4505d4615d6e Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 14 Mar 2020 18:47:44 -0500 Subject: [PATCH 04/14] Add a global machine state --- Marlin/src/MarlinCore.cpp | 6 ++++-- Marlin/src/MarlinCore.h | 16 +++++++++++++--- Marlin/src/gcode/control/M999.cpp | 4 ++-- Marlin/src/module/temperature.cpp | 4 ++-- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp index f19aaef968..b4ddc80454 100644 --- a/Marlin/src/MarlinCore.cpp +++ b/Marlin/src/MarlinCore.cpp @@ -202,7 +202,7 @@ const char NUL_STR[] PROGMEM = "", SP_Z_LBL[] PROGMEM = " Z:", SP_E_LBL[] PROGMEM = " E:"; -bool Running = true; +MarlinState marlin_state = MF_INITIALIZING; // For M109 and M190, this flag may be cleared (by M108) to exit the wait loop bool wait_for_heatup = true; @@ -839,7 +839,7 @@ void stop() { SERIAL_ERROR_MSG(STR_ERR_STOPPED); LCD_MESSAGEPGM(MSG_STOPPED); safe_delay(350); // allow enough time for messages to get out before stopping - Running = false; + marlin_state = MF_STOPPED; } } @@ -1183,6 +1183,8 @@ void setup() { SETUP_RUN(max7219.init()); #endif + marlin_state = MF_RUNNING; + SETUP_LOG("setup() completed."); } diff --git a/Marlin/src/MarlinCore.h b/Marlin/src/MarlinCore.h index 141ce7156e..3bce72ab80 100644 --- a/Marlin/src/MarlinCore.h +++ b/Marlin/src/MarlinCore.h @@ -76,9 +76,19 @@ void minkill(const bool steppers_off=false); void quickstop_stepper(); -extern bool Running; -inline bool IsRunning() { return Running; } -inline bool IsStopped() { return !Running; } +// Global State of the firmware +enum MarlinState : uint8_t { + MF_INITIALIZING = 0, + MF_RUNNING = _BV(0), + MF_PAUSED = _BV(1), + MF_WAITING = _BV(2), + MF_STOPPED = _BV(3), + MF_KILLED = _BV(7) +}; + +extern MarlinState marlin_state; +inline bool IsRunning() { return marlin_state == MF_RUNNING; } +inline bool IsStopped() { return marlin_state != MF_RUNNING; } bool printingIsActive(); bool printingIsPaused(); diff --git a/Marlin/src/gcode/control/M999.cpp b/Marlin/src/gcode/control/M999.cpp index c498e66cab..79cd5e1854 100644 --- a/Marlin/src/gcode/control/M999.cpp +++ b/Marlin/src/gcode/control/M999.cpp @@ -23,7 +23,7 @@ #include "../gcode.h" #include "../../lcd/ultralcd.h" // for lcd_reset_alert_level -#include "../../MarlinCore.h" // for Running +#include "../../MarlinCore.h" // for marlin_state #include "../queue.h" // for flush_and_request_resend /** @@ -37,7 +37,7 @@ * */ void GcodeSuite::M999() { - Running = true; + marlin_state = MF_RUNNING; ui.reset_alert_level(); if (parser.boolval('S')) return; diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp index d0b1ddf0a3..f16a3af046 100644 --- a/Marlin/src/module/temperature.cpp +++ b/Marlin/src/module/temperature.cpp @@ -765,7 +765,7 @@ int16_t Temperature::getHeaterPower(const heater_ind_t heater_id) { // inline void loud_kill(PGM_P const lcd_msg, const heater_ind_t heater) { - Running = false; + marlin_state = MF_KILLED; #if USE_BEEPER for (uint8_t i = 20; i--;) { WRITE(BEEPER_PIN, HIGH); delay(25); @@ -2003,7 +2003,7 @@ void Temperature::init() { /** SERIAL_ECHO_START(); - SERIAL_ECHOPGM("Thermal Thermal Runaway Running. Heater ID: "); + SERIAL_ECHOPGM("Thermal Runaway Running. Heater ID: "); if (heater_id == H_CHAMBER) SERIAL_ECHOPGM("chamber"); if (heater_id < 0) SERIAL_ECHOPGM("bed"); else SERIAL_ECHO(heater_id); SERIAL_ECHOPAIR(" ; State:", sm.state, " ; Timer:", sm.timer, " ; Temperature:", current, " ; Target Temp:", target); From 090a90a0364fec1f13ade0680bbf26aa5aef23d9 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 10 Mar 2020 17:45:39 -0500 Subject: [PATCH 05/14] Add EEPROM_BOOT_SILENT option --- Marlin/Configuration.h | 1 + Marlin/src/module/configuration_store.cpp | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index a92557977f..6cac225fce 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1446,6 +1446,7 @@ //#define EEPROM_SETTINGS // Persistent storage with M500 and M501 //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! #define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM. +#define EEPROM_BOOT_SILENT // Keep M503 quiet and only give errors during first load #if ENABLED(EEPROM_SETTINGS) //#define EEPROM_AUTO_INIT // Init EEPROM automatically on any errors. #endif diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp index eb77325094..fd28c3cc40 100644 --- a/Marlin/src/module/configuration_store.cpp +++ b/Marlin/src/module/configuration_store.cpp @@ -2185,8 +2185,10 @@ void MarlinSettings::postprocess() { } #if ENABLED(EEPROM_CHITCHAT) && DISABLED(DISABLE_M503) - if (!validating) report(); + // Report the EEPROM settings + if (!validating && (DISABLED(EEPROM_BOOT_SILENT) || IsRunning())) report(); #endif + EEPROM_FINISH(); return !eeprom_error; From 695e01407565f082b191268cab81d0bfee0867e6 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 10 Mar 2020 17:46:20 -0500 Subject: [PATCH 06/14] Do later mounting of LCD-based SD --- Marlin/src/MarlinCore.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp index b4ddc80454..5e2fe02077 100644 --- a/Marlin/src/MarlinCore.cpp +++ b/Marlin/src/MarlinCore.cpp @@ -991,8 +991,8 @@ void setup() { SETUP_RUN(ui.show_bootscreen()); #endif - #if ENABLED(SDSUPPORT) - SETUP_RUN(card.mount()); // Mount the SD card before settings.first_load + #if ENABLED(SDSUPPORT) && defined(SDCARD_CONNECTION) && !SD_CONNECTION_IS(LCD) + SETUP_RUN(card.mount()); // Mount onboard / custom SD card before settings.first_load #endif SETUP_RUN(settings.first_load()); // Load data from EEPROM if available (or use defaults) From 85187290a78f0947eed8f590942e34da05ee447a Mon Sep 17 00:00:00 2001 From: Karl Andersson Date: Mon, 16 Mar 2020 00:03:10 +0100 Subject: [PATCH 07/14] Fix incorrect type on ubl_storage_slot (#17170) --- Marlin/src/module/configuration_store.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp index fd28c3cc40..3a83dd7c1d 100644 --- a/Marlin/src/module/configuration_store.cpp +++ b/Marlin/src/module/configuration_store.cpp @@ -1531,10 +1531,10 @@ void MarlinSettings::postprocess() { _FIELD_TEST(planner_leveling_active); #if ENABLED(AUTO_BED_LEVELING_UBL) const bool &planner_leveling_active = planner.leveling_active; - const uint8_t &ubl_storage_slot = ubl.storage_slot; + const int8_t &ubl_storage_slot = ubl.storage_slot; #else bool planner_leveling_active; - uint8_t ubl_storage_slot; + int8_t ubl_storage_slot; #endif EEPROM_READ(planner_leveling_active); EEPROM_READ(ubl_storage_slot); From c39873759f1602e30343369bab2a0de7d5165058 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 15 Mar 2020 18:14:58 -0500 Subject: [PATCH 08/14] Fix Z after ABL Bilinear G29 with fade Co-Authored-By: Alan T --- Marlin/src/gcode/bedlevel/abl/G29.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp index 2d782e9e33..de69545983 100644 --- a/Marlin/src/gcode/bedlevel/abl/G29.cpp +++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp @@ -934,7 +934,12 @@ G29_TYPE GcodeSuite::G29() { // Unapply the offset because it is going to be immediately applied // and cause compensation movement in Z - current_position.z -= bilinear_z_offset(current_position); + #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT) + const float fade_scaling_factor = planner.fade_scaling_factor_for_z(current_position.z); + #else + constexpr float fade_scaling_factor = 1.0f; + #endif + current_position.z -= fade_scaling_factor * bilinear_z_offset(current_position); if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(" corrected Z:", current_position.z); } From 3b987dfcec653bfa8c79412d44cc70fd07941bd2 Mon Sep 17 00:00:00 2001 From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com> Date: Mon, 16 Mar 2020 00:23:24 +0100 Subject: [PATCH 09/14] Fix G34 Z lower, extra "BLTOUCH" debug line (#17175) --- Marlin/src/core/utility.cpp | 1 - Marlin/src/gcode/calibrate/G34_M422.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp index 19247ff69f..5e159af581 100644 --- a/Marlin/src/core/utility.cpp +++ b/Marlin/src/core/utility.cpp @@ -67,7 +67,6 @@ void safe_delay(millis_t ms) { TERN(PROBE_MANUALLY, "PROBE_MANUALLY", "") TERN(NOZZLE_AS_PROBE, "NOZZLE_AS_PROBE", "") TERN(FIX_MOUNTED_PROBE, "FIX_MOUNTED_PROBE", "") - TERN(BLTOUCH, "BLTOUCH", "") TERN(HAS_Z_SERVO_PROBE, TERN(BLTOUCH, "BLTOUCH", "SERVO PROBE"), "") TERN(TOUCH_MI_PROBE, "TOUCH_MI_PROBE", "") TERN(Z_PROBE_SLED, "Z_PROBE_SLED", "") diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp index 672f40737a..d1b828d079 100644 --- a/Marlin/src/gcode/calibrate/G34_M422.cpp +++ b/Marlin/src/gcode/calibrate/G34_M422.cpp @@ -203,7 +203,7 @@ void GcodeSuite::G34() { const uint8_t iprobe = (iteration & 1) ? NUM_Z_STEPPER_DRIVERS - 1 - i : i; // Safe clearance even on an incline - if (iteration == 0 || i > 0) do_blocking_move_to_z(z_probe); + if ((iteration == 0 || i > 0) && z_probe > current_position.z) do_blocking_move_to_z(z_probe); if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR_P(PSTR("Probing X"), z_stepper_align.xy[iprobe].x, SP_Y_STR, z_stepper_align.xy[iprobe].y); From 775a4294fc280d7e8c90e429118a2e1dacfb115e Mon Sep 17 00:00:00 2001 From: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com> Date: Sun, 15 Mar 2020 19:29:18 -0400 Subject: [PATCH 10/14] Configurable SLOWDOWN divisor (#17171) --- Marlin/Configuration_adv.h | 6 +++++- Marlin/src/module/planner.cpp | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 6183711646..6149864ab4 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -753,8 +753,12 @@ // Minimum time that a segment needs to take if the buffer is emptied #define DEFAULT_MINSEGMENTTIME 20000 // (ms) -// If defined the movements slow down when the look ahead buffer is only half full +// Slow down the machine if the look ahead buffer is (by default) half full. +// Increase the slowdown divisor for larger buffer sizes. #define SLOWDOWN +#if ENABLED(SLOWDOWN) + #define SLOWDOWN_DIVISOR 2 +#endif // Frequency limit // See nophead's blog for more info diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp index 7417749088..3b2daf1812 100644 --- a/Marlin/src/module/planner.cpp +++ b/Marlin/src/module/planner.cpp @@ -2041,7 +2041,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move, #endif #if ENABLED(SLOWDOWN) - if (WITHIN(moves_queued, 2, (BLOCK_BUFFER_SIZE) / 2 - 1)) { + #ifndef SLOWDOWN_DIVISOR + #define SLOWDOWN_DIVISOR 2 + #endif + if (WITHIN(moves_queued, 2, (BLOCK_BUFFER_SIZE) / (SLOWDOWN_DIVISOR) - 1)) { if (segment_time_us < settings.min_segment_time_us) { // buffer is draining, add extra time. The amount of time added increases if the buffer is still emptied more. const uint32_t nst = segment_time_us + LROUND(2 * (settings.min_segment_time_us - segment_time_us) / moves_queued); From a662079cbc6bda43edaf146a996d39195f0e6dae Mon Sep 17 00:00:00 2001 From: thinkyhead Date: Mon, 16 Mar 2020 00:04:45 +0000 Subject: [PATCH 11/14] [cron] Bump distribution date (2020-03-16) --- Marlin/src/inc/Version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h index 7b8461567c..16f3effccc 100644 --- a/Marlin/src/inc/Version.h +++ b/Marlin/src/inc/Version.h @@ -42,7 +42,7 @@ * version was tagged. */ #ifndef STRING_DISTRIBUTION_DATE - #define STRING_DISTRIBUTION_DATE "2020-03-15" + #define STRING_DISTRIBUTION_DATE "2020-03-16" #endif /** From 2fc0df1b392e9dc8c89f77b64fd64865785e24d5 Mon Sep 17 00:00:00 2001 From: Pascal de Bruijn Date: Mon, 16 Mar 2020 20:11:55 +0100 Subject: [PATCH 12/14] Shorter LCD remaining time to prevent overlap (#17181) --- Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp index 92f935f04b..be414ab303 100644 --- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp +++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp @@ -448,10 +448,10 @@ void MarlinUI::draw_status_screen() { #endif } + constexpr bool can_show_days = DISABLED(DOGM_SD_PERCENT) || ENABLED(ROTATE_PROGRESS_DISPLAY); if (ev != lastElapsed) { lastElapsed = ev; - const bool has_days = (elapsed.value >= 60*60*24L); - const uint8_t len = elapsed.toDigital(elapsed_string, has_days); + const uint8_t len = elapsed.toDigital(elapsed_string, can_show_days && elapsed.value >= 60*60*24L); elapsed_x_pos = _SD_INFO_X(len); #if ENABLED(SHOW_REMAINING_TIME) @@ -468,8 +468,7 @@ void MarlinUI::draw_status_screen() { } else { duration_t estimation = timeval; - const bool has_days = (estimation.value >= 60*60*24L); - const uint8_t len = estimation.toDigital(estimation_string, has_days); + const uint8_t len = estimation.toDigital(estimation_string, can_show_days && estimation.value >= 60*60*24L); estimation_x_pos = _SD_INFO_X(len #if !BOTH(DOGM_SD_PERCENT, ROTATE_PROGRESS_DISPLAY) + 1 From b14c933171b50c87808367bf14872fb7acced92d Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 16 Mar 2020 15:59:05 -0500 Subject: [PATCH 13/14] LPC1768 EEPROM fallback to flash, add overrides (#17184) --- Marlin/src/HAL/DUE/inc/Conditionals_post.h | 2 +- Marlin/src/HAL/ESP32/inc/Conditionals_post.h | 5 +++++ Marlin/src/HAL/LPC1768/inc/Conditionals_post.h | 8 ++------ Marlin/src/HAL/LPC1768/persistent_store_flash.cpp | 3 +-- Marlin/src/HAL/SAMD51/inc/Conditionals_post.h | 2 +- Marlin/src/HAL/STM32/inc/Conditionals_post.h | 5 +++++ .../src/HAL/STM32_F4_F7/inc/Conditionals_post.h | 3 +-- .../src/HAL/TEENSY31_32/inc/Conditionals_post.h | 5 +++++ Marlin/src/inc/Conditionals_post.h | 4 +--- Marlin/src/inc/SanityCheck.h | 15 +++++++++++++++ Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h | 6 ++++++ Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h | 6 ++++++ Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h | 6 ++++++ Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h | 6 ++++++ Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h | 6 ++++++ Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h | 8 ++++++++ Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h | 4 ++++ Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h | 6 ++++++ Marlin/src/pins/lpc1768/pins_MKS_SBASE.h | 8 ++++++++ Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h | 6 ++++++ Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h | 6 ++++++ Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h | 6 ++++++ Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h | 7 ++++++- Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h | 8 ++++++++ .../src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h | 6 ++++++ Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h | 6 ++++++ Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h | 6 ++++++ Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h | 6 ++++++ Marlin/src/pins/lpc1769/pins_MKS_SGEN.h | 8 +++++++- Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h | 6 ++++++ Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h | 6 ++++++ 31 files changed, 168 insertions(+), 17 deletions(-) diff --git a/Marlin/src/HAL/DUE/inc/Conditionals_post.h b/Marlin/src/HAL/DUE/inc/Conditionals_post.h index 223890d790..b52462f6d8 100644 --- a/Marlin/src/HAL/DUE/inc/Conditionals_post.h +++ b/Marlin/src/HAL/DUE/inc/Conditionals_post.h @@ -24,5 +24,5 @@ #if USE_EMULATED_EEPROM #undef SRAM_EEPROM_EMULATION #undef SDCARD_EEPROM_EMULATION - #define FLASH_EEPROM_EMULATION 1 + #define FLASH_EEPROM_EMULATION #endif diff --git a/Marlin/src/HAL/ESP32/inc/Conditionals_post.h b/Marlin/src/HAL/ESP32/inc/Conditionals_post.h index 0285c52ee3..e51b55698e 100644 --- a/Marlin/src/HAL/ESP32/inc/Conditionals_post.h +++ b/Marlin/src/HAL/ESP32/inc/Conditionals_post.h @@ -20,3 +20,8 @@ * */ #pragma once + +// If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation +#if ENABLED(EEPROM_SETTINGS) && NONE(USE_REAL_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION) + #define SDCARD_EEPROM_EMULATION +#endif diff --git a/Marlin/src/HAL/LPC1768/inc/Conditionals_post.h b/Marlin/src/HAL/LPC1768/inc/Conditionals_post.h index 2637174543..a8d102e865 100644 --- a/Marlin/src/HAL/LPC1768/inc/Conditionals_post.h +++ b/Marlin/src/HAL/LPC1768/inc/Conditionals_post.h @@ -21,10 +21,6 @@ */ #pragma once -#if ENABLED(EEPROM_SETTINGS) - #undef USE_REAL_EEPROM - #define USE_EMULATED_EEPROM 1 - #if DISABLED(FLASH_EEPROM_EMULATION) - #define SDCARD_EEPROM_EMULATION 1 - #endif +#if USE_EMULATED_EEPROM && NONE(SDCARD_EEPROM_EMULATION, SRAM_EEPROM_EMULATION) + #define FLASH_EEPROM_EMULATION #endif diff --git a/Marlin/src/HAL/LPC1768/persistent_store_flash.cpp b/Marlin/src/HAL/LPC1768/persistent_store_flash.cpp index 5525f818a0..e166858d64 100644 --- a/Marlin/src/HAL/LPC1768/persistent_store_flash.cpp +++ b/Marlin/src/HAL/LPC1768/persistent_store_flash.cpp @@ -36,12 +36,11 @@ * 16Kb I/O buffers (intended to hold DMA USB and Ethernet data, but currently * unused). */ -#include "../../inc/MarlinConfigPre.h" +#include "../../inc/MarlinConfig.h" #if ENABLED(FLASH_EEPROM_EMULATION) #include "persistent_store_api.h" -#include "../../inc/MarlinConfig.h" extern "C" { #include diff --git a/Marlin/src/HAL/SAMD51/inc/Conditionals_post.h b/Marlin/src/HAL/SAMD51/inc/Conditionals_post.h index 223890d790..b52462f6d8 100644 --- a/Marlin/src/HAL/SAMD51/inc/Conditionals_post.h +++ b/Marlin/src/HAL/SAMD51/inc/Conditionals_post.h @@ -24,5 +24,5 @@ #if USE_EMULATED_EEPROM #undef SRAM_EEPROM_EMULATION #undef SDCARD_EEPROM_EMULATION - #define FLASH_EEPROM_EMULATION 1 + #define FLASH_EEPROM_EMULATION #endif diff --git a/Marlin/src/HAL/STM32/inc/Conditionals_post.h b/Marlin/src/HAL/STM32/inc/Conditionals_post.h index 0285c52ee3..e51b55698e 100644 --- a/Marlin/src/HAL/STM32/inc/Conditionals_post.h +++ b/Marlin/src/HAL/STM32/inc/Conditionals_post.h @@ -20,3 +20,8 @@ * */ #pragma once + +// If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation +#if ENABLED(EEPROM_SETTINGS) && NONE(USE_REAL_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION) + #define SDCARD_EEPROM_EMULATION +#endif diff --git a/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h b/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h index 6e2cf62101..5a190342ac 100644 --- a/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h +++ b/Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h @@ -23,8 +23,7 @@ #if ENABLED(EEPROM_SETTINGS) && defined(STM32F7) #undef USE_REAL_EEPROM - #define USE_EMULATED_EEPROM 1 #undef SRAM_EEPROM_EMULATION #undef SDCARD_EEPROM_EMULATION - #define FLASH_EEPROM_EMULATION 1 + #define FLASH_EEPROM_EMULATION #endif diff --git a/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h b/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h index 0285c52ee3..e51b55698e 100644 --- a/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h +++ b/Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h @@ -20,3 +20,8 @@ * */ #pragma once + +// If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation +#if ENABLED(EEPROM_SETTINGS) && NONE(USE_REAL_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION) + #define SDCARD_EEPROM_EMULATION +#endif diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index 97090d4775..ebc77b9383 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -35,15 +35,13 @@ #define HAS_LINEAR_E_JERK 1 #endif +// If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation #if ENABLED(EEPROM_SETTINGS) #if NONE(FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION) && EITHER(I2C_EEPROM, SPI_EEPROM) #define USE_REAL_EEPROM 1 #else #define USE_EMULATED_EEPROM 1 #endif - #if NONE(USE_REAL_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION) - #define SDCARD_EEPROM_EMULATION 1 - #endif #else #undef I2C_EEPROM #undef SPI_EEPROM diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index 454183e548..574d6a336e 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -1993,9 +1993,24 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS static_assert(PWM_PIN(E2_AUTO_FAN_PIN), "E2" AF_ERR_SUFF); #elif HAS_AUTO_FAN_3 static_assert(PWM_PIN(E3_AUTO_FAN_PIN), "E3" AF_ERR_SUFF); + #elif HAS_AUTO_FAN_4 + static_assert(PWM_PIN(E4_AUTO_FAN_PIN), "E4" AF_ERR_SUFF); + #elif HAS_AUTO_FAN_5 + static_assert(PWM_PIN(E5_AUTO_FAN_PIN), "E5" AF_ERR_SUFF); + #elif HAS_AUTO_FAN_6 + static_assert(PWM_PIN(E6_AUTO_FAN_PIN), "E6" AF_ERR_SUFF); + #elif HAS_AUTO_FAN_7 + static_assert(PWM_PIN(E7_AUTO_FAN_PIN), "E7" AF_ERR_SUFF); #endif #endif +/** + * Make sure only one EEPROM type is enabled + */ +#if ENABLED(EEPROM_SETTINGS) && 1 < ENABLED(SDCARD_EEPROM_EMULATION) + ENABLED(FLASH_EEPROM_EMULATION) + ENABLED(SRAM_EEPROM_EMULATION) + #error "Please select only one of SDCARD, FLASH, or SRAM_EEPROM_EMULATION." +#endif + /** * Make sure only one display is enabled */ diff --git a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h index 1f02f9299e..ef064694ab 100644 --- a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h +++ b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h @@ -31,6 +31,12 @@ #define BOARD_INFO_NAME "AZSMZ MINI" +// +// EEPROM +// +#define FLASH_EEPROM_EMULATION +//#define SDCARD_EEPROM_EMULATION + // // Servos // diff --git a/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h b/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h index 4ff4ebc73b..a4800dcc73 100644 --- a/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h +++ b/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h @@ -38,6 +38,12 @@ #define BOARD_INFO_NAME "BIQU Thunder B300 V1.0" #endif +// +// EEPROM +// +#define FLASH_EEPROM_EMULATION +//#define SDCARD_EEPROM_EMULATION + // // Limit Switches // diff --git a/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h b/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h index 17a9b7d58d..549b44019a 100644 --- a/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h +++ b/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h @@ -36,6 +36,12 @@ #define BOARD_INFO_NAME "BIQU BQ111-A4" +// +// EEPROM +// +#define FLASH_EEPROM_EMULATION +//#define SDCARD_EEPROM_EMULATION + // // Limit Switches // diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h index 104f40fdf1..feadafa592 100644 --- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h +++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h @@ -23,6 +23,12 @@ #define BOARD_INFO_NAME "BIGTREE SKR 1.1" +// +// EEPROM +// +#define FLASH_EEPROM_EMULATION +//#define SDCARD_EEPROM_EMULATION + // // Limit Switches // diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h index bd0ad468de..3bd2640665 100644 --- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h +++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h @@ -23,6 +23,12 @@ #define BOARD_INFO_NAME "BIGTREE SKR 1.3" +// +// EEPROM +// +#define FLASH_EEPROM_EMULATION +//#define SDCARD_EEPROM_EMULATION + /** * Trinamic Stallguard pins */ diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h index 3fb66aa156..25a8dda3a7 100644 --- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h +++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h @@ -25,6 +25,14 @@ #define BOARD_INFO_NAME "BIGTREE SKR 1.4" #endif +// +// EEPROM +// +#if NONE(FLASH_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION) + #define FLASH_EEPROM_EMULATION + //#define SDCARD_EEPROM_EMULATION +#endif + // // SD Connection // diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h index e84d3de2b1..2844fb3cda 100644 --- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h +++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h @@ -32,6 +32,10 @@ // Ignore temp readings during development. //#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000 +#if DISABLED(SDCARD_EEPROM_EMULATION) + #define FLASH_EEPROM_EMULATION +#endif + // // Steppers // diff --git a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h index 28445962ac..5ebf6ecba1 100644 --- a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h +++ b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h @@ -30,6 +30,12 @@ // Ignore temp readings during develpment. //#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000 +// +// EEPROM +// +#define FLASH_EEPROM_EMULATION +//#define SDCARD_EEPROM_EMULATION + // // Enable 12MHz clock output on P1.27 pin to sync TMC2208 chip clocks // diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h index b3dba6794c..6fb38f3e46 100644 --- a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h +++ b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h @@ -38,6 +38,14 @@ #define BOARD_WEBSITE_URL "github.com/makerbase-mks/MKS-SBASE" #endif +// +// EEPROM +// +#if NONE(FLASH_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION) + #define FLASH_EEPROM_EMULATION + //#define SDCARD_EEPROM_EMULATION +#endif + #define LED_PIN P1_18 // Used as a status indicator #define LED2_PIN P1_19 #define LED3_PIN P1_20 diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h index 58f9eb5493..e7471f6ec6 100644 --- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h +++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h @@ -32,6 +32,12 @@ #define BOARD_INFO_NAME "MKS SGen-L" #define BOARD_WEBSITE_URL "github.com/makerbase-mks/MKS-SGEN_L" +// +// EEPROM +// +#define FLASH_EEPROM_EMULATION +//#define SDCARD_EEPROM_EMULATION + // // Servos // diff --git a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h index bf989798fd..18c3ee992b 100644 --- a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h +++ b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h @@ -42,6 +42,12 @@ #define BOARD_INFO_NAME "Re-ARM RAMPS 1.4" +// +// EEPROM +// +#define FLASH_EEPROM_EMULATION +//#define SDCARD_EEPROM_EMULATION + // // Servos // diff --git a/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h b/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h index 1a8e997eb2..3c55ac9be3 100644 --- a/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h +++ b/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h @@ -32,6 +32,12 @@ #define BOARD_INFO_NAME "Selena Compact" #define BOARD_WEBSITE_URL "github.com/Ales2-k/Selena" +// +// EEPROM +// +#define FLASH_EEPROM_EMULATION +//#define SDCARD_EEPROM_EMULATION + // // Servos // diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h index 5ee0e58566..1b91e4f50b 100644 --- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h +++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h @@ -32,6 +32,12 @@ #define BOARD_INFO_NAME "Azteeg X5 GT" #define BOARD_WEBSITE_URL "tinyurl.com/yx8tdqa3" +// +// EEPROM +// +#define FLASH_EEPROM_EMULATION +//#define SDCARD_EEPROM_EMULATION + // // Servos // @@ -47,7 +53,6 @@ #define Z_MIN_PIN P1_26 #define Z_MAX_PIN P1_29 - // // Steppers // diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h index 2c54bd6035..7559d6ad50 100644 --- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h +++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h @@ -187,6 +187,14 @@ #endif // HAS_SPI_LCD +// +// EEPROM +// +#if NONE(FLASH_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION) + #define FLASH_EEPROM_EMULATION + //#define SDCARD_EEPROM_EMULATION +#endif + // // SD Support // diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h index 4b731ae9d3..1e5d2f3a2c 100644 --- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h +++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h @@ -31,6 +31,12 @@ #define BOARD_INFO_NAME "Azteeg X5 MINI WIFI" +// +// EEPROM +// +#define FLASH_EEPROM_EMULATION +//#define SDCARD_EEPROM_EMULATION + // // DIGIPOT slave addresses // diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h index 937ba56bb7..a8649b6f8d 100644 --- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h +++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h @@ -24,6 +24,12 @@ #define BOARD_INFO_NAME "BIGTREE SKR 1.4 TURBO" #define SKR_HAS_LPC1769 +// +// EEPROM +// +#define FLASH_EEPROM_EMULATION +//#define SDCARD_EEPROM_EMULATION + // // Include SKR 1.4 pins // diff --git a/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h b/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h index 739603e2b6..3556ff83f0 100644 --- a/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h +++ b/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h @@ -31,6 +31,12 @@ #define BOARD_INFO_NAME "Cohesion3D Mini" +// +// EEPROM +// +#define FLASH_EEPROM_EMULATION +//#define SDCARD_EEPROM_EMULATION + // // Servos // diff --git a/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h b/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h index 58bf0d6e71..2502c76580 100644 --- a/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h +++ b/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h @@ -31,6 +31,12 @@ #define BOARD_INFO_NAME "Cohesion3D ReMix" +// +// EEPROM +// +#define FLASH_EEPROM_EMULATION +//#define SDCARD_EEPROM_EMULATION + // // Servos // diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h index a5a91f6207..cac0868d51 100644 --- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h +++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h @@ -31,8 +31,14 @@ #define BOARD_INFO_NAME "MKS SGen" #define BOARD_WEBSITE_URL "github.com/makerbase-mks/MKS-SGEN" -#define MKS_HAS_LPC1769 +// +// EEPROM +// +#define FLASH_EEPROM_EMULATION +//#define SDCARD_EEPROM_EMULATION + +#define MKS_HAS_LPC1769 #include "../lpc1768/pins_MKS_SBASE.h" #undef E1_STEP_PIN diff --git a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h index 5bf64e9d02..3db8a99403 100644 --- a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h +++ b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h @@ -32,6 +32,12 @@ #define BOARD_INFO_NAME "Smoothieboard" #define BOARD_WEBSITE_URL "smoothieware.org/smoothieboard" +// +// EEPROM +// +#define FLASH_EEPROM_EMULATION +//#define SDCARD_EEPROM_EMULATION + // // Servos // diff --git a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h index 8f7d00bb3b..9f28c2d94e 100644 --- a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h +++ b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h @@ -32,6 +32,12 @@ #define BOARD_INFO_NAME "TH3D EZBoard" #define BOARD_WEBSITE_URL "th3dstudio.com" +// +// EEPROM +// +#define FLASH_EEPROM_EMULATION +//#define SDCARD_EEPROM_EMULATION + // // Servos // From f6e80d576dc0c538852fa32dd09584b564314916 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 16 Mar 2020 17:49:33 -0500 Subject: [PATCH 14/14] Fix Z_MIN_PROBE_PIN on SKR 1.4 (#17187) --- Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h index 25a8dda3a7..e9a46ba551 100644 --- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h +++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h @@ -96,11 +96,7 @@ // Z Probe (when not Z_MIN_PIN) // #ifndef Z_MIN_PROBE_PIN - #if Z_STOP_PIN != P1_27 - #define Z_MIN_PROBE_PIN P1_27 - #else - #define Z_MIN_PROBE_PIN P0_10 - #endif + #define Z_MIN_PROBE_PIN P0_10 #endif //