Browse Source

Update test scripts to error on unknown (#16229)

Jeff Eberl 4 years ago
parent
commit
70325a6a0f

+ 4
- 0
Marlin/src/HAL/HAL_LPC1768/inc/SanityCheck.h View File

@@ -68,3 +68,7 @@
68 68
 #if IS_RE_ARM_BOARD && ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && HAS_DRIVER(TMC2130) && DISABLED(TMC_USE_SW_SPI)
69 69
   #error "Re-ARM with REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER and TMC2130 require TMC_USE_SW_SPI"
70 70
 #endif
71
+
72
+#if ENABLED(BAUD_RATE_GCODE)
73
+  #error "BAUD_RATE_GCODE is not yet supported on LPC176x."
74
+#endif

+ 7
- 5
buildroot/bin/opt_disable View File

@@ -1,11 +1,13 @@
1 1
 #!/usr/bin/env bash
2 2
 
3
-SED=$(which gsed || which sed)
3
+# exit on first failure
4
+set -e
4 5
 
5
-for opt in "$@" ; do
6
-  eval "${SED} -i 's/\([[:blank:]]*\)\(#define \b${opt}\b\)/\1\/\/\2/g' Marlin/Configuration.h"
7
-done
6
+SED=$(which gsed || which sed)
8 7
 
9 8
 for opt in "$@" ; do
10
-  eval "${SED} -i 's/\([[:blank:]]*\)\(#define \b${opt}\b\)/\1\/\/\2/g' Marlin/Configuration_adv.h"
9
+  # Logic for returning nonzero based on answer here: https://stackoverflow.com/a/15966279/104648
10
+  eval "${SED} -i '/\([[:blank:]]*\)\(\/\/\)*\([[:blank:]]*\)\(#define \b${opt}\b\)/{s//\1\3\/\/\4/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration.h" ||
11
+  eval "${SED} -i '/\([[:blank:]]*\)\(\/\/\)*\([[:blank:]]*\)\(#define \b${opt}\b\)/{s//\1\3\/\/\4/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration_adv.h" ||
12
+  (echo "ERROR: opt_disable Can't find ${opt}" >&2 && exit 9)
11 13
 done

+ 7
- 5
buildroot/bin/opt_enable View File

@@ -1,11 +1,13 @@
1 1
 #!/usr/bin/env bash
2 2
 
3
-SED=$(which gsed || which sed)
3
+# exit on first failure
4
+set -e
4 5
 
5
-for opt in "$@" ; do
6
-  eval "${SED} -i 's/\/\/[[:blank:]]*\(#define \b${opt}\b\)/\1/g' Marlin/Configuration.h"
7
-done
6
+SED=$(which gsed || which sed)
8 7
 
9 8
 for opt in "$@" ; do
10
-  eval "${SED} -i 's/\/\/[[:blank:]]*\(#define \b${opt}\b\)/\1/g' Marlin/Configuration_adv.h"
9
+  # Logic for returning nonzero based on answer here: https://stackoverflow.com/a/15966279/104648
10
+  eval "${SED} -i '/\(\/\/\)*[[:blank:]]*\(#define \b${opt}\b\)/{s//\2/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration.h" ||
11
+  eval "${SED} -i '/\(\/\/\)*[[:blank:]]*\(#define \b${opt}\b\)/{s//\2/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration_adv.h" ||
12
+  (echo "ERROR: opt_enable Can't find ${opt}" >&2 && exit 9)
11 13
 done

+ 7
- 2
buildroot/bin/opt_set View File

@@ -1,6 +1,11 @@
1 1
 #!/usr/bin/env bash
2 2
 
3
+# exit on first failure
4
+set -e
5
+
3 6
 SED=$(which gsed || which sed)
4 7
 
5
-eval "${SED} -E -i 's/(\/\/)?(#define \b${1}\b).*$/\2 ${2}/g' Marlin/Configuration.h"
6
-eval "${SED} -E -i 's/(\/\/)?(#define \b${1}\b).*$/\2 ${2}/g' Marlin/Configuration_adv.h"
8
+# Logic for returning nonzero based on answer here: https://stackoverflow.com/a/15966279/104648
9
+eval "${SED} -i '/\(\/\/\)*\([[:blank:]]*\)\(#define \b${1}\b\).*$/{s//\2\3 ${2}/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration.h" ||
10
+eval "${SED} -i '/\(\/\/\)*\([[:blank:]]*\)\(#define \b${1}\b\).*$/{s//\2\3 ${2}/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration_adv.h" ||
11
+(echo "ERROR: opt_set Can't find ${1}" >&2 && exit 9)

+ 2
- 1
buildroot/bin/pins_set View File

@@ -7,4 +7,5 @@ PIN=$2
7 7
 VAL=$3
8 8
 
9 9
 SED=$(which gsed || which sed)
10
-eval "${SED} -E -i 's/(\/\/)?(#define +${PIN}\b).*$/\2 ${VAL}/g' Marlin/src/pins/$DIR/pins_${NAM}.h"
10
+eval "${SED} -i '/\(\/\/\)*\(#define \+${PIN}\b\).*$/{s//\2 ${VAL}/;h};\${x;/./{x;q0};x;q9}' Marlin/src/pins/$DIR/pins_${NAM}.h" ||
11
+(echo "ERROR: pins_set Can't find ${PIN}" >&2 && exit 9)

+ 1
- 1
buildroot/share/tests/LPC1768-tests View File

@@ -15,7 +15,7 @@ set -e
15 15
 
16 16
 restore_configs
17 17
 opt_set MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EFB
18
-opt_enable VIKI2 SDSUPPORT SERIAL_PORT2 NEOPIXEL_LED BAUD_RATE_GCODE
18
+opt_enable VIKI2 SDSUPPORT SERIAL_PORT_2 NEOPIXEL_LED
19 19
 opt_set NEOPIXEL_PIN P1_16
20 20
 exec_test $1 $2 "ReARM EFB VIKI2, SDSUPPORT, 2 Serial ports (USB CDC + UART0), NeoPixel"
21 21
 

+ 4
- 4
buildroot/share/tests/LPC1769-tests View File

@@ -21,7 +21,7 @@ opt_enable VIKI2 SDSUPPORT ADAPTIVE_FAN_SLOWING NO_FAN_SLOWING_IN_PID_TUNING \
21 21
            FIX_MOUNTED_PROBE AUTO_BED_LEVELING_BILINEAR G29_RETRY_AND_RECOVER Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
22 22
            BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET BABYSTEP_ZPROBE_GFX_OVERLAY \
23 23
            PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE SLOW_PWM_HEATERS PIDTEMPBED EEPROM_SETTINGS INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT \
24
-           Z_SAFE_HOMING ADVANCED_PAUSE_FEATURE PARK_HEAD_ON_PAUSE BAUD_RATE_GCODE \
24
+           Z_SAFE_HOMING ADVANCED_PAUSE_FEATURE PARK_HEAD_ON_PAUSE \
25 25
            LCD_INFO_MENU ARC_SUPPORT BEZIER_CURVE_SUPPORT EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES SDCARD_SORT_ALPHA
26 26
 opt_set GRID_MAX_POINTS_X 16
27 27
 exec_test $1 $2 "Smoothieboard with many features"
@@ -33,8 +33,8 @@ exec_test $1 $2 "Smoothieboard with many features"
33 33
 #           AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 EEPROM_SETTINGS \
34 34
 #           FILAMENT_LCD_DISPLAY FILAMENT_WIDTH_SENSOR FAN_SOFT_PWM \
35 35
 #           SHOW_TEMP_ADC_VALUES HOME_Y_BEFORE_X EMERGENCY_PARSER FAN_KICKSTART_TIME \
36
-#           SD_ABORT_ON_ENDSTOP_HIT ADVANCED_OK GCODE_MACROS BAUD_RATE_GCODE \
37
-#           VOLUMETRIC_DEFAULT_ON NO_WORKSPACE_OFFSETS ACTION_ON_KILL \
36
+#           SD_ABORT_ON_ENDSTOP_HIT ADVANCED_OK GCODE_MACROS \
37
+#           VOLUMETRIC_DEFAULT_ON NO_WORKSPACE_OFFSETS \
38 38
 #           EXTRA_FAN_SPEED FWRETRACT MENU_ADDAUTOSTART SDCARD_SORT_ALPHA
39 39
 #opt_set FAN_MIN_PWM 50
40 40
 #opt_set FAN_KICKSTART_TIME 100
@@ -47,7 +47,7 @@ opt_set MOTHERBOARD BOARD_COHESION3D_REMIX
47 47
 opt_set X_DRIVER_TYPE TMC2130
48 48
 opt_set Y_DRIVER_TYPE TMC2130
49 49
 opt_set Z_DRIVER_TYPE TMC2130
50
-opt_enable AUTO_BED_LEVELING_BILINEAR EEPROM_SETTINGS EEPROM_CHITCHAT BAUD_RATE_GCODE \
50
+opt_enable AUTO_BED_LEVELING_BILINEAR EEPROM_SETTINGS EEPROM_CHITCHAT \
51 51
            TMC_USE_SW_SPI MONITOR_DRIVER_STATUS STEALTHCHOP_XY STEALTHCHOP_Z HYBRID_THRESHOLD \
52 52
            SENSORLESS_PROBING X_STALL_SENSITIVITY Y_STALL_SENSITIVITY Z_STALL_SENSITIVITY TMC_DEBUG
53 53
 opt_disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN PSU_CONTROL

+ 2
- 2
buildroot/share/tests/esp32-tests View File

@@ -12,8 +12,8 @@ set -e
12 12
 restore_configs
13 13
 opt_set MOTHERBOARD BOARD_ESPRESSIF_ESP32
14 14
 opt_enable WIFISUPPORT GCODE_MACROS BAUD_RATE_GCODE
15
-opt_set "WIFI_SSID \"ssid\""
16
-opt_set "WIFI_PWD \"password\""
15
+opt_set WIFI_SSID "\"ssid\""
16
+opt_set WIFI_PWD "\"password\""
17 17
 opt_set TX_BUFFER_SIZE 64
18 18
 opt_add WEBSUPPORT
19 19
 exec_test $1 $2 "ESP32 with WIFISUPPORT and WEBSUPPORT"

+ 5
- 3
buildroot/share/tests/megaatmega2560-tests View File

@@ -117,11 +117,13 @@ opt_set LCD_LANGUAGE de
117 117
 opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT \
118 118
            ULTIMAKERCONTROLLER SDSUPPORT PCA9632 LCD_INFO_MENU \
119 119
            AUTO_BED_LEVELING_BILINEAR PROBE_MANUALLY LCD_BED_LEVELING G26_MESH_VALIDATION MESH_EDIT_MENU \
120
-           M100_FREE_MEMORY_WATCHER M100_FREE_MEMORY_DUMPER M100_FREE_MEMORY_CORRUPTOR \
120
+           M100_FREE_MEMORY_WATCHER \
121 121
            INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT EXPERIMENTAL_I2CBUS \
122 122
            NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE \
123 123
            ADVANCED_PAUSE_FEATURE PARK_HEAD_ON_PAUSE ADVANCED_PAUSE_CONTINUOUS_PURGE FILAMENT_LOAD_UNLOAD_GCODES \
124 124
            PRINTCOUNTER SERVICE_NAME_1 SERVICE_INTERVAL_1 M114_DETAIL
125
+opt_add M100_FREE_MEMORY_DUMPER
126
+opt_add M100_FREE_MEMORY_CORRUPTOR
125 127
 opt_set PWM_MOTOR_CURRENT "{ 1300, 1300, 1250 }"
126 128
 opt_set I2C_SLAVE_ADDRESS 63
127 129
 exec_test $1 $2 "MINIRAMBO | Ultimaker LCD | M100 | PWM_MOTOR_CURRENT | PRINTCOUNTER | Advanced Pause ..."
@@ -179,7 +181,7 @@ opt_enable COREYX USE_XMAX_PLUG MIXING_EXTRUDER GRADIENT_MIX \
179 181
            FIX_MOUNTED_PROBE AUTO_BED_LEVELING_LINEAR DEBUG_LEVELING_FEATURE FILAMENT_WIDTH_SENSOR \
180 182
            SHOW_TEMP_ADC_VALUES HOME_Y_BEFORE_X EMERGENCY_PARSER \
181 183
            SD_ABORT_ON_ENDSTOP_HIT HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT ADVANCED_OK M114_DETAIL \
182
-           VOLUMETRIC_DEFAULT_ON NO_WORKSPACE_OFFSETS ACTION_ON_KILL EXTRA_FAN_SPEED FWRETRACT
184
+           VOLUMETRIC_DEFAULT_ON NO_WORKSPACE_OFFSETS EXTRA_FAN_SPEED FWRETRACT
183 185
 opt_set FAN_MIN_PWM 50
184 186
 opt_set FAN_KICKSTART_TIME 100
185 187
 opt_set XY_FREQUENCY_LIMIT 15
@@ -295,7 +297,7 @@ exec_test $1 $2 "Full-featured CR-10S config"
295 297
 # Delta Config (generic) + ABL bilinear + BLTOUCH
296 298
 use_example_configs delta/generic
297 299
 opt_set LCD_LANGUAGE cz
298
-opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_CALIBRATION_MENU AUTO_BED_LEVELING_BILINEAR BLTOUCH BLTOUCH_FORCE_5V_MODE
300
+opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_CALIBRATION_MENU AUTO_BED_LEVELING_BILINEAR BLTOUCH
299 301
 exec_test $1 $2 "RAMPS | DELTA | RRD LCD | ABL Bilinear | BLTOUCH"
300 302
 
301 303
 #

+ 2
- 2
config/default/Configuration.h View File

@@ -330,9 +330,9 @@
330 330
   //#define PSU_DEFAULT_OFF         // Keep power off until enabled directly with M80
331 331
   //#define PSU_POWERUP_DELAY 100   // (ms) Delay for the PSU to warm up to full power
332 332
 
333
-  //#define AUTO_POWER_CONTROL  // Enable automatic control of the PS_ON pin
333
+  //#define AUTO_POWER_CONTROL      // Enable automatic control of the PS_ON pin
334 334
   #if ENABLED(AUTO_POWER_CONTROL)
335
-    #define AUTO_POWER_FANS           // Turn on PSU if fans need power
335
+    #define AUTO_POWER_FANS         // Turn on PSU if fans need power
336 336
     #define AUTO_POWER_E_FANS
337 337
     #define AUTO_POWER_CONTROLLERFAN
338 338
     #define AUTO_POWER_CHAMBER_FAN

Loading…
Cancel
Save