Fix Travis builds and add build for ESP8266 (#586)
* Fix Travis builds and add build for ESP8266
This commit is contained in:
parent
b0c6144886
commit
29595a7775
23
.travis.yml
23
.travis.yml
|
@ -1,17 +1,28 @@
|
||||||
sudo: false
|
sudo: false
|
||||||
|
|
||||||
language: python
|
language: python
|
||||||
python:
|
|
||||||
- "2.7"
|
|
||||||
|
|
||||||
os:
|
os:
|
||||||
- linux
|
- linux
|
||||||
|
|
||||||
dist:
|
git:
|
||||||
- xenial
|
depth: false
|
||||||
|
|
||||||
script:
|
stages:
|
||||||
- bash $TRAVIS_BUILD_DIR/travis/build.sh
|
- build
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
include:
|
||||||
|
|
||||||
|
- name: "Build Arduino ESP32"
|
||||||
|
if: tag IS blank AND (type = pull_request OR (type = push AND branch = master))
|
||||||
|
stage: build
|
||||||
|
script: bash $TRAVIS_BUILD_DIR/travis/build.sh esp32
|
||||||
|
|
||||||
|
- name: "Build Arduino ESP8266"
|
||||||
|
if: tag IS blank AND (type = pull_request OR (type = push AND branch = master))
|
||||||
|
stage: build
|
||||||
|
script: bash $TRAVIS_BUILD_DIR/travis/build.sh esp8266
|
||||||
|
|
||||||
notifications:
|
notifications:
|
||||||
email:
|
email:
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
|
#include <DNSServer.h>
|
||||||
|
#ifdef ESP32
|
||||||
#include <WiFi.h>
|
#include <WiFi.h>
|
||||||
#include <AsyncTCP.h>
|
#include <AsyncTCP.h>
|
||||||
#include <DNSServer.h>
|
#elif defined(ESP8266)
|
||||||
|
#include <ESP8266WiFi.h>
|
||||||
|
#include <ESPAsyncTCP.h>
|
||||||
|
#endif
|
||||||
#include "ESPAsyncWebServer.h"
|
#include "ESPAsyncWebServer.h"
|
||||||
|
|
||||||
DNSServer dnsServer;
|
DNSServer dnsServer;
|
||||||
|
|
|
@ -1,9 +1,15 @@
|
||||||
#include <WiFi.h>
|
|
||||||
#include <ESPmDNS.h>
|
|
||||||
#include <ArduinoOTA.h>
|
#include <ArduinoOTA.h>
|
||||||
|
#ifdef ESP32
|
||||||
#include <FS.h>
|
#include <FS.h>
|
||||||
#include <SPIFFS.h>
|
#include <SPIFFS.h>
|
||||||
|
#include <ESPmDNS.h>
|
||||||
|
#include <WiFi.h>
|
||||||
#include <AsyncTCP.h>
|
#include <AsyncTCP.h>
|
||||||
|
#elif defined(ESP8266)
|
||||||
|
#include <ESP8266WiFi.h>
|
||||||
|
#include <ESPAsyncTCP.h>
|
||||||
|
#include <ESP8266mDNS.h>
|
||||||
|
#endif
|
||||||
#include <ESPAsyncWebServer.h>
|
#include <ESPAsyncWebServer.h>
|
||||||
#include <SPIFFSEditor.h>
|
#include <SPIFFSEditor.h>
|
||||||
|
|
||||||
|
@ -134,8 +140,12 @@ void setup(){
|
||||||
});
|
});
|
||||||
server.addHandler(&events);
|
server.addHandler(&events);
|
||||||
|
|
||||||
|
#ifdef ESP32
|
||||||
server.addHandler(new SPIFFSEditor(SPIFFS, http_username,http_password));
|
server.addHandler(new SPIFFSEditor(SPIFFS, http_username,http_password));
|
||||||
|
#elif defined(ESP8266)
|
||||||
|
server.addHandler(new SPIFFSEditor(http_username,http_password));
|
||||||
|
#endif
|
||||||
|
|
||||||
server.on("/heap", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/heap", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
request->send(200, "text/plain", String(ESP.getFreeHeap()));
|
request->send(200, "text/plain", String(ESP.getFreeHeap()));
|
||||||
});
|
});
|
||||||
|
|
|
@ -6,8 +6,13 @@
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <Arduino.h>
|
#include <Arduino.h>
|
||||||
|
#ifdef ESP32
|
||||||
#include <WiFi.h>
|
#include <WiFi.h>
|
||||||
#include <AsyncTCP.h>
|
#include <AsyncTCP.h>
|
||||||
|
#elif defined(ESP8266)
|
||||||
|
#include <ESP8266WiFi.h>
|
||||||
|
#include <ESPAsyncTCP.h>
|
||||||
|
#endif
|
||||||
#include <ESPAsyncWebServer.h>
|
#include <ESPAsyncWebServer.h>
|
||||||
|
|
||||||
AsyncWebServer server(80);
|
AsyncWebServer server(80);
|
||||||
|
|
242
travis/build.sh
242
travis/build.sh
|
@ -1,29 +1,237 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
echo -e "travis_fold:start:sketch_test_env_prepare"
|
PLATFORM=$1
|
||||||
pip install pyserial
|
CHUNK_INDEX=$2
|
||||||
|
CHUNKS_CNT=$3
|
||||||
|
if [ "$#" -lt 3 ]; then
|
||||||
|
echo "Building all sketches"
|
||||||
|
CHUNK_INDEX=0
|
||||||
|
CHUNKS_CNT=1
|
||||||
|
fi
|
||||||
|
if [ "$CHUNKS_CNT" -le 0 ]; then
|
||||||
|
echo "Chunks count must be positive number"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if [ "$CHUNK_INDEX" -ge "$CHUNKS_CNT" ]; then
|
||||||
|
echo "Chunk index must be less than chunks count"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ $PLATFORM == "esp32" ]; then
|
||||||
|
echo "BUILDING ESP32 EXAMPLES"
|
||||||
|
elif [ $PLATFORM == "esp8266" ]; then
|
||||||
|
echo "BUILDING ESP8266 EXAMPLES"
|
||||||
|
else
|
||||||
|
echo "UNKNOWN PLATFORM $PLATFORM"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo -e "travis_fold:start:prep_arduino_ide"
|
||||||
|
# Install Arduino IDE
|
||||||
wget -O arduino.tar.xz https://www.arduino.cc/download.php?f=/arduino-nightly-linux64.tar.xz
|
wget -O arduino.tar.xz https://www.arduino.cc/download.php?f=/arduino-nightly-linux64.tar.xz
|
||||||
tar xf arduino.tar.xz
|
tar xf arduino.tar.xz
|
||||||
mv arduino-nightly $HOME/arduino_ide
|
mv arduino-nightly $HOME/arduino_ide
|
||||||
mkdir -p $HOME/Arduino/libraries
|
mkdir -p $HOME/Arduino/libraries
|
||||||
|
mkdir -p $HOME/Arduino/hardware
|
||||||
|
echo -e "travis_fold:end:prep_arduino_ide"
|
||||||
|
|
||||||
|
echo -e "travis_fold:start:sketch_test_env_prepare"
|
||||||
cd $HOME/Arduino/libraries
|
cd $HOME/Arduino/libraries
|
||||||
cp -rf $TRAVIS_BUILD_DIR ESPAsyncWebServer
|
cp -rf $TRAVIS_BUILD_DIR ESPAsyncWebServer
|
||||||
git clone https://github.com/bblanchon/ArduinoJson
|
git clone https://github.com/bblanchon/ArduinoJson
|
||||||
git clone https://github.com/me-no-dev/AsyncTCP
|
#wget https://github.com/bblanchon/ArduinoJson/releases/download/v6.11.0/ArduinoJson-v6.11.0.zip && unzip ArduinoJson-v6.11.0.zip
|
||||||
cd $HOME/arduino_ide/hardware
|
PLATFORM_EXAMPLES=$TRAVIS_BUILD_DIR/examples
|
||||||
mkdir espressif
|
|
||||||
cd espressif
|
if [ $PLATFORM == "esp32" ]; then
|
||||||
git clone https://github.com/espressif/arduino-esp32.git esp32
|
# ESP32
|
||||||
cd esp32
|
cd $HOME/Arduino/libraries
|
||||||
git submodule update --init --recursive
|
git clone https://github.com/me-no-dev/AsyncTCP
|
||||||
cd tools
|
cd $HOME/Arduino/hardware
|
||||||
python get.py
|
pip install pyserial
|
||||||
cd $TRAVIS_BUILD_DIR
|
mkdir espressif
|
||||||
export PATH="$HOME/arduino_ide:$HOME/arduino_ide/hardware/espressif/esp32/tools/xtensa-esp32-elf/bin:$PATH"
|
cd espressif
|
||||||
source travis/common.sh
|
git clone https://github.com/espressif/arduino-esp32.git esp32
|
||||||
|
cd esp32
|
||||||
|
git submodule update --init --recursive
|
||||||
|
cd tools
|
||||||
|
python get.py
|
||||||
|
PLATFORM_FQBN="espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app,CPUFreq=240,FlashMode=qio,FlashFreq=80,FlashSize=4M,UploadSpeed=921600,DebugLevel=none"
|
||||||
|
PLATFORM_SIZE_BIN=$HOME/Arduino/hardware/espressif/esp32/tools/xtensa-esp32-elf/bin/xtensa-esp32-elf-size
|
||||||
|
elif [ $PLATFORM == "esp8266" ]; then
|
||||||
|
# ESP8266
|
||||||
|
cd $HOME/Arduino/libraries
|
||||||
|
git clone https://github.com/me-no-dev/ESPAsyncTCP
|
||||||
|
cd $HOME/Arduino/hardware
|
||||||
|
mkdir esp8266com
|
||||||
|
cd esp8266com
|
||||||
|
git clone https://github.com/esp8266/Arduino.git esp8266
|
||||||
|
cd esp8266
|
||||||
|
git submodule update --init --recursive
|
||||||
|
cd tools
|
||||||
|
python get.py
|
||||||
|
PLATFORM_FQBN="esp8266com:esp8266:generic:xtal=80,FlashFreq=40,FlashMode=qio,baud=921600,eesz=4M1M,ip=lm2f,ResetMethod=nodemcu"
|
||||||
|
PLATFORM_SIZE_BIN=$HOME/Arduino/hardware/esp8266com/esp8266/tools/xtensa-lx106-elf/bin/xtensa-lx106-elf-size
|
||||||
|
fi
|
||||||
echo -e "travis_fold:end:sketch_test_env_prepare"
|
echo -e "travis_fold:end:sketch_test_env_prepare"
|
||||||
|
|
||||||
echo -e "travis_fold:start:sketch_test"
|
cd $TRAVIS_BUILD_DIR
|
||||||
build_sketches $HOME/arduino_ide $HOME/Arduino/libraries/ESPAsyncWebServer/examples "-l $HOME/Arduino/libraries"
|
|
||||||
|
ARDUINO_IDE_PATH=$HOME/arduino_ide
|
||||||
|
ARDUINO_USR_PATH=$HOME/Arduino
|
||||||
|
ARDUINO_BUILD_DIR=$HOME/build.tmp
|
||||||
|
ARDUINO_CACHE_DIR=$HOME/cache.tmp
|
||||||
|
ARDUINO_BUILD_CMD="$ARDUINO_IDE_PATH/arduino-builder -compile -logger=human -core-api-version=10810 -hardware \"$ARDUINO_IDE_PATH/hardware\" -hardware \"$ARDUINO_USR_PATH/hardware\" -tools \"$ARDUINO_IDE_PATH/tools-builder\" -built-in-libraries \"$ARDUINO_IDE_PATH/libraries\" -libraries \"$ARDUINO_USR_PATH/libraries\" -fqbn=$PLATFORM_FQBN -warnings=\"all\" -build-cache \"$ARDUINO_CACHE_DIR\" -build-path \"$ARDUINO_BUILD_DIR\" -verbose"
|
||||||
|
|
||||||
|
function print_size_info()
|
||||||
|
{
|
||||||
|
elf_file=$1
|
||||||
|
|
||||||
|
if [ -z "$elf_file" ]; then
|
||||||
|
if [ $PLATFORM == "esp32" ]; then
|
||||||
|
printf "sketch iram0.text flash.text flash.rodata dram0.data dram0.bss dram flash\n"
|
||||||
|
elif [ $PLATFORM == "esp8266" ]; then
|
||||||
|
printf "sketch data rodata bss text irom0.text dram flash\n"
|
||||||
|
fi
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
elf_name=$(basename $elf_file)
|
||||||
|
sketch_name="${elf_name%.*}"
|
||||||
|
declare -A segments
|
||||||
|
while read -a tokens; do
|
||||||
|
seg=${tokens[0]}
|
||||||
|
seg=${seg//./}
|
||||||
|
size=${tokens[1]}
|
||||||
|
addr=${tokens[2]}
|
||||||
|
if [ "$addr" -eq "$addr" -a "$addr" -ne "0" ] 2>/dev/null; then
|
||||||
|
segments[$seg]=$size
|
||||||
|
fi
|
||||||
|
done < <($PLATFORM_SIZE_BIN --format=sysv $elf_file)
|
||||||
|
|
||||||
|
if [ $PLATFORM == "esp32" ]; then
|
||||||
|
total_ram=$((${segments[dram0data]} + ${segments[dram0bss]}))
|
||||||
|
total_flash=$((${segments[iram0text]} + ${segments[flashtext]} + ${segments[dram0data]} + ${segments[flashrodata]}))
|
||||||
|
printf "%-32s %-8d %-8d %-8d %-8d %-8d %-8d %-8d\n" $sketch_name ${segments[iram0text]} ${segments[flashtext]} ${segments[flashrodata]} ${segments[dram0data]} ${segments[dram0bss]} $total_ram $total_flash
|
||||||
|
elif [ $PLATFORM == "esp8266" ]; then
|
||||||
|
total_ram=$((${segments[data]} + ${segments[rodata]} + ${segments[bss]}))
|
||||||
|
total_flash=$((${segments[data]} + ${segments[rodata]} + ${segments[text]} + ${segments[irom0text]}))
|
||||||
|
printf "%-28s %-8d %-8d %-8d %-8d %-8d %-8d %-8d\n" $sketch_name ${segments[data]} ${segments[rodata]} ${segments[bss]} ${segments[text]} ${segments[irom0text]} $total_ram $total_flash
|
||||||
|
fi
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
function build_sketch()
|
||||||
|
{
|
||||||
|
local sketch=$1
|
||||||
|
echo -e "\n------------ Building $sketch ------------\n";
|
||||||
|
rm -rf $ARDUINO_BUILD_DIR/*
|
||||||
|
time ($ARDUINO_BUILD_CMD $sketch >build.log)
|
||||||
|
local result=$?
|
||||||
|
if [ $result -ne 0 ]; then
|
||||||
|
echo "Build failed ($1)"
|
||||||
|
echo "Build log:"
|
||||||
|
cat build.log
|
||||||
|
return $result
|
||||||
|
fi
|
||||||
|
rm build.log
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
function count_sketches()
|
||||||
|
{
|
||||||
|
local sketches=$(find $PLATFORM_EXAMPLES -name *.ino)
|
||||||
|
local sketchnum=0
|
||||||
|
rm -rf sketches.txt
|
||||||
|
for sketch in $sketches; do
|
||||||
|
local sketchdir=$(dirname $sketch)
|
||||||
|
local sketchdirname=$(basename $sketchdir)
|
||||||
|
local sketchname=$(basename $sketch)
|
||||||
|
if [[ "${sketchdirname}.ino" != "$sketchname" ]]; then
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
echo $sketch >> sketches.txt
|
||||||
|
sketchnum=$(($sketchnum + 1))
|
||||||
|
done
|
||||||
|
return $sketchnum
|
||||||
|
}
|
||||||
|
|
||||||
|
function build_sketches()
|
||||||
|
{
|
||||||
|
mkdir -p $ARDUINO_BUILD_DIR
|
||||||
|
mkdir -p $ARDUINO_CACHE_DIR
|
||||||
|
mkdir -p $ARDUINO_USR_PATH/libraries
|
||||||
|
mkdir -p $ARDUINO_USR_PATH/hardware
|
||||||
|
|
||||||
|
local chunk_idex=$1
|
||||||
|
local chunks_num=$2
|
||||||
|
count_sketches
|
||||||
|
local sketchcount=$?
|
||||||
|
local sketches=$(cat sketches.txt)
|
||||||
|
|
||||||
|
local chunk_size=$(( $sketchcount / $chunks_num ))
|
||||||
|
local all_chunks=$(( $chunks_num * $chunk_size ))
|
||||||
|
if [ "$all_chunks" -lt "$sketchcount" ]; then
|
||||||
|
chunk_size=$(( $chunk_size + 1 ))
|
||||||
|
fi
|
||||||
|
|
||||||
|
local start_index=$(( $chunk_idex * $chunk_size ))
|
||||||
|
if [ "$sketchcount" -le "$start_index" ]; then
|
||||||
|
echo "Skipping job"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
local end_index=$(( $(( $chunk_idex + 1 )) * $chunk_size ))
|
||||||
|
if [ "$end_index" -gt "$sketchcount" ]; then
|
||||||
|
end_index=$sketchcount
|
||||||
|
fi
|
||||||
|
|
||||||
|
local start_num=$(( $start_index + 1 ))
|
||||||
|
#echo -e "Sketches: \n$sketches\n"
|
||||||
|
echo "Found $sketchcount Sketches";
|
||||||
|
echo "Chunk Count : $chunks_num"
|
||||||
|
echo "Chunk Size : $chunk_size"
|
||||||
|
echo "Start Sketch: $start_num"
|
||||||
|
echo "End Sketch : $end_index"
|
||||||
|
|
||||||
|
local sketchnum=0
|
||||||
|
print_size_info >size.log
|
||||||
|
for sketch in $sketches; do
|
||||||
|
local sketchdir=$(dirname $sketch)
|
||||||
|
local sketchdirname=$(basename $sketchdir)
|
||||||
|
local sketchname=$(basename $sketch)
|
||||||
|
if [[ "${sketchdirname}.ino" != "$sketchname" ]]; then
|
||||||
|
#echo "Skipping $sketch, beacause it is not the main sketch file";
|
||||||
|
continue
|
||||||
|
fi;
|
||||||
|
if [[ -f "$sketchdir/.test.skip" ]]; then
|
||||||
|
#echo "Skipping $sketch marked";
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
sketchnum=$(($sketchnum + 1))
|
||||||
|
if [ "$sketchnum" -le "$start_index" ]; then
|
||||||
|
#echo "Skipping $sketch index low"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
if [ "$sketchnum" -gt "$end_index" ]; then
|
||||||
|
#echo "Skipping $sketch index high"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
build_sketch $sketch
|
||||||
|
local result=$?
|
||||||
|
if [ $result -ne 0 ]; then
|
||||||
|
return $result
|
||||||
|
fi
|
||||||
|
print_size_info $ARDUINO_BUILD_DIR/*.elf >>size.log
|
||||||
|
done
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
echo -e "travis_fold:start:test_arduino_ide"
|
||||||
|
# Build Examples
|
||||||
|
build_sketches $CHUNK_INDEX $CHUNKS_CNT
|
||||||
if [ $? -ne 0 ]; then exit 1; fi
|
if [ $? -ne 0 ]; then exit 1; fi
|
||||||
echo -e "travis_fold:end:sketch_test"
|
echo -e "travis_fold:end:test_arduino_ide"
|
||||||
|
|
||||||
|
echo -e "travis_fold:start:size_report"
|
||||||
|
cat size.log
|
||||||
|
echo -e "travis_fold:end:size_report"
|
||||||
|
|
Loading…
Reference in New Issue