Browse Source

Don't define IS_ULTIPANEL empty

Scott Lahteine 3 years ago
parent
commit
28a9708ddb
1 changed files with 21 additions and 21 deletions
  1. 21
    21
      Marlin/src/inc/Conditionals_LCD.h

+ 21
- 21
Marlin/src/inc/Conditionals_LCD.h View File

63
 #elif ENABLED(CARTESIO_UI)
63
 #elif ENABLED(CARTESIO_UI)
64
 
64
 
65
   #define DOGLCD
65
   #define DOGLCD
66
-  #define IS_ULTIPANEL
66
+  #define IS_ULTIPANEL 1
67
 
67
 
68
 #elif EITHER(DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE)
68
 #elif EITHER(DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE)
69
 
69
 
70
   #define IS_DWIN_MARLINUI 1
70
   #define IS_DWIN_MARLINUI 1
71
-  #define IS_ULTIPANEL
71
+  #define IS_ULTIPANEL 1
72
 
72
 
73
 #elif ENABLED(ZONESTAR_LCD)
73
 #elif ENABLED(ZONESTAR_LCD)
74
 
74
 
76
   #define IS_RRW_KEYPAD
76
   #define IS_RRW_KEYPAD
77
   #define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0
77
   #define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0
78
   #define ADC_KEY_NUM 8
78
   #define ADC_KEY_NUM 8
79
-  #define IS_ULTIPANEL
79
+  #define IS_ULTIPANEL 1
80
 
80
 
81
   // This helps to implement ADC_KEYPAD menus
81
   // This helps to implement ADC_KEYPAD menus
82
   #define REVERSE_MENU_DIRECTION
82
   #define REVERSE_MENU_DIRECTION
98
   #define IS_U8GLIB_SSD1306
98
   #define IS_U8GLIB_SSD1306
99
 
99
 
100
 #elif ENABLED(RADDS_DISPLAY)
100
 #elif ENABLED(RADDS_DISPLAY)
101
-  #define IS_ULTIPANEL
101
+  #define IS_ULTIPANEL 1
102
   #define ENCODER_PULSES_PER_STEP 2
102
   #define ENCODER_PULSES_PER_STEP 2
103
 
103
 
104
 #elif EITHER(ANET_FULL_GRAPHICS_LCD, BQ_LCD_SMART_CONTROLLER)
104
 #elif EITHER(ANET_FULL_GRAPHICS_LCD, BQ_LCD_SMART_CONTROLLER)
108
 #elif ANY(miniVIKI, VIKI2, ELB_FULL_GRAPHIC_CONTROLLER, AZSMZ_12864)
108
 #elif ANY(miniVIKI, VIKI2, ELB_FULL_GRAPHIC_CONTROLLER, AZSMZ_12864)
109
 
109
 
110
   #define DOGLCD
110
   #define DOGLCD
111
-  #define IS_ULTIPANEL
111
+  #define IS_ULTIPANEL 1
112
 
112
 
113
   #if ENABLED(miniVIKI)
113
   #if ENABLED(miniVIKI)
114
     #define U8GLIB_ST7565_64128N
114
     #define U8GLIB_ST7565_64128N
123
 #elif ENABLED(OLED_PANEL_TINYBOY2)
123
 #elif ENABLED(OLED_PANEL_TINYBOY2)
124
 
124
 
125
   #define IS_U8GLIB_SSD1306
125
   #define IS_U8GLIB_SSD1306
126
-  #define IS_ULTIPANEL
126
+  #define IS_ULTIPANEL 1
127
 
127
 
128
 #elif ENABLED(RA_CONTROL_PANEL)
128
 #elif ENABLED(RA_CONTROL_PANEL)
129
 
129
 
130
   #define LCD_I2C_TYPE_PCA8574
130
   #define LCD_I2C_TYPE_PCA8574
131
   #define LCD_I2C_ADDRESS 0x27   // I2C Address of the port expander
131
   #define LCD_I2C_ADDRESS 0x27   // I2C Address of the port expander
132
-  #define IS_ULTIPANEL
132
+  #define IS_ULTIPANEL 1
133
 
133
 
134
 #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
134
 #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
135
 
135
 
136
   #define DOGLCD
136
   #define DOGLCD
137
   #define U8GLIB_ST7920
137
   #define U8GLIB_ST7920
138
-  #define IS_ULTIPANEL
138
+  #define IS_ULTIPANEL 1
139
 
139
 
140
 #elif ENABLED(CR10_STOCKDISPLAY)
140
 #elif ENABLED(CR10_STOCKDISPLAY)
141
 
141
 
179
 
179
 
180
   #define FYSETC_MINI_12864
180
   #define FYSETC_MINI_12864
181
   #define DOGLCD
181
   #define DOGLCD
182
-  #define IS_ULTIPANEL
182
+  #define IS_ULTIPANEL 1
183
   #define LED_COLORS_REDUCE_GREEN
183
   #define LED_COLORS_REDUCE_GREEN
184
   #if ENABLED(PSU_CONTROL) && EITHER(FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1)
184
   #if ENABLED(PSU_CONTROL) && EITHER(FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1)
185
     #define LED_BACKLIGHT_TIMEOUT 10000
185
     #define LED_BACKLIGHT_TIMEOUT 10000
205
 
205
 
206
 #elif ENABLED(ULTI_CONTROLLER)
206
 #elif ENABLED(ULTI_CONTROLLER)
207
 
207
 
208
-  #define IS_ULTIPANEL
208
+  #define IS_ULTIPANEL 1
209
   #define U8GLIB_SSD1309
209
   #define U8GLIB_SSD1309
210
   #define LCD_RESET_PIN LCD_PINS_D6 //  This controller need a reset pin
210
   #define LCD_RESET_PIN LCD_PINS_D6 //  This controller need a reset pin
211
   #define ENCODER_PULSES_PER_STEP 2
211
   #define ENCODER_PULSES_PER_STEP 2
220
 #elif EITHER(TFTGLCD_PANEL_SPI, TFTGLCD_PANEL_I2C)
220
 #elif EITHER(TFTGLCD_PANEL_SPI, TFTGLCD_PANEL_I2C)
221
 
221
 
222
   #define IS_TFTGLCD_PANEL 1
222
   #define IS_TFTGLCD_PANEL 1
223
-  #define IS_ULTIPANEL                      // Note that IS_ULTIPANEL leads to HAS_WIRED_LCD
223
+  #define IS_ULTIPANEL 1                      // Note that IS_ULTIPANEL leads to HAS_WIRED_LCD
224
 
224
 
225
   #if ENABLED(SDSUPPORT) && DISABLED(LCD_PROGRESS_BAR)
225
   #if ENABLED(SDSUPPORT) && DISABLED(LCD_PROGRESS_BAR)
226
     #define LCD_PROGRESS_BAR
226
     #define LCD_PROGRESS_BAR
246
 #endif
246
 #endif
247
 
247
 
248
 #if EITHER(MAKRPANEL, MINIPANEL)
248
 #if EITHER(MAKRPANEL, MINIPANEL)
249
-  #define IS_ULTIPANEL
249
+  #define IS_ULTIPANEL 1
250
   #define DOGLCD
250
   #define DOGLCD
251
   #if ENABLED(MAKRPANEL)
251
   #if ENABLED(MAKRPANEL)
252
     #define U8GLIB_ST7565_64128N
252
     #define U8GLIB_ST7565_64128N
258
 #endif
258
 #endif
259
 
259
 
260
 #if ENABLED(OVERLORD_OLED)
260
 #if ENABLED(OVERLORD_OLED)
261
-  #define IS_ULTIPANEL
261
+  #define IS_ULTIPANEL 1
262
   #define U8GLIB_SH1106
262
   #define U8GLIB_SH1106
263
   /**
263
   /**
264
    * PCA9632 for buzzer and LEDs via i2c
264
    * PCA9632 for buzzer and LEDs via i2c
302
 
302
 
303
 // Basic Ultipanel-like displays
303
 // Basic Ultipanel-like displays
304
 #if ANY(ULTIMAKERCONTROLLER, REPRAP_DISCOUNT_SMART_CONTROLLER, G3D_PANEL, RIGIDBOT_PANEL, PANEL_ONE, U8GLIB_SH1106)
304
 #if ANY(ULTIMAKERCONTROLLER, REPRAP_DISCOUNT_SMART_CONTROLLER, G3D_PANEL, RIGIDBOT_PANEL, PANEL_ONE, U8GLIB_SH1106)
305
-  #define IS_ULTIPANEL
305
+  #define IS_ULTIPANEL 1
306
 #endif
306
 #endif
307
 
307
 
308
 // Einstart OLED has Cardinal nav via pins defined in pins_EINSTART-S.h
308
 // Einstart OLED has Cardinal nav via pins defined in pins_EINSTART-S.h
309
 #if ENABLED(U8GLIB_SH1106_EINSTART)
309
 #if ENABLED(U8GLIB_SH1106_EINSTART)
310
   #define DOGLCD
310
   #define DOGLCD
311
-  #define IS_ULTIPANEL
311
+  #define IS_ULTIPANEL 1
312
 #endif
312
 #endif
313
 
313
 
314
 // Compatibility
314
 // Compatibility
350
 
350
 
351
 #if TFT_SCALED_DOGLCD
351
 #if TFT_SCALED_DOGLCD
352
   #define DOGLCD
352
   #define DOGLCD
353
-  #define IS_ULTIPANEL
353
+  #define IS_ULTIPANEL 1
354
   #define DELAYED_BACKLIGHT_INIT
354
   #define DELAYED_BACKLIGHT_INIT
355
 #elif ENABLED(TFT_LVGL_UI)
355
 #elif ENABLED(TFT_LVGL_UI)
356
   #define DELAYED_BACKLIGHT_INIT
356
   #define DELAYED_BACKLIGHT_INIT
359
 // Color UI
359
 // Color UI
360
 #if ENABLED(TFT_COLOR_UI)
360
 #if ENABLED(TFT_COLOR_UI)
361
   #define HAS_GRAPHICAL_TFT 1
361
   #define HAS_GRAPHICAL_TFT 1
362
-  #define IS_ULTIPANEL
362
+  #define IS_ULTIPANEL 1
363
 #endif
363
 #endif
364
 
364
 
365
 /**
365
 /**
383
   #define LCD_I2C_TYPE_MCP23017
383
   #define LCD_I2C_TYPE_MCP23017
384
   #define LCD_I2C_ADDRESS 0x20 // I2C Address of the port expander
384
   #define LCD_I2C_ADDRESS 0x20 // I2C Address of the port expander
385
   #define LCD_USE_I2C_BUZZER   // Enable buzzer on LCD (optional)
385
   #define LCD_USE_I2C_BUZZER   // Enable buzzer on LCD (optional)
386
-  #define IS_ULTIPANEL
386
+  #define IS_ULTIPANEL 1
387
 
387
 
388
 #elif ENABLED(LCD_I2C_VIKI)
388
 #elif ENABLED(LCD_I2C_VIKI)
389
 
389
 
398
   #define LCD_I2C_TYPE_MCP23017
398
   #define LCD_I2C_TYPE_MCP23017
399
   #define LCD_I2C_ADDRESS 0x20 // I2C Address of the port expander
399
   #define LCD_I2C_ADDRESS 0x20 // I2C Address of the port expander
400
   #define LCD_USE_I2C_BUZZER   // Enable buzzer on LCD (requires LiquidTWI2 v1.2.3 or later)
400
   #define LCD_USE_I2C_BUZZER   // Enable buzzer on LCD (requires LiquidTWI2 v1.2.3 or later)
401
-  #define IS_ULTIPANEL
401
+  #define IS_ULTIPANEL 1
402
 
402
 
403
   #define ENCODER_FEEDRATE_DEADZONE 4
403
   #define ENCODER_FEEDRATE_DEADZONE 4
404
 
404
 
443
 // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/schematics#!shiftregister-connection
443
 // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/schematics#!shiftregister-connection
444
 #if ENABLED(FF_INTERFACEBOARD)
444
 #if ENABLED(FF_INTERFACEBOARD)
445
   #define SR_LCD_3W_NL    // Non latching 3 wire shift register
445
   #define SR_LCD_3W_NL    // Non latching 3 wire shift register
446
-  #define IS_ULTIPANEL
446
+  #define IS_ULTIPANEL 1
447
 #elif ENABLED(SAV_3DLCD)
447
 #elif ENABLED(SAV_3DLCD)
448
   #define SR_LCD_2W_NL    // Non latching 2 wire shift register
448
   #define SR_LCD_2W_NL    // Non latching 2 wire shift register
449
-  #define IS_ULTIPANEL
449
+  #define IS_ULTIPANEL 1
450
 #endif
450
 #endif
451
 
451
 
452
 #if ENABLED(IS_ULTIPANEL)
452
 #if ENABLED(IS_ULTIPANEL)

Loading…
Cancel
Save