update
This commit is contained in:
@@ -90,6 +90,7 @@ bool DisplayManager_::setAutoTransition(bool active)
|
||||
ui->disablesetAutoTransition();
|
||||
return false;
|
||||
}
|
||||
showGif = false;
|
||||
}
|
||||
|
||||
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");
|
||||
customApps.erase(customApps.find(name));
|
||||
removeCustomApp(name);
|
||||
showGif = false;
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
DynamicJsonDocument doc(1024);
|
||||
DeserializationError error = deserializeJson(doc, json);
|
||||
if (error)
|
||||
{
|
||||
showGif = false;
|
||||
doc.clear();
|
||||
return;
|
||||
}
|
||||
@@ -487,7 +489,6 @@ void DisplayManager_::generateNotification(const char *json)
|
||||
fs::File nullPointer;
|
||||
notify.icon = nullPointer;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void DisplayManager_::loadNativeApps()
|
||||
|
||||
@@ -75,7 +75,7 @@ void loadSettings()
|
||||
TEXTCOLOR_565 = Settings.getUInt("COL", 0xFFFF);
|
||||
AUTO_TRANSITION = Settings.getBool("TRANS", true);
|
||||
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");
|
||||
DATE_FORMAT = Settings.getString("DFORMAT", "%d.%m.%y");
|
||||
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";
|
||||
int TIME_PER_APP = 7000;
|
||||
uint8_t MATRIX_FPS = 23;
|
||||
int TIME_PER_TRANSITION = 500;
|
||||
int TIME_PER_TRANSITION = 400;
|
||||
String NTP_SERVER = "de.pool.ntp.org";
|
||||
String NTP_TZ = "CET-1CEST,M3.5.0,M10.5.0/3";
|
||||
bool HA_DISCOVERY = false;
|
||||
|
||||
@@ -50,7 +50,7 @@ void ServerManager_::setup()
|
||||
|
||||
isConnected = !(myIP == IPAddress(192, 168, 4, 1));
|
||||
Serial.println(myIP.toString());
|
||||
|
||||
Serial.println(isConnected);
|
||||
if (isConnected)
|
||||
{
|
||||
|
||||
|
||||
@@ -62,7 +62,6 @@ void setup()
|
||||
loadSettings();
|
||||
Serial.begin(115200);
|
||||
PeripheryManager.setup();
|
||||
delay(500);
|
||||
ServerManager.loadSettings();
|
||||
DisplayManager.setup();
|
||||
DisplayManager.HSVtext(9, 6, VERSION, true);
|
||||
@@ -70,7 +69,6 @@ void setup()
|
||||
PeripheryManager.playBootSound();
|
||||
xTaskCreatePinnedToCore(BootAnimation, "Task", 10000, NULL, 1, &taskHandle, 1);
|
||||
ServerManager.setup();
|
||||
|
||||
if (ServerManager.isConnected)
|
||||
{
|
||||
MQTTManager.setup();
|
||||
|
||||
Reference in New Issue
Block a user