Browse Source

Merge pull request #7134 from thinkyhead/bf_skynet_a3_ready

Add Skynet/ANET A10 support
Scott Lahteine 8 years ago
parent
commit
e687782875
66 changed files with 4119 additions and 403 deletions
  1. 57
    37
      Marlin/Conditionals_LCD.h
  2. 4
    1
      Marlin/SanityCheck.h
  3. 1
    0
      Marlin/boards.h
  4. 1607
    0
      Marlin/example_configurations/Anet/Configuration.h
  5. 1349
    0
      Marlin/example_configurations/Anet/Configuration_adv.h
  6. 22
    12
      Marlin/example_configurations/CL-260/Configuration.h
  7. 21
    11
      Marlin/example_configurations/Cartesio/Configuration.h
  8. 2
    2
      Marlin/example_configurations/Cartesio/Configuration_adv.h
  9. 21
    11
      Marlin/example_configurations/Felix/Configuration.h
  10. 2
    2
      Marlin/example_configurations/Felix/Configuration_adv.h
  11. 21
    11
      Marlin/example_configurations/Felix/DUAL/Configuration.h
  12. 21
    11
      Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h
  13. 2
    2
      Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h
  14. 21
    11
      Marlin/example_configurations/Hephestos/Configuration.h
  15. 2
    2
      Marlin/example_configurations/Hephestos/Configuration_adv.h
  16. 21
    11
      Marlin/example_configurations/Hephestos_2/Configuration.h
  17. 2
    2
      Marlin/example_configurations/Hephestos_2/Configuration_adv.h
  18. 21
    6
      Marlin/example_configurations/K8200/Configuration.h
  19. 2
    2
      Marlin/example_configurations/K8200/Configuration_adv.h
  20. 21
    11
      Marlin/example_configurations/K8400/Configuration.h
  21. 2
    2
      Marlin/example_configurations/K8400/Configuration_adv.h
  22. 21
    11
      Marlin/example_configurations/K8400/Dual-head/Configuration.h
  23. 22
    12
      Marlin/example_configurations/M150/Configuration.h
  24. 2
    2
      Marlin/example_configurations/M150/Configuration_adv.h
  25. 21
    11
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  26. 21
    11
      Marlin/example_configurations/RigidBot/Configuration.h
  27. 2
    2
      Marlin/example_configurations/RigidBot/Configuration_adv.h
  28. 21
    11
      Marlin/example_configurations/SCARA/Configuration.h
  29. 2
    2
      Marlin/example_configurations/SCARA/Configuration_adv.h
  30. 21
    11
      Marlin/example_configurations/TAZ4/Configuration.h
  31. 2
    2
      Marlin/example_configurations/TAZ4/Configuration_adv.h
  32. 21
    6
      Marlin/example_configurations/TinyBoy2/Configuration.h
  33. 2
    2
      Marlin/example_configurations/TinyBoy2/Configuration_adv.h
  34. 21
    11
      Marlin/example_configurations/WITBOX/Configuration.h
  35. 2
    2
      Marlin/example_configurations/WITBOX/Configuration_adv.h
  36. 21
    11
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  37. 21
    11
      Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h
  38. 2
    2
      Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h
  39. 21
    11
      Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h
  40. 2
    2
      Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h
  41. 21
    11
      Marlin/example_configurations/delta/generic/Configuration.h
  42. 2
    2
      Marlin/example_configurations/delta/generic/Configuration_adv.h
  43. 21
    11
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  44. 2
    2
      Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
  45. 21
    11
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  46. 2
    2
      Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
  47. 21
    11
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  48. 2
    2
      Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
  49. 24
    14
      Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h
  50. 2
    2
      Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h
  51. 21
    11
      Marlin/example_configurations/makibox/Configuration.h
  52. 2
    2
      Marlin/example_configurations/makibox/Configuration_adv.h
  53. 21
    11
      Marlin/example_configurations/tvrrug/Round2/Configuration.h
  54. 2
    2
      Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
  55. 22
    12
      Marlin/example_configurations/wt150/Configuration.h
  56. 2
    2
      Marlin/example_configurations/wt150/Configuration_adv.h
  57. 2
    0
      Marlin/pins.h
  58. 5
    0
      Marlin/pinsDebug.h
  59. 3
    0
      Marlin/pinsDebug_list.h
  60. 274
    0
      Marlin/pins_ANET_10.h
  61. 29
    1
      Marlin/temperature.cpp
  62. 8
    0
      Marlin/temperature.h
  63. 113
    7
      Marlin/ultralcd.cpp
  64. 19
    1
      Marlin/ultralcd.h
  65. 6
    1
      buildroot/bin/build_marlin
  66. 2
    5
      buildroot/bin/build_marlin_fail

+ 57
- 37
Marlin/Conditionals_LCD.h View File

31
   #define LCD_HAS_DIRECTIONAL_BUTTONS (BUTTON_EXISTS(UP) || BUTTON_EXISTS(DWN) || BUTTON_EXISTS(LFT) || BUTTON_EXISTS(RT))
31
   #define LCD_HAS_DIRECTIONAL_BUTTONS (BUTTON_EXISTS(UP) || BUTTON_EXISTS(DWN) || BUTTON_EXISTS(LFT) || BUTTON_EXISTS(RT))
32
 
32
 
33
   #if ENABLED(CARTESIO_UI)
33
   #if ENABLED(CARTESIO_UI)
34
+
34
     #define DOGLCD
35
     #define DOGLCD
35
     #define ULTIPANEL
36
     #define ULTIPANEL
36
     #define NEWPANEL
37
     #define NEWPANEL
37
     #define DEFAULT_LCD_CONTRAST 90
38
     #define DEFAULT_LCD_CONTRAST 90
38
     #define LCD_CONTRAST_MIN 60
39
     #define LCD_CONTRAST_MIN 60
39
     #define LCD_CONTRAST_MAX 140
40
     #define LCD_CONTRAST_MAX 140
40
-  #endif
41
 
41
 
42
-  #if ENABLED(MAKRPANEL) || ENABLED(MINIPANEL)
42
+  #elif ENABLED(MAKRPANEL) || ENABLED(MINIPANEL)
43
+
43
     #define DOGLCD
44
     #define DOGLCD
44
     #define ULTIPANEL
45
     #define ULTIPANEL
45
     #define NEWPANEL
46
     #define NEWPANEL
46
     #define DEFAULT_LCD_CONTRAST 17
47
     #define DEFAULT_LCD_CONTRAST 17
47
-  #endif
48
 
48
 
49
-  #if ENABLED(miniVIKI) || ENABLED(VIKI2) || ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
49
+  #elif ENABLED(ANET_KEYPAD_LCD)
50
+
51
+    #define REPRAPWORLD_KEYPAD
52
+    #define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0
53
+    #define ADC_KEYPAD
54
+    #define ADC_KEY_NUM 8
55
+    #define ULTIPANEL
56
+    // this helps to implement ADC_KEYPAD menus
57
+    #define ENCODER_STEPS_PER_MENU_ITEM 1
58
+    #define REVERSE_MENU_DIRECTION
59
+
60
+  #elif ENABLED(ANET_FULL_GRAPHICS_LCD)
61
+
62
+    #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
63
+
64
+  #elif ENABLED(BQ_LCD_SMART_CONTROLLER)
65
+
66
+    #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
67
+    #define LONG_FILENAME_HOST_SUPPORT
68
+
69
+  #elif ENABLED(miniVIKI) || ENABLED(VIKI2) || ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
70
+
50
     #define ULTRA_LCD  //general LCD support, also 16x2
71
     #define ULTRA_LCD  //general LCD support, also 16x2
51
     #define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
72
     #define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
52
     #define ULTIMAKERCONTROLLER //as available from the Ultimaker online store.
73
     #define ULTIMAKERCONTROLLER //as available from the Ultimaker online store.
65
       #define SD_DETECT_INVERTED
86
       #define SD_DETECT_INVERTED
66
     #endif
87
     #endif
67
 
88
 
68
-  #endif
89
+  #elif ENABLED(OLED_PANEL_TINYBOY2)
69
 
90
 
70
-  #if ENABLED(OLED_PANEL_TINYBOY2)
71
     #define U8GLIB_SSD1306
91
     #define U8GLIB_SSD1306
72
     #define ULTIPANEL
92
     #define ULTIPANEL
73
     #define NEWPANEL
93
     #define NEWPANEL
74
     #define REVERSE_ENCODER_DIRECTION
94
     #define REVERSE_ENCODER_DIRECTION
75
     #define REVERSE_MENU_DIRECTION
95
     #define REVERSE_MENU_DIRECTION
96
+
97
+  #elif ENABLED(RA_CONTROL_PANEL)
98
+
99
+    #define LCD_I2C_TYPE_PCA8574
100
+    #define LCD_I2C_ADDRESS 0x27   // I2C Address of the port expander
101
+    #define ULTIPANEL
102
+    #define NEWPANEL
103
+
104
+  #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
105
+
106
+    #define DOGLCD
107
+    #define U8GLIB_ST7920
108
+    #define ULTIPANEL
109
+    #define NEWPANEL
110
+
76
   #endif
111
   #endif
77
 
112
 
78
   // Generic support for SSD1306 / SH1106 OLED based LCDs.
113
   // Generic support for SSD1306 / SH1106 OLED based LCDs.
85
     #define ULTIMAKERCONTROLLER
120
     #define ULTIMAKERCONTROLLER
86
   #endif
121
   #endif
87
 
122
 
88
-  #if ENABLED(BQ_LCD_SMART_CONTROLLER)
89
-    #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
90
-    #ifndef LONG_FILENAME_HOST_SUPPORT
91
-      #define LONG_FILENAME_HOST_SUPPORT
92
-    #endif
93
-  #endif
94
-
95
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
123
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
96
     #define DOGLCD
124
     #define DOGLCD
97
     #define U8GLIB_ST7920
125
     #define U8GLIB_ST7920
113
     #endif
141
     #endif
114
   #endif
142
   #endif
115
 
143
 
116
-  #if ENABLED(RA_CONTROL_PANEL)
117
-    #define LCD_I2C_TYPE_PCA8574
118
-    #define LCD_I2C_ADDRESS 0x27   // I2C Address of the port expander
119
-    #define ULTIPANEL
120
-    #define NEWPANEL
121
-  #endif
122
-
123
-  #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
124
-    #define DOGLCD
125
-    #define U8GLIB_ST7920
126
-    #define ULTIPANEL
127
-    #define NEWPANEL
128
-  #endif
129
-
130
   /**
144
   /**
131
    * I2C PANELS
145
    * I2C PANELS
132
    */
146
    */
133
 
147
 
134
   #if ENABLED(LCD_I2C_SAINSMART_YWROBOT)
148
   #if ENABLED(LCD_I2C_SAINSMART_YWROBOT)
149
+
135
     // Note: This controller requires F.Malpartida's LiquidCrystal_I2C library
150
     // Note: This controller requires F.Malpartida's LiquidCrystal_I2C library
136
     // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home
151
     // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home
152
+
137
     #define LCD_I2C_TYPE_PCF8575
153
     #define LCD_I2C_TYPE_PCF8575
138
     #define LCD_I2C_ADDRESS 0x27   // I2C Address of the port expander
154
     #define LCD_I2C_ADDRESS 0x27   // I2C Address of the port expander
139
     #define ULTIPANEL
155
     #define ULTIPANEL
140
     #define NEWPANEL
156
     #define NEWPANEL
141
-  #endif
142
 
157
 
143
-  // PANELOLU2 LCD with status LEDs, separate encoder and click inputs
144
-  #if ENABLED(LCD_I2C_PANELOLU2)
158
+  #elif ENABLED(LCD_I2C_PANELOLU2)
159
+
160
+    // PANELOLU2 LCD with status LEDs, separate encoder and click inputs
161
+
145
     #define LCD_I2C_TYPE_MCP23017
162
     #define LCD_I2C_TYPE_MCP23017
146
     #define LCD_I2C_ADDRESS 0x20 // I2C Address of the port expander
163
     #define LCD_I2C_ADDRESS 0x20 // I2C Address of the port expander
147
     #define LCD_USE_I2C_BUZZER //comment out to disable buzzer on LCD
164
     #define LCD_USE_I2C_BUZZER //comment out to disable buzzer on LCD
148
     #define ULTIPANEL
165
     #define ULTIPANEL
149
     #define NEWPANEL
166
     #define NEWPANEL
150
-  #endif
151
 
167
 
152
-  // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
153
-  #if ENABLED(LCD_I2C_VIKI)
154
-    // This uses the LiquidTWI2 library v1.2.3 or later ( https://github.com/lincomatic/LiquidTWI2 )
155
-    // Make sure the LiquidTWI2 directory is placed in the Arduino or Sketchbook libraries subdirectory.
156
-    // Note: The pause/stop/resume LCD button pin should be connected to the Arduino
157
-    //       BTN_ENC pin (or set BTN_ENC to -1 if not used)
168
+  #elif ENABLED(LCD_I2C_VIKI)
169
+
170
+    /**
171
+     * Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
172
+     *
173
+     * This uses the LiquidTWI2 library v1.2.3 or later ( https://github.com/lincomatic/LiquidTWI2 )
174
+     * Make sure the LiquidTWI2 directory is placed in the Arduino or Sketchbook libraries subdirectory.
175
+     * Note: The pause/stop/resume LCD button pin should be connected to the Arduino
176
+     *       BTN_ENC pin (or set BTN_ENC to -1 if not used)
177
+     */
158
     #define LCD_I2C_TYPE_MCP23017
178
     #define LCD_I2C_TYPE_MCP23017
159
     #define LCD_I2C_ADDRESS 0x20 // I2C Address of the port expander
179
     #define LCD_I2C_ADDRESS 0x20 // I2C Address of the port expander
160
     #define LCD_USE_I2C_BUZZER //comment out to disable buzzer on LCD (requires LiquidTWI2 v1.2.3 or later)
180
     #define LCD_USE_I2C_BUZZER //comment out to disable buzzer on LCD (requires LiquidTWI2 v1.2.3 or later)

+ 4
- 1
Marlin/SanityCheck.h View File

1102
   #if ENABLED(MINIPANEL)
1102
   #if ENABLED(MINIPANEL)
1103
     + 1
1103
     + 1
1104
   #endif
1104
   #endif
1105
-  #if ENABLED(REPRAPWORLD_KEYPAD) && DISABLED(CARTESIO_UI)
1105
+  #if ENABLED(REPRAPWORLD_KEYPAD) && DISABLED(CARTESIO_UI) && DISABLED(ANET_KEYPAD_LCD)
1106
     + 1
1106
     + 1
1107
   #endif
1107
   #endif
1108
   #if ENABLED(RIGIDBOT_PANEL)
1108
   #if ENABLED(RIGIDBOT_PANEL)
1138
   #if ENABLED(OLED_PANEL_TINYBOY2)
1138
   #if ENABLED(OLED_PANEL_TINYBOY2)
1139
     + 1
1139
     + 1
1140
   #endif
1140
   #endif
1141
+  #if ENABLED(ANET_KEYPAD_LCD)
1142
+    + 1
1143
+  #endif
1141
   , "Please select no more than one LCD controller option."
1144
   , "Please select no more than one LCD controller option."
1142
 );
1145
 );
1143
 
1146
 

+ 1
- 0
Marlin/boards.h View File

59
 #define BOARD_MELZI_MAKR3D      66   // Melzi with ATmega1284 (MaKr3d version)
59
 #define BOARD_MELZI_MAKR3D      66   // Melzi with ATmega1284 (MaKr3d version)
60
 #define BOARD_AZTEEG_X3         67   // Azteeg X3
60
 #define BOARD_AZTEEG_X3         67   // Azteeg X3
61
 #define BOARD_AZTEEG_X3_PRO     68   // Azteeg X3 Pro
61
 #define BOARD_AZTEEG_X3_PRO     68   // Azteeg X3 Pro
62
+#define BOARD_ANET_10           69   // Anet 1.0 (Melzi clone)
62
 #define BOARD_ULTIMAKER         7    // Ultimaker
63
 #define BOARD_ULTIMAKER         7    // Ultimaker
63
 #define BOARD_ULTIMAKER_OLD     71   // Ultimaker (Older electronics. Pre 1.5.4. This is rare)
64
 #define BOARD_ULTIMAKER_OLD     71   // Ultimaker (Older electronics. Pre 1.5.4. This is rare)
64
 #define BOARD_ULTIMAIN_2        72   // Ultimainboard 2.x (Uses TEMP_SENSOR 20)
65
 #define BOARD_ULTIMAIN_2        72   // Ultimainboard 2.x (Uses TEMP_SENSOR 20)

+ 1607
- 0
Marlin/example_configurations/Anet/Configuration.h
File diff suppressed because it is too large
View File


+ 1349
- 0
Marlin/example_configurations/Anet/Configuration_adv.h
File diff suppressed because it is too large
View File


+ 22
- 12
Marlin/example_configurations/CL-260/Configuration.h View File

571
  * Probe Type
571
  * Probe Type
572
  *
572
  *
573
  * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc.
573
  * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc.
574
- * You must activate one of these to use Auto Bed Leveling below.
574
+ * Activate one of these to use Auto Bed Leveling below.
575
  */
575
  */
576
 
576
 
577
 /**
577
 /**
1283
 //#define ULTIPANEL
1283
 //#define ULTIPANEL
1284
 
1284
 
1285
 //
1285
 //
1286
-// Cartesio UI
1287
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1288
-//
1289
-//#define CARTESIO_UI
1290
-
1291
-//
1292
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1286
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1293
 // http://reprap.org/wiki/PanelOne
1287
 // http://reprap.org/wiki/PanelOne
1294
 //
1288
 //
1371
 //#define BQ_LCD_SMART_CONTROLLER
1365
 //#define BQ_LCD_SMART_CONTROLLER
1372
 
1366
 
1373
 //
1367
 //
1368
+// Cartesio UI
1369
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1370
+//
1371
+//#define CARTESIO_UI
1372
+
1373
+//
1374
+// ANET_10 Controller supported displays.
1375
+//
1376
+//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1377
+                                  // This LCD is known to be susceptible to electrical interference
1378
+                                  // which scrambles the display.  Pressing any button clears it up.
1379
+//#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1380
+                                  // A clone of the RepRapDiscount full graphics display but with
1381
+                                  // different pins/wiring (see pins_ANET_10.h).
1382
+
1383
+//
1374
 // CONTROLLER TYPE: I2C
1384
 // CONTROLLER TYPE: I2C
1375
 //
1385
 //
1376
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1386
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1420
 //#define U8GLIB_SSD1306
1430
 //#define U8GLIB_SSD1306
1421
 
1431
 
1422
 //
1432
 //
1433
+// TinyBoy2 128x64 OLED / Encoder Panel
1434
+//
1435
+//#define OLED_PANEL_TINYBOY2
1436
+
1437
+//
1423
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1438
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1424
 //
1439
 //
1425
 //#define SAV_3DGLCD
1440
 //#define SAV_3DGLCD
1436
 //
1451
 //
1437
 //#define SAV_3DLCD
1452
 //#define SAV_3DLCD
1438
 
1453
 
1439
-//
1440
-// TinyBoy2 128x64 OLED / Encoder Panel
1441
-//
1442
-//#define OLED_PANEL_TINYBOY2
1443
-
1444
 //=============================================================================
1454
 //=============================================================================
1445
 //=============================== Extra Features ==============================
1455
 //=============================== Extra Features ==============================
1446
 //=============================================================================
1456
 //=============================================================================

+ 21
- 11
Marlin/example_configurations/Cartesio/Configuration.h View File

1280
 //#define ULTIPANEL
1280
 //#define ULTIPANEL
1281
 
1281
 
1282
 //
1282
 //
1283
-// Cartesio UI
1284
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1285
-//
1286
-#define CARTESIO_UI
1287
-
1288
-//
1289
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1283
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1290
 // http://reprap.org/wiki/PanelOne
1284
 // http://reprap.org/wiki/PanelOne
1291
 //
1285
 //
1368
 //#define BQ_LCD_SMART_CONTROLLER
1362
 //#define BQ_LCD_SMART_CONTROLLER
1369
 
1363
 
1370
 //
1364
 //
1365
+// Cartesio UI
1366
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1367
+//
1368
+#define CARTESIO_UI
1369
+
1370
+//
1371
+// ANET_10 Controller supported displays.
1372
+//
1373
+//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1374
+                                  // This LCD is known to be susceptible to electrical interference
1375
+                                  // which scrambles the display.  Pressing any button clears it up.
1376
+//#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1377
+                                  // A clone of the RepRapDiscount full graphics display but with
1378
+                                  // different pins/wiring (see pins_ANET_10.h).
1379
+
1380
+//
1371
 // CONTROLLER TYPE: I2C
1381
 // CONTROLLER TYPE: I2C
1372
 //
1382
 //
1373
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1383
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1417
 //#define U8GLIB_SSD1306
1427
 //#define U8GLIB_SSD1306
1418
 
1428
 
1419
 //
1429
 //
1430
+// TinyBoy2 128x64 OLED / Encoder Panel
1431
+//
1432
+//#define OLED_PANEL_TINYBOY2
1433
+
1434
+//
1420
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1435
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1421
 //
1436
 //
1422
 //#define SAV_3DGLCD
1437
 //#define SAV_3DGLCD
1433
 //
1448
 //
1434
 //#define SAV_3DLCD
1449
 //#define SAV_3DLCD
1435
 
1450
 
1436
-//
1437
-// TinyBoy2 128x64 OLED / Encoder Panel
1438
-//
1439
-//#define OLED_PANEL_TINYBOY2
1440
-
1441
 //=============================================================================
1451
 //=============================================================================
1442
 //=============================== Extra Features ==============================
1452
 //=============================== Extra Features ==============================
1443
 //=============================================================================
1453
 //=============================================================================

+ 2
- 2
Marlin/example_configurations/Cartesio/Configuration_adv.h View File

123
   #define AUTOTEMP_OLDWEIGHT 0.98
123
   #define AUTOTEMP_OLDWEIGHT 0.98
124
 #endif
124
 #endif
125
 
125
 
126
-//Show Temperature ADC value
127
-//The M105 command return, besides traditional information, the ADC value read from temperature sensors.
126
+// Show Temperature ADC value
127
+// Enable for M105 to include ADC values read from temperature sensors.
128
 //#define SHOW_TEMP_ADC_VALUES
128
 //#define SHOW_TEMP_ADC_VALUES
129
 
129
 
130
 /**
130
 /**

+ 21
- 11
Marlin/example_configurations/Felix/Configuration.h View File

1264
 //#define ULTIPANEL
1264
 //#define ULTIPANEL
1265
 
1265
 
1266
 //
1266
 //
1267
-// Cartesio UI
1268
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1269
-//
1270
-//#define CARTESIO_UI
1271
-
1272
-//
1273
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1267
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1274
 // http://reprap.org/wiki/PanelOne
1268
 // http://reprap.org/wiki/PanelOne
1275
 //
1269
 //
1352
 //#define BQ_LCD_SMART_CONTROLLER
1346
 //#define BQ_LCD_SMART_CONTROLLER
1353
 
1347
 
1354
 //
1348
 //
1349
+// Cartesio UI
1350
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1351
+//
1352
+//#define CARTESIO_UI
1353
+
1354
+//
1355
+// ANET_10 Controller supported displays.
1356
+//
1357
+//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1358
+                                  // This LCD is known to be susceptible to electrical interference
1359
+                                  // which scrambles the display.  Pressing any button clears it up.
1360
+//#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1361
+                                  // A clone of the RepRapDiscount full graphics display but with
1362
+                                  // different pins/wiring (see pins_ANET_10.h).
1363
+
1364
+//
1355
 // CONTROLLER TYPE: I2C
1365
 // CONTROLLER TYPE: I2C
1356
 //
1366
 //
1357
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1367
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1401
 //#define U8GLIB_SSD1306
1411
 //#define U8GLIB_SSD1306
1402
 
1412
 
1403
 //
1413
 //
1414
+// TinyBoy2 128x64 OLED / Encoder Panel
1415
+//
1416
+//#define OLED_PANEL_TINYBOY2
1417
+
1418
+//
1404
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1419
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1405
 //
1420
 //
1406
 //#define SAV_3DGLCD
1421
 //#define SAV_3DGLCD
1417
 //
1432
 //
1418
 //#define SAV_3DLCD
1433
 //#define SAV_3DLCD
1419
 
1434
 
1420
-//
1421
-// TinyBoy2 128x64 OLED / Encoder Panel
1422
-//
1423
-//#define OLED_PANEL_TINYBOY2
1424
-
1425
 //=============================================================================
1435
 //=============================================================================
1426
 //=============================== Extra Features ==============================
1436
 //=============================== Extra Features ==============================
1427
 //=============================================================================
1437
 //=============================================================================

+ 2
- 2
Marlin/example_configurations/Felix/Configuration_adv.h View File

123
   #define AUTOTEMP_OLDWEIGHT 0.98
123
   #define AUTOTEMP_OLDWEIGHT 0.98
124
 #endif
124
 #endif
125
 
125
 
126
-//Show Temperature ADC value
127
-//The M105 command return, besides traditional information, the ADC value read from temperature sensors.
126
+// Show Temperature ADC value
127
+// Enable for M105 to include ADC values read from temperature sensors.
128
 //#define SHOW_TEMP_ADC_VALUES
128
 //#define SHOW_TEMP_ADC_VALUES
129
 
129
 
130
 /**
130
 /**

+ 21
- 11
Marlin/example_configurations/Felix/DUAL/Configuration.h View File

1264
 //#define ULTIPANEL
1264
 //#define ULTIPANEL
1265
 
1265
 
1266
 //
1266
 //
1267
-// Cartesio UI
1268
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1269
-//
1270
-//#define CARTESIO_UI
1271
-
1272
-//
1273
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1267
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1274
 // http://reprap.org/wiki/PanelOne
1268
 // http://reprap.org/wiki/PanelOne
1275
 //
1269
 //
1352
 //#define BQ_LCD_SMART_CONTROLLER
1346
 //#define BQ_LCD_SMART_CONTROLLER
1353
 
1347
 
1354
 //
1348
 //
1349
+// Cartesio UI
1350
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1351
+//
1352
+//#define CARTESIO_UI
1353
+
1354
+//
1355
+// ANET_10 Controller supported displays.
1356
+//
1357
+//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1358
+                                  // This LCD is known to be susceptible to electrical interference
1359
+                                  // which scrambles the display.  Pressing any button clears it up.
1360
+//#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1361
+                                  // A clone of the RepRapDiscount full graphics display but with
1362
+                                  // different pins/wiring (see pins_ANET_10.h).
1363
+
1364
+//
1355
 // CONTROLLER TYPE: I2C
1365
 // CONTROLLER TYPE: I2C
1356
 //
1366
 //
1357
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1367
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1401
 //#define U8GLIB_SSD1306
1411
 //#define U8GLIB_SSD1306
1402
 
1412
 
1403
 //
1413
 //
1414
+// TinyBoy2 128x64 OLED / Encoder Panel
1415
+//
1416
+//#define OLED_PANEL_TINYBOY2
1417
+
1418
+//
1404
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1419
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1405
 //
1420
 //
1406
 //#define SAV_3DGLCD
1421
 //#define SAV_3DGLCD
1417
 //
1432
 //
1418
 //#define SAV_3DLCD
1433
 //#define SAV_3DLCD
1419
 
1434
 
1420
-//
1421
-// TinyBoy2 128x64 OLED / Encoder Panel
1422
-//
1423
-//#define OLED_PANEL_TINYBOY2
1424
-
1425
 //=============================================================================
1435
 //=============================================================================
1426
 //=============================== Extra Features ==============================
1436
 //=============================== Extra Features ==============================
1427
 //=============================================================================
1437
 //=============================================================================

+ 21
- 11
Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h View File

1286
 //#define ULTIPANEL
1286
 //#define ULTIPANEL
1287
 
1287
 
1288
 //
1288
 //
1289
-// Cartesio UI
1290
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1291
-//
1292
-//#define CARTESIO_UI
1293
-
1294
-//
1295
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1289
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1296
 // http://reprap.org/wiki/PanelOne
1290
 // http://reprap.org/wiki/PanelOne
1297
 //
1291
 //
1374
 //#define BQ_LCD_SMART_CONTROLLER
1368
 //#define BQ_LCD_SMART_CONTROLLER
1375
 
1369
 
1376
 //
1370
 //
1371
+// Cartesio UI
1372
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1373
+//
1374
+//#define CARTESIO_UI
1375
+
1376
+//
1377
+// ANET_10 Controller supported displays.
1378
+//
1379
+//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1380
+                                  // This LCD is known to be susceptible to electrical interference
1381
+                                  // which scrambles the display.  Pressing any button clears it up.
1382
+//#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1383
+                                  // A clone of the RepRapDiscount full graphics display but with
1384
+                                  // different pins/wiring (see pins_ANET_10.h).
1385
+
1386
+//
1377
 // CONTROLLER TYPE: I2C
1387
 // CONTROLLER TYPE: I2C
1378
 //
1388
 //
1379
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1389
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1423
 //#define U8GLIB_SSD1306
1433
 //#define U8GLIB_SSD1306
1424
 
1434
 
1425
 //
1435
 //
1436
+// TinyBoy2 128x64 OLED / Encoder Panel
1437
+//
1438
+//#define OLED_PANEL_TINYBOY2
1439
+
1440
+//
1426
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1441
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1427
 //
1442
 //
1428
 //#define SAV_3DGLCD
1443
 //#define SAV_3DGLCD
1439
 //
1454
 //
1440
 //#define SAV_3DLCD
1455
 //#define SAV_3DLCD
1441
 
1456
 
1442
-//
1443
-// TinyBoy2 128x64 OLED / Encoder Panel
1444
-//
1445
-//#define OLED_PANEL_TINYBOY2
1446
-
1447
 //=============================================================================
1457
 //=============================================================================
1448
 //=============================== Extra Features ==============================
1458
 //=============================== Extra Features ==============================
1449
 //=============================================================================
1459
 //=============================================================================

+ 2
- 2
Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h View File

123
   #define AUTOTEMP_OLDWEIGHT 0.98
123
   #define AUTOTEMP_OLDWEIGHT 0.98
124
 #endif
124
 #endif
125
 
125
 
126
-//Show Temperature ADC value
127
-//The M105 command return, besides traditional information, the ADC value read from temperature sensors.
126
+// Show Temperature ADC value
127
+// Enable for M105 to include ADC values read from temperature sensors.
128
 //#define SHOW_TEMP_ADC_VALUES
128
 //#define SHOW_TEMP_ADC_VALUES
129
 
129
 
130
 /**
130
 /**

+ 21
- 11
Marlin/example_configurations/Hephestos/Configuration.h View File

1272
 //#define ULTIPANEL
1272
 //#define ULTIPANEL
1273
 
1273
 
1274
 //
1274
 //
1275
-// Cartesio UI
1276
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1277
-//
1278
-//#define CARTESIO_UI
1279
-
1280
-//
1281
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1275
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1282
 // http://reprap.org/wiki/PanelOne
1276
 // http://reprap.org/wiki/PanelOne
1283
 //
1277
 //
1360
 //#define BQ_LCD_SMART_CONTROLLER
1354
 //#define BQ_LCD_SMART_CONTROLLER
1361
 
1355
 
1362
 //
1356
 //
1357
+// Cartesio UI
1358
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1359
+//
1360
+//#define CARTESIO_UI
1361
+
1362
+//
1363
+// ANET_10 Controller supported displays.
1364
+//
1365
+//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1366
+                                  // This LCD is known to be susceptible to electrical interference
1367
+                                  // which scrambles the display.  Pressing any button clears it up.
1368
+//#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1369
+                                  // A clone of the RepRapDiscount full graphics display but with
1370
+                                  // different pins/wiring (see pins_ANET_10.h).
1371
+
1372
+//
1363
 // CONTROLLER TYPE: I2C
1373
 // CONTROLLER TYPE: I2C
1364
 //
1374
 //
1365
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1375
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1409
 //#define U8GLIB_SSD1306
1419
 //#define U8GLIB_SSD1306
1410
 
1420
 
1411
 //
1421
 //
1422
+// TinyBoy2 128x64 OLED / Encoder Panel
1423
+//
1424
+//#define OLED_PANEL_TINYBOY2
1425
+
1426
+//
1412
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1427
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1413
 //
1428
 //
1414
 //#define SAV_3DGLCD
1429
 //#define SAV_3DGLCD
1425
 //
1440
 //
1426
 //#define SAV_3DLCD
1441
 //#define SAV_3DLCD
1427
 
1442
 
1428
-//
1429
-// TinyBoy2 128x64 OLED / Encoder Panel
1430
-//
1431
-//#define OLED_PANEL_TINYBOY2
1432
-
1433
 //=============================================================================
1443
 //=============================================================================
1434
 //=============================== Extra Features ==============================
1444
 //=============================== Extra Features ==============================
1435
 //=============================================================================
1445
 //=============================================================================

+ 2
- 2
Marlin/example_configurations/Hephestos/Configuration_adv.h View File

123
   #define AUTOTEMP_OLDWEIGHT 0.98
123
   #define AUTOTEMP_OLDWEIGHT 0.98
124
 #endif
124
 #endif
125
 
125
 
126
-//Show Temperature ADC value
127
-//The M105 command return, besides traditional information, the ADC value read from temperature sensors.
126
+// Show Temperature ADC value
127
+// Enable for M105 to include ADC values read from temperature sensors.
128
 //#define SHOW_TEMP_ADC_VALUES
128
 //#define SHOW_TEMP_ADC_VALUES
129
 
129
 
130
 /**
130
 /**

+ 21
- 11
Marlin/example_configurations/Hephestos_2/Configuration.h View File

1275
 //#define ULTIPANEL
1275
 //#define ULTIPANEL
1276
 
1276
 
1277
 //
1277
 //
1278
-// Cartesio UI
1279
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1280
-//
1281
-//#define CARTESIO_UI
1282
-
1283
-//
1284
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1278
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1285
 // http://reprap.org/wiki/PanelOne
1279
 // http://reprap.org/wiki/PanelOne
1286
 //
1280
 //
1363
 #define BQ_LCD_SMART_CONTROLLER
1357
 #define BQ_LCD_SMART_CONTROLLER
1364
 
1358
 
1365
 //
1359
 //
1360
+// Cartesio UI
1361
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1362
+//
1363
+//#define CARTESIO_UI
1364
+
1365
+//
1366
+// ANET_10 Controller supported displays.
1367
+//
1368
+//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1369
+                                  // This LCD is known to be susceptible to electrical interference
1370
+                                  // which scrambles the display.  Pressing any button clears it up.
1371
+//#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1372
+                                  // A clone of the RepRapDiscount full graphics display but with
1373
+                                  // different pins/wiring (see pins_ANET_10.h).
1374
+
1375
+//
1366
 // CONTROLLER TYPE: I2C
1376
 // CONTROLLER TYPE: I2C
1367
 //
1377
 //
1368
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1378
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1412
 //#define U8GLIB_SSD1306
1422
 //#define U8GLIB_SSD1306
1413
 
1423
 
1414
 //
1424
 //
1425
+// TinyBoy2 128x64 OLED / Encoder Panel
1426
+//
1427
+//#define OLED_PANEL_TINYBOY2
1428
+
1429
+//
1415
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1430
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1416
 //
1431
 //
1417
 //#define SAV_3DGLCD
1432
 //#define SAV_3DGLCD
1428
 //
1443
 //
1429
 //#define SAV_3DLCD
1444
 //#define SAV_3DLCD
1430
 
1445
 
1431
-//
1432
-// TinyBoy2 128x64 OLED / Encoder Panel
1433
-//
1434
-//#define OLED_PANEL_TINYBOY2
1435
-
1436
 //=============================================================================
1446
 //=============================================================================
1437
 //=============================== Extra Features ==============================
1447
 //=============================== Extra Features ==============================
1438
 //=============================================================================
1448
 //=============================================================================

+ 2
- 2
Marlin/example_configurations/Hephestos_2/Configuration_adv.h View File

123
   #define AUTOTEMP_OLDWEIGHT 0.98
123
   #define AUTOTEMP_OLDWEIGHT 0.98
124
 #endif
124
 #endif
125
 
125
 
126
-//Show Temperature ADC value
127
-//The M105 command return, besides traditional information, the ADC value read from temperature sensors.
126
+// Show Temperature ADC value
127
+// Enable for M105 to include ADC values read from temperature sensors.
128
 //#define SHOW_TEMP_ADC_VALUES
128
 //#define SHOW_TEMP_ADC_VALUES
129
 
129
 
130
 /**
130
 /**

+ 21
- 6
Marlin/example_configurations/K8200/Configuration.h View File

1314
 //#define ULTIPANEL
1314
 //#define ULTIPANEL
1315
 
1315
 
1316
 //
1316
 //
1317
-// Cartesio UI
1318
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1319
-//
1320
-//#define CARTESIO_UI
1321
-
1322
-//
1323
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1317
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1324
 // http://reprap.org/wiki/PanelOne
1318
 // http://reprap.org/wiki/PanelOne
1325
 //
1319
 //
1402
 //#define BQ_LCD_SMART_CONTROLLER
1396
 //#define BQ_LCD_SMART_CONTROLLER
1403
 
1397
 
1404
 //
1398
 //
1399
+// Cartesio UI
1400
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1401
+//
1402
+//#define CARTESIO_UI
1403
+
1404
+//
1405
+// ANET_10 Controller supported displays.
1406
+//
1407
+//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1408
+                                  // This LCD is known to be susceptible to electrical interference
1409
+                                  // which scrambles the display.  Pressing any button clears it up.
1410
+//#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1411
+                                  // A clone of the RepRapDiscount full graphics display but with
1412
+                                  // different pins/wiring (see pins_ANET_10.h).
1413
+
1414
+//
1405
 // CONTROLLER TYPE: I2C
1415
 // CONTROLLER TYPE: I2C
1406
 //
1416
 //
1407
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1417
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1451
 //#define U8GLIB_SSD1306
1461
 //#define U8GLIB_SSD1306
1452
 
1462
 
1453
 //
1463
 //
1464
+// TinyBoy2 128x64 OLED / Encoder Panel
1465
+//
1466
+//#define OLED_PANEL_TINYBOY2
1467
+
1468
+//
1454
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1469
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1455
 //
1470
 //
1456
 //#define SAV_3DGLCD
1471
 //#define SAV_3DGLCD

+ 2
- 2
Marlin/example_configurations/K8200/Configuration_adv.h View File

136
   #define AUTOTEMP_OLDWEIGHT 0.98
136
   #define AUTOTEMP_OLDWEIGHT 0.98
137
 #endif
137
 #endif
138
 
138
 
139
-//Show Temperature ADC value
140
-//The M105 command return, besides traditional information, the ADC value read from temperature sensors.
139
+// Show Temperature ADC value
140
+// Enable for M105 to include ADC values read from temperature sensors.
141
 //#define SHOW_TEMP_ADC_VALUES
141
 //#define SHOW_TEMP_ADC_VALUES
142
 
142
 
143
 /**
143
 /**

+ 21
- 11
Marlin/example_configurations/K8400/Configuration.h View File

1282
 //#define ULTIPANEL
1282
 //#define ULTIPANEL
1283
 
1283
 
1284
 //
1284
 //
1285
-// Cartesio UI
1286
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1287
-//
1288
-//#define CARTESIO_UI
1289
-
1290
-//
1291
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1285
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1292
 // http://reprap.org/wiki/PanelOne
1286
 // http://reprap.org/wiki/PanelOne
1293
 //
1287
 //
1370
 //#define BQ_LCD_SMART_CONTROLLER
1364
 //#define BQ_LCD_SMART_CONTROLLER
1371
 
1365
 
1372
 //
1366
 //
1367
+// Cartesio UI
1368
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1369
+//
1370
+//#define CARTESIO_UI
1371
+
1372
+//
1373
+// ANET_10 Controller supported displays.
1374
+//
1375
+//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1376
+                                  // This LCD is known to be susceptible to electrical interference
1377
+                                  // which scrambles the display.  Pressing any button clears it up.
1378
+//#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1379
+                                  // A clone of the RepRapDiscount full graphics display but with
1380
+                                  // different pins/wiring (see pins_ANET_10.h).
1381
+
1382
+//
1373
 // CONTROLLER TYPE: I2C
1383
 // CONTROLLER TYPE: I2C
1374
 //
1384
 //
1375
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1385
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1419
 //#define U8GLIB_SSD1306
1429
 //#define U8GLIB_SSD1306
1420
 
1430
 
1421
 //
1431
 //
1432
+// TinyBoy2 128x64 OLED / Encoder Panel
1433
+//
1434
+//#define OLED_PANEL_TINYBOY2
1435
+
1436
+//
1422
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1437
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1423
 //
1438
 //
1424
 //#define SAV_3DGLCD
1439
 //#define SAV_3DGLCD
1435
 //
1450
 //
1436
 //#define SAV_3DLCD
1451
 //#define SAV_3DLCD
1437
 
1452
 
1438
-//
1439
-// TinyBoy2 128x64 OLED / Encoder Panel
1440
-//
1441
-//#define OLED_PANEL_TINYBOY2
1442
-
1443
 //=============================================================================
1453
 //=============================================================================
1444
 //=============================== Extra Features ==============================
1454
 //=============================== Extra Features ==============================
1445
 //=============================================================================
1455
 //=============================================================================

+ 2
- 2
Marlin/example_configurations/K8400/Configuration_adv.h View File

123
   #define AUTOTEMP_OLDWEIGHT 0.98
123
   #define AUTOTEMP_OLDWEIGHT 0.98
124
 #endif
124
 #endif
125
 
125
 
126
-//Show Temperature ADC value
127
-//The M105 command return, besides traditional information, the ADC value read from temperature sensors.
126
+// Show Temperature ADC value
127
+// Enable for M105 to include ADC values read from temperature sensors.
128
 //#define SHOW_TEMP_ADC_VALUES
128
 //#define SHOW_TEMP_ADC_VALUES
129
 
129
 
130
 /**
130
 /**

+ 21
- 11
Marlin/example_configurations/K8400/Dual-head/Configuration.h View File

1282
 //#define ULTIPANEL
1282
 //#define ULTIPANEL
1283
 
1283
 
1284
 //
1284
 //
1285
-// Cartesio UI
1286
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1287
-//
1288
-//#define CARTESIO_UI
1289
-
1290
-//
1291
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1285
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1292
 // http://reprap.org/wiki/PanelOne
1286
 // http://reprap.org/wiki/PanelOne
1293
 //
1287
 //
1370
 //#define BQ_LCD_SMART_CONTROLLER
1364
 //#define BQ_LCD_SMART_CONTROLLER
1371
 
1365
 
1372
 //
1366
 //
1367
+// Cartesio UI
1368
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1369
+//
1370
+//#define CARTESIO_UI
1371
+
1372
+//
1373
+// ANET_10 Controller supported displays.
1374
+//
1375
+//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1376
+                                  // This LCD is known to be susceptible to electrical interference
1377
+                                  // which scrambles the display.  Pressing any button clears it up.
1378
+//#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1379
+                                  // A clone of the RepRapDiscount full graphics display but with
1380
+                                  // different pins/wiring (see pins_ANET_10.h).
1381
+
1382
+//
1373
 // CONTROLLER TYPE: I2C
1383
 // CONTROLLER TYPE: I2C
1374
 //
1384
 //
1375
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1385
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1419
 //#define U8GLIB_SSD1306
1429
 //#define U8GLIB_SSD1306
1420
 
1430
 
1421
 //
1431
 //
1432
+// TinyBoy2 128x64 OLED / Encoder Panel
1433
+//
1434
+//#define OLED_PANEL_TINYBOY2
1435
+
1436
+//
1422
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1437
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1423
 //
1438
 //
1424
 //#define SAV_3DGLCD
1439
 //#define SAV_3DGLCD
1435
 //
1450
 //
1436
 //#define SAV_3DLCD
1451
 //#define SAV_3DLCD
1437
 
1452
 
1438
-//
1439
-// TinyBoy2 128x64 OLED / Encoder Panel
1440
-//
1441
-//#define OLED_PANEL_TINYBOY2
1442
-
1443
 //=============================================================================
1453
 //=============================================================================
1444
 //=============================== Extra Features ==============================
1454
 //=============================== Extra Features ==============================
1445
 //=============================================================================
1455
 //=============================================================================

+ 22
- 12
Marlin/example_configurations/M150/Configuration.h View File

589
  * Probe Type
589
  * Probe Type
590
  *
590
  *
591
  * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc.
591
  * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc.
592
- * You must activate one of these to use Auto Bed Leveling below.
592
+ * Activate one of these to use Auto Bed Leveling below.
593
  */
593
  */
594
 
594
 
595
 /**
595
 /**
1309
 //#define ULTIPANEL
1309
 //#define ULTIPANEL
1310
 
1310
 
1311
 //
1311
 //
1312
-// Cartesio UI
1313
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1314
-//
1315
-//#define CARTESIO_UI
1316
-
1317
-//
1318
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1312
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1319
 // http://reprap.org/wiki/PanelOne
1313
 // http://reprap.org/wiki/PanelOne
1320
 //
1314
 //
1397
 //#define BQ_LCD_SMART_CONTROLLER
1391
 //#define BQ_LCD_SMART_CONTROLLER
1398
 
1392
 
1399
 //
1393
 //
1394
+// Cartesio UI
1395
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1396
+//
1397
+//#define CARTESIO_UI
1398
+
1399
+//
1400
+// ANET_10 Controller supported displays.
1401
+//
1402
+//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1403
+                                  // This LCD is known to be susceptible to electrical interference
1404
+                                  // which scrambles the display.  Pressing any button clears it up.
1405
+//#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1406
+                                  // A clone of the RepRapDiscount full graphics display but with
1407
+                                  // different pins/wiring (see pins_ANET_10.h).
1408
+
1409
+//
1400
 // CONTROLLER TYPE: I2C
1410
 // CONTROLLER TYPE: I2C
1401
 //
1411
 //
1402
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1412
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1446
 //#define U8GLIB_SSD1306
1456
 //#define U8GLIB_SSD1306
1447
 
1457
 
1448
 //
1458
 //
1459
+// TinyBoy2 128x64 OLED / Encoder Panel
1460
+//
1461
+//#define OLED_PANEL_TINYBOY2
1462
+
1463
+//
1449
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1464
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1450
 //
1465
 //
1451
 //#define SAV_3DGLCD
1466
 //#define SAV_3DGLCD
1462
 //
1477
 //
1463
 //#define SAV_3DLCD
1478
 //#define SAV_3DLCD
1464
 
1479
 
1465
-//
1466
-// TinyBoy2 128x64 OLED / Encoder Panel
1467
-//
1468
-//#define OLED_PANEL_TINYBOY2
1469
-
1470
 //=============================================================================
1480
 //=============================================================================
1471
 //=============================== Extra Features ==============================
1481
 //=============================== Extra Features ==============================
1472
 //=============================================================================
1482
 //=============================================================================

+ 2
- 2
Marlin/example_configurations/M150/Configuration_adv.h View File

123
   #define AUTOTEMP_OLDWEIGHT 0.98
123
   #define AUTOTEMP_OLDWEIGHT 0.98
124
 #endif
124
 #endif
125
 
125
 
126
-//Show Temperature ADC value
127
-//The M105 command return, besides traditional information, the ADC value read from temperature sensors.
126
+// Show Temperature ADC value
127
+// Enable for M105 to include ADC values read from temperature sensors.
128
 //#define SHOW_TEMP_ADC_VALUES
128
 //#define SHOW_TEMP_ADC_VALUES
129
 
129
 
130
 /**
130
 /**

+ 21
- 11
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h View File

1282
 //#define ULTIPANEL
1282
 //#define ULTIPANEL
1283
 
1283
 
1284
 //
1284
 //
1285
-// Cartesio UI
1286
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1287
-//
1288
-//#define CARTESIO_UI
1289
-
1290
-//
1291
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1285
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1292
 // http://reprap.org/wiki/PanelOne
1286
 // http://reprap.org/wiki/PanelOne
1293
 //
1287
 //
1370
 //#define BQ_LCD_SMART_CONTROLLER
1364
 //#define BQ_LCD_SMART_CONTROLLER
1371
 
1365
 
1372
 //
1366
 //
1367
+// Cartesio UI
1368
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1369
+//
1370
+//#define CARTESIO_UI
1371
+
1372
+//
1373
+// ANET_10 Controller supported displays.
1374
+//
1375
+//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1376
+                                  // This LCD is known to be susceptible to electrical interference
1377
+                                  // which scrambles the display.  Pressing any button clears it up.
1378
+//#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1379
+                                  // A clone of the RepRapDiscount full graphics display but with
1380
+                                  // different pins/wiring (see pins_ANET_10.h).
1381
+
1382
+//
1373
 // CONTROLLER TYPE: I2C
1383
 // CONTROLLER TYPE: I2C
1374
 //
1384
 //
1375
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1385
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1419
 //#define U8GLIB_SSD1306
1429
 //#define U8GLIB_SSD1306
1420
 
1430
 
1421
 //
1431
 //
1432
+// TinyBoy2 128x64 OLED / Encoder Panel
1433
+//
1434
+//#define OLED_PANEL_TINYBOY2
1435
+
1436
+//
1422
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1437
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1423
 //
1438
 //
1424
 //#define SAV_3DGLCD
1439
 //#define SAV_3DGLCD
1435
 //
1450
 //
1436
 //#define SAV_3DLCD
1451
 //#define SAV_3DLCD
1437
 
1452
 
1438
-//
1439
-// TinyBoy2 128x64 OLED / Encoder Panel
1440
-//
1441
-//#define OLED_PANEL_TINYBOY2
1442
-
1443
 //=============================================================================
1453
 //=============================================================================
1444
 //=============================== Extra Features ==============================
1454
 //=============================== Extra Features ==============================
1445
 //=============================================================================
1455
 //=============================================================================

+ 21
- 11
Marlin/example_configurations/RigidBot/Configuration.h View File

1280
 //#define ULTIPANEL
1280
 //#define ULTIPANEL
1281
 
1281
 
1282
 //
1282
 //
1283
-// Cartesio UI
1284
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1285
-//
1286
-//#define CARTESIO_UI
1287
-
1288
-//
1289
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1283
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1290
 // http://reprap.org/wiki/PanelOne
1284
 // http://reprap.org/wiki/PanelOne
1291
 //
1285
 //
1370
 //#define BQ_LCD_SMART_CONTROLLER
1364
 //#define BQ_LCD_SMART_CONTROLLER
1371
 
1365
 
1372
 //
1366
 //
1367
+// Cartesio UI
1368
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1369
+//
1370
+//#define CARTESIO_UI
1371
+
1372
+//
1373
+// ANET_10 Controller supported displays.
1374
+//
1375
+//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1376
+                                  // This LCD is known to be susceptible to electrical interference
1377
+                                  // which scrambles the display.  Pressing any button clears it up.
1378
+//#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1379
+                                  // A clone of the RepRapDiscount full graphics display but with
1380
+                                  // different pins/wiring (see pins_ANET_10.h).
1381
+
1382
+//
1373
 // CONTROLLER TYPE: I2C
1383
 // CONTROLLER TYPE: I2C
1374
 //
1384
 //
1375
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1385
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1419
 //#define U8GLIB_SSD1306
1429
 //#define U8GLIB_SSD1306
1420
 
1430
 
1421
 //
1431
 //
1432
+// TinyBoy2 128x64 OLED / Encoder Panel
1433
+//
1434
+//#define OLED_PANEL_TINYBOY2
1435
+
1436
+//
1422
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1437
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1423
 //
1438
 //
1424
 //#define SAV_3DGLCD
1439
 //#define SAV_3DGLCD
1435
 //
1450
 //
1436
 //#define SAV_3DLCD
1451
 //#define SAV_3DLCD
1437
 
1452
 
1438
-//
1439
-// TinyBoy2 128x64 OLED / Encoder Panel
1440
-//
1441
-//#define OLED_PANEL_TINYBOY2
1442
-
1443
 //=============================================================================
1453
 //=============================================================================
1444
 //=============================== Extra Features ==============================
1454
 //=============================== Extra Features ==============================
1445
 //=============================================================================
1455
 //=============================================================================

+ 2
- 2
Marlin/example_configurations/RigidBot/Configuration_adv.h View File

123
   #define AUTOTEMP_OLDWEIGHT 0.98
123
   #define AUTOTEMP_OLDWEIGHT 0.98
124
 #endif
124
 #endif
125
 
125
 
126
-//Show Temperature ADC value
127
-//The M105 command return, besides traditional information, the ADC value read from temperature sensors.
126
+// Show Temperature ADC value
127
+// Enable for M105 to include ADC values read from temperature sensors.
128
 //#define SHOW_TEMP_ADC_VALUES
128
 //#define SHOW_TEMP_ADC_VALUES
129
 
129
 
130
 /**
130
 /**

+ 21
- 11
Marlin/example_configurations/SCARA/Configuration.h View File

1294
 //#define ULTIPANEL
1294
 //#define ULTIPANEL
1295
 
1295
 
1296
 //
1296
 //
1297
-// Cartesio UI
1298
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1299
-//
1300
-//#define CARTESIO_UI
1301
-
1302
-//
1303
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1297
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1304
 // http://reprap.org/wiki/PanelOne
1298
 // http://reprap.org/wiki/PanelOne
1305
 //
1299
 //
1382
 //#define BQ_LCD_SMART_CONTROLLER
1376
 //#define BQ_LCD_SMART_CONTROLLER
1383
 
1377
 
1384
 //
1378
 //
1379
+// Cartesio UI
1380
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1381
+//
1382
+//#define CARTESIO_UI
1383
+
1384
+//
1385
+// ANET_10 Controller supported displays.
1386
+//
1387
+//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1388
+                                  // This LCD is known to be susceptible to electrical interference
1389
+                                  // which scrambles the display.  Pressing any button clears it up.
1390
+//#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1391
+                                  // A clone of the RepRapDiscount full graphics display but with
1392
+                                  // different pins/wiring (see pins_ANET_10.h).
1393
+
1394
+//
1385
 // CONTROLLER TYPE: I2C
1395
 // CONTROLLER TYPE: I2C
1386
 //
1396
 //
1387
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1397
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1431
 //#define U8GLIB_SSD1306
1441
 //#define U8GLIB_SSD1306
1432
 
1442
 
1433
 //
1443
 //
1444
+// TinyBoy2 128x64 OLED / Encoder Panel
1445
+//
1446
+//#define OLED_PANEL_TINYBOY2
1447
+
1448
+//
1434
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1449
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1435
 //
1450
 //
1436
 //#define SAV_3DGLCD
1451
 //#define SAV_3DGLCD
1447
 //
1462
 //
1448
 //#define SAV_3DLCD
1463
 //#define SAV_3DLCD
1449
 
1464
 
1450
-//
1451
-// TinyBoy2 128x64 OLED / Encoder Panel
1452
-//
1453
-//#define OLED_PANEL_TINYBOY2
1454
-
1455
 //=============================================================================
1465
 //=============================================================================
1456
 //=============================== Extra Features ==============================
1466
 //=============================== Extra Features ==============================
1457
 //=============================================================================
1467
 //=============================================================================

+ 2
- 2
Marlin/example_configurations/SCARA/Configuration_adv.h View File

123
   #define AUTOTEMP_OLDWEIGHT 0.98
123
   #define AUTOTEMP_OLDWEIGHT 0.98
124
 #endif
124
 #endif
125
 
125
 
126
-//Show Temperature ADC value
127
-//The M105 command return, besides traditional information, the ADC value read from temperature sensors.
126
+// Show Temperature ADC value
127
+// Enable for M105 to include ADC values read from temperature sensors.
128
 //#define SHOW_TEMP_ADC_VALUES
128
 //#define SHOW_TEMP_ADC_VALUES
129
 
129
 
130
 /**
130
 /**

+ 21
- 11
Marlin/example_configurations/TAZ4/Configuration.h View File

1301
 //#define ULTIPANEL
1301
 //#define ULTIPANEL
1302
 
1302
 
1303
 //
1303
 //
1304
-// Cartesio UI
1305
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1306
-//
1307
-//#define CARTESIO_UI
1308
-
1309
-//
1310
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1304
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1311
 // http://reprap.org/wiki/PanelOne
1305
 // http://reprap.org/wiki/PanelOne
1312
 //
1306
 //
1389
 //#define BQ_LCD_SMART_CONTROLLER
1383
 //#define BQ_LCD_SMART_CONTROLLER
1390
 
1384
 
1391
 //
1385
 //
1386
+// Cartesio UI
1387
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1388
+//
1389
+//#define CARTESIO_UI
1390
+
1391
+//
1392
+// ANET_10 Controller supported displays.
1393
+//
1394
+//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1395
+                                  // This LCD is known to be susceptible to electrical interference
1396
+                                  // which scrambles the display.  Pressing any button clears it up.
1397
+//#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1398
+                                  // A clone of the RepRapDiscount full graphics display but with
1399
+                                  // different pins/wiring (see pins_ANET_10.h).
1400
+
1401
+//
1392
 // CONTROLLER TYPE: I2C
1402
 // CONTROLLER TYPE: I2C
1393
 //
1403
 //
1394
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1404
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1438
 //#define U8GLIB_SSD1306
1448
 //#define U8GLIB_SSD1306
1439
 
1449
 
1440
 //
1450
 //
1451
+// TinyBoy2 128x64 OLED / Encoder Panel
1452
+//
1453
+//#define OLED_PANEL_TINYBOY2
1454
+
1455
+//
1441
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1456
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1442
 //
1457
 //
1443
 //#define SAV_3DGLCD
1458
 //#define SAV_3DGLCD
1454
 //
1469
 //
1455
 //#define SAV_3DLCD
1470
 //#define SAV_3DLCD
1456
 
1471
 
1457
-//
1458
-// TinyBoy2 128x64 OLED / Encoder Panel
1459
-//
1460
-//#define OLED_PANEL_TINYBOY2
1461
-
1462
 //=============================================================================
1472
 //=============================================================================
1463
 //=============================== Extra Features ==============================
1473
 //=============================== Extra Features ==============================
1464
 //=============================================================================
1474
 //=============================================================================

+ 2
- 2
Marlin/example_configurations/TAZ4/Configuration_adv.h View File

123
   #define AUTOTEMP_OLDWEIGHT 0.98
123
   #define AUTOTEMP_OLDWEIGHT 0.98
124
 #endif
124
 #endif
125
 
125
 
126
-//Show Temperature ADC value
127
-//The M105 command return, besides traditional information, the ADC value read from temperature sensors.
126
+// Show Temperature ADC value
127
+// Enable for M105 to include ADC values read from temperature sensors.
128
 //#define SHOW_TEMP_ADC_VALUES
128
 //#define SHOW_TEMP_ADC_VALUES
129
 
129
 
130
 /**
130
 /**

+ 21
- 6
Marlin/example_configurations/TinyBoy2/Configuration.h View File

1338
 //#define ULTIPANEL
1338
 //#define ULTIPANEL
1339
 
1339
 
1340
 //
1340
 //
1341
-// Cartesio UI
1342
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1343
-//
1344
-//#define CARTESIO_UI
1345
-
1346
-//
1347
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1341
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1348
 // http://reprap.org/wiki/PanelOne
1342
 // http://reprap.org/wiki/PanelOne
1349
 //
1343
 //
1426
 //#define BQ_LCD_SMART_CONTROLLER
1420
 //#define BQ_LCD_SMART_CONTROLLER
1427
 
1421
 
1428
 //
1422
 //
1423
+// Cartesio UI
1424
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1425
+//
1426
+//#define CARTESIO_UI
1427
+
1428
+//
1429
+// ANET_10 Controller supported displays.
1430
+//
1431
+//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1432
+                                  // This LCD is known to be susceptible to electrical interference
1433
+                                  // which scrambles the display.  Pressing any button clears it up.
1434
+//#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1435
+                                  // A clone of the RepRapDiscount full graphics display but with
1436
+                                  // different pins/wiring (see pins_ANET_10.h).
1437
+
1438
+//
1429
 // CONTROLLER TYPE: I2C
1439
 // CONTROLLER TYPE: I2C
1430
 //
1440
 //
1431
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1441
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1475
 //#define U8GLIB_SSD1306
1485
 //#define U8GLIB_SSD1306
1476
 
1486
 
1477
 //
1487
 //
1488
+// TinyBoy2 128x64 OLED / Encoder Panel
1489
+//
1490
+//#define OLED_PANEL_TINYBOY2
1491
+
1492
+//
1478
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1493
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1479
 //
1494
 //
1480
 //#define SAV_3DGLCD
1495
 //#define SAV_3DGLCD

+ 2
- 2
Marlin/example_configurations/TinyBoy2/Configuration_adv.h View File

123
   #define AUTOTEMP_OLDWEIGHT 0.98
123
   #define AUTOTEMP_OLDWEIGHT 0.98
124
 #endif
124
 #endif
125
 
125
 
126
-//Show Temperature ADC value
127
-//The M105 command return, besides traditional information, the ADC value read from temperature sensors.
126
+// Show Temperature ADC value
127
+// Enable for M105 to include ADC values read from temperature sensors.
128
 //#define SHOW_TEMP_ADC_VALUES
128
 //#define SHOW_TEMP_ADC_VALUES
129
 
129
 
130
 /**
130
 /**

+ 21
- 11
Marlin/example_configurations/WITBOX/Configuration.h View File

1272
 //#define ULTIPANEL
1272
 //#define ULTIPANEL
1273
 
1273
 
1274
 //
1274
 //
1275
-// Cartesio UI
1276
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1277
-//
1278
-//#define CARTESIO_UI
1279
-
1280
-//
1281
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1275
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1282
 // http://reprap.org/wiki/PanelOne
1276
 // http://reprap.org/wiki/PanelOne
1283
 //
1277
 //
1360
 //#define BQ_LCD_SMART_CONTROLLER
1354
 //#define BQ_LCD_SMART_CONTROLLER
1361
 
1355
 
1362
 //
1356
 //
1357
+// Cartesio UI
1358
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1359
+//
1360
+//#define CARTESIO_UI
1361
+
1362
+//
1363
+// ANET_10 Controller supported displays.
1364
+//
1365
+//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1366
+                                  // This LCD is known to be susceptible to electrical interference
1367
+                                  // which scrambles the display.  Pressing any button clears it up.
1368
+//#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1369
+                                  // A clone of the RepRapDiscount full graphics display but with
1370
+                                  // different pins/wiring (see pins_ANET_10.h).
1371
+
1372
+//
1363
 // CONTROLLER TYPE: I2C
1373
 // CONTROLLER TYPE: I2C
1364
 //
1374
 //
1365
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1375
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1409
 //#define U8GLIB_SSD1306
1419
 //#define U8GLIB_SSD1306
1410
 
1420
 
1411
 //
1421
 //
1422
+// TinyBoy2 128x64 OLED / Encoder Panel
1423
+//
1424
+//#define OLED_PANEL_TINYBOY2
1425
+
1426
+//
1412
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1427
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1413
 //
1428
 //
1414
 //#define SAV_3DGLCD
1429
 //#define SAV_3DGLCD
1425
 //
1440
 //
1426
 //#define SAV_3DLCD
1441
 //#define SAV_3DLCD
1427
 
1442
 
1428
-//
1429
-// TinyBoy2 128x64 OLED / Encoder Panel
1430
-//
1431
-//#define OLED_PANEL_TINYBOY2
1432
-
1433
 //=============================================================================
1443
 //=============================================================================
1434
 //=============================== Extra Features ==============================
1444
 //=============================== Extra Features ==============================
1435
 //=============================================================================
1445
 //=============================================================================

+ 2
- 2
Marlin/example_configurations/WITBOX/Configuration_adv.h View File

123
   #define AUTOTEMP_OLDWEIGHT 0.98
123
   #define AUTOTEMP_OLDWEIGHT 0.98
124
 #endif
124
 #endif
125
 
125
 
126
-//Show Temperature ADC value
127
-//The M105 command return, besides traditional information, the ADC value read from temperature sensors.
126
+// Show Temperature ADC value
127
+// Enable for M105 to include ADC values read from temperature sensors.
128
 //#define SHOW_TEMP_ADC_VALUES
128
 //#define SHOW_TEMP_ADC_VALUES
129
 
129
 
130
 /**
130
 /**

+ 21
- 11
Marlin/example_configurations/adafruit/ST7565/Configuration.h View File

1282
 //#define ULTIPANEL
1282
 //#define ULTIPANEL
1283
 
1283
 
1284
 //
1284
 //
1285
-// Cartesio UI
1286
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1287
-//
1288
-//#define CARTESIO_UI
1289
-
1290
-//
1291
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1285
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1292
 // http://reprap.org/wiki/PanelOne
1286
 // http://reprap.org/wiki/PanelOne
1293
 //
1287
 //
1370
 //#define BQ_LCD_SMART_CONTROLLER
1364
 //#define BQ_LCD_SMART_CONTROLLER
1371
 
1365
 
1372
 //
1366
 //
1367
+// Cartesio UI
1368
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1369
+//
1370
+//#define CARTESIO_UI
1371
+
1372
+//
1373
+// ANET_10 Controller supported displays.
1374
+//
1375
+//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1376
+                                  // This LCD is known to be susceptible to electrical interference
1377
+                                  // which scrambles the display.  Pressing any button clears it up.
1378
+//#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1379
+                                  // A clone of the RepRapDiscount full graphics display but with
1380
+                                  // different pins/wiring (see pins_ANET_10.h).
1381
+
1382
+//
1373
 // CONTROLLER TYPE: I2C
1383
 // CONTROLLER TYPE: I2C
1374
 //
1384
 //
1375
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1385
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1419
 //#define U8GLIB_SSD1306
1429
 //#define U8GLIB_SSD1306
1420
 
1430
 
1421
 //
1431
 //
1432
+// TinyBoy2 128x64 OLED / Encoder Panel
1433
+//
1434
+//#define OLED_PANEL_TINYBOY2
1435
+
1436
+//
1422
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1437
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1423
 //
1438
 //
1424
 //#define SAV_3DGLCD
1439
 //#define SAV_3DGLCD
1435
 //
1450
 //
1436
 //#define SAV_3DLCD
1451
 //#define SAV_3DLCD
1437
 
1452
 
1438
-//
1439
-// TinyBoy2 128x64 OLED / Encoder Panel
1440
-//
1441
-//#define OLED_PANEL_TINYBOY2
1442
-
1443
 //=============================================================================
1453
 //=============================================================================
1444
 //=============================== Extra Features ==============================
1454
 //=============================== Extra Features ==============================
1445
 //=============================================================================
1455
 //=============================================================================

+ 21
- 11
Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h View File

1403
 //#define ULTIPANEL
1403
 //#define ULTIPANEL
1404
 
1404
 
1405
 //
1405
 //
1406
-// Cartesio UI
1407
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1408
-//
1409
-//#define CARTESIO_UI
1410
-
1411
-//
1412
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1406
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1413
 // http://reprap.org/wiki/PanelOne
1407
 // http://reprap.org/wiki/PanelOne
1414
 //
1408
 //
1491
 //#define BQ_LCD_SMART_CONTROLLER
1485
 //#define BQ_LCD_SMART_CONTROLLER
1492
 
1486
 
1493
 //
1487
 //
1488
+// Cartesio UI
1489
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1490
+//
1491
+//#define CARTESIO_UI
1492
+
1493
+//
1494
+// ANET_10 Controller supported displays.
1495
+//
1496
+//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1497
+                                  // This LCD is known to be susceptible to electrical interference
1498
+                                  // which scrambles the display.  Pressing any button clears it up.
1499
+//#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1500
+                                  // A clone of the RepRapDiscount full graphics display but with
1501
+                                  // different pins/wiring (see pins_ANET_10.h).
1502
+
1503
+//
1494
 // CONTROLLER TYPE: I2C
1504
 // CONTROLLER TYPE: I2C
1495
 //
1505
 //
1496
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1506
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1540
 //#define U8GLIB_SSD1306
1550
 //#define U8GLIB_SSD1306
1541
 
1551
 
1542
 //
1552
 //
1553
+// TinyBoy2 128x64 OLED / Encoder Panel
1554
+//
1555
+//#define OLED_PANEL_TINYBOY2
1556
+
1557
+//
1543
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1558
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1544
 //
1559
 //
1545
 //#define SAV_3DGLCD
1560
 //#define SAV_3DGLCD
1556
 //
1571
 //
1557
 //#define SAV_3DLCD
1572
 //#define SAV_3DLCD
1558
 
1573
 
1559
-//
1560
-// TinyBoy2 128x64 OLED / Encoder Panel
1561
-//
1562
-//#define OLED_PANEL_TINYBOY2
1563
-
1564
 //=============================================================================
1574
 //=============================================================================
1565
 //=============================== Extra Features ==============================
1575
 //=============================== Extra Features ==============================
1566
 //=============================================================================
1576
 //=============================================================================

+ 2
- 2
Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h View File

123
   #define AUTOTEMP_OLDWEIGHT 0.98
123
   #define AUTOTEMP_OLDWEIGHT 0.98
124
 #endif
124
 #endif
125
 
125
 
126
-//Show Temperature ADC value
127
-//The M105 command return, besides traditional information, the ADC value read from temperature sensors.
126
+// Show Temperature ADC value
127
+// Enable for M105 to include ADC values read from temperature sensors.
128
 //#define SHOW_TEMP_ADC_VALUES
128
 //#define SHOW_TEMP_ADC_VALUES
129
 
129
 
130
 /**
130
 /**

+ 21
- 11
Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h View File

1404
 //#define ULTIPANEL
1404
 //#define ULTIPANEL
1405
 
1405
 
1406
 //
1406
 //
1407
-// Cartesio UI
1408
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1409
-//
1410
-//#define CARTESIO_UI
1411
-
1412
-//
1413
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1407
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1414
 // http://reprap.org/wiki/PanelOne
1408
 // http://reprap.org/wiki/PanelOne
1415
 //
1409
 //
1492
 //#define BQ_LCD_SMART_CONTROLLER
1486
 //#define BQ_LCD_SMART_CONTROLLER
1493
 
1487
 
1494
 //
1488
 //
1489
+// Cartesio UI
1490
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1491
+//
1492
+//#define CARTESIO_UI
1493
+
1494
+//
1495
+// ANET_10 Controller supported displays.
1496
+//
1497
+//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1498
+                                  // This LCD is known to be susceptible to electrical interference
1499
+                                  // which scrambles the display.  Pressing any button clears it up.
1500
+//#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1501
+                                  // A clone of the RepRapDiscount full graphics display but with
1502
+                                  // different pins/wiring (see pins_ANET_10.h).
1503
+
1504
+//
1495
 // CONTROLLER TYPE: I2C
1505
 // CONTROLLER TYPE: I2C
1496
 //
1506
 //
1497
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1507
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1541
 //#define U8GLIB_SSD1306
1551
 //#define U8GLIB_SSD1306
1542
 
1552
 
1543
 //
1553
 //
1554
+// TinyBoy2 128x64 OLED / Encoder Panel
1555
+//
1556
+//#define OLED_PANEL_TINYBOY2
1557
+
1558
+//
1544
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1559
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1545
 //
1560
 //
1546
 //#define SAV_3DGLCD
1561
 //#define SAV_3DGLCD
1557
 //
1572
 //
1558
 //#define SAV_3DLCD
1573
 //#define SAV_3DLCD
1559
 
1574
 
1560
-//
1561
-// TinyBoy2 128x64 OLED / Encoder Panel
1562
-//
1563
-//#define OLED_PANEL_TINYBOY2
1564
-
1565
 //=============================================================================
1575
 //=============================================================================
1566
 //=============================== Extra Features ==============================
1576
 //=============================== Extra Features ==============================
1567
 //=============================================================================
1577
 //=============================================================================

+ 2
- 2
Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h View File

123
   #define AUTOTEMP_OLDWEIGHT 0.98
123
   #define AUTOTEMP_OLDWEIGHT 0.98
124
 #endif
124
 #endif
125
 
125
 
126
-//Show Temperature ADC value
127
-//The M105 command return, besides traditional information, the ADC value read from temperature sensors.
126
+// Show Temperature ADC value
127
+// Enable for M105 to include ADC values read from temperature sensors.
128
 //#define SHOW_TEMP_ADC_VALUES
128
 //#define SHOW_TEMP_ADC_VALUES
129
 
129
 
130
 /**
130
 /**

+ 21
- 11
Marlin/example_configurations/delta/generic/Configuration.h View File

1393
 //#define ULTIPANEL
1393
 //#define ULTIPANEL
1394
 
1394
 
1395
 //
1395
 //
1396
-// Cartesio UI
1397
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1398
-//
1399
-//#define CARTESIO_UI
1400
-
1401
-//
1402
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1396
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1403
 // http://reprap.org/wiki/PanelOne
1397
 // http://reprap.org/wiki/PanelOne
1404
 //
1398
 //
1481
 //#define BQ_LCD_SMART_CONTROLLER
1475
 //#define BQ_LCD_SMART_CONTROLLER
1482
 
1476
 
1483
 //
1477
 //
1478
+// Cartesio UI
1479
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1480
+//
1481
+//#define CARTESIO_UI
1482
+
1483
+//
1484
+// ANET_10 Controller supported displays.
1485
+//
1486
+//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1487
+                                  // This LCD is known to be susceptible to electrical interference
1488
+                                  // which scrambles the display.  Pressing any button clears it up.
1489
+//#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1490
+                                  // A clone of the RepRapDiscount full graphics display but with
1491
+                                  // different pins/wiring (see pins_ANET_10.h).
1492
+
1493
+//
1484
 // CONTROLLER TYPE: I2C
1494
 // CONTROLLER TYPE: I2C
1485
 //
1495
 //
1486
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1496
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1530
 //#define U8GLIB_SSD1306
1540
 //#define U8GLIB_SSD1306
1531
 
1541
 
1532
 //
1542
 //
1543
+// TinyBoy2 128x64 OLED / Encoder Panel
1544
+//
1545
+//#define OLED_PANEL_TINYBOY2
1546
+
1547
+//
1533
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1548
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1534
 //
1549
 //
1535
 //#define SAV_3DGLCD
1550
 //#define SAV_3DGLCD
1546
 //
1561
 //
1547
 //#define SAV_3DLCD
1562
 //#define SAV_3DLCD
1548
 
1563
 
1549
-//
1550
-// TinyBoy2 128x64 OLED / Encoder Panel
1551
-//
1552
-//#define OLED_PANEL_TINYBOY2
1553
-
1554
 //=============================================================================
1564
 //=============================================================================
1555
 //=============================== Extra Features ==============================
1565
 //=============================== Extra Features ==============================
1556
 //=============================================================================
1566
 //=============================================================================

+ 2
- 2
Marlin/example_configurations/delta/generic/Configuration_adv.h View File

123
   #define AUTOTEMP_OLDWEIGHT 0.98
123
   #define AUTOTEMP_OLDWEIGHT 0.98
124
 #endif
124
 #endif
125
 
125
 
126
-//Show Temperature ADC value
127
-//The M105 command return, besides traditional information, the ADC value read from temperature sensors.
126
+// Show Temperature ADC value
127
+// Enable for M105 to include ADC values read from temperature sensors.
128
 //#define SHOW_TEMP_ADC_VALUES
128
 //#define SHOW_TEMP_ADC_VALUES
129
 
129
 
130
 /**
130
 /**

+ 21
- 11
Marlin/example_configurations/delta/kossel_mini/Configuration.h View File

1396
 //#define ULTIPANEL
1396
 //#define ULTIPANEL
1397
 
1397
 
1398
 //
1398
 //
1399
-// Cartesio UI
1400
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1401
-//
1402
-//#define CARTESIO_UI
1403
-
1404
-//
1405
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1399
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1406
 // http://reprap.org/wiki/PanelOne
1400
 // http://reprap.org/wiki/PanelOne
1407
 //
1401
 //
1484
 //#define BQ_LCD_SMART_CONTROLLER
1478
 //#define BQ_LCD_SMART_CONTROLLER
1485
 
1479
 
1486
 //
1480
 //
1481
+// Cartesio UI
1482
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1483
+//
1484
+//#define CARTESIO_UI
1485
+
1486
+//
1487
+// ANET_10 Controller supported displays.
1488
+//
1489
+//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1490
+                                  // This LCD is known to be susceptible to electrical interference
1491
+                                  // which scrambles the display.  Pressing any button clears it up.
1492
+//#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1493
+                                  // A clone of the RepRapDiscount full graphics display but with
1494
+                                  // different pins/wiring (see pins_ANET_10.h).
1495
+
1496
+//
1487
 // CONTROLLER TYPE: I2C
1497
 // CONTROLLER TYPE: I2C
1488
 //
1498
 //
1489
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1499
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1533
 //#define U8GLIB_SSD1306
1543
 //#define U8GLIB_SSD1306
1534
 
1544
 
1535
 //
1545
 //
1546
+// TinyBoy2 128x64 OLED / Encoder Panel
1547
+//
1548
+//#define OLED_PANEL_TINYBOY2
1549
+
1550
+//
1536
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1551
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1537
 //
1552
 //
1538
 //#define SAV_3DGLCD
1553
 //#define SAV_3DGLCD
1549
 //
1564
 //
1550
 //#define SAV_3DLCD
1565
 //#define SAV_3DLCD
1551
 
1566
 
1552
-//
1553
-// TinyBoy2 128x64 OLED / Encoder Panel
1554
-//
1555
-//#define OLED_PANEL_TINYBOY2
1556
-
1557
 //=============================================================================
1567
 //=============================================================================
1558
 //=============================== Extra Features ==============================
1568
 //=============================== Extra Features ==============================
1559
 //=============================================================================
1569
 //=============================================================================

+ 2
- 2
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h View File

123
   #define AUTOTEMP_OLDWEIGHT 0.98
123
   #define AUTOTEMP_OLDWEIGHT 0.98
124
 #endif
124
 #endif
125
 
125
 
126
-//Show Temperature ADC value
127
-//The M105 command return, besides traditional information, the ADC value read from temperature sensors.
126
+// Show Temperature ADC value
127
+// Enable for M105 to include ADC values read from temperature sensors.
128
 //#define SHOW_TEMP_ADC_VALUES
128
 //#define SHOW_TEMP_ADC_VALUES
129
 
129
 
130
 /**
130
 /**

+ 21
- 11
Marlin/example_configurations/delta/kossel_pro/Configuration.h View File

1401
 //#define ULTIPANEL
1401
 //#define ULTIPANEL
1402
 
1402
 
1403
 //
1403
 //
1404
-// Cartesio UI
1405
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1406
-//
1407
-//#define CARTESIO_UI
1408
-
1409
-//
1410
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1404
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1411
 // http://reprap.org/wiki/PanelOne
1405
 // http://reprap.org/wiki/PanelOne
1412
 //
1406
 //
1489
 //#define BQ_LCD_SMART_CONTROLLER
1483
 //#define BQ_LCD_SMART_CONTROLLER
1490
 
1484
 
1491
 //
1485
 //
1486
+// Cartesio UI
1487
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1488
+//
1489
+//#define CARTESIO_UI
1490
+
1491
+//
1492
+// ANET_10 Controller supported displays.
1493
+//
1494
+//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1495
+                                  // This LCD is known to be susceptible to electrical interference
1496
+                                  // which scrambles the display.  Pressing any button clears it up.
1497
+//#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1498
+                                  // A clone of the RepRapDiscount full graphics display but with
1499
+                                  // different pins/wiring (see pins_ANET_10.h).
1500
+
1501
+//
1492
 // CONTROLLER TYPE: I2C
1502
 // CONTROLLER TYPE: I2C
1493
 //
1503
 //
1494
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1504
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1538
 //#define U8GLIB_SSD1306
1548
 //#define U8GLIB_SSD1306
1539
 
1549
 
1540
 //
1550
 //
1551
+// TinyBoy2 128x64 OLED / Encoder Panel
1552
+//
1553
+//#define OLED_PANEL_TINYBOY2
1554
+
1555
+//
1541
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1556
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1542
 //
1557
 //
1543
 //#define SAV_3DGLCD
1558
 //#define SAV_3DGLCD
1554
 //
1569
 //
1555
 //#define SAV_3DLCD
1570
 //#define SAV_3DLCD
1556
 
1571
 
1557
-//
1558
-// TinyBoy2 128x64 OLED / Encoder Panel
1559
-//
1560
-//#define OLED_PANEL_TINYBOY2
1561
-
1562
 //=============================================================================
1572
 //=============================================================================
1563
 //=============================== Extra Features ==============================
1573
 //=============================== Extra Features ==============================
1564
 //=============================================================================
1574
 //=============================================================================

+ 2
- 2
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h View File

128
   #define AUTOTEMP_OLDWEIGHT 0.98
128
   #define AUTOTEMP_OLDWEIGHT 0.98
129
 #endif
129
 #endif
130
 
130
 
131
-//Show Temperature ADC value
132
-//The M105 command return, besides traditional information, the ADC value read from temperature sensors.
131
+// Show Temperature ADC value
132
+// Enable for M105 to include ADC values read from temperature sensors.
133
 //#define SHOW_TEMP_ADC_VALUES
133
 //#define SHOW_TEMP_ADC_VALUES
134
 
134
 
135
 /**
135
 /**

+ 21
- 11
Marlin/example_configurations/delta/kossel_xl/Configuration.h View File

1459
 //#define ULTIPANEL
1459
 //#define ULTIPANEL
1460
 
1460
 
1461
 //
1461
 //
1462
-// Cartesio UI
1463
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1464
-//
1465
-//#define CARTESIO_UI
1466
-
1467
-//
1468
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1462
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1469
 // http://reprap.org/wiki/PanelOne
1463
 // http://reprap.org/wiki/PanelOne
1470
 //
1464
 //
1547
 //#define BQ_LCD_SMART_CONTROLLER
1541
 //#define BQ_LCD_SMART_CONTROLLER
1548
 
1542
 
1549
 //
1543
 //
1544
+// Cartesio UI
1545
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1546
+//
1547
+//#define CARTESIO_UI
1548
+
1549
+//
1550
+// ANET_10 Controller supported displays.
1551
+//
1552
+//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1553
+                                  // This LCD is known to be susceptible to electrical interference
1554
+                                  // which scrambles the display.  Pressing any button clears it up.
1555
+//#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1556
+                                  // A clone of the RepRapDiscount full graphics display but with
1557
+                                  // different pins/wiring (see pins_ANET_10.h).
1558
+
1559
+//
1550
 // CONTROLLER TYPE: I2C
1560
 // CONTROLLER TYPE: I2C
1551
 //
1561
 //
1552
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1562
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1596
 //#define U8GLIB_SSD1306
1606
 //#define U8GLIB_SSD1306
1597
 
1607
 
1598
 //
1608
 //
1609
+// TinyBoy2 128x64 OLED / Encoder Panel
1610
+//
1611
+//#define OLED_PANEL_TINYBOY2
1612
+
1613
+//
1599
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1614
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1600
 //
1615
 //
1601
 //#define SAV_3DGLCD
1616
 //#define SAV_3DGLCD
1612
 //
1627
 //
1613
 //#define SAV_3DLCD
1628
 //#define SAV_3DLCD
1614
 
1629
 
1615
-//
1616
-// TinyBoy2 128x64 OLED / Encoder Panel
1617
-//
1618
-//#define OLED_PANEL_TINYBOY2
1619
-
1620
 //=============================================================================
1630
 //=============================================================================
1621
 //=============================== Extra Features ==============================
1631
 //=============================== Extra Features ==============================
1622
 //=============================================================================
1632
 //=============================================================================

+ 2
- 2
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h View File

123
   #define AUTOTEMP_OLDWEIGHT 0.98
123
   #define AUTOTEMP_OLDWEIGHT 0.98
124
 #endif
124
 #endif
125
 
125
 
126
-//Show Temperature ADC value
127
-//The M105 command return, besides traditional information, the ADC value read from temperature sensors.
126
+// Show Temperature ADC value
127
+// Enable for M105 to include ADC values read from temperature sensors.
128
 //#define SHOW_TEMP_ADC_VALUES
128
 //#define SHOW_TEMP_ADC_VALUES
129
 
129
 
130
 /**
130
 /**

+ 24
- 14
Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h View File

582
 //#define Z_MIN_PROBE_ENDSTOP
582
 //#define Z_MIN_PROBE_ENDSTOP
583
 
583
 
584
 /**
584
 /**
585
- *   Probe Type
585
+ * Probe Type
586
  *
586
  *
587
- *   Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc.
588
- *   You must activate one of these to use Auto Bed Leveling below.
587
+ * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc.
588
+ * Activate one of these to use Auto Bed Leveling below.
589
  */
589
  */
590
 
590
 
591
 /**
591
 /**
1298
 //#define ULTIPANEL
1298
 //#define ULTIPANEL
1299
 
1299
 
1300
 //
1300
 //
1301
-// Cartesio UI
1302
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1303
-//
1304
-//#define CARTESIO_UI
1305
-
1306
-//
1307
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1301
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1308
 // http://reprap.org/wiki/PanelOne
1302
 // http://reprap.org/wiki/PanelOne
1309
 //
1303
 //
1386
 //#define BQ_LCD_SMART_CONTROLLER
1380
 //#define BQ_LCD_SMART_CONTROLLER
1387
 
1381
 
1388
 //
1382
 //
1383
+// Cartesio UI
1384
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1385
+//
1386
+//#define CARTESIO_UI
1387
+
1388
+//
1389
+// ANET_10 Controller supported displays.
1390
+//
1391
+//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1392
+                                  // This LCD is known to be susceptible to electrical interference
1393
+                                  // which scrambles the display.  Pressing any button clears it up.
1394
+//#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1395
+                                  // A clone of the RepRapDiscount full graphics display but with
1396
+                                  // different pins/wiring (see pins_ANET_10.h).
1397
+
1398
+//
1389
 // CONTROLLER TYPE: I2C
1399
 // CONTROLLER TYPE: I2C
1390
 //
1400
 //
1391
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1401
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1435
 //#define U8GLIB_SSD1306
1445
 //#define U8GLIB_SSD1306
1436
 
1446
 
1437
 //
1447
 //
1448
+// TinyBoy2 128x64 OLED / Encoder Panel
1449
+//
1450
+//#define OLED_PANEL_TINYBOY2
1451
+
1452
+//
1438
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1453
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1439
 //
1454
 //
1440
 //#define SAV_3DGLCD
1455
 //#define SAV_3DGLCD
1451
 //
1466
 //
1452
 //#define SAV_3DLCD
1467
 //#define SAV_3DLCD
1453
 
1468
 
1454
-//
1455
-// TinyBoy2 128x64 OLED / Encoder Panel
1456
-//
1457
-//#define OLED_PANEL_TINYBOY2
1458
-
1459
 //=============================================================================
1469
 //=============================================================================
1460
 //=============================== Extra Features ==============================
1470
 //=============================== Extra Features ==============================
1461
 //=============================================================================
1471
 //=============================================================================

+ 2
- 2
Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h View File

123
   #define AUTOTEMP_OLDWEIGHT 0.98
123
   #define AUTOTEMP_OLDWEIGHT 0.98
124
 #endif
124
 #endif
125
 
125
 
126
-//Show Temperature ADC value
127
-//The M105 command return, besides traditional information, the ADC value read from temperature sensors.
126
+// Show Temperature ADC value
127
+// Enable for M105 to include ADC values read from temperature sensors.
128
 //#define SHOW_TEMP_ADC_VALUES
128
 //#define SHOW_TEMP_ADC_VALUES
129
 
129
 
130
 /**
130
 /**

+ 21
- 11
Marlin/example_configurations/makibox/Configuration.h View File

1285
 //#define ULTIPANEL
1285
 //#define ULTIPANEL
1286
 
1286
 
1287
 //
1287
 //
1288
-// Cartesio UI
1289
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1290
-//
1291
-//#define CARTESIO_UI
1292
-
1293
-//
1294
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1288
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1295
 // http://reprap.org/wiki/PanelOne
1289
 // http://reprap.org/wiki/PanelOne
1296
 //
1290
 //
1373
 //#define BQ_LCD_SMART_CONTROLLER
1367
 //#define BQ_LCD_SMART_CONTROLLER
1374
 
1368
 
1375
 //
1369
 //
1370
+// Cartesio UI
1371
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1372
+//
1373
+//#define CARTESIO_UI
1374
+
1375
+//
1376
+// ANET_10 Controller supported displays.
1377
+//
1378
+//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1379
+                                  // This LCD is known to be susceptible to electrical interference
1380
+                                  // which scrambles the display.  Pressing any button clears it up.
1381
+//#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1382
+                                  // A clone of the RepRapDiscount full graphics display but with
1383
+                                  // different pins/wiring (see pins_ANET_10.h).
1384
+
1385
+//
1376
 // CONTROLLER TYPE: I2C
1386
 // CONTROLLER TYPE: I2C
1377
 //
1387
 //
1378
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1388
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1422
 //#define U8GLIB_SSD1306
1432
 //#define U8GLIB_SSD1306
1423
 
1433
 
1424
 //
1434
 //
1435
+// TinyBoy2 128x64 OLED / Encoder Panel
1436
+//
1437
+//#define OLED_PANEL_TINYBOY2
1438
+
1439
+//
1425
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1440
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1426
 //
1441
 //
1427
 //#define SAV_3DGLCD
1442
 //#define SAV_3DGLCD
1438
 //
1453
 //
1439
 //#define SAV_3DLCD
1454
 //#define SAV_3DLCD
1440
 
1455
 
1441
-//
1442
-// TinyBoy2 128x64 OLED / Encoder Panel
1443
-//
1444
-//#define OLED_PANEL_TINYBOY2
1445
-
1446
 //=============================================================================
1456
 //=============================================================================
1447
 //=============================== Extra Features ==============================
1457
 //=============================== Extra Features ==============================
1448
 //=============================================================================
1458
 //=============================================================================

+ 2
- 2
Marlin/example_configurations/makibox/Configuration_adv.h View File

123
   #define AUTOTEMP_OLDWEIGHT 0.98
123
   #define AUTOTEMP_OLDWEIGHT 0.98
124
 #endif
124
 #endif
125
 
125
 
126
-//Show Temperature ADC value
127
-//The M105 command return, besides traditional information, the ADC value read from temperature sensors.
126
+// Show Temperature ADC value
127
+// Enable for M105 to include ADC values read from temperature sensors.
128
 //#define SHOW_TEMP_ADC_VALUES
128
 //#define SHOW_TEMP_ADC_VALUES
129
 
129
 
130
 /**
130
 /**

+ 21
- 11
Marlin/example_configurations/tvrrug/Round2/Configuration.h View File

1277
 //#define ULTIPANEL
1277
 //#define ULTIPANEL
1278
 
1278
 
1279
 //
1279
 //
1280
-// Cartesio UI
1281
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1282
-//
1283
-//#define CARTESIO_UI
1284
-
1285
-//
1286
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1280
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1287
 // http://reprap.org/wiki/PanelOne
1281
 // http://reprap.org/wiki/PanelOne
1288
 //
1282
 //
1365
 //#define BQ_LCD_SMART_CONTROLLER
1359
 //#define BQ_LCD_SMART_CONTROLLER
1366
 
1360
 
1367
 //
1361
 //
1362
+// Cartesio UI
1363
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1364
+//
1365
+//#define CARTESIO_UI
1366
+
1367
+//
1368
+// ANET_10 Controller supported displays.
1369
+//
1370
+//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1371
+                                  // This LCD is known to be susceptible to electrical interference
1372
+                                  // which scrambles the display.  Pressing any button clears it up.
1373
+//#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1374
+                                  // A clone of the RepRapDiscount full graphics display but with
1375
+                                  // different pins/wiring (see pins_ANET_10.h).
1376
+
1377
+//
1368
 // CONTROLLER TYPE: I2C
1378
 // CONTROLLER TYPE: I2C
1369
 //
1379
 //
1370
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1380
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1414
 //#define U8GLIB_SSD1306
1424
 //#define U8GLIB_SSD1306
1415
 
1425
 
1416
 //
1426
 //
1427
+// TinyBoy2 128x64 OLED / Encoder Panel
1428
+//
1429
+//#define OLED_PANEL_TINYBOY2
1430
+
1431
+//
1417
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1432
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1418
 //
1433
 //
1419
 //#define SAV_3DGLCD
1434
 //#define SAV_3DGLCD
1430
 //
1445
 //
1431
 //#define SAV_3DLCD
1446
 //#define SAV_3DLCD
1432
 
1447
 
1433
-//
1434
-// TinyBoy2 128x64 OLED / Encoder Panel
1435
-//
1436
-//#define OLED_PANEL_TINYBOY2
1437
-
1438
 //=============================================================================
1448
 //=============================================================================
1439
 //=============================== Extra Features ==============================
1449
 //=============================== Extra Features ==============================
1440
 //=============================================================================
1450
 //=============================================================================

+ 2
- 2
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h View File

123
   #define AUTOTEMP_OLDWEIGHT 0.98
123
   #define AUTOTEMP_OLDWEIGHT 0.98
124
 #endif
124
 #endif
125
 
125
 
126
-//Show Temperature ADC value
127
-//The M105 command return, besides traditional information, the ADC value read from temperature sensors.
126
+// Show Temperature ADC value
127
+// Enable for M105 to include ADC values read from temperature sensors.
128
 //#define SHOW_TEMP_ADC_VALUES
128
 //#define SHOW_TEMP_ADC_VALUES
129
 
129
 
130
 /**
130
 /**

+ 22
- 12
Marlin/example_configurations/wt150/Configuration.h View File

576
  * Probe Type
576
  * Probe Type
577
  *
577
  *
578
  * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc.
578
  * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc.
579
- * You must activate one of these to use Auto Bed Leveling below.
579
+ * Activate one of these to use Auto Bed Leveling below.
580
  */
580
  */
581
 
581
 
582
 /**
582
 /**
1288
 //#define ULTIPANEL
1288
 //#define ULTIPANEL
1289
 
1289
 
1290
 //
1290
 //
1291
-// Cartesio UI
1292
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1293
-//
1294
-//#define CARTESIO_UI
1295
-
1296
-//
1297
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1291
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1298
 // http://reprap.org/wiki/PanelOne
1292
 // http://reprap.org/wiki/PanelOne
1299
 //
1293
 //
1376
 //#define BQ_LCD_SMART_CONTROLLER
1370
 //#define BQ_LCD_SMART_CONTROLLER
1377
 
1371
 
1378
 //
1372
 //
1373
+// Cartesio UI
1374
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1375
+//
1376
+//#define CARTESIO_UI
1377
+
1378
+//
1379
+// ANET_10 Controller supported displays.
1380
+//
1381
+//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1382
+                                  // This LCD is known to be susceptible to electrical interference
1383
+                                  // which scrambles the display.  Pressing any button clears it up.
1384
+//#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1385
+                                  // A clone of the RepRapDiscount full graphics display but with
1386
+                                  // different pins/wiring (see pins_ANET_10.h).
1387
+
1388
+//
1379
 // CONTROLLER TYPE: I2C
1389
 // CONTROLLER TYPE: I2C
1380
 //
1390
 //
1381
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1391
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C
1425
 //#define U8GLIB_SSD1306
1435
 //#define U8GLIB_SSD1306
1426
 
1436
 
1427
 //
1437
 //
1438
+// TinyBoy2 128x64 OLED / Encoder Panel
1439
+//
1440
+//#define OLED_PANEL_TINYBOY2
1441
+
1442
+//
1428
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1443
 // SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules
1429
 //
1444
 //
1430
 //#define SAV_3DGLCD
1445
 //#define SAV_3DGLCD
1441
 //
1456
 //
1442
 //#define SAV_3DLCD
1457
 //#define SAV_3DLCD
1443
 
1458
 
1444
-//
1445
-// TinyBoy2 128x64 OLED / Encoder Panel
1446
-//
1447
-//#define OLED_PANEL_TINYBOY2
1448
-
1449
 //=============================================================================
1459
 //=============================================================================
1450
 //=============================== Extra Features ==============================
1460
 //=============================== Extra Features ==============================
1451
 //=============================================================================
1461
 //=============================================================================

+ 2
- 2
Marlin/example_configurations/wt150/Configuration_adv.h View File

123
   #define AUTOTEMP_OLDWEIGHT 0.98
123
   #define AUTOTEMP_OLDWEIGHT 0.98
124
 #endif
124
 #endif
125
 
125
 
126
-//Show Temperature ADC value
127
-//The M105 command return, besides traditional information, the ADC value read from temperature sensors.
126
+// Show Temperature ADC value
127
+// Enable for M105 to include ADC values read from temperature sensors.
128
 //#define SHOW_TEMP_ADC_VALUES
128
 //#define SHOW_TEMP_ADC_VALUES
129
 
129
 
130
 /**
130
 /**

+ 2
- 0
Marlin/pins.h View File

107
   #include "pins_AZTEEG_X3.h"
107
   #include "pins_AZTEEG_X3.h"
108
 #elif MB(AZTEEG_X3_PRO)
108
 #elif MB(AZTEEG_X3_PRO)
109
   #include "pins_AZTEEG_X3_PRO.h"
109
   #include "pins_AZTEEG_X3_PRO.h"
110
+#elif MB(ANET_10)
111
+  #include "pins_ANET_10.h"
110
 #elif MB(ULTIMAKER)
112
 #elif MB(ULTIMAKER)
111
   #include "pins_ULTIMAKER.h"
113
   #include "pins_ULTIMAKER.h"
112
 #elif MB(ULTIMAKER_OLD)
114
 #elif MB(ULTIMAKER_OLD)

+ 5
- 0
Marlin/pinsDebug.h View File

129
   bool get_pinMode(int8_t pin) {return *portModeRegister(digitalPinToPort_DEBUG(pin)) & digitalPinToBitMask_DEBUG(pin); }
129
   bool get_pinMode(int8_t pin) {return *portModeRegister(digitalPinToPort_DEBUG(pin)) & digitalPinToBitMask_DEBUG(pin); }
130
 #endif
130
 #endif
131
 
131
 
132
+#if defined(__AVR_ATmega1284P__)  // 1284 IDE extensions set this to the number of
133
+  #undef NUM_DIGITAL_PINS         // digital only pins while all other CPUs have it
134
+  #define NUM_DIGITAL_PINS 32     // set to digital only + digital/analog
135
+#endif
136
+
132
 #define PWM_PRINT(V) do{ sprintf_P(buffer, PSTR("PWM:  %4d"), V); SERIAL_ECHO(buffer); }while(0)
137
 #define PWM_PRINT(V) do{ sprintf_P(buffer, PSTR("PWM:  %4d"), V); SERIAL_ECHO(buffer); }while(0)
133
 #define PWM_CASE(N,Z)                                           \
138
 #define PWM_CASE(N,Z)                                           \
134
   case TIMER##N##Z:                                             \
139
   case TIMER##N##Z:                                             \

+ 3
- 0
Marlin/pinsDebug_list.h View File

29
 
29
 
30
 #line 0 // set __LINE__ to a known value for both passes
30
 #line 0 // set __LINE__ to a known value for both passes
31
 
31
 
32
+#if PIN_EXISTS(ADC_KEYPAD) && ADC_KEYPAD_PIN < NUM_ANALOG_INPUTS
33
+  REPORT_NAME_ANALOG(ADC_KEYPAD_PIN, __LINE__ )
34
+#endif
32
 #if defined(__FD) && __FD >= 0
35
 #if defined(__FD) && __FD >= 0
33
   REPORT_NAME_DIGITAL(__FD, __LINE__ )
36
   REPORT_NAME_DIGITAL(__FD, __LINE__ )
34
 #endif
37
 #endif

+ 274
- 0
Marlin/pins_ANET_10.h View File

1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (C) 2017 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
+/**
24
+ * Anet V1.0 board pin assignments
25
+ */
26
+
27
+/**
28
+ * Rev B    16 JUN 2017
29
+ *
30
+ * 1) no longer uses Sanguino files to define some of the pins
31
+ * 2) added pointers to useable Arduino IDE extensions
32
+ *
33
+ */
34
+
35
+/**
36
+ * The standard Arduino IDE extension (board manager) for this board
37
+ * is located at https://github.com/SkyNet3D/anet-board.
38
+ *
39
+ * Installation instructions are on that page.
40
+ *
41
+ * After copying the files to the appropriate location, restart Arduino and
42
+ * you'll see "Anet V1.0" and "Anet V1.0 (Optiboot)" in the boards list.
43
+ *
44
+ * "Anet V1.0" uses the bootloader that was installed on the board when
45
+ * it shipped from the factory.
46
+ *
47
+ * "Anet V1.0 (Optiboot)" frees up another 3K of FLASH.  You'll need to burn
48
+ * a new bootloader to the board to be able to automatically download a
49
+ * compiled image.
50
+ *
51
+ */
52
+
53
+/**
54
+ * Another usable Arduino IDE extension (board manager) can be found at
55
+ * https://github.com/Lauszus/Sanguino
56
+ *
57
+ * This extension has been tested on Arduino 1.6.12 & 1.8.0
58
+ *
59
+ * Here's the JSON path:
60
+ * https://raw.githubusercontent.com/Lauszus/Sanguino/master/package_lauszus_sanguino_index.json
61
+ *
62
+ * When installing select 1.0.2
63
+ *
64
+ * Installation instructions can be found at https://learn.sparkfun.com/pages/CustomBoardsArduino
65
+ * Just use the above JSON URL instead of Sparkfun's JSON.
66
+ *
67
+ * Once installed select the Sanguino board and then select the CPU.
68
+ *
69
+ */
70
+
71
+/**
72
+ *  To burn a new bootloader:
73
+ *
74
+ *   1. Connect your programmer to the board.
75
+ *   2. In the Arduino IDE select the board and then select the programmer.
76
+ *   3. In the Arduino IDE click on "burn bootloader". Don't worry about the "verify failed at 1F000" error message.
77
+ *   4. The programmer is no longer needed. Remove it.
78
+ */
79
+
80
+/**
81
+ * Additional info:
82
+ *
83
+ *   Anet Schematics                    - https://github.com/ralf-e/ANET-3D-Board-V1.0
84
+ *   Wiring RRDFG Smart Controller      - http://www.thingiverse.com/thing:2103748
85
+ *   SkyNet3D Anet software development - https://github.com/SkyNet3D/Marlin/
86
+ *   Anet Users / Skynet SW on Facebook - https://www.facebook.com/skynet3ddevelopment/
87
+ *
88
+ *   Many thanks to Hans Raaf (@oderwat) for developing the Anet-specific software and supporting the Anet community.
89
+*/
90
+
91
+#if !defined(__AVR_ATmega1284P__)
92
+  #error "Oops!  Make sure you have 'Anet V1.0', 'Anet V1.0 (Optiboot)' or 'Sanguino' selected from the 'Tools -> Boards' menu."
93
+#endif
94
+
95
+#ifndef BOARD_NAME
96
+  #define BOARD_NAME "Anet"
97
+#endif
98
+
99
+#define LARGE_FLASH true
100
+
101
+//
102
+// Limit Switches
103
+//
104
+#define X_STOP_PIN         18
105
+#define Y_STOP_PIN         19
106
+#define Z_STOP_PIN         20
107
+
108
+//
109
+// Steppers
110
+//
111
+#define X_STEP_PIN         15
112
+#define X_DIR_PIN          21
113
+#define X_ENABLE_PIN       14
114
+
115
+#define Y_STEP_PIN         22
116
+#define Y_DIR_PIN          23
117
+#define Y_ENABLE_PIN       14
118
+
119
+#define Z_STEP_PIN          3
120
+#define Z_DIR_PIN           2
121
+#define Z_ENABLE_PIN       26
122
+
123
+#define E0_STEP_PIN         1
124
+#define E0_DIR_PIN          0
125
+#define E0_ENABLE_PIN      14
126
+
127
+//
128
+// Temperature Sensors
129
+//
130
+#define TEMP_0_PIN          7  // Analog Input (pin 33 extruder)
131
+#define TEMP_BED_PIN        6  // Analog Input (pin 34 bed)
132
+
133
+//
134
+// Heaters / Fans
135
+//
136
+#define HEATER_0_PIN       13  // (extruder)
137
+#define HEATER_BED_PIN     12  // (bed)
138
+#define FAN_PIN             4
139
+
140
+//
141
+// Misc. Functions
142
+//
143
+#define SDSS               31
144
+#define LED_PIN            -1
145
+
146
+/**
147
+ * LCD / Controller
148
+ *
149
+ * Only the following displays are supported:
150
+ *  ANET_KEYPAD_LCD
151
+ *  ANET_FULL_GRAPHICS_LCD
152
+ *  REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
153
+*/
154
+
155
+#if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
156
+  #define LCD_SDSS           28
157
+  #if ENABLED(ADC_KEYPAD)
158
+    #define SERVO0_PIN         27 // free for BLTouch/3D-Touch
159
+    #define LCD_PINS_RS        28
160
+    #define LCD_PINS_ENABLE    29
161
+    #define LCD_PINS_D4        10
162
+    #define LCD_PINS_D5        11
163
+    #define LCD_PINS_D6        16
164
+    #define LCD_PINS_D7        17
165
+    #define BTN_EN1            -1
166
+    #define BTN_EN2            -1
167
+    #define BTN_ENC            -1
168
+    #define ADC_KEYPAD_PIN      1
169
+    #define ENCODER_FEEDRATE_DEADZONE 2
170
+  #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) || ENABLED(ANET_FULL_GRAPHICS_LCD)
171
+    // Pin definitions for the Anet A6 Full Graphics display and the RepRapDiscount Full Graphics
172
+    // display using an adapter board  // https://go.aisler.net/benlye/anet-lcd-adapter/pcb
173
+    // See below for alternative pin definitions for use with https://www.thingiverse.com/thing:2103748
174
+    #define SERVO0_PIN         29 // free for BLTouch/3D-Touch
175
+    #define BEEPER_PIN         17
176
+    #define LCD_PINS_RS        27
177
+    #define LCD_PINS_ENABLE    28
178
+    #define LCD_PINS_D4        30
179
+    #define BTN_EN1            11
180
+    #define BTN_EN2            10
181
+    #define BTN_ENC            16
182
+    #define ST7920_DELAY_1 DELAY_0_NOP
183
+    #define ST7920_DELAY_2 DELAY_1_NOP
184
+    #define ST7920_DELAY_3 DELAY_2_NOP
185
+    #ifndef ENCODER_STEPS_PER_MENU_ITEM
186
+      #define ENCODER_STEPS_PER_MENU_ITEM 1
187
+    #endif
188
+    #ifndef ENCODER_PULSES_PER_STEP
189
+      #define ENCODER_PULSES_PER_STEP 4
190
+    #endif
191
+  #endif
192
+#endif  // ULTRA_LCD && NEWPANEL
193
+
194
+/**
195
+ * ====================================================================
196
+ * =============== Alternative RepRapDiscount Wiring ==================
197
+ * ====================================================================
198
+ *
199
+ * An alternative wiring scheme for the RepRapDiscount Full Graphics Display is
200
+ * published by oderwat on Thingiverse at https://www.thingiverse.com/thing:2103748.
201
+ *
202
+ * Using that adapter requires changing the pin definition as follows:
203
+ *   #define SERVO0_PIN        27 // free for BLTouch/3D-Touch
204
+ *   #define BEEPER_PIN        28
205
+ *   #define LCD_PINS_RS       30
206
+ *   #define LCD_PINS_ENABLE   29
207
+ *   #define LCD_PINS_D4       17
208
+ *
209
+ * The BLTouch pin becomes LCD:3
210
+ */
211
+
212
+/**
213
+ * ====================================================================
214
+ * ===================== LCD PINOUTS ==================================
215
+ * ====================================================================
216
+ *
217
+ *   Anet V1.0 controller           | ANET_KEYPAD_LCD   | ANET_FULL_      | RepRapDiscount Full      | Thingiverse RepRap wiring
218
+ *   physical   logical   alt       |                   | GRAPHICS_LCD    | Graphics Display Wiring  | http://www.thingiverse
219
+ *     pin        pin     functions |                   |                 |                          | .com/thing:2103748
220
+ *------------------------------------------------------------------------------------------------------------------------
221
+ *   ANET-J3.1    8 ***             | N/A               | J3_TX ***       |                          |
222
+ *   ANET-J3.2    9 ***             | N/A               | J3_RX ***       |                          |
223
+ *   ANET-J3.3    6       MISO      | N/A               | MISO ***        | EXP2.1   MISO            | EXP2.1   MISO
224
+ *   ANET-J3.4    +5V               | N/A               | +5V             |                          |
225
+ *   ANET-J3.5    7       SCK       | N/A               | SCK ***         | EXP2.2   SCK             | EXP2.2   SCK
226
+ *   ANET-J3.6    5       MOSI      | N/A               | MOSI ***        | EXP2.6   MOSI            | EXP2.6   MOSI
227
+ *   ANET-J3.7    !RESET            | N/A               | button          | EXP2.8   panel button    | EXP2.8   panel button
228
+ *   ANET-J3.8    GND               | N/A               | GND             | EXP2.9   GND             | EXP2.9   GND
229
+ *   ANET-J3.9    4       Don't use | N/A               | N/C             |                          |
230
+ *   ANET-J3.10   +3.3V             | N/A               | +3.3V ***       |                          |
231
+ *                                  |                   |                 |                          |
232
+ *                                  |                   |                 |                          |
233
+ *   ANET-LCD.1   GND               | GND               | GND             | EXP1.9   GND             | EXP1.9   GND
234
+ *   ANET-LCD.2   +5V               | +5V               | +5V             | EXP1.10  +5V             | EXP1.10  +5V
235
+ *   ANET-LCD.3   27      A4        | N/C *             | LCD_PINS_RS     | EXP1.4   LCD_PINS_RS     | EXP2.4   SDSS or N/C *
236
+ *   ANET-LCD.4   10                | LCD_PINS_D4       | BTN_EN2         | EXP2.3   BTN_EN2         | EXP2.3   BTN_EN2
237
+ *   ANET-LCD.5   28      A3        | LCD_PINS_RS       | LCD_PINS_ENABLE | EXP1.3   LCD_PINS_ENABLE | EXP1.1   BEEPER_PIN
238
+ *   ANET-LCD.6   11                | LCD_PINS_D5       | BTN_EN1         | EXP2.5   BTN_EN1         | EXP2.5   BTN_EN1
239
+ *   ANET-LCD.7   29      A2        | LCD_PINS_ENABLE   | N/C *           | EXP2.4   SDSS or N/C *   | EXP1.3   LCD_PINS_ENABLE
240
+ *   ANET-LCD.8   16      SCL       | LCD_PINS_D6       | BTN_ENC         | EXP1.2   BTN_ENC         | EXP1.2   BTN_ENC
241
+ *   ANET-LCD.9   30      A1        | ADC_KEYPAD_PIN ** | LCD_PINS_D4     | EXP1.5   LCD_PINS_D4     | EXP1.4   LCD_PINS_RS
242
+ *   ANET-LCD.10  17      SDA       | LCD_PINS_D7       | BEEPER_PIN      | EXP1.1   BEEPER_PIN      | EXP1.5   LCD_PINS_D4
243
+ *
244
+ *                 N/C * - if not connected to the LCD can be used for BLTouch servo input
245
+ *                 ** - analog pin -WITHOUT a pullup
246
+ *                 *** - only connected to something if the Bluetooth module is populated
247
+ */
248
+
249
+/**
250
+ *   REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
251
+ *   physical pin  function
252
+ *   EXP1.1        BEEPER
253
+ *   EXP1.2        BTN_ENC
254
+ *   EXP1.3        LCD_PINS_ENABLE
255
+ *   EXP1.4        LCD_PINS_RS
256
+ *   EXP1.5        LCD_PINS_D4
257
+ *   EXP1.6        LCD_PINS_D5 (not used)
258
+ *   EXP1.7        LCD_PINS_D6 (not used)
259
+ *   EXP1.8        LCD_PINS_D7 (not used)
260
+ *   EXP1.9        GND
261
+ *   EXP1.10       VCC
262
+ *
263
+ *
264
+ *   EXP2.1        MISO
265
+ *   EXP2.2        SCK
266
+ *   EXP2.3        BTN_EN2
267
+ *   EXP2.4        SDSS
268
+ *   EXP2.5        BTN_EN1
269
+ *   EXP2.6        MOSI
270
+ *   EXP2.7        SD_DETECT_PIN
271
+ *   EXP2.8        button
272
+ *   EXP2.9        GND
273
+ *   EXP2.10       NC
274
+ */

+ 29
- 1
Marlin/temperature.cpp View File

212
   #endif
212
   #endif
213
 #endif
213
 #endif
214
 
214
 
215
+#if ENABLED(ADC_KEYPAD)
216
+  uint32_t Temperature::current_ADCKey_raw = 0;
217
+  uint8_t Temperature::ADCKey_count = 0;
218
+#endif
219
+
215
 #if HAS_PID_HEATING
220
 #if HAS_PID_HEATING
216
 
221
 
217
   void Temperature::PID_autotune(float temp, int hotend, int ncycles, bool set_result/*=false*/) {
222
   void Temperature::PID_autotune(float temp, int hotend, int ncycles, bool set_result/*=false*/) {
1625
   static uint8_t pwm_count = _BV(SOFT_PWM_SCALE);
1630
   static uint8_t pwm_count = _BV(SOFT_PWM_SCALE);
1626
   // avoid multiple loads of pwm_count
1631
   // avoid multiple loads of pwm_count
1627
   uint8_t pwm_count_tmp = pwm_count;
1632
   uint8_t pwm_count_tmp = pwm_count;
1633
+  #if ENABLED(ADC_KEYPAD)
1634
+    static unsigned int raw_ADCKey_value = 0;
1635
+  #endif
1628
 
1636
 
1629
   // Static members for each heater
1637
   // Static members for each heater
1630
   #if ENABLED(SLOW_PWM_HEATERS)
1638
   #if ENABLED(SLOW_PWM_HEATERS)
1997
           raw_filwidth_value -= (raw_filwidth_value >> 7); // Subtract 1/128th of the raw_filwidth_value
2005
           raw_filwidth_value -= (raw_filwidth_value >> 7); // Subtract 1/128th of the raw_filwidth_value
1998
           raw_filwidth_value += ((unsigned long)ADC << 7); // Add new ADC reading, scaled by 128
2006
           raw_filwidth_value += ((unsigned long)ADC << 7); // Add new ADC reading, scaled by 128
1999
         }
2007
         }
2000
-        break;
2008
+      break;
2001
     #endif
2009
     #endif
2002
 
2010
 
2011
+    #if ENABLED(ADC_KEYPAD)
2012
+      case Prepare_ADC_KEY:
2013
+        START_ADC(ADC_KEYPAD_PIN);
2014
+        break;
2015
+      case Measure_ADC_KEY:
2016
+        if (ADCKey_count < 16) {
2017
+          raw_ADCKey_value = ADC;
2018
+          if (raw_ADCKey_value > 900) {
2019
+            //ADC Key release
2020
+            ADCKey_count = 0;
2021
+            current_ADCKey_raw = 0;
2022
+          }
2023
+          else {
2024
+            current_ADCKey_raw += raw_ADCKey_value;
2025
+            ADCKey_count++;
2026
+          }
2027
+        }
2028
+        break;
2029
+    #endif // ADC_KEYPAD
2030
+
2003
     case StartupDelay: break;
2031
     case StartupDelay: break;
2004
 
2032
 
2005
   } // switch(adc_sensor_state)
2033
   } // switch(adc_sensor_state)

+ 8
- 0
Marlin/temperature.h View File

81
     Prepare_FILWIDTH,
81
     Prepare_FILWIDTH,
82
     Measure_FILWIDTH,
82
     Measure_FILWIDTH,
83
   #endif
83
   #endif
84
+  #if ENABLED(ADC_KEYPAD)
85
+    Prepare_ADC_KEY,
86
+    Measure_ADC_KEY,
87
+  #endif
84
   SensorsReady, // Temperatures ready. Delay the next round of readings to let ADC pins settle.
88
   SensorsReady, // Temperatures ready. Delay the next round of readings to let ADC pins settle.
85
   StartupDelay  // Startup, delay initial temp reading a tiny bit so the hardware can settle
89
   StartupDelay  // Startup, delay initial temp reading a tiny bit so the hardware can settle
86
 };
90
 };
272
     #endif
276
     #endif
273
 
277
 
274
   public:
278
   public:
279
+    #if ENABLED(ADC_KEYPAD)
280
+      static uint32_t current_ADCKey_raw;
281
+      static uint8_t ADCKey_count;
282
+    #endif
275
 
283
 
276
     /**
284
     /**
277
      * Instance Methods
285
      * Instance Methods

+ 113
- 7
Marlin/ultralcd.cpp View File

4021
 
4021
 
4022
   /**
4022
   /**
4023
    *
4023
    *
4024
-   * Handlers for RepRap World Keypad input
4024
+   * Handlers for Keypad input
4025
    *
4025
    *
4026
    */
4026
    */
4027
-  #if ENABLED(REPRAPWORLD_KEYPAD)
4027
+  #if ENABLED(ADC_KEYPAD)
4028
+
4029
+    inline void handle_adc_keypad() {
4030
+      static uint8_t adc_steps = 0;
4031
+      if (buttons_reprapworld_keypad) {
4032
+        adc_steps++;
4033
+        NOMORE(adc_steps, 20);
4034
+
4035
+        lcd_quick_feedback();
4036
+        lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
4037
+        return_to_status_ms = millis() + LCD_TIMEOUT_TO_STATUS;
4038
+        if (encoderDirection == -1) { // side effect which signals we are inside a menu
4039
+          if (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_DOWN)
4040
+            encoderPosition -= ENCODER_STEPS_PER_MENU_ITEM;
4041
+          else if (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_UP)
4042
+            encoderPosition += ENCODER_STEPS_PER_MENU_ITEM;
4043
+          else if (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_LEFT)
4044
+            menu_action_back();
4045
+          else if (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_RIGHT)
4046
+            // enqueue_and_echo_commands_P(PSTR("M0 Pause"));
4047
+            lcd_return_to_status();
4048
+        }
4049
+        else {
4050
+          const int8_t step = adc_steps > 19 ? 100 : adc_steps > 10 ? 10 : 1;
4051
+          if (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_DOWN)
4052
+            encoderPosition += ENCODER_PULSES_PER_STEP * step;
4053
+          else if (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_UP)
4054
+            encoderPosition -= ENCODER_PULSES_PER_STEP * step;
4055
+          else if (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_RIGHT)
4056
+            encoderPosition = 0;
4057
+        }
4058
+        #if ENABLED(ADC_KEYPAD_DEBUG)
4059
+          SERIAL_PROTOCOLLNPAIR("buttons_reprapworld_keypad = ", (uint32_t)buttons_reprapworld_keypad);
4060
+          SERIAL_PROTOCOLLNPAIR("encoderPosition = ", (uint32_t)encoderPosition);
4061
+        #endif
4062
+      }
4063
+      else if (!thermalManager.current_ADCKey_raw) {
4064
+        // reset stepping acceleration
4065
+        adc_steps = 0;
4066
+      }
4067
+    }
4068
+
4069
+  #elif ENABLED(REPRAPWORLD_KEYPAD)
4070
+
4028
     void _reprapworld_keypad_move(const AxisEnum axis, const int16_t dir) {
4071
     void _reprapworld_keypad_move(const AxisEnum axis, const int16_t dir) {
4029
       move_menu_scale = REPRAPWORLD_KEYPAD_MOVE_STEP;
4072
       move_menu_scale = REPRAPWORLD_KEYPAD_MOVE_STEP;
4030
       encoderPosition = dir;
4073
       encoderPosition = dir;
4135
       SET_INPUT_PULLUP(BTN_ENC);
4178
       SET_INPUT_PULLUP(BTN_ENC);
4136
     #endif
4179
     #endif
4137
 
4180
 
4138
-    #if ENABLED(REPRAPWORLD_KEYPAD)
4181
+    #if ENABLED(REPRAPWORLD_KEYPAD) && DISABLED(ADC_KEYPAD)
4139
       SET_OUTPUT(SHIFT_CLK);
4182
       SET_OUTPUT(SHIFT_CLK);
4140
       OUT_WRITE(SHIFT_LD, HIGH);
4183
       OUT_WRITE(SHIFT_LD, HIGH);
4141
       SET_INPUT_PULLUP(SHIFT_OUT);
4184
       SET_INPUT_PULLUP(SHIFT_OUT);
4315
         slow_buttons = lcd_implementation_read_slow_buttons(); // buttons which take too long to read in interrupt context
4358
         slow_buttons = lcd_implementation_read_slow_buttons(); // buttons which take too long to read in interrupt context
4316
       #endif
4359
       #endif
4317
 
4360
 
4318
-      #if ENABLED(REPRAPWORLD_KEYPAD)
4361
+      #if ENABLED(ADC_KEYPAD)
4362
+
4363
+        handle_adc_keypad();
4364
+
4365
+      #elif ENABLED(REPRAPWORLD_KEYPAD)
4366
+
4319
         handle_reprapworld_keypad();
4367
         handle_reprapworld_keypad();
4368
+
4320
       #endif
4369
       #endif
4321
 
4370
 
4322
       bool encoderPastThreshold = (abs(encoderDiff) >= ENCODER_PULSES_PER_STEP);
4371
       bool encoderPastThreshold = (abs(encoderDiff) >= ENCODER_PULSES_PER_STEP);
4329
             if (encoderRateMultiplierEnabled) {
4378
             if (encoderRateMultiplierEnabled) {
4330
               int32_t encoderMovementSteps = abs(encoderDiff) / ENCODER_PULSES_PER_STEP;
4379
               int32_t encoderMovementSteps = abs(encoderDiff) / ENCODER_PULSES_PER_STEP;
4331
 
4380
 
4332
-              if (lastEncoderMovementMillis != 0) {
4381
+              if (lastEncoderMovementMillis) {
4333
                 // Note that the rate is always calculated between two passes through the
4382
                 // Note that the rate is always calculated between two passes through the
4334
                 // loop and that the abs of the encoderDiff value is tracked.
4383
                 // loop and that the abs of the encoderDiff value is tracked.
4335
-                float encoderStepRate = (float)(encoderMovementSteps) / ((float)(ms - lastEncoderMovementMillis)) * 1000.0;
4384
+                float encoderStepRate = float(encoderMovementSteps) / float(ms - lastEncoderMovementMillis) * 1000.0;
4336
 
4385
 
4337
                 if (encoderStepRate >= ENCODER_100X_STEPS_PER_SEC)     encoderMultiplier = 100;
4386
                 if (encoderStepRate >= ENCODER_100X_STEPS_PER_SEC)     encoderMultiplier = 100;
4338
                 else if (encoderStepRate >= ENCODER_10X_STEPS_PER_SEC) encoderMultiplier = 10;
4387
                 else if (encoderStepRate >= ENCODER_10X_STEPS_PER_SEC) encoderMultiplier = 10;
4402
               break;
4451
               break;
4403
           } // switch
4452
           } // switch
4404
         }
4453
         }
4454
+
4455
+      #if ENABLED(ADC_KEYPAD)
4456
+        buttons_reprapworld_keypad = 0;
4457
+      #endif
4458
+
4405
       #if ENABLED(ULTIPANEL)
4459
       #if ENABLED(ULTIPANEL)
4406
         #define CURRENTSCREEN() (*currentScreen)(), lcd_clicked = false
4460
         #define CURRENTSCREEN() (*currentScreen)(), lcd_clicked = false
4407
       #else
4461
       #else
4649
         #if ENABLED(LCD_HAS_SLOW_BUTTONS)
4703
         #if ENABLED(LCD_HAS_SLOW_BUTTONS)
4650
           buttons |= slow_buttons;
4704
           buttons |= slow_buttons;
4651
         #endif
4705
         #endif
4652
-        #if ENABLED(REPRAPWORLD_KEYPAD)
4706
+
4707
+        #if ENABLED(ADC_KEYPAD)
4708
+
4709
+          uint8_t newbutton_reprapworld_keypad = 0;
4710
+          buttons = 0;
4711
+          if (buttons_reprapworld_keypad == 0) {
4712
+            newbutton_reprapworld_keypad = get_ADC_keyValue();
4713
+            if (WITHIN(newbutton_reprapworld_keypad, 1, 8))
4714
+              buttons_reprapworld_keypad = _BV(newbutton_reprapworld_keypad - 1);
4715
+          }
4716
+
4717
+        #elif ENABLED(REPRAPWORLD_KEYPAD)
4718
+
4653
           GET_BUTTON_STATES(buttons_reprapworld_keypad);
4719
           GET_BUTTON_STATES(buttons_reprapworld_keypad);
4720
+
4654
         #endif
4721
         #endif
4722
+
4655
       #else
4723
       #else
4656
         GET_BUTTON_STATES(buttons);
4724
         GET_BUTTON_STATES(buttons);
4657
       #endif // !NEWPANEL
4725
       #endif // !NEWPANEL
4717
 
4785
 
4718
 #endif // ULTIPANEL
4786
 #endif // ULTIPANEL
4719
 
4787
 
4788
+#if ENABLED(ADC_KEYPAD)
4789
+
4790
+  typedef struct {
4791
+    uint16_t ADCKeyValueMin, ADCKeyValueMax;
4792
+    uint8_t  ADCKeyNo;
4793
+  } _stADCKeypadTable_;
4794
+
4795
+  static const _stADCKeypadTable_ stADCKeyTable[] = PROGMEM {
4796
+    // VALUE_MIN, VALUE_MAX, KEY
4797
+    { 4000, 4096, BLEN_REPRAPWORLD_KEYPAD_F1 + 1 },     // F1
4798
+    { 4000, 4096, BLEN_REPRAPWORLD_KEYPAD_F2 + 1 },     // F2
4799
+    { 4000, 4096, BLEN_REPRAPWORLD_KEYPAD_F3 + 1 },     // F3
4800
+    {  300,  500, BLEN_REPRAPWORLD_KEYPAD_LEFT + 1 },   // LEFT
4801
+    { 1900, 2200, BLEN_REPRAPWORLD_KEYPAD_RIGHT + 1 },  // RIGHT
4802
+    {  570,  870, BLEN_REPRAPWORLD_KEYPAD_UP + 1 },     // UP
4803
+    { 2670, 2870, BLEN_REPRAPWORLD_KEYPAD_DOWN + 1 },   // DOWN
4804
+    { 1150, 1450, BLEN_REPRAPWORLD_KEYPAD_MIDDLE + 1 }, // ENTER
4805
+  };
4806
+
4807
+  uint8_t get_ADC_keyValue(void) {
4808
+    if (thermalManager.ADCKey_count >= 16) {
4809
+      const uint16_t currentkpADCValue = thermalManager.current_ADCKey_raw >> 2;
4810
+      #if ENABLED(ADC_KEYPAD_DEBUG)
4811
+        SERIAL_PROTOCOLLN(currentkpADCValue);
4812
+      #endif
4813
+      thermalManager.current_ADCKey_raw = 0;
4814
+      thermalManager.ADCKey_count = 0;
4815
+      if (currentkpADCValue < 4000)
4816
+        for (uint8_t i = 0; i < ADC_KEY_NUM; i++) {
4817
+          const uint16_t lo = pgm_read_word(&stADCKeyTable[i].ADCKeyValueMin),
4818
+                         hi = pgm_read_word(&stADCKeyTable[i].ADCKeyValueMax);
4819
+          if (WITHIN(currentkpADCValue, lo, hi)) return pgm_read_byte(&stADCKeyTable[i].ADCKeyNo);
4820
+        }
4821
+    }
4822
+    return 0;
4823
+  }
4824
+#endif
4825
+
4720
 #endif // ULTRA_LCD
4826
 #endif // ULTRA_LCD

+ 19
- 1
Marlin/ultralcd.h View File

57
     void dontExpireStatus();
57
     void dontExpireStatus();
58
   #endif
58
   #endif
59
 
59
 
60
+  #if ENABLED(ADC_KEYPAD)
61
+    uint8_t get_ADC_keyValue();
62
+  #endif
63
+
60
   #if ENABLED(DOGLCD)
64
   #if ENABLED(DOGLCD)
61
     extern uint16_t lcd_contrast;
65
     extern uint16_t lcd_contrast;
62
     void set_lcd_contrast(const uint16_t value);
66
     void set_lcd_contrast(const uint16_t value);
130
     #define REPRAPWORLD_KEYPAD_MOVE_Y_UP    (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_UP)
134
     #define REPRAPWORLD_KEYPAD_MOVE_Y_UP    (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_UP)
131
     #define REPRAPWORLD_KEYPAD_MOVE_X_LEFT  (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_LEFT)
135
     #define REPRAPWORLD_KEYPAD_MOVE_X_LEFT  (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_LEFT)
132
 
136
 
137
+    #if ENABLED(ADC_KEYPAD)
138
+      #define REPRAPWORLD_KEYPAD_MOVE_HOME  (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_F1)
139
+      #define KEYPAD_EN_C                   EN_REPRAPWORLD_KEYPAD_MIDDLE
140
+    #else
141
+      #define REPRAPWORLD_KEYPAD_MOVE_HOME  (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_MIDDLE)
142
+      #define KEYPAD_EN_C                   EN_REPRAPWORLD_KEYPAD_F1
143
+    #endif
144
+    #define REPRAPWORLD_KEYPAD_MOVE_MENU    (buttons_reprapworld_keypad & KEYPAD_EN_C)
145
+
146
+    #if BUTTON_EXISTS(ENC)
147
+      #define LCD_CLICKED ((buttons & EN_C) || REPRAPWORLD_KEYPAD_MOVE_MENU)
148
+    #else
149
+      #define LCD_CLICKED REPRAPWORLD_KEYPAD_MOVE_MENU
150
+    #endif
151
+
133
     #define REPRAPWORLD_KEYPAD_PRESSED      (buttons_reprapworld_keypad & ( \
152
     #define REPRAPWORLD_KEYPAD_PRESSED      (buttons_reprapworld_keypad & ( \
134
                                               EN_REPRAPWORLD_KEYPAD_F3 | \
153
                                               EN_REPRAPWORLD_KEYPAD_F3 | \
135
                                               EN_REPRAPWORLD_KEYPAD_F2 | \
154
                                               EN_REPRAPWORLD_KEYPAD_F2 | \
141
                                               EN_REPRAPWORLD_KEYPAD_LEFT) \
160
                                               EN_REPRAPWORLD_KEYPAD_LEFT) \
142
                                             )
161
                                             )
143
 
162
 
144
-    #define LCD_CLICKED ((buttons & EN_C) || (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_F1))
145
   #elif ENABLED(NEWPANEL)
163
   #elif ENABLED(NEWPANEL)
146
     #define LCD_CLICKED (buttons & EN_C)
164
     #define LCD_CLICKED (buttons & EN_C)
147
   #else
165
   #else

+ 6
- 1
buildroot/bin/build_marlin View File

1
 #!/usr/bin/env bash
1
 #!/usr/bin/env bash
2
 
2
 
3
-arduino --verify --board arduino:avr:mega:cpu=atmega2560 Marlin/Marlin.ino
3
+case "$#" in
4
+  0 ) BOARD=arduino:avr:mega:cpu=atmega2560 ;;
5
+  * ) BOARD=arduino:avr:$1 ;;
6
+esac
7
+
8
+arduino --verify --board $BOARD Marlin/Marlin.ino

+ 2
- 5
buildroot/bin/build_marlin_fail View File

1
 #!/usr/bin/env bash
1
 #!/usr/bin/env bash
2
 
2
 
3
-if arduino --verify --board arduino:avr:mega:cpu=atmega2560 Marlin/Marlin.ino ; then
4
-  return 1
5
-else
6
-  return 0
7
-fi
3
+build_marlin $@ && exit 0
4
+exit 1

Loading…
Cancel
Save