Massive changes. Added a quite nice webinterface with live data using WebSockets. Removed the FTP server (wasn't that useful anyways). JSON creating using ArduinoJson instead of String concatenation. Ans, and, and.

2019-11-16 23:03:13 +01:00
parent e471a57578
commit b9a4770ff2
21 changed files with 620 additions and 2806 deletions
--- a/include/controller.h
+++ b/include/controller.h
@ -1,11 +1,16 @@
 #pragma once

 #include <Arduino.h>
+#include <ESPAsyncWebServer.h>
 #include "config.h"
+
+class Controller;
+
 #include "player.h"
 #include "playlist.h"
 #include "playlist_manager.h"
 #include "mqtt_client.h"
+#include "http_server.h"
 #include <MFRC522.h>

 enum ControllerState { NORMAL, LOCKING, LOCKED };
@ -14,6 +19,7 @@ class Controller {
 private:
 	MFRC522* _rfid;
 	MQTTClient* _mqtt_client;
+	HTTPServer* _http_server;
 	PlaylistManager* _pm;
 	ControllerState _state = NORMAL;
 	bool _rfid_enabled = true;
@ -24,12 +30,13 @@ private:
 	uint32_t _get_rfid_card_uid();
 	String _read_rfid_data();
 	bool _rfid_present = false;
-	uint32_t _last_rfid_card_uid = 0;
-	uint8_t _no_rfid_card_count = 0;
+	String _last_rfid_uid = "";
+	String _last_rfid_data = "";
 	Player* _player;
 	unsigned long _last_rfid_scan_at = 0;
+	unsigned long _last_position_info_at = 0;
 	String _serial_buffer = String();
-	void _execute_serial_command(String cmd);
+	String _cmd_queue = "";
 	void _execute_command_ls(String path);
 	void _execute_command_ids();
 	void _execute_command_help();
@ -40,6 +47,13 @@ private:
 public:
 	Controller(Player* p, PlaylistManager* pm);
 	void set_mqtt_client(MQTTClient* m);
-	String get_status_json();
+	void register_http_server(HTTPServer* h);
 	void loop();
+	void send_player_status();
+	void send_playlist_manager_status();
+	void send_position();
+	void inform_new_client(AsyncWebSocketClient* client);
+	String json();
+	bool process_message(String m);
+	void queue_command(String cmd);
 };
--- a/include/http_server.h
+++ b/include/http_server.h
@ -1,29 +1,28 @@
-/*
 #pragma once
-#include <ESP8266WebServer.h>
+
+class HTTPServer;
+
 #include "player.h"
 #include "controller.h"
-#include <SD.h>
-#include <WiFiClient.h>
-#include <ESP8266WiFi.h>
-#include <ESP8266mDNS.h>
+#include <AsyncTCP.h>
+#include <ESPAsyncWebServer.h>

 class HTTPServer {
 private:
-	ESP8266WebServer* _http_server;
-	void _handle_upload();
+	AsyncWebServer* _server;
+	
+	Player* _player;
+	Controller* _controller;
+	void _handle_upload(AsyncWebServerRequest* request, String filename, size_t index, uint8_t* data, size_t len, bool final);
 	uint16_t _chunk_length;
 	uint8_t* _chunk;
 	uint32_t _file_size;
 	uint32_t _file_size_done;
 	bool _need_header;
 	uint32_t _upload_position;
-	void _handle_index();
-	void _handle_status();
-	Player* _player;
-	Controller* _controller;
+	void _onEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len);
+	void _handle_index(AsyncWebServerRequest* req);
 public:
 	HTTPServer(Player* p, Controller* c);
-	void loop();
+	AsyncWebSocket* ws;
 };
-*/
--- a/include/index.html
+++ b/include/index.html
@ -0,0 +1,236 @@
+const char* html = R"V0G0N(<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+	<title>ESMP3</title>
+	<script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha256-pasqAKBDmFT4eHoN2ndd6lN370kFiGUFyTiUHWhU7k8=" crossorigin="anonymous"></script>
+	<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
+	<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
+	<script src="https://kit.fontawesome.com/272149490a.js" crossorigin="anonymous"></script>
+</head>
+
+<body>
+	<div class="container bg-dark text-light">
+		<div class="row">
+			<div class="col-sm-1">
+				<h1 id="play_state_icon"><i class="fa fa-stop"></i></h1>
+			</div>
+			<div class="col-sm-11">
+				<h2><i class="fa fa-compact-disc"></i> <span id="album"></span></h2>
+				<h2><i class="fa fa-scroll"></i> <span id="track"></span></h2>
+			</div>
+		</div>
+	</div>
+	<div class="container">
+		<div class="row">
+			<div class="col">
+				<input type="range" class="custom-range" id="position_slider" disabled>
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-sm-6">
+			</div>
+			<div class="col-sm-1">
+				<h3><i class="fa fa-volume-down"></i></h3>
+			</div>
+			<div class="col-sm-4">
+				<input type="range" class="custom-range" id="volume_slider">
+			</div>
+			<div class="col-sm-1">
+				<h3><i class="fa fa-volume-up"></i></h3>
+			</div>
+		</div>
+		<div class="row">
+			<div class="col">
+				<button type="button" class="btn btn-primary btn-lg btn-block" id="button_track_prev"><i class="fa fa-step-backward"></i></button>
+			</div>
+			<div class="col">
+				<button type="button" class="btn btn-primary btn-lg btn-block" id="button_stop"><i class="fa fa-stop"></i></button>
+			</div>
+			<div class="col">
+				<button type="button" class="btn btn-primary btn-lg btn-block" id="button_play"><i class="fa fa-play"></i></button>
+			</div>
+			<div class="col">
+				<button type="button" class="btn btn-primary btn-lg btn-block" id="button_track_next"><i class="fa fa-step-forward"></i></button>
+			</div>
+			<div class="col">
+				<button type="button" class="btn btn-primary btn-lg btn-block" id="button_lock"><i class="fa fa-lock-open"></i></button>
+			</div>
+			<div class="col">
+				<button type="button" class="btn btn-primary btn-lg btn-block" id="button_open"><i class="fa fa-eject"></i></button>
+		</div>
+	</div>
+	
+	<div class="container">
+		<table class="table table-hover table-sm" id="track_list_table">
+			<thead class="thead-light">
+				<tr>
+					<th>Nr.</th>
+					<th>Status</th>
+					<th>Track</th>
+				</tr>
+			</thead>
+			<tbody class="" id="track_list">
+			
+			</tbody>
+		</table>
+	</div>
+	
+	
+	
+	<div class="modal fade" id="openModal" tabindex="-1" role="dialog">
+		<div class="modal-dialog modal-dialog-centered" role="document">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h5 class="modal-title">Album öffnen</h5>
+					<button type="button" class="close" data-dismiss="modal">
+						<span>&times;</span>
+					</button>
+				</div>
+				
+				<div class="modal-body">
+					<div id="albums_without_id_area">
+						<h6>Albums without RFID card</h6>
+						<table class="table table-hover table-sm">
+							<tbody id="albums_without_id">
+							</tbody>
+						</table>
+					</div>
+					
+					<h6>Albums with RFID</h6>
+					<table class="table table-hover table-sm">
+						<tbody id="albums_with_id">
+						</tbody>
+					</table>
+				</div>
+				
+				<div class="modal-footer">
+					<button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
+				</div>
+			</div>
+		</div>
+	</div>
+</body>
+
+<script>
+update_player = function(data) {
+	$('#play_state_icon i').removeClass('fa-stop', 'fa-play').addClass(data.playing ? 'fa-play' : 'fa-stop');
+	
+	if (data.playing) {
+		$('#button_play').removeClass('btn-primary').addClass('btn-secondary', 'btn-disabled');
+		$('#button_stop').removeClass('btn-secondary', 'btn-disabled').addClass('btn-primary');
+	} else if (data.playlist) {
+		$('#button_play').removeClass('btn-secondary', 'btn-disabled').addClass('btn-primary');
+		$('#button_stop').removeClass('btn-primary').addClass('btn-secondary', 'btn-disabled');
+	} else {
+		$('#button_play').removeClass('btn-primary').addClass('btn-secondary', 'btn-disabled');
+		$('#button_stop').removeClass('btn-primary').addClass('btn-secondary', 'btn-disabled');
+	}
+	
+	$('#volume_slider').attr('min', data.volume.min).attr('max', data.volume.max).val(data.volume.current);
+	
+	if (data.playlist) update_playlist(data.playlist);
+}
+
+update_playlist = function(data) {
+	$('#track_list tr').remove();
+	for (var i=0; i<data.files.length; i++) {
+		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].substr(data.files[i].lastIndexOf('/')+1)));
+		$('#track_list').append(tr);
+	}
+	
+	if (data.has_track_next) {
+		$('#button_track_next').removeClass('btn-secondary', 'btn-disabled').addClass('btn-primary');
+	} else {
+		$('#button_track_next').removeClass('btn-primary').addClass('btn-secondary', 'btn-disabled');
+	}
+	
+	if (data.has_track_prev) {
+		$('#button_track_prev').removeClass('btn-secondary', 'btn-disabled').addClass('btn-primary');
+	} else {
+		$('#button_track_prev').removeClass('btn-primary').addClass('btn-secondary', 'btn-disabled');
+	}
+	
+	var file = data.files[data.current_track];
+	if (file) {
+		file = file.substr(1);
+		$('#album').html(file.substr(0, file.indexOf('/')));
+		file = file.substr(file.indexOf('/')+1);
+		$('#track').html(file.substr(0, file.lastIndexOf('.'))); 
+	}
+}
+
+update_controller = function(data) {
+	if (data.lock_state == "locked") {
+		$('#button_lock').removeClass('btn-primary', 'btn-warning').addClass('btn-danger');
+		$('#button_lock i').removeClass('fa-lock-open').addClass('fa-lock');
+	} else if (data.lock_state == "locking") {
+		$('#button_lock').removeClass('btn-primary', 'btn-danger').addClass('btn-warning');
+		$('#button_lock i').removeClass('fa-lock-open').addClass('fa-lock');
+	} else {
+		$('#button_lock').removeClass('btn-danger', 'btn-warning').addClass('btn-primary');
+		$('#button_lock i').removeClass('fa-lock').addClass('fa-lock-open');
+	}
+}
+
+update_playlist_manager = function(data) {
+	if (data.unmapped.length > 0) {
+		$('#albums_without_id_area').show();
+		$('#albums_without_id tr').remove();
+		data.unmapped = data.unmapped.sort();
+		for (var i=0; i<data.unmapped.length; i++) {
+			var tr = $('<tr>').attr('data-folder', data.unmapped[i]).append($('<td>').html(data.unmapped[i].substr(1)));
+			$('#albums_without_id').append(tr);
+		}
+	} else {
+		$('#albums_without_id_area').hide();
+	}
+	
+	var folders = Object.keys(data.folders).sort();
+	for (var i in folders) {
+		var folder = folders[i];
+		var tr = $('<tr>').attr('data-folder', folder);
+		tr.append($('<td>').html(folder.substr(1)));
+		$('#albums_with_id').append(tr);
+	}
+}
+
+update_position = function(data) {
+	$('#position_slider').attr('max', data.file_size).val(data.position);
+}
+
+process_ws_message = function(event) {
+	var data = event.data.split("\n");;
+	for (var i=0; i<data.length; i++) {
+		var json = JSON.parse(data[i]);
+		console.log(json);
+		switch(json["_type"]) {
+			case "position": update_position(json); break;
+			case "player": update_player(json); break;
+			case "playlist_manager": update_playlist_manager(json); break;
+		}	
+	}
+}
+
+$(function() {
+	ws = new WebSocket("ws://" + location.host + "/ws");
+	ws.onmessage = process_ws_message;
+	
+	$('#volume_slider').change(function(e) { ws.send("volume=" + e.target.value); });
+	$('#button_play').click(function(e) { ws.send("play"); });
+	$('#button_stop').click(function(e) { ws.send("stop"); });
+	$('#button_track_next').click(function(e) { ws.send("track_next"); });
+	$('#button_track_prev').click(function(e) { ws.send("track_prev"); });
+	$('#button_open').click(function(e) { $('#openModal').modal('show'); });
+	$('#track_list').on('click', 'tr', function(e) { ws.send("track=" + $(e.target).parent().data('track')); });
+	$('#albums_without_id, #albums_with_id').on('click', 'tr', function(e) { ws.send("play " + $(e.target).parent().data('folder')); $('#openModal').modal('hide'); });
+});
+</script>
+</html>
+
+)V0G0N";
--- a/include/player.h
+++ b/include/player.h
@ -5,6 +5,10 @@
 #include "spi_master.h"
 #include "playlist.h"

+class Player;
+
+#include "controller.h"
+
 #define SCI_MODE 0x00
 #define SCI_STATUS 0x01
 #define SCI_BASS 0x02
@ -39,7 +43,6 @@ private:
 	enum state { uninitialized, idle, playing, stopping,
 		sleeping, recording };
 	void _reset();
-	void _init();
 	void _wait();
 	uint16_t _read_control_register(uint8_t address, bool do_wait=true);
 	void _write_control_register(uint8_t address, uint16_t value, bool do_wait=true);
@ -70,27 +73,32 @@ private:
 	SPISettings* _spi_settings = &_spi_settings_slow;

 	File _file;
+	uint32_t _file_size = 0;
 	uint8_t _buffer[32];
-	uint32_t _current_play_position;
-	Playlist* _current_playlist;
+	uint32_t _current_play_position = 0;
+	Playlist* _current_playlist = NULL;
 	uint _refills;
 	uint8_t _volume;
 	uint16_t _stop_delay;
 	uint32_t _skip_to;
 	SPIMaster* _spi;
+	Controller* _controller;
 	unsigned long _stopped_at;
 public:
 	Player(SPIMaster* s);
+	void init();
+	void register_controller(Controller* c);
 	void vol_up();
 	void vol_down();
 	void track_next();
 	void track_prev();
+	void set_track(uint8_t track);
 	bool is_playing();
 	bool play();
 	bool play(Playlist* p);
 	void stop(bool turn_speaker_off=true);
 	bool loop();
 	void set_volume(uint8_t vol, bool save = true);
-	uint32_t position() { return _current_play_position; }
-	uint8_t volume() { return _volume; }
+	String position_json();
+	String json();
 };
--- a/include/playlist.h
+++ b/include/playlist.h
@ -1,25 +1,32 @@
 #pragma once
 #include <Arduino.h>
 #include <vector>
+#include <ArduinoJson.h>

 class Playlist {
 private:
 	uint32_t _position = 0;
 	uint32_t _current_track = 0;
+	bool _started = false;
 	bool _shuffled = false;
 	std::vector<String> _files;
 public:
 	Playlist(String path);
+	void start();
 	bool has_track_next();
 	bool has_track_prev();
 	bool track_next();
 	bool track_prev();
 	void track_restart();
+	bool set_track(uint8_t track);
 	void reset();
 	bool is_empty();
 	String get_current_file();
 	uint32_t get_position();
 	void set_position(uint32_t p);
 	void shuffle(uint8_t random_offset=0);
+	void advent_shuffle(uint8_t day);
 	bool is_fresh();
+	void dump();
+	void json(JsonObject json);
 };
--- a/include/playlist_manager.h
+++ b/include/playlist_manager.h
@ -1,14 +1,18 @@
 #pragma once

 #include <map>
+#include <vector>
 #include "playlist.h"

 class PlaylistManager {
 private:
 	std::map<String, String> _map;
 	std::map<String, Playlist*> _playlists;
+	std::vector<String> _unmapped_folders;
 public:
 	PlaylistManager();
 	Playlist* get_playlist_for_id(String id);
+	Playlist* get_playlist_for_folder(String folder);
 	void dump_ids();
+	String json();
 };