From 280af07b4c1258e4e455697ef3dfd4aa78e2af5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Br=C3=A1zio?= Date: Fri, 10 Jun 2016 15:25:00 +0100 Subject: [PATCH 1/2] Improves travis buildroot regexp --- buildroot/bin/opt_disable | 2 +- buildroot/bin/opt_disable_adv | 5 +++++ buildroot/bin/opt_enable | 2 +- buildroot/bin/opt_enable_adv | 2 +- buildroot/bin/opt_set | 2 +- buildroot/bin/opt_set_adv | 2 +- buildroot/bin/pins_set | 2 +- 7 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 buildroot/bin/opt_disable_adv diff --git a/buildroot/bin/opt_disable b/buildroot/bin/opt_disable index 4e2d853fb0..35ad1aad4a 100755 --- a/buildroot/bin/opt_disable +++ b/buildroot/bin/opt_disable @@ -1,5 +1,5 @@ #!/usr/bin/env bash for opt in "$@" ; do - eval "sed -i 's/\(\/\/ *\)*\(\#define +$opt[^a-zA-Z0-9_]\)/\/\/\2/g' Marlin/Configuration.h" + eval "sed -i 's/\([[:blank:]]*\)\(#define \b${opt}\b\)/\1\/\/\2/g' Marlin/Configuration.h" done diff --git a/buildroot/bin/opt_disable_adv b/buildroot/bin/opt_disable_adv new file mode 100644 index 0000000000..80d83183e5 --- /dev/null +++ b/buildroot/bin/opt_disable_adv @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +for opt in "$@" ; do + eval "sed -i 's/\([[:blank:]]*\)\(#define \b${opt}\b\)/\1\/\/\2/g' Marlin/Configuration_adv.h" +done diff --git a/buildroot/bin/opt_enable b/buildroot/bin/opt_enable index cc9a3e007d..7b119fa15f 100755 --- a/buildroot/bin/opt_enable +++ b/buildroot/bin/opt_enable @@ -1,5 +1,5 @@ #!/usr/bin/env bash for opt in "$@" ; do - eval "sed -i 's/\/\/ *\(#define +$opt[^a-zA-Z0-9_]\)/\1/g' Marlin/Configuration.h" + eval "sed -i 's/\/\/[[:blank:]]*\(#define \b${opt}\b\)/\1/g' Marlin/Configuration.h" done diff --git a/buildroot/bin/opt_enable_adv b/buildroot/bin/opt_enable_adv index a557dc3f71..a34e56f12c 100755 --- a/buildroot/bin/opt_enable_adv +++ b/buildroot/bin/opt_enable_adv @@ -1,5 +1,5 @@ #!/usr/bin/env bash for opt in "$@" ; do - eval "sed -i 's/\/\/ *\(#define +$opt[^a-zA-Z0-9_]\)/\1/g' Marlin/Configuration_adv.h" + eval "sed -i 's/\/\/[[:blank:]]*\(#define \b${opt}\b\)/\1/g' Marlin/Configuration_adv.h" done diff --git a/buildroot/bin/opt_set b/buildroot/bin/opt_set index 2646bc1037..cf8c0d850c 100755 --- a/buildroot/bin/opt_set +++ b/buildroot/bin/opt_set @@ -1,3 +1,3 @@ #!/usr/bin/env bash -eval "sed -i 's/\(#define +$1 +\)[^ ]*$/\1 $2/g' Marlin/Configuration.h" +eval "sed -i 's/\(#define \b${1}\b\).*$/\1 ${2}/g' Marlin/Configuration.h" diff --git a/buildroot/bin/opt_set_adv b/buildroot/bin/opt_set_adv index 63a18d4369..54076a0bca 100755 --- a/buildroot/bin/opt_set_adv +++ b/buildroot/bin/opt_set_adv @@ -1,3 +1,3 @@ #!/usr/bin/env bash -eval "sed -i 's/\(#define +$1 +\)[^ ]*$/\1 $2/g' Marlin/Configuration_adv.h" +eval "sed -i 's/\(#define \b${1}\b\).*$/\1 ${2}/g' Marlin/Configuration_adv.h" diff --git a/buildroot/bin/pins_set b/buildroot/bin/pins_set index bd14586be3..ae6549fb3d 100755 --- a/buildroot/bin/pins_set +++ b/buildroot/bin/pins_set @@ -1,3 +1,3 @@ #!/usr/bin/env bash -eval "sed -i 's/\(#define +$2 +\)[^ ]*$/\1 $3/g' Marlin/pins_$1.h" +eval "sed -i 's/\(#define \b${2}\b\).*$/\1 ${3}/g' Marlin/pins_${1}.h" From 9b3a0895fdcde5fdec33643e828a0832a413f5ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Br=C3=A1zio?= Date: Fri, 10 Jun 2016 16:04:01 +0100 Subject: [PATCH 2/2] Upgrades travis Arduino IDE version to 1.6.9 --- .travis.yml | 132 +++++++++++++++++++++++++++------------------------- 1 file changed, 69 insertions(+), 63 deletions(-) diff --git a/.travis.yml b/.travis.yml index 24640918a0..ed31e34e0c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,10 +17,10 @@ before_install: # install: # - # Install arduino 1.6.8 - - wget http://downloads-02.arduino.cc/arduino-1.6.8-linux64.tar.xz - - tar xf arduino-1.6.8-linux64.tar.xz - - sudo mv arduino-1.6.8 /usr/local/share/arduino + # Install arduino 1.6.9 + - wget http://downloads-02.arduino.cc/arduino-1.6.9-linux64.tar.xz + - tar xf arduino-1.6.9-linux64.tar.xz + - sudo mv arduino-1.6.9 /usr/local/share/arduino - ln -s /usr/local/share/arduino/arduino ${TRAVIS_BUILD_DIR}/buildroot/bin/arduino # # Install: LiquidCrystal_I2C library @@ -105,7 +105,8 @@ script: - opt_enable NUM_SERVOS Z_ENDSTOP_SERVO_NR SERVO_ENDSTOP_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE - build_marlin # - # Test EEPROM_SETTINGS, EEPROM_CHITCHAT, M100_FREE_MEMORY_WATCHER, INCH_MODE_SUPPORT, TEMPERATURE_UNITS_SUPPORT + # Test EEPROM_SETTINGS, EEPROM_CHITCHAT, M100_FREE_MEMORY_WATCHER, + # INCH_MODE_SUPPORT, TEMPERATURE_UNITS_SUPPORT # - restore_configs - opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT M100_FREE_MEMORY_WATCHER INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT @@ -130,7 +131,57 @@ script: - opt_enable BQ_LCD_SMART_CONTROLLER SPEAKER - build_marlin # - ### LCDS ### + # Enable FILAMENTCHANGEENABLE + # + - restore_configs + - opt_enable FILAMENTCHANGEENABLE ULTIMAKERCONTROLLER + - build_marlin + # + # Enable filament sensor + # + - restore_configs + - opt_enable FILAMENT_WIDTH_SENSOR + - build_marlin + # + # Enable filament sensor with LCD display + # + - opt_enable ULTIMAKERCONTROLLER FILAMENT_LCD_DISPLAY + - build_marlin + # + # Enable BEZIER_CURVE_SUPPORT + # + - restore_configs + - opt_enable_adv BEZIER_CURVE_SUPPORT + - build_marlin + # + # Enable COREXY + # + - restore_configs + - opt_enable COREXY + - build_marlin + # + # Enable COREXZ + # + - restore_configs + - opt_enable COREXZ + - build_marlin + # + # Enable Z_DUAL_STEPPER_DRIVERS, Z_DUAL_ENDSTOPS + # + - restore_configs + - 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 + # + # Test PRINTCOUNTER + # + - restore_configs + - opt_enable PRINTCOUNTER + - build_marlin + # + # + ######## STANDARD LCD/PANELS ############## # # ULTRA_LCD # @@ -188,25 +239,29 @@ script: - opt_enable RA_CONTROL_PANEL - build_marlin # - ### I2C PANELS ### + ######## I2C LCD/PANELS ############## + # + # !!!ATTENTION!!! + # Most I2C configurations are failing at the moment because they require + # a different Liquid Crystal library "LiquidTWI2". # # LCD_I2C_SAINSMART_YWROBOT - # Failing at the moment needs different library + # #- restore_configs #- opt_enable LCD_I2C_SAINSMART_YWROBOT #- build_marlin # # LCD_I2C_PANELOLU2 # - - restore_configs - - opt_enable LCD_I2C_PANELOLU2 - - build_marlin + #- restore_configs + #- opt_enable LCD_I2C_PANELOLU2 + #- build_marlin # # LCD_I2C_VIKI # - - restore_configs - - opt_enable LCD_I2C_VIKI - - build_marlin + #- restore_configs + #- opt_enable LCD_I2C_VIKI + #- build_marlin # # LCM1602 # @@ -214,55 +269,6 @@ script: - opt_enable LCM1602 - build_marlin # - # Enable FILAMENTCHANGEENABLE - # - - restore_configs - - opt_enable FILAMENTCHANGEENABLE ULTIMAKERCONTROLLER - - build_marlin - # - # Enable filament sensor - # - - restore_configs - - opt_enable FILAMENT_WIDTH_SENSOR - - build_marlin - # - # Enable filament sensor with LCD display - # - - opt_enable ULTIMAKERCONTROLLER FILAMENT_LCD_DISPLAY - - build_marlin - # - # Enable BEZIER_CURVE_SUPPORT - # - - restore_configs - - opt_enable_adv BEZIER_CURVE_SUPPORT - - build_marlin - # - # Enable COREXY - # - - restore_configs - - opt_enable COREXY - - build_marlin - # - # Enable COREXZ - # - - restore_configs - - opt_enable COREXZ - - build_marlin - # - # Enable Z_DUAL_STEPPER_DRIVERS, Z_DUAL_ENDSTOPS - # - - restore_configs - - 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 - # - # Test PRINTCOUNTER - # - - restore_configs - - opt_enable PRINTCOUNTER - - build_marlin - # # ######## Example Configurations ############## #