Переглянути джерело

Enable/disable multiple options on a single line.

Scott Lahteine 8 роки тому
джерело
коміт
1cd1ccbf86

+ 8
- 21
.travis.yml Переглянути файл

@@ -63,16 +63,11 @@ script:
63 63
   - build_marlin
64 64
   # enable AUTO_BED_LEVELING with servos
65 65
   - restore_configs
66
-  - opt_enable ENABLE_AUTO_BED_LEVELING
67
-  - opt_enable NUM_SERVOS
68
-  - opt_enable Z_ENDSTOP_SERVO_NR
69
-  - opt_enable SERVO_ENDSTOP_ANGLES
70
-  - opt_enable DEACTIVATE_SERVOS_AFTER_MOVE
66
+  - opt_enable ENABLE_AUTO_BED_LEVELING NUM_SERVOS Z_ENDSTOP_SERVO_NR SERVO_ENDSTOP_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE
71 67
   - build_marlin
72 68
   # enable EEPROM_SETTINGS & EEPROM_CHITCHAT
73 69
   - restore_configs
74
-  - opt_enable EEPROM_SETTINGS
75
-  - opt_enable EEPROM_CHITCHAT
70
+  - opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT
76 71
   - build_marlin
77 72
   ### LCDS ###
78 73
   # ULTIMAKERCONTROLLER
@@ -86,13 +81,11 @@ script:
86 81
   #- build_marlin
87 82
   # REPRAP_DISCOUNT_SMART_CONTROLLER
88 83
   - restore_configs
89
-  - opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER
90
-  - opt_enable SDSUPPORT
84
+  - opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT
91 85
   - build_marlin
92 86
   # G3D_PANEL
93 87
   - restore_configs
94
-  - opt_enable G3D_PANEL
95
-  - opt_enable SDSUPPORT
88
+  - opt_enable G3D_PANEL SDSUPPORT
96 89
   - build_marlin
97 90
   # REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
98 91
   - restore_configs
@@ -101,9 +94,7 @@ script:
101 94
   # REPRAPWORLD_KEYPAD
102 95
   # Cant find configuration details to get it to compile
103 96
   #- restore_configs
104
-  #- opt_enable ULTRA_LCD
105
-  #- opt_enable REPRAPWORLD_KEYPAD
106
-  #- opt_enable REPRAPWORLD_KEYPAD_MOVE_STEP
97
+  #- opt_enable ULTRA_LCD REPRAPWORLD_KEYPAD REPRAPWORLD_KEYPAD_MOVE_STEP
107 98
   #- build_marlin
108 99
   # RA_CONTROL_PANEL
109 100
   - restore_configs
@@ -137,9 +128,7 @@ script:
137 128
   - build_marlin
138 129
   # Enable filament sensor with LCD display
139 130
   - restore_configs
140
-  - opt_enable ULTIMAKERCONTROLLER
141
-  - opt_enable FILAMENT_SENSOR
142
-  - opt_enable FILAMENT_LCD_DISPLAY
131
+  - opt_enable ULTIMAKERCONTROLLER FILAMENT_SENSOR FILAMENT_LCD_DISPLAY
143 132
   - build_marlin
144 133
   # Enable COREXY
145 134
   - restore_configs
@@ -151,8 +140,7 @@ script:
151 140
   - build_marlin
152 141
   # Enable Z_DUAL_STEPPER_DRIVERS, Z_DUAL_ENDSTOPS
153 142
   - restore_configs
154
-  - opt_enable_adv Z_DUAL_STEPPER_DRIVERS
155
-  - opt_enable_adv Z_DUAL_ENDSTOPS
143
+  - opt_enable_adv Z_DUAL_STEPPER_DRIVERS Z_DUAL_ENDSTOPS
156 144
   - pins_set RAMPS_14 X_MAX_PIN -1
157 145
   - opt_set_adv Z2_MAX_PIN 2
158 146
   - build_marlin
@@ -164,8 +152,7 @@ script:
164 152
   # Delta Config (generic) + ABL + ALLEN_KEY
165 153
   - use_example_configs delta/generic
166 154
   - opt_disable DISABLE_MIN_ENDSTOPS
167
-  - opt_enable AUTO_BED_LEVELING_FEATURE
168
-  - opt_enable Z_PROBE_ALLEN_KEY
155
+  - opt_enable AUTO_BED_LEVELING_FEATURE Z_PROBE_ALLEN_KEY
169 156
   - build_marlin
170 157
   # Delta Config (Mini Kossel)
171 158
   - use_example_configs delta/kossel_mini

+ 3
- 1
LinuxAddons/bin/opt_disable Переглянути файл

@@ -1,3 +1,5 @@
1 1
 #!/usr/bin/env bash
2 2
 
3
-eval "sed 's/\(\/\/ *\)*\(\#define *$1\)/\/\/\2/g' Marlin/Configuration.h"
3
+for opt in "$@" ; do
4
+  eval "sed -i 's/\(\/\/ *\)*\(\#define *$opt\)/\/\/\2/g' Marlin/Configuration.h"
5
+done

+ 3
- 1
LinuxAddons/bin/opt_enable Переглянути файл

@@ -1,3 +1,5 @@
1 1
 #!/usr/bin/env bash
2 2
 
3
-eval "sed -i 's/\/\/ *\(#define *$1\)/\1/g' Marlin/Configuration.h"
3
+for opt in "$@" ; do
4
+  eval "sed -i 's/\/\/ *\(#define *$opt\)/\1/g' Marlin/Configuration.h"
5
+done

+ 3
- 1
LinuxAddons/bin/opt_enable_adv Переглянути файл

@@ -1,3 +1,5 @@
1 1
 #!/usr/bin/env bash
2 2
 
3
-eval "sed -i 's/\/\/ *\(#define *$1\)/\1/g' Marlin/Configuration_adv.h"
3
+for opt in "$@" ; do
4
+  eval "sed -i 's/\/\/ *\(#define *$opt\)/\1/g' Marlin/Configuration_adv.h"
5
+done

Завантаження…
Відмінити
Зберегти