浏览代码

ZONESTAR_LCD warning for RAMPS / ReARM (#20702)

ellensp 4 年前
父节点
当前提交
107f692de8
没有帐户链接到提交者的电子邮件

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

325
   #define LCD_PINS_ENABLE                  P0_18  // J3-10 & AUX-3 (SID, MOSI)
325
   #define LCD_PINS_ENABLE                  P0_18  // J3-10 & AUX-3 (SID, MOSI)
326
   #define LCD_PINS_D4                      P2_06  // J3-8 & AUX-3 (SCK, CLK)
326
   #define LCD_PINS_D4                      P2_06  // J3-8 & AUX-3 (SCK, CLK)
327
 
327
 
328
+#elif ENABLED(ZONESTAR_LCD)
329
+
330
+  #error "CAUTION! ZONESTAR_LCD on REARM requires wiring modifications. NB. ADCs are not 5V tolerant. Comment out this line to continue."
331
+
328
 #elif IS_TFTGLCD_PANEL
332
 #elif IS_TFTGLCD_PANEL
329
 
333
 
330
   #if ENABLED(TFTGLCD_PANEL_SPI)
334
   #if ENABLED(TFTGLCD_PANEL_SPI)

+ 1
- 0
Marlin/src/pins/ramps/pins_RAMPS.h 查看文件

468
 
468
 
469
     #elif ENABLED(ZONESTAR_LCD)
469
     #elif ENABLED(ZONESTAR_LCD)
470
 
470
 
471
+      #error "CAUTION! ZONESTAR_LCD on RAMPS requires wiring modifications. It plugs into AUX2 but GND and 5V need to be swapped. Comment out this line to continue."
471
       #define LCD_PINS_RS                     64
472
       #define LCD_PINS_RS                     64
472
       #define LCD_PINS_ENABLE                 44
473
       #define LCD_PINS_ENABLE                 44
473
       #define LCD_PINS_D4                     63
474
       #define LCD_PINS_D4                     63

+ 1
- 1
buildroot/tests/mega2560-tests 查看文件

72
 opt_set TEMP_SENSOR_2 1
72
 opt_set TEMP_SENSOR_2 1
73
 opt_set TEMP_SENSOR_3 1
73
 opt_set TEMP_SENSOR_3 1
74
 opt_set TEMP_SENSOR_4 1
74
 opt_set TEMP_SENSOR_4 1
75
-opt_enable ZONESTAR_LCD Z_PROBE_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE BOOT_MARLIN_LOGO_ANIMATED \
75
+opt_enable VIKI2 Z_PROBE_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE BOOT_MARLIN_LOGO_ANIMATED \
76
            AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS EEPROM_CHITCHAT M114_DETAIL \
76
            AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS EEPROM_CHITCHAT M114_DETAIL \
77
            NO_VOLUMETRICS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES AUTOTEMP G38_PROBE_TARGET JOYSTICK \
77
            NO_VOLUMETRICS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES AUTOTEMP G38_PROBE_TARGET JOYSTICK \
78
            DIRECT_STEPPING DETECT_BROKEN_ENDSTOP \
78
            DIRECT_STEPPING DETECT_BROKEN_ENDSTOP \

+ 8
- 1
buildroot/tests/sanguino1284p-tests 查看文件

7
 set -e
7
 set -e
8
 
8
 
9
 #
9
 #
10
-# Build with the default configurations
10
+# Start with default configurations...
11
 #
11
 #
12
 restore_configs
12
 restore_configs
13
 opt_set MOTHERBOARD BOARD_SANGUINOLOLU_12
13
 opt_set MOTHERBOARD BOARD_SANGUINOLOLU_12
16
 opt_set CONTROLLER_FAN_PIN 27
16
 opt_set CONTROLLER_FAN_PIN 27
17
 exec_test $1 $2 "Default Configuration | MINIPANAL | CONTROLLER_FAN" "$3"
17
 exec_test $1 $2 "Default Configuration | MINIPANAL | CONTROLLER_FAN" "$3"
18
 
18
 
19
+#
20
+# Start with default configurations...
21
+#
22
+restore_configs
23
+opt_set MOTHERBOARD BOARD_MELZI
24
+opt_enable ZONESTAR_LCD
25
+exec_test $1 $2 "Default Configuration | ZONESTAR_LCD " "$3"
19
 
26
 
20
 # clean up
27
 # clean up
21
 restore_configs
28
 restore_configs

正在加载...
取消
保存