Skip to content

Hide get_accessories message #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DutchDevelop merged 3 commits into from
Apr 20, 2024
Merged

Hide get_accessories message #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dcee135
Changed initial LED update
Apr 5, 2024
14fd39f
AddingWifi rescan on repeat failure
Apr 20, 2024
b418816
Status update
Apr 20, 2024
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
25 changes: 18 additions & 7 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "serialmanager.h"
#include "wifi-manager.h"


int wifi_reconnect_count = 0;
void defaultcolors(){
Serial.println(F("Setting default customisable colors"));
printerConfig.runningColor = hex2rgb("#000000",255,255);//WHITE Running
Expand Down Expand Up @@ -86,7 +86,8 @@ void setup(){
Serial.println(F(" **"));
Serial.println();
globalVariables.started = true;

Serial.println(F("Updating LEDs from Setup"));
updateleds();
}

void loop(){
Expand All @@ -97,12 +98,22 @@ void loop(){
ledsloop();

if (WiFi.status() != WL_CONNECTED){
if (WiFi.status() == WL_DISCONNECTED) Serial.print(F("Wifi connection Disconnected. "));

Serial.print(F("Wifi connection dropped. "));
Serial.print(F("Wifi Status: "));
Serial.println(wl_status_to_string(WiFi.status()));
Serial.println(F("Attempting to reconnect to WiFi..."));
WiFi.disconnect();
delay(10);
WiFi.reconnect();
wifi_reconnect_count += 1;
if(wifi_reconnect_count <= 2){
WiFi.disconnect();
delay(100);
WiFi.reconnect();
} else {
//Not connecting after 10 simple disconnect / reconnects
//Do something more drastic in case needing to switch to new AP
scanNetwork();
connectToWifi();
wifi_reconnect_count = 0;
}
}
}
if(printerConfig.rescanWiFiNetwork)
Expand Down
7 changes: 4 additions & 3 deletions src/mqttmanager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ void connectMqtt(){
mqttClient.subscribe(report_topic.c_str());
printerVariables.online = true;
printerVariables.disconnectMQTTms = 0;
Serial.println(F("Updating LEDs from MQTT connect"));
updateleds();
//Serial.println(F("Updating LEDs from MQTT connect"));
//updateleds();
}else{
Serial.println(F("Failed to connect with error code: "));
Serial.print(mqttClient.state());
Expand Down Expand Up @@ -93,7 +93,7 @@ void ParseCallback(char *topic, byte *payload, unsigned int length){
auto deserializeError = deserializeJson(messageobject, payload, length, DeserializationOption::Filter(filter));
if (!deserializeError){
if (printerConfig.debuging){
Serial.print(F("Mqtt message received, "));
Serial.println(F("Mqtt message received."));
Serial.print(F("FreeHeap: "));
Serial.println(ESP.getFreeHeap());
}
Expand All @@ -106,6 +106,7 @@ void ParseCallback(char *topic, byte *payload, unsigned int length){
|| messageobject["print"]["command"] == "project_file" //1 message per print
|| messageobject["print"]["command"] == "clean_print_error" //During error (no info)
|| messageobject["print"]["command"] == "resume" //After error or pause
|| messageobject["print"]["command"] == "get_accessories" //After error or pause
|| messageobject["print"]["command"] == "prepare"){ //1 message per print
return;
}
Expand Down