From b143441251bd15009a36a776cff7acb2f563c323 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 6 Jul 2018 21:10:09 -0500
Subject: [PATCH] Test CR-10S with status and bootscreen
Also fix use_example_configs
---
.travis.yml | 14 +++++---------
buildroot/bin/use_example_configs | 6 +++++-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 4d3bfebff6..fa7a76571c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -84,7 +84,8 @@ script:
- opt_set TEMP_SENSOR_4 999
- opt_set TEMP_SENSOR_BED 1
- opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 DEBUG_LEVELING_FEATURE G26_MESH_EDITING ENABLE_LEVELING_FADE_HEIGHT SKEW_CORRECTION
- - opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
+ - opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT
+ - opt_enable_adv SDCARD_SORT_ALPHA STATUS_MESSAGE_SCROLLING SCROLL_LONG_FILENAMES LIGHTWEIGHT_UI
- opt_enable_adv CUSTOM_USER_MENUS I2C_POSITION_ENCODERS BABYSTEPPING BABYSTEP_XY LIN_ADVANCE NANODLP_Z_SYNC QUICK_HOME JUNCTION_DEVIATION
- build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM}
#
@@ -233,15 +234,10 @@ script:
#- opt_set_adv SDSORT_CACHE_NAMES true
#- build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM}
#
- # REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER with LIGHTWEIGHT_UI
+ # Test a full-featured CR-10S config
#
- - restore_configs
- - opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT
- - opt_enable_adv SDCARD_SORT_ALPHA STATUS_MESSAGE_SCROLLING SCROLL_LONG_FILENAMES LIGHTWEIGHT_UI
- - opt_set_adv SDSORT_GCODE true
- - opt_set_adv SDSORT_USES_RAM true
- - opt_set_adv SDSORT_USES_STACK true
- - opt_set_adv SDSORT_CACHE_NAMES true
+ - use_example_configs Creality/CR-10S
+ - opt_enable SHOW_CUSTOM_BOOTSCREEN
- build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM}
#
# REPRAPWORLD_KEYPAD
diff --git a/buildroot/bin/use_example_configs b/buildroot/bin/use_example_configs
index 405f36b2a9..453c627bed 100755
--- a/buildroot/bin/use_example_configs
+++ b/buildroot/bin/use_example_configs
@@ -5,5 +5,9 @@ restore_configs
cp Marlin/src/config/examples/"$@"/Configuration* Marlin/
if [ -f "Marlin/src/config/examples/$@/_Bootscreen.h" ]; then
- cp "Marlin/src/config/examples/$@/_Bootscreen.h" Marlin/src/config/
+ cp "Marlin/src/config/examples/$@/_Bootscreen.h" Marlin/
+fi
+
+if [ -f "Marlin/src/config/examples/$@/_Statusscreen.h" ]; then
+ cp "Marlin/src/config/examples/$@/_Statusscreen.h" Marlin/
fi
--
GitLab