bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Test CR-10S with status and bootscreen

Browse Source 
Also fix use_example_configs
This commit is contained in:
Scott Lahteine
2018-07-06 21:10:09 -05:00
parent dde009efdf
commit b143441251
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.travis.yml
View File

@@ -84,7 +84,8 @@ script:
- opt_set TEMP_SENSOR_4 999 - opt_set TEMP_SENSOR_4 999
- opt_set TEMP_SENSOR_BED 1 - 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 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 - 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} - build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM}
# #
@@ -233,15 +234,10 @@ script:
#- opt_set_adv SDSORT_CACHE_NAMES true #- opt_set_adv SDSORT_CACHE_NAMES true
#- build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM} #- 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 - use_example_configs Creality/CR-10S
- opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT - opt_enable SHOW_CUSTOM_BOOTSCREEN
- 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
- build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM} - build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM}
# #
# REPRAPWORLD_KEYPAD # REPRAPWORLD_KEYPAD

6
buildroot/bin/use_example_configs
View File

@@ -5,5 +5,9 @@ restore_configs
cp Marlin/src/config/examples/"$@"/Configuration* Marlin/ cp Marlin/src/config/examples/"$@"/Configuration* Marlin/
if [ -f "Marlin/src/config/examples/$@/_Bootscreen.h" ]; then 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 fi