Browse Source

🧑‍💻 IS_ULTRA_LCD => HAS_WIRED_LCD

Scott Lahteine 3 years ago
parent
commit
01bb11b415

+ 5
- 6
Marlin/src/inc/Conditionals_LCD.h View File

41
  *
41
  *
42
  *  DOGLCD                  : Run a Graphical LCD through U8GLib (with MarlinUI)
42
  *  DOGLCD                  : Run a Graphical LCD through U8GLib (with MarlinUI)
43
  *  IS_ULTIPANEL            : Define LCD_PINS_D5/6/7 for direct-connected "Ultipanel" LCDs
43
  *  IS_ULTIPANEL            : Define LCD_PINS_D5/6/7 for direct-connected "Ultipanel" LCDs
44
- *  IS_ULTRA_LCD            : Ultra LCD, not necessarily Ultipanel.
44
+ *  HAS_WIRED_LCD           : Ultra LCD, not necessarily Ultipanel.
45
  *  IS_RRD_SC               : Common RRD Smart Controller digital interface pins
45
  *  IS_RRD_SC               : Common RRD Smart Controller digital interface pins
46
  *  IS_RRD_FG_SC            : Common RRD Full Graphical Smart Controller digital interface pins
46
  *  IS_RRD_FG_SC            : Common RRD Full Graphical Smart Controller digital interface pins
47
  *  IS_U8GLIB_ST7920        : Most common DOGM display SPI interface, supporting a "lightweight" display mode.
47
  *  IS_U8GLIB_ST7920        : Most common DOGM display SPI interface, supporting a "lightweight" display mode.
48
  *  U8GLIB_SH1106           : SH1106 OLED with I2C interface via U8GLib
48
  *  U8GLIB_SH1106           : SH1106 OLED with I2C interface via U8GLib
49
  *  IS_U8GLIB_SSD1306       : SSD1306 OLED with I2C interface via U8GLib (U8GLIB_SSD1306)
49
  *  IS_U8GLIB_SSD1306       : SSD1306 OLED with I2C interface via U8GLib (U8GLIB_SSD1306)
50
- *  U8GLIB_SSD1309          : SSD1309 OLED with I2C interface via U8GLib (HAS_U8GLIB_I2C_OLED, IS_ULTRA_LCD, DOGLCD)
50
+ *  U8GLIB_SSD1309          : SSD1309 OLED with I2C interface via U8GLib (HAS_U8GLIB_I2C_OLED, HAS_WIRED_LCD, DOGLCD)
51
  *  IS_U8GLIB_ST7565_64128N : ST7565 128x64 LCD with SPI interface via U8GLib
51
  *  IS_U8GLIB_ST7565_64128N : ST7565 128x64 LCD with SPI interface via U8GLib
52
  *  IS_U8GLIB_LM6059_AF     : LM6059 with Hardware SPI via U8GLib
52
  *  IS_U8GLIB_LM6059_AF     : LM6059 with Hardware SPI via U8GLib
53
  */
53
  */
287
 // 128x64 I2C OLED LCDs - SSD1306/SSD1309/SH1106
287
 // 128x64 I2C OLED LCDs - SSD1306/SSD1309/SH1106
288
 #if ANY(U8GLIB_SSD1306, U8GLIB_SSD1309, U8GLIB_SH1106)
288
 #if ANY(U8GLIB_SSD1306, U8GLIB_SSD1309, U8GLIB_SH1106)
289
   #define HAS_U8GLIB_I2C_OLED 1
289
   #define HAS_U8GLIB_I2C_OLED 1
290
-  #define IS_ULTRA_LCD 1
290
+  #define HAS_WIRED_LCD 1
291
   #define DOGLCD
291
   #define DOGLCD
292
 #endif
292
 #endif
293
 
293
 
443
 #endif
443
 #endif
444
 
444
 
445
 #if EITHER(IS_ULTIPANEL, ULTRA_LCD)
445
 #if EITHER(IS_ULTIPANEL, ULTRA_LCD)
446
-  #define IS_ULTRA_LCD 1
446
+  #define HAS_WIRED_LCD 1
447
 #endif
447
 #endif
448
 
448
 
449
 #if EITHER(IS_ULTIPANEL, REPRAPWORLD_KEYPAD)
449
 #if EITHER(IS_ULTIPANEL, REPRAPWORLD_KEYPAD)
502
   #endif
502
   #endif
503
 #endif
503
 #endif
504
 
504
 
505
-#if IS_ULTRA_LCD
506
-  #define HAS_WIRED_LCD 1
505
+#if HAS_WIRED_LCD
507
   #if ENABLED(DOGLCD)
506
   #if ENABLED(DOGLCD)
508
     #define HAS_MARLINUI_U8GLIB 1
507
     #define HAS_MARLINUI_U8GLIB 1
509
   #elif IS_TFTGLCD_PANEL
508
   #elif IS_TFTGLCD_PANEL

+ 2
- 2
Marlin/src/pins/mega/pins_MEGATRONICS.h View File

106
 //
106
 //
107
 #define BEEPER_PIN                            33
107
 #define BEEPER_PIN                            33
108
 
108
 
109
-#if IS_ULTRA_LCD && IS_NEWPANEL
109
+#if HAS_WIRED_LCD && IS_NEWPANEL
110
 
110
 
111
   #define LCD_PINS_RS                         16
111
   #define LCD_PINS_RS                         16
112
   #define LCD_PINS_ENABLE                     17
112
   #define LCD_PINS_ENABLE                     17
122
 
122
 
123
   #define SD_DETECT_PIN                       -1  // RAMPS doesn't use this
123
   #define SD_DETECT_PIN                       -1  // RAMPS doesn't use this
124
 
124
 
125
-#endif // IS_ULTRA_LCD && IS_NEWPANEL
125
+#endif // HAS_WIRED_LCD && IS_NEWPANEL
126
 
126
 
127
 //
127
 //
128
 // M3/M4/M5 - Spindle/Laser Control
128
 // M3/M4/M5 - Spindle/Laser Control

+ 1
- 1
Marlin/src/pins/pins.h View File

61
   #endif
61
   #endif
62
 #endif
62
 #endif
63
 
63
 
64
-#if !(BOTH(IS_ULTRA_LCD, IS_NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, WYH_L12864, MINIPANEL, REPRAPWORLD_KEYPAD))
64
+#if !(BOTH(HAS_WIRED_LCD, IS_NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, WYH_L12864, MINIPANEL, REPRAPWORLD_KEYPAD))
65
   #define HAS_FREE_AUX2_PINS 1
65
   #define HAS_FREE_AUX2_PINS 1
66
 #endif
66
 #endif
67
 
67
 

+ 3
- 3
Marlin/src/pins/ramps/pins_3DRAG.h View File

111
     #define SPINDLE_LASER_PWM_PIN             46  // Hardware PWM
111
     #define SPINDLE_LASER_PWM_PIN             46  // Hardware PWM
112
     #define SPINDLE_LASER_ENA_PIN             62  // Pullup!
112
     #define SPINDLE_LASER_ENA_PIN             62  // Pullup!
113
     #define SPINDLE_DIR_PIN                   48
113
     #define SPINDLE_DIR_PIN                   48
114
-  #elif !BOTH(IS_ULTRA_LCD, IS_NEWPANEL)          // Use expansion header if no LCD in use
114
+  #elif !BOTH(HAS_WIRED_LCD, IS_NEWPANEL)          // Use expansion header if no LCD in use
115
     #define SPINDLE_LASER_ENA_PIN             16  // Pullup or pulldown!
115
     #define SPINDLE_LASER_ENA_PIN             16  // Pullup or pulldown!
116
     #define SPINDLE_DIR_PIN                   17
116
     #define SPINDLE_DIR_PIN                   17
117
     #if !NUM_SERVOS                               // Use servo connector if possible
117
     #if !NUM_SERVOS                               // Use servo connector if possible
135
 //
135
 //
136
 // LCD / Controller
136
 // LCD / Controller
137
 //
137
 //
138
-#if IS_ULTRA_LCD && IS_NEWPANEL
138
+#if HAS_WIRED_LCD && IS_NEWPANEL
139
   #undef BEEPER_PIN
139
   #undef BEEPER_PIN
140
 
140
 
141
   // TODO: Remap EXP1/2 based on adapter
141
   // TODO: Remap EXP1/2 based on adapter
164
 
164
 
165
   #define BEEPER_PIN                          33
165
   #define BEEPER_PIN                          33
166
 
166
 
167
-#endif // IS_ULTRA_LCD && IS_NEWPANEL
167
+#endif // HAS_WIRED_LCD && IS_NEWPANEL
168
 
168
 
169
 #if IS_U8GLIB_ST7920
169
 #if IS_U8GLIB_ST7920
170
   #define BOARD_ST7920_DELAY_1                 0
170
   #define BOARD_ST7920_DELAY_1                 0

+ 1
- 1
Marlin/src/pins/ramps/pins_FELIX2.h View File

49
 //
49
 //
50
 // LCD / Controller
50
 // LCD / Controller
51
 //
51
 //
52
-#if IS_ULTRA_LCD && IS_NEWPANEL
52
+#if HAS_WIRED_LCD && IS_NEWPANEL
53
 
53
 
54
   #define SD_DETECT_PIN                       6
54
   #define SD_DETECT_PIN                       6
55
 
55
 

+ 1
- 1
Marlin/src/pins/ramps/pins_K8600.h View File

69
 //
69
 //
70
 // LCD / Controller
70
 // LCD / Controller
71
 //
71
 //
72
-#if IS_ULTRA_LCD && IS_NEWPANEL
72
+#if HAS_WIRED_LCD && IS_NEWPANEL
73
   #undef BEEPER_PIN
73
   #undef BEEPER_PIN
74
 
74
 
75
   #undef LCD_PINS_RS
75
   #undef LCD_PINS_RS

+ 1
- 1
Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h View File

172
   #define LCD_PINS_D6                         32
172
   #define LCD_PINS_D6                         32
173
   #define LCD_PINS_D7                         30
173
   #define LCD_PINS_D7                         30
174
 
174
 
175
-#elif BOTH(BOARD_REV_1_5, IS_ULTRA_LCD)
175
+#elif BOTH(BOARD_REV_1_5, HAS_WIRED_LCD)
176
 
176
 
177
   #define BEEPER_PIN                          18
177
   #define BEEPER_PIN                          18
178
 
178
 

+ 2
- 2
Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h View File

135
   #define LCD_BACKLIGHT_PIN                   17  // LCD backlight LED
135
   #define LCD_BACKLIGHT_PIN                   17  // LCD backlight LED
136
 #endif
136
 #endif
137
 
137
 
138
-#if !HAS_CUTTER && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(IS_ULTRA_LCD, IS_NEWPANEL) // try to use IO Header
138
+#if !HAS_CUTTER && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(HAS_WIRED_LCD, IS_NEWPANEL) // try to use IO Header
139
   #define CASE_LIGHT_PIN                       4  // Hardware PWM  - see if IO Header is available
139
   #define CASE_LIGHT_PIN                       4  // Hardware PWM  - see if IO Header is available
140
 #endif
140
 #endif
141
 
141
 
268
 // M3/M4/M5 - Spindle/Laser Control
268
 // M3/M4/M5 - Spindle/Laser Control
269
 //
269
 //
270
 #if HAS_CUTTER
270
 #if HAS_CUTTER
271
-  #if !MB(AZTEEG_X1) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(IS_ULTRA_LCD, IS_NEWPANEL) // try to use IO Header
271
+  #if !MB(AZTEEG_X1) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(HAS_WIRED_LCD, IS_NEWPANEL) // try to use IO Header
272
 
272
 
273
     #define SPINDLE_LASER_ENA_PIN             10  // Pullup or pulldown!
273
     #define SPINDLE_LASER_ENA_PIN             10  // Pullup or pulldown!
274
     #define SPINDLE_LASER_PWM_PIN              4  // Hardware PWM
274
     #define SPINDLE_LASER_PWM_PIN              4  // Hardware PWM

+ 2
- 2
Marlin/src/pins/teensy2/pins_PRINTRBOARD.h View File

121
 //
121
 //
122
 // LCD / Controller
122
 // LCD / Controller
123
 //
123
 //
124
-#if IS_ULTRA_LCD && IS_NEWPANEL
124
+#if HAS_WIRED_LCD && IS_NEWPANEL
125
 
125
 
126
   #define LCD_PINS_RS                          9  // E1       JP11-11
126
   #define LCD_PINS_RS                          9  // E1       JP11-11
127
   #define LCD_PINS_ENABLE                      8  // E0       JP11-10
127
   #define LCD_PINS_ENABLE                      8  // E0       JP11-10
163
 
163
 
164
   #endif
164
   #endif
165
 
165
 
166
-#endif // IS_ULTRA_LCD && IS_NEWPANEL
166
+#endif // HAS_WIRED_LCD && IS_NEWPANEL
167
 
167
 
168
 #ifndef SDSS
168
 #ifndef SDSS
169
   #define SDSS                                26  // B6 SDCS
169
   #define SDSS                                26  // B6 SDCS

+ 2
- 2
Marlin/src/pins/teensy2/pins_TEENSYLU.h View File

145
 //
145
 //
146
 // LCD / Controller
146
 // LCD / Controller
147
 //
147
 //
148
-#if IS_ULTRA_LCD && IS_NEWPANEL
148
+#if HAS_WIRED_LCD && IS_NEWPANEL
149
 
149
 
150
   #define BEEPER_PIN                          -1
150
   #define BEEPER_PIN                          -1
151
 
151
 
158
 
158
 
159
   #define SD_DETECT_PIN                       -1
159
   #define SD_DETECT_PIN                       -1
160
 
160
 
161
-#endif // IS_ULTRA_LCD && IS_NEWPANEL
161
+#endif // HAS_WIRED_LCD && IS_NEWPANEL
162
 
162
 
163
 //
163
 //
164
 // M3/M4/M5 - Spindle/Laser Control
164
 // M3/M4/M5 - Spindle/Laser Control

Loading…
Cancel
Save