3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-30 07:17:59 +00:00
Code Issues Releases Wiki Activity

ZONESTAR_LCD warning for RAMPS / ReARM (#20702)

Browse Source
This commit is contained in:
ellensp 2021-01-28 10:11:25 +13:00 committed by GitHub
parent a1019413f4
commit 107f692de8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
View File

@ -325,6 +325,10 @@
#define LCD_PINS_ENABLE P0_18 // J3-10 & AUX-3 (SID, MOSI) #define LCD_PINS_ENABLE P0_18 // J3-10 & AUX-3 (SID, MOSI)
#define LCD_PINS_D4 P2_06 // J3-8 & AUX-3 (SCK, CLK) #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 #elif IS_TFTGLCD_PANEL
#if ENABLED(TFTGLCD_PANEL_SPI) #if ENABLED(TFTGLCD_PANEL_SPI)

1
Marlin/src/pins/ramps/pins_RAMPS.h
View File

@ -468,6 +468,7 @@
#elif ENABLED(ZONESTAR_LCD) #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_RS 64
#define LCD_PINS_ENABLE 44 #define LCD_PINS_ENABLE 44
#define LCD_PINS_D4 63 #define LCD_PINS_D4 63

2
buildroot/tests/mega2560-tests
View File

@ -72,7 +72,7 @@ opt_set TEMP_SENSOR_1 1
opt_set TEMP_SENSOR_2 1 opt_set TEMP_SENSOR_2 1
opt_set TEMP_SENSOR_3 1 opt_set TEMP_SENSOR_3 1
opt_set TEMP_SENSOR_4 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 \ 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 \ NO_VOLUMETRICS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES AUTOTEMP G38_PROBE_TARGET JOYSTICK \
DIRECT_STEPPING DETECT_BROKEN_ENDSTOP \ DIRECT_STEPPING DETECT_BROKEN_ENDSTOP \

9
buildroot/tests/sanguino1284p-tests
View File

@ -7,7 +7,7 @@
set -e set -e
# #
# Build with the default configurations # Start with default configurations...
# #
restore_configs restore_configs
opt_set MOTHERBOARD BOARD_SANGUINOLOLU_12 opt_set MOTHERBOARD BOARD_SANGUINOLOLU_12
@ -16,6 +16,13 @@ opt_enable MINIPANEL USE_CONTROLLER_FAN CONTROLLER_FAN_EDITABLE
opt_set CONTROLLER_FAN_PIN 27 opt_set CONTROLLER_FAN_PIN 27
exec_test $1 $2 "Default Configuration | MINIPANAL | CONTROLLER_FAN" "$3" 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 # clean up
restore_configs restore_configs