Skip to content

Commit

Permalink
ZONESTAR_LCD warning for RAMPS / ReARM (MarlinFirmware#20702)
Browse files Browse the repository at this point in the history
  • Loading branch information
ellensp authored and W4tel-BiDi committed Apr 5, 2021
1 parent caecbf0 commit f626de9
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 2 deletions.
4 changes: 4 additions & 0 deletions Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,10 @@
#define LCD_PINS_ENABLE P0_18 // J3-10 & AUX-3 (SID, MOSI)
#define LCD_PINS_D4 P2_06 // J3-8 & AUX-3 (SCK, CLK)

#elif ENABLED(ZONESTAR_LCD)

#error "CAUTION! ZONESTAR_LCD on REARM requires wiring modifications. NB. ADCs are not 5V tolerant. Comment out this line to continue."

#elif IS_TFTGLCD_PANEL

#if ENABLED(TFTGLCD_PANEL_SPI)
Expand Down
1 change: 1 addition & 0 deletions Marlin/src/pins/ramps/pins_RAMPS.h
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,7 @@

#elif ENABLED(ZONESTAR_LCD)

#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."
#define LCD_PINS_RS 64
#define LCD_PINS_ENABLE 44
#define LCD_PINS_D4 63
Expand Down
2 changes: 1 addition & 1 deletion buildroot/tests/mega2560-tests
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ opt_set TEMP_SENSOR_1 1
opt_set TEMP_SENSOR_2 1
opt_set TEMP_SENSOR_3 1
opt_set TEMP_SENSOR_4 1
opt_enable ZONESTAR_LCD Z_PROBE_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE BOOT_MARLIN_LOGO_ANIMATED \
opt_enable VIKI2 Z_PROBE_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE BOOT_MARLIN_LOGO_ANIMATED \
AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS EEPROM_CHITCHAT M114_DETAIL \
NO_VOLUMETRICS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES AUTOTEMP G38_PROBE_TARGET JOYSTICK \
DIRECT_STEPPING DETECT_BROKEN_ENDSTOP \
Expand Down
9 changes: 8 additions & 1 deletion buildroot/tests/sanguino1284p-tests
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
set -e

#
# Build with the default configurations
# Start with default configurations...
#
restore_configs
opt_set MOTHERBOARD BOARD_SANGUINOLOLU_12
Expand All @@ -16,6 +16,13 @@ opt_enable MINIPANEL USE_CONTROLLER_FAN CONTROLLER_FAN_EDITABLE
opt_set CONTROLLER_FAN_PIN 27
exec_test $1 $2 "Default Configuration | MINIPANAL | CONTROLLER_FAN" "$3"

#
# Start with default configurations...
#
restore_configs
opt_set MOTHERBOARD BOARD_MELZI
opt_enable ZONESTAR_LCD
exec_test $1 $2 "Default Configuration | ZONESTAR_LCD " "$3"

# clean up
restore_configs

0 comments on commit f626de9

Please sign in to comment.