Browse Source

Merge bugfix-2.0.x into 2.0.x

Scott Lahteine 4 years ago
parent
commit
fa48fbb9b8
100 changed files with 115 additions and 77 deletions
  1. 9
    8
      .github/workflows/test-builds.yml
  2. 9
    1
      Marlin/Configuration.h
  3. 30
    29
      Marlin/Configuration_adv.h
  4. 0
    0
      Marlin/src/HAL/AVR/HAL.cpp
  5. 0
    0
      Marlin/src/HAL/AVR/HAL.h
  6. 2
    2
      Marlin/src/HAL/AVR/HAL_SPI.cpp
  7. 2
    2
      Marlin/src/HAL/AVR/MarlinSerial.cpp
  8. 9
    9
      Marlin/src/HAL/AVR/MarlinSerial.h
  9. 0
    0
      Marlin/src/HAL/AVR/Servo.cpp
  10. 0
    0
      Marlin/src/HAL/AVR/ServoTimers.h
  11. 0
    0
      Marlin/src/HAL/AVR/endstop_interrupts.h
  12. 1
    1
      Marlin/src/HAL/AVR/fast_pwm.cpp
  13. 0
    0
      Marlin/src/HAL/AVR/fastio.cpp
  14. 0
    0
      Marlin/src/HAL/AVR/fastio.h
  15. 1
    1
      Marlin/src/HAL/AVR/fastio/fastio_1280.h
  16. 0
    0
      Marlin/src/HAL/AVR/fastio/fastio_1281.h
  17. 0
    0
      Marlin/src/HAL/AVR/fastio/fastio_168.h
  18. 0
    0
      Marlin/src/HAL/AVR/fastio/fastio_644.h
  19. 0
    0
      Marlin/src/HAL/AVR/fastio/fastio_AT90USB.h
  20. 0
    0
      Marlin/src/HAL/AVR/inc/Conditionals_LCD.h
  21. 0
    0
      Marlin/src/HAL/AVR/inc/Conditionals_adv.h
  22. 0
    0
      Marlin/src/HAL/AVR/inc/Conditionals_post.h
  23. 1
    1
      Marlin/src/HAL/AVR/inc/SanityCheck.h
  24. 0
    0
      Marlin/src/HAL/AVR/math.h
  25. 0
    0
      Marlin/src/HAL/AVR/persistent_store_eeprom.cpp
  26. 2
    2
      Marlin/src/HAL/AVR/pinsDebug.h
  27. 0
    0
      Marlin/src/HAL/AVR/pinsDebug_Teensyduino.h
  28. 0
    0
      Marlin/src/HAL/AVR/pinsDebug_plus_70.h
  29. 0
    0
      Marlin/src/HAL/AVR/spi_pins.h
  30. 2
    2
      Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp
  31. 0
    0
      Marlin/src/HAL/AVR/watchdog.cpp
  32. 0
    0
      Marlin/src/HAL/AVR/watchdog.h
  33. 0
    0
      Marlin/src/HAL/DUE/DebugMonitor.cpp
  34. 2
    2
      Marlin/src/HAL/DUE/EepromEmulation.cpp
  35. 0
    0
      Marlin/src/HAL/DUE/HAL.cpp
  36. 0
    0
      Marlin/src/HAL/DUE/HAL.h
  37. 0
    0
      Marlin/src/HAL/DUE/HAL_SPI.cpp
  38. 0
    0
      Marlin/src/HAL/DUE/InterruptVectors.cpp
  39. 0
    0
      Marlin/src/HAL/DUE/InterruptVectors.h
  40. 2
    2
      Marlin/src/HAL/DUE/MarlinSerial.cpp
  41. 8
    8
      Marlin/src/HAL/DUE/MarlinSerial.h
  42. 2
    2
      Marlin/src/HAL/DUE/MarlinSerialUSB.cpp
  43. 0
    0
      Marlin/src/HAL/DUE/MarlinSerialUSB.h
  44. 0
    0
      Marlin/src/HAL/DUE/Servo.cpp
  45. 0
    0
      Marlin/src/HAL/DUE/ServoTimers.h
  46. 0
    0
      Marlin/src/HAL/DUE/Tone.cpp
  47. 0
    0
      Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
  48. 0
    0
      Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp
  49. 0
    0
      Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
  50. 2
    2
      Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp
  51. 0
    0
      Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h
  52. 0
    0
      Marlin/src/HAL/DUE/endstop_interrupts.h
  53. 0
    0
      Marlin/src/HAL/DUE/fastio.h
  54. 0
    0
      Marlin/src/HAL/DUE/fastio/G2_PWM.cpp
  55. 1
    1
      Marlin/src/HAL/DUE/fastio/G2_PWM.h
  56. 0
    0
      Marlin/src/HAL/DUE/fastio/G2_pins.h
  57. 0
    0
      Marlin/src/HAL/DUE/inc/Conditionals_LCD.h
  58. 0
    0
      Marlin/src/HAL/DUE/inc/Conditionals_adv.h
  59. 28
    0
      Marlin/src/HAL/DUE/inc/Conditionals_post.h
  60. 0
    0
      Marlin/src/HAL/DUE/inc/SanityCheck.h
  61. 2
    2
      Marlin/src/HAL/DUE/persistent_store_eeprom.cpp
  62. 0
    0
      Marlin/src/HAL/DUE/pinsDebug.h
  63. 0
    0
      Marlin/src/HAL/DUE/spi_pins.h
  64. 0
    0
      Marlin/src/HAL/DUE/timers.cpp
  65. 0
    0
      Marlin/src/HAL/DUE/timers.h
  66. 0
    0
      Marlin/src/HAL/DUE/usb/arduino_due_x.h
  67. 0
    0
      Marlin/src/HAL/DUE/usb/compiler.h
  68. 0
    0
      Marlin/src/HAL/DUE/usb/conf_access.h
  69. 0
    0
      Marlin/src/HAL/DUE/usb/conf_clock.h
  70. 0
    0
      Marlin/src/HAL/DUE/usb/conf_usb.h
  71. 0
    0
      Marlin/src/HAL/DUE/usb/ctrl_access.c
  72. 0
    0
      Marlin/src/HAL/DUE/usb/ctrl_access.h
  73. 0
    0
      Marlin/src/HAL/DUE/usb/genclk.h
  74. 0
    0
      Marlin/src/HAL/DUE/usb/mrepeat.h
  75. 0
    0
      Marlin/src/HAL/DUE/usb/osc.h
  76. 0
    0
      Marlin/src/HAL/DUE/usb/pll.h
  77. 0
    0
      Marlin/src/HAL/DUE/usb/preprocessor.h
  78. 0
    0
      Marlin/src/HAL/DUE/usb/sbc_protocol.h
  79. 0
    0
      Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.cpp
  80. 0
    0
      Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.h
  81. 0
    0
      Marlin/src/HAL/DUE/usb/spc_protocol.h
  82. 0
    0
      Marlin/src/HAL/DUE/usb/stringz.h
  83. 0
    0
      Marlin/src/HAL/DUE/usb/sysclk.c
  84. 0
    0
      Marlin/src/HAL/DUE/usb/sysclk.h
  85. 0
    0
      Marlin/src/HAL/DUE/usb/tpaste.h
  86. 0
    0
      Marlin/src/HAL/DUE/usb/udc.c
  87. 0
    0
      Marlin/src/HAL/DUE/usb/udc.h
  88. 0
    0
      Marlin/src/HAL/DUE/usb/udc_desc.h
  89. 0
    0
      Marlin/src/HAL/DUE/usb/udd.h
  90. 0
    0
      Marlin/src/HAL/DUE/usb/udi.h
  91. 0
    0
      Marlin/src/HAL/DUE/usb/udi_cdc.c
  92. 0
    0
      Marlin/src/HAL/DUE/usb/udi_cdc.h
  93. 0
    0
      Marlin/src/HAL/DUE/usb/udi_cdc_conf.h
  94. 0
    0
      Marlin/src/HAL/DUE/usb/udi_cdc_desc.c
  95. 0
    0
      Marlin/src/HAL/DUE/usb/udi_composite_desc.c
  96. 0
    0
      Marlin/src/HAL/DUE/usb/udi_msc.c
  97. 0
    0
      Marlin/src/HAL/DUE/usb/udi_msc.h
  98. 0
    0
      Marlin/src/HAL/DUE/usb/uotghs_device_due.c
  99. 0
    0
      Marlin/src/HAL/DUE/usb/uotghs_device_due.h
  100. 0
    0
      Marlin/src/HAL/DUE/usb/uotghs_otg.h

+ 9
- 8
.github/workflows/test-builds.yml View File

@@ -29,7 +29,7 @@ jobs:
29 29
         - DUE
30 30
         - esp32
31 31
         - linux_native
32
-        - megaatmega2560
32
+        - mega2560
33 33
         - teensy31
34 34
         - teensy35
35 35
         - SAMD51_grandcentral_m4
@@ -37,22 +37,23 @@ jobs:
37 37
         # Extended AVR Environments
38 38
 
39 39
         - FYSETC_F6_13
40
-        - megaatmega1280
40
+        - mega1280
41 41
         - rambo
42
-        - sanguino_atmega1284p
43
-        - sanguino_atmega644p
42
+        - sanguino1284p
43
+        - sanguino644p
44 44
 
45 45
         # Extended STM32 Environments
46 46
 
47
-        - STM32F103RC_bigtree
48
-        - STM32F103RC_bigtree_USB
49
-        - STM32F103RE_bigtree
50
-        - STM32F103RE_bigtree_USB
47
+        - STM32F103RC_btt
48
+        - STM32F103RC_btt_USB
49
+        - STM32F103RE_btt
50
+        - STM32F103RE_btt_USB
51 51
         - STM32F103RC_fysetc
52 52
         - jgaurora_a5s_a1
53 53
         - STM32F103VE_longer
54 54
         - STM32F407VE_black
55 55
         - BIGTREE_SKR_PRO
56
+        - BIGTREE_GTR_V1_0
56 57
         - mks_robin
57 58
         - ARMED
58 59
         - FYSETC_S6

+ 9
- 1
Marlin/Configuration.h View File

@@ -36,7 +36,7 @@
36 36
  * Advanced settings can be found in Configuration_adv.h
37 37
  *
38 38
  */
39
-#define CONFIGURATION_H_VERSION 020004
39
+#define CONFIGURATION_H_VERSION 020005
40 40
 
41 41
 //===========================================================================
42 42
 //============================= Getting Started =============================
@@ -925,6 +925,14 @@
925 925
   #define SMART_EFFECTOR_MOD_PIN  -1  // Connect a GPIO pin to the Smart Effector MOD pin
926 926
 #endif
927 927
 
928
+/**
929
+ * Use StallGuard2 to probe the bed with the nozzle.
930
+ * Requires stallGuard-capable Trinamic stepper drivers.
931
+ * CAUTION: This can damage machines with Z lead screws.
932
+ *          Take extreme care when setting up this feature.
933
+ */
934
+//#define SENSORLESS_PROBING
935
+
928 936
 //
929 937
 // For Z_PROBE_ALLEN_KEY see the Delta example configurations.
930 938
 //

+ 30
- 29
Marlin/Configuration_adv.h View File

@@ -31,7 +31,7 @@
31 31
  * Basic settings can be found in Configuration.h
32 32
  *
33 33
  */
34
-#define CONFIGURATION_ADV_H_VERSION 020004
34
+#define CONFIGURATION_ADV_H_VERSION 020005
35 35
 
36 36
 // @section temperature
37 37
 
@@ -276,8 +276,10 @@
276 276
   #define AUTOTEMP_OLDWEIGHT 0.98
277 277
 #endif
278 278
 
279
-// Show extra position information with 'M114 D'
280
-//#define M114_DETAIL
279
+// Extra options for the M114 "Current Position" report
280
+//#define M114_DETAIL         // Use 'M114` for details to check planner calculations
281
+//#define M114_REALTIME       // Real current position based on forward kinematics
282
+//#define M114_LEGACY         // M114 used to synchronize on every call. Enable if needed.
281 283
 
282 284
 // Show Temperature ADC value
283 285
 // Enable for M105 to include ADC values read from temperature sensors.
@@ -716,6 +718,9 @@
716 718
   #define Z_STEPPER_ALIGN_ITERATIONS 5    // Number of iterations to apply during alignment
717 719
   #define Z_STEPPER_ALIGN_ACC        0.02 // Stop iterating early if the accuracy is better than this
718 720
   #define RESTORE_LEVELING_AFTER_G34      // Restore leveling after G34 is done?
721
+  // After G34, re-home Z (G28 Z) or just calculate it from the last probe heights?
722
+  // Re-homing might be more precise in reproducing the actual 'G28 Z' homing height, especially on an uneven bed.
723
+  #define HOME_AFTER_G34
719 724
 #endif
720 725
 
721 726
 // @section motion
@@ -990,6 +995,10 @@
990 995
 // Show the E position (filament used) during printing
991 996
 //#define LCD_SHOW_E_TOTAL
992 997
 
998
+#if ENABLED(SHOW_BOOTSCREEN)
999
+  #define BOOTSCREEN_TIMEOUT 4000        // (ms) Total Duration to display the boot screen(s)
1000
+#endif
1001
+
993 1002
 #if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS
994 1003
   //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
995 1004
   //#define SHOW_REMAINING_TIME          // Display estimated time to completion
@@ -1012,12 +1021,9 @@
1012 1021
 
1013 1022
 #if ENABLED(SDSUPPORT)
1014 1023
 
1015
-  // Some RAMPS and other boards don't detect when an SD card is inserted. You can work
1016
-  // around this by connecting a push button or single throw switch to the pin defined
1017
-  // as SD_DETECT_PIN in your board's pins definitions.
1018
-  // This setting should be disabled unless you are using a push button, pulling the pin to ground.
1019
-  // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER).
1020
-  #define SD_DETECT_INVERTED
1024
+  // The standard SD detect circuit reads LOW when media is inserted and HIGH when empty.
1025
+  // Enable this option and set to HIGH if your SD cards are incorrectly detected.
1026
+  //#define SD_DETECT_STATE HIGH
1021 1027
 
1022 1028
   #define SD_FINISHED_STEPPERRELEASE true          // Disable steppers when SD Print is finished
1023 1029
   #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the Z enabled so your bed stays in place.
@@ -1039,9 +1045,13 @@
1039 1045
    * during SD printing. If the recovery file is found at boot time, present
1040 1046
    * an option on the LCD screen to continue the print from the last-known
1041 1047
    * point in the file.
1048
+   *
1049
+   * If the machine reboots when resuming a print you may need to replace or
1050
+   * reformat the SD card. (Bad sectors delay startup triggering the watchdog.)
1042 1051
    */
1043 1052
   //#define POWER_LOSS_RECOVERY
1044 1053
   #if ENABLED(POWER_LOSS_RECOVERY)
1054
+    #define PLR_ENABLED_DEFAULT   false // Power Loss Recovery enabled by default. (Set with 'M413 Sn' & M500)
1045 1055
     //#define BACKUP_POWER_SUPPLY       // Backup power / UPS to move the steppers on power loss
1046 1056
     //#define POWER_LOSS_ZRAISE       2 // (mm) Z axis raise on resume (on power loss with UPS)
1047 1057
     //#define POWER_LOSS_PIN         44 // Pin to detect power loss. Set to -1 to disable default pin on boards without module.
@@ -1221,10 +1231,6 @@
1221 1231
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
1222 1232
   //#define USE_SMALL_INFOFONT
1223 1233
 
1224
-  // Enable this option and reduce the value to optimize screen updates.
1225
-  // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
1226
-  //#define DOGM_SPI_DELAY_US 5
1227
-
1228 1234
   // Swap the CW/CCW indicators in the graphics overlay
1229 1235
   //#define OVERLAY_GFX_REVERSE
1230 1236
 
@@ -1241,6 +1247,10 @@
1241 1247
    * This will prevent position updates from being displayed.
1242 1248
    */
1243 1249
   #if ENABLED(U8GLIB_ST7920)
1250
+    // Enable this option and reduce the value to optimize screen updates.
1251
+    // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
1252
+    //#define DOGM_SPI_DELAY_US 5
1253
+
1244 1254
     //#define LIGHTWEIGHT_UI
1245 1255
     #if ENABLED(LIGHTWEIGHT_UI)
1246 1256
       #define STATUS_EXPIRE_SECONDS 20
@@ -1278,7 +1288,7 @@
1278 1288
 // Additional options for DGUS / DWIN displays
1279 1289
 //
1280 1290
 #if HAS_DGUS_LCD
1281
-  #define DGUS_SERIAL_PORT 2
1291
+  #define DGUS_SERIAL_PORT 3
1282 1292
   #define DGUS_BAUDRATE 115200
1283 1293
 
1284 1294
   #define DGUS_RX_BUFFER_SIZE 128
@@ -1286,16 +1296,15 @@
1286 1296
   //#define DGUS_SERIAL_STATS_RX_BUFFER_OVERRUNS  // Fix Rx overrun situation (Currently only for AVR)
1287 1297
 
1288 1298
   #define DGUS_UPDATE_INTERVAL_MS  500    // (ms) Interval between automatic screen updates
1289
-  #define BOOTSCREEN_TIMEOUT      3000    // (ms) Duration to display the boot screen
1290 1299
 
1291 1300
   #if EITHER(DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY)
1292 1301
     #define DGUS_PRINT_FILENAME           // Display the filename during printing
1293 1302
     #define DGUS_PREHEAT_UI               // Display a preheat screen during heatup
1294 1303
 
1295 1304
     #if ENABLED(DGUS_LCD_UI_FYSETC)
1296
-      //#define DUGS_UI_MOVE_DIS_OPTION   // Disabled by default for UI_FYSETC
1305
+      //#define DGUS_UI_MOVE_DIS_OPTION   // Disabled by default for UI_FYSETC
1297 1306
     #else
1298
-      #define DUGS_UI_MOVE_DIS_OPTION     // Enabled by default for UI_HIPRECY
1307
+      #define DGUS_UI_MOVE_DIS_OPTION     // Enabled by default for UI_HIPRECY
1299 1308
     #endif
1300 1309
 
1301 1310
     #define DGUS_FILAMENT_LOADUNLOAD
@@ -1578,7 +1587,7 @@
1578 1587
   #if ENABLED(PROBE_TEMP_COMPENSATION)
1579 1588
     // Max temperature that can be reached by heated bed.
1580 1589
     // This is required only for the calibration process.
1581
-    #define PTC_MAX_BED_TEMP 110
1590
+    #define PTC_MAX_BED_TEMP BED_MAXTEMP
1582 1591
 
1583 1592
     // Park position to wait for probe cooldown
1584 1593
     #define PTC_PARK_POS_X 0.0F
@@ -2015,7 +2024,7 @@
2015 2024
  * TMCStepper library is required to use TMC stepper drivers.
2016 2025
  * https://github.com/teemuatlut/TMCStepper
2017 2026
  */
2018
-#if HAS_TRINAMIC
2027
+#if HAS_TRINAMIC_CONFIG
2019 2028
 
2020 2029
   #define HOLD_MULTIPLIER    0.5  // Scales down the holding current from run current
2021 2030
   #define INTERPOLATE       true  // Interpolate X/Y/Z_MICROSTEPS to 256
@@ -2302,14 +2311,6 @@
2302 2311
    */
2303 2312
   //#define SENSORLESS_HOMING // StallGuard capable drivers only
2304 2313
 
2305
-  /**
2306
-   * Use StallGuard2 to probe the bed with the nozzle.
2307
-   *
2308
-   * CAUTION: This could cause damage to machines that use a lead screw or threaded rod
2309
-   *          to move the Z axis. Take extreme care when attempting to enable this feature.
2310
-   */
2311
-  //#define SENSORLESS_PROBING // StallGuard capable drivers only
2312
-
2313 2314
   #if EITHER(SENSORLESS_HOMING, SENSORLESS_PROBING)
2314 2315
     // TMC2209: 0...255. TMC2130: -64...63
2315 2316
     #define X_STALL_SENSITIVITY  8
@@ -2345,7 +2346,7 @@
2345 2346
    */
2346 2347
   #define TMC_ADV() {  }
2347 2348
 
2348
-#endif // HAS_TRINAMIC
2349
+#endif // HAS_TRINAMIC_CONFIG
2349 2350
 
2350 2351
 // @section L64XX
2351 2352
 
@@ -2991,7 +2992,7 @@
2991 2992
   #define MAX7219_LOAD_PIN  44
2992 2993
 
2993 2994
   //#define MAX7219_GCODE          // Add the M7219 G-code to control the LED matrix
2994
-  #define MAX7219_INIT_TEST    2   // Do a test pattern at initialization (Set to 2 for spiral)
2995
+  #define MAX7219_INIT_TEST    2   // Test pattern at startup: 0=none, 1=sweep, 2=spiral
2995 2996
   #define MAX7219_NUMBER_UNITS 1   // Number of Max7219 units in chain.
2996 2997
   #define MAX7219_ROTATE       0   // Rotate the display clockwise (in multiples of +/- 90°)
2997 2998
                                    // connector at:  right=0   bottom=-90  top=90  left=180

Marlin/src/HAL/HAL_AVR/HAL.cpp → Marlin/src/HAL/AVR/HAL.cpp View File


Marlin/src/HAL/HAL_AVR/HAL.h → Marlin/src/HAL/AVR/HAL.h View File


Marlin/src/HAL/HAL_AVR/HAL_SPI.cpp → Marlin/src/HAL/AVR/HAL_SPI.cpp View File

@@ -197,7 +197,7 @@ void spiBegin() {
197 197
     // output pin high - like sending 0xFF
198 198
     WRITE(MOSI_PIN, HIGH);
199 199
 
200
-    for (uint8_t i = 0; i < 8; i++) {
200
+    LOOP_L_N(i, 8) {
201 201
       WRITE(SCK_PIN, HIGH);
202 202
 
203 203
       nop; // adjust so SCK is nice
@@ -224,7 +224,7 @@ void spiBegin() {
224 224
   void spiSend(uint8_t data) {
225 225
     // no interrupts during byte send - about 8µs
226 226
     cli();
227
-    for (uint8_t i = 0; i < 8; i++) {
227
+    LOOP_L_N(i, 8) {
228 228
       WRITE(SCK_PIN, LOW);
229 229
       WRITE(MOSI_PIN, data & 0x80);
230 230
       data <<= 1;

Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp → Marlin/src/HAL/AVR/MarlinSerial.cpp View File

@@ -55,7 +55,7 @@
55 55
   // A SW memory barrier, to ensure GCC does not overoptimize loops
56 56
   #define sw_barrier() asm volatile("": : :"memory");
57 57
 
58
-  #include "../../feature/emergency_parser.h"
58
+  #include "../../feature/e_parser.h"
59 59
 
60 60
   // "Atomically" read the RX head index value without disabling interrupts:
61 61
   // This MUST be called with RX interrupts enabled, and CAN'T be called
@@ -682,7 +682,7 @@
682 682
 
683 683
     // Round correctly so that print(1.999, 2) prints as "2.00"
684 684
     double rounding = 0.5;
685
-    for (uint8_t i = 0; i < digits; ++i) rounding *= 0.1;
685
+    LOOP_L_N(i, digits) rounding *= 0.1;
686 686
     number += rounding;
687 687
 
688 688
     // Extract the integer part of the number and print it

Marlin/src/HAL/HAL_AVR/MarlinSerial.h → Marlin/src/HAL/AVR/MarlinSerial.h View File

@@ -31,10 +31,10 @@
31 31
  * Templatized 01 October 2018 by Eduardo José Tagle to allow multiple instances
32 32
  */
33 33
 
34
-#include "../shared/MarlinSerial.h"
35
-
36 34
 #include <WString.h>
37 35
 
36
+#include "../../inc/MarlinConfigPre.h"
37
+
38 38
 #ifndef SERIAL_PORT
39 39
   #define SERIAL_PORT 0
40 40
 #endif
@@ -261,12 +261,12 @@
261 261
     static constexpr int PORT               = serial;
262 262
     static constexpr unsigned int RX_SIZE   = RX_BUFFER_SIZE;
263 263
     static constexpr unsigned int TX_SIZE   = TX_BUFFER_SIZE;
264
-    static constexpr bool XONOFF            = bSERIAL_XON_XOFF;
265
-    static constexpr bool EMERGENCYPARSER   = bEMERGENCY_PARSER;
266
-    static constexpr bool DROPPED_RX        = bSERIAL_STATS_DROPPED_RX;
267
-    static constexpr bool RX_OVERRUNS       = bSERIAL_STATS_RX_BUFFER_OVERRUNS;
268
-    static constexpr bool RX_FRAMING_ERRORS = bSERIAL_STATS_RX_FRAMING_ERRORS;
269
-    static constexpr bool MAX_RX_QUEUED     = bSERIAL_STATS_MAX_RX_QUEUED;
264
+    static constexpr bool XONOFF            = ENABLED(SERIAL_XON_XOFF);
265
+    static constexpr bool EMERGENCYPARSER   = ENABLED(EMERGENCY_PARSER);
266
+    static constexpr bool DROPPED_RX        = ENABLED(SERIAL_STATS_DROPPED_RX);
267
+    static constexpr bool RX_OVERRUNS       = ENABLED(SERIAL_STATS_RX_BUFFER_OVERRUNS);
268
+    static constexpr bool RX_FRAMING_ERRORS = ENABLED(SERIAL_STATS_RX_FRAMING_ERRORS);
269
+    static constexpr bool MAX_RX_QUEUED     = ENABLED(SERIAL_STATS_MAX_RX_QUEUED);
270 270
   };
271 271
   extern MarlinSerial<MarlinSerialCfg<SERIAL_PORT>> customizedSerial1;
272 272
 
@@ -304,7 +304,7 @@
304 304
     static constexpr bool XONOFF            = false;
305 305
     static constexpr bool EMERGENCYPARSER   = false;
306 306
     static constexpr bool DROPPED_RX        = false;
307
-    static constexpr bool RX_OVERRUNS       = bDGUS_SERIAL_STATS_RX_BUFFER_OVERRUNS;
307
+    static constexpr bool RX_OVERRUNS       = HAS_DGUS_LCD && ENABLED(DGUS_SERIAL_STATS_RX_BUFFER_OVERRUNS);
308 308
     static constexpr bool RX_FRAMING_ERRORS = false;
309 309
     static constexpr bool MAX_RX_QUEUED     = false;
310 310
   };

Marlin/src/HAL/HAL_AVR/Servo.cpp → Marlin/src/HAL/AVR/Servo.cpp View File


Marlin/src/HAL/HAL_AVR/ServoTimers.h → Marlin/src/HAL/AVR/ServoTimers.h View File


Marlin/src/HAL/HAL_AVR/endstop_interrupts.h → Marlin/src/HAL/AVR/endstop_interrupts.h View File


Marlin/src/HAL/HAL_AVR/fast_pwm.cpp → Marlin/src/HAL/AVR/fast_pwm.cpp View File

@@ -167,7 +167,7 @@ void set_pwm_frequency(const pin_t pin, int f_desired) {
167 167
     uint16_t prescaler[] = { 0, 1, 8, /*TIMER2 ONLY*/32, 64, /*TIMER2 ONLY*/128, 256, 1024 };
168 168
 
169 169
     // loop over prescaler values
170
-    for (uint8_t i = 1; i < 8; i++) {
170
+    LOOP_S_L_N(i, 1, 8) {
171 171
       uint16_t res_temp_fast = 255, res_temp_phase_correct = 255;
172 172
       if (timer.n == 2) {
173 173
         // No resolution calculation for TIMER2 unless enabled USE_OCR2A_AS_TOP

Marlin/src/HAL/HAL_AVR/fastio.cpp → Marlin/src/HAL/AVR/fastio.cpp View File


Marlin/src/HAL/HAL_AVR/fastio.h → Marlin/src/HAL/AVR/fastio.h View File


Marlin/src/HAL/HAL_AVR/fastio/fastio_1280.h → Marlin/src/HAL/AVR/fastio/fastio_1280.h View File

@@ -26,7 +26,7 @@
26 26
  *
27 27
  *   Hardware Pin  : 02 03 06 07 01 05 15 16 17 18 23 24 25 26 64 63 13 12 46 45 44 43 78 77 76 75 74 73 72 71 60 59 58 57 56 55 54 53 50 70 52 51 42 41 40 39 38 37 36 35 22 21 20 19 97 96 95 94 93 92 91 90 89 88 87 86 85 84 83 82 | 04 08 09 10 11 14 27 28 29 30 31 32 33 34 47 48 49 61 62 65 66 67 68 69 79 80 81 98 99 100
28 28
  *   Port          : E0 E1 E4 E5 G5 E3 H3 H4 H5 H6 B4 B5 B6 B7 J1 J0 H1 H0 D3 D2 D1 D0 A0 A1 A2 A3 A4 A5 A6 A7 C7 C6 C5 C4 C3 C2 C1 C0 D7 G2 G1 G0 L7 L6 L5 L4 L3 L2 L1 L0 B3 B2 B1 B0 F0 F1 F2 F3 F4 F5 F6 F7 K0 K1 K2 K3 K4 K5 K6 K7 | E2 E6 E7 xx xx H2 H7 G3 G4 xx xx xx xx xx D4 D5 D6 xx xx J2 J3 J4 J5 J6 J7 xx xx xx xx xx
29
- *   Logical Pin   : 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | 78 79 80 xx xx 84 85 71 70 xx xx xx xx xx 81 82 83 xx xx 72 72 75 76 77 74 xx xx xx xx xx
29
+ *   Logical Pin   : 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | 78 79 80 xx xx 84 85 71 70 xx xx xx xx xx 81 82 83 xx xx 72 73 75 76 77 74 xx xx xx xx xx
30 30
  */
31 31
 
32 32
 #include "../fastio.h"

Marlin/src/HAL/HAL_AVR/fastio/fastio_1281.h → Marlin/src/HAL/AVR/fastio/fastio_1281.h View File


Marlin/src/HAL/HAL_AVR/fastio/fastio_168.h → Marlin/src/HAL/AVR/fastio/fastio_168.h View File


Marlin/src/HAL/HAL_AVR/fastio/fastio_644.h → Marlin/src/HAL/AVR/fastio/fastio_644.h View File


Marlin/src/HAL/HAL_AVR/fastio/fastio_AT90USB.h → Marlin/src/HAL/AVR/fastio/fastio_AT90USB.h View File


Marlin/src/HAL/HAL_AVR/inc/Conditionals_LCD.h → Marlin/src/HAL/AVR/inc/Conditionals_LCD.h View File


Marlin/src/HAL/HAL_AVR/inc/Conditionals_adv.h → Marlin/src/HAL/AVR/inc/Conditionals_adv.h View File


Marlin/src/HAL/HAL_AVR/inc/Conditionals_post.h → Marlin/src/HAL/AVR/inc/Conditionals_post.h View File


Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h → Marlin/src/HAL/AVR/inc/SanityCheck.h View File

@@ -56,7 +56,7 @@
56 56
 /**
57 57
  * The Trinamic library includes SoftwareSerial.h, leading to a compile error.
58 58
  */
59
-#if HAS_TRINAMIC && ENABLED(ENDSTOP_INTERRUPTS_FEATURE)
59
+#if HAS_TRINAMIC_CONFIG && ENABLED(ENDSTOP_INTERRUPTS_FEATURE)
60 60
   #error "TMCStepper includes SoftwareSerial.h which is incompatible with ENDSTOP_INTERRUPTS_FEATURE. Disable ENDSTOP_INTERRUPTS_FEATURE to continue."
61 61
 #endif
62 62
 

Marlin/src/HAL/HAL_AVR/math.h → Marlin/src/HAL/AVR/math.h View File


Marlin/src/HAL/HAL_AVR/persistent_store_eeprom.cpp → Marlin/src/HAL/AVR/persistent_store_eeprom.cpp View File


Marlin/src/HAL/HAL_AVR/pinsDebug.h → Marlin/src/HAL/AVR/pinsDebug.h View File

@@ -70,12 +70,12 @@
70 70
 
71 71
 void PRINT_ARRAY_NAME(uint8_t x) {
72 72
   char *name_mem_pointer = (char*)pgm_read_ptr(&pin_array[x].name);
73
-  for (uint8_t y = 0; y < MAX_NAME_LENGTH; y++) {
73
+  LOOP_L_N(y, MAX_NAME_LENGTH) {
74 74
     char temp_char = pgm_read_byte(name_mem_pointer + y);
75 75
     if (temp_char != 0)
76 76
       SERIAL_CHAR(temp_char);
77 77
     else {
78
-      for (uint8_t i = 0; i < MAX_NAME_LENGTH - y; i++) SERIAL_CHAR(' ');
78
+      LOOP_L_N(i, MAX_NAME_LENGTH - y) SERIAL_CHAR(' ');
79 79
       break;
80 80
     }
81 81
   }

Marlin/src/HAL/HAL_AVR/pinsDebug_Teensyduino.h → Marlin/src/HAL/AVR/pinsDebug_Teensyduino.h View File


Marlin/src/HAL/HAL_AVR/pinsDebug_plus_70.h → Marlin/src/HAL/AVR/pinsDebug_plus_70.h View File


Marlin/src/HAL/HAL_AVR/spi_pins.h → Marlin/src/HAL/AVR/spi_pins.h View File


Marlin/src/HAL/HAL_AVR/u8g_com_HAL_AVR_sw_spi.cpp → Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp View File

@@ -88,7 +88,7 @@ void u8g_spiSend_sw_AVR_mode_0(uint8_t val) {
88 88
   volatile uint8_t *outData = u8g_outData,
89 89
                    *outClock = u8g_outClock;
90 90
   U8G_ATOMIC_START();
91
-  for (uint8_t i = 0; i < 8; i++) {
91
+  LOOP_L_N(i, 8) {
92 92
     if (val & 0x80)
93 93
       *outData |= bitData;
94 94
     else
@@ -108,7 +108,7 @@ void u8g_spiSend_sw_AVR_mode_3(uint8_t val) {
108 108
   volatile uint8_t *outData = u8g_outData,
109 109
                    *outClock = u8g_outClock;
110 110
   U8G_ATOMIC_START();
111
-  for (uint8_t i = 0; i < 8; i++) {
111
+  LOOP_L_N(i, 8) {
112 112
     *outClock &= bitNotClock;
113 113
     if (val & 0x80)
114 114
       *outData |= bitData;

Marlin/src/HAL/HAL_AVR/watchdog.cpp → Marlin/src/HAL/AVR/watchdog.cpp View File


Marlin/src/HAL/HAL_AVR/watchdog.h → Marlin/src/HAL/AVR/watchdog.h View File


Marlin/src/HAL/HAL_DUE/DebugMonitor.cpp → Marlin/src/HAL/DUE/DebugMonitor.cpp View File


Marlin/src/HAL/HAL_DUE/EepromEmulation.cpp → Marlin/src/HAL/DUE/EepromEmulation.cpp View File

@@ -54,7 +54,7 @@
54 54
 
55 55
 #include "../../inc/MarlinConfig.h"
56 56
 
57
-#if ENABLED(EEPROM_SETTINGS) && NONE(I2C_EEPROM, SPI_EEPROM)
57
+#if ENABLED(FLASH_EEPROM_EMULATION)
58 58
 
59 59
 #include "../shared/Marduino.h"
60 60
 #include "../shared/persistent_store_api.h"
@@ -1016,5 +1016,5 @@ void eeprom_flush() {
1016 1016
   ee_Flush();
1017 1017
 }
1018 1018
 
1019
-#endif // EEPROM_SETTINGS && (!I2C_EEPROM && !SPI_EEPROM)
1019
+#endif // FLASH_EEPROM_EMULATION
1020 1020
 #endif // ARDUINO_ARCH_AVR

Marlin/src/HAL/HAL_DUE/HAL.cpp → Marlin/src/HAL/DUE/HAL.cpp View File


Marlin/src/HAL/HAL_DUE/HAL.h → Marlin/src/HAL/DUE/HAL.h View File


Marlin/src/HAL/HAL_DUE/HAL_SPI.cpp → Marlin/src/HAL/DUE/HAL_SPI.cpp View File


Marlin/src/HAL/HAL_DUE/InterruptVectors.cpp → Marlin/src/HAL/DUE/InterruptVectors.cpp View File


Marlin/src/HAL/HAL_DUE/InterruptVectors.h → Marlin/src/HAL/DUE/InterruptVectors.h View File


Marlin/src/HAL/HAL_DUE/MarlinSerial.cpp → Marlin/src/HAL/DUE/MarlinSerial.cpp View File

@@ -45,7 +45,7 @@ template<typename Cfg> typename MarlinSerial<Cfg>::ring_buffer_pos_t MarlinSeria
45 45
 // A SW memory barrier, to ensure GCC does not overoptimize loops
46 46
 #define sw_barrier() asm volatile("": : :"memory");
47 47
 
48
-#include "../../feature/emergency_parser.h"
48
+#include "../../feature/e_parser.h"
49 49
 
50 50
 // (called with RX interrupts disabled)
51 51
 template<typename Cfg>
@@ -606,7 +606,7 @@ void MarlinSerial<Cfg>::printFloat(double number, uint8_t digits) {
606 606
 
607 607
   // Round correctly so that print(1.999, 2) prints as "2.00"
608 608
   double rounding = 0.5;
609
-  for (uint8_t i = 0; i < digits; ++i) rounding *= 0.1;
609
+  LOOP_L_N(i, digits) rounding *= 0.1;
610 610
   number += rounding;
611 611
 
612 612
   // Extract the integer part of the number and print it

Marlin/src/HAL/HAL_DUE/MarlinSerial.h → Marlin/src/HAL/DUE/MarlinSerial.h View File

@@ -27,10 +27,10 @@
27 27
  * Based on MarlinSerial for AVR, copyright (c) 2006 Nicholas Zambetti.  All right reserved.
28 28
  */
29 29
 
30
-#include "../shared/MarlinSerial.h"
31
-
32 30
 #include <WString.h>
33 31
 
32
+#include "../../inc/MarlinConfigPre.h"
33
+
34 34
 #define DEC 10
35 35
 #define HEX 16
36 36
 #define OCT 8
@@ -163,12 +163,12 @@ struct MarlinSerialCfg {
163 163
   static constexpr int PORT               = serial;
164 164
   static constexpr unsigned int RX_SIZE   = RX_BUFFER_SIZE;
165 165
   static constexpr unsigned int TX_SIZE   = TX_BUFFER_SIZE;
166
-  static constexpr bool XONOFF            = bSERIAL_XON_XOFF;
167
-  static constexpr bool EMERGENCYPARSER   = bEMERGENCY_PARSER;
168
-  static constexpr bool DROPPED_RX        = bSERIAL_STATS_DROPPED_RX;
169
-  static constexpr bool RX_OVERRUNS       = bSERIAL_STATS_RX_BUFFER_OVERRUNS;
170
-  static constexpr bool RX_FRAMING_ERRORS = bSERIAL_STATS_RX_FRAMING_ERRORS;
171
-  static constexpr bool MAX_RX_QUEUED     = bSERIAL_STATS_MAX_RX_QUEUED;
166
+  static constexpr bool XONOFF            = ENABLED(SERIAL_XON_XOFF);
167
+  static constexpr bool EMERGENCYPARSER   = ENABLED(EMERGENCY_PARSER);
168
+  static constexpr bool DROPPED_RX        = ENABLED(SERIAL_STATS_DROPPED_RX);
169
+  static constexpr bool RX_OVERRUNS       = ENABLED(SERIAL_STATS_RX_BUFFER_OVERRUNS);
170
+  static constexpr bool RX_FRAMING_ERRORS = ENABLED(SERIAL_STATS_RX_FRAMING_ERRORS);
171
+  static constexpr bool MAX_RX_QUEUED     = ENABLED(SERIAL_STATS_MAX_RX_QUEUED);
172 172
 };
173 173
 
174 174
 #if SERIAL_PORT >= 0

Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.cpp → Marlin/src/HAL/DUE/MarlinSerialUSB.cpp View File

@@ -34,7 +34,7 @@
34 34
 #include "MarlinSerialUSB.h"
35 35
 
36 36
 #if ENABLED(EMERGENCY_PARSER)
37
-  #include "../../feature/emergency_parser.h"
37
+  #include "../../feature/e_parser.h"
38 38
 #endif
39 39
 
40 40
 // Imports from Atmel USB Stack/CDC implementation
@@ -259,7 +259,7 @@ void MarlinSerialUSB::printFloat(double number, uint8_t digits) {
259 259
 
260 260
   // Round correctly so that print(1.999, 2) prints as "2.00"
261 261
   double rounding = 0.5;
262
-  for (uint8_t i = 0; i < digits; ++i)
262
+  LOOP_L_N(i, digits)
263 263
     rounding *= 0.1;
264 264
 
265 265
   number += rounding;

Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.h → Marlin/src/HAL/DUE/MarlinSerialUSB.h View File


Marlin/src/HAL/HAL_DUE/Servo.cpp → Marlin/src/HAL/DUE/Servo.cpp View File


Marlin/src/HAL/HAL_DUE/ServoTimers.h → Marlin/src/HAL/DUE/ServoTimers.h View File


Marlin/src/HAL/HAL_DUE/Tone.cpp → Marlin/src/HAL/DUE/Tone.cpp View File


Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp → Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp View File


Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp → Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp View File


Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp → Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp View File


Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp → Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp View File

@@ -80,7 +80,7 @@ Pio *SCK_pPio, *MOSI_pPio;
80 80
 uint32_t SCK_dwMask, MOSI_dwMask;
81 81
 
82 82
 void u8g_spiSend_sw_DUE_mode_0(uint8_t val) { // 3MHz
83
-  for (uint8_t i = 0; i < 8; i++) {
83
+  LOOP_L_N(i, 8) {
84 84
     if (val & 0x80)
85 85
       MOSI_pPio->PIO_SODR = MOSI_dwMask;
86 86
     else
@@ -94,7 +94,7 @@ void u8g_spiSend_sw_DUE_mode_0(uint8_t val) { // 3MHz
94 94
 }
95 95
 
96 96
 void u8g_spiSend_sw_DUE_mode_3(uint8_t val) { // 3.5MHz
97
-  for (uint8_t i = 0; i < 8; i++) {
97
+  LOOP_L_N(i, 8) {
98 98
     SCK_pPio->PIO_CODR = SCK_dwMask;
99 99
     DELAY_NS(50);
100 100
     if (val & 0x80)

Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h → Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h View File


Marlin/src/HAL/HAL_DUE/endstop_interrupts.h → Marlin/src/HAL/DUE/endstop_interrupts.h View File


Marlin/src/HAL/HAL_DUE/fastio.h → Marlin/src/HAL/DUE/fastio.h View File


Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.cpp → Marlin/src/HAL/DUE/fastio/G2_PWM.cpp View File


Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.h → Marlin/src/HAL/DUE/fastio/G2_PWM.h View File

@@ -63,7 +63,7 @@ extern PWM_map ISR_table[NUM_PWMS];
63 63
 extern uint32_t motor_current_setting[3];
64 64
 
65 65
 #define IR_BIT(p) (WITHIN(p, 0, 3) ? (p) : (p) + 4)
66
-#define COPY_ACTIVE_TABLE() do{ for (uint8_t i = 0; i < 6 ; i++) work_table[i] = active_table[i]; }while(0)
66
+#define COPY_ACTIVE_TABLE() do{ LOOP_L_N(i, 6) work_table[i] = active_table[i]; }while(0)
67 67
 
68 68
 #define PWM_MR0 19999         // base repetition rate minus one count - 20mS
69 69
 #define PWM_PR 24             // prescaler value - prescaler divide by 24 + 1  -  1 MHz output

Marlin/src/HAL/HAL_DUE/fastio/G2_pins.h → Marlin/src/HAL/DUE/fastio/G2_pins.h View File


Marlin/src/HAL/HAL_DUE/inc/Conditionals_LCD.h → Marlin/src/HAL/DUE/inc/Conditionals_LCD.h View File


Marlin/src/HAL/HAL_DUE/inc/Conditionals_adv.h → Marlin/src/HAL/DUE/inc/Conditionals_adv.h View File


+ 28
- 0
Marlin/src/HAL/DUE/inc/Conditionals_post.h View File

@@ -0,0 +1,28 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
+ *
5
+ * Based on Sprinter and grbl.
6
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7
+ *
8
+ * This program is free software: you can redistribute it and/or modify
9
+ * it under the terms of the GNU General Public License as published by
10
+ * the Free Software Foundation, either version 3 of the License, or
11
+ * (at your option) any later version.
12
+ *
13
+ * This program is distributed in the hope that it will be useful,
14
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
+ * GNU General Public License for more details.
17
+ *
18
+ * You should have received a copy of the GNU General Public License
19
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
20
+ *
21
+ */
22
+#pragma once
23
+
24
+#if USE_EMULATED_EEPROM
25
+  #undef SRAM_EEPROM_EMULATION
26
+  #undef SDCARD_EEPROM_EMULATION
27
+  #define FLASH_EEPROM_EMULATION 1
28
+#endif

Marlin/src/HAL/HAL_DUE/inc/SanityCheck.h → Marlin/src/HAL/DUE/inc/SanityCheck.h View File


Marlin/src/HAL/HAL_DUE/persistent_store_eeprom.cpp → Marlin/src/HAL/DUE/persistent_store_eeprom.cpp View File

@@ -29,7 +29,7 @@
29 29
 #include "../../inc/MarlinConfig.h"
30 30
 #include "../shared/persistent_store_api.h"
31 31
 
32
-#if !defined(E2END) && NONE(I2C_EEPROM, SPI_EEPROM)
32
+#if !defined(E2END) && ENABLED(FLASH_EEPROM_EMULATION)
33 33
   #define E2END 0xFFF // Default to Flash emulated EEPROM size (EepromEmulation_Due.cpp)
34 34
 #endif
35 35
 
@@ -38,7 +38,7 @@ extern void eeprom_flush();
38 38
 bool PersistentStore::access_start() { return true; }
39 39
 
40 40
 bool PersistentStore::access_finish() {
41
-  #if NONE(I2C_EEPROM, SPI_EEPROM)
41
+  #if ENABLED(FLASH_EEPROM_EMULATION)
42 42
     eeprom_flush();
43 43
   #endif
44 44
   return true;

Marlin/src/HAL/HAL_DUE/pinsDebug.h → Marlin/src/HAL/DUE/pinsDebug.h View File


Marlin/src/HAL/HAL_DUE/spi_pins.h → Marlin/src/HAL/DUE/spi_pins.h View File


Marlin/src/HAL/HAL_DUE/timers.cpp → Marlin/src/HAL/DUE/timers.cpp View File


Marlin/src/HAL/HAL_DUE/timers.h → Marlin/src/HAL/DUE/timers.h View File


Marlin/src/HAL/HAL_DUE/usb/arduino_due_x.h → Marlin/src/HAL/DUE/usb/arduino_due_x.h View File


Marlin/src/HAL/HAL_DUE/usb/compiler.h → Marlin/src/HAL/DUE/usb/compiler.h View File


Marlin/src/HAL/HAL_DUE/usb/conf_access.h → Marlin/src/HAL/DUE/usb/conf_access.h View File


Marlin/src/HAL/HAL_DUE/usb/conf_clock.h → Marlin/src/HAL/DUE/usb/conf_clock.h View File


Marlin/src/HAL/HAL_DUE/usb/conf_usb.h → Marlin/src/HAL/DUE/usb/conf_usb.h View File


Marlin/src/HAL/HAL_DUE/usb/ctrl_access.c → Marlin/src/HAL/DUE/usb/ctrl_access.c View File


Marlin/src/HAL/HAL_DUE/usb/ctrl_access.h → Marlin/src/HAL/DUE/usb/ctrl_access.h View File


Marlin/src/HAL/HAL_DUE/usb/genclk.h → Marlin/src/HAL/DUE/usb/genclk.h View File


Marlin/src/HAL/HAL_DUE/usb/mrepeat.h → Marlin/src/HAL/DUE/usb/mrepeat.h View File


Marlin/src/HAL/HAL_DUE/usb/osc.h → Marlin/src/HAL/DUE/usb/osc.h View File


Marlin/src/HAL/HAL_DUE/usb/pll.h → Marlin/src/HAL/DUE/usb/pll.h View File


Marlin/src/HAL/HAL_DUE/usb/preprocessor.h → Marlin/src/HAL/DUE/usb/preprocessor.h View File


Marlin/src/HAL/HAL_DUE/usb/sbc_protocol.h → Marlin/src/HAL/DUE/usb/sbc_protocol.h View File


Marlin/src/HAL/HAL_DUE/usb/sd_mmc_spi_mem.cpp → Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.cpp View File


Marlin/src/HAL/HAL_DUE/usb/sd_mmc_spi_mem.h → Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.h View File


Marlin/src/HAL/HAL_DUE/usb/spc_protocol.h → Marlin/src/HAL/DUE/usb/spc_protocol.h View File


Marlin/src/HAL/HAL_DUE/usb/stringz.h → Marlin/src/HAL/DUE/usb/stringz.h View File


Marlin/src/HAL/HAL_DUE/usb/sysclk.c → Marlin/src/HAL/DUE/usb/sysclk.c View File


Marlin/src/HAL/HAL_DUE/usb/sysclk.h → Marlin/src/HAL/DUE/usb/sysclk.h View File


Marlin/src/HAL/HAL_DUE/usb/tpaste.h → Marlin/src/HAL/DUE/usb/tpaste.h View File


Marlin/src/HAL/HAL_DUE/usb/udc.c → Marlin/src/HAL/DUE/usb/udc.c View File


Marlin/src/HAL/HAL_DUE/usb/udc.h → Marlin/src/HAL/DUE/usb/udc.h View File


Marlin/src/HAL/HAL_DUE/usb/udc_desc.h → Marlin/src/HAL/DUE/usb/udc_desc.h View File


Marlin/src/HAL/HAL_DUE/usb/udd.h → Marlin/src/HAL/DUE/usb/udd.h View File


Marlin/src/HAL/HAL_DUE/usb/udi.h → Marlin/src/HAL/DUE/usb/udi.h View File


Marlin/src/HAL/HAL_DUE/usb/udi_cdc.c → Marlin/src/HAL/DUE/usb/udi_cdc.c View File


Marlin/src/HAL/HAL_DUE/usb/udi_cdc.h → Marlin/src/HAL/DUE/usb/udi_cdc.h View File


Marlin/src/HAL/HAL_DUE/usb/udi_cdc_conf.h → Marlin/src/HAL/DUE/usb/udi_cdc_conf.h View File


Marlin/src/HAL/HAL_DUE/usb/udi_cdc_desc.c → Marlin/src/HAL/DUE/usb/udi_cdc_desc.c View File


Marlin/src/HAL/HAL_DUE/usb/udi_composite_desc.c → Marlin/src/HAL/DUE/usb/udi_composite_desc.c View File


Marlin/src/HAL/HAL_DUE/usb/udi_msc.c → Marlin/src/HAL/DUE/usb/udi_msc.c View File


Marlin/src/HAL/HAL_DUE/usb/udi_msc.h → Marlin/src/HAL/DUE/usb/udi_msc.h View File


Marlin/src/HAL/HAL_DUE/usb/uotghs_device_due.c → Marlin/src/HAL/DUE/usb/uotghs_device_due.c View File


Marlin/src/HAL/HAL_DUE/usb/uotghs_device_due.h → Marlin/src/HAL/DUE/usb/uotghs_device_due.h View File


Marlin/src/HAL/HAL_DUE/usb/uotghs_otg.h → Marlin/src/HAL/DUE/usb/uotghs_otg.h View File


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save