Sfoglia il codice sorgente

Test CR-10S with status and bootscreen

Also fix use_example_configs
Scott Lahteine 6 anni fa
parent
commit
b143441251
2 ha cambiato i file con 10 aggiunte e 10 eliminazioni
  1. 5
    9
      .travis.yml
  2. 5
    1
      buildroot/bin/use_example_configs

+ 5
- 9
.travis.yml Vedi File

@@ -84,7 +84,8 @@ script:
84 84
   - opt_set TEMP_SENSOR_4 999
85 85
   - opt_set TEMP_SENSOR_BED 1
86 86
   - opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 DEBUG_LEVELING_FEATURE G26_MESH_EDITING ENABLE_LEVELING_FADE_HEIGHT SKEW_CORRECTION
87
-  - opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
87
+  - opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT
88
+  - opt_enable_adv SDCARD_SORT_ALPHA STATUS_MESSAGE_SCROLLING SCROLL_LONG_FILENAMES LIGHTWEIGHT_UI
88 89
   - opt_enable_adv CUSTOM_USER_MENUS I2C_POSITION_ENCODERS BABYSTEPPING BABYSTEP_XY LIN_ADVANCE NANODLP_Z_SYNC QUICK_HOME JUNCTION_DEVIATION
89 90
   - build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM}
90 91
   #
@@ -233,15 +234,10 @@ script:
233 234
   #- opt_set_adv SDSORT_CACHE_NAMES true
234 235
   #- build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM}
235 236
   #
236
-  # REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER with LIGHTWEIGHT_UI
237
+  # Test a full-featured CR-10S config
237 238
   #
238
-  - restore_configs
239
-  - opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT
240
-  - opt_enable_adv SDCARD_SORT_ALPHA STATUS_MESSAGE_SCROLLING SCROLL_LONG_FILENAMES LIGHTWEIGHT_UI
241
-  - opt_set_adv SDSORT_GCODE true
242
-  - opt_set_adv SDSORT_USES_RAM true
243
-  - opt_set_adv SDSORT_USES_STACK true
244
-  - opt_set_adv SDSORT_CACHE_NAMES true
239
+  - use_example_configs Creality/CR-10S
240
+  - opt_enable SHOW_CUSTOM_BOOTSCREEN
245 241
   - build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM}
246 242
   #
247 243
   # REPRAPWORLD_KEYPAD

+ 5
- 1
buildroot/bin/use_example_configs Vedi File

@@ -5,5 +5,9 @@ restore_configs
5 5
 cp Marlin/src/config/examples/"$@"/Configuration* Marlin/
6 6
 
7 7
 if [ -f "Marlin/src/config/examples/$@/_Bootscreen.h" ]; then
8
-  cp "Marlin/src/config/examples/$@/_Bootscreen.h" Marlin/src/config/
8
+  cp "Marlin/src/config/examples/$@/_Bootscreen.h" Marlin/
9
+fi
10
+
11
+if [ -f "Marlin/src/config/examples/$@/_Statusscreen.h" ]; then
12
+  cp "Marlin/src/config/examples/$@/_Statusscreen.h" Marlin/
9 13
 fi

Loading…
Annulla
Salva