Browse Source

[2.0.x] Update LPC176x tests, fix clean script (#11617)

Chris Pepper 6 years ago
parent
commit
b71c2b8651

+ 14
- 14
Marlin/src/pins/pins.h View File

@@ -277,33 +277,33 @@
277 277
 //
278 278
 
279 279
 #elif MB(RAMPS_14_RE_ARM_EFB)
280
-  #include "pins_RAMPS_RE_ARM.h"      // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
280
+  #include "pins_RAMPS_RE_ARM.h"      // LPC1768                                    env:LPC1768
281 281
 #elif MB(RAMPS_14_RE_ARM_EEB)
282
-  #include "pins_RAMPS_RE_ARM.h"      // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
282
+  #include "pins_RAMPS_RE_ARM.h"      // LPC1768                                    env:LPC1768
283 283
 #elif MB(RAMPS_14_RE_ARM_EFF)
284
-  #include "pins_RAMPS_RE_ARM.h"      // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
284
+  #include "pins_RAMPS_RE_ARM.h"      // LPC1768                                    env:LPC1768
285 285
 #elif MB(RAMPS_14_RE_ARM_EEF)
286
-  #include "pins_RAMPS_RE_ARM.h"      // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
286
+  #include "pins_RAMPS_RE_ARM.h"      // LPC1768                                    env:LPC1768
287 287
 #elif MB(RAMPS_14_RE_ARM_SF)
288
-  #include "pins_RAMPS_RE_ARM.h"      // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
288
+  #include "pins_RAMPS_RE_ARM.h"      // LPC1768                                    env:LPC1768
289 289
 #elif MB(MKS_SBASE)
290
-  #include "pins_MKS_SBASE.h"         // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
290
+  #include "pins_MKS_SBASE.h"         // LPC1768                                    env:LPC1768
291 291
 #elif MB(AZSMZ_MINI)
292
-  #include "pins_AZSMZ_MINI.h"        // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
292
+  #include "pins_AZSMZ_MINI.h"        // LPC1768                                    env:LPC1768
293 293
 #elif MB(AZTEEG_X5_GT)
294
-  #include "pins_AZTEEG_X5_GT.h"      // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
294
+  #include "pins_AZTEEG_X5_GT.h"      // LPC1769                                    env:LPC1768
295 295
 #elif MB(AZTEEG_X5_MINI_WIFI)
296
-  #include "pins_AZTEEG_X5_MINI_WIFI.h" // LPC176x                                  env:LPC1768 env:LPC1768_debug_and_upload
296
+  #include "pins_AZTEEG_X5_MINI_WIFI.h" // LPC1769                                  env:LPC1768
297 297
 #elif MB(BIQU_BQ111_A4)
298
-  #include "pins_BIQU_BQ111_A4.h"     // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
298
+  #include "pins_BIQU_BQ111_A4.h"     // LPC1768                                    env:LPC1768
299 299
 #elif MB(SELENA_COMPACT)
300
-  #include "pins_SELENA_COMPACT.h"    // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
300
+  #include "pins_SELENA_COMPACT.h"    // LPC1768                                    env:LPC1768
301 301
 #elif MB(COHESION3D_REMIX)
302
-  #include "pins_COHESION3D_REMIX.h"  // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
302
+  #include "pins_COHESION3D_REMIX.h"  // LPC1769                                    env:LPC1768
303 303
 #elif MB(COHESION3D_MINI)
304
-  #include "pins_COHESION3D_MINI.h"   // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
304
+  #include "pins_COHESION3D_MINI.h"   // LPC1769                                    env:LPC1768
305 305
 #elif MB(SMOOTHIEBOARD)
306
-  #include "pins_SMOOTHIEBOARD.h"     // LPC176x                                    env:LPC1768 env:LPC1768_debug_and_upload
306
+  #include "pins_SMOOTHIEBOARD.h"     // LPC1769                                    env:LPC1768
307 307
 
308 308
 //
309 309
 // Other 32-bit Boards

+ 7
- 9
buildroot/bin/env_clean View File

@@ -1,13 +1,11 @@
1 1
 #!/usr/bin/env bash
2 2
 
3
-[ -d ".pioenvs" ] && rm -r .pioenvs
4
-[ -d ".piolibdeps" ] && rm -r .piolibdeps
5
-[ -d ".piolib" ] && rm -r .piolib
3
+rm -rf .pioenvs
4
+rm -rf .piolibdeps
5
+rm -rf .piolib
6 6
 
7
-if [ ! -z "$1" ]; then
8
-  if [ $1 = "--deep" ]; then
9
-    [ -d "~/.platformio/packages" ] && rm -r ~/.platformio/packages/*
10
-    [ -d "~/.platformio/platforms" ] && rm -r ~/.platformio/platforms/*
11
-    [ -d "~/.platformio/.cache" ] && rm -r ~/.platformio/.cache/*
12
-  fi
7
+if [[ $1 = "--deep" ]]; then
8
+  rm -rf ~/.platformio/packages/*
9
+  rm -rf ~/.platformio/platforms/*
10
+  rm -rf ~/.platformio/.cache/*
13 11
 fi

+ 46
- 3
buildroot/share/tests/LPC1768_tests View File

@@ -10,12 +10,55 @@ exec_test $1 $2 "Build Re-ARM Default Configuration"
10 10
 restore_configs
11 11
 opt_set MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EFB
12 12
 opt_enable VIKI2 SDSUPPORT
13
-exec_test $1 $2 "VIKI2 and SDSUPPORT"
13
+exec_test $1 $2 "ReARM EFB VIKI2 and SDSUPPORT"
14
+
15
+restore_configs
16
+use_example_configs Mks/Sbase
17
+exec_test $1 $2 "MKS SBASE Example Config"
18
+
19
+restore_configs
20
+use_example_configs Azteeg/X5GT
21
+exec_test $1 $2 "Azteeg X5GT Example Config"
22
+
23
+restore_configs
24
+opt_set MOTHERBOARD BOARD_MKS_SBASE
25
+opt_set EXTRUDERS 2
26
+opt_enable NUM_SERVOS
27
+opt_set NUM_SERVOS 1
28
+opt_enable SWITCHING_EXTRUDER ULTIMAKERCONTROLLER
29
+exec_test $1 $2 "MKS_SBASE SWITCHING_EXTRUDER"
30
+
31
+restore_configs
32
+opt_set MOTHERBOARD BOARD_MKS_SBASE
33
+opt_set EXTRUDERS 2
34
+opt_set TEMP_SENSOR_0 1
35
+opt_set TEMP_SENSOR_1 5
36
+opt_set TEMP_SENSOR_BED 1
37
+opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT
38
+opt_enable FILAMENT_WIDTH_SENSOR FILAMENT_LCD_DISPLAY
39
+opt_enable FIX_MOUNTED_PROBE Z_SAFE_HOMING AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE
40
+opt_enable BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET BABYSTEP_ZPROBE_GFX_OVERLAY
41
+opt_enable PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE SLOW_PWM_HEATERS PIDTEMPBED EEPROM_SETTINGS INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT
42
+opt_enable_adv ADVANCED_PAUSE_FEATURE LCD_INFO_MENU ARC_SUPPORT BEZIER_CURVE_SUPPORT EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES SDCARD_SORT_ALPHA PARK_HEAD_ON_PAUSE
43
+opt_set GRID_MAX_POINTS_X 16
44
+exec_test $1 $2 "MKS SBASE Many Features"
14 45
 
15 46
 restore_configs
16 47
 opt_set MOTHERBOARD BOARD_MKS_SBASE
17
-opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS
18
-exec_test $1 $2 "MKS SBASE RRDFG SDSUPPORT EEPROM_SETTINGS"
48
+opt_enable COREYX
49
+opt_set_adv FAN_MIN_PWM 50
50
+opt_set_adv FAN_KICKSTART_TIME 100
51
+opt_set_adv XY_FREQUENCY_LIMIT  15
52
+opt_enable_adv SHOW_TEMP_ADC_VALUES HOME_Y_BEFORE_X EMERGENCY_PARSER FAN_KICKSTART_TIME
53
+opt_enable_adv ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED ADVANCED_OK
54
+opt_enable_adv VOLUMETRIC_DEFAULT_ON NO_WORKSPACE_OFFSETS ACTION_ON_KILL
55
+opt_enable_adv EXTRA_FAN_SPEED FWERETRACT Z_DUAL_STEPPER_DRIVERS Z_DUAL_ENDSTOPS
56
+opt_enable_adv MENU_ADDAUTOSTART SDCARD_SORT_ALPHA
57
+opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER BABYSTEPPING DAC_MOTOR_CURRENT_DEFAULT
58
+opt_enable FILAMENT_LCD_DISPLAY FILAMENT_WIDTH_SENSOR
59
+opt_enable FAN_SOFT_PWM SDSUPPORT
60
+opt_enable USE_XMAX_PLUG
61
+exec_test $1 $2 "MKS SBASE Many less common options"
19 62
 
20 63
 #clean up
21 64
 restore_configs

+ 7
- 1
buildroot/share/tests/start_tests View File

@@ -20,7 +20,13 @@ export -f exec_test
20 20
 
21 21
 env_backup
22 22
 printf "Running \033[0;32m$2\033[0m Tests\n"
23
-if [ $2 = "ALL" ]; then
23
+
24
+if [[ $3 = "--deep-clean" ]]; then
25
+  echo "Deleting all PlatformIO caches, downloads and installed packages..."
26
+  env_clean --deep
27
+fi
28
+
29
+if [[ $2 = "ALL" ]]; then
24 30
   dir_list=("$(dirname "${BASH_SOURCE[0]}")"/*)
25 31
   declare -a tests=(${dir_list[@]/*start_tests/})
26 32
   for f in "${tests[@]}"; do

Loading…
Cancel
Save