瀏覽代碼

Merge pull request #9283 from thinkyhead/bf2_jgaurora_configs

[2.0.x] Add JGAurora A5 support
Scott Lahteine 7 年之前
父節點
當前提交
7a52dfad55
沒有連結到貢獻者的電子郵件帳戶。
共有 61 個檔案被更改,包括 3663 行新增30 行删除
  1. 2
    1
      Marlin/Configuration.h
  2. 2
    2
      Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp
  3. 2
    1
      Marlin/src/config/default/Configuration.h
  4. 1
    0
      Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
  5. 1
    0
      Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
  6. 1
    0
      Marlin/src/config/examples/Anet/A6/Configuration.h
  7. 1
    0
      Marlin/src/config/examples/Anet/A8/Configuration.h
  8. 2
    1
      Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
  9. 1
    0
      Marlin/src/config/examples/BQ/Hephestos/Configuration.h
  10. 1
    0
      Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
  11. 1
    0
      Marlin/src/config/examples/BQ/WITBOX/Configuration.h
  12. 1
    0
      Marlin/src/config/examples/Cartesio/Configuration.h
  13. 1
    0
      Marlin/src/config/examples/Creality/CR-10/Configuration.h
  14. 1
    0
      Marlin/src/config/examples/Creality/CR-10S/Configuration.h
  15. 1
    0
      Marlin/src/config/examples/Creality/Ender/Configuration.h
  16. 1
    0
      Marlin/src/config/examples/Felix/Configuration.h
  17. 1
    0
      Marlin/src/config/examples/Felix/DUAL/Configuration.h
  18. 1
    0
      Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
  19. 1
    0
      Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
  20. 1
    0
      Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
  21. 1
    0
      Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
  22. 1809
    0
      Marlin/src/config/examples/JGAurora/A5/Configuration.h
  23. 1601
    0
      Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h
  24. 39
    0
      Marlin/src/config/examples/JGAurora/A5/README.md
  25. 2
    1
      Marlin/src/config/examples/MakerParts/Configuration.h
  26. 1
    0
      Marlin/src/config/examples/Malyan/M150/Configuration.h
  27. 1
    0
      Marlin/src/config/examples/Malyan/M200/Configuration.h
  28. 1
    0
      Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
  29. 1
    0
      Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
  30. 2
    1
      Marlin/src/config/examples/Mks/Sbase/Configuration.h
  31. 1
    0
      Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
  32. 1
    0
      Marlin/src/config/examples/RigidBot/Configuration.h
  33. 1
    0
      Marlin/src/config/examples/SCARA/Configuration.h
  34. 2
    1
      Marlin/src/config/examples/STM32F10/Configuration.h
  35. 1
    0
      Marlin/src/config/examples/Sanguinololu/Configuration.h
  36. 2
    1
      Marlin/src/config/examples/TheBorg/Configuration.h
  37. 1
    0
      Marlin/src/config/examples/TinyBoy2/Configuration.h
  38. 1
    0
      Marlin/src/config/examples/Tronxy/X1/Configuration.h
  39. 2
    1
      Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
  40. 1
    0
      Marlin/src/config/examples/Velleman/K8200/Configuration.h
  41. 1
    0
      Marlin/src/config/examples/Velleman/K8400/Configuration.h
  42. 1
    0
      Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
  43. 1
    0
      Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h
  44. 1
    0
      Marlin/src/config/examples/adafruit/ST7565/Configuration.h
  45. 1
    0
      Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
  46. 1
    0
      Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h
  47. 1
    0
      Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
  48. 1
    0
      Marlin/src/config/examples/delta/generic/Configuration.h
  49. 1
    0
      Marlin/src/config/examples/delta/kossel_mini/Configuration.h
  50. 1
    0
      Marlin/src/config/examples/delta/kossel_pro/Configuration.h
  51. 1
    0
      Marlin/src/config/examples/delta/kossel_xl/Configuration.h
  52. 1
    0
      Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
  53. 1
    0
      Marlin/src/config/examples/makibox/Configuration.h
  54. 1
    0
      Marlin/src/config/examples/stm32f103ret6/Configuration.h
  55. 1
    0
      Marlin/src/config/examples/tvrrug/Round2/Configuration.h
  56. 1
    0
      Marlin/src/config/examples/wt150/Configuration.h
  57. 25
    0
      Marlin/src/inc/SanityCheck.h
  58. 64
    0
      Marlin/src/module/thermistor/thermistor_15.h
  59. 3
    0
      Marlin/src/module/thermistor/thermistors.h
  60. 48
    20
      Marlin/src/pins/pins.h
  61. 12
    0
      Marlin/src/pins/pinsDebug_list.h

+ 2
- 1
Marlin/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design
1734
  * LED Type. Enable only one of the following two options.
1735
  * LED Type. Enable only one of the following two options.
1735
  *
1736
  *
1736
  */
1737
  */
1737
-
1738
 //#define RGB_LED
1738
 //#define RGB_LED
1739
 //#define RGBW_LED
1739
 //#define RGBW_LED
1740
+
1740
 #if ENABLED(RGB_LED) || ENABLED(RGBW_LED)
1741
 #if ENABLED(RGB_LED) || ENABLED(RGBW_LED)
1741
   #define RGB_LED_R_PIN 34
1742
   #define RGB_LED_R_PIN 34
1742
   #define RGB_LED_G_PIN 43
1743
   #define RGB_LED_G_PIN 43

+ 2
- 2
Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp 查看文件

69
     uint8_t xon_xoff_state = XON_XOFF_CHAR_SENT | XON_CHAR;
69
     uint8_t xon_xoff_state = XON_XOFF_CHAR_SENT | XON_CHAR;
70
   #endif
70
   #endif
71
 
71
 
72
-  void clear_command_queue(); 
72
+  void clear_command_queue();
73
 
73
 
74
   #if ENABLED(SERIAL_STATS_DROPPED_RX)
74
   #if ENABLED(SERIAL_STATS_DROPPED_RX)
75
     uint8_t rx_dropped_bytes = 0;
75
     uint8_t rx_dropped_bytes = 0;
391
     // may be written to rx_buffer_tail, making the buffer appear full rather than empty.
391
     // may be written to rx_buffer_tail, making the buffer appear full rather than empty.
392
     CRITICAL_SECTION_START;
392
     CRITICAL_SECTION_START;
393
       rx_buffer.head = rx_buffer.tail = 0;
393
       rx_buffer.head = rx_buffer.tail = 0;
394
-      clear_command_queue(); 
394
+      clear_command_queue();
395
     CRITICAL_SECTION_END;
395
     CRITICAL_SECTION_END;
396
 
396
 
397
     #if ENABLED(SERIAL_XON_XOFF)
397
     #if ENABLED(SERIAL_XON_XOFF)

+ 2
- 1
Marlin/src/config/default/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design
1734
  * LED Type. Enable only one of the following two options.
1735
  * LED Type. Enable only one of the following two options.
1735
  *
1736
  *
1736
  */
1737
  */
1737
-
1738
 //#define RGB_LED
1738
 //#define RGB_LED
1739
 //#define RGBW_LED
1739
 //#define RGBW_LED
1740
+
1740
 #if ENABLED(RGB_LED) || ENABLED(RGBW_LED)
1741
 #if ENABLED(RGB_LED) || ENABLED(RGBW_LED)
1741
   #define RGB_LED_R_PIN 34
1742
   #define RGB_LED_R_PIN 34
1742
   #define RGB_LED_G_PIN 43
1743
   #define RGB_LED_G_PIN 43

+ 1
- 0
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/AliExpress/CL-260/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/Anet/A6/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/Anet/A8/Configuration.h 查看文件

277
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
278
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
279
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
280
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
281
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
282
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design
283
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 2
- 1
Marlin/src/config/examples/Azteeg/X5GT/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design
1729
  * LED Type. Enable only one of the following two options.
1730
  * LED Type. Enable only one of the following two options.
1730
  *
1731
  *
1731
  */
1732
  */
1732
-
1733
 //#define RGB_LED
1733
 //#define RGB_LED
1734
 //#define RGBW_LED
1734
 //#define RGBW_LED
1735
+
1735
 #if ENABLED(RGB_LED) || ENABLED(RGBW_LED)
1736
 #if ENABLED(RGB_LED) || ENABLED(RGBW_LED)
1736
   #define RGB_LED_R_PIN 34
1737
   #define RGB_LED_R_PIN 34
1737
   #define RGB_LED_G_PIN 43
1738
   #define RGB_LED_G_PIN 43

+ 1
- 0
Marlin/src/config/examples/BQ/Hephestos/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h 查看文件

275
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
275
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
276
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
277
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
278
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
279
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
280
  *    66 : 4.7M High Temperature thermistor from Dyze Design
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/BQ/WITBOX/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/Cartesio/Configuration.h 查看文件

277
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
278
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
279
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
280
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
281
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
282
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design
283
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/Creality/CR-10/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/Creality/CR-10S/Configuration.h 查看文件

267
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
267
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
268
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
268
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
269
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
269
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
270
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
270
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
271
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
271
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
272
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
272
  *    66 : 4.7M High Temperature thermistor from Dyze Design
273
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/Creality/Ender/Configuration.h 查看文件

267
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
267
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
268
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
268
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
269
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
269
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
270
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
270
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
271
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
271
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
272
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
272
  *    66 : 4.7M High Temperature thermistor from Dyze Design
273
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/Felix/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/Felix/DUAL/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h 查看文件

277
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
278
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
279
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
280
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
281
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
282
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design
283
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/Geeetech/GT2560/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/Infitary/i3-M508/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1809
- 0
Marlin/src/config/examples/JGAurora/A5/Configuration.h
文件差異過大導致無法顯示
查看文件


+ 1601
- 0
Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h
文件差異過大導致無法顯示
查看文件


+ 39
- 0
Marlin/src/config/examples/JGAurora/A5/README.md 查看文件

1
+# Configuration for JGAurora A5 printer
2
+
3
+## Firmware Installation Instructions
4
+
5
+To install custom firmware:
6
+
7
+- Download and install arduino IDE software from https://www.arduino.cc/en/Main/Software
8
+- Plug in A5 to your computer via USB cable
9
+- In arduino IDE, under the Tools menu, set:
10
+  – **Board** to "Arduino/Genuino Mega or Mega 2560"
11
+  – ***Processor*** to "Atmega 2560 (Mega 2560)"
12
+  – **Port** to your 3D printer’s serial port. To figure out the correct serial port unplug the printer and observe the "Port" menu. Connect the printer's USB cable, re-open the "Port" menu and see if a new ports has appeared. This new port is likely to be your printer.
13
+    - If you can’t find the right port or if your machine isn't detected, you may need to install a driver for the CH340 serial-to-USB interface chip in the printer.
14
+      - [macOS CH340 Serial Driver](http://sampin.ch/ch340-driver-mac)
15
+      - [Windows CH340 Serial Driver](https://sparks.gogo.co.nz/ch340.html)
16
+- Install the u8glib library using the library manager in the menu "Sketch -> Include Library -> Manage Libraries."
17
+- IMPORTANT: Unplug the 8-pin LCD panel header connector on your printer. The LCD should turn off completely. This is found underneath the LCD, and can be accessed from underneath the printer without removing any screws. Remember where it goes so you can put it back after flashing.
18
+- Close all other programs (Cura, Repetier Host, JGCreat, etc.) that could connect to the serial port.
19
+- Open the "Marlin.ino" file in Arduino IDE and wait for the new project window to appear.
20
+- Select "Upload" from the "Sketch" menu or click the Upload button.
21
+- Wait for the firmware to finish uploading and verifying. This may take a couple of minutes.
22
+- Plug the LCD connector back in.
23
+- In the Arduino IDE, select "Tools -> Serial monitor" to open up a simple console. In the popup menus, select "Newline" and a Baud Rate of "250000."
24
+- In the input box, enter the following G-code commands:
25
+  - `M502` (press return) to reset settings (in RAM) to your configured defaults.
26
+  - `M500` (press return) to write settings and initialize the EEPROM.
27
+
28
+## Graphical Display
29
+
30
+The control panel included with the JGAurora interfaces only indirectly with Marlin, and this imposes some limitations. But you can use a RepRap Discount Full Graphic Smart Controller with the JGAurora A5 by applying the following additional settings in `Configuration.h`:
31
+
32
+```cpp
33
+#define ENCODER_PULSES_PER_STEP 5
34
+#define ENCODER_STEPS_PER_MENU_ITEM 1
35
+#define REVERSE_ENCODER_DIRECTION
36
+#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
37
+```
38
+
39
+You may also be able to change `BEEPER_PIN` to use the piezo on the LCD controller instead of the one on the board.

+ 2
- 1
Marlin/src/config/examples/MakerParts/Configuration.h 查看文件

287
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
287
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
288
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
288
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
289
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
289
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
290
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
290
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
291
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
291
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
292
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
292
  *    66 : 4.7M High Temperature thermistor from Dyze Design
293
  *    66 : 4.7M High Temperature thermistor from Dyze Design
1741
  * LED Type. Enable only one of the following two options.
1742
  * LED Type. Enable only one of the following two options.
1742
  *
1743
  *
1743
  */
1744
  */
1744
-
1745
 //#define RGB_LED
1745
 //#define RGB_LED
1746
 //#define RGBW_LED
1746
 //#define RGBW_LED
1747
+
1747
 #if ENABLED(RGB_LED) || ENABLED(RGBW_LED)
1748
 #if ENABLED(RGB_LED) || ENABLED(RGBW_LED)
1748
   #define RGB_LED_R_PIN 34
1749
   #define RGB_LED_R_PIN 34
1749
   #define RGB_LED_G_PIN 43
1750
   #define RGB_LED_G_PIN 43

+ 1
- 0
Marlin/src/config/examples/Malyan/M150/Configuration.h 查看文件

281
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
281
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
282
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
282
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
283
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
283
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
284
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
284
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
285
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
285
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
286
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
286
  *    66 : 4.7M High Temperature thermistor from Dyze Design
287
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/Malyan/M200/Configuration.h 查看文件

267
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
267
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
268
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
268
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
269
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
269
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
270
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
270
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
271
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
271
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
272
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
272
  *    66 : 4.7M High Temperature thermistor from Dyze Design
273
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/Micromake/C1/basic/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 2
- 1
Marlin/src/config/examples/Mks/Sbase/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design
1707
  * LED Type. Enable only one of the following two options.
1708
  * LED Type. Enable only one of the following two options.
1708
  *
1709
  *
1709
  */
1710
  */
1710
-
1711
 //#define RGB_LED
1711
 //#define RGB_LED
1712
 //#define RGBW_LED
1712
 //#define RGBW_LED
1713
+
1713
 #if ENABLED(RGB_LED) || ENABLED(RGBW_LED)
1714
 #if ENABLED(RGB_LED) || ENABLED(RGBW_LED)
1714
   #define RGB_LED_R_PIN 34
1715
   #define RGB_LED_R_PIN 34
1715
   #define RGB_LED_G_PIN 43
1716
   #define RGB_LED_G_PIN 43

+ 1
- 0
Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/RigidBot/Configuration.h 查看文件

279
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
279
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
280
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
280
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
281
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
281
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
282
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
282
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
283
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
283
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
284
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
284
  *    66 : 4.7M High Temperature thermistor from Dyze Design
285
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/SCARA/Configuration.h 查看文件

306
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
306
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
307
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
307
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
308
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
308
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
309
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
309
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
310
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
310
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
311
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
311
  *    66 : 4.7M High Temperature thermistor from Dyze Design
312
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 2
- 1
Marlin/src/config/examples/STM32F10/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design
1737
  * LED Type. Enable only one of the following two options.
1738
  * LED Type. Enable only one of the following two options.
1738
  *
1739
  *
1739
  */
1740
  */
1740
-
1741
 //#define RGB_LED
1741
 //#define RGB_LED
1742
 //#define RGBW_LED
1742
 //#define RGBW_LED
1743
+
1743
 #if ENABLED(RGB_LED) || ENABLED(RGBW_LED)
1744
 #if ENABLED(RGB_LED) || ENABLED(RGBW_LED)
1744
   #define RGB_LED_R_PIN 34
1745
   #define RGB_LED_R_PIN 34
1745
   #define RGB_LED_G_PIN 43
1746
   #define RGB_LED_G_PIN 43

+ 1
- 0
Marlin/src/config/examples/Sanguinololu/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 2
- 1
Marlin/src/config/examples/TheBorg/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design
1734
  * LED Type. Enable only one of the following two options.
1735
  * LED Type. Enable only one of the following two options.
1735
  *
1736
  *
1736
  */
1737
  */
1737
-
1738
 //#define RGB_LED
1738
 //#define RGB_LED
1739
 //#define RGBW_LED
1739
 //#define RGBW_LED
1740
+
1740
 #if ENABLED(RGB_LED) || ENABLED(RGBW_LED)
1741
 #if ENABLED(RGB_LED) || ENABLED(RGBW_LED)
1741
   #define RGB_LED_R_PIN 34
1742
   #define RGB_LED_R_PIN 34
1742
   #define RGB_LED_G_PIN 43
1743
   #define RGB_LED_G_PIN 43

+ 1
- 0
Marlin/src/config/examples/TinyBoy2/Configuration.h 查看文件

298
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
298
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
299
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
299
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
300
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
300
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
301
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
301
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
302
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
302
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
303
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
303
  *    66 : 4.7M High Temperature thermistor from Dyze Design
304
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/Tronxy/X1/Configuration.h 查看文件

267
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
267
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
268
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
268
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
269
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
269
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
270
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
270
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
271
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
271
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
272
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
272
  *    66 : 4.7M High Temperature thermistor from Dyze Design
273
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 2
- 1
Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h 查看文件

267
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
267
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
268
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
268
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
269
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
269
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
270
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
270
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
271
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
271
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
272
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
272
  *    66 : 4.7M High Temperature thermistor from Dyze Design
273
  *    66 : 4.7M High Temperature thermistor from Dyze Design
1726
  * LED Type. Enable only one of the following two options.
1727
  * LED Type. Enable only one of the following two options.
1727
  *
1728
  *
1728
  */
1729
  */
1729
-
1730
 //#define RGB_LED
1730
 //#define RGB_LED
1731
 //#define RGBW_LED
1731
 //#define RGBW_LED
1732
+
1732
 #if ENABLED(RGB_LED) || ENABLED(RGBW_LED)
1733
 #if ENABLED(RGB_LED) || ENABLED(RGBW_LED)
1733
   #define RGB_LED_R_PIN 34
1734
   #define RGB_LED_R_PIN 34
1734
   #define RGB_LED_G_PIN 43
1735
   #define RGB_LED_G_PIN 43

+ 1
- 0
Marlin/src/config/examples/Velleman/K8200/Configuration.h 查看文件

296
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
296
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
297
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
297
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
298
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
298
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
299
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
299
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
300
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
300
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
301
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
301
  *    66 : 4.7M High Temperature thermistor from Dyze Design
302
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/Velleman/K8400/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h 查看文件

267
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
267
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
268
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
268
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
269
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
269
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
270
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
270
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
271
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
271
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
272
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
272
  *    66 : 4.7M High Temperature thermistor from Dyze Design
273
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/adafruit/ST7565/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h 查看文件

267
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
267
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
268
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
268
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
269
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
269
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
270
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
270
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
271
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
271
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
272
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
272
  *    66 : 4.7M High Temperature thermistor from Dyze Design
273
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/delta/generic/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/delta/kossel_mini/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/delta/kossel_pro/Configuration.h 查看文件

280
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
280
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
281
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
281
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
282
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
282
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
283
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
283
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
284
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
284
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
285
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
285
  *    66 : 4.7M High Temperature thermistor from Dyze Design
286
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/delta/kossel_xl/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h 查看文件

281
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
281
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
282
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
282
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
283
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
283
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
284
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
284
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
285
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
285
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
286
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
286
  *    66 : 4.7M High Temperature thermistor from Dyze Design
287
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/makibox/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/stm32f103ret6/Configuration.h 查看文件

248
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
248
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
249
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
249
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
250
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
250
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
251
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
251
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
252
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
252
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
253
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
253
  *    66 : 4.7M High Temperature thermistor from Dyze Design
254
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/tvrrug/Round2/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 1
- 0
Marlin/src/config/examples/wt150/Configuration.h 查看文件

276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
276
  *    11 : 100k beta 3950 1% thermistor (4.7k pullup)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
277
  *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
278
  *    13 : 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"
279
+ *    15 : 100k thermistor calibration for JGAurora A5 hotend
279
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    20 : the PT100 circuit found in the Ultimainboard V2.x
280
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
281
  *    66 : 4.7M High Temperature thermistor from Dyze Design
282
  *    66 : 4.7M High Temperature thermistor from Dyze Design

+ 25
- 0
Marlin/src/inc/SanityCheck.h 查看文件

1467
   #elif defined(AUTOMATIC_CURRENT_CONTROL)
1467
   #elif defined(AUTOMATIC_CURRENT_CONTROL)
1468
     #error "AUTOMATIC_CURRENT_CONTROL is now MONITOR_DRIVER_STATUS. Please update your configuration."
1468
     #error "AUTOMATIC_CURRENT_CONTROL is now MONITOR_DRIVER_STATUS. Please update your configuration."
1469
   #endif
1469
   #endif
1470
+
1471
+  #if ENABLED(X_IS_TMC2130) && !PIN_EXISTS(X_CS)
1472
+    #error "X_CS_PIN is required for X_IS_TMC2130. Define X_CS_PIN in Configuration_adv.h."
1473
+  #elif ENABLED(X2_IS_TMC2130) && !PIN_EXISTS(X2_CS)
1474
+    #error "X2_CS_PIN is required for X2_IS_TMC2130. Define X2_CS_PIN in Configuration_adv.h."
1475
+  #elif ENABLED(Y_IS_TMC2130) && !PIN_EXISTS(Y_CS)
1476
+    #error "Y_CS_PIN is required for Y_IS_TMC2130. Define Y_CS_PIN in Configuration_adv.h."
1477
+  #elif ENABLED(Y2_IS_TMC2130) && !PIN_EXISTS(Y2_CS)
1478
+    #error "Y2_CS_PIN is required for Y2_IS_TMC2130. Define Y2_CS_PIN in Configuration_adv.h."
1479
+  #elif ENABLED(Z_IS_TMC2130) && !PIN_EXISTS(Z_CS)
1480
+    #error "Z_CS_PIN is required for Z_IS_TMC2130. Define Z_CS_PIN in Configuration_adv.h."
1481
+  #elif ENABLED(Z2_IS_TMC2130) && !PIN_EXISTS(Z2_CS)
1482
+    #error "Z2_CS_PIN is required for Z2_IS_TMC2130. Define Z2_CS_PIN in Configuration_adv.h."
1483
+  #elif ENABLED(E0_IS_TMC2130) && !PIN_EXISTS(E0_CS)
1484
+    #error "E0_CS_PIN is required for E0_IS_TMC2130. Define E0_CS_PIN in Configuration_adv.h."
1485
+  #elif ENABLED(E1_IS_TMC2130) && !PIN_EXISTS(E1_CS)
1486
+    #error "E1_CS_PIN is required for E1_IS_TMC2130. Define E1_CS_PIN in Configuration_adv.h."
1487
+  #elif ENABLED(E2_IS_TMC2130) && !PIN_EXISTS(E2_CS)
1488
+    #error "E2_CS_PIN is required for E2_IS_TMC2130. Define E2_CS_PIN in Configuration_adv.h."
1489
+  #elif ENABLED(E3_IS_TMC2130) && !PIN_EXISTS(E3_CS)
1490
+    #error "E3_CS_PIN is required for E3_IS_TMC2130. Define E3_CS_PIN in Configuration_adv.h."
1491
+  #elif ENABLED(E4_IS_TMC2130) && !PIN_EXISTS(E4_CS)
1492
+    #error "E4_CS_PIN is required for E4_IS_TMC2130. Define E4_CS_PIN in Configuration_adv.h."
1493
+  #endif
1494
+
1470
 #endif
1495
 #endif
1471
 
1496
 
1472
 /**
1497
 /**

+ 64
- 0
Marlin/src/module/thermistor/thermistor_15.h 查看文件

1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (C) 2016 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
+
23
+ // 100k bed thermistor in JGAurora A5. Calibrated by Sam Pinches 21st Jan 2018 using cheap k-type thermocouple inserted into heater block, using TM-902C meter.
24
+const short temptable_15[][2] PROGMEM = {
25
+  { OV(  31), 275 },
26
+  { OV(  33), 270 },
27
+  { OV(  35), 260 },
28
+  { OV(  38), 253 },
29
+  { OV(  41), 248 },
30
+  { OV( 48), 239 },
31
+  { OV( 56), 232 },
32
+  { OV( 66), 222 },
33
+  { OV( 78), 212 },
34
+  { OV( 93), 206 },
35
+  { OV( 106), 199 },
36
+  { OV( 118), 191 },
37
+  { OV( 130), 186 },
38
+  { OV( 158), 176 },
39
+  { OV( 187), 167 },
40
+  { OV( 224), 158 },
41
+  { OV( 270), 148 },
42
+  { OV( 321),  137 },
43
+  { OV( 379),  127 },
44
+  { OV( 446),  117 },
45
+  { OV( 518),  106 },
46
+  { OV( 593),  96 },
47
+  { OV( 668),  86 },
48
+  { OV( 739),  76 },
49
+  { OV( 767),  72 },
50
+  { OV( 830),  62 },
51
+  { OV( 902),  48 },
52
+  { OV( 926),  45 },
53
+  { OV( 955),  35 },
54
+  { OV( 966),  30 },
55
+  { OV( 977),  25 },
56
+  { OV( 985),  20 },
57
+  { OV( 993),  15 },
58
+  { OV( 999),  10 },
59
+  { OV(1004),   5 },
60
+  { OV(1008),   0 },
61
+  { OV(1012),  -5 },
62
+  { OV(1016), -10 },
63
+  { OV(1020), -15 }
64
+};

+ 3
- 0
Marlin/src/module/thermistor/thermistors.h 查看文件

79
 #if ANY_THERMISTOR_IS(13) // Hisens thermistor B25/50 =3950 +/-1%
79
 #if ANY_THERMISTOR_IS(13) // Hisens thermistor B25/50 =3950 +/-1%
80
   #include "thermistor_13.h"
80
   #include "thermistor_13.h"
81
 #endif
81
 #endif
82
+#if ANY_THERMISTOR_IS(15) // JGAurora A5 thermistor calibration
83
+  #include "thermistor_15.h"
84
+#endif
82
 #if ANY_THERMISTOR_IS(20) // PT100 with INA826 amp on Ultimaker v2.0 electronics
85
 #if ANY_THERMISTOR_IS(20) // PT100 with INA826 amp on Ultimaker v2.0 electronics
83
   #include "thermistor_20.h"
86
   #include "thermistor_20.h"
84
 #endif
87
 #endif

+ 48
- 20
Marlin/src/pins/pins.h 查看文件

364
 #ifndef Z_MS2_PIN
364
 #ifndef Z_MS2_PIN
365
   #define Z_MS2_PIN -1
365
   #define Z_MS2_PIN -1
366
 #endif
366
 #endif
367
+#ifndef Z_MS3_PIN
368
+  #define Z_MS3_PIN -1
369
+#endif
370
+#ifndef E0_MS1_PIN
371
+  #define E0_MS1_PIN -1
372
+#endif
373
+#ifndef E0_MS2_PIN
374
+  #define E0_MS2_PIN -1
375
+#endif
376
+#ifndef E1_MS1_PIN
377
+  #define E1_MS1_PIN -1
378
+#endif
379
+#ifndef E1_MS2_PIN
380
+  #define E1_MS2_PIN -1
381
+#endif
382
+#ifndef E2_MS1_PIN
383
+  #define E2_MS1_PIN -1
384
+#endif
385
+#ifndef E2_MS2_PIN
386
+  #define E2_MS2_PIN -1
387
+#endif
388
+#ifndef E3_MS1_PIN
389
+  #define E3_MS1_PIN -1
390
+#endif
391
+#ifndef E3_MS2_PIN
392
+  #define E3_MS2_PIN -1
393
+#endif
394
+#ifndef E3_MS3_PIN
395
+  #define E3_MS3_PIN -1
396
+#endif
397
+#ifndef E4_MS1_PIN
398
+  #define E4_MS1_PIN -1
399
+#endif
400
+#ifndef E4_MS2_PIN
401
+  #define E4_MS2_PIN -1
402
+#endif
403
+#ifndef E4_MS3_PIN
404
+  #define E4_MS3_PIN -1
405
+#endif
406
+
367
 #ifndef E0_STEP_PIN
407
 #ifndef E0_STEP_PIN
368
   #define E0_STEP_PIN -1
408
   #define E0_STEP_PIN -1
369
 #endif
409
 #endif
373
 #ifndef E0_ENABLE_PIN
413
 #ifndef E0_ENABLE_PIN
374
   #define E0_ENABLE_PIN -1
414
   #define E0_ENABLE_PIN -1
375
 #endif
415
 #endif
376
-#ifndef E0_MS1_PIN
377
-  #define E0_MS1_PIN -1
378
-#endif
379
-#ifndef E0_MS2_PIN
380
-  #define E0_MS2_PIN -1
381
-#endif
382
 #ifndef E1_STEP_PIN
416
 #ifndef E1_STEP_PIN
383
   #define E1_STEP_PIN -1
417
   #define E1_STEP_PIN -1
384
 #endif
418
 #endif
388
 #ifndef E1_ENABLE_PIN
422
 #ifndef E1_ENABLE_PIN
389
   #define E1_ENABLE_PIN -1
423
   #define E1_ENABLE_PIN -1
390
 #endif
424
 #endif
391
-#ifndef E1_MS1_PIN
392
-  #define E1_MS1_PIN -1
393
-#endif
394
-#ifndef E1_MS2_PIN
395
-  #define E1_MS2_PIN -1
396
-#endif
397
 #ifndef E2_STEP_PIN
425
 #ifndef E2_STEP_PIN
398
   #define E2_STEP_PIN -1
426
   #define E2_STEP_PIN -1
399
 #endif
427
 #endif
539
     #define _E1_PINS E1_STEP_PIN, E1_DIR_PIN, E1_ENABLE_PIN, E1_MS1_PIN, E1_MS2_PIN,
567
     #define _E1_PINS E1_STEP_PIN, E1_DIR_PIN, E1_ENABLE_PIN, E1_MS1_PIN, E1_MS2_PIN,
540
     #if EXTRUDERS > 4 // Tools 4 and 5 use E2
568
     #if EXTRUDERS > 4 // Tools 4 and 5 use E2
541
       #undef _E2_PINS
569
       #undef _E2_PINS
542
-      #define _E2_PINS E2_STEP_PIN, E2_DIR_PIN, E2_ENABLE_PIN,
570
+      #define _E2_PINS E2_STEP_PIN, E2_DIR_PIN, E2_ENABLE_PIN, E2_MS1_PIN, E2_MS2_PIN,
543
     #endif
571
     #endif
544
   #endif
572
   #endif
545
 #elif EXTRUDERS > 1
573
 #elif EXTRUDERS > 1
547
   #define _E1_PINS E1_STEP_PIN, E1_DIR_PIN, E1_ENABLE_PIN, E1_MS1_PIN, E1_MS2_PIN,
575
   #define _E1_PINS E1_STEP_PIN, E1_DIR_PIN, E1_ENABLE_PIN, E1_MS1_PIN, E1_MS2_PIN,
548
   #if EXTRUDERS > 2
576
   #if EXTRUDERS > 2
549
     #undef _E2_PINS
577
     #undef _E2_PINS
550
-    #define _E2_PINS E2_STEP_PIN, E2_DIR_PIN, E2_ENABLE_PIN,
578
+    #define _E2_PINS E2_STEP_PIN, E2_DIR_PIN, E2_ENABLE_PIN, E2_MS1_PIN, E2_MS2_PIN,
551
     #if EXTRUDERS > 3
579
     #if EXTRUDERS > 3
552
       #undef _E3_PINS
580
       #undef _E3_PINS
553
-      #define _E3_PINS E3_STEP_PIN, E3_DIR_PIN, E3_ENABLE_PIN,
581
+      #define _E3_PINS E3_STEP_PIN, E3_DIR_PIN, E3_ENABLE_PIN, E3_MS1_PIN, E3_MS2_PIN,
554
       #if EXTRUDERS > 4
582
       #if EXTRUDERS > 4
555
         #undef _E4_PINS
583
         #undef _E4_PINS
556
-        #define _E4_PINS E4_STEP_PIN, E4_DIR_PIN, E4_ENABLE_PIN,
584
+        #define _E4_PINS E4_STEP_PIN, E4_DIR_PIN, E4_ENABLE_PIN, E4_MS1_PIN, E4_MS2_PIN,
557
       #endif // EXTRUDERS > 4
585
       #endif // EXTRUDERS > 4
558
     #endif // EXTRUDERS > 3
586
     #endif // EXTRUDERS > 3
559
   #endif // EXTRUDERS > 2
587
   #endif // EXTRUDERS > 2
582
   #endif // HOTENDS > 2
610
   #endif // HOTENDS > 2
583
 #elif ENABLED(MIXING_EXTRUDER)
611
 #elif ENABLED(MIXING_EXTRUDER)
584
   #undef _E1_PINS
612
   #undef _E1_PINS
585
-  #define _E1_PINS E1_STEP_PIN, E1_DIR_PIN, E1_ENABLE_PIN,
613
+  #define _E1_PINS E1_STEP_PIN, E1_DIR_PIN, E1_ENABLE_PIN, E1_MS1_PIN, E1_MS2_PIN,
586
   #if MIXING_STEPPERS > 2
614
   #if MIXING_STEPPERS > 2
587
     #undef _E2_PINS
615
     #undef _E2_PINS
588
-    #define _E2_PINS E2_STEP_PIN, E2_DIR_PIN, E2_ENABLE_PIN,
616
+    #define _E2_PINS E2_STEP_PIN, E2_DIR_PIN, E2_ENABLE_PIN, E2_MS1_PIN, E2_MS2_PIN,
589
     #if MIXING_STEPPERS > 3
617
     #if MIXING_STEPPERS > 3
590
       #undef _E3_PINS
618
       #undef _E3_PINS
591
-      #define _E3_PINS E3_STEP_PIN, E3_DIR_PIN, E3_ENABLE_PIN,
619
+      #define _E3_PINS E3_STEP_PIN, E3_DIR_PIN, E3_ENABLE_PIN, E3_MS1_PIN, E3_MS2_PIN,
592
       #if MIXING_STEPPERS > 4
620
       #if MIXING_STEPPERS > 4
593
         #undef _E4_PINS
621
         #undef _E4_PINS
594
-        #define _E4_PINS E4_STEP_PIN, E4_DIR_PIN, E4_ENABLE_PIN,
622
+        #define _E4_PINS E4_STEP_PIN, E4_DIR_PIN, E4_ENABLE_PIN, E4_MS1_PIN, E4_MS2_PIN,
595
       #endif // MIXING_STEPPERS > 4
623
       #endif // MIXING_STEPPERS > 4
596
     #endif // MIXING_STEPPERS > 3
624
     #endif // MIXING_STEPPERS > 3
597
   #endif // MIXING_STEPPERS > 2
625
   #endif // MIXING_STEPPERS > 2

+ 12
- 0
Marlin/src/pins/pinsDebug_list.h 查看文件

289
 #if PIN_EXISTS(E3_STEP)
289
 #if PIN_EXISTS(E3_STEP)
290
   REPORT_NAME_DIGITAL(E3_STEP_PIN, __LINE__ )
290
   REPORT_NAME_DIGITAL(E3_STEP_PIN, __LINE__ )
291
 #endif
291
 #endif
292
+#if PIN_EXISTS(E4_CS)
293
+  REPORT_NAME_DIGITAL(E4_CS_PIN, __LINE__ )
294
+#endif
292
 #if PIN_EXISTS(E4_DIR)
295
 #if PIN_EXISTS(E4_DIR)
293
   REPORT_NAME_DIGITAL(E4_DIR_PIN, __LINE__ )
296
   REPORT_NAME_DIGITAL(E4_DIR_PIN, __LINE__ )
294
 #endif
297
 #endif
295
 #if PIN_EXISTS(E4_ENABLE)
298
 #if PIN_EXISTS(E4_ENABLE)
296
   REPORT_NAME_DIGITAL(E4_ENABLE_PIN, __LINE__ )
299
   REPORT_NAME_DIGITAL(E4_ENABLE_PIN, __LINE__ )
297
 #endif
300
 #endif
301
+#if PIN_EXISTS(E4_MS1)
302
+  REPORT_NAME_DIGITAL(E4_MS1_PIN, __LINE__ )
303
+#endif
304
+#if PIN_EXISTS(E4_MS2)
305
+  REPORT_NAME_DIGITAL(E4_MS2_PIN, __LINE__ )
306
+#endif
307
+#if PIN_EXISTS(E4_MS3)
308
+  REPORT_NAME_DIGITAL(E4_MS3_PIN, __LINE__ )
309
+#endif
298
 #if PIN_EXISTS(E4_STEP)
310
 #if PIN_EXISTS(E4_STEP)
299
   REPORT_NAME_DIGITAL(E4_STEP_PIN, __LINE__ )
311
   REPORT_NAME_DIGITAL(E4_STEP_PIN, __LINE__ )
300
 #endif
312
 #endif

Loading…
取消
儲存