Get ESP8266 CI running again (#531)
Add LWIP to ESP8266 builds New build step on ESP8266 Fix warnings, quiet get.py Ack SPIFFS deprecation Example fix Clean up overzealous pragmas Fix server.accept() deprecation
This commit is contained in:
1 parent
2069060574
commit
a6f1eda9a2
8 files changed
+23
-8
No files matched your search
@@ -48,7 +48,6 @@ void loop()
|
||||
{
|
||||
if (midi->isRunning()) {
|
||||
if (!midi->loop()) {
|
||||
uint32_t e = millis();
|
||||
midi->stop();
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -30,6 +30,7 @@ class AudioOutputNullSlow : public AudioOutput
|
||||
~AudioOutputNullSlow() {};
|
||||
virtual bool begin() { samples = 0; startms = millis(); return true; }
|
||||
virtual bool ConsumeSample(int16_t sample[2]) {
|
||||
(void) sample;
|
||||
// return false (= output buffer full)
|
||||
// sometimes to let the main loop running
|
||||
constexpr int everylog2 = 10;
|
||||
|
||||
@@ -13,10 +13,10 @@ void loop() {}
|
||||
#include "AudioFileSourceBuffer.h"
|
||||
#include "AudioGeneratorMP3.h"
|
||||
#if AUDIO
|
||||
#pragma message("Outputting audio")
|
||||
// #pragma message("Outputting audio")
|
||||
#include "AudioOutputLinuxDSP.h"
|
||||
#else
|
||||
#pragma message("No audio")
|
||||
// #pragma message("No audio")
|
||||
#include "AudioOutputNullSlow.h"
|
||||
#endif
|
||||
|
||||
|
||||
@@ -24,6 +24,9 @@ void setup() {}
|
||||
void loop() {}
|
||||
#else
|
||||
|
||||
// ESP8266 server.available() is now server.accept()
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||
|
||||
#if defined(ESP32)
|
||||
#include <WiFi.h>
|
||||
#else
|
||||
|
||||
@@ -20,6 +20,9 @@
|
||||
|
||||
#if defined(ESP32) || defined(ESP8266)
|
||||
|
||||
#ifdef _GNU_SOURCE
|
||||
#undef _GNU_SOURCE
|
||||
#endif
|
||||
#define _GNU_SOURCE
|
||||
|
||||
#include "AudioFileSourceICYStream.h"
|
||||
|
||||
@@ -27,6 +27,9 @@
|
||||
#include "AudioFileSource.h"
|
||||
#include "AudioFileSourceFS.h"
|
||||
|
||||
// Yes, I know SPIFFS is deprecated
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||
|
||||
class AudioFileSourceSPIFFS : public AudioFileSourceFS
|
||||
{
|
||||
public:
|
||||
|
||||
@@ -26,6 +26,10 @@
|
||||
#include "SPIFFS.h"
|
||||
#endif
|
||||
|
||||
// Yes, I know SPIFFS is deprecated
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||
|
||||
|
||||
#include "AudioOutputSPIFFSWAV.h"
|
||||
|
||||
static const uint8_t wavHeaderTemplate[] PROGMEM = { // Hardcoded simple WAV header with 0xffffffff lengths all around
|
||||
|
||||
+7
-5
@@ -111,13 +111,15 @@ function install_esp8266()
|
||||
# Set custom warnings for all builds (i.e. could add -Wextra at some point)
|
||||
echo "compiler.c.extra_flags=-Wall -Wextra -Werror $debug_flags" > ../platform.local.txt
|
||||
echo "compiler.cpp.extra_flags=-Wall -Wextra -Werror $debug_flags" >> ../platform.local.txt
|
||||
echo "mkbuildoptglobals.extra_flags=--ci --cache_core" >> ../platform.local.txt
|
||||
echo -e "\n----platform.local.txt----"
|
||||
cat ../platform.local.txt
|
||||
git submodule init
|
||||
git submodule update
|
||||
python3 get.py
|
||||
python3 get.py -q
|
||||
export PATH="$ide_path/hardware/esp8266com/esp8266/tools/xtensa-lx106-elf/bin:$PATH"
|
||||
popd
|
||||
cd esp8266
|
||||
}
|
||||
|
||||
function install_rp2040()
|
||||
@@ -138,7 +140,7 @@ function install_rp2040()
|
||||
cd ../pico-sdk
|
||||
git submodule update --init
|
||||
cd ../tools
|
||||
python3 get.py
|
||||
python3 get.py -q
|
||||
export PATH="$ide_path/hardware/pico/rp2040/system/arm-none-eabi/bin:$PATH"
|
||||
popd
|
||||
cd rp2040
|
||||
@@ -192,11 +194,12 @@ if [ "$BUILD_MOD" == "" ]; then
|
||||
export BUILD_REM=0
|
||||
fi
|
||||
|
||||
export cache_dir=$(mktemp -d)
|
||||
if [ "$BUILD_TYPE" = "build" ]; then
|
||||
export BUILD_PY="hardware/esp8266com/esp8266/tools/build.py -b generic -s 4M1M -v -k "
|
||||
install_arduino
|
||||
install_esp8266 "$HOME/arduino_ide"
|
||||
build_sketches_with_arduino
|
||||
source "$HOME/arduino_ide/hardware/esp8266com/esp8266/tests/common.sh"
|
||||
build_sketches "$HOME/arduino_ide" "$TRAVIS_BUILD_DIR" "-l $HOME/Arduino/libraries" "$BUILD_MOD" "$BUILD_REM" "lm2f"
|
||||
elif [ "$BUILD_TYPE" = "build_esp32" ]; then
|
||||
install_arduino
|
||||
install_esp32 "$HOME/arduino_ide"
|
||||
@@ -210,7 +213,6 @@ elif [ "$BUILD_TYPE" = "build_esp32" ]; then
|
||||
elif [ "$BUILD_TYPE" = "build_rp2040" ]; then
|
||||
install_arduino
|
||||
install_rp2040 "$HOME/arduino_ide"
|
||||
export cache_dir=$(mktemp -d)
|
||||
source "$HOME/arduino_ide/hardware/pico/rp2040/tests/common.sh"
|
||||
build_sketches "$HOME/arduino_ide" "$TRAVIS_BUILD_DIR" "-l $HOME/Arduino/libraries" "$BUILD_MOD" "$BUILD_REM"
|
||||
fi
|
||||
Reference in new issue
Block a user