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

Removed MQTT client. Was more or less unused, anyways.

Browse Source
This commit is contained in:
Fabian Schlenz
2019-11-17 17:38:41 +01:00
parent be8a124803
commit 37df309127
51 changed files with 2 additions and 3863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/controller.cpp
View File

@ -29,10 +29,6 @@ Controller::Controller(Player* p, PlaylistManager* pm) {
for (uint8_t i=0; i<NUM_BUTTONS; i++) _button_last_pressed_at[i]=0;
}
void Controller::set_mqtt_client(MQTTClient* m) {
_mqtt_client = m;
}
void Controller::register_http_server(HTTPServer* h) {
_http_server = h;
}
@ -97,8 +93,6 @@ void Controller::_check_rfid() {
} else {
uint32_t uid = _get_rfid_card_uid();
if (uid > 0) {
_mqtt_client->publish_rfid_uid(uid);
//_no_rfid_card_count = 0;
String temp = String(uid, HEX);
String s_uid = "";
for (int i=0; i<(8-temp.length()); i++) {

11
src/main.cpp
View File

@ -9,16 +9,13 @@
#include "player.h"
#include "spi_master.h"
#include "http_server.h"
#include "mqtt_client.h"
#include "playlist_manager.h"
Controller* controller;
Player* player;
PlaylistManager* pm;
HTTPServer* http_server;
MQTTClient* mqtt_client;
unsigned long last_mqtt_report = 0;
uint8_t SPIMaster::state = 0;
void setup() {
@ -71,11 +68,8 @@ void setup() {
}
INFO("WiFi connected. IP address: %s\n", WiFi.localIP().toString().c_str());
mqtt_client = new MQTTClient();
MDNS.begin("esmp3");
controller->set_mqtt_client(mqtt_client);
DEBUG("Setting up HTTP server...\n");
http_server = new HTTPServer(player, controller);
controller->register_http_server(http_server);
@ -100,9 +94,4 @@ void loop() {
if (more_data_needed) return;
controller->loop();
mqtt_client->loop();
if ((last_mqtt_report + 10000 < millis()) || last_mqtt_report > millis()) {
last_mqtt_report = millis();
mqtt_client->publish_status(controller->json());
}
}

36
src/mqtt_client.cpp
View File

@ -1,36 +0,0 @@
#include "mqtt_client.h"
MQTTClient::MQTTClient() {
_wifi_client = new WiFiClient();
_mqtt = new PubSubClient(*_wifi_client);
_mqtt->setServer("10.10.2.1", 1883);
_last_reconnect_attempt = 0;
}
void MQTTClient::loop() {
if (!_mqtt->connected()) {
unsigned long now = millis();
if (now - _last_reconnect_attempt > 5000) {
DEBUG("Connecting to MQTT server...\n");
_last_reconnect_attempt = now;
_reconnect();
}
} else {
_mqtt->loop();
}
}
void MQTTClient::_reconnect() {
_mqtt->connect("esmp3", "esmp3", "pairugp598hpknfblaaagvaie58oh", "esmp3/state", 0, true, "OFFLINE");
_mqtt->publish("esmp3/state", "ONLINE", true);
}
void MQTTClient::publish_status(String s) {
_mqtt->publish("esmp3/status", s.c_str(), true);
}
void MQTTClient::publish_rfid_uid(uint32_t uid) {
String s = String(uid, HEX);
_mqtt->publish("esmp3/rfid_uid", s.c_str(), true);
}