From 62e65280215d068cef203c101cc9bc29b43ad61d Mon Sep 17 00:00:00 2001 From: Luc <8822552+luc-github@users.noreply.github.com> Date: Mon, 23 Nov 2020 14:26:58 +0100 Subject: [PATCH] Fix new esp8266 waveform parameter in arduino crash travis --- command.sh | 24 ++++++++++++------------ platformio.ini | 2 ++ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/command.sh b/command.sh index c00ef4d4..70edf99c 100644 --- a/command.sh +++ b/command.sh @@ -2,7 +2,7 @@ function build_sketch() { - local sketch=$1 + local sketch=$1 local target=$2 local ide=$3 local bt=$4 @@ -36,7 +36,7 @@ function build_sketch() echo "setup for esp8266" sed -i "s/#define DISPLAY_DEVICE/\/\/#define DISPLAY_DEVICE/g" $TRAVIS_BUILD_DIR/esp3d/configuration.h sed -i "s/#define ETH_FEATURE/\/\/#define ETH_FEATURE/g" $TRAVIS_BUILD_DIR/esp3d/configuration.h - arduino --board esp8266com:esp8266:generic:eesz=4M3M,xtal=160,FlashMode=dio,FlashFreq=40,sdk=nonosdk221,ip=lm2f,dbg=Disabled,vt=flash,exception=disabled,ssl=basic --save-prefs + arduino --board esp8266com:esp8266:generic:eesz=4M3M,xtal=160,FlashMode=dio,FlashFreq=40,sdk=nonosdk221,ip=lm2f,dbg=Disabled,vt=flash,exception=disabled,ssl=basic, waveform=pwm --save-prefs fi if [[ "$fs" == "SPIFFS" ]]; then @@ -52,18 +52,18 @@ function build_sketch() fi echo "Display configuration" cat $TRAVIS_BUILD_DIR/esp3d/configuration.h - # build sketch with arduino ide - echo -e "\n Build $sketch \n" - arduino --verbose --verify $sketch + # build sketch with arduino ide + echo -e "\n Build $sketch \n" + arduino --verbose --verify $sketch - # get build result from arduino - local re=$? + # get build result from arduino + local re=$? - # check result - if [ $re -ne 0 ]; then - echo "Failed to build $sketch" - return $re - fi + # check result + if [ $re -ne 0 ]; then + echo "Failed to build $sketch" + return $re + fi else echo "setup for platformIO" sed -i "s/#define BLUETOOTH_FEATURE/\/\/#define BLUETOOTH_FEATURE/g" $TRAVIS_BUILD_DIR/esp3d/configuration.h diff --git a/platformio.ini b/platformio.ini index edc0fb5e..6a946804 100644 --- a/platformio.ini +++ b/platformio.ini @@ -51,6 +51,7 @@ build_flags = -DNONOSDK221=1 -DNDEBUG -DVTABLES_IN_FLASH + -DWAVEFORM_LOCKED_PWM upload_speed = 115200 lib_ignore = AsyncTCP @@ -75,6 +76,7 @@ build_flags = -DNONOSDK221=1 -DNDEBUG -DVTABLES_IN_FLASH + -DWAVEFORM_LOCKED_PWM upload_speed = 115200 lib_ignore = AsyncTCP