From 07b1ea3a5ce1988d4df5d7ae157fff27def395f3 Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Thu, 28 Nov 2019 06:42:30 +0100 Subject: [PATCH 01/24] Added Updater to automatically perform OTA updates without user interaction. --- DEPLOY.md | 9 +++ data/_version.txt | 1 + include/config.sample.h | 12 +++- include/controller.h | 1 + include/updater.h | 8 +++ src/controller.cpp | 9 +++ src/main.cpp | 26 +++++++- src/updater.cpp | 127 ++++++++++++++++++++++++++++++++++++++++ update.manifest | 3 + 9 files changed, 192 insertions(+), 4 deletions(-) create mode 100644 DEPLOY.md create mode 100644 data/_version.txt create mode 100644 include/updater.h create mode 100644 src/updater.cpp create mode 100644 update.manifest diff --git a/DEPLOY.md b/DEPLOY.md new file mode 100644 index 0000000..75dab17 --- /dev/null +++ b/DEPLOY.md @@ -0,0 +1,9 @@ +# Deploying a new version + +* Update the OTA_VERSION in `include/config.h`, `include/config.sample.h`, + `data/_version.txt`, and `update.manifest`. +* Commit the changes. +* Tag the commit with the new version string. +* Push everything. +* Create theimages using `pio run` and `pio run -t buildfs`. +* Upload `update.manifest`, `firmware.bin` and `spiffs.bin`. diff --git a/data/_version.txt b/data/_version.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/data/_version.txt @@ -0,0 +1 @@ +1 diff --git a/include/config.sample.h b/include/config.sample.h index d13fff6..05fe964 100644 --- a/include/config.sample.h +++ b/include/config.sample.h @@ -1,13 +1,21 @@ #pragma once #include +// This is a simple number indicating the version for the HTTP Updater. +#define OTA_VERSION 1 +// Comment out to prevent automatic updates. +#define OTA_UPDATE_URL "https://files.schle.nz/esmp3/update.manifest" +#define OTA_CHECK_INTERVAL 12*60*60*1000 // 12 hours + #define SHOW_DEBUG //#define SHOW_TRACE #define FTP_DEBUG #define DELAY_AFTER_DEBUG_AND_TRACE 0 -#define WIFI_SSID "---CHANGEME---" -#define WIFI_PASS "---CHANGEME---" +// Here you can define WiFi data to use. But actually, the better way to do +// this is by using /_wifi.txt on the sd card. +//#define WIFI_SSID "---CHANGEME---" +//#define WIFI_PASS "---CHANGEME---" #define VS1053_SLEEP_DELAY 5000 #define POSITION_SEND_INTERVAL 5000 diff --git a/include/controller.h b/include/controller.h index 00ce87e..980281b 100644 --- a/include/controller.h +++ b/include/controller.h @@ -32,6 +32,7 @@ private: unsigned long _last_rfid_scan_at = 0; unsigned long _last_position_info_at = 0; + unsigned long _last_update_check_at = 0; String _serial_buffer = String(); String _cmd_queue = ""; void _execute_command_ls(String path); diff --git a/include/updater.h b/include/updater.h new file mode 100644 index 0000000..b781fc2 --- /dev/null +++ b/include/updater.h @@ -0,0 +1,8 @@ +#pragma once + +class Updater { +public: + static void run(); + static bool do_update(int cmd, String url); + static void update_spiffs(); +}; diff --git a/src/controller.cpp b/src/controller.cpp index 1326620..9994cd2 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -3,6 +3,7 @@ #include "config.h" #include "playlist.h" #include "http_server.h" +#include "updater.h" #include Controller::Controller(Player* p, PlaylistManager* playlist_manager) { @@ -50,6 +51,14 @@ void Controller::loop() { process_message(_cmd_queue); _cmd_queue = ""; } + + #ifdef OTA_UPDATE_URL + if (!player->is_playing() && _last_update_check_atselect_sd(false); DEBUG("Starting SPIFFS...\n"); + uint16_t spiffs_version = 0; SPIFFS.begin(true); + if (SPIFFS.exists("/_version.txt")) { + File f = SPIFFS.open("/_version.txt", "r"); + spiffs_version = f.readString().toInt(); + f.close(); + DEBUG("SPIFFS filesystem version is %d.\n", spiffs_version); + } else { + DEBUG("No SPIFFS filesystem version found - setting spiffs_version to 0.\n"); + } DEBUG("Initializing PlaylistManager...\n"); pm = new PlaylistManager(); @@ -93,9 +103,15 @@ void setup() { f.close(); } SPIMaster::select_sd(false); + + if (!connected) { + #if defined(WIFI_SSID) and defined(WIFI_PASS) DEBUG("Trying hardcoded WiFi data...\n"); connected = connect_to_wifi(WIFI_SSID, WIFI_PASS); + #else + DEBUG("No hardcoded WiFi data set.\n"); + #endif } if (!connected) { INFO("No WiFi connection!\n"); @@ -118,6 +134,12 @@ void setup() { } else { INFO("Could not fetch current time via NTP.\n"); } + + #ifdef OTA_UPDATE_URL + if (spiffs_version < OTA_VERSION) { + Updater::run(); + } + #endif INFO("Initialization completed.\n"); } diff --git a/src/updater.cpp b/src/updater.cpp new file mode 100644 index 0000000..9d956c3 --- /dev/null +++ b/src/updater.cpp @@ -0,0 +1,127 @@ +#include +#include +#include "config.h" +#include "updater.h" +#include "http_client_wrapper.h" + +void Updater::run() { + DEBUG("Updater is running...\n"); + HTTPClientWrapper* http = new HTTPClientWrapper(); + DEBUG("Requesting update info...\n"); + bool result = http->get(OTA_UPDATE_URL); + if (!result) { + ERROR("Updater failed requesting %s.\n", OTA_UPDATE_URL); + return; + } + String line = http->readUntil("\n"); + if (!line.startsWith("VERSION=")) { + ERROR("Expected first line to be VERSION.\n"); + return; + } + uint16_t version = line.substring(8).toInt(); + if (version==0) { + ERROR("Could not parse version number.\n"); + return; + } + DEBUG("Found version %d. My version is %d.\n", version, OTA_VERSION); + if (version <= OTA_VERSION) { + return; + } + line = http->readUntil("\n"); + if (!line.startsWith("IMAGE_PATH=")) { + ERROR("Expected second line to be IMAGE_PATH.\n"); + return; + } + String image_path = line.substring(11); + image_path.trim(); + line = http->readUntil("\n"); + if (!line.startsWith("SPIFFS_PATH=")) { + ERROR("Expected third line to be SPIFFS_PATH.\n"); + return; + } + String spiffs_path = line.substring(12); + spiffs_path.trim(); + + http->close(); + delete http; + + result = do_update(U_FLASH, image_path); + if (result) { + do_update(U_SPIFFS, spiffs_path); + } + DEBUG("Done. Rebooting...\n"); + ESP.restart(); +} + +bool Updater::do_update(int command, String url) { + HTTPClientWrapper* http = new HTTPClientWrapper(); + bool result = http->get(url); + if (!result) { + ERROR("Updater failed requesting %s.\n", url.c_str()); + return false; + } + + result = Update.begin(http->getSize(), command); + if (!result) { + ERROR("Update could not be started.\n"); + return false; + } + uint8_t buf[512]; + uint16_t len; + while((len = http->read(buf, 512))) { + Update.write(buf, 512); + } + + http->close(); + delete http; + + result = Update.end(); + if (!result) { + ERROR("Writing the update failed somewhere. Aborted.\n"); + return false; + } + return true; +} + +void Updater::update_spiffs() { + HTTPClientWrapper* http = new HTTPClientWrapper(); + DEBUG("Requesting update info...\n"); + bool result = http->get(OTA_UPDATE_URL); + if (!result) { + ERROR("Updater failed requesting %s.\n", OTA_UPDATE_URL); + return; + } + String line = http->readUntil("\n"); + if (!line.startsWith("VERSION=")) { + ERROR("Expected first line to be VERSION.\n"); + return; + } + uint16_t version = line.substring(8).toInt(); + if (version==0) { + ERROR("Could not parse version number.\n"); + return; + } else if (version > OTA_VERSION) { + DEBUG("Found newer version %d. My version is %d. Starting full update!\n", version, OTA_VERSION); + run(); + } else { + DEBUG("Loading SPIFFS image.\n"); + line = http->readUntil("\n"); + if (!line.startsWith("IMAGE_PATH=")) { + ERROR("Expected second line to be IMAGE_PATH.\n"); + return; + } + line = http->readUntil("\n"); + if (!line.startsWith("SPIFFS_PATH=")) { + ERROR("Expected third line to be SPIFFS_PATH.\n"); + return; + } + String spiffs_path = line.substring(12); + spiffs_path.trim(); + do_update(U_SPIFFS, spiffs_path); + DEBUG("Done. Rebooting...\n"); + delay(500); + ESP.restart(); + } + http->close(); + delete http; +} diff --git a/update.manifest b/update.manifest new file mode 100644 index 0000000..69f7d45 --- /dev/null +++ b/update.manifest @@ -0,0 +1,3 @@ +VERSION=1 +IMAGE_PATH=https://files.schle.nz/esmp3/firmware.bin +SPIFFS_PATH=https://files.schle.nz/esmp3/spiffs.bin From b805d1b18399895c7142acc6f0c87ceac1878001 Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Thu, 28 Nov 2019 06:48:16 +0100 Subject: [PATCH 02/24] Updater: Better flow for performing updates; added MD5 validation. --- include/updater.h | 8 ++-- src/main.cpp | 4 +- src/updater.cpp | 113 ++++++++++++++++++++-------------------------- update.manifest | 2 + 4 files changed, 58 insertions(+), 69 deletions(-) diff --git a/include/updater.h b/include/updater.h index b781fc2..3aa76b7 100644 --- a/include/updater.h +++ b/include/updater.h @@ -1,8 +1,10 @@ #pragma once +#include "http_client_wrapper.h" + class Updater { public: - static void run(); - static bool do_update(int cmd, String url); - static void update_spiffs(); + static void run(uint16_t spiffs_version = 0); + static bool do_update(int cmd, String url, String expected_md5); + static bool read_line(String* dst, HTTPClientWrapper* http, String expected_key); }; diff --git a/src/main.cpp b/src/main.cpp index e32d8d7..7b5804d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -136,9 +136,7 @@ void setup() { } #ifdef OTA_UPDATE_URL - if (spiffs_version < OTA_VERSION) { - Updater::run(); - } + Updater::run(spiffs_version); #endif INFO("Initialization completed.\n"); diff --git a/src/updater.cpp b/src/updater.cpp index 9d956c3..e0a9351 100644 --- a/src/updater.cpp +++ b/src/updater.cpp @@ -4,7 +4,8 @@ #include "updater.h" #include "http_client_wrapper.h" -void Updater::run() { +void Updater::run(uint16_t spiffs_version) { + bool update_image = true; DEBUG("Updater is running...\n"); HTTPClientWrapper* http = new HTTPClientWrapper(); DEBUG("Requesting update info...\n"); @@ -13,47 +14,74 @@ void Updater::run() { ERROR("Updater failed requesting %s.\n", OTA_UPDATE_URL); return; } - String line = http->readUntil("\n"); - if (!line.startsWith("VERSION=")) { - ERROR("Expected first line to be VERSION.\n"); + + String line_str = ""; + if (!read_line(&line_str, http, "VERSION")) { return; } - uint16_t version = line.substring(8).toInt(); + uint16_t version = line_str.toInt(); if (version==0) { ERROR("Could not parse version number.\n"); return; } DEBUG("Found version %d. My version is %d.\n", version, OTA_VERSION); if (version <= OTA_VERSION) { + if (spiffs_version>0 && spiffs_version < version) { + update_image = false; + DEBUG("SPIFFS needs an update. Continuing.\n"); + } else { + return; + } + } + + String image_path = ""; + if (!read_line(&image_path, http, "IMAGE_PATH")) { return; } - line = http->readUntil("\n"); - if (!line.startsWith("IMAGE_PATH=")) { - ERROR("Expected second line to be IMAGE_PATH.\n"); + + String image_md5 = ""; + if (!read_line(&image_md5, http, "IMAGE_MD5")) { return; } - String image_path = line.substring(11); - image_path.trim(); - line = http->readUntil("\n"); - if (!line.startsWith("SPIFFS_PATH=")) { - ERROR("Expected third line to be SPIFFS_PATH.\n"); + + String spiffs_path = ""; + if (!read_line(&spiffs_path, http, "SPIFFS_PATH")) { + return; + } + + String spiffs_md5 = ""; + if (!read_line(&spiffs_md5, http, "SPIFFS_MD5")) { return; } - String spiffs_path = line.substring(12); - spiffs_path.trim(); http->close(); delete http; - result = do_update(U_FLASH, image_path); + result = true; + if (update_image) { + result = do_update(U_FLASH, image_path, image_md5); + } if (result) { - do_update(U_SPIFFS, spiffs_path); + do_update(U_SPIFFS, spiffs_path, spiffs_md5); } DEBUG("Done. Rebooting...\n"); ESP.restart(); } -bool Updater::do_update(int command, String url) { +bool Updater::read_line(String* dst, HTTPClientWrapper* http, String expected_key) { + expected_key += "="; + String line = http->readUntil("\n"); + if (!line.startsWith(expected_key)) { + ERROR("Expected line start with '%s', but it started with '%s'.\n", expected_key.c_str(), line.c_str()); + return false; + } + line = line.substring(expected_key.length()); + line.trim(); + dst->concat(line); + return true; +} + +bool Updater::do_update(int command, String url, String expected_md5) { HTTPClientWrapper* http = new HTTPClientWrapper(); bool result = http->get(url); if (!result) { @@ -66,10 +94,11 @@ bool Updater::do_update(int command, String url) { ERROR("Update could not be started.\n"); return false; } + Update.setMD5(expected_md5.c_str()); uint8_t buf[512]; uint16_t len; while((len = http->read(buf, 512))) { - Update.write(buf, 512); + Update.write(buf, len); } http->close(); @@ -77,51 +106,9 @@ bool Updater::do_update(int command, String url) { result = Update.end(); if (!result) { - ERROR("Writing the update failed somewhere. Aborted.\n"); + const char* error = Update.errorString(); + ERROR("Writing the update failed. The error was: %s\n", error); return false; } return true; } - -void Updater::update_spiffs() { - HTTPClientWrapper* http = new HTTPClientWrapper(); - DEBUG("Requesting update info...\n"); - bool result = http->get(OTA_UPDATE_URL); - if (!result) { - ERROR("Updater failed requesting %s.\n", OTA_UPDATE_URL); - return; - } - String line = http->readUntil("\n"); - if (!line.startsWith("VERSION=")) { - ERROR("Expected first line to be VERSION.\n"); - return; - } - uint16_t version = line.substring(8).toInt(); - if (version==0) { - ERROR("Could not parse version number.\n"); - return; - } else if (version > OTA_VERSION) { - DEBUG("Found newer version %d. My version is %d. Starting full update!\n", version, OTA_VERSION); - run(); - } else { - DEBUG("Loading SPIFFS image.\n"); - line = http->readUntil("\n"); - if (!line.startsWith("IMAGE_PATH=")) { - ERROR("Expected second line to be IMAGE_PATH.\n"); - return; - } - line = http->readUntil("\n"); - if (!line.startsWith("SPIFFS_PATH=")) { - ERROR("Expected third line to be SPIFFS_PATH.\n"); - return; - } - String spiffs_path = line.substring(12); - spiffs_path.trim(); - do_update(U_SPIFFS, spiffs_path); - DEBUG("Done. Rebooting...\n"); - delay(500); - ESP.restart(); - } - http->close(); - delete http; -} diff --git a/update.manifest b/update.manifest index 69f7d45..7f0bdd5 100644 --- a/update.manifest +++ b/update.manifest @@ -1,3 +1,5 @@ VERSION=1 IMAGE_PATH=https://files.schle.nz/esmp3/firmware.bin +IMAGE_MD5=ead8d94ae8a3c9f46e7ee65e2270fd69 SPIFFS_PATH=https://files.schle.nz/esmp3/spiffs.bin +SPIFFS_MD5=9f3902e3312863da8326e7fbe9485c9e From bbf77c6b1eb3fb126004c6a2e865a285d3225239 Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Thu, 28 Nov 2019 19:26:35 +0100 Subject: [PATCH 03/24] Added deploy script. --- deploy.sh | 37 +++++++++++++++++++++++++++++++++++++ platformio.ini | 21 +++++++++++++++++---- update.manifest | 5 ----- 3 files changed, 54 insertions(+), 9 deletions(-) create mode 100755 deploy.sh delete mode 100644 update.manifest diff --git a/deploy.sh b/deploy.sh new file mode 100755 index 0000000..e13af7c --- /dev/null +++ b/deploy.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env bash +set -x +set -e + +if ! git diff-index --quiet HEAD ; then + echo "Git isn't clean. Cant deploy." + exit 1 +fi + +read -p "Version to generate: " VERSION + +OTA_VERSION=`grep "VERSION=" bin/update.manifest | cut -d"=" -f2` +OTA_VERSION=$(( "$OTA_VERSION" + 1 )) +echo "$OTA_VERSION" > data/_version.txt + +sed -i.bak "s/#define OTA_VERSION .*/#define OTA_VERSION $OTA_VERSION/" include/config.h include/config.sample.h +rm include/config.h.bak include/config.sample.h.bak + +PLATFORMIO_BUILD_FLAGS='-DVERSION=\"$VERSION\"' pio run -e deploy -t buildprog || exit 1 +pio run -e deploy -t buildfs || exit 1 + +cp .pio/build/deploy/firmware.bin bin/firmware.bin || exit 1 +cp .pio/build/deploy/spiffs.bin bin/spiffs.bin || exit 1 + +sed -i.bak "s/VERSION=.*/VERSION=$OTA_VERSION/" bin/update.manifest +MD5=`md5sum --binary bin/firmware.bin | cut -d" " -f1` +sed -i.bak "s/IMAGE_MD5=.*/IMAGE_MD5=$MD5/" bin/update.manifest +MD5=`md5sum --binary bin/spiffs.bin | cut -d" " -f1` +sed -i.bak "s/SPIFFS_MD5=.*/SPIFFS_MD5=$MD5/" bin/update.manifest +rm bin/update.manifest.bak + +git diff +exit 99 + +git add bin/firmware.bin bin/spiffs.bin bin/update.manifest +git commit -m "Deploying version $VERSION." +git tag -a -m "Deploying version $VERSION" $VERSION diff --git a/platformio.ini b/platformio.ini index a3cfd34..f9800a5 100644 --- a/platformio.ini +++ b/platformio.ini @@ -8,16 +8,29 @@ ; Please visit documentation for the other options and examples ; https://docs.platformio.org/page/projectconf.html +[platformio] +default_envs = esp32 + +[extra] +lib_deps = + 63 ; MFRC522 + https://github.com/me-no-dev/ESPAsyncWebServer.git + ArduinoJSON + 6691 ; TinyXML + [env:esp32] platform = espressif32 board = esp-wrover-kit framework = arduino upload_speed = 512000 build_flags=!./build_version.sh -lib_deps = MFRC522 - https://github.com/me-no-dev/ESPAsyncWebServer.git - ArduinoJSON - 6691 ; TinyXML +lib_deps = ${extra.lib_deps} upload_port = /dev/cu.SLAB_USBtoUART monitor_speed = 74480 ;monitor_port = /dev/cu.wchusbserial1420 + +[env:deploy] +platform = espressif32 +board = esp-wrover-kit +framework = arduino +lib_deps = ${extra.lib_deps} diff --git a/update.manifest b/update.manifest deleted file mode 100644 index 7f0bdd5..0000000 --- a/update.manifest +++ /dev/null @@ -1,5 +0,0 @@ -VERSION=1 -IMAGE_PATH=https://files.schle.nz/esmp3/firmware.bin -IMAGE_MD5=ead8d94ae8a3c9f46e7ee65e2270fd69 -SPIFFS_PATH=https://files.schle.nz/esmp3/spiffs.bin -SPIFFS_MD5=9f3902e3312863da8326e7fbe9485c9e From 7a20cf4b04a81b715401eddd618e816a5810a96c Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Fri, 29 Nov 2019 05:29:01 +0100 Subject: [PATCH 04/24] Better deploy script. --- DEPLOY.md | 8 +------- deploy.sh | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/DEPLOY.md b/DEPLOY.md index 75dab17..6120bc0 100644 --- a/DEPLOY.md +++ b/DEPLOY.md @@ -1,9 +1,3 @@ # Deploying a new version -* Update the OTA_VERSION in `include/config.h`, `include/config.sample.h`, - `data/_version.txt`, and `update.manifest`. -* Commit the changes. -* Tag the commit with the new version string. -* Push everything. -* Create theimages using `pio run` and `pio run -t buildfs`. -* Upload `update.manifest`, `firmware.bin` and `spiffs.bin`. +* Use `deploy.sh`. diff --git a/deploy.sh b/deploy.sh index e13af7c..3ec8bca 100755 --- a/deploy.sh +++ b/deploy.sh @@ -7,6 +7,15 @@ if ! git diff-index --quiet HEAD ; then exit 1 fi +branch_name=$(git symbolic-ref -q HEAD) +branch_name=${branch_name##refs/heads/} +branch_name=${branch_name:-HEAD} + +if [ "$branch_name" != "master" ]; then + echo "We are not on master branch. Can't deploy." + exit 1 +fi + read -p "Version to generate: " VERSION OTA_VERSION=`grep "VERSION=" bin/update.manifest | cut -d"=" -f2` @@ -29,9 +38,13 @@ MD5=`md5sum --binary bin/spiffs.bin | cut -d" " -f1` sed -i.bak "s/SPIFFS_MD5=.*/SPIFFS_MD5=$MD5/" bin/update.manifest rm bin/update.manifest.bak +echo; echo; echo; echo; echo +echo "Please check the git diff, if everything looks okay:" git diff -exit 99 + +read -p "Press ENTER to continue, Ctrl-C to abort. " foo git add bin/firmware.bin bin/spiffs.bin bin/update.manifest git commit -m "Deploying version $VERSION." git tag -a -m "Deploying version $VERSION" $VERSION +git push --follow-tags From 6445dc0fb8e6668c51d59d923a0125c3909ac8f3 Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Fri, 29 Nov 2019 05:32:22 +0100 Subject: [PATCH 05/24] Unly call Updater on startup if the SPIFFS needs an update. --- src/main.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 7b5804d..e95d555 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -136,7 +136,9 @@ void setup() { } #ifdef OTA_UPDATE_URL - Updater::run(spiffs_version); + if (spiffs_version < OTA_VERSION) { + Updater::run(spiffs_version); + } #endif INFO("Initialization completed.\n"); From 5fe66fdaefe866fa29d67019d9d55a0bcbb2fddb Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Fri, 29 Nov 2019 05:35:47 +0100 Subject: [PATCH 06/24] Added a command `update` to run the update check. --- data/index.html | 2 ++ src/controller.cpp | 9 ++++----- src/http_server.cpp | 39 +++++++++++++++++++++++++++++++-------- 3 files changed, 37 insertions(+), 13 deletions(-) diff --git a/data/index.html b/data/index.html index 8b1c53f..b4decb4 100644 --- a/data/index.html +++ b/data/index.html @@ -151,6 +151,7 @@
Actions
+
@@ -288,6 +289,7 @@ $(function() { $('#button_settings').click(function(e) { $('#settingsModal').modal('show'); }); $('#button_reset_vs1053').click(function(e) { ws.send("reset_vs1053"); $('#settingsModal').modal('hide'); }); $('#button_reboot').click(function(e) { ws.send("reboot"); $('#settingsModal').modal('hide'); }); + $('#button_update').click(function(e) { ws.send("update"); $('#settingsModal').modal('hide'); }); $('#button_url_open').click(function(e) { ws.send("play " + $('#input_url').val()); $('#openModal').modal('hide');}); $('#button_add_mapping').click(function(e) { $('#settingsModal').modal('hide'); diff --git a/src/controller.cpp b/src/controller.cpp index 9994cd2..18e702d 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -259,13 +259,8 @@ bool Controller::process_message(String cmd) { if (cmd.startsWith("play ")) { Playlist* p = pm->get_playlist_for_folder(cmd.substring(5)); player->play(p); - //} else if (cmd.equals("ls")) { - // _execute_command_ls("/"); - //} else if (cmd.startsWith("ls ")) { - // _execute_command_ls(cmd.substring(3)); } else if (cmd.equals("play")) { player->play(); - } else if (cmd.equals("stop")) { player->stop(); } else if (cmd.equals("help")) { @@ -298,6 +293,10 @@ bool Controller::process_message(String cmd) { String folder = rest.substring(idx + 1); pm->add_mapping(id, folder); send_playlist_manager_status(); + #ifdef OTA_UPDATE_URL + } else if (cmd.equals("update")) { + Updater::run(); + #endif } else { ERROR("Unknown command: %s\n", cmd.c_str()); return false; diff --git a/src/http_server.cpp b/src/http_server.cpp index 4d8ac1b..2687913 100644 --- a/src/http_server.cpp +++ b/src/http_server.cpp @@ -11,14 +11,37 @@ HTTPServer::HTTPServer(Player* p, Controller* c) { _server->addHandler(ws); ws->onEvent([&](AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len){this->_onEvent(server, client, type, arg, data, len);}); - _server->on("/", HTTP_GET, [&](AsyncWebServerRequest* req) {req->send(SPIFFS, "/index.html", "text/html");}); - _server->on("/upload", HTTP_POST, [](AsyncWebServerRequest* req) {req->send(200); }, ([&](AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final){this->_handle_upload(request, filename, index, data, len, final);})); - _server->on("/_mapping.txt", HTTP_GET, [&](AsyncWebServerRequest* req) {req->send(200, "text/plain", _controller->pm->create_mapping_txt());}); - _server->on("/player.json", HTTP_GET, [&](AsyncWebServerRequest* req) {req->send(200, "application/json", _controller->player->json());}); - _server->on("/playlist_manager.json", HTTP_GET, [&](AsyncWebServerRequest* req) {req->send(200, "application/json", _controller->pm->json());}); - _server->on("/controller.json", HTTP_GET, [&](AsyncWebServerRequest* req) {req->send(200, "application/json", _controller->json());}); - _server->on("/position.json", HTTP_GET, [&](AsyncWebServerRequest* req) {req->send(200, "application/json", _controller->player->position_json());}); - _server->on("/cmd", HTTP_POST, [&](AsyncWebServerRequest *req) {req->send(200); }, NULL, [&](AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total) {_controller->queue_command((char*)data);}); + _server->on("/", HTTP_GET, [&](AsyncWebServerRequest* req) { + req->send(SPIFFS, "/index.html", "text/html"); + }); + _server->on("/upload", HTTP_POST, [](AsyncWebServerRequest* req) { + req->send(200); + }, [&](AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) { + this->_handle_upload(request, filename, index, data, len, final); + }); + _server->on("/_mapping.txt", HTTP_GET, [&](AsyncWebServerRequest* req) { + req->send(200, "text/plain", _controller->pm->create_mapping_txt()); + }); + _server->on("/player.json", HTTP_GET, [&](AsyncWebServerRequest* req) { + req->send(200, "application/json", _controller->player->json()); + }); + _server->on("/playlist_manager.json", HTTP_GET, [&](AsyncWebServerRequest* req) { + req->send(200, "application/json", _controller->pm->json()); + }); + _server->on("/controller.json", HTTP_GET, [&](AsyncWebServerRequest* req) { + req->send(200, "application/json", _controller->json()); + }); + _server->on("/position.json", HTTP_GET, [&](AsyncWebServerRequest* req) { + req->send(200, "application/json", _controller->player->position_json()); + }); + _server->on("/cmd", HTTP_POST, [&](AsyncWebServerRequest *req) { + if (req->hasParam("cmd", true)) { + _controller->queue_command(req->getParam("cmd", true)->value()); + req->send(200); + } else { + req->send(400); + } + }); _server->begin(); MDNS.addService("http", "tcp", 80); } From d4c9a6d58295b4a321b24ebfbf5084234d1b5b24 Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Fri, 29 Nov 2019 05:36:22 +0100 Subject: [PATCH 07/24] Documented API commands. --- README.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/README.md b/README.md index 202c904..b1c51b2 100644 --- a/README.md +++ b/README.md @@ -145,3 +145,28 @@ will play. On December 2nd, track 2 followed by track 1. On December 3rd, tracks 3, 1 and 2. From December 24th on, track 24 followed by tracks 1-23. So your kid will get the "daily track" first, followed by all previous tags in the right order. + +#### API +You can send commands to ESMP3 using three different ways: +* Through a websocket connection to `ws:///ws`. +* Through the serial console using an USB cable. +* Via HTTP POST request to `http:///cmd`, having the + command in the variable `cmd`. + +Supported commands are: +| Command | Action | +|---------|--------| +| `play ` | Starts playing the given path. Path may be a path on the +sd card or a http(s) URL of a webstream (direct links to mp3/4/ogg streams, +PLS files, M3U files or podcast XML feeds are supported). | +| `play` | Continues playing the previously played thing. | +| `stop` | Stops playing. | +| `volume=` | Sets the volume to X (0-255). | +| `track_prev` | Starts the previous track, if available. | +| `track_next` | Starts the next track, if available. | +| `track=` | Starts playing track no. X of the currently playing album. | +| `reset_vs1053` | Resets the VS1053 audio chip. | +| `reboot` | Reboots ESMP3. | +| `add_mapping==` | Adds a mapping between RFID card and path +. See `play` for valid path formats. | +| `update` | Runs an update check. | From 63b96166779ed3b0996e6a0fbc7c069c9c83aa1a Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Fri, 29 Nov 2019 05:36:59 +0100 Subject: [PATCH 08/24] Removed "redefined macro" warnings from MFRC522 library. --- include/controller.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/controller.h b/include/controller.h index 980281b..b16931a 100644 --- a/include/controller.h +++ b/include/controller.h @@ -10,6 +10,8 @@ class Controller; #include "playlist.h" #include "playlist_manager.h" #include "http_server.h" + +#undef DEPRECATED #include enum ControllerState { NORMAL, LOCKING, LOCKED }; From 196021bef5f46c9fb088cd4d21c8169f6ff13986 Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Fri, 29 Nov 2019 05:45:21 +0100 Subject: [PATCH 09/24] Try to (re)connect to WiFi every 5 minutes. (Only when not playing at the moment.) --- include/controller.h | 1 + src/controller.cpp | 11 +++++-- src/main.cpp | 74 ++++++++++++++++++++++++-------------------- 3 files changed, 51 insertions(+), 35 deletions(-) diff --git a/include/controller.h b/include/controller.h index b16931a..3989caf 100644 --- a/include/controller.h +++ b/include/controller.h @@ -35,6 +35,7 @@ private: unsigned long _last_rfid_scan_at = 0; unsigned long _last_position_info_at = 0; unsigned long _last_update_check_at = 0; + unsigned long _last_wifi_try_at = 0; String _serial_buffer = String(); String _cmd_queue = ""; void _execute_command_ls(String path); diff --git a/src/controller.cpp b/src/controller.cpp index 18e702d..f2c37df 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -1,4 +1,5 @@ #include "controller.h" +#include "main.h" #include "spi_master.h" #include "config.h" #include "playlist.h" @@ -53,12 +54,18 @@ void Controller::loop() { } #ifdef OTA_UPDATE_URL - if (!player->is_playing() && _last_update_check_atis_playing() && _last_update_check_at < now && _last_update_check_at + OTA_CHECK_INTERVAL < now) { Updater::run(); } else { - _last_update_check_at = millis(); + _last_update_check_at = now; } #endif + + if (!player->is_playing() && !WiFi.isConnected() && _last_wifi_try_at < now && _last_wifi_try_at + 5*60*1000 < now) { + wifi_connect(); + } else { + _last_wifi_try_at = now; + } TRACE("Controller::loop() done.\n"); } diff --git a/src/main.cpp b/src/main.cpp index e95d555..5233578 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4,6 +4,7 @@ #include #include #include +#include "main.h" #include "config.h" #include "controller.h" #include "player.h" @@ -32,6 +33,43 @@ bool connect_to_wifi(String ssid, String pass) { return true; } +void wifi_connect() { + bool connected = false; + INFO("Connecting to WiFi...\n"); + SPIMaster::select_sd(); + if (SD.exists("/_wifis.txt")) { + DEBUG("Reading /_wifis.txt\n"); + File f = SD.open("/_wifis.txt", "r"); + while (String line = f.readStringUntil('\n')) { + if (line.length()==0 || line.startsWith("#") || line.indexOf('=')==-1) { + continue; + } + String ssid = line.substring(0, line.indexOf('=')); + String pass = line.substring(line.indexOf('=')+1); + connected = connect_to_wifi(ssid, pass); + if (connected) break; + } + f.close(); + } else { + File f = SD.open("/_wifis.txt", "w"); + f.print("# WiFi definitions. Syntax: =. Lines starting with # are ignored. Example:\n# My WiFi=VerySecretPassword\n"); + f.close(); + } + SPIMaster::select_sd(false); + + if (!connected) { + #if defined(WIFI_SSID) and defined(WIFI_PASS) + DEBUG("Trying hardcoded WiFi data...\n"); + connected = connect_to_wifi(WIFI_SSID, WIFI_PASS); + #else + DEBUG("No hardcoded WiFi data set.\n"); + #endif + } + if (!connected) { + INFO("No WiFi connection!\n"); + } +} + void setup() { delay(500); Serial.begin(74880); @@ -81,41 +119,11 @@ void setup() { controller = new Controller(player, pm); INFO("Player and controller initialized.\n"); - bool connected = false; - INFO("Connecting to WiFi...\n"); - SPIMaster::select_sd(); - if (SD.exists("/_wifis.txt")) { - DEBUG("Reading /_wifis.txt\n"); - File f = SD.open("/_wifis.txt", "r"); - while (String line = f.readStringUntil('\n')) { - if (line.length()==0 || line.startsWith("#") || line.indexOf('=')==-1) { - continue; - } - String ssid = line.substring(0, line.indexOf('=')); - String pass = line.substring(line.indexOf('=')+1); - connected = connect_to_wifi(ssid, pass); - if (connected) break; - } - f.close(); - } else { - File f = SD.open("/_wifis.txt", "w"); - f.print("# WiFi definitions. Syntax: =. Lines starting with # are ignored. Example:\n# My WiFi=VerySecretPassword\n"); - f.close(); - } - SPIMaster::select_sd(false); + wifi_connect(); + + - if (!connected) { - #if defined(WIFI_SSID) and defined(WIFI_PASS) - DEBUG("Trying hardcoded WiFi data...\n"); - connected = connect_to_wifi(WIFI_SSID, WIFI_PASS); - #else - DEBUG("No hardcoded WiFi data set.\n"); - #endif - } - if (!connected) { - INFO("No WiFi connection!\n"); - } MDNS.begin("esmp3"); From 001e2751316e7fb23a062a3e85dbd776579cb660 Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Fri, 29 Nov 2019 05:46:26 +0100 Subject: [PATCH 10/24] Include information about versions and WiFi connection to controller's json. --- include/main.h | 4 ++++ src/controller.cpp | 17 +++++++++++++++++ src/main.cpp | 3 ++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 include/main.h diff --git a/include/main.h b/include/main.h new file mode 100644 index 0000000..b1c6ac1 --- /dev/null +++ b/include/main.h @@ -0,0 +1,4 @@ +#pragma once + +extern uint16_t spiffs_version; +void wifi_connect(); diff --git a/src/controller.cpp b/src/controller.cpp index f2c37df..6189e53 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -377,6 +377,23 @@ String Controller::json() { rfid["data"] = _last_rfid_data; json["uptime"] = millis() / 1000; json["free_heap"] = ESP.getFreeHeap(); + JsonObject versions = json.createNestedObject("versions"); + versions["spiffs"] = spiffs_version; + versions["ota"] = OTA_VERSION; + #ifdef VERSION + versions["release"] = VERSION; + #else + versions["release"] = "unknown"; + #endif + + JsonObject wifi = json.createNestedObject("wifi"); + if (WiFi.isConnected()) { + wifi["connected"] = true; + wifi["ssid"] = WiFi.SSID(); + wifi["rssi"] = WiFi.RSSI(); + } else { + wifi["connected"] = false; + } return json.as(); } diff --git a/src/main.cpp b/src/main.cpp index 5233578..6a50dfd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -20,6 +20,8 @@ HTTPServer* http_server; uint8_t SPIMaster::state = 0; +uint16_t spiffs_version = 0; + bool connect_to_wifi(String ssid, String pass) { TRACE("Connecting to wifi \"%s\"...\n", ssid.c_str()); WiFi.mode(WIFI_AP_STA); @@ -100,7 +102,6 @@ void setup() { spi->select_sd(false); DEBUG("Starting SPIFFS...\n"); - uint16_t spiffs_version = 0; SPIFFS.begin(true); if (SPIFFS.exists("/_version.txt")) { File f = SPIFFS.open("/_version.txt", "r"); From dd9e1538c88e1877f9aa4a24bcc5d109d3849c35 Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Fri, 29 Nov 2019 05:52:00 +0100 Subject: [PATCH 11/24] Playlist: More defensive proramming for when trying to play an empty playlist. --- include/playlist.h | 2 +- src/player.cpp | 5 ++++- src/playlist.cpp | 9 +++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/include/playlist.h b/include/playlist.h index 0da83e6..d352b37 100644 --- a/include/playlist.h +++ b/include/playlist.h @@ -36,7 +36,7 @@ public: bool set_track(uint8_t track); void reset(); bool is_empty(); - String get_current_file(); + bool get_current_file(String* dst); uint32_t get_position(); void set_position(uint32_t p); void shuffle(uint8_t random_offset=0); diff --git a/src/player.cpp b/src/player.cpp index 9047a28..d12a99c 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -535,7 +535,10 @@ bool Player::play() { if (_current_playlist == NULL) return false; if (_current_playlist->get_file_count()==0) return false; _current_playlist->start(); - String file = _current_playlist->get_current_file(); + String file; + if (!_current_playlist->get_current_file(&file)) { + return false; + } uint32_t position = _current_playlist->get_position(); _state = playing; _play_file(file, position); diff --git a/src/playlist.cpp b/src/playlist.cpp index 1dd7516..c476a1f 100644 --- a/src/playlist.cpp +++ b/src/playlist.cpp @@ -310,8 +310,13 @@ void Playlist::reset() { _started = false; } -String Playlist::get_current_file() { - return _files[_current_track].filename; +bool Playlist::get_current_file(String* dst) { + if (_current_track < _files.size()) { + return false; + } else { + dst->concat(_files[_current_track].filename); + return true; + } } uint32_t Playlist::get_position() { From 8e15f87cd3420316fe9eae22d288ed221f77d082 Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Fri, 29 Nov 2019 06:10:17 +0100 Subject: [PATCH 12/24] Moved index.html from SPIFFS to program memory. Removed dependencies to SPIFFS. Also, we can use a different partition scheme with much more program space instead of reserving some of it for SPIFFS. --- data/_version.txt | 1 - deploy.sh | 7 +------ include/main.h | 3 ++- include/updater.h | 2 +- partitions.csv | 6 ++++++ platformio.ini | 4 ++++ src/controller.cpp | 1 - src/http_server.cpp | 4 ++-- {data => src}/index.html | 0 src/main.cpp | 24 ------------------------ src/updater.cpp | 32 +++++++------------------------- 11 files changed, 23 insertions(+), 61 deletions(-) delete mode 100644 data/_version.txt create mode 100644 partitions.csv rename {data => src}/index.html (100%) diff --git a/data/_version.txt b/data/_version.txt deleted file mode 100644 index d00491f..0000000 --- a/data/_version.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/deploy.sh b/deploy.sh index 3ec8bca..ff1290a 100755 --- a/deploy.sh +++ b/deploy.sh @@ -20,22 +20,17 @@ read -p "Version to generate: " VERSION OTA_VERSION=`grep "VERSION=" bin/update.manifest | cut -d"=" -f2` OTA_VERSION=$(( "$OTA_VERSION" + 1 )) -echo "$OTA_VERSION" > data/_version.txt sed -i.bak "s/#define OTA_VERSION .*/#define OTA_VERSION $OTA_VERSION/" include/config.h include/config.sample.h rm include/config.h.bak include/config.sample.h.bak PLATFORMIO_BUILD_FLAGS='-DVERSION=\"$VERSION\"' pio run -e deploy -t buildprog || exit 1 -pio run -e deploy -t buildfs || exit 1 cp .pio/build/deploy/firmware.bin bin/firmware.bin || exit 1 -cp .pio/build/deploy/spiffs.bin bin/spiffs.bin || exit 1 sed -i.bak "s/VERSION=.*/VERSION=$OTA_VERSION/" bin/update.manifest MD5=`md5sum --binary bin/firmware.bin | cut -d" " -f1` sed -i.bak "s/IMAGE_MD5=.*/IMAGE_MD5=$MD5/" bin/update.manifest -MD5=`md5sum --binary bin/spiffs.bin | cut -d" " -f1` -sed -i.bak "s/SPIFFS_MD5=.*/SPIFFS_MD5=$MD5/" bin/update.manifest rm bin/update.manifest.bak echo; echo; echo; echo; echo @@ -44,7 +39,7 @@ git diff read -p "Press ENTER to continue, Ctrl-C to abort. " foo -git add bin/firmware.bin bin/spiffs.bin bin/update.manifest +git add bin/firmware.bin bin/update.manifest git commit -m "Deploying version $VERSION." git tag -a -m "Deploying version $VERSION" $VERSION git push --follow-tags diff --git a/include/main.h b/include/main.h index b1c6ac1..0117185 100644 --- a/include/main.h +++ b/include/main.h @@ -1,4 +1,5 @@ #pragma once -extern uint16_t spiffs_version; void wifi_connect(); + +extern const uint8_t file_index_html_start[] asm("_binary_src_index_html_start"); diff --git a/include/updater.h b/include/updater.h index 3aa76b7..9d5a3a8 100644 --- a/include/updater.h +++ b/include/updater.h @@ -4,7 +4,7 @@ class Updater { public: - static void run(uint16_t spiffs_version = 0); + static void run(); static bool do_update(int cmd, String url, String expected_md5); static bool read_line(String* dst, HTTPClientWrapper* http, String expected_key); }; diff --git a/partitions.csv b/partitions.csv new file mode 100644 index 0000000..5ed782b --- /dev/null +++ b/partitions.csv @@ -0,0 +1,6 @@ +# Custom partition table without SPIFFS. +# Name, Type, SubType, Offset, Size, Flags +nvs, data, nvs, 0x9000, 0x5000, +otadata, data, ota, 0xe000, 0x2000, +app0, app, ota_0, 0x10000, 0x220000, +app1, app, ota_1, 0x230000,0x220000, diff --git a/platformio.ini b/platformio.ini index f9800a5..8e880cc 100644 --- a/platformio.ini +++ b/platformio.ini @@ -27,6 +27,8 @@ build_flags=!./build_version.sh lib_deps = ${extra.lib_deps} upload_port = /dev/cu.SLAB_USBtoUART monitor_speed = 74480 +board_build.embed_txtfiles = src/index.html +board_build.partitions = partitions.csv ;monitor_port = /dev/cu.wchusbserial1420 [env:deploy] @@ -34,3 +36,5 @@ platform = espressif32 board = esp-wrover-kit framework = arduino lib_deps = ${extra.lib_deps} +board_build.embed_txtfiles = src/index.html +board_build.partitions = partitions.csv diff --git a/src/controller.cpp b/src/controller.cpp index 6189e53..8a30ba4 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -378,7 +378,6 @@ String Controller::json() { json["uptime"] = millis() / 1000; json["free_heap"] = ESP.getFreeHeap(); JsonObject versions = json.createNestedObject("versions"); - versions["spiffs"] = spiffs_version; versions["ota"] = OTA_VERSION; #ifdef VERSION versions["release"] = VERSION; diff --git a/src/http_server.cpp b/src/http_server.cpp index 2687913..087d9f7 100644 --- a/src/http_server.cpp +++ b/src/http_server.cpp @@ -1,7 +1,7 @@ #include "http_server.h" +#include "main.h" #include "spi_master.h" #include -#include HTTPServer::HTTPServer(Player* p, Controller* c) { _player = p; @@ -12,7 +12,7 @@ HTTPServer::HTTPServer(Player* p, Controller* c) { ws->onEvent([&](AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len){this->_onEvent(server, client, type, arg, data, len);}); _server->on("/", HTTP_GET, [&](AsyncWebServerRequest* req) { - req->send(SPIFFS, "/index.html", "text/html"); + req->send(200, "text/html", (const char*)file_index_html_start); }); _server->on("/upload", HTTP_POST, [](AsyncWebServerRequest* req) { req->send(200); diff --git a/data/index.html b/src/index.html similarity index 100% rename from data/index.html rename to src/index.html diff --git a/src/main.cpp b/src/main.cpp index 6a50dfd..157e557 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3,7 +3,6 @@ #include #include #include -#include #include "main.h" #include "config.h" #include "controller.h" @@ -20,8 +19,6 @@ HTTPServer* http_server; uint8_t SPIMaster::state = 0; -uint16_t spiffs_version = 0; - bool connect_to_wifi(String ssid, String pass) { TRACE("Connecting to wifi \"%s\"...\n", ssid.c_str()); WiFi.mode(WIFI_AP_STA); @@ -101,17 +98,6 @@ void setup() { } spi->select_sd(false); - DEBUG("Starting SPIFFS...\n"); - SPIFFS.begin(true); - if (SPIFFS.exists("/_version.txt")) { - File f = SPIFFS.open("/_version.txt", "r"); - spiffs_version = f.readString().toInt(); - f.close(); - DEBUG("SPIFFS filesystem version is %d.\n", spiffs_version); - } else { - DEBUG("No SPIFFS filesystem version found - setting spiffs_version to 0.\n"); - } - DEBUG("Initializing PlaylistManager...\n"); pm = new PlaylistManager(); @@ -122,10 +108,6 @@ void setup() { wifi_connect(); - - - - MDNS.begin("esmp3"); DEBUG("Setting up HTTP server...\n"); @@ -144,12 +126,6 @@ void setup() { INFO("Could not fetch current time via NTP.\n"); } - #ifdef OTA_UPDATE_URL - if (spiffs_version < OTA_VERSION) { - Updater::run(spiffs_version); - } - #endif - INFO("Initialization completed.\n"); } diff --git a/src/updater.cpp b/src/updater.cpp index e0a9351..491e373 100644 --- a/src/updater.cpp +++ b/src/updater.cpp @@ -4,8 +4,7 @@ #include "updater.h" #include "http_client_wrapper.h" -void Updater::run(uint16_t spiffs_version) { - bool update_image = true; +void Updater::run() { DEBUG("Updater is running...\n"); HTTPClientWrapper* http = new HTTPClientWrapper(); DEBUG("Requesting update info...\n"); @@ -26,12 +25,7 @@ void Updater::run(uint16_t spiffs_version) { } DEBUG("Found version %d. My version is %d.\n", version, OTA_VERSION); if (version <= OTA_VERSION) { - if (spiffs_version>0 && spiffs_version < version) { - update_image = false; - DEBUG("SPIFFS needs an update. Continuing.\n"); - } else { - return; - } + return; } String image_path = ""; @@ -44,27 +38,15 @@ void Updater::run(uint16_t spiffs_version) { return; } - String spiffs_path = ""; - if (!read_line(&spiffs_path, http, "SPIFFS_PATH")) { - return; - } - - String spiffs_md5 = ""; - if (!read_line(&spiffs_md5, http, "SPIFFS_MD5")) { - return; - } - http->close(); delete http; - result = true; - if (update_image) { - result = do_update(U_FLASH, image_path, image_md5); + if(do_update(U_FLASH, image_path, image_md5)) { + DEBUG("Update done. Rebooting...\n"); + } else { + DEBUG("Update failed. Rebooting...\n"); } - if (result) { - do_update(U_SPIFFS, spiffs_path, spiffs_md5); - } - DEBUG("Done. Rebooting...\n"); + delay(1000); ESP.restart(); } From 571e969bc475bddedffc2c72bb5c3cb2019326c2 Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Fri, 29 Nov 2019 06:13:16 +0100 Subject: [PATCH 13/24] deploy.sh: Show last tags. --- deploy.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/deploy.sh b/deploy.sh index ff1290a..d5c9a27 100755 --- a/deploy.sh +++ b/deploy.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -x -set -e +#set -e if ! git diff-index --quiet HEAD ; then echo "Git isn't clean. Cant deploy." @@ -16,6 +16,14 @@ if [ "$branch_name" != "master" ]; then exit 1 fi +echo +echo +echo "Last tags:" +vers=`git tag --sort=-version:refname | head -n 5` +while read version; do + echo " $version" +done <<< "$vers" + read -p "Version to generate: " VERSION OTA_VERSION=`grep "VERSION=" bin/update.manifest | cut -d"=" -f2` From 076f0e9dfdcb98ac05dddd894f34c690e0471db8 Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Fri, 29 Nov 2019 06:14:45 +0100 Subject: [PATCH 14/24] Changed the baud rate of the serial port to 115200 to match the ESP32 boot loader. --- platformio.ini | 2 +- src/main.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platformio.ini b/platformio.ini index 8e880cc..0142fa7 100644 --- a/platformio.ini +++ b/platformio.ini @@ -26,7 +26,7 @@ upload_speed = 512000 build_flags=!./build_version.sh lib_deps = ${extra.lib_deps} upload_port = /dev/cu.SLAB_USBtoUART -monitor_speed = 74480 +monitor_speed = 115200 board_build.embed_txtfiles = src/index.html board_build.partitions = partitions.csv ;monitor_port = /dev/cu.wchusbserial1420 diff --git a/src/main.cpp b/src/main.cpp index 157e557..8b195e9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -71,7 +71,7 @@ void wifi_connect() { void setup() { delay(500); - Serial.begin(74880); + Serial.begin(115200); Serial.println("Starting..."); Serial.println("Started."); INFO("Starting.\n"); From 65118fbc4273f111a0908f3f41bde62633b23eac Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Fri, 29 Nov 2019 17:41:16 +0100 Subject: [PATCH 15/24] Play position in stuff like podcasts can now be permanently persisted. --- include/playlist.h | 12 +++++++ include/playlist_manager.h | 1 + src/player.cpp | 3 +- src/playlist.cpp | 42 ++++++++++++++++++---- src/playlist_manager.cpp | 72 ++++++++++++++++++++++++++++++++++++-- 5 files changed, 121 insertions(+), 9 deletions(-) diff --git a/include/playlist.h b/include/playlist.h index d352b37..38e1f97 100644 --- a/include/playlist.h +++ b/include/playlist.h @@ -4,9 +4,16 @@ #include #include "http_client_wrapper.h" +enum PlaylistPersistence { + PERSIST_NONE, + PERSIST_TEMPORARY, + PERSIST_PERMANENTLY +}; + struct PlaylistEntry { String filename; String title; + String id; bool operator<(PlaylistEntry p) { return title < p.title; } }; @@ -19,12 +26,14 @@ private: bool _shuffled = false; std::vector _files; String _title = ""; + String _path; void _add_path(String path); void _examine_http_url(String url); void _parse_rss(HTTPClientWrapper* http); void _parse_m3u(HTTPClientWrapper* http); void _parse_pls(HTTPClientWrapper* http); public: + PlaylistPersistence persistence = PERSIST_TEMPORARY; Playlist(String path); void start(); uint16_t get_file_count(); @@ -34,9 +43,12 @@ public: bool track_prev(); void track_restart(); bool set_track(uint8_t track); + void set_track_by_id(String id); void reset(); + String path(); bool is_empty(); bool get_current_file(String* dst); + String get_current_track_id(); uint32_t get_position(); void set_position(uint32_t p); void shuffle(uint8_t random_offset=0); diff --git a/include/playlist_manager.h b/include/playlist_manager.h index 920728c..42c88a0 100644 --- a/include/playlist_manager.h +++ b/include/playlist_manager.h @@ -20,4 +20,5 @@ public: String json(); bool add_mapping(String id, String folder); String create_mapping_txt(); + void persist(Playlist* p); }; diff --git a/src/player.cpp b/src/player.cpp index d12a99c..2a9f337 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -613,7 +613,8 @@ void Player::stop(bool turn_speaker_off) { if (_state != playing) return; INFO("Stopping...\n"); _current_playlist->set_position(_current_play_position); - + _controller->pm->persist(_current_playlist); + _state = stopping; _stop_delay = 0; _write_control_register(SCI_MODE, _read_control_register(SCI_MODE) | SM_CANCEL); diff --git a/src/playlist.cpp b/src/playlist.cpp index c476a1f..a07a1b6 100644 --- a/src/playlist.cpp +++ b/src/playlist.cpp @@ -7,7 +7,9 @@ #include Playlist::Playlist(String path) { + _path = path; if (path.startsWith("/")) { + persistence = PERSIST_TEMPORARY; _add_path(path); } else if (path.startsWith("http")) { _examine_http_url(path); @@ -44,7 +46,7 @@ void Playlist::_add_path(String path) { ext.equals(".mpa"))) { TRACE(" Adding entry %s\n", entry.name()); String title = filename.substring(0, filename.length() - 4); - _files.push_back({.filename=entry.name(), .title=title}); + _files.push_back({.filename=entry.name(), .title=title, .id=String(_files.size())}); bool non_ascii_chars = false; for(int i=0; igetContentType(); DEBUG("Content-Type is %s.\n", ct.c_str()); if (ct.startsWith("audio/x-mpegurl")) { + _parse_m3u(http); } else if (ct.startsWith("audio/")) { - _files.push_back({.filename=url, .title=url}); + persistence = PERSIST_NONE; + _files.push_back({.filename=url, .title=url, .id="none"}); } else if (ct.startsWith("application/rss+xml")) { + persistence = PERSIST_PERMANENTLY; _parse_rss(http); } else if (ct.startsWith("application/pls+xml")) { + persistence = PERSIST_PERMANENTLY; _parse_pls(http); } else { ERROR("Unknown content type %s.\n", ct.c_str()); @@ -95,6 +101,7 @@ String xml_title = ""; String xml_album_title = ""; String xml_url = ""; String xml_enclosure_url = ""; +String xml_guid = ""; bool xml_enclosure_is_audio = false; void xmlcb(uint8_t status, char* tagName, uint16_t tagLen, char* data, uint16_t dataLen) { @@ -106,8 +113,11 @@ void xmlcb(uint8_t status, char* tagName, uint16_t tagLen, char* data, uint16_t } else if (tag.endsWith("/item") && (status & STATUS_START_TAG)) { xml_title = ""; xml_url = ""; + xml_guid = ""; } else if (tag.endsWith("/item/title") && (status & STATUS_TAG_TEXT)) { xml_title = String(data); + } else if (tag.endsWith("/item/guid") && (status & STATUS_TAG_TEXT)) { + xml_guid = data; //} else if (xml_last_tag.endsWith("/item/enclosure") && (status & STATUS_ATTR_TEXT)) { // DEBUG("tag: %s, data: %s\n", tag.c_str(), data); } else if (xml_last_tag.endsWith("/item/enclosure") && tag.equals("type") && (status & STATUS_ATTR_TEXT) && String(data).indexOf("audio/")>=0) { @@ -126,7 +136,7 @@ void xmlcb(uint8_t status, char* tagName, uint16_t tagLen, char* data, uint16_t } else if (tag.endsWith("/item") && (status & STATUS_END_TAG)) { if (xml_title.length()>0 && xml_url.length()>0) { DEBUG("Adding playlist entry: '%s' => '%s'\n", xml_title.c_str(), xml_url.c_str()); - xml_files_ptr->push_back({xml_url, xml_title}); + xml_files_ptr->insert(xml_files_ptr->begin(), {.filename=xml_url, .title=xml_title, .id=xml_guid}); } } } @@ -180,7 +190,7 @@ void Playlist::_parse_m3u(HTTPClientWrapper* http) { } } else if (line.startsWith("http")) { if (title.length()==0) title = line; - _files.push_back({.filename=line, .title=title}); + _files.push_back({.filename=line, .title=title, .id="none"}); title = ""; } line = ""; @@ -222,7 +232,7 @@ void Playlist::_parse_pls(HTTPClientWrapper* http) { } if (title.length()>0 && url.length()>0) { - _files.push_back({.filename=url, .title=title}); + _files.push_back({.filename=url, .title=title, .id="none"}); last_index = -1; title = ""; url = ""; @@ -231,6 +241,10 @@ void Playlist::_parse_pls(HTTPClientWrapper* http) { // don't close http at the end } +String Playlist::path() { + return _path; +} + uint16_t Playlist::get_file_count() { return _files.size(); } @@ -274,6 +288,15 @@ bool Playlist::set_track(uint8_t track) { return false; } +void Playlist::set_track_by_id(String id) { + for (int i=0; i<_files.size(); i++) { + if (id.equals(_files[i].id)) { + set_track(i); + return; + } + } +} + void Playlist::track_restart() { _position = 0; } @@ -310,8 +333,15 @@ void Playlist::reset() { _started = false; } +String Playlist::get_current_track_id() { + if (_current_track > _files.size()) { + return ""; + } + return _files[_current_track].id; +} + bool Playlist::get_current_file(String* dst) { - if (_current_track < _files.size()) { + if (_current_track > _files.size()) { return false; } else { dst->concat(_files[_current_track].filename); diff --git a/src/playlist_manager.cpp b/src/playlist_manager.cpp index fa87022..5f3576c 100644 --- a/src/playlist_manager.cpp +++ b/src/playlist_manager.cpp @@ -104,10 +104,41 @@ Playlist* PlaylistManager::get_playlist_for_id(String id) { } Playlist* PlaylistManager::get_playlist_for_folder(String folder) { + Playlist* p; if (!_playlists.count(folder)) { - _playlists[folder] = new Playlist(folder); + p = new Playlist(folder); + _playlists[folder] = p; + if (p->persistence == PERSIST_PERMANENTLY) { + // TODO Load persistence from file + String search = folder; + search += "="; + SPIMaster::select_sd(); + if (SD.exists("/_positions.txt")) { + File f = SD.open("/_positions.txt", "r"); + while (true) { + String s = f.readStringUntil('\n'); + if (s.length()==0) break; + if (s.startsWith(search)) { + s = s.substring(search.length()); + int idx = s.indexOf(','); + String title_index = s.substring(0, idx); + uint32_t position = s.substring(idx+1).toInt(); + p->set_track_by_id(title_index); + p->set_position(position); + break; + } + } + f.close(); + } + SPIMaster::select_sd(false); + } + } else { + p = _playlists[folder]; + if (p->persistence == PERSIST_NONE) { + p->reset(); + } } - return _playlists[folder]; + return p; } void PlaylistManager::dump_ids() { @@ -164,3 +195,40 @@ String PlaylistManager::create_mapping_txt() { } return s; } + +void PlaylistManager::persist(Playlist* p) { + if (p->persistence != PERSIST_PERMANENTLY) return; + + String search = p->path(); + search += '='; + + bool old_file_existed = false; + + SPIMaster::select_sd(); + if (SD.exists("_positions.txt")) { + SD.rename("/_positions.txt", "/_positions.temp.txt"); + old_file_existed = true; + } + File dst = SD.open("/_positions.txt", "w"); + + if (old_file_existed) { + File src = SD.open("/_positions.temp.txt", "r"); + + while (true) { + String line = src.readStringUntil('\n'); + line.trim(); + if (line.startsWith(search)) continue; + dst.println(line); + } + + src.close(); + SD.remove("/_positions.temp.txt"); + } + + dst.print(search); + dst.print(p->get_current_track_id()); + dst.print(','); + dst.println(p->get_position()); + dst.close(); + SPIMaster::select_sd(false); +} From 9175193b67042c1ffdeb8c28c120853422b6c870 Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Fri, 29 Nov 2019 21:16:10 +0100 Subject: [PATCH 16/24] Disabled the custom partitioning stuff because the ESP32 entered a boot loop after flashing it. So we are back at ~85% memory used... --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index 0142fa7..9f26dbb 100644 --- a/platformio.ini +++ b/platformio.ini @@ -28,7 +28,7 @@ lib_deps = ${extra.lib_deps} upload_port = /dev/cu.SLAB_USBtoUART monitor_speed = 115200 board_build.embed_txtfiles = src/index.html -board_build.partitions = partitions.csv +;board_build.partitions = partitions.csv ;monitor_port = /dev/cu.wchusbserial1420 [env:deploy] From 4eef69516ed60c9d46c07f7c68b39725f0954e14 Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Fri, 29 Nov 2019 21:18:28 +0100 Subject: [PATCH 17/24] Made TRACE a bit less talkative. --- src/controller.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/controller.cpp b/src/controller.cpp index 8a30ba4..e5b5829 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -36,7 +36,6 @@ void Controller::register_http_server(HTTPServer* h) { } void Controller::loop() { - TRACE("Controller::loop()...\n"); unsigned long now = millis(); if ((_last_rfid_scan_at < now - RFID_SCAN_INTERVAL) || (now < _last_rfid_scan_at)) { _check_rfid(); @@ -66,7 +65,6 @@ void Controller::loop() { } else { _last_wifi_try_at = now; } - TRACE("Controller::loop() done.\n"); } uint32_t Controller::_get_rfid_card_uid() { @@ -85,7 +83,7 @@ uint32_t Controller::_get_rfid_card_uid() { } void Controller::_check_rfid() { - TRACE("check_rfid running...\n"); + //TRACE("check_rfid running...\n"); MFRC522::StatusCode status; if (_rfid_present) { byte buffer[2]; @@ -244,8 +242,6 @@ String Controller::_read_rfid_data() { } void Controller::_check_serial() { - TRACE("check_serial running...\n"); - if (Serial.available() > 0) { char c = Serial.read(); Serial.printf("%c", c); @@ -332,8 +328,6 @@ void Controller::_execute_command_help() { } void Controller::_check_buttons() { - TRACE("check_buttons running...\n"); - if (BTN_PREV() && _debounce_button(0)) { if (_state == NORMAL) { player->track_prev(); From 51bef054650df710ffd0a2defde5c2a7b8a4482b Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Fri, 29 Nov 2019 21:20:19 +0100 Subject: [PATCH 18/24] Fixed advent mode and persistence stuff. --- src/controller.cpp | 3 +- src/playlist.cpp | 13 ++++++-- src/playlist_manager.cpp | 67 +++++++++++++++++++++------------------- 3 files changed, 48 insertions(+), 35 deletions(-) diff --git a/src/controller.cpp b/src/controller.cpp index e5b5829..49cc747 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -142,7 +142,8 @@ void Controller::_check_rfid() { if (time.tm_mon == 11) { // tm_mon is "months since january", so 11 means december. pl->advent_shuffle(time.tm_mday); } else { - // TODO + DEBUG("Album is in advent mode, but it isn't december (yet). Not playing.\n"); + return; } } else if (data.indexOf("[random]") != -1 && pl->is_fresh()) { pl->shuffle(); diff --git a/src/playlist.cpp b/src/playlist.cpp index a07a1b6..4613228 100644 --- a/src/playlist.cpp +++ b/src/playlist.cpp @@ -317,12 +317,19 @@ void Playlist::shuffle(uint8_t random_offset) { } void Playlist::advent_shuffle(uint8_t day) { - if (day > 24) day = 24; + TRACE("advent_shuffle running...\n"); + + // Not enough songs till the current day? Play all songs in the default order. + if (day > _files.size()) { + return; + } + + // We are in the "different playlist every day" mode. So we don't persist it in order to not miss changes. + persistence = PERSIST_NONE; - if (day > _files.size()) return; _files.insert(_files.begin(), _files[day - 1]); - _files.erase(_files.begin() + day - 1, _files.end()); + _files.erase(_files.begin() + day, _files.end()); } void Playlist::reset() { diff --git a/src/playlist_manager.cpp b/src/playlist_manager.cpp index 5f3576c..0b1f7d4 100644 --- a/src/playlist_manager.cpp +++ b/src/playlist_manager.cpp @@ -109,7 +109,6 @@ Playlist* PlaylistManager::get_playlist_for_folder(String folder) { p = new Playlist(folder); _playlists[folder] = p; if (p->persistence == PERSIST_PERMANENTLY) { - // TODO Load persistence from file String search = folder; search += "="; SPIMaster::select_sd(); @@ -197,38 +196,44 @@ String PlaylistManager::create_mapping_txt() { } void PlaylistManager::persist(Playlist* p) { - if (p->persistence != PERSIST_PERMANENTLY) return; + if (p->persistence == PERSIST_NONE) { + _playlists.erase(p->path()); + return; + } else if (p->persistence == PERSIST_PERMANENTLY) { - String search = p->path(); - search += '='; - - bool old_file_existed = false; - - SPIMaster::select_sd(); - if (SD.exists("_positions.txt")) { - SD.rename("/_positions.txt", "/_positions.temp.txt"); - old_file_existed = true; - } - File dst = SD.open("/_positions.txt", "w"); - - if (old_file_existed) { - File src = SD.open("/_positions.temp.txt", "r"); - - while (true) { - String line = src.readStringUntil('\n'); - line.trim(); - if (line.startsWith(search)) continue; - dst.println(line); + String search = p->path(); + search += '='; + + bool old_file_existed = false; + + SPIMaster::select_sd(); + if (SD.exists("_positions.txt")) { + SD.rename("/_positions.txt", "/_positions.temp.txt"); + old_file_existed = true; + } + File dst = SD.open("/_positions.txt", "w"); + + if (old_file_existed) { + File src = SD.open("/_positions.temp.txt", "r"); + + while (true) { + String line = src.readStringUntil('\n'); + line.trim(); + if (line.startsWith(search)) continue; + dst.println(line); + } + + src.close(); + SD.remove("/_positions.temp.txt"); } - src.close(); - SD.remove("/_positions.temp.txt"); + dst.print(search); + dst.print(p->get_current_track_id()); + dst.print(','); + dst.println(p->get_position()); + dst.close(); + SPIMaster::select_sd(false); + + _playlists.erase(p->path()); } - - dst.print(search); - dst.print(p->get_current_track_id()); - dst.print(','); - dst.println(p->get_position()); - dst.close(); - SPIMaster::select_sd(false); } From 38d48ab0e432d428b0f0852a9e3518cc047d104c Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Fri, 29 Nov 2019 21:22:35 +0100 Subject: [PATCH 19/24] Controller: Only read sector 1 from RFID cards. That's big enough and much faster. --- src/controller.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controller.cpp b/src/controller.cpp index 49cc747..5a30cbb 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -199,7 +199,7 @@ String Controller::_read_rfid_data() { case MFRC522::PICC_TYPE_MIFARE_4K: sectors = 40; break; default: INFO("Unknown PICC type %s\n", String(MFRC522::PICC_GetTypeName(type)).c_str()); } - + sectors = 2; // Pretend we have only two sectors, so we read only sector #1. int good_key_index = -1; for (uint8_t sector=1; sector Date: Fri, 29 Nov 2019 21:23:01 +0100 Subject: [PATCH 20/24] HTTPClientWrapper: Initialize buffer variables. D'Oh. --- src/http_client_wrapper.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/http_client_wrapper.cpp b/src/http_client_wrapper.cpp index c33203c..bb1a90a 100644 --- a/src/http_client_wrapper.cpp +++ b/src/http_client_wrapper.cpp @@ -72,6 +72,9 @@ bool HTTPClientWrapper::_request(String method, String url, uint32_t offset, uin DEBUG("Unexpected HTTP return code %d. Cancelling.\n", status); return false; } + + _buffer_position = 0; + _buffer_length = 0; _connected = true; _length = _http->getSize() + offset; From d3c699aefa7f68c989b4b0f225e753bcabc8d25d Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Fri, 29 Nov 2019 21:23:38 +0100 Subject: [PATCH 21/24] Webinterface: Typo fix. --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index b4decb4..5240c4c 100644 --- a/src/index.html +++ b/src/index.html @@ -188,7 +188,7 @@ update_playlist = function(data) { tr = $('').data('track', i); tr.append($('').html(i + 1)); tr.append($('').html(data.current_track==i ? '' : '')); - tr.append($('').html(data.files[i].substr(data.files[i].title))); + tr.append($('').html(data.files[i].title)); $('#track_list').append(tr); } From 547080acf5005e706c281f809268db64709c0c7e Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Fri, 29 Nov 2019 21:24:10 +0100 Subject: [PATCH 22/24] Main: Fix WiFi connection stuff for multiple WiFis. --- src/main.cpp | 52 +++++++++++++++++++++++----------------------------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 8b195e9..55e2e22 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,6 +2,7 @@ #include #include #include +#include #include #include "main.h" #include "config.h" @@ -19,34 +20,22 @@ HTTPServer* http_server; uint8_t SPIMaster::state = 0; -bool connect_to_wifi(String ssid, String pass) { - TRACE("Connecting to wifi \"%s\"...\n", ssid.c_str()); - WiFi.mode(WIFI_AP_STA); - WiFi.begin(ssid.c_str(), pass.c_str()); - if (WiFi.waitForConnectResult() != WL_CONNECTED) { - DEBUG("Could not connect to wifi \"%s\".\n", ssid.c_str()); - return false; - } else { - INFO("Connected to \"%s\". IP address: %s\n", ssid.c_str(), WiFi.localIP().toString().c_str()); - } - return true; -} - void wifi_connect() { - bool connected = false; INFO("Connecting to WiFi...\n"); + WiFiMulti wifi; SPIMaster::select_sd(); if (SD.exists("/_wifis.txt")) { DEBUG("Reading /_wifis.txt\n"); File f = SD.open("/_wifis.txt", "r"); while (String line = f.readStringUntil('\n')) { - if (line.length()==0 || line.startsWith("#") || line.indexOf('=')==-1) { + if (line.length()==0) { + break; + } else if (line.startsWith("#") || line.indexOf('=')==-1) { continue; } String ssid = line.substring(0, line.indexOf('=')); String pass = line.substring(line.indexOf('=')+1); - connected = connect_to_wifi(ssid, pass); - if (connected) break; + wifi.addAP(ssid.c_str(), pass.c_str()); } f.close(); } else { @@ -55,22 +44,21 @@ void wifi_connect() { f.close(); } SPIMaster::select_sd(false); - - if (!connected) { - #if defined(WIFI_SSID) and defined(WIFI_PASS) - DEBUG("Trying hardcoded WiFi data...\n"); - connected = connect_to_wifi(WIFI_SSID, WIFI_PASS); - #else - DEBUG("No hardcoded WiFi data set.\n"); - #endif - } - if (!connected) { - INFO("No WiFi connection!\n"); + + #if defined(WIFI_SSID) and defined(WIFI_PASS) + wifi.addAP(WIFI_SSID, WIFI_PASS); + #endif + + if (wifi.run() == WL_CONNECTED) { + DEBUG("Connected to WiFi \"%s\".\n", WiFi.SSID().c_str()); + } else { + DEBUG("No WiFi connection!\n"); } } void setup() { - delay(500); + // Small delay to give the Serial console a bit of time to connect. + delay(1000); Serial.begin(115200); Serial.println("Starting..."); Serial.println("Started."); @@ -125,6 +113,12 @@ void setup() { } else { INFO("Could not fetch current time via NTP.\n"); } + + #ifdef VERSION + INFO("ESMP3 version %s (OTA_VERSION %d)\n", VERSION, OTA_VERSION); + #else + INFO("ESMP3, version unknown (OTA_VERSION %d)\n", OTA_VERSION); + #endif INFO("Initialization completed.\n"); } From 0dd5937707990daa38e17ab5da168ddf557d0939 Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Fri, 29 Nov 2019 21:24:41 +0100 Subject: [PATCH 23/24] Player: Prevent overflows in vol_up() and vol_down(). --- src/player.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/player.cpp b/src/player.cpp index 2a9f337..5635fe8 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -464,14 +464,14 @@ void Player::set_volume(uint8_t vol, bool save) { void Player::vol_up() { if (!is_playing()) return; - uint8_t vol = _volume + VOLUME_STEP; + uint16_t vol = _volume + VOLUME_STEP; if (vol > VOLUME_MAX) vol=VOLUME_MAX; set_volume(vol); } void Player::vol_down() { if (!is_playing()) return; - uint8_t vol = _volume - VOLUME_STEP; + int16_t vol = _volume - VOLUME_STEP; if (vol < VOLUME_MIN) vol=VOLUME_MIN; set_volume(vol); } From ecc7c46b8d9c0dad0a2cb5b1801cbbf37d4a029a Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Fri, 29 Nov 2019 21:25:17 +0100 Subject: [PATCH 24/24] Playlist: Restrict RSS feeds to the newest 20 entries. Keep them in the correct order, starting with the last (newest) one. --- src/playlist.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/playlist.cpp b/src/playlist.cpp index 4613228..6a14613 100644 --- a/src/playlist.cpp +++ b/src/playlist.cpp @@ -135,6 +135,7 @@ void xmlcb(uint8_t status, char* tagName, uint16_t tagLen, char* data, uint16_t xml_enclosure_url = ""; } else if (tag.endsWith("/item") && (status & STATUS_END_TAG)) { if (xml_title.length()>0 && xml_url.length()>0) { + if (xml_files_ptr->size() > 20) return; DEBUG("Adding playlist entry: '%s' => '%s'\n", xml_title.c_str(), xml_url.c_str()); xml_files_ptr->insert(xml_files_ptr->begin(), {.filename=xml_url, .title=xml_title, .id=xml_guid}); } @@ -158,6 +159,7 @@ void Playlist::_parse_rss(HTTPClientWrapper* http) { while ((i = http->read()) >= 0) { xml.processChar(i); } + _current_track = _files.size()-1; xml_files_ptr = NULL; if (xml_album_title.length()>0) { _title = xml_album_title; @@ -326,7 +328,7 @@ void Playlist::advent_shuffle(uint8_t day) { // We are in the "different playlist every day" mode. So we don't persist it in order to not miss changes. persistence = PERSIST_NONE; - + _files.insert(_files.begin(), _files[day - 1]); _files.erase(_files.begin() + day, _files.end()); @@ -382,6 +384,7 @@ void Playlist::json(JsonObject json) { JsonObject o = files.createNestedObject(); o["filename"] = entry.filename; o["title"] = entry.title; + o["id"] = entry.id; } json["current_track"] = _current_track; json["has_track_next"] = has_track_next();