ソースを参照

Merge remote-tracking branch 'upstream/bugfix-2.0.x' into 2.0.x

Scott Lahteine 4年前
コミット
f9aec2685c
100個のファイルの変更305行の追加214行の削除
  1. 19
    0
      .editorconfig
  2. 1
    1
      .github/workflows/test-builds.yml
  3. 4
    1
      .gitignore
  4. 13
    10
      Marlin/Configuration.h
  5. 59
    25
      Marlin/Configuration_adv.h
  6. 73
    68
      Marlin/Makefile
  7. 1
    1
      Marlin/Version.h
  8. 1
    1
      Marlin/src/HAL/HAL.h
  9. 1
    1
      Marlin/src/HAL/HAL_AVR/HAL.cpp
  10. 3
    3
      Marlin/src/HAL/HAL_AVR/HAL.h
  11. 1
    1
      Marlin/src/HAL/HAL_AVR/HAL_SPI.cpp
  12. 1
    1
      Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp
  13. 1
    1
      Marlin/src/HAL/HAL_AVR/MarlinSerial.h
  14. 1
    1
      Marlin/src/HAL/HAL_AVR/Servo.cpp
  15. 1
    1
      Marlin/src/HAL/HAL_AVR/ServoTimers.h
  16. 1
    1
      Marlin/src/HAL/HAL_AVR/endstop_interrupts.h
  17. 1
    1
      Marlin/src/HAL/HAL_AVR/fast_pwm.cpp
  18. 1
    1
      Marlin/src/HAL/HAL_AVR/fastio.cpp
  19. 1
    1
      Marlin/src/HAL/HAL_AVR/fastio.h
  20. 1
    1
      Marlin/src/HAL/HAL_AVR/fastio/fastio_1280.h
  21. 1
    1
      Marlin/src/HAL/HAL_AVR/fastio/fastio_1281.h
  22. 1
    1
      Marlin/src/HAL/HAL_AVR/fastio/fastio_168.h
  23. 1
    1
      Marlin/src/HAL/HAL_AVR/fastio/fastio_644.h
  24. 1
    1
      Marlin/src/HAL/HAL_AVR/fastio/fastio_AT90USB.h
  25. 1
    1
      Marlin/src/HAL/HAL_AVR/inc/Conditionals_LCD.h
  26. 1
    1
      Marlin/src/HAL/HAL_AVR/inc/Conditionals_adv.h
  27. 1
    1
      Marlin/src/HAL/HAL_AVR/inc/Conditionals_post.h
  28. 2
    2
      Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h
  29. 1
    1
      Marlin/src/HAL/HAL_AVR/math.h
  30. 1
    1
      Marlin/src/HAL/HAL_AVR/persistent_store_eeprom.cpp
  31. 1
    1
      Marlin/src/HAL/HAL_AVR/pinsDebug.h
  32. 1
    1
      Marlin/src/HAL/HAL_AVR/pinsDebug_Teensyduino.h
  33. 1
    1
      Marlin/src/HAL/HAL_AVR/pinsDebug_plus_70.h
  34. 1
    1
      Marlin/src/HAL/HAL_AVR/spi_pins.h
  35. 1
    1
      Marlin/src/HAL/HAL_AVR/u8g_com_HAL_AVR_sw_spi.cpp
  36. 1
    1
      Marlin/src/HAL/HAL_AVR/watchdog.cpp
  37. 1
    1
      Marlin/src/HAL/HAL_AVR/watchdog.h
  38. 1
    1
      Marlin/src/HAL/HAL_DUE/DebugMonitor.cpp
  39. 21
    0
      Marlin/src/HAL/HAL_DUE/EepromEmulation.cpp
  40. 1
    1
      Marlin/src/HAL/HAL_DUE/HAL.cpp
  41. 3
    3
      Marlin/src/HAL/HAL_DUE/HAL.h
  42. 1
    1
      Marlin/src/HAL/HAL_DUE/HAL_SPI.cpp
  43. 5
    5
      Marlin/src/HAL/HAL_DUE/InterruptVectors.cpp
  44. 1
    1
      Marlin/src/HAL/HAL_DUE/InterruptVectors.h
  45. 1
    1
      Marlin/src/HAL/HAL_DUE/MarlinSerial.cpp
  46. 1
    1
      Marlin/src/HAL/HAL_DUE/MarlinSerial.h
  47. 1
    1
      Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.cpp
  48. 1
    1
      Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.h
  49. 1
    1
      Marlin/src/HAL/HAL_DUE/Servo.cpp
  50. 1
    1
      Marlin/src/HAL/HAL_DUE/Tone.cpp
  51. 1
    1
      Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
  52. 1
    1
      Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp
  53. 1
    1
      Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
  54. 1
    1
      Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp
  55. 1
    1
      Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h
  56. 1
    1
      Marlin/src/HAL/HAL_DUE/endstop_interrupts.h
  57. 1
    1
      Marlin/src/HAL/HAL_DUE/fastio.h
  58. 1
    1
      Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.cpp
  59. 1
    1
      Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.h
  60. 1
    1
      Marlin/src/HAL/HAL_DUE/fastio/G2_pins.h
  61. 1
    1
      Marlin/src/HAL/HAL_DUE/inc/Conditionals_LCD.h
  62. 1
    1
      Marlin/src/HAL/HAL_DUE/inc/Conditionals_adv.h
  63. 1
    1
      Marlin/src/HAL/HAL_DUE/inc/Conditionals_post.h
  64. 2
    2
      Marlin/src/HAL/HAL_DUE/inc/SanityCheck.h
  65. 1
    1
      Marlin/src/HAL/HAL_DUE/persistent_store_eeprom.cpp
  66. 1
    1
      Marlin/src/HAL/HAL_DUE/pinsDebug.h
  67. 1
    1
      Marlin/src/HAL/HAL_DUE/spi_pins.h
  68. 1
    1
      Marlin/src/HAL/HAL_DUE/timers.cpp
  69. 1
    1
      Marlin/src/HAL/HAL_DUE/timers.h
  70. 1
    1
      Marlin/src/HAL/HAL_DUE/watchdog.cpp
  71. 1
    1
      Marlin/src/HAL/HAL_DUE/watchdog.h
  72. 1
    1
      Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.cpp
  73. 1
    1
      Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.h
  74. 7
    1
      Marlin/src/HAL/HAL_ESP32/HAL.cpp
  75. 3
    3
      Marlin/src/HAL/HAL_ESP32/HAL.h
  76. 1
    1
      Marlin/src/HAL/HAL_ESP32/HAL_SPI.cpp
  77. 1
    1
      Marlin/src/HAL/HAL_ESP32/Servo.cpp
  78. 1
    1
      Marlin/src/HAL/HAL_ESP32/Servo.h
  79. 1
    1
      Marlin/src/HAL/HAL_ESP32/WebSocketSerial.cpp
  80. 1
    1
      Marlin/src/HAL/HAL_ESP32/WebSocketSerial.h
  81. 1
    1
      Marlin/src/HAL/HAL_ESP32/endstop_interrupts.h
  82. 1
    1
      Marlin/src/HAL/HAL_ESP32/fastio.h
  83. 4
    4
      Marlin/src/HAL/HAL_ESP32/i2s.cpp
  84. 1
    1
      Marlin/src/HAL/HAL_ESP32/i2s.h
  85. 1
    1
      Marlin/src/HAL/HAL_ESP32/inc/Conditionals_LCD.h
  86. 1
    1
      Marlin/src/HAL/HAL_ESP32/inc/Conditionals_adv.h
  87. 1
    1
      Marlin/src/HAL/HAL_ESP32/inc/Conditionals_post.h
  88. 2
    2
      Marlin/src/HAL/HAL_ESP32/inc/SanityCheck.h
  89. 1
    1
      Marlin/src/HAL/HAL_ESP32/ota.cpp
  90. 1
    1
      Marlin/src/HAL/HAL_ESP32/ota.h
  91. 1
    1
      Marlin/src/HAL/HAL_ESP32/persistent_store_impl.cpp
  92. 1
    1
      Marlin/src/HAL/HAL_ESP32/servotimers.h
  93. 1
    1
      Marlin/src/HAL/HAL_ESP32/spi_pins.h
  94. 1
    1
      Marlin/src/HAL/HAL_ESP32/spiffs.cpp
  95. 1
    1
      Marlin/src/HAL/HAL_ESP32/spiffs.h
  96. 2
    2
      Marlin/src/HAL/HAL_ESP32/timers.cpp
  97. 1
    1
      Marlin/src/HAL/HAL_ESP32/timers.h
  98. 1
    1
      Marlin/src/HAL/HAL_ESP32/watchdog.cpp
  99. 1
    1
      Marlin/src/HAL/HAL_ESP32/watchdog.h
  100. 0
    0
      Marlin/src/HAL/HAL_ESP32/web.cpp

+ 19
- 0
.editorconfig ファイルの表示

@@ -0,0 +1,19 @@
1
+# editorconfig.org
2
+root = true
3
+
4
+[{*.patch,syntax_test_*}]
5
+trim_trailing_whitespace = false
6
+
7
+[{*.c,*.cpp,*.h}]
8
+charset = utf-8
9
+
10
+[{*.c,*.cpp,*.h,Makefile}]
11
+trim_trailing_whitespace = true
12
+insert_final_newline = true
13
+end_of_line = lf
14
+indent_style = space
15
+indent_size = 2
16
+
17
+[{*.py,*.conf,*.sublime-project}]
18
+indent_style = tab
19
+indent_size = 4

+ 1
- 1
.github/workflows/test-builds.yml ファイルの表示

@@ -32,6 +32,7 @@ jobs:
32 32
         - megaatmega2560
33 33
         - teensy31
34 34
         - teensy35
35
+        - SAMD51_grandcentral_m4
35 36
 
36 37
         # Extended AVR Environments
37 38
 
@@ -75,7 +76,6 @@ jobs:
75 76
         #- mks_robin_lite
76 77
         #- mks_robin_mini
77 78
         #- mks_robin_nano
78
-        #- SAMD51_grandcentral_m4
79 79
 
80 80
     steps:
81 81
 

+ 4
- 1
.gitignore ファイルの表示

@@ -1,6 +1,6 @@
1 1
 #
2 2
 # Marlin 3D Printer Firmware
3
-# Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+# Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
 #
5 5
 # Based on Sprinter and grbl.
6 6
 # Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -146,6 +146,9 @@ Marlin/*/*/readme.txt
146 146
 Marlin/*/*/*/readme.txt
147 147
 Marlin/*/*/*/*/readme.txt
148 148
 
149
+# Secure Credentials
150
+Configuration_Secure.h
151
+
149 152
 #Visual Studio
150 153
 *.sln
151 154
 *.vcxproj

+ 13
- 10
Marlin/Configuration.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -36,7 +36,7 @@
36 36
  * Advanced settings can be found in Configuration_adv.h
37 37
  *
38 38
  */
39
-#define CONFIGURATION_H_VERSION 020000
39
+#define CONFIGURATION_H_VERSION 020004
40 40
 
41 41
 //===========================================================================
42 42
 //============================= Getting Started =============================
@@ -1065,12 +1065,14 @@
1065 1065
 
1066 1066
 // @section homing
1067 1067
 
1068
-//#define NO_MOTION_BEFORE_HOMING  // Inhibit movement until all axes have been homed
1068
+//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed
1069 1069
 
1070
-//#define UNKNOWN_Z_NO_RAISE // Don't raise Z (lower the bed) if Z is "unknown." For beds that fall when Z is powered off.
1070
+//#define UNKNOWN_Z_NO_RAISE      // Don't raise Z (lower the bed) if Z is "unknown." For beds that fall when Z is powered off.
1071 1071
 
1072
-//#define Z_HOMING_HEIGHT 4  // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ...
1073
-                             // Be sure you have this distance over your Z_MAX_POS in case.
1072
+//#define Z_HOMING_HEIGHT  4      // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ...
1073
+                                  // Be sure to have this much clearance over your Z_MAX_POS to prevent grinding.
1074
+
1075
+//#define Z_AFTER_HOMING  10      // (mm) Height to move to after homing Z
1074 1076
 
1075 1077
 // Direction of endstops when homing; 1=MAX, -1=MIN
1076 1078
 // :[-1,1]
@@ -1232,6 +1234,7 @@
1232 1234
     #define MESH_TEST_HOTEND_TEMP  205    // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
1233 1235
     #define MESH_TEST_BED_TEMP      60    // (°C) Default bed temperature for the G26 Mesh Validation Tool.
1234 1236
     #define G26_XY_FEEDRATE         20    // (mm/s) Feedrate for XY Moves for the G26 Mesh Validation Tool.
1237
+    #define G26_RETRACT_MULTIPLIER   1.0  // G26 Q (retraction) used by default between mesh test elements.
1235 1238
   #endif
1236 1239
 
1237 1240
 #endif
@@ -1311,10 +1314,10 @@
1311 1314
 //#define LEVEL_BED_CORNERS
1312 1315
 
1313 1316
 #if ENABLED(LEVEL_BED_CORNERS)
1314
-  #define LEVEL_CORNERS_INSET 30    // (mm) An inset for corner leveling
1315
-  #define LEVEL_CORNERS_Z_HOP  4.0  // (mm) Move nozzle up before moving between corners
1316
-  #define LEVEL_CORNERS_HEIGHT 0.0  // (mm) Z height of nozzle at leveling points
1317
-  //#define LEVEL_CENTER_TOO        // Move to the center after the last corner
1317
+  #define LEVEL_CORNERS_INSET_LFRB { 30, 30, 30, 30 } // (mm) Left, Front, Right, Back insets
1318
+  #define LEVEL_CORNERS_HEIGHT      0.0   // (mm) Z height of nozzle at leveling points
1319
+  #define LEVEL_CORNERS_Z_HOP       4.0   // (mm) Z height of nozzle between leveling points
1320
+  //#define LEVEL_CENTER_TOO              // Move to the center after the last corner
1318 1321
 #endif
1319 1322
 
1320 1323
 /**

+ 59
- 25
Marlin/Configuration_adv.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -31,7 +31,7 @@
31 31
  * Basic settings can be found in Configuration.h
32 32
  *
33 33
  */
34
-#define CONFIGURATION_ADV_H_VERSION 020000
34
+#define CONFIGURATION_ADV_H_VERSION 020004
35 35
 
36 36
 // @section temperature
37 37
 
@@ -668,11 +668,37 @@
668 668
  */
669 669
 //#define Z_STEPPER_AUTO_ALIGN
670 670
 #if ENABLED(Z_STEPPER_AUTO_ALIGN)
671
-  // Define probe X and Y positions for Z1, Z2 [, Z3]
672
-  #define Z_STEPPER_ALIGN_XY { {  10, 190 }, { 100,  10 }, { 190, 190 } }
671
+  // Define probe X and Y positions for Z1, Z2 [, Z3 [, Z4]]
672
+  // If not defined, probe limits will be used.
673
+  // Override with 'M422 S<index> X<pos> Y<pos>'
674
+  //#define Z_STEPPER_ALIGN_XY { {  10, 190 }, { 100,  10 }, { 190, 190 } }
675
+
676
+  /**
677
+   * Orientation for the automatically-calculated probe positions.
678
+   * Override Z stepper align points with 'M422 S<index> X<pos> Y<pos>'
679
+   *
680
+   * 2 Steppers:  (0)     (1)
681
+   *               |       |   2   |
682
+   *               | 1   2 |       |
683
+   *               |       |   1   |
684
+   *
685
+   * 3 Steppers:  (0)     (1)     (2)     (3)
686
+   *               |   3   | 1     | 2   1 |     2 |
687
+   *               |       |     3 |       | 3     |
688
+   *               | 1   2 | 2     |   3   |     1 |
689
+   *
690
+   * 4 Steppers:  (0)     (1)     (2)     (3)
691
+   *               | 4   3 | 1   4 | 2   1 | 3   2 |
692
+   *               |       |       |       |       |
693
+   *               | 1   2 | 2   3 | 3   4 | 4   1 |
694
+   *
695
+   */
696
+  #ifndef Z_STEPPER_ALIGN_XY
697
+    //#define Z_STEPPERS_ORIENTATION 0
698
+  #endif
673 699
 
674 700
   // Provide Z stepper positions for more rapid convergence in bed alignment.
675
-  // Currently requires triple stepper drivers.
701
+  // Requires triple stepper drivers (i.e., set NUM_Z_STEPPER_DRIVERS to 3)
676 702
   //#define Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS
677 703
   #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
678 704
     // Define Stepper XY positions for Z1, Z2, Z3 corresponding to
@@ -680,23 +706,16 @@
680 706
     // Define one position per Z stepper in stepper driver order.
681 707
     #define Z_STEPPER_ALIGN_STEPPER_XY { { 210.7, 102.5 }, { 152.6, 220.0 }, { 94.5, 102.5 } }
682 708
   #else
683
-    // Amplification factor. Used to scale the correction step up or down.
684
-    // In case the stepper (spindle) position is further out than the test point.
685
-    // Use a value > 1. NOTE: This may cause instability
686
-    #define Z_STEPPER_ALIGN_AMP 1.0
709
+    // Amplification factor. Used to scale the correction step up or down in case
710
+    // the stepper (spindle) position is farther out than the test point.
711
+    #define Z_STEPPER_ALIGN_AMP 1.0       // Use a value > 1.0 NOTE: This may cause instability!
687 712
   #endif
688 713
 
689
-  // Set number of iterations to align
690
-  #define Z_STEPPER_ALIGN_ITERATIONS 3
691
-
692
-  // Enable to restore leveling setup after operation
693
-  #define RESTORE_LEVELING_AFTER_G34
694
-
695 714
   // On a 300mm bed a 5% grade would give a misalignment of ~1.5cm
696
-  #define G34_MAX_GRADE  5  // (%) Maximum incline G34 will handle
697
-
698
-  // Stop criterion. If the accuracy is better than this stop iterating early
699
-  #define Z_STEPPER_ALIGN_ACC 0.02
715
+  #define G34_MAX_GRADE              5    // (%) Maximum incline that G34 will handle
716
+  #define Z_STEPPER_ALIGN_ITERATIONS 5    // Number of iterations to apply during alignment
717
+  #define Z_STEPPER_ALIGN_ACC        0.02 // Stop iterating early if the accuracy is better than this
718
+  #define RESTORE_LEVELING_AFTER_G34      // Restore leveling after G34 is done?
700 719
 #endif
701 720
 
702 721
 // @section motion
@@ -821,8 +840,8 @@
821 840
 
822 841
   // Define the pin to read during calibration
823 842
   #ifndef CALIBRATION_PIN
824
-    #define CALIBRATION_PIN -1 // Override in pins.h or set to -1 to use your Z endstop
825
-    #define CALIBRATION_PIN_INVERTING false // Set to true to invert the pin
843
+    //#define CALIBRATION_PIN -1            // Define here to override the default pin
844
+    #define CALIBRATION_PIN_INVERTING false // Set to true to invert the custom pin
826 845
     //#define CALIBRATION_PIN_PULLDOWN
827 846
     #define CALIBRATION_PIN_PULLUP
828 847
   #endif
@@ -1314,9 +1333,11 @@
1314 1333
   //#define AO_EXP1_PINMAP    // AlephObjects CLCD UI EXP1 mapping
1315 1334
   //#define AO_EXP2_PINMAP    // AlephObjects CLCD UI EXP2 mapping
1316 1335
   //#define CR10_TFT_PINMAP   // Rudolph Riedel's CR10 pin mapping
1336
+  //#define S6_TFT_PINMAP     // FYSETC S6 pin mapping
1337
+
1317 1338
   //#define OTHER_PIN_LAYOUT  // Define pins manually below
1318 1339
   #if ENABLED(OTHER_PIN_LAYOUT)
1319
-    // The pins for CS and MOD_RESET (PD) must be chosen.
1340
+    // Pins for CS and MOD_RESET (PD) must be chosen
1320 1341
     #define CLCD_MOD_RESET  9
1321 1342
     #define CLCD_SPI_CS    10
1322 1343
 
@@ -1426,6 +1447,7 @@
1426 1447
  */
1427 1448
 //#define BABYSTEPPING
1428 1449
 #if ENABLED(BABYSTEPPING)
1450
+  //#define INTEGRATED_BABYSTEPPING         // EXPERIMENTAL integration of babystepping into the Stepper ISR
1429 1451
   //#define BABYSTEP_WITHOUT_HOMING
1430 1452
   //#define BABYSTEP_XY                     // Also enable X/Y Babystepping. Not supported on DELTA!
1431 1453
   #define BABYSTEP_INVERT_Z false           // Change if Z babysteps should go the other way
@@ -1554,7 +1576,7 @@
1554 1576
 
1555 1577
   // Add additional compensation depending on hotend temperature
1556 1578
   // Note: this values cannot be calibrated and have to be set manually
1557
-  #ifdef PROBE_TEMP_COMPENSATION
1579
+  #if ENABLED(PROBE_TEMP_COMPENSATION)
1558 1580
     // Max temperature that can be reached by heated bed.
1559 1581
     // This is required only for the calibration process.
1560 1582
     #define PTC_MAX_BED_TEMP 110
@@ -2765,6 +2787,10 @@
2765 2787
  */
2766 2788
 #define FASTER_GCODE_PARSER
2767 2789
 
2790
+#if ENABLED(FASTER_GCODE_PARSER)
2791
+  //#define GCODE_QUOTED_STRINGS  // Support for quoted string parameters
2792
+#endif
2793
+
2768 2794
 /**
2769 2795
  * CNC G-code options
2770 2796
  * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
@@ -3004,11 +3030,19 @@
3004 3030
 //#define ESP3D_WIFISUPPORT   // ESP3D Library WiFi management (https://github.com/luc-github/ESP3DLib)
3005 3031
 
3006 3032
 #if EITHER(WIFISUPPORT, ESP3D_WIFISUPPORT)
3007
-  #define WIFI_SSID "Wifi SSID"
3008
-  #define WIFI_PWD  "Wifi Password"
3009 3033
   //#define WEBSUPPORT          // Start a webserver (which may include auto-discovery)
3010 3034
   //#define OTASUPPORT          // Support over-the-air firmware updates
3011 3035
   //#define WIFI_CUSTOM_COMMAND // Accept feature config commands (e.g., WiFi ESP3D) from the host
3036
+
3037
+  /**
3038
+   * To set a default WiFi SSID / Password, create a file called Configuration_Secure.h with
3039
+   * the following defines, customized for your network. This specific file is excluded via
3040
+   * .gitignore to prevent it from accidentally leaking to the public.
3041
+   *
3042
+   *   #define WIFI_SSID "WiFi SSID"
3043
+   *   #define WIFI_PWD  "WiFi Password"
3044
+   */
3045
+  //#include "Configuration_Secure.h" // External file with WiFi SSID / Password
3012 3046
 #endif
3013 3047
 
3014 3048
 /**

+ 73
- 68
Marlin/Makefile ファイルの表示

@@ -180,88 +180,93 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1105)
180 180
 else ifeq ($(HARDWARE_MOTHERBOARD),1106)
181 181
 # MKS v1.5 with Allegro A4982 stepper drivers
182 182
 else ifeq ($(HARDWARE_MOTHERBOARD),1107)
183
-# MKS BASE 1.0 with Heroic HR4982 stepper drivers
183
+# MKS v1.6 with Allegro A4982 stepper drivers
184 184
 else ifeq ($(HARDWARE_MOTHERBOARD),1108)
185
-# MKS GEN v1.3 or 1.4
185
+
186
+# MKS BASE 1.0 with Heroic HR4982 stepper drivers
186 187
 else ifeq ($(HARDWARE_MOTHERBOARD),1109)
187
-# MKS GEN L
188
+# MKS GEN v1.3 or 1.4
188 189
 else ifeq ($(HARDWARE_MOTHERBOARD),1110)
189
-# zrib V2.0 control board (Chinese knock off RAMPS replica)
190
+# MKS GEN L
190 191
 else ifeq ($(HARDWARE_MOTHERBOARD),1111)
191
-# BigTreeTech or BIQU KFB2.0
192
+# zrib V2.0 control board (Chinese knock off RAMPS replica)
192 193
 else ifeq ($(HARDWARE_MOTHERBOARD),1112)
193
-# Felix 2.0+ Electronics Board (RAMPS like)
194
+# BigTreeTech or BIQU KFB2.0
194 195
 else ifeq ($(HARDWARE_MOTHERBOARD),1113)
195
-# Invent-A-Part RigidBoard
196
+# Felix 2.0+ Electronics Board (RAMPS like)
196 197
 else ifeq ($(HARDWARE_MOTHERBOARD),1114)
197
-# Invent-A-Part RigidBoard V2
198
+# Invent-A-Part RigidBoard
198 199
 else ifeq ($(HARDWARE_MOTHERBOARD),1115)
199
-# Sainsmart 2-in-1 board
200
+# Invent-A-Part RigidBoard V2
200 201
 else ifeq ($(HARDWARE_MOTHERBOARD),1116)
201
-# Ultimaker
202
+# Sainsmart 2-in-1 board
202 203
 else ifeq ($(HARDWARE_MOTHERBOARD),1117)
203
-# Ultimaker (Older electronics. Pre 1.5.4. This is rare)
204
+# Ultimaker
204 205
 else ifeq ($(HARDWARE_MOTHERBOARD),1118)
206
+# Ultimaker (Older electronics. Pre 1.5.4. This is rare)
207
+else ifeq ($(HARDWARE_MOTHERBOARD),1119)
205 208
   MCU ?= atmega1280
206 209
 
207 210
 # Azteeg X3
208
-else ifeq ($(HARDWARE_MOTHERBOARD),1119)
209
-# Azteeg X3 Pro
210 211
 else ifeq ($(HARDWARE_MOTHERBOARD),1120)
211
-# Ultimainboard 2.x (Uses TEMP_SENSOR 20)
212
+# Azteeg X3 Pro
212 213
 else ifeq ($(HARDWARE_MOTHERBOARD),1121)
213
-# Rumba
214
+# Ultimainboard 2.x (Uses TEMP_SENSOR 20)
214 215
 else ifeq ($(HARDWARE_MOTHERBOARD),1122)
215
-# Raise3D Rumba
216
+# Rumba
216 217
 else ifeq ($(HARDWARE_MOTHERBOARD),1123)
217
-# Rapide Lite RL200 Rumba
218
+# Raise3D Rumba
218 219
 else ifeq ($(HARDWARE_MOTHERBOARD),1124)
219
-# Formbot T-Rex 2 Plus
220
+# Rapide Lite RL200 Rumba
220 221
 else ifeq ($(HARDWARE_MOTHERBOARD),1125)
221
-# Formbot T-Rex 3
222
+# Formbot T-Rex 2 Plus
222 223
 else ifeq ($(HARDWARE_MOTHERBOARD),1126)
223
-# Formbot Raptor
224
+# Formbot T-Rex 3
224 225
 else ifeq ($(HARDWARE_MOTHERBOARD),1127)
225
-# Formbot Raptor 2
226
+# Formbot Raptor
226 227
 else ifeq ($(HARDWARE_MOTHERBOARD),1128)
227
-# bq ZUM Mega 3D
228
+# Formbot Raptor 2
228 229
 else ifeq ($(HARDWARE_MOTHERBOARD),1129)
229
-# MakeBoard Mini v2.1.2 is a control board sold by MicroMake
230
+# bq ZUM Mega 3D
230 231
 else ifeq ($(HARDWARE_MOTHERBOARD),1130)
231
-# TriGorilla Anycubic version 1.3 based on RAMPS EFB
232
+# MakeBoard Mini v2.1.2 is a control board sold by MicroMake
232 233
 else ifeq ($(HARDWARE_MOTHERBOARD),1131)
233
-# TriGorilla Anycubic version 1.4 based on RAMPS EFB
234
+# TriGorilla Anycubic version 1.3 based on RAMPS EFB
234 235
 else ifeq ($(HARDWARE_MOTHERBOARD),1132)
235
-# TriGorilla Anycubic version 1.4 Rev 1.1
236
+# TriGorilla Anycubic version 1.4 based on RAMPS EFB
236 237
 else ifeq ($(HARDWARE_MOTHERBOARD),1133)
237
-# Creality: Ender-4, CR-8
238
+# TriGorilla Anycubic version 1.4 Rev 1.1
238 239
 else ifeq ($(HARDWARE_MOTHERBOARD),1134)
239
-# Creality: CR10S, CR20, CR-X
240
+# Creality: Ender-4, CR-8
240 241
 else ifeq ($(HARDWARE_MOTHERBOARD),1135)
241
-# Dagoma F5
242
+# Creality: CR10S, CR20, CR-X
242 243
 else ifeq ($(HARDWARE_MOTHERBOARD),1136)
243
-# FYSETC F6
244
+# Dagoma F5
244 245
 else ifeq ($(HARDWARE_MOTHERBOARD),1137)
245
-# Duplicator i3 Plus
246
+# FYSETC F6 1.3
246 247
 else ifeq ($(HARDWARE_MOTHERBOARD),1138)
247
-# VORON
248
+# FYSETC F6 1.5
248 249
 else ifeq ($(HARDWARE_MOTHERBOARD),1139)
249
-# TRONXY V3 1.0
250
+# Duplicator i3 Plus
250 251
 else ifeq ($(HARDWARE_MOTHERBOARD),1140)
251
-# Z-Bolt X Series
252
+# VORON
252 253
 else ifeq ($(HARDWARE_MOTHERBOARD),1141)
253
-# TT OSCAR
254
+# TRONXY V3 1.0
254 255
 else ifeq ($(HARDWARE_MOTHERBOARD),1142)
255
-# Overlord/Overlord Pro
256
+# Z-Bolt X Series
256 257
 else ifeq ($(HARDWARE_MOTHERBOARD),1143)
257
-# ADIMLab Gantry v1
258
+# TT OSCAR
258 259
 else ifeq ($(HARDWARE_MOTHERBOARD),1144)
259
-# ADIMLab Gantry v2
260
+# Overlord/Overlord Pro
260 261
 else ifeq ($(HARDWARE_MOTHERBOARD),1145)
261
-# BIQU Tango V1
262
+# ADIMLab Gantry v1
262 263
 else ifeq ($(HARDWARE_MOTHERBOARD),1146)
263
-# MKS GEN L V2
264
+# ADIMLab Gantry v2
264 265
 else ifeq ($(HARDWARE_MOTHERBOARD),1147)
266
+# BIQU Tango V1
267
+else ifeq ($(HARDWARE_MOTHERBOARD),1148)
268
+# MKS GEN L V2
269
+else ifeq ($(HARDWARE_MOTHERBOARD),1149)
265 270
 
266 271
 #
267 272
 # RAMBo and derivatives
@@ -784,11 +789,11 @@ sym: $(BUILD_DIR)/$(TARGET).sym
784 789
 # Do not try to reset an Arduino if it's not one
785 790
 upload: $(BUILD_DIR)/$(TARGET).hex
786 791
 ifeq (${AVRDUDE_PROGRAMMER}, arduino)
787
-	stty hup < $(UPLOAD_PORT); true
792
+  stty hup < $(UPLOAD_PORT); true
788 793
 endif
789
-	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH)
794
+  $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH)
790 795
 ifeq (${AVRDUDE_PROGRAMMER}, arduino)
791
-	stty -hup < $(UPLOAD_PORT); true
796
+  stty -hup < $(UPLOAD_PORT); true
792 797
 endif
793 798
 
794 799
 # Display size of file.
@@ -796,10 +801,10 @@ HEXSIZE = $(SIZE) --target=$(FORMAT) $(BUILD_DIR)/$(TARGET).hex
796 801
 ELFSIZE = $(SIZE)  $(SIZE_FLAGS) $(BUILD_DIR)/$(TARGET).elf; \
797 802
           $(SIZE)  $(BUILD_DIR)/$(TARGET).elf
798 803
 sizebefore:
799
-	$P if [ -f $(BUILD_DIR)/$(TARGET).elf ]; then echo; echo $(MSG_SIZE_BEFORE); $(HEXSIZE); echo; fi
804
+  $P if [ -f $(BUILD_DIR)/$(TARGET).elf ]; then echo; echo $(MSG_SIZE_BEFORE); $(HEXSIZE); echo; fi
800 805
 
801 806
 sizeafter: build
802
-	$P if [ -f $(BUILD_DIR)/$(TARGET).elf ]; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); echo; fi
807
+  $P if [ -f $(BUILD_DIR)/$(TARGET).elf ]; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); echo; fi
803 808
 
804 809
 
805 810
 # Convert ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB.
@@ -811,71 +816,71 @@ COFFCONVERT=$(OBJCOPY) --debugging \
811 816
 
812 817
 
813 818
 coff: $(BUILD_DIR)/$(TARGET).elf
814
-	$(COFFCONVERT) -O coff-avr $(BUILD_DIR)/$(TARGET).elf $(TARGET).cof
819
+  $(COFFCONVERT) -O coff-avr $(BUILD_DIR)/$(TARGET).elf $(TARGET).cof
815 820
 
816 821
 
817 822
 extcoff: $(TARGET).elf
818
-	$(COFFCONVERT) -O coff-ext-avr $(BUILD_DIR)/$(TARGET).elf $(TARGET).cof
823
+  $(COFFCONVERT) -O coff-ext-avr $(BUILD_DIR)/$(TARGET).elf $(TARGET).cof
819 824
 
820 825
 
821 826
 .SUFFIXES: .elf .hex .eep .lss .sym .bin
822 827
 .PRECIOUS: .o
823 828
 
824 829
 .elf.hex:
825
-	$(Pecho) "  COPY  $@"
826
-	$P $(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@
830
+  $(Pecho) "  COPY  $@"
831
+  $P $(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@
827 832
 
828 833
 .elf.bin:
829
-	$(Pecho) "  COPY  $@"
830
-	$P $(OBJCOPY) -O binary -R .eeprom $< $@
834
+  $(Pecho) "  COPY  $@"
835
+  $P $(OBJCOPY) -O binary -R .eeprom $< $@
831 836
 
832 837
 .elf.eep:
833
-	-$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
838
+  -$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
834 839
     --change-section-lma .eeprom=0 -O $(FORMAT) $< $@
835 840
 
836 841
 # Create extended listing file from ELF output file.
837 842
 .elf.lss:
838
-	$(OBJDUMP) -h -S $< > $@
843
+  $(OBJDUMP) -h -S $< > $@
839 844
 
840 845
 # Create a symbol table from ELF output file.
841 846
 .elf.sym:
842
-	$(NM) -n $< > $@
847
+  $(NM) -n $< > $@
843 848
 
844 849
 # Link: create ELF output file from library.
845 850
 
846 851
 $(BUILD_DIR)/$(TARGET).elf: $(OBJ) Configuration.h
847
-	$(Pecho) "  CXX   $@"
848
-	$P $(CC) $(LD_PREFIX) $(ALL_CXXFLAGS) -o $@ -L. $(OBJ) $(LDFLAGS) $(LD_SUFFIX)
852
+  $(Pecho) "  CXX   $@"
853
+  $P $(CC) $(LD_PREFIX) $(ALL_CXXFLAGS) -o $@ -L. $(OBJ) $(LDFLAGS) $(LD_SUFFIX)
849 854
 
850 855
 # Object files that were found in "src" will be stored in $(BUILD_DIR)
851 856
 # in directories that mirror the structure of "src"
852 857
 
853 858
 $(BUILD_DIR)/%.o: %.c Configuration.h Configuration_adv.h $(MAKEFILE)
854
-	$(Pecho) "  CC    $<"
855
-	$P $(CC) -MMD -c $(ALL_CFLAGS) $(CWARN) $< -o $@
859
+  $(Pecho) "  CC    $<"
860
+  $P $(CC) -MMD -c $(ALL_CFLAGS) $(CWARN) $< -o $@
856 861
 
857 862
 $(BUILD_DIR)/%.o: %.cpp Configuration.h Configuration_adv.h $(MAKEFILE)
858
-	$(Pecho) "  CXX   $<"
859
-	$P $(CXX) -MMD -c $(ALL_CXXFLAGS) $(CXXWARN) $< -o $@
863
+  $(Pecho) "  CXX   $<"
864
+  $P $(CXX) -MMD -c $(ALL_CXXFLAGS) $(CXXWARN) $< -o $@
860 865
 
861 866
 # Object files for Arduino libs will be created in $(BUILD_DIR)/arduino
862 867
 
863 868
 $(BUILD_DIR)/arduino/%.o: %.c Configuration.h Configuration_adv.h $(MAKEFILE)
864
-	$(Pecho) "  CC    $<"
865
-	$P $(CC) -MMD -c $(ALL_CFLAGS) $(LIBWARN) $< -o $@
869
+  $(Pecho) "  CC    $<"
870
+  $P $(CC) -MMD -c $(ALL_CFLAGS) $(LIBWARN) $< -o $@
866 871
 
867 872
 $(BUILD_DIR)/arduino/%.o: %.cpp Configuration.h Configuration_adv.h $(MAKEFILE)
868
-	$(Pecho) "  CXX   $<"
869
-	$P $(CXX) -MMD -c $(ALL_CXXFLAGS)  $(LIBWARN) $< -o $@
873
+  $(Pecho) "  CXX   $<"
874
+  $P $(CXX) -MMD -c $(ALL_CXXFLAGS)  $(LIBWARN) $< -o $@
870 875
 
871 876
 $(BUILD_DIR)/arduino/%.o: %.S $(MAKEFILE)
872
-	$(Pecho) "  CXX   $<"
873
-	$P $(CXX) -MMD -c $(ALL_ASFLAGS) $< -o $@
877
+  $(Pecho) "  CXX   $<"
878
+  $P $(CXX) -MMD -c $(ALL_ASFLAGS) $< -o $@
874 879
 
875 880
 # Target: clean project.
876 881
 clean:
877
-	$(Pecho) "  RMDIR $(BUILD_DIR)/"
878
-	$P rm -rf $(BUILD_DIR)
882
+  $(Pecho) "  RMDIR $(BUILD_DIR)/"
883
+  $P rm -rf $(BUILD_DIR)
879 884
 
880 885
 
881 886
 .PHONY: all build elf hex eep lss sym program coff extcoff clean depend sizebefore sizeafter

+ 1
- 1
Marlin/Version.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_AVR/HAL.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 3
- 3
Marlin/src/HAL/HAL_AVR/HAL.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
5 5
  *
6 6
  * This program is free software: you can redistribute it and/or modify
@@ -53,8 +53,8 @@
53 53
 //#define analogInputToDigitalPin(IO) IO
54 54
 
55 55
 #ifndef CRITICAL_SECTION_START
56
-  #define CRITICAL_SECTION_START  unsigned char _sreg = SREG; cli()
57
-  #define CRITICAL_SECTION_END    SREG = _sreg
56
+  #define CRITICAL_SECTION_START()  unsigned char _sreg = SREG; cli()
57
+  #define CRITICAL_SECTION_END()    SREG = _sreg
58 58
 #endif
59 59
 #define ISRS_ENABLED() TEST(SREG, SREG_I)
60 60
 #define ENABLE_ISRS()  sei()

+ 1
- 1
Marlin/src/HAL/HAL_AVR/HAL_SPI.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_AVR/MarlinSerial.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_AVR/Servo.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_AVR/ServoTimers.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_AVR/endstop_interrupts.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_AVR/fast_pwm.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_AVR/fastio.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_AVR/fastio.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_AVR/fastio/fastio_1280.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_AVR/fastio/fastio_1281.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_AVR/fastio/fastio_168.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_AVR/fastio/fastio_644.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_AVR/fastio/fastio_AT90USB.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_AVR/inc/Conditionals_LCD.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_AVR/inc/Conditionals_adv.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_AVR/inc/Conditionals_post.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 2
- 2
Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -60,6 +60,6 @@
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
 
63
-#if TMC_HAS_SW_SERIAL && ENABLED(MONITOR_DRIVER_STATUS)
63
+#if HAS_TMC_SW_SERIAL && ENABLED(MONITOR_DRIVER_STATUS)
64 64
   #error "MONITOR_DRIVER_STATUS causes performance issues when used with SoftwareSerial-connected drivers. Disable MONITOR_DRIVER_STATUS or use hardware serial to continue."
65 65
 #endif

+ 1
- 1
Marlin/src/HAL/HAL_AVR/math.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_AVR/persistent_store_eeprom.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_AVR/pinsDebug.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * This program is free software: you can redistribute it and/or modify
6 6
  * it under the terms of the GNU General Public License as published by

+ 1
- 1
Marlin/src/HAL/HAL_AVR/pinsDebug_Teensyduino.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * This program is free software: you can redistribute it and/or modify
6 6
  * it under the terms of the GNU General Public License as published by

+ 1
- 1
Marlin/src/HAL/HAL_AVR/pinsDebug_plus_70.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * This program is free software: you can redistribute it and/or modify
6 6
  * it under the terms of the GNU General Public License as published by

+ 1
- 1
Marlin/src/HAL/HAL_AVR/spi_pins.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_AVR/u8g_com_HAL_AVR_sw_spi.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_AVR/watchdog.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_AVR/watchdog.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_DUE/DebugMonitor.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 21
- 0
Marlin/src/HAL/HAL_DUE/EepromEmulation.cpp ファイルの表示

@@ -1,3 +1,24 @@
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
+ */
1 22
 
2 23
 /* EEPROM emulation over flash with reduced wear
3 24
  *

+ 1
- 1
Marlin/src/HAL/HAL_DUE/HAL.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
5 5
  *
6 6
  * This program is free software: you can redistribute it and/or modify

+ 3
- 3
Marlin/src/HAL/HAL_DUE/HAL.h ファイルの表示

@@ -1,7 +1,7 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3 3
  *
4
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
5 5
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
6 6
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
7 7
  *
@@ -119,8 +119,8 @@ typedef int8_t pin_t;
119 119
 //
120 120
 // Interrupts
121 121
 //
122
-#define CRITICAL_SECTION_START  uint32_t primask = __get_PRIMASK(); __disable_irq()
123
-#define CRITICAL_SECTION_END    if (!primask) __enable_irq()
122
+#define CRITICAL_SECTION_START()  uint32_t primask = __get_PRIMASK(); __disable_irq()
123
+#define CRITICAL_SECTION_END()    if (!primask) __enable_irq()
124 124
 #define ISRS_ENABLED() (!__get_PRIMASK())
125 125
 #define ENABLE_ISRS()  __enable_irq()
126 126
 #define DISABLE_ISRS() __disable_irq()

+ 1
- 1
Marlin/src/HAL/HAL_DUE/HAL_SPI.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 5
- 5
Marlin/src/HAL/HAL_DUE/InterruptVectors.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -63,13 +63,13 @@ static pfnISR_Handler* get_relocated_table_addr() {
63 63
   memcpy(&ram_tab, romtab, sizeof(ram_tab));
64 64
 
65 65
   // Disable global interrupts
66
-  CRITICAL_SECTION_START;
66
+  CRITICAL_SECTION_START();
67 67
 
68 68
   // Set the vector table base address to the SRAM copy
69 69
   SCB->VTOR = (uint32_t)(&ram_tab);
70 70
 
71 71
   // Reenable interrupts
72
-  CRITICAL_SECTION_END;
72
+  CRITICAL_SECTION_END();
73 73
 
74 74
   // Return the address of the table
75 75
   return (pfnISR_Handler*)(&ram_tab);
@@ -80,7 +80,7 @@ pfnISR_Handler install_isr(IRQn_Type irq, pfnISR_Handler newHandler) {
80 80
   pfnISR_Handler *isrtab = get_relocated_table_addr();
81 81
 
82 82
   // Disable global interrupts
83
-  CRITICAL_SECTION_START;
83
+  CRITICAL_SECTION_START();
84 84
 
85 85
   // Get the original handler
86 86
   pfnISR_Handler oldHandler = isrtab[irq + 16];
@@ -89,7 +89,7 @@ pfnISR_Handler install_isr(IRQn_Type irq, pfnISR_Handler newHandler) {
89 89
   isrtab[irq + 16] = newHandler;
90 90
 
91 91
   // Reenable interrupts
92
-  CRITICAL_SECTION_END;
92
+  CRITICAL_SECTION_END();
93 93
 
94 94
   // Return the original one
95 95
   return oldHandler;

+ 1
- 1
Marlin/src/HAL/HAL_DUE/InterruptVectors.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_DUE/MarlinSerial.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_DUE/MarlinSerial.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_DUE/Servo.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_DUE/Tone.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_DUE/endstop_interrupts.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_DUE/fastio.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_DUE/fastio/G2_PWM.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_DUE/fastio/G2_pins.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_DUE/inc/Conditionals_LCD.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_DUE/inc/Conditionals_adv.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_DUE/inc/Conditionals_post.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 2
- 2
Marlin/src/HAL/HAL_DUE/inc/SanityCheck.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -56,6 +56,6 @@
56 56
   #error "FAST_PWM_FAN is not yet implemented for this platform."
57 57
 #endif
58 58
 
59
-#if TMC_HAS_SW_SERIAL
59
+#if HAS_TMC_SW_SERIAL
60 60
   #error "TMC220x Software Serial is not supported on this platform."
61 61
 #endif

+ 1
- 1
Marlin/src/HAL/HAL_DUE/persistent_store_eeprom.cpp ファイルの表示

@@ -1,7 +1,7 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3 3
  *
4
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
5 5
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
6 6
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
7 7
  * Copyright (c) 2016 Victor Perez victor_pv@hotmail.com

+ 1
- 1
Marlin/src/HAL/HAL_DUE/pinsDebug.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * This program is free software: you can redistribute it and/or modify
6 6
  * it under the terms of the GNU General Public License as published by

+ 1
- 1
Marlin/src/HAL/HAL_DUE/spi_pins.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_DUE/timers.cpp ファイルの表示

@@ -1,7 +1,7 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3 3
  *
4
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
5 5
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
6 6
  * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
7 7
  *

+ 1
- 1
Marlin/src/HAL/HAL_DUE/timers.h ファイルの表示

@@ -1,7 +1,7 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3 3
  *
4
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
5 5
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
6 6
  *
7 7
  * This program is free software: you can redistribute it and/or modify

+ 1
- 1
Marlin/src/HAL/HAL_DUE/watchdog.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_DUE/watchdog.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 7
- 1
Marlin/src/HAL/HAL_ESP32/HAL.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -172,6 +172,12 @@ void HAL_adc_init() {
172 172
   #if HAS_TEMP_ADC_5
173 173
     adc1_set_attenuation(get_channel(TEMP_5_PIN), ADC_ATTEN_11db);
174 174
   #endif
175
+  #if HAS_TEMP_ADC_6
176
+    adc2_set_attenuation(get_channel(TEMP_6_PIN), ADC_ATTEN_11db);
177
+  #endif
178
+  #if HAS_TEMP_ADC_7
179
+    adc3_set_attenuation(get_channel(TEMP_7_PIN), ADC_ATTEN_11db);
180
+  #endif
175 181
   #if HAS_HEATED_BED
176 182
     adc1_set_attenuation(get_channel(TEMP_BED_PIN), ADC_ATTEN_11db);
177 183
   #endif

+ 3
- 3
Marlin/src/HAL/HAL_ESP32/HAL.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
5 5
  *
6 6
  * This program is free software: you can redistribute it and/or modify
@@ -65,8 +65,8 @@ extern portMUX_TYPE spinlock;
65 65
   #define NUM_SERIAL 1
66 66
 #endif
67 67
 
68
-#define CRITICAL_SECTION_START portENTER_CRITICAL(&spinlock)
69
-#define CRITICAL_SECTION_END   portEXIT_CRITICAL(&spinlock)
68
+#define CRITICAL_SECTION_START() portENTER_CRITICAL(&spinlock)
69
+#define CRITICAL_SECTION_END()   portEXIT_CRITICAL(&spinlock)
70 70
 #define ISRS_ENABLED() (spinlock.owner == portMUX_FREE_VAL)
71 71
 #define ENABLE_ISRS()  if (spinlock.owner != portMUX_FREE_VAL) portEXIT_CRITICAL(&spinlock)
72 72
 #define DISABLE_ISRS() portENTER_CRITICAL(&spinlock)

+ 1
- 1
Marlin/src/HAL/HAL_ESP32/HAL_SPI.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_ESP32/Servo.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_ESP32/Servo.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_ESP32/WebSocketSerial.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_ESP32/WebSocketSerial.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_ESP32/endstop_interrupts.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_ESP32/fastio.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 4
- 4
Marlin/src/HAL/HAL_ESP32/i2s.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -153,8 +153,8 @@ void stepperTask(void* parameter) {
153 153
         remaining--;
154 154
       }
155 155
       else {
156
-        Stepper::stepper_pulse_phase_isr();
157
-        remaining = Stepper::stepper_block_phase_isr();
156
+        Stepper::pulse_phase_isr();
157
+        remaining = Stepper::block_phase_isr();
158 158
       }
159 159
     }
160 160
   }
@@ -308,7 +308,7 @@ int i2s_init() {
308 308
   esp_intr_enable(i2s_isr_handle);
309 309
 
310 310
   // Create the task that will feed the buffer
311
-  xTaskCreate(stepperTask, "StepperTask", 10000, nullptr, 1, nullptr);
311
+  xTaskCreatePinnedToCore(stepperTask, "StepperTask", 10000, nullptr, 1, nullptr, CONFIG_ARDUINO_RUNNING_CORE); // run I2S stepper task on same core as rest of Marlin
312 312
 
313 313
   // Route the i2s pins to the appropriate GPIO
314 314
   gpio_matrix_out_check(I2S_DATA, I2S0O_DATA_OUT23_IDX, 0, 0);

+ 1
- 1
Marlin/src/HAL/HAL_ESP32/i2s.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_ESP32/inc/Conditionals_LCD.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_ESP32/inc/Conditionals_adv.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_ESP32/inc/Conditionals_post.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 2
- 2
Marlin/src/HAL/HAL_ESP32/inc/SanityCheck.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -29,7 +29,7 @@
29 29
   #error "FAST_PWM_FAN is not yet implemented for this platform."
30 30
 #endif
31 31
 
32
-#if TMC_HAS_SW_SERIAL
32
+#if HAS_TMC_SW_SERIAL
33 33
   #error "TMC220x Software Serial is not supported on this platform."
34 34
 #endif
35 35
 

+ 1
- 1
Marlin/src/HAL/HAL_ESP32/ota.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
5 5
  *
6 6
  * This program is free software: you can redistribute it and/or modify

+ 1
- 1
Marlin/src/HAL/HAL_ESP32/ota.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
5 5
  *
6 6
  * This program is free software: you can redistribute it and/or modify

+ 1
- 1
Marlin/src/HAL/HAL_ESP32/persistent_store_impl.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_ESP32/servotimers.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_ESP32/spi_pins.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * This program is free software: you can redistribute it and/or modify
6 6
  * it under the terms of the GNU General Public License as published by

+ 1
- 1
Marlin/src/HAL/HAL_ESP32/spiffs.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_ESP32/spiffs.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 2
- 2
Marlin/src/HAL/HAL_ESP32/timers.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -106,7 +106,7 @@ void HAL_timer_start(const uint8_t timer_num, uint32_t frequency) {
106 106
 
107 107
   timer_enable_intr(timer.group, timer.idx);
108 108
 
109
-  timer_isr_register(timer.group, timer.idx, timer_isr, (void*)timer_num, 0, nullptr);
109
+  timer_isr_register(timer.group, timer.idx, timer_isr, (void*)(uint32_t)timer_num, 0, nullptr);
110 110
 
111 111
   timer_start(timer.group, timer.idx);
112 112
 }

+ 1
- 1
Marlin/src/HAL/HAL_ESP32/timers.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_ESP32/watchdog.cpp ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 1
- 1
Marlin/src/HAL/HAL_ESP32/watchdog.h ファイルの表示

@@ -1,6 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
5 5
  * Based on Sprinter and grbl.
6 6
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

+ 0
- 0
Marlin/src/HAL/HAL_ESP32/web.cpp ファイルの表示


変更されたファイルが多すぎるため、一部のファイルは表示されません

読み込み中…
キャンセル
保存