fabian/esmp3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added MQTT client, better speaker handling, fixed bug in FTP server, ...

Browse Source
This commit is contained in:
Fabian Schlenz
2019-08-14 21:01:01 +02:00
parent dcbb42f5ef
commit 5f682c303f
54 changed files with 4945 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/http_server.cpp
View File

@@ -4,16 +4,7 @@ HTTPServer::HTTPServer(Player* p, Controller* c) {
_player = p;
_controller = c;
_http_server = new ESP8266WebServer(80);
DEBUG("Connecting to wifi \"%s\"...\n", WIFI_SSID);
WiFi.mode(WIFI_AP_STA);
WiFi.begin(WIFI_SSID, WIFI_PASS);
if (WiFi.waitForConnectResult() != WL_CONNECTED) {
ERROR("Could not connect to Wifi. Rebooting.");
delay(1000);
ESP.restart();
}
INFO("WiFi connected.\n");
MDNS.begin("esmp3");
//_http_server->onFileUpload([&]() { _handle_upload(); yield();});
_http_server->on("/upload", HTTP_POST, [&]() {
_http_server->sendHeader("Connection", "close");
@@ -123,29 +114,7 @@ void HTTPServer::_handle_index() {
}
void HTTPServer::_handle_status() {
String response = String("{");
response.concat("\"state\": \"");
response.concat(_player->is_playing() ? "playing" : "idle");
response.concat("\", ");
if (_player->is_playing()) {
response.concat("\"album\": \"");
response.concat(_player->album());
response.concat("\", \"track\": ");
response.concat(_player->track());
response.concat(", \"position\": ");
response.concat(_player->position());
response.concat(", ");
}
response.concat("\"volume\": ");
response.concat(_player->volume());
response.concat(", \"volume_max\": ");
response.concat(VOLUME_MAX);
response.concat(", \"volume_min\": ");
response.concat(VOLUME_MIN);
response.concat(", \"rfid_uid\": ");
response.concat(_controller->rfid_uid());
response.concat("}");
_http_server->send(200, "application/json", response);
_http_server->send(200, "application/json", _controller->get_status_json());
}
void HTTPServer::loop() {