diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..639c48f --- /dev/null +++ b/.travis.yml @@ -0,0 +1,28 @@ +sudo: false +language: bash +os: linux +dist: trusty + +matrix: + include: + - env: + - BUILD_TYPE=build + - env: + - BUILD_TYPE=build_esp32 + +install: + +script: + - $TRAVIS_BUILD_DIR/tests/common.sh + +deploy: + +notifications: + email: + on_success: change + on_failure: change + webhooks: + urls: + on_success: change # options: [always|never|change] default: always + on_failure: always # options: [always|never|change] default: always + on_start: false # default: false diff --git a/README.md b/README.md index af7a1b8..5580327 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ESP8266Audio - now supporting ESP32 as well! +# ESP8266Audio - now supporting ESP32 as well! [![Build Status](https://travis-ci.org/earlephilhower/ESP8266Audio.svg?branch=master)](https://travis-ci.org/earlephilhower/ESP8266Audio) Arduino library for parsing and decoding MOD, WAV, MP3, FLAC, MIDI, and AAC files and playing them on an I2S DAC or even using a software-simulated delta-sigma DAC with dynamic 32x oversampling. ESP8266 is fully supported and most mature, but we've also just introduced support for the ESP32. diff --git a/examples/PlayMIDIFromFastROMFS/PlayMIDIFromFastROMFS.ino b/examples/PlayMIDIFromSPIFFS/PlayMIDIFromSPIFFS.ino similarity index 67% rename from examples/PlayMIDIFromFastROMFS/PlayMIDIFromFastROMFS.ino rename to examples/PlayMIDIFromSPIFFS/PlayMIDIFromSPIFFS.ino index d500fd8..b16b4ad 100644 --- a/examples/PlayMIDIFromFastROMFS/PlayMIDIFromFastROMFS.ino +++ b/examples/PlayMIDIFromSPIFFS/PlayMIDIFromSPIFFS.ino @@ -1,6 +1,7 @@ #include #ifdef ESP32 #include + #include "SPIFFS.h" #else #include #endif @@ -9,29 +10,25 @@ #include #include #include -#include +#include -AudioFileSourceFastROMFS *sf2; -AudioFileSourceFastROMFS *mid; +AudioFileSourceSPIFFS *sf2; +AudioFileSourceSPIFFS *mid; AudioOutputI2SDAC *dac; AudioGeneratorMIDI *midi; -FastROMFilesystem *fs; void setup() { - const char *soundfont = "1mgm.sf2"; - const char *midifile = "furelise.mid"; + const char *soundfont = "/1mgm.sf2"; + const char *midifile = "/furelise.mid"; WiFi.mode(WIFI_OFF); Serial.begin(115200); Serial.println("Starting up...\n"); - fs = new FastROMFilesystem(); - fs->mount(); - - sf2 = new AudioFileSourceFastROMFS(fs, soundfont); - mid = new AudioFileSourceFastROMFS(fs, midifile); + sf2 = new AudioFileSourceSPIFFS(soundfont); + mid = new AudioFileSourceSPIFFS(midifile); dac = new AudioOutputI2SDAC(); midi = new AudioGeneratorMIDI(); diff --git a/examples/PlayMIDIFromFastROMFS/data/1mgm.sf2 b/examples/PlayMIDIFromSPIFFS/data/1mgm.sf2 similarity index 100% rename from examples/PlayMIDIFromFastROMFS/data/1mgm.sf2 rename to examples/PlayMIDIFromSPIFFS/data/1mgm.sf2 diff --git a/examples/PlayMIDIFromFastROMFS/data/furelise.mid b/examples/PlayMIDIFromSPIFFS/data/furelise.mid similarity index 100% rename from examples/PlayMIDIFromFastROMFS/data/furelise.mid rename to examples/PlayMIDIFromSPIFFS/data/furelise.mid diff --git a/tests/common.sh b/tests/common.sh new file mode 100755 index 0000000..0c79a72 --- /dev/null +++ b/tests/common.sh @@ -0,0 +1,167 @@ +#!/usr/bin/env bash + +#set -x # echo on + +function print_size_info() +{ + elf_file=$1 + + if [ -z "$elf_file" ]; then + printf "sketch data rodata bss text irom0.text dram flash\n" + return 0 + fi + + elf_name=$(basename $elf_file) + sketch_name="${elf_name%.*}" + # echo $sketch_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 < <(xtensa-lx106-elf-size --format=sysv $elf_file) + + 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 + return 0 +} + +function build_sketches() +{ + set +e + local arduino=$1 + local srcpath=$2 + local build_arg=$3 + local build_dir=build.tmp + mkdir -p $build_dir + local build_cmd="python $arduino/$BUILD_PY -p $PWD/$build_dir $build_arg " + local sketches=$(find $srcpath -name *.ino) + print_size_info >size.log + export ARDUINO_IDE_PATH=$arduino + for sketch in $sketches; do + rm -rf $build_dir/* + 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 -e "\n ------------ Skipping $sketch ------------ \n"; + continue + fi + echo -e "\n ------------ Building $sketch ------------ \n"; + # $arduino --verify $sketch; + echo "$build_cmd $sketch" + time ($build_cmd $sketch >build.log) + local result=$? + if [ $result -ne 0 ]; then + echo "Build failed ($1)" + echo "Build log:" + cat build.log + set -e + return $result + fi + rm build.log + #print_size_info $build_dir/*.elf >>size.log + done + set -e +} + +function install_libraries() +{ + mkdir -p $HOME/Arduino/libraries + cp -a $TRAVIS_BUILD_DIR $HOME/Arduino/libraries/ESP8266Audio + git clone https://github.com/earlephilhower/ESP8266SAM $HOME/Arduino/libraries/ESP8266SAM + git clone https://github.com/earlephilhower/ESP8266FastROMFS $HOME/Arduino/libraries/ESP8266FastROMFS + git clone https://github.com/Gianbacchio/ESP8266_Spiram $HOME/Arduino/libraries/ESP8266_Spiram + # Following libs are not to be tested, just used. + rm -rf $HOME/Arduino/libraries/ESP8266_Spiram/examples + rm -rf $HOME/Arduino/libraries/ESP8266FastROMFS/examples +} + +function install_ide() +{ + local ide_path=$1 + local core_path=$2 + wget -O arduino.tar.xz https://www.arduino.cc/download.php?f=/arduino-nightly-linux64.tar.xz + tar xf arduino.tar.xz + mv arduino-nightly $ide_path + cd $ide_path/hardware + mkdir esp8266com + cd esp8266com + git clone https://github.com/esp8266/Arduino esp8266 + pushd esp8266/tools + python get.py + export PATH="$ide_path:$ide_path/hardware/esp8266com/esp8266/tools/xtensa-lx106-elf/bin:$PATH" + popd + cd .. + mkdir espressif + cd espressif + git clone https://github.com/espressif/arduino-esp32 esp32 + pushd esp32/tools + python get.py + export PATH="$ide_path:$ide_path/hardware/espressif/esp32/tools/xtensa-esp32-elf/bin:$PATH" + popd +} + +function run_host_tests() +{ + pushd host + make + make clean-objects + popd +} + + +function install_arduino() +{ + # Install Arduino IDE and required libraries + echo -e "travis_fold:start:sketch_test_env_prepare" + cd $TRAVIS_BUILD_DIR + install_ide $HOME/arduino_ide $TRAVIS_BUILD_DIR + which arduino + cd $TRAVIS_BUILD_DIR + install_libraries + echo -e "travis_fold:end:sketch_test_env_prepare" +} + +function build_sketches_with_arduino() +{ + # Compile sketches + echo -e "travis_fold:start:sketch_test" +# build_sketches $HOME/arduino_ide $TRAVIS_BUILD_DIR/libraries "-l $HOME/Arduino/libraries" + build_sketches $HOME/arduino_ide $HOME/Arduino/libraries "-l $HOME/Arduino/libraries" + echo -e "travis_fold:end:sketch_test" + + # Generate size report + echo -e "travis_fold:start:size_report" + cat size.log + echo -e "travis_fold:end:size_report" +} + +set -e + +if [ "$BUILD_TYPE" = "build" ]; then + export BUILD_PY="hardware/esp8266com/esp8266/tools/build.py -b generic -s 4M1M -v -k " + install_arduino + build_sketches_with_arduino +elif [ "$BUILD_TYPE" = "build_esp32" ]; then + export BUILD_PY="hardware/espressif/esp32/tools/build.py -b esp32 -v -k " + install_arduino + build_sketches_with_arduino +elif [ "$BUILD_TYPE" = "host_tests" ]; then + # Run host side tests + cd $TRAVIS_BUILD_DIR/tests + run_host_tests +fi +