Browse Source

Enable/disable multiple options on a single line.

Scott Lahteine 8 years ago
parent
commit
1cd1ccbf86
4 changed files with 17 additions and 24 deletions
  1. 8
    21
      .travis.yml
  2. 3
    1
      LinuxAddons/bin/opt_disable
  3. 3
    1
      LinuxAddons/bin/opt_enable
  4. 3
    1
      LinuxAddons/bin/opt_enable_adv

+ 8
- 21
.travis.yml View File

63
   - build_marlin
63
   - build_marlin
64
   # enable AUTO_BED_LEVELING with servos
64
   # enable AUTO_BED_LEVELING with servos
65
   - restore_configs
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
   - build_marlin
67
   - build_marlin
72
   # enable EEPROM_SETTINGS & EEPROM_CHITCHAT
68
   # enable EEPROM_SETTINGS & EEPROM_CHITCHAT
73
   - restore_configs
69
   - restore_configs
74
-  - opt_enable EEPROM_SETTINGS
75
-  - opt_enable EEPROM_CHITCHAT
70
+  - opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT
76
   - build_marlin
71
   - build_marlin
77
   ### LCDS ###
72
   ### LCDS ###
78
   # ULTIMAKERCONTROLLER
73
   # ULTIMAKERCONTROLLER
86
   #- build_marlin
81
   #- build_marlin
87
   # REPRAP_DISCOUNT_SMART_CONTROLLER
82
   # REPRAP_DISCOUNT_SMART_CONTROLLER
88
   - restore_configs
83
   - restore_configs
89
-  - opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER
90
-  - opt_enable SDSUPPORT
84
+  - opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT
91
   - build_marlin
85
   - build_marlin
92
   # G3D_PANEL
86
   # G3D_PANEL
93
   - restore_configs
87
   - restore_configs
94
-  - opt_enable G3D_PANEL
95
-  - opt_enable SDSUPPORT
88
+  - opt_enable G3D_PANEL SDSUPPORT
96
   - build_marlin
89
   - build_marlin
97
   # REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
90
   # REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
98
   - restore_configs
91
   - restore_configs
101
   # REPRAPWORLD_KEYPAD
94
   # REPRAPWORLD_KEYPAD
102
   # Cant find configuration details to get it to compile
95
   # Cant find configuration details to get it to compile
103
   #- restore_configs
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
   #- build_marlin
98
   #- build_marlin
108
   # RA_CONTROL_PANEL
99
   # RA_CONTROL_PANEL
109
   - restore_configs
100
   - restore_configs
137
   - build_marlin
128
   - build_marlin
138
   # Enable filament sensor with LCD display
129
   # Enable filament sensor with LCD display
139
   - restore_configs
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
   - build_marlin
132
   - build_marlin
144
   # Enable COREXY
133
   # Enable COREXY
145
   - restore_configs
134
   - restore_configs
151
   - build_marlin
140
   - build_marlin
152
   # Enable Z_DUAL_STEPPER_DRIVERS, Z_DUAL_ENDSTOPS
141
   # Enable Z_DUAL_STEPPER_DRIVERS, Z_DUAL_ENDSTOPS
153
   - restore_configs
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
   - pins_set RAMPS_14 X_MAX_PIN -1
144
   - pins_set RAMPS_14 X_MAX_PIN -1
157
   - opt_set_adv Z2_MAX_PIN 2
145
   - opt_set_adv Z2_MAX_PIN 2
158
   - build_marlin
146
   - build_marlin
164
   # Delta Config (generic) + ABL + ALLEN_KEY
152
   # Delta Config (generic) + ABL + ALLEN_KEY
165
   - use_example_configs delta/generic
153
   - use_example_configs delta/generic
166
   - opt_disable DISABLE_MIN_ENDSTOPS
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
   - build_marlin
156
   - build_marlin
170
   # Delta Config (Mini Kossel)
157
   # Delta Config (Mini Kossel)
171
   - use_example_configs delta/kossel_mini
158
   - use_example_configs delta/kossel_mini

+ 3
- 1
LinuxAddons/bin/opt_disable View File

1
 #!/usr/bin/env bash
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 View File

1
 #!/usr/bin/env bash
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 View File

1
 #!/usr/bin/env bash
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

Loading…
Cancel
Save