Merge upstream changes from Marlin 2.1.2.2
This commit is contained in:
@@ -10,11 +10,9 @@ set -e
|
||||
# Build with ESP3D WiFi, OTA and custom WIFI commands support
|
||||
#
|
||||
restore_configs
|
||||
opt_set MOTHERBOARD BOARD_MKS_TINYBEE TX_BUFFER_SIZE 64 \
|
||||
WIFI_SSID '"ssid"' WIFI_PWD '"password"' \
|
||||
SERIAL_PORT_2 -1 BAUDRATE_2 250000
|
||||
opt_enable ESP3D_WIFISUPPORT WEBSUPPORT OTASUPPORT WIFI_CUSTOM_COMMAND
|
||||
exec_test $1 "$2" "MKS TinyBee with ESP3D_WIFISUPPORT" "$3"
|
||||
opt_set MOTHERBOARD BOARD_MKS_TINYBEE TX_BUFFER_SIZE 64 SERIAL_PORT_2 -1 BAUDRATE_2 250000
|
||||
opt_enable ESP3D_WIFISUPPORT
|
||||
exec_test $1 $2 "MKS TinyBee with ESP3D_WIFISUPPORT" "$3"
|
||||
|
||||
#
|
||||
# Build with LCD, SD support and Speaker support
|
||||
@@ -25,8 +23,8 @@ opt_set MOTHERBOARD BOARD_MKS_TINYBEE \
|
||||
LCD_INFO_SCREEN_STYLE 0 \
|
||||
DISPLAY_CHARSET_HD44780 WESTERN \
|
||||
NEOPIXEL_TYPE NEO_RGB
|
||||
opt_enable FYSETC_MINI_12864_2_1 SDSUPPORT
|
||||
opt_enable LED_CONTROL_MENU LED_USER_PRESET_STARTUP LED_COLOR_PRESETS NEOPIXEL_LED
|
||||
opt_enable FYSETC_MINI_12864_2_1 SDSUPPORT NO_SD_AUTOSTART \
|
||||
NEOPIXEL_LED LED_CONTROL_MENU LED_USER_PRESET_STARTUP LED_COLOR_PRESETS
|
||||
exec_test $1 $2 "MKS TinyBee with NeoPixel LCD, SD and Speaker" "$3"
|
||||
|
||||
# cleanup
|
||||
|
Reference in New Issue
Block a user