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]

src/controller.cpp

@@ -36,6 +36,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();
@@ -65,6 +66,7 @@ void Controller::loop() {
 	} else {
 		_last_wifi_try_at = now;
 	}
+	TRACE("Controller::loop() done.\n");
 }
 
 uint32_t Controller::_get_rfid_card_uid() {
@@ -83,7 +85,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 +144,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");
-					return;
+					// TODO
 				}
 			} else if (data.indexOf("[random]") != -1 && pl->is_fresh()) {
 				pl->shuffle();
@@ -199,7 +200,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 +244,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);
@@ -329,6 +332,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();

src/http_client_wrapper.cpp

@@ -72,9 +72,6 @@ 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;

src/index.html

@@ -188,7 +188,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);
 	}
 	

src/main.cpp

@@ -2,7 +2,6 @@
 #include <SPI.h>
 #include <SD.h>
 #include <WiFi.h>
-#include <WiFiMulti.h>
 #include <ESPmDNS.h>
 #include "main.h"
 #include "config.h"
@@ -20,22 +19,34 @@ 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) {
-				break;
-			} else if (line.startsWith("#") || line.indexOf('=')==-1) {
+			if (line.length()==0 || 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());
+			connected = connect_to_wifi(ssid, pass);
+			if (connected) break;
 		}
 		f.close();
 	} else {
@@ -44,21 +55,22 @@ void wifi_connect() {
 		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");
+	
+	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() {
-	// Small delay to give the Serial console a bit of time to connect.
-	delay(1000);
+	delay(500);
 	Serial.begin(115200);
 	Serial.println("Starting...");
 	Serial.println("Started.");
@@ -113,12 +125,6 @@ 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");
 }

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);
 }

src/playlist.cpp

@@ -135,7 +135,6 @@ 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});
 		}
@@ -159,7 +158,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;
@@ -319,19 +317,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() {
@@ -384,7 +375,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

@@ -109,6 +109,7 @@ 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();
@@ -196,44 +197,38 @@ String PlaylistManager::create_mapping_txt() {
 }
 
 void PlaylistManager::persist(Playlist* p) {
-	if (p->persistence == PERSIST_NONE) {
-		_playlists.erase(p->path());
-		return;
-	} else if (p->persistence == PERSIST_PERMANENTLY) {
+	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);
-
-		_playlists.erase(p->path());
+	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);
 }