DEPLOY.md

@@ -1,3 +0,0 @@
-# Deploying a new version
-
-* Use `deploy.sh`.

README.md

@@ -145,28 +145,3 @@ 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://<IP>/ws`.
-* Through the serial console using an USB cable.
-* Via HTTP POST request to `http://<IP>/cmd`, having the
-  command in the variable `cmd`.
-
-Supported commands are:
-| Command | Action |
-|---------|--------|
-| `play <PATH>` | 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=<X>` | Sets the volume to X (0-255). |
-| `track_prev` | Starts the previous track, if available. |
-| `track_next` | Starts the next track, if available. |
-| `track=<X>` | Starts playing track no. X of the currently playing album. |
-| `reset_vs1053` | Resets the VS1053 audio chip. |
-| `reboot` | Reboots ESMP3. |
-| `add_mapping=<ID>=<PATH>` | Adds a mapping between RFID card <ID> and path
-<PATH>. See `play` for valid path formats. |
-| `update` | Runs an update check. |

data/index.html

@@ -151,7 +151,6 @@
 						<h6>Actions</h6>
 						<button type="button" class="btn btn-danger btn-lg btn-block" id="button_reset_vs1053">Reset VS1053 chip</button>
 						<button type="button" class="btn btn-danger btn-lg btn-block" id="button_reboot">Reboot ESMP3</button>
-						<button type="button" class="btn btn-danger btn-lg btn-block" id="button_update">Check for and install update</button>
 					</div>
 					
 					<div class="modal-footer">
@@ -188,7 +187,7 @@ update_playlist = function(data) {
 		tr = $('<tr>').data('track', i);
 		tr.append($('<td>').html(i + 1));
 		tr.append($('<td>').html(data.current_track==i ? '<i class="fa fa-play"></i>' : ''));
-		tr.append($('<td>').html(data.files[i].title));
+		tr.append($('<td>').html(data.files[i].substr(data.files[i].title)));
 		$('#track_list').append(tr);
 	}
 	
@@ -289,7 +288,6 @@ $(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');

deploy.sh

@@ -1,53 +0,0 @@
-#!/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
-
-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
-
-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`
-OTA_VERSION=$(( "$OTA_VERSION" + 1 ))
-
-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
-
-cp .pio/build/deploy/firmware.bin bin/firmware.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
-rm bin/update.manifest.bak
-
-echo; echo; echo; echo; echo
-echo "Please check the git diff, if everything looks okay:"
-git diff
-
-read -p "Press ENTER to continue, Ctrl-C to abort. " foo
-
-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

include/config.sample.h

@@ -1,21 +1,13 @@
 #pragma once
 #include <Arduino.h>
 
-// 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
 
-// Here you can define WiFi data to use. But actually, the better way to do
+#define WIFI_SSID "---CHANGEME---"
-// this is by using /_wifi.txt on the sd card.
+#define WIFI_PASS "---CHANGEME---"
-//#define WIFI_SSID "---CHANGEME---"
-//#define WIFI_PASS "---CHANGEME---"
 
 #define VS1053_SLEEP_DELAY 5000
 #define POSITION_SEND_INTERVAL 5000

include/controller.h

@@ -10,8 +10,6 @@ class Controller;
 #include "playlist.h"
 #include "playlist_manager.h"
 #include "http_server.h"
-
-#undef DEPRECATED
 #include <MFRC522.h>
 
 enum ControllerState { NORMAL, LOCKING, LOCKED };
@@ -34,8 +32,6 @@ 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);

include/main.h

@@ -1,5 +0,0 @@
-#pragma once
-
-void wifi_connect();
-
-extern const uint8_t file_index_html_start[] asm("_binary_src_index_html_start");

include/playlist.h

@@ -4,16 +4,9 @@
 #include <ArduinoJson.h>
 #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; }
 };
@@ -26,14 +19,12 @@ private:
 	bool _shuffled = false;
 	std::vector<PlaylistEntry> _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();
@@ -43,12 +34,9 @@ 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_file();
-	String get_current_track_id();
 	uint32_t get_position();
 	void set_position(uint32_t p);
 	void shuffle(uint8_t random_offset=0);

include/playlist_manager.h

@@ -20,5 +20,4 @@ public:
 	String json();
 	bool add_mapping(String id, String folder);
 	String create_mapping_txt();
-	void persist(Playlist* p);
 };

include/updater.h

@@ -1,10 +0,0 @@
-#pragma once
-
-#include "http_client_wrapper.h"
-
-class Updater {
-public:
-	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);
-};

partitions.csv

@@ -1,6 +0,0 @@
-# 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,

platformio.ini

@@ -8,33 +8,16 @@
 ; 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 = ${extra.lib_deps}
+lib_deps = MFRC522
+	https://github.com/me-no-dev/ESPAsyncWebServer.git
+	ArduinoJSON
+	6691 ; TinyXML
 upload_port = /dev/cu.SLAB_USBtoUART
-monitor_speed = 115200
+monitor_speed = 74480
-board_build.embed_txtfiles = src/index.html
-;board_build.partitions = partitions.csv
 ;monitor_port = /dev/cu.wchusbserial1420
-
-[env:deploy]
-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

src/controller.cpp

@@ -1,10 +1,8 @@
 #include "controller.h"
-#include "main.h"
 #include "spi_master.h"
 #include "config.h"
 #include "playlist.h"
 #include "http_server.h"
-#include "updater.h"
 #include <ArduinoJson.h>
 
 Controller::Controller(Player* p, PlaylistManager* playlist_manager) {
@@ -36,6 +34,7 @@ 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();
@@ -51,20 +50,7 @@ void Controller::loop() {
 		process_message(_cmd_queue);
 		_cmd_queue = "";
 	}
-	
+	TRACE("Controller::loop() done.\n");
-	#ifdef OTA_UPDATE_URL
-	if (!player->is_playing() && _last_update_check_at < now && _last_update_check_at + OTA_CHECK_INTERVAL < now) {
-		Updater::run();
-	} else {
-		_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;
-	}
 }
 
 uint32_t Controller::_get_rfid_card_uid() {
@@ -83,7 +69,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];
@@ -142,8 +128,7 @@ 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 {
-					DEBUG("Album is in advent mode, but it isn't december (yet). Not playing.\n");
+					// TODO
-					return;
 				}
 			} else if (data.indexOf("[random]") != -1 && pl->is_fresh()) {
 				pl->shuffle();
@@ -199,7 +184,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<sectors; sector++) {
 		uint8_t blocks = (sector < 32) ? 4 : 16;
@@ -243,6 +228,8 @@ 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);
@@ -263,8 +250,13 @@ 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")) {
@@ -297,10 +289,6 @@ 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;
@@ -329,6 +317,8 @@ 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();
@@ -372,22 +362,6 @@ String Controller::json() {
 	rfid["data"] = _last_rfid_data;
 	json["uptime"] = millis() / 1000;
 	json["free_heap"] = ESP.getFreeHeap();
-	JsonObject versions = json.createNestedObject("versions");
-	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<String>();
 }
 

src/http_client_wrapper.cpp

@@ -73,9 +73,6 @@ bool HTTPClientWrapper::_request(String method, String url, uint32_t offset, uin
 		return false;
 	}
 	
-	_buffer_position = 0;
-	_buffer_length = 0;
-	
 	_connected = true;
 	_length = _http->getSize() + offset;
 	if (_http->hasHeader("Content-Type")) {

src/http_server.cpp

@@ -1,7 +1,7 @@
 #include "http_server.h"
-#include "main.h"
 #include "spi_master.h"
 #include <ESPmDNS.h>
+#include <SPIFFS.h>
 
 HTTPServer::HTTPServer(Player* p, Controller* c) {
 	_player = p;
@@ -11,37 +11,14 @@ 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) {
+	_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); }, ([&](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("/upload", HTTP_POST, [](AsyncWebServerRequest* req) {
+	_server->on("/player.json", HTTP_GET, [&](AsyncWebServerRequest* req) {req->send(200, "application/json", _controller->player->json());});
-		req->send(200); 
+	_server->on("/playlist_manager.json", HTTP_GET, [&](AsyncWebServerRequest* req) {req->send(200, "application/json", _controller->pm->json());});
-	}, [&](AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
+	_server->on("/controller.json", HTTP_GET, [&](AsyncWebServerRequest* req) {req->send(200, "application/json", _controller->json());});
-		this->_handle_upload(request, filename, index, data, len, final);
+	_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("/_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);
 }

src/main.cpp

@@ -2,16 +2,14 @@
 #include <SPI.h>
 #include <SD.h>
 #include <WiFi.h>
-#include <WiFiMulti.h>
 #include <ESPmDNS.h>
-#include "main.h"
+#include <SPIFFS.h>
 #include "config.h"
 #include "controller.h"
 #include "player.h"
 #include "spi_master.h"
 #include "http_server.h"
 #include "playlist_manager.h"
-#include "updater.h"
 
 Controller* controller;
 Player* player;
@@ -20,53 +18,29 @@ HTTPServer* http_server;
 
 uint8_t SPIMaster::state = 0;
 
-void wifi_connect() {
+bool connect_to_wifi(String ssid, String pass) {
-	INFO("Connecting to WiFi...\n");
+	TRACE("Connecting to wifi \"%s\"...\n", ssid.c_str());
-	WiFiMulti wifi;
+	WiFi.mode(WIFI_AP_STA);
-	SPIMaster::select_sd();
+	WiFi.begin(ssid.c_str(), pass.c_str());
-	if (SD.exists("/_wifis.txt")) {
+	if (WiFi.waitForConnectResult() != WL_CONNECTED) {
-		DEBUG("Reading /_wifis.txt\n");
+		DEBUG("Could not connect to wifi \"%s\".\n", ssid.c_str());
-		File f = SD.open("/_wifis.txt", "r");
+		return false;
-		while (String line = f.readStringUntil('\n')) {
-			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);
-			wifi.addAP(ssid.c_str(), pass.c_str());
-		}
-		f.close();
 	} else {
-		File f = SD.open("/_wifis.txt", "w");
+		INFO("Connected to \"%s\". IP address: %s\n", ssid.c_str(), WiFi.localIP().toString().c_str());
-		f.print("# WiFi definitions. Syntax: <SSID>=<PASS>. Lines starting with # are ignored. Example:\n# My WiFi=VerySecretPassword\n");
-		f.close();
-	}
-	SPIMaster::select_sd(false);
-
-	#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");
 	}
+	return true;
 }
 
 void setup() {
-	// Small delay to give the Serial console a bit of time to connect.
+	delay(500);
-	delay(1000);
+	Serial.begin(74880);
-	Serial.begin(115200);
 	Serial.println("Starting...");
 	Serial.println("Started.");
 	INFO("Starting.\n");
 	#ifdef VERSION
-		INFO("ESMP3 version %s (OTA_VERSION %d)\n", VERSION, OTA_VERSION);
+		INFO("ESMP3 version %s\n", VERSION);
 	#else
-		INFO("ESMP3, version unknown (OTA_VERSION %d)\n", OTA_VERSION);
+		INFO("ESMP3, version unknown\n");
 	#endif
 	INFO("Initializing...\n");
 
@@ -86,6 +60,9 @@ void setup() {
 	}
 	spi->select_sd(false);
 
+	DEBUG("Starting SPIFFS...\n");
+	SPIFFS.begin(true);
+
 	DEBUG("Initializing PlaylistManager...\n");
 	pm = new PlaylistManager();
 	
@@ -94,7 +71,35 @@ void setup() {
     controller = new Controller(player, pm);
     INFO("Player and controller initialized.\n");
 
-    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: <SSID>=<PASS>. Lines starting with # are ignored. Example:\n# My WiFi=VerySecretPassword\n");
+		f.close();
+	}
+	SPIMaster::select_sd(false);
+	if (!connected) {
+		DEBUG("Trying hardcoded WiFi data...\n");
+		connected = connect_to_wifi(WIFI_SSID, WIFI_PASS);
+	}
+	if (!connected) {
+		INFO("No WiFi connection!\n");
+	}
 	
 	MDNS.begin("esmp3");
 
@@ -114,12 +119,6 @@ void setup() {
 		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");
 }
 

src/player.cpp

@@ -464,14 +464,14 @@ void Player::set_volume(uint8_t vol, bool save) {
 
 void Player::vol_up() {
 	if (!is_playing()) return;
-	uint16_t vol = _volume + VOLUME_STEP;
+	uint8_t vol = _volume + VOLUME_STEP;
 	if (vol > VOLUME_MAX) vol=VOLUME_MAX;
 	set_volume(vol);
 }
 
 void Player::vol_down() {
 	if (!is_playing()) return;
-	int16_t vol = _volume - VOLUME_STEP;
+	uint8_t vol = _volume - VOLUME_STEP;
 	if (vol < VOLUME_MIN) vol=VOLUME_MIN;
 	set_volume(vol);
 }
@@ -535,10 +535,7 @@ bool Player::play() {
 	if (_current_playlist == NULL) return false;
 	if (_current_playlist->get_file_count()==0) return false;
 	_current_playlist->start();
-	String file;
+	String file = _current_playlist->get_current_file();
-	if (!_current_playlist->get_current_file(&file)) {
-		return false;
-	}
 	uint32_t position = _current_playlist->get_position();
 	_state = playing;
 	_play_file(file, position);
@@ -613,7 +610,6 @@ 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;

src/playlist.cpp

@@ -7,9 +7,7 @@
 #include <TinyXML.h>
 
 Playlist::Playlist(String path) {
-	_path = path;
 	if (path.startsWith("/")) {
-		persistence = PERSIST_TEMPORARY;
 		_add_path(path);
 	} else if (path.startsWith("http")) {
 		_examine_http_url(path);
@@ -46,7 +44,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, .id=String(_files.size())});
+			_files.push_back({.filename=entry.name(), .title=title});
 			bool non_ascii_chars = false;
 			for(int i=0; i<filename.length(); i++) {
 				char c = filename.charAt(i);
@@ -77,16 +75,12 @@ void Playlist::_examine_http_url(String url) {
 	String ct = http->getContentType();
 	DEBUG("Content-Type is %s.\n", ct.c_str());
 	if (ct.startsWith("audio/x-mpegurl")) {
-		
 		_parse_m3u(http);
 	} else if (ct.startsWith("audio/")) {
-		persistence = PERSIST_NONE;
+		_files.push_back({.filename=url, .title=url});
-		_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());
@@ -101,7 +95,6 @@ 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) {
@@ -113,11 +106,8 @@ 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) {
@@ -135,9 +125,8 @@ 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});
+			xml_files_ptr->push_back({xml_url, xml_title});
 		}
 	}
 }
@@ -159,7 +148,6 @@ 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;
@@ -192,7 +180,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, .id="none"});
+				_files.push_back({.filename=line, .title=title});
 				title = "";
 			}
 			line = "";
@@ -234,7 +222,7 @@ void Playlist::_parse_pls(HTTPClientWrapper* http) {
 		}
 
 		if (title.length()>0 && url.length()>0) {
-			_files.push_back({.filename=url, .title=title, .id="none"});
+			_files.push_back({.filename=url, .title=title});
 			last_index = -1;
 			title = "";
 			url = "";
@@ -243,10 +231,6 @@ 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();
 }
@@ -290,15 +274,6 @@ 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;
 }
@@ -319,19 +294,12 @@ void Playlist::shuffle(uint8_t random_offset) {
 }
 
 void Playlist::advent_shuffle(uint8_t day) {
-	TRACE("advent_shuffle running...\n");
+	if (day > 24) day = 24;
-	
-	// 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, _files.end());
+	_files.erase(_files.begin() + day - 1, _files.end());
 }
 
 void Playlist::reset() {
@@ -342,20 +310,8 @@ void Playlist::reset() {
 	_started = false;
 }
 
-String Playlist::get_current_track_id() {
+String Playlist::get_current_file() {
-	if (_current_track > _files.size()) {
+	return _files[_current_track].filename;
-		return "";
-	}
-	return _files[_current_track].id;
-}
-
-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() {
@@ -384,7 +340,6 @@ 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();

src/playlist_manager.cpp

@@ -104,40 +104,10 @@ Playlist* PlaylistManager::get_playlist_for_id(String id) {
 }
 
 Playlist* PlaylistManager::get_playlist_for_folder(String folder) {
-	Playlist* p;
 	if (!_playlists.count(folder)) {
-		p = new Playlist(folder);
+		_playlists[folder] = new Playlist(folder);
-		_playlists[folder] = p;
-		if (p->persistence == PERSIST_PERMANENTLY) {
-			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;
 	}
-				}
+	return _playlists[folder];
-				f.close();
-			}
-			SPIMaster::select_sd(false);
-		}
-	} else {
-		p = _playlists[folder];
-		if (p->persistence == PERSIST_NONE) {
-			p->reset();
-		}
-	}
-	return p;
 }
 
 void PlaylistManager::dump_ids() {
@@ -194,46 +164,3 @@ String PlaylistManager::create_mapping_txt() {
 	}
 	return s;
 }
-
-void PlaylistManager::persist(Playlist* p) {
-	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);
-			}
-			
-			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());
-	}
-}

src/updater.cpp

@@ -1,96 +0,0 @@
-#include <Arduino.h>
-#include <Update.h>
-#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_str = "";
-	if (!read_line(&line_str, http, "VERSION")) {
-		return;
-	}
-	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) {
-		return;
-	}
-	
-	String image_path = "";
-	if (!read_line(&image_path, http, "IMAGE_PATH")) {
-		return;
-	}
-	
-	String image_md5 = "";
-	if (!read_line(&image_md5, http, "IMAGE_MD5")) {
-		return;
-	}
-
-	http->close();
-	delete http;
-	
-	if(do_update(U_FLASH, image_path, image_md5)) {
-		DEBUG("Update done. Rebooting...\n");
-	} else {
-		DEBUG("Update failed. Rebooting...\n");
-	}
-	delay(1000);
-	ESP.restart();
-}
-
-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) {
-		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;
-	}
-	Update.setMD5(expected_md5.c_str());
-	uint8_t buf[512];
-	uint16_t len;
-	while((len = http->read(buf, 512))) {
-		Update.write(buf, len);
-	}
-	
-	http->close();
-	delete http;
-	
-	result = Update.end();
-	if (!result) {
-		const char* error = Update.errorString();
-		ERROR("Writing the update failed. The error was: %s\n", error);
-		return false;
-	}
-	return true;
-}