Browse Source

Remove extra NEWPANEL settings in Conditionals_LCD.h

Scott Lahteine 7 years ago
parent
commit
ef90b49fff
1 changed files with 1 additions and 12 deletions
  1. 1
    12
      Marlin/src/inc/Conditionals_LCD.h

+ 1
- 12
Marlin/src/inc/Conditionals_LCD.h View File

34
 
34
 
35
     #define DOGLCD
35
     #define DOGLCD
36
     #define ULTIPANEL
36
     #define ULTIPANEL
37
-    #define NEWPANEL
38
     #define DEFAULT_LCD_CONTRAST 90
37
     #define DEFAULT_LCD_CONTRAST 90
39
     #define LCD_CONTRAST_MIN 60
38
     #define LCD_CONTRAST_MIN 60
40
     #define LCD_CONTRAST_MAX 140
39
     #define LCD_CONTRAST_MAX 140
43
 
42
 
44
     #define DOGLCD
43
     #define DOGLCD
45
     #define ULTIPANEL
44
     #define ULTIPANEL
46
-    #define NEWPANEL
47
     #define DEFAULT_LCD_CONTRAST 17
45
     #define DEFAULT_LCD_CONTRAST 17
48
     #define U8GLIB_ST7565_64128N
46
     #define U8GLIB_ST7565_64128N
49
 
47
 
51
 
49
 
52
     #define DOGLCD
50
     #define DOGLCD
53
     #define ULTIPANEL
51
     #define ULTIPANEL
54
-    #define NEWPANEL
55
     #define DEFAULT_LCD_CONTRAST 17
52
     #define DEFAULT_LCD_CONTRAST 17
56
 
53
 
57
   #elif ENABLED(ANET_KEYPAD_LCD)
54
   #elif ENABLED(ANET_KEYPAD_LCD)
102
 
99
 
103
     #define U8GLIB_SSD1306
100
     #define U8GLIB_SSD1306
104
     #define ULTIPANEL
101
     #define ULTIPANEL
105
-    #define NEWPANEL
106
     #define REVERSE_ENCODER_DIRECTION
102
     #define REVERSE_ENCODER_DIRECTION
107
     #define REVERSE_MENU_DIRECTION
103
     #define REVERSE_MENU_DIRECTION
108
 
104
 
111
     #define LCD_I2C_TYPE_PCA8574
107
     #define LCD_I2C_TYPE_PCA8574
112
     #define LCD_I2C_ADDRESS 0x27   // I2C Address of the port expander
108
     #define LCD_I2C_ADDRESS 0x27   // I2C Address of the port expander
113
     #define ULTIPANEL
109
     #define ULTIPANEL
114
-    #define NEWPANEL
115
 
110
 
116
   #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
111
   #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
117
 
112
 
118
     #define DOGLCD
113
     #define DOGLCD
119
     #define U8GLIB_ST7920
114
     #define U8GLIB_ST7920
120
     #define ULTIPANEL
115
     #define ULTIPANEL
121
-    #define NEWPANEL
122
 
116
 
123
   #endif
117
   #endif
124
 
118
 
143
    || ENABLED(G3D_PANEL)                        \
137
    || ENABLED(G3D_PANEL)                        \
144
    || ENABLED(RIGIDBOT_PANEL)
138
    || ENABLED(RIGIDBOT_PANEL)
145
     #define ULTIPANEL
139
     #define ULTIPANEL
146
-    #define NEWPANEL
147
   #endif
140
   #endif
148
 
141
 
149
   #if ENABLED(REPRAPWORLD_KEYPAD)
142
   #if ENABLED(REPRAPWORLD_KEYPAD)
165
     #define LCD_I2C_TYPE_PCF8575
158
     #define LCD_I2C_TYPE_PCF8575
166
     #define LCD_I2C_ADDRESS 0x27   // I2C Address of the port expander
159
     #define LCD_I2C_ADDRESS 0x27   // I2C Address of the port expander
167
     #define ULTIPANEL
160
     #define ULTIPANEL
168
-    #define NEWPANEL
169
 
161
 
170
   #elif ENABLED(LCD_I2C_PANELOLU2)
162
   #elif ENABLED(LCD_I2C_PANELOLU2)
171
 
163
 
175
     #define LCD_I2C_ADDRESS 0x20 // I2C Address of the port expander
167
     #define LCD_I2C_ADDRESS 0x20 // I2C Address of the port expander
176
     #define LCD_USE_I2C_BUZZER //comment out to disable buzzer on LCD
168
     #define LCD_USE_I2C_BUZZER //comment out to disable buzzer on LCD
177
     #define ULTIPANEL
169
     #define ULTIPANEL
178
-    #define NEWPANEL
179
 
170
 
180
   #elif ENABLED(LCD_I2C_VIKI)
171
   #elif ENABLED(LCD_I2C_VIKI)
181
 
172
 
191
     #define LCD_I2C_ADDRESS 0x20 // I2C Address of the port expander
182
     #define LCD_I2C_ADDRESS 0x20 // I2C Address of the port expander
192
     #define LCD_USE_I2C_BUZZER //comment out to disable buzzer on LCD (requires LiquidTWI2 v1.2.3 or later)
183
     #define LCD_USE_I2C_BUZZER //comment out to disable buzzer on LCD (requires LiquidTWI2 v1.2.3 or later)
193
     #define ULTIPANEL
184
     #define ULTIPANEL
194
-    #define NEWPANEL
195
 
185
 
196
     #define ENCODER_FEEDRATE_DEADZONE 4
186
     #define ENCODER_FEEDRATE_DEADZONE 4
197
 
187
 
237
   #if ENABLED(SAV_3DLCD)
227
   #if ENABLED(SAV_3DLCD)
238
     #define SR_LCD_2W_NL    // Non latching 2 wire shift register
228
     #define SR_LCD_2W_NL    // Non latching 2 wire shift register
239
     #define ULTIPANEL
229
     #define ULTIPANEL
240
-    #define NEWPANEL
241
   #endif
230
   #endif
242
 
231
 
243
   #if ENABLED(DOGLCD) // Change number of lines to match the DOG graphic display
232
   #if ENABLED(DOGLCD) // Change number of lines to match the DOG graphic display
250
   #endif
239
   #endif
251
 
240
 
252
   #if ENABLED(ULTIPANEL)
241
   #if ENABLED(ULTIPANEL)
253
-    #define NEWPANEL  //enable this if you have a click-encoder panel
242
+    #define NEWPANEL  // Disable this if you actually have no click-encoder panel
254
     #define ULTRA_LCD
243
     #define ULTRA_LCD
255
     #ifndef LCD_WIDTH
244
     #ifndef LCD_WIDTH
256
       #define LCD_WIDTH 20
245
       #define LCD_WIDTH 20

Loading…
Cancel
Save