Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/display_handler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ void DisplayHandler::loop() {

// Global Vars
char message[LCD_COLS]{' '};
uint16_t i = writeIndex - scrollPosition;
uint16_t i = (writeIndex - scrollPosition + MAX_ALARMS) % MAX_ALARMS;

// First line: Always show current frequency
if (hasAnalysis && currentAnalysis.isValidSignal) {
Expand Down
7 changes: 3 additions & 4 deletions src/networking.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "networking.h"

Networking::Networking() : mqttClient(espClient){}
Networking::Networking() : mqttClient(espClient), lastReconnectTry(0) {}

void Networking::begin() {
if (WIFI_CONFIGURED) {
Expand All @@ -27,22 +27,21 @@ void Networking::setupWiFi() {
void Networking::setupMqtt() {
Serial.println("Setting up MQTT...");
mqttClient.setServer(MQTT_SERVER, MQTT_PORT);
espClient.setInsecure();
espClient.setInsecure();
espClient.setTimeout(5); // 5 seconds connection timeout
}

void Networking::reconnectWiFi() {
Serial.println("WiFi lost connection. Reconnecting...");
WiFi.disconnect();
WiFi.reconnect();
delay(1000);
}

void Networking::reconnectMQTT() {
Serial.println("Attempting MQTT connection...");
String clientId = "FreqSensor-";
clientId += String(random(0xffff), HEX);
mqttClient.disconnect();
mqttClient.connect(clientId.c_str(), MQTT_USERNAME, MQTT_PASSWORD);
bool connected = mqttClient.connect(clientId.c_str(), MQTT_USERNAME, MQTT_PASSWORD);
if (connected) {
Serial.println("MQTT connected!");
Expand Down