From 260dbaf2eca032fd994ed0660248f9965a7eff97 Mon Sep 17 00:00:00 2001 From: odaki Date: Mon, 6 May 2019 10:08:29 +0900 Subject: [PATCH 1/2] Add a test to enable both BT and WiFi. To enable both, change the partition setting to min_spiffs. --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2e0c3959..a995e728 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,6 @@ before_script: - cd esp32/tools - python get.py - cd .. - - echo 'build.flash_freq=40m' >> platform.txt - mv $TRAVIS_BUILD_DIR/libraries/ESP32SSDP $HOME/arduino_ide/libraries/ - mv $TRAVIS_BUILD_DIR/libraries/arduinoWebSockets $HOME/arduino_ide/libraries/ @@ -26,7 +25,7 @@ script: - cd $TRAVIS_BUILD_DIR - source command.sh - export PATH="$HOME/arduino_ide:$PATH" - - arduino --board esp32:esp32:esp32 --save-prefs + - arduino --board esp32:esp32:esp32:PartitionScheme=min_spiffs,FlashFreq=40 --save-prefs - sed -n '48,72p;73q' $TRAVIS_BUILD_DIR/Grbl_Esp32/config.h - sed -i "s/\/\/#define ENABLE_BLUETOOTH/#define ENABLE_BLUETOOTH/g" $TRAVIS_BUILD_DIR/Grbl_Esp32/config.h - sed -i "s/#define ENABLE_BLUETOOTH/\/\/#define ENABLE_BLUETOOTH/g" $TRAVIS_BUILD_DIR/Grbl_Esp32/config.h @@ -37,6 +36,11 @@ script: - sed -i "s/#define ENABLE_WIFI/\/\/#define ENABLE_WIFI/g" $TRAVIS_BUILD_DIR/Grbl_Esp32/config.h - sed -n '48,72p;73q' $TRAVIS_BUILD_DIR/Grbl_Esp32/config.h - build_sketch $TRAVIS_BUILD_DIR/Grbl_Esp32/Grbl_Esp32.ino + - sed -i "s/\/\/#define ENABLE_BLUETOOTH/#define ENABLE_BLUETOOTH/g" $TRAVIS_BUILD_DIR/Grbl_Esp32/config.h + - sed -i "s/\/\/#define ENABLE_WIFI/#define ENABLE_WIFI/g" $TRAVIS_BUILD_DIR/Grbl_Esp32/config.h + - sed -n '48,72p;73q' $TRAVIS_BUILD_DIR/Grbl_Esp32/config.h + - build_sketch $TRAVIS_BUILD_DIR/Grbl_Esp32/Grbl_Esp32.ino + notifications: email: From d4b7e82b4758fba2cbbf47b75a8edaa52389a0fa Mon Sep 17 00:00:00 2001 From: odaki Date: Mon, 6 May 2019 14:31:15 +0900 Subject: [PATCH 2/2] Change warning level to all to recognize potential errors For example, uninitialized variable references could not be found in the original grbl source. To catch this kind of problem we should update travis. (Thanks to Luc!) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a995e728..2e8c816a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ script: - cd $TRAVIS_BUILD_DIR - source command.sh - export PATH="$HOME/arduino_ide:$PATH" - - arduino --board esp32:esp32:esp32:PartitionScheme=min_spiffs,FlashFreq=40 --save-prefs + - arduino --board esp32:esp32:esp32:PartitionScheme=min_spiffs,FlashFreq=40 --pref compiler.warning_level=all --save-prefs - sed -n '48,72p;73q' $TRAVIS_BUILD_DIR/Grbl_Esp32/config.h - sed -i "s/\/\/#define ENABLE_BLUETOOTH/#define ENABLE_BLUETOOTH/g" $TRAVIS_BUILD_DIR/Grbl_Esp32/config.h - sed -i "s/#define ENABLE_BLUETOOTH/\/\/#define ENABLE_BLUETOOTH/g" $TRAVIS_BUILD_DIR/Grbl_Esp32/config.h