projects/awtrix-light
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Stephan Mühl
2023-04-04 15:51:09 +02:00
parent 0e25888c4d
commit 6a9c030d8c
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/DisplayManager.cpp
View File

@@ -90,6 +90,7 @@ bool DisplayManager_::setAutoTransition(bool active)
ui->disablesetAutoTransition(); ui->disablesetAutoTransition();
return false; return false;
} }
showGif = false;
} }
void DisplayManager_::drawGIF(uint16_t x, uint16_t y, fs::File gFile) void DisplayManager_::drawGIF(uint16_t x, uint16_t y, fs::File gFile)
@@ -258,14 +259,15 @@ void DisplayManager_::generateCustomPage(const String &name, const char *json)
Serial.println("delete"); Serial.println("delete");
customApps.erase(customApps.find(name)); customApps.erase(customApps.find(name));
removeCustomApp(name); removeCustomApp(name);
showGif = false;
return; return;
} }
DynamicJsonDocument doc(1024); DynamicJsonDocument doc(1024);
DeserializationError error = deserializeJson(doc, json); DeserializationError error = deserializeJson(doc, json);
if (error) if (error)
{ {
showGif = false;
doc.clear(); doc.clear();
return; return;
} }
@@ -458,7 +460,7 @@ void DisplayManager_::generateNotification(const char *json)
notify.color = TEXTCOLOR_565; notify.color = TEXTCOLOR_565;
} }
notify.flag = true; notify.flag = true;
showGif = false; showGif = false;
if (doc.containsKey("icon")) if (doc.containsKey("icon"))
@@ -487,7 +489,6 @@ void DisplayManager_::generateNotification(const char *json)
fs::File nullPointer; fs::File nullPointer;
notify.icon = nullPointer; notify.icon = nullPointer;
} }
} }
void DisplayManager_::loadNativeApps() void DisplayManager_::loadNativeApps()

4
src/Globals.cpp
View File

@@ -75,7 +75,7 @@ void loadSettings()
TEXTCOLOR_565 = Settings.getUInt("COL", 0xFFFF); TEXTCOLOR_565 = Settings.getUInt("COL", 0xFFFF);
AUTO_TRANSITION = Settings.getBool("TRANS", true); AUTO_TRANSITION = Settings.getBool("TRANS", true);
TIME_PER_TRANSITION = Settings.getUInt("TSPEED", 400); TIME_PER_TRANSITION = Settings.getUInt("TSPEED", 400);
TIME_PER_APP = Settings.getUInt("ADUR", 5000); TIME_PER_APP = Settings.getUInt("ADUR", 7000);
TIME_FORMAT = Settings.getString("TFORMAT", "%H:%M:%S"); TIME_FORMAT = Settings.getString("TFORMAT", "%H:%M:%S");
DATE_FORMAT = Settings.getString("DFORMAT", "%d.%m.%y"); DATE_FORMAT = Settings.getString("DFORMAT", "%d.%m.%y");
START_ON_MONDAY = Settings.getBool("SOM", true); START_ON_MONDAY = Settings.getBool("SOM", true);
@@ -161,7 +161,7 @@ String NET_PDNS = "8.8.8.8";
String NET_SDNS = "1.1.1.1"; String NET_SDNS = "1.1.1.1";
int TIME_PER_APP = 7000; int TIME_PER_APP = 7000;
uint8_t MATRIX_FPS = 23; uint8_t MATRIX_FPS = 23;
int TIME_PER_TRANSITION = 500; int TIME_PER_TRANSITION = 400;
String NTP_SERVER = "de.pool.ntp.org"; String NTP_SERVER = "de.pool.ntp.org";
String NTP_TZ = "CET-1CEST,M3.5.0,M10.5.0/3"; String NTP_TZ = "CET-1CEST,M3.5.0,M10.5.0/3";
bool HA_DISCOVERY = false; bool HA_DISCOVERY = false;

2
src/ServerManager.cpp
View File

@@ -50,7 +50,7 @@ void ServerManager_::setup()
isConnected = !(myIP == IPAddress(192, 168, 4, 1)); isConnected = !(myIP == IPAddress(192, 168, 4, 1));
Serial.println(myIP.toString()); Serial.println(myIP.toString());
Serial.println(isConnected);
if (isConnected) if (isConnected)
{ {

2
src/main.cpp
View File

@@ -62,7 +62,6 @@ void setup()
loadSettings(); loadSettings();
Serial.begin(115200); Serial.begin(115200);
PeripheryManager.setup(); PeripheryManager.setup();
delay(500);
ServerManager.loadSettings(); ServerManager.loadSettings();
DisplayManager.setup(); DisplayManager.setup();
DisplayManager.HSVtext(9, 6, VERSION, true); DisplayManager.HSVtext(9, 6, VERSION, true);
@@ -70,7 +69,6 @@ void setup()
PeripheryManager.playBootSound(); PeripheryManager.playBootSound();
xTaskCreatePinnedToCore(BootAnimation, "Task", 10000, NULL, 1, &taskHandle, 1); xTaskCreatePinnedToCore(BootAnimation, "Task", 10000, NULL, 1, &taskHandle, 1);
ServerManager.setup(); ServerManager.setup();
if (ServerManager.isConnected) if (ServerManager.isConnected)
{ {
MQTTManager.setup(); MQTTManager.setup();