andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

pull/1/head
Chris Pepper 6 years ago
committed by Scott Lahteine
parent
a317bb4991
commit
b71c2b8651
4 changed files with 74 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      Marlin/src/pins/pins.h
  2. 16
      buildroot/bin/env_clean
  3. 49
      buildroot/share/tests/LPC1768_tests
  4. 8
      buildroot/share/tests/start_tests

28
Marlin/src/pins/pins.h
View File

@ -277,33 +277,33 @@
// //
#elif MB(RAMPS_14_RE_ARM_EFB) #elif MB(RAMPS_14_RE_ARM_EFB)
#include "pins_RAMPS_RE_ARM.h" // LPC176x env:LPC1768 env:LPC1768_debug_and_upload #include "pins_RAMPS_RE_ARM.h" // LPC1768 env:LPC1768
#elif MB(RAMPS_14_RE_ARM_EEB) #elif MB(RAMPS_14_RE_ARM_EEB)
#include "pins_RAMPS_RE_ARM.h" // LPC176x env:LPC1768 env:LPC1768_debug_and_upload #include "pins_RAMPS_RE_ARM.h" // LPC1768 env:LPC1768
#elif MB(RAMPS_14_RE_ARM_EFF) #elif MB(RAMPS_14_RE_ARM_EFF)
#include "pins_RAMPS_RE_ARM.h" // LPC176x env:LPC1768 env:LPC1768_debug_and_upload #include "pins_RAMPS_RE_ARM.h" // LPC1768 env:LPC1768
#elif MB(RAMPS_14_RE_ARM_EEF) #elif MB(RAMPS_14_RE_ARM_EEF)
#include "pins_RAMPS_RE_ARM.h" // LPC176x env:LPC1768 env:LPC1768_debug_and_upload #include "pins_RAMPS_RE_ARM.h" // LPC1768 env:LPC1768
#elif MB(RAMPS_14_RE_ARM_SF) #elif MB(RAMPS_14_RE_ARM_SF)
#include "pins_RAMPS_RE_ARM.h" // LPC176x env:LPC1768 env:LPC1768_debug_and_upload #include "pins_RAMPS_RE_ARM.h" // LPC1768 env:LPC1768
#elif MB(MKS_SBASE) #elif MB(MKS_SBASE)
#include "pins_MKS_SBASE.h" // LPC176x env:LPC1768 env:LPC1768_debug_and_upload #include "pins_MKS_SBASE.h" // LPC1768 env:LPC1768
#elif MB(AZSMZ_MINI) #elif MB(AZSMZ_MINI)
#include "pins_AZSMZ_MINI.h" // LPC176x env:LPC1768 env:LPC1768_debug_and_upload #include "pins_AZSMZ_MINI.h" // LPC1768 env:LPC1768
#elif MB(AZTEEG_X5_GT) #elif MB(AZTEEG_X5_GT)
#include "pins_AZTEEG_X5_GT.h" // LPC176x env:LPC1768 env:LPC1768_debug_and_upload #include "pins_AZTEEG_X5_GT.h" // LPC1769 env:LPC1768
#elif MB(AZTEEG_X5_MINI_WIFI) #elif MB(AZTEEG_X5_MINI_WIFI)
#include "pins_AZTEEG_X5_MINI_WIFI.h" // LPC176x env:LPC1768 env:LPC1768_debug_and_upload #include "pins_AZTEEG_X5_MINI_WIFI.h" // LPC1769 env:LPC1768
#elif MB(BIQU_BQ111_A4) #elif MB(BIQU_BQ111_A4)
#include "pins_BIQU_BQ111_A4.h" // LPC176x env:LPC1768 env:LPC1768_debug_and_upload #include "pins_BIQU_BQ111_A4.h" // LPC1768 env:LPC1768
#elif MB(SELENA_COMPACT) #elif MB(SELENA_COMPACT)
#include "pins_SELENA_COMPACT.h" // LPC176x env:LPC1768 env:LPC1768_debug_and_upload #include "pins_SELENA_COMPACT.h" // LPC1768 env:LPC1768
#elif MB(COHESION3D_REMIX) #elif MB(COHESION3D_REMIX)
#include "pins_COHESION3D_REMIX.h" // LPC176x env:LPC1768 env:LPC1768_debug_and_upload #include "pins_COHESION3D_REMIX.h" // LPC1769 env:LPC1768
#elif MB(COHESION3D_MINI) #elif MB(COHESION3D_MINI)
#include "pins_COHESION3D_MINI.h" // LPC176x env:LPC1768 env:LPC1768_debug_and_upload #include "pins_COHESION3D_MINI.h" // LPC1769 env:LPC1768
#elif MB(SMOOTHIEBOARD) #elif MB(SMOOTHIEBOARD)
#include "pins_SMOOTHIEBOARD.h" // LPC176x env:LPC1768 env:LPC1768_debug_and_upload #include "pins_SMOOTHIEBOARD.h" // LPC1769 env:LPC1768
// //
// Other 32-bit Boards // Other 32-bit Boards

16
buildroot/bin/env_clean
View File

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

49
buildroot/share/tests/LPC1768_tests
View File

@ -10,12 +10,55 @@ exec_test $1 $2 "Build Re-ARM Default Configuration"
restore_configs restore_configs
opt_set MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EFB opt_set MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EFB
opt_enable VIKI2 SDSUPPORT opt_enable VIKI2 SDSUPPORT
exec_test $1 $2 "VIKI2 and SDSUPPORT" exec_test $1 $2 "ReARM EFB VIKI2 and SDSUPPORT"
restore_configs
use_example_configs Mks/Sbase
exec_test $1 $2 "MKS SBASE Example Config"
restore_configs
use_example_configs Azteeg/X5GT
exec_test $1 $2 "Azteeg X5GT Example Config"
restore_configs
opt_set MOTHERBOARD BOARD_MKS_SBASE
opt_set EXTRUDERS 2
opt_enable NUM_SERVOS
opt_set NUM_SERVOS 1
opt_enable SWITCHING_EXTRUDER ULTIMAKERCONTROLLER
exec_test $1 $2 "MKS_SBASE SWITCHING_EXTRUDER"
restore_configs
opt_set MOTHERBOARD BOARD_MKS_SBASE
opt_set EXTRUDERS 2
opt_set TEMP_SENSOR_0 1
opt_set TEMP_SENSOR_1 5
opt_set TEMP_SENSOR_BED 1
opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT
opt_enable FILAMENT_WIDTH_SENSOR FILAMENT_LCD_DISPLAY
opt_enable FIX_MOUNTED_PROBE Z_SAFE_HOMING AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE
opt_enable BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET BABYSTEP_ZPROBE_GFX_OVERLAY
opt_enable PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE SLOW_PWM_HEATERS PIDTEMPBED EEPROM_SETTINGS INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT
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
opt_set GRID_MAX_POINTS_X 16
exec_test $1 $2 "MKS SBASE Many Features"
restore_configs restore_configs
opt_set MOTHERBOARD BOARD_MKS_SBASE opt_set MOTHERBOARD BOARD_MKS_SBASE
opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS opt_enable COREYX
exec_test $1 $2 "MKS SBASE RRDFG SDSUPPORT EEPROM_SETTINGS" opt_set_adv FAN_MIN_PWM 50
opt_set_adv FAN_KICKSTART_TIME 100
opt_set_adv XY_FREQUENCY_LIMIT 15
opt_enable_adv SHOW_TEMP_ADC_VALUES HOME_Y_BEFORE_X EMERGENCY_PARSER FAN_KICKSTART_TIME
opt_enable_adv ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED ADVANCED_OK
opt_enable_adv VOLUMETRIC_DEFAULT_ON NO_WORKSPACE_OFFSETS ACTION_ON_KILL
opt_enable_adv EXTRA_FAN_SPEED FWERETRACT Z_DUAL_STEPPER_DRIVERS Z_DUAL_ENDSTOPS
opt_enable_adv MENU_ADDAUTOSTART SDCARD_SORT_ALPHA
opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER BABYSTEPPING DAC_MOTOR_CURRENT_DEFAULT
opt_enable FILAMENT_LCD_DISPLAY FILAMENT_WIDTH_SENSOR
opt_enable FAN_SOFT_PWM SDSUPPORT
opt_enable USE_XMAX_PLUG
exec_test $1 $2 "MKS SBASE Many less common options"
#clean up #clean up
restore_configs restore_configs

8
buildroot/share/tests/start_tests
View File

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

Write Preview
Loading…
Cancel
Save