Parcourir la source

Merge nightly patches

Scott Lahteine il y a 5 ans
Parent
révision
129b1bb8d4
45 fichiers modifiés avec 224 ajouts et 52 suppressions
  1. 1
    0
      Marlin/Configuration.h
  2. 7
    3
      Marlin/Configuration_adv.h
  3. 1
    1
      Marlin/src/HAL/DUE/inc/Conditionals_post.h
  4. 5
    0
      Marlin/src/HAL/ESP32/inc/Conditionals_post.h
  5. 2
    6
      Marlin/src/HAL/LPC1768/inc/Conditionals_post.h
  6. 1
    2
      Marlin/src/HAL/LPC1768/persistent_store_flash.cpp
  7. 1
    1
      Marlin/src/HAL/SAMD51/inc/Conditionals_post.h
  8. 5
    0
      Marlin/src/HAL/STM32/inc/Conditionals_post.h
  9. 1
    2
      Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h
  10. 5
    0
      Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h
  11. 6
    4
      Marlin/src/MarlinCore.cpp
  12. 13
    3
      Marlin/src/MarlinCore.h
  13. 0
    1
      Marlin/src/core/utility.cpp
  14. 6
    1
      Marlin/src/gcode/bedlevel/abl/G29.cpp
  15. 1
    1
      Marlin/src/gcode/calibrate/G34_M422.cpp
  16. 2
    2
      Marlin/src/gcode/control/M999.cpp
  17. 1
    3
      Marlin/src/inc/Conditionals_post.h
  18. 15
    0
      Marlin/src/inc/SanityCheck.h
  19. 1
    1
      Marlin/src/inc/Version.h
  20. 3
    4
      Marlin/src/lcd/dogm/status_screen_DOGM.cpp
  21. 4
    4
      Marlin/src/lcd/menu/menu_configuration.cpp
  22. 5
    3
      Marlin/src/module/configuration_store.cpp
  23. 4
    1
      Marlin/src/module/planner.cpp
  24. 2
    2
      Marlin/src/module/temperature.cpp
  25. 6
    0
      Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
  26. 6
    0
      Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h
  27. 6
    0
      Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
  28. 6
    0
      Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
  29. 6
    0
      Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
  30. 9
    5
      Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
  31. 4
    0
      Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
  32. 6
    0
      Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
  33. 8
    0
      Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
  34. 6
    0
      Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
  35. 6
    0
      Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
  36. 6
    0
      Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
  37. 6
    1
      Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
  38. 8
    0
      Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
  39. 6
    0
      Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h
  40. 6
    0
      Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h
  41. 6
    0
      Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
  42. 6
    0
      Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
  43. 7
    1
      Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
  44. 6
    0
      Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
  45. 6
    0
      Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h

+ 1
- 0
Marlin/Configuration.h Voir le fichier

@@ -1446,6 +1446,7 @@
1446 1446
 //#define EEPROM_SETTINGS     // Persistent storage with M500 and M501
1447 1447
 //#define DISABLE_M503        // Saves ~2700 bytes of PROGMEM. Disable for release!
1448 1448
 #define EEPROM_CHITCHAT       // Give feedback on EEPROM commands. Disable to save PROGMEM.
1449
+#define EEPROM_BOOT_SILENT    // Keep M503 quiet and only give errors during first load
1449 1450
 #if ENABLED(EEPROM_SETTINGS)
1450 1451
   //#define EEPROM_AUTO_INIT  // Init EEPROM automatically on any errors.
1451 1452
 #endif

+ 7
- 3
Marlin/Configuration_adv.h Voir le fichier

@@ -753,8 +753,12 @@
753 753
 // Minimum time that a segment needs to take if the buffer is emptied
754 754
 #define DEFAULT_MINSEGMENTTIME        20000   // (ms)
755 755
 
756
-// If defined the movements slow down when the look ahead buffer is only half full
756
+// Slow down the machine if the look ahead buffer is (by default) half full.
757
+// Increase the slowdown divisor for larger buffer sizes.
757 758
 #define SLOWDOWN
759
+#if ENABLED(SLOWDOWN)
760
+  #define SLOWDOWN_DIVISOR 2
761
+#endif
758 762
 
759 763
 // Frequency limit
760 764
 // See nophead's blog for more info
@@ -999,7 +1003,7 @@
999 1003
   #define BOOTSCREEN_TIMEOUT 4000        // (ms) Total Duration to display the boot screen(s)
1000 1004
 #endif
1001 1005
 
1002
-#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS
1006
+#if HAS_GRAPHICAL_LCD && EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
1003 1007
   //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
1004 1008
   //#define SHOW_REMAINING_TIME          // Display estimated time to completion
1005 1009
   #if ENABLED(SHOW_REMAINING_TIME)
@@ -1008,7 +1012,7 @@
1008 1012
   #endif
1009 1013
 #endif
1010 1014
 
1011
-#if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
1015
+#if HAS_CHARACTER_LCD && EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
1012 1016
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
1013 1017
   #if ENABLED(LCD_PROGRESS_BAR)
1014 1018
     #define PROGRESS_BAR_BAR_TIME 2000    // (ms) Amount of time to show the bar

+ 1
- 1
Marlin/src/HAL/DUE/inc/Conditionals_post.h Voir le fichier

@@ -24,5 +24,5 @@
24 24
 #if USE_EMULATED_EEPROM
25 25
   #undef SRAM_EEPROM_EMULATION
26 26
   #undef SDCARD_EEPROM_EMULATION
27
-  #define FLASH_EEPROM_EMULATION 1
27
+  #define FLASH_EEPROM_EMULATION
28 28
 #endif

+ 5
- 0
Marlin/src/HAL/ESP32/inc/Conditionals_post.h Voir le fichier

@@ -20,3 +20,8 @@
20 20
  *
21 21
  */
22 22
 #pragma once
23
+
24
+// If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation
25
+#if ENABLED(EEPROM_SETTINGS) && NONE(USE_REAL_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
26
+  #define SDCARD_EEPROM_EMULATION
27
+#endif

+ 2
- 6
Marlin/src/HAL/LPC1768/inc/Conditionals_post.h Voir le fichier

@@ -21,10 +21,6 @@
21 21
  */
22 22
 #pragma once
23 23
 
24
-#if ENABLED(EEPROM_SETTINGS)
25
-  #undef USE_REAL_EEPROM
26
-  #define USE_EMULATED_EEPROM 1
27
-  #if DISABLED(FLASH_EEPROM_EMULATION)
28
-    #define SDCARD_EEPROM_EMULATION 1
29
-  #endif
24
+#if USE_EMULATED_EEPROM && NONE(SDCARD_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
25
+  #define FLASH_EEPROM_EMULATION
30 26
 #endif

+ 1
- 2
Marlin/src/HAL/LPC1768/persistent_store_flash.cpp Voir le fichier

@@ -36,12 +36,11 @@
36 36
  * 16Kb I/O buffers (intended to hold DMA USB and Ethernet data, but currently
37 37
  * unused).
38 38
  */
39
-#include "../../inc/MarlinConfigPre.h"
39
+#include "../../inc/MarlinConfig.h"
40 40
 
41 41
 #if ENABLED(FLASH_EEPROM_EMULATION)
42 42
 
43 43
 #include "persistent_store_api.h"
44
-#include "../../inc/MarlinConfig.h"
45 44
 
46 45
 extern "C" {
47 46
   #include <lpc17xx_iap.h>

+ 1
- 1
Marlin/src/HAL/SAMD51/inc/Conditionals_post.h Voir le fichier

@@ -24,5 +24,5 @@
24 24
 #if USE_EMULATED_EEPROM
25 25
   #undef SRAM_EEPROM_EMULATION
26 26
   #undef SDCARD_EEPROM_EMULATION
27
-  #define FLASH_EEPROM_EMULATION 1
27
+  #define FLASH_EEPROM_EMULATION
28 28
 #endif

+ 5
- 0
Marlin/src/HAL/STM32/inc/Conditionals_post.h Voir le fichier

@@ -20,3 +20,8 @@
20 20
  *
21 21
  */
22 22
 #pragma once
23
+
24
+// If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation
25
+#if ENABLED(EEPROM_SETTINGS) && NONE(USE_REAL_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
26
+  #define SDCARD_EEPROM_EMULATION
27
+#endif

+ 1
- 2
Marlin/src/HAL/STM32_F4_F7/inc/Conditionals_post.h Voir le fichier

@@ -23,8 +23,7 @@
23 23
 
24 24
 #if ENABLED(EEPROM_SETTINGS) && defined(STM32F7)
25 25
   #undef USE_REAL_EEPROM
26
-  #define USE_EMULATED_EEPROM 1
27 26
   #undef SRAM_EEPROM_EMULATION
28 27
   #undef SDCARD_EEPROM_EMULATION
29
-  #define FLASH_EEPROM_EMULATION 1
28
+  #define FLASH_EEPROM_EMULATION
30 29
 #endif

+ 5
- 0
Marlin/src/HAL/TEENSY31_32/inc/Conditionals_post.h Voir le fichier

@@ -20,3 +20,8 @@
20 20
  *
21 21
  */
22 22
 #pragma once
23
+
24
+// If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation
25
+#if ENABLED(EEPROM_SETTINGS) && NONE(USE_REAL_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
26
+  #define SDCARD_EEPROM_EMULATION
27
+#endif

+ 6
- 4
Marlin/src/MarlinCore.cpp Voir le fichier

@@ -202,7 +202,7 @@ const char NUL_STR[] PROGMEM = "",
202 202
            SP_Z_LBL[] PROGMEM = " Z:",
203 203
            SP_E_LBL[] PROGMEM = " E:";
204 204
 
205
-bool Running = true;
205
+MarlinState marlin_state = MF_INITIALIZING;
206 206
 
207 207
 // For M109 and M190, this flag may be cleared (by M108) to exit the wait loop
208 208
 bool wait_for_heatup = true;
@@ -839,7 +839,7 @@ void stop() {
839 839
     SERIAL_ERROR_MSG(STR_ERR_STOPPED);
840 840
     LCD_MESSAGEPGM(MSG_STOPPED);
841 841
     safe_delay(350);       // allow enough time for messages to get out before stopping
842
-    Running = false;
842
+    marlin_state = MF_STOPPED;
843 843
   }
844 844
 }
845 845
 
@@ -991,8 +991,8 @@ void setup() {
991 991
     SETUP_RUN(ui.show_bootscreen());
992 992
   #endif
993 993
 
994
-  #if ENABLED(SDSUPPORT)
995
-    SETUP_RUN(card.mount());          // Mount the SD card before settings.first_load
994
+  #if ENABLED(SDSUPPORT) && defined(SDCARD_CONNECTION) && !SD_CONNECTION_IS(LCD)
995
+    SETUP_RUN(card.mount());          // Mount onboard / custom SD card before settings.first_load
996 996
   #endif
997 997
 
998 998
   SETUP_RUN(settings.first_load());   // Load data from EEPROM if available (or use defaults)
@@ -1183,6 +1183,8 @@ void setup() {
1183 1183
     SETUP_RUN(max7219.init());
1184 1184
   #endif
1185 1185
 
1186
+  marlin_state = MF_RUNNING;
1187
+
1186 1188
   SETUP_LOG("setup() completed.");
1187 1189
 }
1188 1190
 

+ 13
- 3
Marlin/src/MarlinCore.h Voir le fichier

@@ -76,9 +76,19 @@ void minkill(const bool steppers_off=false);
76 76
 
77 77
 void quickstop_stepper();
78 78
 
79
-extern bool Running;
80
-inline bool IsRunning() { return  Running; }
81
-inline bool IsStopped() { return !Running; }
79
+// Global State of the firmware
80
+enum MarlinState : uint8_t {
81
+  MF_INITIALIZING =  0,
82
+  MF_RUNNING      = _BV(0),
83
+  MF_PAUSED       = _BV(1),
84
+  MF_WAITING      = _BV(2),
85
+  MF_STOPPED      = _BV(3),
86
+  MF_KILLED       = _BV(7)
87
+};
88
+
89
+extern MarlinState marlin_state;
90
+inline bool IsRunning() { return marlin_state == MF_RUNNING; }
91
+inline bool IsStopped() { return marlin_state != MF_RUNNING; }
82 92
 
83 93
 bool printingIsActive();
84 94
 bool printingIsPaused();

+ 0
- 1
Marlin/src/core/utility.cpp Voir le fichier

@@ -67,7 +67,6 @@ void safe_delay(millis_t ms) {
67 67
       TERN(PROBE_MANUALLY, "PROBE_MANUALLY", "")
68 68
       TERN(NOZZLE_AS_PROBE, "NOZZLE_AS_PROBE", "")
69 69
       TERN(FIX_MOUNTED_PROBE, "FIX_MOUNTED_PROBE", "")
70
-      TERN(BLTOUCH, "BLTOUCH", "")
71 70
       TERN(HAS_Z_SERVO_PROBE, TERN(BLTOUCH, "BLTOUCH", "SERVO PROBE"), "")
72 71
       TERN(TOUCH_MI_PROBE, "TOUCH_MI_PROBE", "")
73 72
       TERN(Z_PROBE_SLED, "Z_PROBE_SLED", "")

+ 6
- 1
Marlin/src/gcode/bedlevel/abl/G29.cpp Voir le fichier

@@ -934,7 +934,12 @@ G29_TYPE GcodeSuite::G29() {
934 934
 
935 935
         // Unapply the offset because it is going to be immediately applied
936 936
         // and cause compensation movement in Z
937
-        current_position.z -= bilinear_z_offset(current_position);
937
+        #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
938
+          const float fade_scaling_factor = planner.fade_scaling_factor_for_z(current_position.z);
939
+        #else
940
+          constexpr float fade_scaling_factor = 1.0f;
941
+        #endif
942
+        current_position.z -= fade_scaling_factor * bilinear_z_offset(current_position);
938 943
 
939 944
         if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(" corrected Z:", current_position.z);
940 945
       }

+ 1
- 1
Marlin/src/gcode/calibrate/G34_M422.cpp Voir le fichier

@@ -203,7 +203,7 @@ void GcodeSuite::G34() {
203 203
         const uint8_t iprobe = (iteration & 1) ? NUM_Z_STEPPER_DRIVERS - 1 - i : i;
204 204
 
205 205
         // Safe clearance even on an incline
206
-        if (iteration == 0 || i > 0) do_blocking_move_to_z(z_probe);
206
+        if ((iteration == 0 || i > 0) && z_probe > current_position.z) do_blocking_move_to_z(z_probe);
207 207
 
208 208
         if (DEBUGGING(LEVELING))
209 209
           DEBUG_ECHOLNPAIR_P(PSTR("Probing X"), z_stepper_align.xy[iprobe].x, SP_Y_STR, z_stepper_align.xy[iprobe].y);

+ 2
- 2
Marlin/src/gcode/control/M999.cpp Voir le fichier

@@ -23,7 +23,7 @@
23 23
 #include "../gcode.h"
24 24
 
25 25
 #include "../../lcd/ultralcd.h" // for lcd_reset_alert_level
26
-#include "../../MarlinCore.h"   // for Running
26
+#include "../../MarlinCore.h"   // for marlin_state
27 27
 #include "../queue.h"           // for flush_and_request_resend
28 28
 
29 29
 /**
@@ -37,7 +37,7 @@
37 37
  *
38 38
  */
39 39
 void GcodeSuite::M999() {
40
-  Running = true;
40
+  marlin_state = MF_RUNNING;
41 41
   ui.reset_alert_level();
42 42
 
43 43
   if (parser.boolval('S')) return;

+ 1
- 3
Marlin/src/inc/Conditionals_post.h Voir le fichier

@@ -35,15 +35,13 @@
35 35
   #define HAS_LINEAR_E_JERK 1
36 36
 #endif
37 37
 
38
+// If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation
38 39
 #if ENABLED(EEPROM_SETTINGS)
39 40
   #if NONE(FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION) && EITHER(I2C_EEPROM, SPI_EEPROM)
40 41
     #define USE_REAL_EEPROM 1
41 42
   #else
42 43
     #define USE_EMULATED_EEPROM 1
43 44
   #endif
44
-  #if NONE(USE_REAL_EEPROM, FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION)
45
-    #define SDCARD_EEPROM_EMULATION 1
46
-  #endif
47 45
 #else
48 46
   #undef I2C_EEPROM
49 47
   #undef SPI_EEPROM

+ 15
- 0
Marlin/src/inc/SanityCheck.h Voir le fichier

@@ -1993,10 +1993,25 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
1993 1993
     static_assert(PWM_PIN(E2_AUTO_FAN_PIN), "E2" AF_ERR_SUFF);
1994 1994
   #elif HAS_AUTO_FAN_3
1995 1995
     static_assert(PWM_PIN(E3_AUTO_FAN_PIN), "E3" AF_ERR_SUFF);
1996
+  #elif HAS_AUTO_FAN_4
1997
+    static_assert(PWM_PIN(E4_AUTO_FAN_PIN), "E4" AF_ERR_SUFF);
1998
+  #elif HAS_AUTO_FAN_5
1999
+    static_assert(PWM_PIN(E5_AUTO_FAN_PIN), "E5" AF_ERR_SUFF);
2000
+  #elif HAS_AUTO_FAN_6
2001
+    static_assert(PWM_PIN(E6_AUTO_FAN_PIN), "E6" AF_ERR_SUFF);
2002
+  #elif HAS_AUTO_FAN_7
2003
+    static_assert(PWM_PIN(E7_AUTO_FAN_PIN), "E7" AF_ERR_SUFF);
1996 2004
   #endif
1997 2005
 #endif
1998 2006
 
1999 2007
 /**
2008
+ * Make sure only one EEPROM type is enabled
2009
+ */
2010
+#if ENABLED(EEPROM_SETTINGS) && 1 < ENABLED(SDCARD_EEPROM_EMULATION) + ENABLED(FLASH_EEPROM_EMULATION) + ENABLED(SRAM_EEPROM_EMULATION)
2011
+  #error "Please select only one of SDCARD, FLASH, or SRAM_EEPROM_EMULATION."
2012
+#endif
2013
+
2014
+/**
2000 2015
  * Make sure only one display is enabled
2001 2016
  */
2002 2017
 #if 1 < 0 \

+ 1
- 1
Marlin/src/inc/Version.h Voir le fichier

@@ -42,7 +42,7 @@
42 42
  * version was tagged.
43 43
  */
44 44
 #ifndef STRING_DISTRIBUTION_DATE
45
-  #define STRING_DISTRIBUTION_DATE "2020-03-14"
45
+  #define STRING_DISTRIBUTION_DATE "2020-03-16"
46 46
 #endif
47 47
 
48 48
 /**

+ 3
- 4
Marlin/src/lcd/dogm/status_screen_DOGM.cpp Voir le fichier

@@ -448,10 +448,10 @@ void MarlinUI::draw_status_screen() {
448 448
         #endif
449 449
       }
450 450
 
451
+      constexpr bool can_show_days = DISABLED(DOGM_SD_PERCENT) || ENABLED(ROTATE_PROGRESS_DISPLAY);
451 452
       if (ev != lastElapsed) {
452 453
         lastElapsed = ev;
453
-        const bool has_days = (elapsed.value >= 60*60*24L);
454
-        const uint8_t len = elapsed.toDigital(elapsed_string, has_days);
454
+        const uint8_t len = elapsed.toDigital(elapsed_string, can_show_days && elapsed.value >= 60*60*24L);
455 455
         elapsed_x_pos = _SD_INFO_X(len);
456 456
 
457 457
         #if ENABLED(SHOW_REMAINING_TIME)
@@ -468,8 +468,7 @@ void MarlinUI::draw_status_screen() {
468 468
             }
469 469
             else {
470 470
               duration_t estimation = timeval;
471
-              const bool has_days = (estimation.value >= 60*60*24L);
472
-              const uint8_t len = estimation.toDigital(estimation_string, has_days);
471
+              const uint8_t len = estimation.toDigital(estimation_string, can_show_days && estimation.value >= 60*60*24L);
473 472
               estimation_x_pos = _SD_INFO_X(len
474 473
                 #if !BOTH(DOGM_SD_PERCENT, ROTATE_PROGRESS_DISPLAY)
475 474
                   + 1

+ 4
- 4
Marlin/src/lcd/menu/menu_configuration.cpp Voir le fichier

@@ -138,12 +138,12 @@ void menu_advanced_settings();
138 138
     START_MENU();
139 139
     BACK_ITEM(MSG_CONFIGURATION);
140 140
     #if ENABLED(DUAL_X_CARRIAGE)
141
-      EDIT_ITEM_FAST(float51, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, float(X2_HOME_POS - 25), float(X2_HOME_POS + 25), _recalc_offsets);
141
+      EDIT_ITEM_FAST(float52, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, float(X2_HOME_POS - 25), float(X2_HOME_POS + 25), _recalc_offsets);
142 142
     #else
143
-      EDIT_ITEM_FAST(float41sign, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, -99.0, 99.0, _recalc_offsets);
143
+      EDIT_ITEM_FAST(float52, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, -99.0, 99.0, _recalc_offsets);
144 144
     #endif
145
-    EDIT_ITEM_FAST(float41sign, MSG_HOTEND_OFFSET_Y, &hotend_offset[1].y, -99.0, 99.0, _recalc_offsets);
146
-    EDIT_ITEM_FAST(float41sign, MSG_HOTEND_OFFSET_Z, &hotend_offset[1].z, Z_PROBE_LOW_POINT, 10.0, _recalc_offsets);
145
+    EDIT_ITEM_FAST(float52,   MSG_HOTEND_OFFSET_Y, &hotend_offset[1].y, -99.0, 99.0, _recalc_offsets);
146
+    EDIT_ITEM_FAST(float52,   MSG_HOTEND_OFFSET_Z, &hotend_offset[1].z, Z_PROBE_LOW_POINT, 10.0, _recalc_offsets);
147 147
     #if ENABLED(EEPROM_SETTINGS)
148 148
       ACTION_ITEM(MSG_STORE_EEPROM, lcd_store_settings);
149 149
     #endif

+ 5
- 3
Marlin/src/module/configuration_store.cpp Voir le fichier

@@ -1531,10 +1531,10 @@ void MarlinSettings::postprocess() {
1531 1531
         _FIELD_TEST(planner_leveling_active);
1532 1532
         #if ENABLED(AUTO_BED_LEVELING_UBL)
1533 1533
           const bool &planner_leveling_active = planner.leveling_active;
1534
-          const uint8_t &ubl_storage_slot = ubl.storage_slot;
1534
+          const int8_t &ubl_storage_slot = ubl.storage_slot;
1535 1535
         #else
1536 1536
           bool planner_leveling_active;
1537
-          uint8_t ubl_storage_slot;
1537
+          int8_t ubl_storage_slot;
1538 1538
         #endif
1539 1539
         EEPROM_READ(planner_leveling_active);
1540 1540
         EEPROM_READ(ubl_storage_slot);
@@ -2185,8 +2185,10 @@ void MarlinSettings::postprocess() {
2185 2185
     }
2186 2186
 
2187 2187
     #if ENABLED(EEPROM_CHITCHAT) && DISABLED(DISABLE_M503)
2188
-      if (!validating) report();
2188
+      // Report the EEPROM settings
2189
+      if (!validating && (DISABLED(EEPROM_BOOT_SILENT) || IsRunning())) report();
2189 2190
     #endif
2191
+
2190 2192
     EEPROM_FINISH();
2191 2193
 
2192 2194
     return !eeprom_error;

+ 4
- 1
Marlin/src/module/planner.cpp Voir le fichier

@@ -2041,7 +2041,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
2041 2041
   #endif
2042 2042
 
2043 2043
   #if ENABLED(SLOWDOWN)
2044
-    if (WITHIN(moves_queued, 2, (BLOCK_BUFFER_SIZE) / 2 - 1)) {
2044
+    #ifndef SLOWDOWN_DIVISOR
2045
+      #define SLOWDOWN_DIVISOR 2
2046
+    #endif
2047
+    if (WITHIN(moves_queued, 2, (BLOCK_BUFFER_SIZE) / (SLOWDOWN_DIVISOR) - 1)) {
2045 2048
       if (segment_time_us < settings.min_segment_time_us) {
2046 2049
         // buffer is draining, add extra time.  The amount of time added increases if the buffer is still emptied more.
2047 2050
         const uint32_t nst = segment_time_us + LROUND(2 * (settings.min_segment_time_us - segment_time_us) / moves_queued);

+ 2
- 2
Marlin/src/module/temperature.cpp Voir le fichier

@@ -765,7 +765,7 @@ int16_t Temperature::getHeaterPower(const heater_ind_t heater_id) {
765 765
 //
766 766
 
767 767
 inline void loud_kill(PGM_P const lcd_msg, const heater_ind_t heater) {
768
-  Running = false;
768
+  marlin_state = MF_KILLED;
769 769
   #if USE_BEEPER
770 770
     for (uint8_t i = 20; i--;) {
771 771
       WRITE(BEEPER_PIN, HIGH); delay(25);
@@ -2003,7 +2003,7 @@ void Temperature::init() {
2003 2003
 
2004 2004
     /**
2005 2005
       SERIAL_ECHO_START();
2006
-      SERIAL_ECHOPGM("Thermal Thermal Runaway Running. Heater ID: ");
2006
+      SERIAL_ECHOPGM("Thermal Runaway Running. Heater ID: ");
2007 2007
       if (heater_id == H_CHAMBER) SERIAL_ECHOPGM("chamber");
2008 2008
       if (heater_id < 0) SERIAL_ECHOPGM("bed"); else SERIAL_ECHO(heater_id);
2009 2009
       SERIAL_ECHOPAIR(" ;  State:", sm.state, " ;  Timer:", sm.timer, " ;  Temperature:", current, " ;  Target Temp:", target);

+ 6
- 0
Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h Voir le fichier

@@ -32,6 +32,12 @@
32 32
 #define BOARD_INFO_NAME "AZSMZ MINI"
33 33
 
34 34
 //
35
+// EEPROM
36
+//
37
+#define FLASH_EEPROM_EMULATION
38
+//#define SDCARD_EEPROM_EMULATION
39
+
40
+//
35 41
 // Servos
36 42
 //
37 43
 #define SERVO0_PIN         P1_23

+ 6
- 0
Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h Voir le fichier

@@ -39,6 +39,12 @@
39 39
 #endif
40 40
 
41 41
 //
42
+// EEPROM
43
+//
44
+#define FLASH_EEPROM_EMULATION
45
+//#define SDCARD_EEPROM_EMULATION
46
+
47
+//
42 48
 // Limit Switches
43 49
 //
44 50
 #define X_MIN_PIN          P1_24   // 10k pullup to 3.3V, 1K series

+ 6
- 0
Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h Voir le fichier

@@ -37,6 +37,12 @@
37 37
 #define BOARD_INFO_NAME "BIQU BQ111-A4"
38 38
 
39 39
 //
40
+// EEPROM
41
+//
42
+#define FLASH_EEPROM_EMULATION
43
+//#define SDCARD_EEPROM_EMULATION
44
+
45
+//
40 46
 // Limit Switches
41 47
 //
42 48
 #define X_MIN_PIN         P1_24   // 10k pullup to 3.3V, 1K series

+ 6
- 0
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h Voir le fichier

@@ -24,6 +24,12 @@
24 24
 #define BOARD_INFO_NAME "BIGTREE SKR 1.1"
25 25
 
26 26
 //
27
+// EEPROM
28
+//
29
+#define FLASH_EEPROM_EMULATION
30
+//#define SDCARD_EEPROM_EMULATION
31
+
32
+//
27 33
 // Limit Switches
28 34
 //
29 35
 

+ 6
- 0
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h Voir le fichier

@@ -23,6 +23,12 @@
23 23
 
24 24
 #define BOARD_INFO_NAME "BIGTREE SKR 1.3"
25 25
 
26
+//
27
+// EEPROM
28
+//
29
+#define FLASH_EEPROM_EMULATION
30
+//#define SDCARD_EEPROM_EMULATION
31
+
26 32
 /**
27 33
  * Trinamic Stallguard pins
28 34
  */

+ 9
- 5
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h Voir le fichier

@@ -26,6 +26,14 @@
26 26
 #endif
27 27
 
28 28
 //
29
+// EEPROM
30
+//
31
+#if NONE(FLASH_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION)
32
+  #define FLASH_EEPROM_EMULATION
33
+  //#define SDCARD_EEPROM_EMULATION
34
+#endif
35
+
36
+//
29 37
 // SD Connection
30 38
 //
31 39
 #ifndef SDCARD_CONNECTION
@@ -88,11 +96,7 @@
88 96
 // Z Probe (when not Z_MIN_PIN)
89 97
 //
90 98
 #ifndef Z_MIN_PROBE_PIN
91
-  #if Z_STOP_PIN != P1_27
92
-    #define Z_MIN_PROBE_PIN P1_27
93
-  #else
94
-    #define Z_MIN_PROBE_PIN P0_10
95
-  #endif
99
+  #define Z_MIN_PROBE_PIN  P0_10
96 100
 #endif
97 101
 
98 102
 //

+ 4
- 0
Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h Voir le fichier

@@ -32,6 +32,10 @@
32 32
 // Ignore temp readings during development.
33 33
 //#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
34 34
 
35
+#if DISABLED(SDCARD_EEPROM_EMULATION)
36
+  #define FLASH_EEPROM_EMULATION
37
+#endif
38
+
35 39
 //
36 40
 // Steppers
37 41
 //

+ 6
- 0
Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h Voir le fichier

@@ -31,6 +31,12 @@
31 31
 //#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
32 32
 
33 33
 //
34
+// EEPROM
35
+//
36
+#define FLASH_EEPROM_EMULATION
37
+//#define SDCARD_EEPROM_EMULATION
38
+
39
+//
34 40
 // Enable 12MHz clock output on P1.27 pin to sync TMC2208 chip clocks
35 41
 //
36 42
 #define LPC1768_ENABLE_CLKOUT_12M

+ 8
- 0
Marlin/src/pins/lpc1768/pins_MKS_SBASE.h Voir le fichier

@@ -38,6 +38,14 @@
38 38
   #define BOARD_WEBSITE_URL "github.com/makerbase-mks/MKS-SBASE"
39 39
 #endif
40 40
 
41
+//
42
+// EEPROM
43
+//
44
+#if NONE(FLASH_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION)
45
+  #define FLASH_EEPROM_EMULATION
46
+  //#define SDCARD_EEPROM_EMULATION
47
+#endif
48
+
41 49
 #define LED_PIN            P1_18   // Used as a status indicator
42 50
 #define LED2_PIN           P1_19
43 51
 #define LED3_PIN           P1_20

+ 6
- 0
Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h Voir le fichier

@@ -33,6 +33,12 @@
33 33
 #define BOARD_WEBSITE_URL "github.com/makerbase-mks/MKS-SGEN_L"
34 34
 
35 35
 //
36
+// EEPROM
37
+//
38
+#define FLASH_EEPROM_EMULATION
39
+//#define SDCARD_EEPROM_EMULATION
40
+
41
+//
36 42
 // Servos
37 43
 //
38 44
 #define SERVO0_PIN         P1_23   // SERVO P1.23

+ 6
- 0
Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h Voir le fichier

@@ -43,6 +43,12 @@
43 43
 #define BOARD_INFO_NAME "Re-ARM RAMPS 1.4"
44 44
 
45 45
 //
46
+// EEPROM
47
+//
48
+#define FLASH_EEPROM_EMULATION
49
+//#define SDCARD_EEPROM_EMULATION
50
+
51
+//
46 52
 // Servos
47 53
 //
48 54
 #define SERVO0_PIN         P1_20   // (11)

+ 6
- 0
Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h Voir le fichier

@@ -33,6 +33,12 @@
33 33
 #define BOARD_WEBSITE_URL "github.com/Ales2-k/Selena"
34 34
 
35 35
 //
36
+// EEPROM
37
+//
38
+#define FLASH_EEPROM_EMULATION
39
+//#define SDCARD_EEPROM_EMULATION
40
+
41
+//
36 42
 // Servos
37 43
 //
38 44
 #define SERVO0_PIN        P1_23

+ 6
- 1
Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h Voir le fichier

@@ -33,6 +33,12 @@
33 33
 #define BOARD_WEBSITE_URL "tinyurl.com/yx8tdqa3"
34 34
 
35 35
 //
36
+// EEPROM
37
+//
38
+#define FLASH_EEPROM_EMULATION
39
+//#define SDCARD_EEPROM_EMULATION
40
+
41
+//
36 42
 // Servos
37 43
 //
38 44
 #define SERVO0_PIN         P1_23
@@ -47,7 +53,6 @@
47 53
 #define Z_MIN_PIN          P1_26
48 54
 #define Z_MAX_PIN          P1_29
49 55
 
50
-
51 56
 //
52 57
 // Steppers
53 58
 //

+ 8
- 0
Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h Voir le fichier

@@ -188,6 +188,14 @@
188 188
 #endif // HAS_SPI_LCD
189 189
 
190 190
 //
191
+// EEPROM
192
+//
193
+#if NONE(FLASH_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION)
194
+  #define FLASH_EEPROM_EMULATION
195
+  //#define SDCARD_EEPROM_EMULATION
196
+#endif
197
+
198
+//
191 199
 // SD Support
192 200
 //
193 201
 #ifndef SDCARD_CONNECTION

+ 6
- 0
Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h Voir le fichier

@@ -32,6 +32,12 @@
32 32
 #define BOARD_INFO_NAME "Azteeg X5 MINI WIFI"
33 33
 
34 34
 //
35
+// EEPROM
36
+//
37
+#define FLASH_EEPROM_EMULATION
38
+//#define SDCARD_EEPROM_EMULATION
39
+
40
+//
35 41
 // DIGIPOT slave addresses
36 42
 //
37 43
 #ifndef DIGIPOT_I2C_ADDRESS_A

+ 6
- 0
Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h Voir le fichier

@@ -25,6 +25,12 @@
25 25
 #define SKR_HAS_LPC1769
26 26
 
27 27
 //
28
+// EEPROM
29
+//
30
+#define FLASH_EEPROM_EMULATION
31
+//#define SDCARD_EEPROM_EMULATION
32
+
33
+//
28 34
 // Include SKR 1.4 pins
29 35
 //
30 36
 #include "../lpc1768/pins_BTT_SKR_V1_4.h"

+ 6
- 0
Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h Voir le fichier

@@ -32,6 +32,12 @@
32 32
 #define BOARD_INFO_NAME "Cohesion3D Mini"
33 33
 
34 34
 //
35
+// EEPROM
36
+//
37
+#define FLASH_EEPROM_EMULATION
38
+//#define SDCARD_EEPROM_EMULATION
39
+
40
+//
35 41
 // Servos
36 42
 //
37 43
 #define SERVO0_PIN         P1_23

+ 6
- 0
Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h Voir le fichier

@@ -32,6 +32,12 @@
32 32
 #define BOARD_INFO_NAME "Cohesion3D ReMix"
33 33
 
34 34
 //
35
+// EEPROM
36
+//
37
+#define FLASH_EEPROM_EMULATION
38
+//#define SDCARD_EEPROM_EMULATION
39
+
40
+//
35 41
 // Servos
36 42
 //
37 43
 #define SERVO0_PIN         P2_04

+ 7
- 1
Marlin/src/pins/lpc1769/pins_MKS_SGEN.h Voir le fichier

@@ -31,8 +31,14 @@
31 31
 
32 32
 #define BOARD_INFO_NAME   "MKS SGen"
33 33
 #define BOARD_WEBSITE_URL "github.com/makerbase-mks/MKS-SGEN"
34
-#define MKS_HAS_LPC1769
35 34
 
35
+//
36
+// EEPROM
37
+//
38
+#define FLASH_EEPROM_EMULATION
39
+//#define SDCARD_EEPROM_EMULATION
40
+
41
+#define MKS_HAS_LPC1769
36 42
 #include "../lpc1768/pins_MKS_SBASE.h"
37 43
 
38 44
 #undef E1_STEP_PIN

+ 6
- 0
Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h Voir le fichier

@@ -33,6 +33,12 @@
33 33
 #define BOARD_WEBSITE_URL "smoothieware.org/smoothieboard"
34 34
 
35 35
 //
36
+// EEPROM
37
+//
38
+#define FLASH_EEPROM_EMULATION
39
+//#define SDCARD_EEPROM_EMULATION
40
+
41
+//
36 42
 // Servos
37 43
 //
38 44
 #define SERVO0_PIN         P1_23

+ 6
- 0
Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h Voir le fichier

@@ -33,6 +33,12 @@
33 33
 #define BOARD_WEBSITE_URL "th3dstudio.com"
34 34
 
35 35
 //
36
+// EEPROM
37
+//
38
+#define FLASH_EEPROM_EMULATION
39
+//#define SDCARD_EEPROM_EMULATION
40
+
41
+//
36 42
 // Servos
37 43
 //
38 44
 #define SERVO0_PIN         P2_04

Chargement…
Annuler
Enregistrer