From ff272c7b690288928851408f8f7e1d5360171da5 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 22 Mar 2016 07:13:38 -0700 Subject: [PATCH 1/2] Improve Travis CI test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add shell scripts to help with managing configs - Clean up .travis.yml file by using shell scripts - Don’t download “astyle” – not needed and delays Travis results --- .travis.yml | 258 ++++++++++++---------------- LinuxAddons/bin/build_marlin | 4 + LinuxAddons/bin/opt_disable | 3 + LinuxAddons/bin/opt_enable | 3 + LinuxAddons/bin/opt_enable_adv | 3 + LinuxAddons/bin/opt_set | 3 + LinuxAddons/bin/opt_set_adv | 3 + LinuxAddons/bin/pins_set | 3 + LinuxAddons/bin/restore_configs | 5 + LinuxAddons/bin/use_example_configs | 3 + 10 files changed, 138 insertions(+), 150 deletions(-) create mode 100755 LinuxAddons/bin/build_marlin create mode 100755 LinuxAddons/bin/opt_disable create mode 100755 LinuxAddons/bin/opt_enable create mode 100755 LinuxAddons/bin/opt_enable_adv create mode 100755 LinuxAddons/bin/opt_set create mode 100755 LinuxAddons/bin/opt_set_adv create mode 100755 LinuxAddons/bin/pins_set create mode 100755 LinuxAddons/bin/restore_configs create mode 100755 LinuxAddons/bin/use_example_configs diff --git a/.travis.yml b/.travis.yml index 610612e6db..567b893036 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,199 +26,157 @@ install: - mv LiquidCrystal_I2C/LiquidCrystal_I2C /usr/local/share/arduino/libraries/LiquidCrystal_I2C - git clone https://github.com/lincomatic/LiquidTWI2.git - mv LiquidTWI2 /usr/local/share/arduino/libraries/LiquidTWI2 - # Install astyle - - wget https://github.com/timonwong/astyle-mirror/archive/master.zip - - unzip master.zip - - cd astyle-mirror-master/build/gcc/ - - make prefix=$HOME astyle install before_script: # arduino requires an X server even with command line # https://github.com/arduino/Arduino/issues/1981 - Xvfb :1 -screen 0 1024x768x16 &> xvfb.log & # change back to home directory for compiling - cd $TRAVIS_BUILD_DIR - # Check style - # ~/bin/astyle --recursive --options=.astylerc "Marlin/*.h" "Marlin/*.cpp" script: - # Abort on style errors - # if [ "0" != `find . -name "*.orig" | wc -l` ] ; then echo "Improperly styled source -- run astyle" ; exit -999; fi - # Relaxed Travis check - # if [ "0" != `find . -name "*.orig" | wc -l` ] ; then echo "Improperly styled source -- run astyle" ; fi # build default config - - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino - # backup configuration.h + - build_marlin + # Backup Configuration.h, Configuration_adv.h, and pins_RAMPS_14.h - cp Marlin/Configuration.h Marlin/Configuration.h.backup - cp Marlin/Configuration_adv.h Marlin/Configuration_adv.h.backup - cp Marlin/pins_RAMPS_14.h Marlin/pins_RAMPS_14.h.backup # add sensor for bed - - sed -i 's/#define TEMP_SENSOR_BED 0/#define TEMP_SENSOR_BED 1/g' Marlin/Configuration.h - - rm -rf .build/ - - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino + - opt_set TEMP_SENSOR_BED 1 + - build_marlin # change extruder numbers from 1 to 2 - - sed -i 's/#define MOTHERBOARD BOARD_RAMPS_14_EFB/#define MOTHERBOARD BOARD_RAMPS_14_EEB/g' Marlin/Configuration.h - - sed -i 's/#define EXTRUDERS 1/#define EXTRUDERS 2/g' Marlin/Configuration.h - - sed -i 's/#define TEMP_SENSOR_1 0/#define TEMP_SENSOR_1 1/g' Marlin/Configuration.h + - opt_set MOTHERBOARD BOARD_RAMPS_14_EEB + - opt_set EXTRUDERS 2 + - opt_set TEMP_SENSOR_1 1 #- cat Marlin/Configuration.h - - rm -rf .build/ - - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino + - build_marlin # change extruder numbers from 2 to 3, needs to be a board with 3 extruders defined in pins.h - - sed -i 's/#define MOTHERBOARD BOARD_RAMPS_14_EEB/#define MOTHERBOARD BOARD_RUMBA/g' Marlin/Configuration.h - - sed -i 's/#define EXTRUDERS 2/#define EXTRUDERS 3/g' Marlin/Configuration.h - - sed -i 's/#define TEMP_SENSOR_2 0/#define TEMP_SENSOR_2 1/g' Marlin/Configuration.h - - rm -rf .build/ - - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino + - opt_set MOTHERBOARD BOARD_RUMBA + - opt_set EXTRUDERS 3 + - opt_set TEMP_SENSOR_2 1 + - build_marlin # enable PIDTEMPBED - - cp Marlin/Configuration.h.backup Marlin/Configuration.h - - sed -i 's/\/\/#define PIDTEMPBED/#define PIDTEMPBED/g' Marlin/Configuration.h - - rm -rf .build/ - - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino + - restore_configs + - opt_enable PIDTEMPBED + - build_marlin # enable AUTO_BED_LEVELING - - cp Marlin/Configuration.h.backup Marlin/Configuration.h - - sed -i 's/\/\/#define ENABLE_AUTO_BED_LEVELING/#define ENABLE_AUTO_BED_LEVELING/g' Marlin/Configuration.h - - rm -rf .build/ - - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino + - restore_configs + - opt_enable ENABLE_AUTO_BED_LEVELING + - build_marlin # enable AUTO_BED_LEVELING with servos - - cp Marlin/Configuration.h.backup Marlin/Configuration.h - - sed -i 's/\/\/#define ENABLE_AUTO_BED_LEVELING/#define ENABLE_AUTO_BED_LEVELING/g' Marlin/Configuration.h - - sed -i 's/\/\/#define NUM_SERVOS/#define NUM_SERVOS/g' Marlin/Configuration.h - - sed -i 's/\/\/#define Z_ENDSTOP_SERVO_NR/#define Z_ENDSTOP_SERVO_NR/g' Marlin/Configuration.h - - sed -i 's/\/\/#define SERVO_ENDSTOP_ANGLES/#define SERVO_ENDSTOP_ANGLES/g' Marlin/Configuration.h - - sed -i 's/\/\/#define DEACTIVATE_SERVOS_AFTER_MOVE/#define DEACTIVATE_SERVOS_AFTER_MOVE/g' Marlin/Configuration.h - - rm -rf .build/ - - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino + - restore_configs + - opt_enable ENABLE_AUTO_BED_LEVELING + - opt_enable NUM_SERVOS + - opt_enable Z_ENDSTOP_SERVO_NR + - opt_enable SERVO_ENDSTOP_ANGLES + - opt_enable DEACTIVATE_SERVOS_AFTER_MOVE + - build_marlin # enable EEPROM_SETTINGS & EEPROM_CHITCHAT - - cp Marlin/Configuration.h.backup Marlin/Configuration.h - - sed -i 's/\/\/#define EEPROM_SETTINGS/#define EEPROM_SETTINGS/g' Marlin/Configuration.h - - sed -i 's/\/\/#define EEPROM_CHITCHAT/#define EEPROM_CHITCHAT/g' Marlin/Configuration.h - - rm -rf .build/ - - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino + - restore_configs + - opt_enable EEPROM_SETTINGS + - opt_enable EEPROM_CHITCHAT + - build_marlin ### LCDS ### # ULTIMAKERCONTROLLER - - cp Marlin/Configuration.h.backup Marlin/Configuration.h - - sed -i 's/\/\/#define ULTIMAKERCONTROLLER/#define ULTIMAKERCONTROLLER/g' Marlin/Configuration.h - - rm -rf .build/ - - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino + - restore_configs + - opt_enable ULTIMAKERCONTROLLER + - build_marlin # MAKRPANEL # Needs to use melzi and sanguino hardware - #- cp Marlin/Configuration.h.backup Marlin/Configuration.h - #- sed -i 's/\/\/#define MAKRPANEL/#define MAKRPANEL/g' Marlin/Configuration.h - #- rm -rf .build/ - #- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino + #- restore_configs + #- opt_enable MAKRPANEL + #- build_marlin # REPRAP_DISCOUNT_SMART_CONTROLLER - - cp Marlin/Configuration.h.backup Marlin/Configuration.h - - sed -i 's/\/\/#define SDSUPPORT/#define SDSUPPORT/g' Marlin/Configuration.h - - sed -i 's/\/\/#define REPRAP_DISCOUNT_SMART_CONTROLLER/#define REPRAP_DISCOUNT_SMART_CONTROLLER/g' Marlin/Configuration.h - - rm -rf .build/ - - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino - # G3D_PANE - - cp Marlin/Configuration.h.backup Marlin/Configuration.h - - sed -i 's/\/\/#define G3D_PANEL/#define G3D_PANEL/g' Marlin/Configuration.h - - rm -rf .build/ - - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino + - restore_configs + - opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER + - opt_enable SDSUPPORT + - build_marlin + # G3D_PANEL + - restore_configs + - opt_enable G3D_PANEL + - opt_enable SDSUPPORT + - build_marlin # REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER - - cp Marlin/Configuration.h.backup Marlin/Configuration.h - - sed -i 's/\/\/#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER/#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER/g' Marlin/Configuration.h - - rm -rf .build/ - - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino - # REPRAPWORLD_KEYPAD + - restore_configs + - opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER + - build_marlin + # REPRAPWORLD_KEYPAD # Cant find configuration details to get it to compile - #- cp Marlin/Configuration.h.backup Marlin/Configuration.h - #- sed -i 's/\/\/#define ULTRA_LCD/#define ULTRA_LCD/g' Marlin/Configuration.h - #- sed -i 's/\/\/#define REPRAPWORLD_KEYPAD/#define REPRAPWORLD_KEYPAD/g' Marlin/Configuration.h - #- sed -i 's/\/\/#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0/#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0/g' Marlin/Configuration.h - #- rm -rf .build/ - #- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino + #- restore_configs + #- opt_enable ULTRA_LCD + #- opt_enable REPRAPWORLD_KEYPAD + #- opt_enable REPRAPWORLD_KEYPAD_MOVE_STEP + #- build_marlin # RA_CONTROL_PANEL - - cp Marlin/Configuration.h.backup Marlin/Configuration.h - - sed -i 's/\/\/#define RA_CONTROL_PANEL/#define RA_CONTROL_PANEL/g' Marlin/Configuration.h - - rm -rf .build/ - - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino + - restore_configs + - opt_enable RA_CONTROL_PANEL + - build_marlin ### I2C PANELS ### # LCD_I2C_SAINSMART_YWROBOT # Failing at the moment needs different library - #- cp Marlin/Configuration.h.backup Marlin/Configuration.h - #- sed -i 's/\/\/#define LCD_I2C_SAINSMART_YWROBOT/#define LCD_I2C_SAINSMART_YWROBOT/g' Marlin/Configuration.h - #- rm -rf .build/ - #- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino + #- restore_configs + #- opt_enable LCD_I2C_SAINSMART_YWROBOT + #- build_marlin # LCD_I2C_PANELOLU2 - - cp Marlin/Configuration.h.backup Marlin/Configuration.h - - sed -i 's/\/\/#define LCD_I2C_PANELOLU2/#define LCD_I2C_PANELOLU2/g' Marlin/Configuration.h - - rm -rf .build/ - - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino + - restore_configs + - opt_enable LCD_I2C_PANELOLU2 + - build_marlin # LCD_I2C_VIKI - - cp Marlin/Configuration.h.backup Marlin/Configuration.h - - sed -i 's/\/\/#define LCD_I2C_VIKI/#define LCD_I2C_VIKI/g' Marlin/Configuration.h - - rm -rf .build/ - - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino + - restore_configs + - opt_enable LCD_I2C_VIKI + - build_marlin # LCM1602 - - cp Marlin/Configuration.h.backup Marlin/Configuration.h - - sed -i 's/\/\/#define LCM1602/#define LCM1602/g' Marlin/Configuration.h - - rm -rf .build/ - - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino + - restore_configs + - opt_enable LCM1602 + - build_marlin # Enable FILAMENTCHANGEENABLE - - cp Marlin/Configuration.h.backup Marlin/Configuration.h - - sed -i 's/\/\/#define FILAMENTCHANGEENABLE/#define FILAMENTCHANGEENABLE/g' Marlin/Configuration.h - - rm -rf .build/ - - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino + - restore_configs + - opt_enable FILAMENTCHANGEENABLE + - build_marlin # Enable filament sensor - - cp Marlin/Configuration.h.backup Marlin/Configuration.h - - sed -i 's/\/\/#define FILAMENT_SENSOR/#define FILAMENT_SENSOR/g' Marlin/Configuration.h - - rm -rf .build/ - - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino - # Enable filament sensor with LCD display - - cp Marlin/Configuration.h.backup Marlin/Configuration.h - - sed -i 's/\/\/#define ULTIMAKERCONTROLLER/#define ULTIMAKERCONTROLLER/g' Marlin/Configuration.h - - sed -i 's/\/\/#define FILAMENT_SENSOR/#define FILAMENT_SENSOR/g' Marlin/Configuration.h - - sed -i 's/\/\/#define FILAMENT_LCD_DISPLAY/#define FILAMENT_LCD_DISPLAY/g' Marlin/Configuration.h - - rm -rf .build/ - - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino + - restore_configs + - opt_enable FILAMENT_SENSOR + - build_marlin + # Enable filament sensor with LCD display + - restore_configs + - opt_enable ULTIMAKERCONTROLLER + - opt_enable FILAMENT_SENSOR + - opt_enable FILAMENT_LCD_DISPLAY + - build_marlin # Enable COREXY - - cp Marlin/Configuration.h.backup Marlin/Configuration.h - - sed -i 's/\/\/#define COREXY/#define COREXY/g' Marlin/Configuration.h - - rm -rf .build/ - - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino + - restore_configs + - opt_enable COREXY + - build_marlin # Enable COREXZ - - cp Marlin/Configuration.h.backup Marlin/Configuration.h - - sed -i 's/\/\/#define COREXZ/#define COREXZ/g' Marlin/Configuration.h - - rm -rf .build/ - - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino + - restore_configs + - opt_enable COREXZ + - build_marlin # Enable Z_DUAL_STEPPER_DRIVERS, Z_DUAL_ENDSTOPS - - cp Marlin/Configuration.h.backup Marlin/Configuration.h - - sed -i 's/\/\/#define Z_DUAL_STEPPER_DRIVERS/#define Z_DUAL_STEPPER_DRIVERS/g' Marlin/Configuration_adv.h - - sed -i 's/\ \ \/\/\ \#define Z_DUAL_ENDSTOPS/#define Z_DUAL_ENDSTOPS/g' Marlin/Configuration_adv.h - - sed -i 's/#define X_MAX_PIN 2/#define X_MAX_PIN -1/g' Marlin/pins_RAMPS_14.h - - sed -i 's/\ \ \ \ \#define Z2_MAX_PIN 36/#define Z2_MAX_PIN 2/g' Marlin/Configuration_adv.h - - rm -rf .build/ - - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino - - cp Marlin/Configuration.h.backup Marlin/Configuration.h - - cp Marlin/Configuration_adv.h.backup Marlin/Configuration_adv.h - - cp Marlin/pins_RAMPS_14.h.backup Marlin/pins_RAMPS_14.h + - restore_configs + - opt_enable_adv Z_DUAL_STEPPER_DRIVERS + - opt_enable_adv Z_DUAL_ENDSTOPS + - pins_set RAMPS_14 X_MAX_PIN -1 + - opt_set_adv Z2_MAX_PIN 2 + - build_marlin + - restore_configs ######## Example Configurations ############## # Delta Config (generic) - - cp Marlin/example_configurations/delta/generic/Configuration* Marlin/ - - rm -rf .build/ - - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino + - use_example_configs delta/generic + - build_marlin # Delta Config (generic) + ABL + ALLEN_KEY - - cp Marlin/example_configurations/delta/generic/Configuration* Marlin/ - - sed -i 's/#define DISABLE_MIN_ENDSTOPS/\/\/#define DISABLE_MIN_ENDSTOPS/g' Marlin/Configuration.h - - sed -i 's/\/\/#define AUTO_BED_LEVELING_FEATURE/#define AUTO_BED_LEVELING_FEATURE/g' Marlin/Configuration.h - - sed -i 's/\/\/#define Z_PROBE_ALLEN_KEY/#define Z_PROBE_ALLEN_KEY/g' Marlin/Configuration.h - - rm -rf .build/ - - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino + - use_example_configs delta/generic + - opt_disable DISABLE_MIN_ENDSTOPS + - opt_enable AUTO_BED_LEVELING_FEATURE + - opt_enable Z_PROBE_ALLEN_KEY + - build_marlin # Delta Config (Mini Kossel) - - cp Marlin/example_configurations/delta/kossel_mini/Configuration* Marlin/ - - rm -rf .build/ - - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino + - use_example_configs delta/kossel_mini + - build_marlin # Makibox Config need to check board type for Teensy++ 2.0 - #- cp Marlin/example_configurations/makibox/Configuration* Marlin/ - #- rm -rf .build/ - #- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino + #- use_example_configs makibox + #- build_marlin # SCARA Config - - cp Marlin/example_configurations/SCARA/Configuration* Marlin/ - - rm -rf .build/ - - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino + - use_example_configs SCARA + - build_marlin # tvrrug Config need to check board type for sanguino atmega644p - #- cp Marlin/example_configurations/tvrrug/Round2/Configuration* Marlin/ - #- rm -rf .build/ - #- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino + #- use_example_configs tvrrug/Round2 + #- build_marlin ######## Board Types ############# diff --git a/LinuxAddons/bin/build_marlin b/LinuxAddons/bin/build_marlin new file mode 100755 index 0000000000..3af5aa12e1 --- /dev/null +++ b/LinuxAddons/bin/build_marlin @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +rm -rf .build/ +DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino diff --git a/LinuxAddons/bin/opt_disable b/LinuxAddons/bin/opt_disable new file mode 100755 index 0000000000..f321a63049 --- /dev/null +++ b/LinuxAddons/bin/opt_disable @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +eval "sed 's/\(\/\/ *\)*\(\#define *$1\)/\/\/\2/g' Marlin/Configuration.h" diff --git a/LinuxAddons/bin/opt_enable b/LinuxAddons/bin/opt_enable new file mode 100755 index 0000000000..6820db2aa0 --- /dev/null +++ b/LinuxAddons/bin/opt_enable @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +eval "sed -i 's/\/\/ *\(#define *$1\)/\1/g' Marlin/Configuration.h" diff --git a/LinuxAddons/bin/opt_enable_adv b/LinuxAddons/bin/opt_enable_adv new file mode 100755 index 0000000000..30b2ddbf34 --- /dev/null +++ b/LinuxAddons/bin/opt_enable_adv @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +eval "sed -i 's/\/\/ *\(#define *$1\)/\1/g' Marlin/Configuration_adv.h" diff --git a/LinuxAddons/bin/opt_set b/LinuxAddons/bin/opt_set new file mode 100755 index 0000000000..fda7f379a0 --- /dev/null +++ b/LinuxAddons/bin/opt_set @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +eval "sed -i 's/\(#define *$1\) *.*$/\1 $2/g' Marlin/Configuration.h" diff --git a/LinuxAddons/bin/opt_set_adv b/LinuxAddons/bin/opt_set_adv new file mode 100755 index 0000000000..9ce1e4ca7c --- /dev/null +++ b/LinuxAddons/bin/opt_set_adv @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +eval "sed -i 's/\(#define *$1\) *.*$/\1 $2/g' Marlin/Configuration_adv.h" diff --git a/LinuxAddons/bin/pins_set b/LinuxAddons/bin/pins_set new file mode 100755 index 0000000000..4fe401c6ae --- /dev/null +++ b/LinuxAddons/bin/pins_set @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +eval "sed -i 's/\(#define *$2\) *.*$/\1 $3/g' Marlin/pins_$1.h" diff --git a/LinuxAddons/bin/restore_configs b/LinuxAddons/bin/restore_configs new file mode 100755 index 0000000000..ca77e556ae --- /dev/null +++ b/LinuxAddons/bin/restore_configs @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +cp Marlin/Configuration.h.backup Marlin/Configuration.h +cp Marlin/Configuration_adv.h.backup Marlin/Configuration_adv.h +cp Marlin/pins_RAMPS_14.h.backup Marlin/pins_RAMPS_14.h diff --git a/LinuxAddons/bin/use_example_configs b/LinuxAddons/bin/use_example_configs new file mode 100755 index 0000000000..d1e6e468f2 --- /dev/null +++ b/LinuxAddons/bin/use_example_configs @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +eval "cp Marlin/example_configurations/$1/Configuration* Marlin/" From 1cd1ccbf86b9eabd2c2991baa3e1b835e6fb2331 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 22 Mar 2016 22:32:42 -0700 Subject: [PATCH 2/2] Enable/disable multiple options on a single line. --- .travis.yml | 29 ++++++++--------------------- LinuxAddons/bin/opt_disable | 4 +++- LinuxAddons/bin/opt_enable | 4 +++- LinuxAddons/bin/opt_enable_adv | 4 +++- 4 files changed, 17 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index 567b893036..cfcee4f775 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,16 +63,11 @@ script: - build_marlin # enable AUTO_BED_LEVELING with servos - restore_configs - - opt_enable ENABLE_AUTO_BED_LEVELING - - opt_enable NUM_SERVOS - - opt_enable Z_ENDSTOP_SERVO_NR - - opt_enable SERVO_ENDSTOP_ANGLES - - opt_enable DEACTIVATE_SERVOS_AFTER_MOVE + - opt_enable ENABLE_AUTO_BED_LEVELING NUM_SERVOS Z_ENDSTOP_SERVO_NR SERVO_ENDSTOP_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE - build_marlin # enable EEPROM_SETTINGS & EEPROM_CHITCHAT - restore_configs - - opt_enable EEPROM_SETTINGS - - opt_enable EEPROM_CHITCHAT + - opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT - build_marlin ### LCDS ### # ULTIMAKERCONTROLLER @@ -86,13 +81,11 @@ script: #- build_marlin # REPRAP_DISCOUNT_SMART_CONTROLLER - restore_configs - - opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER - - opt_enable SDSUPPORT + - opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT - build_marlin # G3D_PANEL - restore_configs - - opt_enable G3D_PANEL - - opt_enable SDSUPPORT + - opt_enable G3D_PANEL SDSUPPORT - build_marlin # REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER - restore_configs @@ -101,9 +94,7 @@ script: # REPRAPWORLD_KEYPAD # Cant find configuration details to get it to compile #- restore_configs - #- opt_enable ULTRA_LCD - #- opt_enable REPRAPWORLD_KEYPAD - #- opt_enable REPRAPWORLD_KEYPAD_MOVE_STEP + #- opt_enable ULTRA_LCD REPRAPWORLD_KEYPAD REPRAPWORLD_KEYPAD_MOVE_STEP #- build_marlin # RA_CONTROL_PANEL - restore_configs @@ -137,9 +128,7 @@ script: - build_marlin # Enable filament sensor with LCD display - restore_configs - - opt_enable ULTIMAKERCONTROLLER - - opt_enable FILAMENT_SENSOR - - opt_enable FILAMENT_LCD_DISPLAY + - opt_enable ULTIMAKERCONTROLLER FILAMENT_SENSOR FILAMENT_LCD_DISPLAY - build_marlin # Enable COREXY - restore_configs @@ -151,8 +140,7 @@ script: - build_marlin # Enable Z_DUAL_STEPPER_DRIVERS, Z_DUAL_ENDSTOPS - restore_configs - - opt_enable_adv Z_DUAL_STEPPER_DRIVERS - - opt_enable_adv Z_DUAL_ENDSTOPS + - opt_enable_adv Z_DUAL_STEPPER_DRIVERS Z_DUAL_ENDSTOPS - pins_set RAMPS_14 X_MAX_PIN -1 - opt_set_adv Z2_MAX_PIN 2 - build_marlin @@ -164,8 +152,7 @@ script: # Delta Config (generic) + ABL + ALLEN_KEY - use_example_configs delta/generic - opt_disable DISABLE_MIN_ENDSTOPS - - opt_enable AUTO_BED_LEVELING_FEATURE - - opt_enable Z_PROBE_ALLEN_KEY + - opt_enable AUTO_BED_LEVELING_FEATURE Z_PROBE_ALLEN_KEY - build_marlin # Delta Config (Mini Kossel) - use_example_configs delta/kossel_mini diff --git a/LinuxAddons/bin/opt_disable b/LinuxAddons/bin/opt_disable index f321a63049..36646dbe60 100755 --- a/LinuxAddons/bin/opt_disable +++ b/LinuxAddons/bin/opt_disable @@ -1,3 +1,5 @@ #!/usr/bin/env bash -eval "sed 's/\(\/\/ *\)*\(\#define *$1\)/\/\/\2/g' Marlin/Configuration.h" +for opt in "$@" ; do + eval "sed -i 's/\(\/\/ *\)*\(\#define *$opt\)/\/\/\2/g' Marlin/Configuration.h" +done diff --git a/LinuxAddons/bin/opt_enable b/LinuxAddons/bin/opt_enable index 6820db2aa0..42233f0635 100755 --- a/LinuxAddons/bin/opt_enable +++ b/LinuxAddons/bin/opt_enable @@ -1,3 +1,5 @@ #!/usr/bin/env bash -eval "sed -i 's/\/\/ *\(#define *$1\)/\1/g' Marlin/Configuration.h" +for opt in "$@" ; do + eval "sed -i 's/\/\/ *\(#define *$opt\)/\1/g' Marlin/Configuration.h" +done diff --git a/LinuxAddons/bin/opt_enable_adv b/LinuxAddons/bin/opt_enable_adv index 30b2ddbf34..89dfce1219 100755 --- a/LinuxAddons/bin/opt_enable_adv +++ b/LinuxAddons/bin/opt_enable_adv @@ -1,3 +1,5 @@ #!/usr/bin/env bash -eval "sed -i 's/\/\/ *\(#define *$1\)/\1/g' Marlin/Configuration_adv.h" +for opt in "$@" ; do + eval "sed -i 's/\/\/ *\(#define *$opt\)/\1/g' Marlin/Configuration_adv.h" +done