浏览代码

Fix SKR 1.4 LCD / ADC Keypad sanity-check (#18670)

ellensp 5 年前
父节点
当前提交
0223ca8abb
共有 2 个文件被更改,包括 10 次插入6 次删除
  1. 4
    0
      Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
  2. 6
    6
      Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h

+ 4
- 0
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h 查看文件

@@ -261,6 +261,10 @@
261 261
     #define LCD_PINS_ENABLE         EXPA1_03_PIN
262 262
     #define LCD_PINS_D4             EXPA1_05_PIN
263 263
 
264
+  #elif HAS_ADC_BUTTONS
265
+
266
+    #error "ADC BUTTONS do not work unmodifed on SKR 1.3, The ADC ports cannot take more than 3.3v."
267
+
264 268
   #else                                           // !CR10_STOCKDISPLAY
265 269
 
266 270
     #define LCD_PINS_RS             EXPA1_07_PIN

+ 6
- 6
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h 查看文件

@@ -250,7 +250,7 @@
250 250
     #define LCD_PINS_ENABLE                P1_23
251 251
     #define LCD_PINS_D4                    P1_21
252 252
 
253
-  #elif HAS_GRAPHICAL_LCD
253
+  #else
254 254
 
255 255
     #define BTN_ENC                        P0_28  // (58) open-drain
256 256
     #define LCD_PINS_RS                    P1_19
@@ -312,14 +312,14 @@
312 312
 
313 313
     #endif // !FYSETC_MINI_12864
314 314
 
315
-  #elif HAS_CHARACTER_LCD
316
-
317
-    #error "Character LCD not yet supported for SKR 1.4."
318
-
319
-  #endif
315
+  #endif // HAS_GRAPHICAL_LCD
320 316
 
321 317
 #endif // HAS_SPI_LCD
322 318
 
319
+#if HAS_ADC_BUTTONS
320
+  #error "ADC BUTTONS do not work unmodifed on SKR 1.4, The ADC ports cannot take more than 3.3v."
321
+#endif
322
+
323 323
 //
324 324
 // Neopixel LED
325 325
 //

正在加载...
取消
保存