GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-10-19 23:41:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix new esp8266 waveform parameter in arduino crash travis

Browse Source
This commit is contained in:
Luc 2020-11-23 14:26:58 +01:00
parent 29f2d837eb
commit 62e6528021
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
command.sh
View File

@ -2,7 +2,7 @@
function build_sketch() function build_sketch()
{ {
local sketch=$1 local sketch=$1
local target=$2 local target=$2
local ide=$3 local ide=$3
local bt=$4 local bt=$4
@ -36,7 +36,7 @@ function build_sketch()
echo "setup for esp8266" echo "setup for esp8266"
sed -i "s/#define DISPLAY_DEVICE/\/\/#define DISPLAY_DEVICE/g" $TRAVIS_BUILD_DIR/esp3d/configuration.h 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 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 fi
if [[ "$fs" == "SPIFFS" ]]; if [[ "$fs" == "SPIFFS" ]];
then then
@ -52,18 +52,18 @@ function build_sketch()
fi fi
echo "Display configuration" echo "Display configuration"
cat $TRAVIS_BUILD_DIR/esp3d/configuration.h cat $TRAVIS_BUILD_DIR/esp3d/configuration.h
# build sketch with arduino ide # build sketch with arduino ide
echo -e "\n Build $sketch \n" echo -e "\n Build $sketch \n"
arduino --verbose --verify $sketch arduino --verbose --verify $sketch
# get build result from arduino # get build result from arduino
local re=$? local re=$?
# check result # check result
if [ $re -ne 0 ]; then if [ $re -ne 0 ]; then
echo "Failed to build $sketch" echo "Failed to build $sketch"
return $re return $re
fi fi
else else
echo "setup for platformIO" echo "setup for platformIO"
sed -i "s/#define BLUETOOTH_FEATURE/\/\/#define BLUETOOTH_FEATURE/g" $TRAVIS_BUILD_DIR/esp3d/configuration.h sed -i "s/#define BLUETOOTH_FEATURE/\/\/#define BLUETOOTH_FEATURE/g" $TRAVIS_BUILD_DIR/esp3d/configuration.h

2
platformio.ini
View File

@ -51,6 +51,7 @@ build_flags =
-DNONOSDK221=1 -DNONOSDK221=1
-DNDEBUG -DNDEBUG
-DVTABLES_IN_FLASH -DVTABLES_IN_FLASH
-DWAVEFORM_LOCKED_PWM
upload_speed = 115200 upload_speed = 115200
lib_ignore = lib_ignore =
AsyncTCP AsyncTCP
@ -75,6 +76,7 @@ build_flags =
-DNONOSDK221=1 -DNONOSDK221=1
-DNDEBUG -DNDEBUG
-DVTABLES_IN_FLASH -DVTABLES_IN_FLASH
-DWAVEFORM_LOCKED_PWM
upload_speed = 115200 upload_speed = 115200
lib_ignore = lib_ignore =
AsyncTCP AsyncTCP