Merge upstream post: temp usermod and new version

This commit is contained in:
Ewoud
2023-05-17 11:50:24 +02:00
parent c0d5cad198
commit e0d2d28b19
7 changed files with 210 additions and 237 deletions

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "wled",
"version": "0.14.0-b15.24",
"version": "0.14.0-b15.25",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "wled",
"version": "0.14.0-b15.24",
"version": "0.14.0-b15.25",
"license": "ISC",
"dependencies": {
"clean-css": "^4.2.3",

View File

@@ -1,6 +1,6 @@
{
"name": "wled",
"version": "0.14.0-b15.24",
"version": "0.14.0-b15.25",
"description": "Tools for WLED project",
"main": "tools/cdata.js",
"directories": {

View File

@@ -62,6 +62,7 @@ class UsermodTemperature : public Usermod {
public:
UsermodTemperature(const char *name, bool enabled):Usermod(name, enabled) {} //WLEDMM: this shouldn't be necessary (passthrough of constructor), maybe because Usermod is an abstract class
/*
* API calls te enable data exchange between WLED modules
*/
@@ -197,50 +198,40 @@ void UsermodTemperature::publishHomeAssistantAutodiscovery() {
}
#endif
public:
UsermodTemperature(const char *name, bool enabled):Usermod(name, enabled) {} //WLEDMM: this shouldn't be necessary (passthrough of constructor), maybe because Usermod is an abstract class
void setup() {
int retries = 10;
sensorFound = 0;
temperature = -127.0f; // default to -127, DS18B20 only goes down to -50C
if (enabled) {
// config says we are enabled
USER_PRINTLN(F("Finding temperature pin..."));
// pin retrieved from cfg.json (readFromConfig()) prior to running setup()
if (temperaturePin >= 0 && pinManager.allocatePin(temperaturePin, true, PinOwner::UM_Temperature)) {
oneWire = new OneWire(temperaturePin);
if (oneWire->reset()) {
while (!findSensor() && retries--) {
delay(25); // try to find sensor
}
}
if (parasite && pinManager.allocatePin(parasitePin, true, PinOwner::UM_Temperature)) {
pinMode(parasitePin, OUTPUT);
digitalWrite(parasitePin, LOW); // deactivate power (close MOSFET)
} else {
parasitePin = -1;
}
} else {
if (temperaturePin >= 0) {
USER_PRINTLN(F("Temperature pin allocation failed."));
}
temperaturePin = -1; // allocation failed
void UsermodTemperature::setup() {
int retries = 10;
sensorFound = 0;
temperature = -127.0f; // default to -127, DS18B20 only goes down to -50C
if (enabled) {
// config says we are enabled
DEBUG_PRINTLN(F("Allocating temperature pin..."));
// pin retrieved from cfg.json (readFromConfig()) prior to running setup()
if (temperaturePin >= 0 && pinManager.allocatePin(temperaturePin, true, PinOwner::UM_Temperature)) {
oneWire = new OneWire(temperaturePin);
if (oneWire->reset()) {
while (!findSensor() && retries--) {
delay(25); // try to find sensor
}
}
lastMeasurement = millis() - readingInterval + 10000;
initDone = true;
USER_PRINTLN(F("temperature usermod initialized."));
if (parasite && pinManager.allocatePin(parasitePin, true, PinOwner::UM_Temperature)) {
pinMode(parasitePin, OUTPUT);
digitalWrite(parasitePin, LOW); // deactivate power (close MOSFET)
} else {
parasitePin = -1;
}
} else {
if (temperaturePin >= 0) {
DEBUG_PRINTLN(F("Temperature pin allocation failed."));
}
temperaturePin = -1; // allocation failed
}
}
lastMeasurement = millis() - readingInterval + 10000;
initDone = true;
}
void loop() {
unsigned long last_runtime = 0; // WLEDMM ensure that strip.isUpdating() will not block longer that 4000ms
if (!enabled || !sensorFound || (strip.isUpdating() && (millis()-last_runtime < 4000))) return; // WLEDMM be nice, but not too nice
last_runtime = millis();
void UsermodTemperature::loop() {
if (!enabled || !sensorFound || strip.isUpdating()) return;
static uint8_t errorCount = 0;
unsigned long now = millis();
@@ -358,8 +349,10 @@ void UsermodTemperature::addToJsonInfo(JsonObject& root) {
*/
void UsermodTemperature::addToConfig(JsonObject &root) {
// we add JSON object: {"Temperature": {"pin": 0, "degC": true}}
JsonObject top = root.createNestedObject(FPSTR(_name)); // usermodname
top[FPSTR(_enabled)] = enabled;
//WLEDMM: call superclass
Usermod::addToConfig(root);
JsonObject top = root[FPSTR(_name)];
top["pin"] = temperaturePin; // usermodparam
top["degC"] = degC; // usermodparam
top[FPSTR(_readInterval)] = readingInterval / 1000;
@@ -368,81 +361,61 @@ void UsermodTemperature::addToConfig(JsonObject &root) {
DEBUG_PRINTLN(F("Temperature config saved."));
}
/**
* addToConfig() (called from set.cpp) stores persistent properties to cfg.json
*/
void addToConfig(JsonObject &root) {
Usermod::addToConfig(root);
JsonObject top = root[FPSTR(_name)];
/**
* readFromConfig() is called before setup() to populate properties from values stored in cfg.json
*
* The function should return true if configuration was successfully loaded or false if there was no configuration.
*/
bool UsermodTemperature::readFromConfig(JsonObject &root) {
// we look for JSON object: {"Temperature": {"pin": 0, "degC": true}}
//WLEDMM call superclass
Usermod::readFromConfig(root); //WLEDMM: configComplete not implemented here (todo?)
JsonObject top = root[FPSTR(_name)];
DEBUG_PRINT(FPSTR(_name));
// we add JSON object: {"Temperature": {"pin": 0, "degC": true}}
top["pin"] = temperaturePin; // usermodparam
top["degC"] = degC; // usermodparam
top[FPSTR(_readInterval)] = readingInterval / 1000;
top[FPSTR(_parasite)] = parasite;
top[FPSTR(_parasitePin)] = parasitePin;
DEBUG_PRINTLN(F("Temperature config saved."));
}
int8_t newTemperaturePin = temperaturePin;
/**
* readFromConfig() is called before setup() to populate properties from values stored in cfg.json
*
* The function should return true if configuration was successfully loaded or false if there was no configuration.
*/
bool readFromConfig(JsonObject &root) {
/*bool configComplete = */Usermod::readFromConfig(root); //WLEDMM: configComplete not implemented here (todo?)
JsonObject top = root[FPSTR(_name)];
DEBUG_PRINT(FPSTR(_name));
if (top.isNull()) {
DEBUG_PRINTLN(F(": No config found. (Using defaults.)"));
return false;
}
// we look for JSON object: {"Temperature": {"pin": 0, "degC": true}}
int8_t newTemperaturePin = temperaturePin;
newTemperaturePin = top["pin"] | newTemperaturePin;
degC = top["degC"] | degC;
readingInterval = top[FPSTR(_readInterval)] | readingInterval/1000;
readingInterval = min(120,max(10,(int)readingInterval)) * 1000; // convert to ms
parasite = top[FPSTR(_parasite)] | parasite;
parasitePin = top[FPSTR(_parasitePin)] | parasitePin;
if (top.isNull()) {
DEBUG_PRINTLN(F(": No config found. (Using defaults.)"));
return false;
}
newTemperaturePin = top["pin"] | newTemperaturePin;
degC = top["degC"] | degC;
readingInterval = top[FPSTR(_readInterval)] | readingInterval/1000;
readingInterval = min(120,max(10,(int)readingInterval)) * 1000; // convert to ms
parasite = top[FPSTR(_parasite)] | parasite;
parasitePin = top[FPSTR(_parasitePin)] | parasitePin;
if (!initDone) {
// first run: reading from cfg.json
temperaturePin = newTemperaturePin;
DEBUG_PRINTLN(F(" config loaded."));
} else {
DEBUG_PRINTLN(F(" config (re)loaded."));
// changing paramters from settings page
if (newTemperaturePin != temperaturePin) {
DEBUG_PRINTLN(F("Re-init temperature."));
// deallocate pin and release memory
delete oneWire;
pinManager.deallocatePin(temperaturePin, PinOwner::UM_Temperature);
temperaturePin = newTemperaturePin;
pinManager.deallocatePin(parasitePin, PinOwner::UM_Temperature);
// initialise
setup();
}
}
// use "return !top["newestParameter"].isNull();" when updating Usermod with new features
return !top[FPSTR(_parasitePin)].isNull();
if (!initDone) {
// first run: reading from cfg.json
temperaturePin = newTemperaturePin;
DEBUG_PRINTLN(F(" config loaded."));
} else {
DEBUG_PRINTLN(F(" config (re)loaded."));
// changing paramters from settings page
if (newTemperaturePin != temperaturePin) {
DEBUG_PRINTLN(F("Re-init temperature."));
// deallocate pin and release memory
delete oneWire;
pinManager.deallocatePin(temperaturePin, PinOwner::UM_Temperature);
temperaturePin = newTemperaturePin;
pinManager.deallocatePin(parasitePin, PinOwner::UM_Temperature);
// initialise
setup();
}
}
// use "return !top["newestParameter"].isNull();" when updating Usermod with new features
return !top[FPSTR(_parasitePin)].isNull();
}
void appendConfigData()
{
oappend(SET_F("addHB('Temperature');")); // WLEDMM
oappend(SET_F("addInfo('Temperature:parasite-pwr")); //WLEDMM use literals
oappend(SET_F("',1,'<i>(if no Vcc connected)</i>');")); // 0 is field type, 1 is actual field
oappend(SET_F("addInfo('Temperature:parasite-pwr-pin")); //WLEDMM use literals
oappend(SET_F("',1,'<i>(for external MOSFET)</i>');")); // 0 is field type, 1 is actual field
}
void UsermodTemperature::appendConfigData() {
oappend(SET_F("addHB('Temperature');")); // WLEDMM
oappend(SET_F("addInfo('")); oappend(String(FPSTR(_name)).c_str()); oappend(SET_F(":")); oappend(String(FPSTR(_parasite)).c_str());
oappend(SET_F("',1,'<i>(if no Vcc connected)</i>');")); // 0 is field type, 1 is actual field
oappend(SET_F("addInfo('")); oappend(String(FPSTR(_name)).c_str()); oappend(SET_F(":")); oappend(String(FPSTR(_parasitePin)).c_str());
oappend(SET_F("',1,'<i>(for external MOSFET)</i>');")); // 0 is field type, 1 is actual field
}
float UsermodTemperature::getTemperature() {
return degC ? getTemperatureC() : getTemperatureF();

View File

@@ -44,43 +44,43 @@ const char PAGE_dmxmap[] PROGMEM = R"=====()=====";
const uint16_t PAGE_update_length = 607;
const uint8_t PAGE_update[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x75, 0x53, 0xd1, 0x6e, 0xd3, 0x30,
0x14, 0x7d, 0xcf, 0x57, 0x78, 0x7e, 0x6a, 0x25, 0xea, 0x6c, 0xd3, 0x78, 0xa0, 0x38, 0x19, 0x2a,
0x14, 0x7d, 0xcf, 0x57, 0x78, 0x7e, 0x6a, 0x25, 0xea, 0x6c, 0x13, 0x7b, 0xa0, 0x24, 0x19, 0x2a,
0x9b, 0x10, 0x12, 0xd3, 0x26, 0x6d, 0x03, 0xf1, 0x84, 0x9c, 0xf8, 0xa6, 0x31, 0x75, 0xec, 0xcc,
0xbe, 0x69, 0x55, 0xa1, 0xfd, 0x3b, 0x37, 0x4e, 0x3b, 0x90, 0x06, 0x2f, 0x51, 0x9c, 0x9c, 0x7b,
0x72, 0xee, 0x39, 0x27, 0xf2, 0xe4, 0xea, 0xf6, 0xe3, 0xc3, 0xf7, 0xbb, 0x6b, 0xd6, 0x62, 0x67,
0x4b, 0x79, 0xb8, 0x82, 0xd2, 0xa5, 0xec, 0x00, 0x15, 0xab, 0xbd, 0x43, 0x70, 0x58, 0xf0, 0x9d,
0xd1, 0xd8, 0x16, 0x1a, 0xb6, 0xa6, 0x86, 0x45, 0x3a, 0x70, 0xe6, 0x54, 0x07, 0x05, 0xdf, 0x1a,
0xd8, 0xf5, 0x3e, 0x20, 0x2f, 0x33, 0x89, 0x06, 0x2d, 0x94, 0xdf, 0xbe, 0x5c, 0x5f, 0xb1, 0xc7,
0x5e, 0x2b, 0x04, 0x99, 0x4f, 0x8f, 0x64, 0xac, 0x83, 0xe9, 0xb1, 0xcc, 0x9a, 0xc1, 0xd5, 0x68,
0xbc, 0x63, 0xab, 0xd9, 0xfc, 0xd7, 0xce, 0x38, 0xed, 0x77, 0xa2, 0x35, 0x11, 0x7d, 0xd8, 0x8b,
0x4a, 0xd5, 0x9b, 0xd9, 0xfc, 0xf9, 0x05, 0xf2, 0x48, 0x10, 0xed, 0xeb, 0xa1, 0x23, 0x05, 0x62,
0x0d, 0x78, 0x6d, 0x61, 0xbc, 0x5d, 0xed, 0x3f, 0xeb, 0x19, 0x1f, 0x1a, 0x3e, 0x17, 0x11, 0xf7,
0x16, 0x84, 0x36, 0xb1, 0xb7, 0x6a, 0x5f, 0x70, 0xe7, 0x1d, 0xf0, 0x37, 0xff, 0x1d, 0xe9, 0xe2,
0xfa, 0xf5, 0x4c, 0x65, 0x7d, 0xbd, 0xe1, 0xcf, 0x99, 0xcc, 0x0f, 0x12, 0x0f, 0x52, 0x59, 0x0c,
0x75, 0xc1, 0xf3, 0x08, 0x88, 0xc6, 0xad, 0x63, 0x1e, 0xc5, 0xcf, 0x78, 0xd9, 0x17, 0xef, 0x78,
0xf9, 0x17, 0x72, 0xa4, 0x2a, 0xb3, 0x0f, 0xa6, 0x1b, 0x0d, 0x60, 0x43, 0xb0, 0x33, 0x3e, 0xd1,
0xd7, 0x31, 0xf2, 0xf9, 0x7b, 0x42, 0x26, 0x84, 0xcc, 0x27, 0x4b, 0x2b, 0xaf, 0xf7, 0xcc, 0x3b,
0xeb, 0x95, 0x2e, 0xf8, 0x27, 0xc0, 0xaf, 0xb3, 0x39, 0xd1, 0xb5, 0xe7, 0x65, 0x76, 0xe3, 0xbd,
0xbb, 0xf1, 0x9a, 0x25, 0xeb, 0xee, 0x7d, 0x83, 0x3b, 0x15, 0xe0, 0xc5, 0x43, 0x42, 0xc8, 0xc6,
0x87, 0x8e, 0x51, 0x26, 0xad, 0xa7, 0xd9, 0xbb, 0xdb, 0xfb, 0x07, 0xce, 0x54, 0xb2, 0x89, 0x44,
0x0e, 0x09, 0xc7, 0x99, 0xa1, 0x57, 0xe4, 0x0b, 0xcb, 0x80, 0x1c, 0xdc, 0xf7, 0x14, 0x4e, 0x37,
0x58, 0x34, 0xbd, 0x0a, 0x98, 0x8f, 0xf3, 0x0b, 0x82, 0x29, 0x4e, 0x0a, 0xe2, 0x50, 0x75, 0x86,
0x52, 0x7d, 0x4c, 0x02, 0x62, 0xaf, 0x1c, 0xab, 0xad, 0x8a, 0xb1, 0xe0, 0xd1, 0xf4, 0xbc, 0x3c,
0x15, 0x67, 0x17, 0xe2, 0x74, 0x51, 0x9d, 0xbd, 0x15, 0xe7, 0x17, 0xa3, 0x33, 0x04, 0x20, 0xf5,
0xa1, 0xbc, 0xf2, 0xbb, 0xa4, 0x9e, 0x61, 0x0b, 0xcc, 0xd2, 0x37, 0x23, 0xb2, 0x00, 0x16, 0x54,
0x84, 0x25, 0x93, 0x8a, 0x65, 0x6d, 0x80, 0xa6, 0xe0, 0x2d, 0x62, 0x1f, 0x97, 0x79, 0xbe, 0x36,
0xd8, 0x0e, 0x95, 0xa8, 0x7d, 0x97, 0x1f, 0x16, 0x1c, 0x2c, 0xc4, 0x7c, 0x5c, 0x32, 0x3f, 0x8c,
0x45, 0xce, 0x50, 0x05, 0x4a, 0xaa, 0xe0, 0x3f, 0x2a, 0xab, 0xdc, 0x86, 0xf4, 0x98, 0x6e, 0xcd,
0xb2, 0x64, 0xff, 0x91, 0x88, 0x9e, 0x88, 0xd8, 0x1a, 0xb0, 0x3a, 0x0a, 0xe3, 0x0f, 0xbc, 0x47,
0x8a, 0x57, 0xdc, 0x22, 0x6e, 0xd7, 0x97, 0xc9, 0xf9, 0xa2, 0x21, 0x91, 0x8b, 0xf8, 0x34, 0x90,
0x9b, 0x63, 0x3f, 0x73, 0x95, 0xd6, 0x90, 0xc6, 0xf5, 0x03, 0xb2, 0xc9, 0xa2, 0xc6, 0x58, 0x38,
0x76, 0xf9, 0x68, 0x64, 0x80, 0xa7, 0xc1, 0x04, 0xd0, 0x13, 0xba, 0x1a, 0x10, 0xa9, 0x8e, 0x13,
0x7c, 0xb2, 0x8e, 0xc8, 0xa6, 0x70, 0x4e, 0x64, 0x3e, 0xbd, 0xfe, 0x07, 0x74, 0x3a, 0x8c, 0x7e,
0xd7, 0xd6, 0xd4, 0x9b, 0x82, 0xaf, 0x46, 0xbb, 0x57, 0xd4, 0xf2, 0x3f, 0x43, 0x29, 0x97, 0x52,
0x6a, 0xb3, 0xcd, 0x52, 0x7c, 0x63, 0x47, 0x89, 0xa6, 0x4c, 0xec, 0x54, 0x3c, 0x21, 0x04, 0x81,
0x13, 0xf9, 0x5d, 0xda, 0x96, 0x69, 0xcf, 0x9c, 0x47, 0xca, 0xcb, 0xd3, 0xc1, 0x07, 0xd2, 0xda,
0x04, 0x88, 0x6d, 0x8a, 0xa4, 0x57, 0x6b, 0x60, 0xcb, 0xb9, 0xcc, 0x89, 0x6f, 0x5c, 0x77, 0x2c,
0xdc, 0xd8, 0xbe, 0xf1, 0xb7, 0xfe, 0x0d, 0x69, 0x67, 0xdf, 0xb7, 0xec, 0x03, 0x00, 0x00
0xbe, 0x69, 0x55, 0xa1, 0xfd, 0x3b, 0xd7, 0x4e, 0x3b, 0x90, 0x06, 0x2f, 0x51, 0x9c, 0x9c, 0x7b,
0x72, 0xee, 0x39, 0x27, 0xc5, 0xc9, 0xd5, 0xed, 0xc7, 0x87, 0xef, 0x77, 0xd7, 0xac, 0xc3, 0xde,
0x54, 0xc5, 0xe1, 0x0a, 0x52, 0x55, 0x45, 0x0f, 0x28, 0x59, 0xe3, 0x2c, 0x82, 0xc5, 0x92, 0xef,
0xb4, 0xc2, 0xae, 0x54, 0xb0, 0xd5, 0x0d, 0x2c, 0xd2, 0x81, 0x33, 0x2b, 0x7b, 0x28, 0xf9, 0x56,
0xc3, 0x6e, 0x70, 0x1e, 0x79, 0x95, 0x15, 0xa8, 0xd1, 0x40, 0xf5, 0xed, 0xcb, 0xf5, 0x15, 0x7b,
0x1c, 0x94, 0x44, 0x28, 0xf2, 0xe9, 0x51, 0x11, 0x1a, 0xaf, 0x07, 0xac, 0xb2, 0x76, 0xb4, 0x0d,
0x6a, 0x67, 0xd9, 0x6a, 0x36, 0xff, 0xb5, 0xd3, 0x56, 0xb9, 0x9d, 0xe8, 0x74, 0x40, 0xe7, 0xf7,
0xa2, 0x96, 0xcd, 0x66, 0x36, 0x7f, 0x7e, 0x81, 0x3c, 0x12, 0x44, 0xb9, 0x66, 0xec, 0x49, 0x81,
0x58, 0x03, 0x5e, 0x1b, 0x88, 0xb7, 0xab, 0xfd, 0x67, 0x35, 0xe3, 0x63, 0xcb, 0xe7, 0x22, 0xe0,
0xde, 0x80, 0x50, 0x3a, 0x0c, 0x46, 0xee, 0x4b, 0x6e, 0x9d, 0x05, 0xfe, 0xe6, 0xbf, 0x23, 0x7d,
0x58, 0xbf, 0x9e, 0xa9, 0x8d, 0x6b, 0x36, 0xfc, 0x39, 0x2b, 0xf2, 0x83, 0xc4, 0x83, 0x54, 0x16,
0x7c, 0x53, 0xf2, 0x3c, 0x00, 0xa2, 0xb6, 0xeb, 0x90, 0x07, 0xf1, 0x33, 0x5c, 0x0e, 0xe5, 0x3b,
0x5e, 0xfd, 0x85, 0x8c, 0x54, 0x55, 0xf6, 0x41, 0xf7, 0xd1, 0x00, 0x36, 0x7a, 0x33, 0xe3, 0x13,
0x7d, 0x13, 0x02, 0x9f, 0xbf, 0x27, 0x64, 0x42, 0x14, 0xf9, 0x64, 0x69, 0xed, 0xd4, 0x9e, 0x39,
0x6b, 0x9c, 0x54, 0x25, 0xff, 0x04, 0xf8, 0x75, 0x36, 0x27, 0xba, 0xee, 0xbc, 0xca, 0x6e, 0x9c,
0xb3, 0x37, 0x4e, 0xb1, 0x64, 0xdd, 0xbd, 0x6b, 0x71, 0x27, 0x3d, 0xbc, 0x78, 0x48, 0x88, 0xa2,
0x75, 0xbe, 0x67, 0x94, 0x49, 0xe7, 0x68, 0xf6, 0xee, 0xf6, 0xfe, 0x81, 0x33, 0x99, 0x6c, 0x22,
0x91, 0x63, 0xc2, 0x71, 0xa6, 0xe9, 0x15, 0xf9, 0xc2, 0x32, 0x20, 0x07, 0xf7, 0x03, 0x85, 0xd3,
0x8f, 0x06, 0xf5, 0x20, 0x3d, 0xe6, 0x71, 0x7e, 0x41, 0x30, 0xc9, 0x49, 0x41, 0x18, 0xeb, 0x5e,
0x53, 0xaa, 0x8f, 0x49, 0x40, 0x18, 0xa4, 0x65, 0x8d, 0x91, 0x21, 0x94, 0x3c, 0xe8, 0x81, 0x57,
0xa7, 0xe2, 0xec, 0xad, 0x38, 0x5d, 0xd4, 0x67, 0x17, 0xe2, 0xfc, 0x22, 0x3a, 0x43, 0x00, 0x52,
0xef, 0xab, 0x2b, 0xb7, 0x4b, 0xea, 0x19, 0x76, 0xc0, 0x0c, 0x7d, 0x33, 0x20, 0xf3, 0x60, 0x40,
0x06, 0x58, 0xb2, 0x42, 0xb2, 0xac, 0xf3, 0xd0, 0x96, 0xbc, 0x43, 0x1c, 0xc2, 0x32, 0xcf, 0xd7,
0x1a, 0xbb, 0xb1, 0x16, 0x8d, 0xeb, 0xf3, 0xc3, 0x82, 0xa3, 0x81, 0x90, 0xc7, 0x25, 0xf3, 0xc3,
0x58, 0xe0, 0x0c, 0xa5, 0xa7, 0xa4, 0x4a, 0xfe, 0xa3, 0x36, 0xd2, 0x6e, 0x48, 0x8f, 0xee, 0xd7,
0x2c, 0x4b, 0xf6, 0x1f, 0x89, 0xe8, 0x89, 0x08, 0x9d, 0x06, 0xa3, 0x82, 0xd0, 0xee, 0xc0, 0x7b,
0xa4, 0x78, 0xc5, 0x2d, 0xc2, 0x76, 0x7d, 0x99, 0x9c, 0x2f, 0x5b, 0x12, 0xb9, 0x08, 0x4f, 0x23,
0xb9, 0x19, 0xfb, 0x99, 0xcb, 0xb4, 0x46, 0xa1, 0xed, 0x30, 0x22, 0x9b, 0x2c, 0x6a, 0xb5, 0x81,
0x63, 0x97, 0x8f, 0x46, 0x7a, 0x78, 0x1a, 0xb5, 0x07, 0x35, 0xa1, 0xeb, 0x11, 0x91, 0xea, 0x38,
0xc1, 0x27, 0xeb, 0x88, 0x6c, 0x0a, 0xe7, 0xa4, 0xc8, 0xa7, 0xd7, 0xff, 0x80, 0x4e, 0x87, 0xe8,
0x77, 0x63, 0x74, 0xb3, 0x29, 0xf9, 0x2a, 0xda, 0xbd, 0xa2, 0x96, 0xff, 0x19, 0x4a, 0xb9, 0x54,
0x85, 0xd2, 0xdb, 0x2c, 0xc5, 0x17, 0x3b, 0x4a, 0x34, 0x55, 0x62, 0xa7, 0xe2, 0x09, 0x21, 0x08,
0x9c, 0xc8, 0xef, 0xd2, 0xb6, 0x4c, 0x39, 0x66, 0x1d, 0x52, 0x5e, 0x8e, 0x0e, 0xce, 0x93, 0xd6,
0xd6, 0x43, 0xe8, 0x52, 0x24, 0x83, 0x5c, 0x03, 0x5b, 0xce, 0x8b, 0x9c, 0xf8, 0xe2, 0xba, 0xb1,
0x70, 0xb1, 0x7d, 0xf1, 0xb7, 0xfe, 0x0d, 0x82, 0x92, 0x04, 0xb1, 0xec, 0x03, 0x00, 0x00
};

View File

@@ -1556,37 +1556,37 @@ const uint8_t PAGE_settings_time[] PROGMEM = {
const uint16_t PAGE_settings_sec_length = 2500;
const uint8_t PAGE_settings_sec[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xa5, 0x58, 0xff, 0x72, 0xdb, 0x36,
0x12, 0xfe, 0x5f, 0x4f, 0x01, 0xa1, 0x33, 0xa9, 0x78, 0xa5, 0x29, 0xdb, 0x49, 0x3b, 0xa9, 0x23,
0x2a, 0x67, 0xc7, 0x4e, 0xe3, 0x1b, 0x3b, 0xf6, 0x44, 0x4a, 0x73, 0x37, 0xb9, 0x4c, 0x06, 0x22,
0x12, 0xfe, 0x5f, 0x4f, 0x01, 0xa1, 0x33, 0xa9, 0x78, 0xa1, 0x29, 0xdb, 0x49, 0x3b, 0x89, 0x23,
0x2a, 0x67, 0xc7, 0x4e, 0xe3, 0x1b, 0x3b, 0xf6, 0x44, 0x4a, 0x73, 0x37, 0xbd, 0x4e, 0x06, 0x22,
0x21, 0x11, 0x11, 0x49, 0xb0, 0x00, 0x68, 0x45, 0x97, 0xf6, 0x3d, 0xee, 0x69, 0xee, 0x61, 0xee,
0x49, 0xee, 0x5b, 0x90, 0x94, 0x64, 0xc7, 0x49, 0x27, 0x73, 0x7f, 0xd8, 0x12, 0x09, 0x60, 0x7f,
0x7c, 0xbb, 0xfb, 0xed, 0x42, 0xa3, 0xfe, 0xe9, 0xd5, 0xb3, 0xe9, 0x3f, 0xae, 0xcf, 0x58, 0xe6,
0x7c, 0xbb, 0xfb, 0xed, 0x42, 0xa3, 0xfe, 0xe9, 0xd5, 0x8b, 0xe9, 0x3f, 0xae, 0xcf, 0x58, 0xe6,
0x8a, 0x7c, 0x3c, 0xa2, 0xff, 0x2c, 0x17, 0xe5, 0x22, 0xe6, 0xb2, 0xe4, 0x78, 0x96, 0x22, 0x1d,
0x8f, 0x0a, 0xe9, 0x04, 0x2b, 0x45, 0x21, 0x63, 0x7e, 0xa3, 0xe4, 0xaa, 0xd2, 0xc6, 0x71, 0x96,
0xe8, 0xd2, 0xc9, 0xd2, 0xc5, 0x7c, 0xa5, 0x52, 0x97, 0xc5, 0x3f, 0xee, 0xef, 0xf3, 0x71, 0xaf,
0xe8, 0xd2, 0xc9, 0xd2, 0xc5, 0x7c, 0xa5, 0x52, 0x97, 0xc5, 0x3f, 0xec, 0xef, 0xf3, 0x71, 0xaf,
0xd9, 0xda, 0xbb, 0xb3, 0x96, 0xca, 0x1b, 0x95, 0xc8, 0x3d, 0xff, 0x10, 0xaa, 0x52, 0x39, 0x25,
0xf2, 0x3d, 0x9b, 0x88, 0x5c, 0xc6, 0x07, 0x61, 0x21, 0x3e, 0xaa, 0xa2, 0x2e, 0x36, 0xcf, 0xb5,
0x95, 0xc6, 0x3f, 0x88, 0x19, 0x9e, 0x4b, 0xcd, 0x59, 0xef, 0x8e, 0xea, 0xd6, 0xa0, 0x24, 0x13,
0xc6, 0x4a, 0x28, 0xa9, 0xdd, 0x7c, 0xef, 0x31, 0xde, 0x3a, 0xe5, 0x72, 0x39, 0xbe, 0x54, 0x36,
0xc6, 0x4a, 0x28, 0xa9, 0xdd, 0x7c, 0xef, 0x09, 0xde, 0x3a, 0xe5, 0x72, 0x39, 0xbe, 0x54, 0x36,
0x61, 0x13, 0xe9, 0x9c, 0x2a, 0x17, 0x76, 0x34, 0x6c, 0x5e, 0x8e, 0x6c, 0x62, 0x54, 0xe5, 0xc6,
0xbd, 0x1b, 0x61, 0x58, 0xae, 0x13, 0x55, 0x85, 0x4e, 0x15, 0x52, 0xd7, 0x2e, 0x4c, 0xe3, 0x54,
0x27, 0x75, 0x01, 0x73, 0x43, 0x2c, 0xc4, 0xfd, 0x83, 0x27, 0xf3, 0xba, 0x4c, 0x9c, 0xd2, 0x25,
0x7b, 0x31, 0x08, 0x3e, 0xad, 0x54, 0x99, 0xea, 0x55, 0xa4, 0x2b, 0x59, 0x0e, 0x78, 0xe6, 0x5c,
0x27, 0x75, 0x01, 0x73, 0x43, 0x2c, 0xc4, 0xfd, 0x83, 0x67, 0xf3, 0xba, 0x4c, 0x9c, 0xd2, 0x25,
0x7b, 0x35, 0x08, 0x3e, 0xad, 0x54, 0x99, 0xea, 0x55, 0xa4, 0x2b, 0x59, 0x0e, 0x78, 0xe6, 0x5c,
0x65, 0x8f, 0x86, 0xc3, 0xa2, 0x88, 0x96, 0xa5, 0x8e, 0x56, 0xb9, 0x4c, 0xa3, 0x85, 0x1c, 0xce,
0xa5, 0x70, 0xb5, 0x91, 0x76, 0x68, 0x5b, 0xb5, 0xc3, 0xef, 0xac, 0x4c, 0x6a, 0xa3, 0xdc, 0x7a,
0xaf, 0x7b, 0xc5, 0x83, 0x3f, 0x36, 0x72, 0x4f, 0xee, 0xca, 0xdd, 0x1c, 0xe4, 0x21, 0x7f, 0x6f,
0x65, 0x3e, 0xdf, 0xdd, 0xfd, 0xfa, 0xb3, 0xdd, 0x75, 0x95, 0x0a, 0x27, 0xef, 0xdb, 0xbb, 0x38,
0x65, 0x3e, 0xdf, 0xdd, 0xfd, 0xf6, 0xb3, 0xdd, 0x75, 0x95, 0x0a, 0x27, 0xef, 0xdb, 0xbb, 0x38,
0x4f, 0x07, 0x32, 0xf8, 0x64, 0x24, 0xec, 0x29, 0x19, 0x19, 0xe7, 0xce, 0x72, 0x49, 0xce, 0x9d,
0xac, 0xfd, 0xd2, 0x76, 0xab, 0xb2, 0x57, 0xb3, 0x0f, 0x3b, 0x9b, 0xe5, 0x83, 0x07, 0x5c, 0xcf,
0x3e, 0xc8, 0xc4, 0xf1, 0x38, 0x76, 0xeb, 0x4a, 0xea, 0x39, 0xbd, 0xeb, 0x1f, 0x1b, 0x23, 0xd6,
0x91, 0xb2, 0xfe, 0xf3, 0x96, 0x84, 0x5c, 0x8b, 0xf4, 0x6f, 0x93, 0x81, 0x0c, 0x5d, 0xdc, 0xdf,
0x0f, 0x3e, 0xe5, 0xd2, 0x31, 0x1d, 0xa7, 0x51, 0x62, 0x00, 0x87, 0x6c, 0xd5, 0x0e, 0x78, 0x83,
0x3c, 0x0f, 0x9e, 0xe8, 0x08, 0x5e, 0x1e, 0x3b, 0x67, 0xd4, 0xac, 0x76, 0x12, 0x0b, 0x26, 0xe1,
0x3c, 0x0f, 0x9e, 0xe9, 0x08, 0x5e, 0x1e, 0x3b, 0x67, 0xd4, 0xac, 0x76, 0x12, 0x0b, 0x26, 0xe1,
0xa1, 0x0c, 0xc2, 0xbb, 0xef, 0x49, 0x37, 0x7c, 0x73, 0xf2, 0xa3, 0x1b, 0x7e, 0x10, 0x37, 0xa2,
0x13, 0xf0, 0xd9, 0x46, 0x61, 0xd7, 0x25, 0x44, 0xb8, 0x20, 0x4c, 0xa3, 0x99, 0x4e, 0xd7, 0x91,
0xa8, 0x80, 0x4f, 0xfa, 0x2c, 0x53, 0x79, 0x3a, 0xd0, 0xb4, 0x5f, 0xa4, 0xe9, 0xd9, 0x0d, 0xac,
0xb8, 0x50, 0x16, 0xf9, 0x28, 0xcd, 0x80, 0x93, 0xcd, 0x3c, 0x1c, 0x04, 0xf1, 0xf8, 0xd3, 0x2f,
0xd2, 0xfd, 0x3a, 0x08, 0x42, 0xc8, 0x3c, 0x49, 0x96, 0xcf, 0x55, 0x2e, 0x29, 0xcd, 0x06, 0x84,
0xa8, 0x80, 0x4f, 0xfa, 0x22, 0x53, 0x79, 0x3a, 0xd0, 0xb4, 0x5f, 0xa4, 0xe9, 0xd9, 0x0d, 0xac,
0xb8, 0x50, 0x16, 0xf9, 0x28, 0xcd, 0x80, 0x93, 0xcd, 0x3c, 0x1c, 0x04, 0xf1, 0xf8, 0xd3, 0x4f,
0xd2, 0xfd, 0x3c, 0x08, 0x42, 0xc8, 0x3c, 0x49, 0x96, 0x2f, 0x55, 0x2e, 0x29, 0xcd, 0x06, 0x84,
0x20, 0x9f, 0x25, 0xcb, 0x64, 0xbe, 0xe0, 0xc1, 0x17, 0x57, 0x2b, 0x44, 0x5b, 0x3a, 0x04, 0x35,
0xf8, 0xe3, 0x7e, 0x3d, 0xd2, 0x18, 0x6d, 0xe0, 0x1e, 0xf4, 0xa0, 0x18, 0xac, 0xce, 0x65, 0x94,
0xeb, 0xc5, 0x80, 0x9f, 0xd1, 0x7b, 0xd6, 0x82, 0x87, 0x88, 0xb3, 0x39, 0x44, 0x7b, 0x18, 0x90,
@@ -1594,65 +1594,65 @@ const uint8_t PAGE_settings_sec[] PROGMEM = {
0xc0, 0xc0, 0xe6, 0x42, 0x51, 0xd6, 0xfd, 0xb3, 0x3c, 0x2f, 0x13, 0x5d, 0x54, 0x00, 0x5d, 0xb2,
0x4a, 0x2c, 0x24, 0x43, 0x4a, 0x88, 0x3e, 0x72, 0x61, 0x27, 0x40, 0x36, 0xd3, 0xab, 0xa9, 0x16,
0xd6, 0x35, 0x31, 0x3a, 0x08, 0x3e, 0x51, 0xfa, 0xeb, 0xd8, 0x7b, 0xe1, 0x68, 0xc1, 0x87, 0x45,
0x95, 0x30, 0xf9, 0xc5, 0xf4, 0xf2, 0x22, 0x96, 0xf0, 0x25, 0xc9, 0x85, 0xb5, 0xe4, 0x08, 0x79,
0x35, 0x70, 0x4f, 0x5b, 0x57, 0x8e, 0x38, 0x49, 0x43, 0x14, 0x92, 0x5c, 0x0a, 0x33, 0x6d, 0x8a,
0x95, 0x30, 0xf9, 0xd5, 0xf4, 0xf2, 0x22, 0x96, 0xf0, 0x25, 0xc9, 0x85, 0xb5, 0xe4, 0x08, 0x79,
0x35, 0x70, 0xcf, 0x5b, 0x57, 0x8e, 0x38, 0x49, 0x43, 0x14, 0x92, 0x5c, 0x0a, 0x33, 0x6d, 0x8a,
0x67, 0xd0, 0x16, 0x91, 0x8f, 0x8d, 0x5b, 0xc3, 0x49, 0x51, 0xaa, 0xc2, 0xdb, 0x1b, 0xf3, 0x52,
0x97, 0xf0, 0xac, 0xdd, 0x11, 0x03, 0xae, 0xee, 0xd0, 0xa0, 0x33, 0x10, 0x89, 0xbd, 0xab, 0xcf,
0xc8, 0x42, 0xdf, 0x50, 0x62, 0x78, 0x45, 0x00, 0xf6, 0xf0, 0xe7, 0xfd, 0xfd, 0x1d, 0x77, 0xea,
0x8a, 0x40, 0xa3, 0x58, 0x90, 0x3f, 0x9d, 0x33, 0xa5, 0x5c, 0xb1, 0xbf, 0x5f, 0x5e, 0xbc, 0x40,
0x69, 0xbe, 0x92, 0xbf, 0xd5, 0xd2, 0xba, 0x27, 0x5f, 0x09, 0xfc, 0x8e, 0xea, 0x2d, 0x3a, 0x2e,
0x53, 0x16, 0xda, 0x6d, 0x85, 0x48, 0xc9, 0x29, 0xf2, 0x2e, 0xf4, 0x6f, 0xac, 0x43, 0x59, 0xdb,
0x71, 0xfc, 0x88, 0xac, 0x08, 0xbe, 0x1a, 0xe7, 0xad, 0x5c, 0xb9, 0x2b, 0x58, 0x92, 0x8c, 0x64,
0x19, 0xf6, 0x3b, 0x01, 0x4d, 0x01, 0x5f, 0x5f, 0x4d, 0xa6, 0xc8, 0xf0, 0x61, 0xe3, 0x10, 0x62,
0x40, 0x9e, 0x94, 0xde, 0x93, 0xe7, 0xda, 0x14, 0xa7, 0x88, 0xe4, 0x93, 0xb6, 0x2a, 0xcb, 0x36,
0xa9, 0x07, 0x9c, 0xe2, 0x8b, 0x44, 0x89, 0x28, 0x61, 0xec, 0xdb, 0xfd, 0x77, 0x61, 0x83, 0x3a,
0xad, 0x95, 0x01, 0xde, 0xdf, 0x88, 0xbc, 0x06, 0x4b, 0xf2, 0xb0, 0x7f, 0xb0, 0x85, 0x2c, 0xc9,
0x64, 0xb2, 0x7c, 0x59, 0x17, 0xdb, 0x3a, 0xef, 0x0f, 0xfa, 0x92, 0x5c, 0x88, 0x96, 0x72, 0x1d,
0x21, 0x54, 0x49, 0x36, 0x18, 0xbe, 0xdd, 0xdf, 0xfb, 0xf9, 0xdd, 0x30, 0x40, 0xb1, 0xbf, 0xe5,
0x27, 0xb0, 0xd7, 0x56, 0x22, 0xa1, 0x12, 0x9c, 0x8a, 0x19, 0xfe, 0x9f, 0x81, 0xcb, 0xe1, 0x22,
0x9f, 0x64, 0x6a, 0xee, 0xf0, 0xf9, 0x0c, 0xe4, 0x6e, 0x74, 0x8e, 0x6f, 0xc7, 0x39, 0x3d, 0x5f,
0x0b, 0x50, 0x36, 0xbd, 0x17, 0x95, 0xbd, 0xd0, 0xc9, 0x92, 0x8e, 0x80, 0xbf, 0x7d, 0x11, 0x4f,
0x5a, 0x49, 0xd7, 0xc8, 0xd0, 0xd7, 0x55, 0xfb, 0xe5, 0x54, 0xaf, 0x4a, 0x2f, 0x17, 0x01, 0xe1,
0x2f, 0x74, 0x41, 0x1b, 0xc0, 0x2e, 0x7a, 0x75, 0x21, 0xbd, 0x02, 0xff, 0xdd, 0xef, 0xf6, 0xdf,
0x5e, 0xa9, 0x45, 0xb6, 0x79, 0xdd, 0x9e, 0x3d, 0x47, 0xa0, 0x0c, 0xbd, 0x3c, 0x95, 0x54, 0x01,
0xfc, 0x1d, 0x92, 0x38, 0xc9, 0xeb, 0x54, 0xda, 0xc1, 0xc6, 0xbb, 0x20, 0xf8, 0xfd, 0xf7, 0xf6,
0x09, 0xe5, 0x4a, 0x9f, 0xa7, 0x72, 0x2e, 0xea, 0xdc, 0xa1, 0xe8, 0x51, 0x0b, 0x3b, 0x65, 0x72,
0xbb, 0xc6, 0x01, 0x95, 0xbc, 0xc3, 0x34, 0xe0, 0xde, 0xb2, 0x49, 0x20, 0x4e, 0x9c, 0xff, 0x9e,
0xff, 0x20, 0x89, 0x5a, 0xef, 0xdb, 0x11, 0xfc, 0x30, 0xe0, 0x6f, 0x2e, 0xce, 0x4e, 0x41, 0xa2,
0x36, 0x7d, 0xca, 0x51, 0x37, 0xd8, 0x6d, 0xd3, 0x60, 0x47, 0xdf, 0x04, 0xc9, 0xc7, 0x29, 0x8c,
0x47, 0xd8, 0xd4, 0x32, 0x3b, 0x5a, 0x8f, 0x2f, 0x1b, 0x98, 0xaa, 0x9d, 0x4e, 0x74, 0xfe, 0xe0,
0xc1, 0xc0, 0xb7, 0xa3, 0xfd, 0x70, 0xe0, 0xfb, 0x55, 0x4c, 0x3b, 0xf2, 0x89, 0xd3, 0x06, 0x08,
0x92, 0xf2, 0x73, 0x27, 0x0b, 0x4a, 0xeb, 0xe4, 0xbc, 0xe2, 0xde, 0xd5, 0x66, 0x1b, 0xce, 0x17,
0x15, 0x78, 0x84, 0xdc, 0x61, 0x97, 0x3a, 0x95, 0x11, 0xbb, 0x46, 0xc5, 0x5a, 0xc9, 0x24, 0xc5,
0x91, 0x91, 0x6d, 0xec, 0xfc, 0x1a, 0x4c, 0x11, 0xde, 0x92, 0x68, 0x6f, 0x4b, 0x0c, 0xbd, 0xb4,
0x20, 0xa0, 0x5d, 0x9e, 0xe5, 0x49, 0xfc, 0x53, 0xdf, 0x00, 0xd1, 0xff, 0xf8, 0x0f, 0x7e, 0xf9,
0x88, 0xc3, 0xdd, 0x6d, 0xf3, 0x1a, 0xda, 0xe8, 0x83, 0x7d, 0x5a, 0xc5, 0x3f, 0x71, 0x8f, 0x6f,
0x6f, 0x34, 0x6c, 0xbb, 0xee, 0xc8, 0x73, 0xc3, 0xf8, 0xaf, 0xaa, 0xa0, 0xfe, 0xcd, 0x6a, 0x93,
0xa3, 0xc8, 0x3d, 0x5d, 0x24, 0x16, 0x1c, 0xfa, 0x04, 0x1b, 0xfd, 0x86, 0xd1, 0xb0, 0x99, 0x37,
0x88, 0xcc, 0xc1, 0x91, 0xa4, 0x39, 0xe6, 0x40, 0x0b, 0xbd, 0x7d, 0x8e, 0xba, 0xe8, 0x31, 0x85,
0x67, 0xfa, 0xf6, 0xde, 0xf2, 0x76, 0x1e, 0x99, 0xcc, 0x39, 0xc3, 0x34, 0x90, 0x69, 0xac, 0x54,
0xda, 0xd2, 0x70, 0x90, 0xaa, 0x1b, 0xe6, 0x49, 0x25, 0x06, 0xc7, 0x01, 0x8e, 0xd5, 0xed, 0x77,
0x99, 0xcc, 0xab, 0x13, 0x1a, 0x55, 0x10, 0x38, 0x87, 0x68, 0x50, 0xbb, 0x89, 0x79, 0xf3, 0xc0,
0xa1, 0x35, 0xc9, 0x55, 0xb2, 0x8c, 0xf9, 0x0b, 0x52, 0xfb, 0x74, 0x34, 0x6c, 0x16, 0x60, 0x1a,
0x44, 0x8c, 0xef, 0x3f, 0xd3, 0xdb, 0x1c, 0x3a, 0xa1, 0x43, 0x54, 0x41, 0xdb, 0x73, 0xb7, 0x4e,
0xd8, 0x7a, 0x56, 0x28, 0xd8, 0x38, 0x11, 0x37, 0x72, 0xbb, 0x25, 0x33, 0x9d, 0xf8, 0xec, 0x70,
0xdc, 0x9b, 0xb4, 0x93, 0x03, 0x7b, 0xc0, 0x5e, 0xfb, 0x3e, 0x4f, 0xf9, 0x59, 0x57, 0xc0, 0xe6,
0x70, 0xdc, 0x8d, 0x35, 0xec, 0xfa, 0xfc, 0xe5, 0x11, 0x1b, 0xa9, 0xb2, 0xaa, 0x5d, 0x2b, 0xba,
0x82, 0x73, 0x2b, 0x6d, 0x52, 0xee, 0x41, 0xc2, 0xfa, 0x66, 0x6e, 0xf2, 0xdf, 0xad, 0xfa, 0x17,
0xbe, 0x3e, 0x02, 0x58, 0xe2, 0x23, 0xf2, 0x7c, 0x81, 0xa9, 0xcc, 0x3f, 0xa9, 0x72, 0xe7, 0x49,
0x97, 0x28, 0x1b, 0xca, 0xe4, 0x98, 0x6f, 0x88, 0x83, 0x98, 0x30, 0x80, 0xac, 0x4a, 0x38, 0xa4,
0x0f, 0x56, 0x3c, 0x59, 0xfc, 0x05, 0x6a, 0x48, 0x79, 0x81, 0x04, 0x03, 0xd3, 0x63, 0x7c, 0x32,
0x2a, 0xe1, 0xcc, 0x0f, 0x5b, 0xd0, 0xb8, 0x9b, 0x70, 0x82, 0x3d, 0x62, 0xa9, 0x5a, 0x28, 0xc7,
0xb0, 0x6d, 0x06, 0x26, 0x01, 0x26, 0x06, 0xf0, 0x53, 0x48, 0x7c, 0xd8, 0xa1, 0x4c, 0xe7, 0xda,
0x1c, 0x7d, 0x37, 0x17, 0x34, 0x42, 0x3e, 0xf8, 0xee, 0xe7, 0xc7, 0x8f, 0x1f, 0x3f, 0x61, 0xaf,
0xc8, 0x42, 0xdf, 0x50, 0x62, 0x78, 0x45, 0x00, 0xf6, 0xf0, 0xe9, 0xfe, 0xfe, 0x8e, 0x3b, 0x75,
0x45, 0xa0, 0x51, 0x2c, 0xc8, 0x9f, 0xce, 0x99, 0x52, 0xae, 0xd8, 0xdf, 0x2f, 0x2f, 0x5e, 0xa1,
0x34, 0xdf, 0xc8, 0xdf, 0x6a, 0x69, 0xdd, 0xb3, 0xaf, 0x04, 0x7e, 0x47, 0xf5, 0x16, 0x1d, 0x97,
0x29, 0x0b, 0xed, 0xb6, 0x42, 0xa4, 0xe4, 0x14, 0x79, 0x17, 0xfa, 0x37, 0xd6, 0xa1, 0xac, 0xed,
0x38, 0x7e, 0x4c, 0x56, 0x04, 0x5f, 0x8d, 0xf3, 0x56, 0xae, 0xdc, 0x15, 0x2c, 0x49, 0x46, 0xb2,
0x0c, 0xfb, 0x9d, 0x80, 0xa6, 0x80, 0xaf, 0xaf, 0x26, 0x53, 0x64, 0xf8, 0xb0, 0x71, 0x08, 0x31,
0x20, 0x4f, 0x4a, 0xef, 0xc9, 0x4b, 0x6d, 0x8a, 0x53, 0x44, 0xf2, 0x59, 0x5b, 0x95, 0x65, 0x9b,
0xd4, 0x03, 0x4e, 0xf1, 0x45, 0xa2, 0x44, 0x94, 0x30, 0xf6, 0x97, 0xfd, 0x5f, 0xc3, 0x06, 0x75,
0x5a, 0x2b, 0x03, 0xbc, 0xbf, 0x11, 0x79, 0x0d, 0x96, 0xe4, 0x61, 0xff, 0x60, 0x0b, 0x59, 0x92,
0xc9, 0x64, 0xf9, 0xba, 0x2e, 0xb6, 0x75, 0xde, 0x1f, 0xf4, 0x25, 0xb9, 0x10, 0x2d, 0xe5, 0x3a,
0x42, 0xa8, 0x92, 0x6c, 0x30, 0xfc, 0x65, 0x7f, 0xef, 0xe9, 0xaf, 0xc3, 0x00, 0xc5, 0xfe, 0x0b,
0x3f, 0x81, 0xbd, 0xb6, 0x12, 0x09, 0x95, 0xe0, 0x54, 0xcc, 0xf0, 0xff, 0x0c, 0x5c, 0x0e, 0x17,
0xf9, 0x24, 0x53, 0x73, 0x87, 0xcf, 0x17, 0x20, 0x77, 0xa3, 0x73, 0x7c, 0x3b, 0xce, 0xe9, 0xf9,
0x5a, 0x80, 0xb2, 0xe9, 0xbd, 0xa8, 0xec, 0x85, 0x4e, 0x96, 0x74, 0x04, 0xfc, 0xed, 0x8b, 0x78,
0xd2, 0x4a, 0xba, 0x46, 0x86, 0xbe, 0xad, 0xda, 0x2f, 0xa7, 0x7a, 0x55, 0x7a, 0xb9, 0x08, 0x08,
0x7f, 0xa5, 0x0b, 0xda, 0x00, 0x76, 0xd1, 0xab, 0x0b, 0xe9, 0x15, 0xf8, 0xef, 0x7e, 0xb7, 0xff,
0xf6, 0x46, 0x2d, 0xb2, 0xcd, 0xeb, 0xf6, 0xec, 0x39, 0x02, 0x65, 0xe8, 0xe5, 0xa9, 0xa4, 0x0a,
0xe0, 0xbf, 0x22, 0x89, 0x93, 0xbc, 0x4e, 0xa5, 0x1d, 0x6c, 0xbc, 0x0b, 0x82, 0xdf, 0x7f, 0x6f,
0x9f, 0x50, 0xae, 0xf4, 0x79, 0x2a, 0xe7, 0xa2, 0xce, 0x1d, 0x8a, 0x1e, 0xb5, 0xb0, 0x53, 0x26,
0xb7, 0x6b, 0x1c, 0x50, 0xc9, 0x3b, 0x4c, 0x03, 0xee, 0x2d, 0x9b, 0x04, 0xe2, 0xc4, 0xf9, 0xef,
0xf9, 0x43, 0x49, 0xd4, 0x7a, 0xdf, 0x8e, 0xe0, 0xe1, 0x80, 0xbf, 0xbb, 0x38, 0x3b, 0x05, 0x89,
0xda, 0xf4, 0x39, 0x47, 0xdd, 0x60, 0xb7, 0x4d, 0x83, 0x1d, 0x7d, 0x13, 0x24, 0x1f, 0xa7, 0x30,
0x1e, 0x61, 0x53, 0xcb, 0xec, 0x68, 0x3d, 0xbe, 0x6c, 0x60, 0xaa, 0x76, 0x3a, 0xd1, 0xf9, 0x83,
0x07, 0x03, 0xdf, 0x8e, 0xf6, 0xc3, 0x81, 0xef, 0x57, 0x31, 0xed, 0xc8, 0x27, 0x4e, 0x1b, 0x20,
0x48, 0xca, 0xcf, 0x9d, 0x2c, 0x28, 0xad, 0x93, 0xf3, 0x8a, 0x7b, 0x57, 0x9b, 0x6d, 0x38, 0x5f,
0x54, 0xe0, 0x11, 0x72, 0x87, 0x5d, 0xea, 0x54, 0x46, 0xec, 0x1a, 0x15, 0x6b, 0x25, 0x93, 0x14,
0x47, 0x46, 0xb6, 0xb1, 0xf3, 0x6b, 0x30, 0x45, 0x78, 0x4b, 0xa2, 0xbd, 0x2d, 0x31, 0xf4, 0xd2,
0x82, 0x80, 0x76, 0x79, 0x96, 0x27, 0xf1, 0xcf, 0x7d, 0x03, 0x44, 0xff, 0xe3, 0x0f, 0xfd, 0xf2,
0x11, 0x87, 0xbb, 0xdb, 0xe6, 0x35, 0xb4, 0xd1, 0x07, 0xfb, 0xbc, 0x8a, 0x7f, 0xe4, 0x1e, 0xdf,
0xde, 0x68, 0xd8, 0x76, 0xdd, 0x91, 0xe7, 0x86, 0xf1, 0x5f, 0x55, 0x41, 0xfd, 0x9b, 0xd5, 0x26,
0x47, 0x91, 0x7b, 0xba, 0x48, 0x2c, 0x38, 0xf4, 0x19, 0x36, 0xfa, 0x0d, 0xa3, 0x61, 0x33, 0x6f,
0x10, 0x99, 0x83, 0x23, 0x49, 0x73, 0xcc, 0x81, 0x16, 0x7a, 0xfb, 0x1c, 0x75, 0xd1, 0x63, 0x0a,
0xcf, 0xf4, 0xed, 0xbd, 0xe5, 0xed, 0x3c, 0x32, 0x99, 0x73, 0x86, 0x69, 0x20, 0xd3, 0x58, 0xa9,
0xb4, 0xa5, 0xe1, 0x20, 0x55, 0x37, 0xcc, 0x93, 0x4a, 0x0c, 0x8e, 0x03, 0x1c, 0xab, 0xdb, 0xef,
0x32, 0x99, 0x57, 0x27, 0x34, 0xaa, 0x20, 0x70, 0x0e, 0xd1, 0xa0, 0x76, 0x13, 0xf3, 0xe6, 0x81,
0x43, 0x6b, 0x92, 0xab, 0x64, 0x19, 0xf3, 0x57, 0xa4, 0xf6, 0xf9, 0x68, 0xd8, 0x2c, 0xc0, 0x34,
0x88, 0x18, 0xdf, 0x7f, 0xa6, 0xb7, 0x39, 0x74, 0x42, 0x87, 0xa8, 0x82, 0xb6, 0xe7, 0x6e, 0x9d,
0xb0, 0xf5, 0xac, 0x50, 0xb0, 0x71, 0x22, 0x6e, 0xe4, 0x76, 0x4b, 0x66, 0x3a, 0xf1, 0xd9, 0xe1,
0xb8, 0x37, 0x69, 0x27, 0x07, 0xf6, 0x80, 0xbd, 0xf5, 0x7d, 0x9e, 0xf2, 0xb3, 0xae, 0x80, 0xcd,
0xe1, 0xb8, 0x1b, 0x6b, 0xd8, 0xf5, 0xf9, 0xeb, 0x23, 0x36, 0x52, 0x65, 0x55, 0xbb, 0x56, 0x74,
0x05, 0xe7, 0x56, 0xda, 0xa4, 0xdc, 0x83, 0x84, 0xf5, 0xcd, 0xdc, 0xe4, 0xbf, 0x5b, 0xf5, 0x2f,
0x7c, 0x7d, 0x0c, 0xb0, 0xc4, 0x47, 0xe4, 0xf9, 0x02, 0x53, 0x99, 0x7f, 0x52, 0xe5, 0xce, 0x93,
0x2e, 0x51, 0x36, 0x94, 0xc9, 0x31, 0xdf, 0x10, 0x07, 0x31, 0x61, 0x00, 0x59, 0x95, 0x70, 0x48,
0x1f, 0xac, 0x78, 0xb2, 0xf8, 0x0b, 0xd4, 0x90, 0xf2, 0x02, 0x09, 0x06, 0xa6, 0xc7, 0xf8, 0x64,
0x54, 0xc2, 0x99, 0x1f, 0xb6, 0xa0, 0x71, 0x37, 0xe1, 0x04, 0x7b, 0xcc, 0x52, 0xb5, 0x50, 0x8e,
0x61, 0xdb, 0x0c, 0x4c, 0x02, 0x4c, 0x0c, 0xe0, 0xa7, 0x90, 0xf8, 0xb0, 0x43, 0x99, 0xce, 0xb5,
0x39, 0xfa, 0x6e, 0x2e, 0x68, 0x84, 0x7c, 0xf0, 0xdd, 0xd3, 0x27, 0x4f, 0x9e, 0x3c, 0x63, 0x6f,
0x4b, 0x59, 0x26, 0x66, 0x5d, 0x39, 0x99, 0x32, 0x67, 0x44, 0x69, 0x0b, 0x65, 0x2d, 0x55, 0x08,
0x3b, 0x41, 0xc7, 0x33, 0xa8, 0xf5, 0xd2, 0xb1, 0x55, 0x26, 0xa9, 0x7e, 0x73, 0x4c, 0x2d, 0xd4,
0x34, 0xe1, 0x6a, 0xc8, 0x52, 0xcd, 0x5e, 0x5e, 0x4d, 0x19, 0x48, 0x89, 0xad, 0x75, 0x6d, 0xd8,
0x34, 0xe1, 0x6a, 0xc8, 0x52, 0xcd, 0x5e, 0x5f, 0x4d, 0x19, 0x48, 0x89, 0xad, 0x75, 0x6d, 0xd8,
0x4c, 0x94, 0x4b, 0x2c, 0xd2, 0x82, 0x36, 0x21, 0x9b, 0x9c, 0x5f, 0x86, 0x4c, 0xba, 0x24, 0x62,
0x95, 0x2a, 0xfb, 0xbd, 0x2e, 0xb0, 0x66, 0x4c, 0xdc, 0xc5, 0x56, 0xca, 0x40, 0x9a, 0xb5, 0x6c,
0x70, 0x35, 0x3d, 0x0e, 0x98, 0xd5, 0x73, 0xb7, 0x12, 0x46, 0xb2, 0x66, 0xe4, 0xba, 0x83, 0xb9,
0x07, 0x69, 0xa6, 0x3f, 0x76, 0xc9, 0xf8, 0xf2, 0xca, 0xe7, 0x95, 0x19, 0x5f, 0x23, 0x18, 0x55,
0x66, 0x00, 0xc2, 0x17, 0xa3, 0xd4, 0x9c, 0xb8, 0xba, 0xbe, 0x15, 0x91, 0x87, 0x87, 0x2d, 0x3a,
0x07, 0x69, 0xa6, 0x3f, 0x76, 0xc9, 0xf8, 0xfa, 0xca, 0xe7, 0x95, 0x19, 0x5f, 0x23, 0x18, 0x55,
0x66, 0x00, 0xc2, 0x17, 0xa3, 0xd4, 0x9c, 0xb8, 0xba, 0xbe, 0x15, 0x91, 0x47, 0x87, 0x2d, 0x3a,
0x53, 0x0d, 0xf4, 0x68, 0x00, 0x66, 0x30, 0x23, 0x64, 0xc8, 0x79, 0xd6, 0x4d, 0x94, 0x0c, 0xe3,
0x95, 0x45, 0xa3, 0x22, 0xe7, 0x58, 0x29, 0x09, 0x1d, 0xcd, 0x44, 0x6e, 0x75, 0x8b, 0xb7, 0xcb,
0x24, 0x26, 0x07, 0x63, 0x00, 0x09, 0xeb, 0xd4, 0xf5, 0xbd, 0x55, 0xd3, 0x4c, 0x6e, 0xde, 0xd0,
@@ -1663,54 +1663,54 @@ const uint8_t PAGE_settings_sec[] PROGMEM = {
0x42, 0x7d, 0xe6, 0x1d, 0x1d, 0xa9, 0x6d, 0x4e, 0x53, 0x95, 0x20, 0xd9, 0x9a, 0x69, 0x86, 0x30,
0x07, 0x03, 0xac, 0x1b, 0xeb, 0xbc, 0x6e, 0x35, 0xf7, 0xea, 0x73, 0x0a, 0x13, 0xb6, 0xa5, 0x8d,
0x49, 0x69, 0x7f, 0x34, 0x54, 0x0d, 0xea, 0xa7, 0xb2, 0x5c, 0x33, 0x91, 0x24, 0x14, 0x3e, 0x60,
0xf2, 0x46, 0x3d, 0x57, 0xac, 0xe3, 0x26, 0x3a, 0x4d, 0x27, 0x65, 0xfa, 0x27, 0x31, 0xbc, 0x7a,
0xd3, 0xc6, 0x90, 0xfe, 0x9e, 0x8b, 0x04, 0xf4, 0x48, 0x90, 0x43, 0xce, 0x9f, 0x1c, 0x7c, 0x35,
0xf2, 0x4e, 0xbd, 0x54, 0xac, 0xe3, 0x26, 0x3a, 0x4d, 0x27, 0x65, 0xfa, 0x27, 0x31, 0xbc, 0x7a,
0xd7, 0xc6, 0x90, 0xfe, 0x5e, 0x8a, 0x04, 0xf4, 0x48, 0x90, 0x43, 0xce, 0x9f, 0x1c, 0x7c, 0x33,
0x69, 0x63, 0x77, 0x9c, 0xe7, 0x5b, 0xb5, 0xa2, 0x4c, 0x59, 0x3b, 0x2c, 0x22, 0xb7, 0xb0, 0x02,
0xc0, 0x25, 0x25, 0x46, 0x87, 0xad, 0x19, 0xff, 0x1f, 0x95, 0x70, 0xbc, 0x83, 0xb7, 0x87, 0x0f,
0x18, 0xc3, 0x18, 0xa4, 0x85, 0x43, 0x90, 0x97, 0x3e, 0x06, 0x8a, 0xb2, 0x22, 0x91, 0x34, 0x3a,
0x82, 0x39, 0x9b, 0x31, 0xb1, 0xcb, 0x7a, 0x62, 0x9e, 0xec, 0xe1, 0x78, 0xd2, 0x65, 0x79, 0x43,
0x38, 0xa0, 0x9a, 0x87, 0xe3, 0x3f, 0xa1, 0xc7, 0xd7, 0xc4, 0x74, 0xbd, 0x4b, 0x51, 0xd6, 0x22,
0x82, 0x39, 0x9b, 0x31, 0xb1, 0xcb, 0x7a, 0x62, 0x9e, 0xec, 0xd1, 0x78, 0xd2, 0x65, 0x79, 0x43,
0x38, 0xa0, 0x9a, 0x47, 0xe3, 0x3f, 0xa1, 0xc7, 0xb7, 0xc4, 0x74, 0xbd, 0x4b, 0x51, 0xd6, 0x22,
0xf7, 0x61, 0xe9, 0x8e, 0x6e, 0x78, 0xcf, 0x8c, 0xcf, 0x9a, 0x0c, 0x3e, 0x36, 0x69, 0xad, 0x4a,
0x8d, 0x4d, 0x5f, 0x44, 0xb0, 0x65, 0xaa, 0xe3, 0x2b, 0xbe, 0xb1, 0x89, 0x58, 0xb4, 0xae, 0x40,
0x82, 0xaf, 0x30, 0xd1, 0x69, 0xd3, 0x1a, 0x25, 0x3a, 0x16, 0x9f, 0x39, 0x8c, 0xd0, 0xe5, 0xb2,
0x82, 0x6f, 0x30, 0xd1, 0x69, 0xd3, 0x1a, 0x25, 0x3a, 0x16, 0x9f, 0x39, 0x8c, 0xd0, 0xe5, 0xb2,
0x61, 0xbb, 0x76, 0x5c, 0x67, 0xbd, 0x0c, 0x09, 0x17, 0xf3, 0x61, 0x0b, 0x38, 0xba, 0x11, 0xd9,
0xdc, 0xb5, 0x66, 0x54, 0x5f, 0x3b, 0xb5, 0x77, 0xc2, 0xdb, 0xe7, 0xd1, 0x50, 0x6c, 0x02, 0x31,
0xee, 0xb5, 0xfa, 0x36, 0x8b, 0x3e, 0x4b, 0x77, 0xac, 0xf6, 0x03, 0x7b, 0x1b, 0x73, 0x3f, 0x93,
0xf9, 0x94, 0xab, 0x70, 0x0f, 0x6d, 0xf4, 0x8d, 0x59, 0x07, 0x5d, 0xef, 0x7e, 0xec, 0xbe, 0xdf,
0x99, 0x63, 0xd3, 0x68, 0x32, 0x8f, 0x48, 0x4a, 0x78, 0xc7, 0xea, 0xe0, 0xfb, 0xf1, 0x6b, 0xbf,
0x99, 0x63, 0xd3, 0x68, 0x32, 0x8f, 0x48, 0x4a, 0x78, 0xc7, 0xea, 0xe0, 0xfb, 0xf1, 0x5b, 0xbf,
0x6d, 0x83, 0x68, 0x93, 0x94, 0x1b, 0xb6, 0xfa, 0x32, 0x14, 0x9d, 0x97, 0xac, 0x45, 0x03, 0xd0,
0xb4, 0x48, 0xf4, 0xb6, 0x50, 0x10, 0x5e, 0x1d, 0x0c, 0xb7, 0xee, 0x19, 0xb7, 0xc0, 0xe8, 0xb0,
0xb8, 0xbd, 0x63, 0x8b, 0x48, 0xef, 0x7e, 0x48, 0x0e, 0xbf, 0x8c, 0xc9, 0x17, 0x3a, 0xe7, 0xbd,
0x98, 0x1c, 0x86, 0x3b, 0xc6, 0x7f, 0x0e, 0xc8, 0x0e, 0x1e, 0x54, 0x41, 0xbd, 0xaf, 0x95, 0x50,
0xe3, 0x08, 0xb5, 0x88, 0x16, 0x9d, 0xe1, 0xed, 0xcb, 0x95, 0x2f, 0xcd, 0xab, 0x5f, 0xcf, 0x5e,
0xbd, 0x79, 0x75, 0x3e, 0x3d, 0x6b, 0xfa, 0x06, 0xe8, 0xd6, 0x50, 0x8f, 0xb9, 0xf7, 0x44, 0xe4,
0xe3, 0x08, 0xb5, 0x88, 0x16, 0x9d, 0xe1, 0xed, 0xcb, 0x95, 0x2f, 0xcd, 0xab, 0x9f, 0xcf, 0xde,
0xbc, 0x7b, 0x73, 0x3e, 0x3d, 0x6b, 0xfa, 0x06, 0xe8, 0xd6, 0x50, 0x8f, 0xb9, 0xf7, 0x44, 0xe4,
0xc3, 0xd1, 0xa3, 0x4b, 0x58, 0x43, 0xb5, 0xb7, 0xe5, 0x15, 0x82, 0x48, 0xe3, 0xb7, 0x1a, 0xdd,
0x04, 0x0d, 0x70, 0xbe, 0x4b, 0x23, 0x0c, 0x5c, 0x6e, 0xe4, 0x9e, 0x27, 0xc6, 0xf6, 0xa2, 0xe7,
0xd5, 0x9d, 0x4d, 0xae, 0xa3, 0xb6, 0x2e, 0x9f, 0xdf, 0x43, 0xf7, 0xe1, 0x86, 0xba, 0xad, 0x27,
0xd5, 0x9d, 0x4d, 0xae, 0xa3, 0xb6, 0x2e, 0x5f, 0xde, 0x43, 0xf7, 0xe1, 0x86, 0xba, 0xad, 0x27,
0x47, 0x22, 0xe0, 0x19, 0x55, 0x7e, 0x8a, 0xde, 0x14, 0x75, 0x55, 0x73, 0x3c, 0xc3, 0x05, 0xab,
0x2b, 0x95, 0xb6, 0x1c, 0xba, 0x1f, 0x2d, 0xd0, 0x82, 0xb3, 0x7a, 0x16, 0xe1, 0xd6, 0x38, 0xbc,
0xd4, 0xba, 0xc4, 0x6c, 0x58, 0xa3, 0xd3, 0x0d, 0x69, 0x20, 0x1c, 0xa2, 0x75, 0x0b, 0xb3, 0xa0,
0x1f, 0x53, 0xde, 0xcf, 0x72, 0xf4, 0x4b, 0x3e, 0xa6, 0xd7, 0x97, 0x97, 0x94, 0x0d, 0x3d, 0x76,
0x23, 0x0d, 0xf1, 0x0d, 0xdb, 0x8f, 0x0e, 0x1e, 0x45, 0xfb, 0x7b, 0xb3, 0x83, 0x1f, 0xa3, 0xc3,
0x47, 0xec, 0xbf, 0xff, 0xfe, 0x0f, 0x61, 0x30, 0x48, 0x02, 0x76, 0xb8, 0x7f, 0xf8, 0x90, 0x7d,
0x55, 0xe3, 0xb1, 0x32, 0x89, 0xd6, 0x7a, 0xa9, 0x64, 0xa3, 0x90, 0xee, 0xae, 0x70, 0x63, 0x58,
0x08, 0x55, 0x46, 0x51, 0xb4, 0x63, 0xd0, 0x11, 0xad, 0x1f, 0x15, 0x68, 0x19, 0xc8, 0x8f, 0xbb,
0x56, 0xfd, 0xe2, 0x25, 0xb2, 0x9d, 0xed, 0xcd, 0x40, 0xfb, 0x4c, 0x17, 0x18, 0xac, 0xd8, 0x71,
0x8d, 0x49, 0xd0, 0x6c, 0x0b, 0x1a, 0x7f, 0x73, 0xe2, 0x41, 0x60, 0xfc, 0x4d, 0xd6, 0xdd, 0x0f,
0xc7, 0xd1, 0x46, 0xee, 0xb7, 0xc8, 0x5a, 0xa9, 0xa5, 0x1a, 0xfa, 0x3b, 0x13, 0x5d, 0x15, 0x60,
0xdd, 0x1e, 0x7a, 0xc2, 0x5e, 0x62, 0x64, 0xaa, 0xa8, 0x48, 0x3f, 0x73, 0x71, 0x77, 0x2b, 0x66,
0x16, 0x49, 0xb7, 0x3f, 0xf0, 0xbf, 0x92, 0x4d, 0x33, 0xb1, 0x95, 0x4c, 0x14, 0x38, 0xd7, 0xa1,
0x2f, 0x2e, 0x37, 0x9e, 0xf6, 0x8e, 0x59, 0x56, 0xa3, 0x6d, 0xfa, 0xb7, 0x7e, 0x32, 0x40, 0x03,
0xc4, 0x9d, 0xc7, 0xac, 0x71, 0x09, 0x47, 0xc7, 0xd6, 0x8c, 0xc6, 0x5e, 0xe4, 0x0a, 0x9a, 0x43,
0xf3, 0xfb, 0x8c, 0xc7, 0xad, 0xdf, 0xa1, 0xd4, 0x6b, 0xa2, 0x78, 0xf0, 0xd3, 0x9e, 0x0f, 0xe5,
0xb3, 0xcc, 0xe0, 0x86, 0xab, 0xd0, 0x3d, 0x26, 0x49, 0xb6, 0xa2, 0xdf, 0x07, 0xda, 0x66, 0x7d,
0x81, 0x36, 0x8e, 0xab, 0x17, 0x72, 0x0e, 0x46, 0x35, 0xb3, 0xc6, 0x37, 0x81, 0x31, 0xcb, 0xf5,
0x0c, 0x31, 0xc7, 0xed, 0xd9, 0x0c, 0x2f, 0xce, 0x9f, 0x9d, 0xbd, 0x9c, 0x9c, 0x7d, 0x8e, 0x75,
0xef, 0xf2, 0x7c, 0xca, 0xf2, 0x46, 0x93, 0x77, 0x10, 0x0d, 0xbe, 0x33, 0x74, 0x22, 0x0d, 0xbc,
0x82, 0x1b, 0xd6, 0x62, 0x4c, 0x40, 0x43, 0xc1, 0x5d, 0xb5, 0xec, 0x98, 0xd0, 0xaa, 0x8a, 0x13,
0x67, 0xf9, 0x7b, 0x3c, 0xf3, 0x57, 0x73, 0x6a, 0x75, 0xb4, 0xa5, 0xe9, 0x2b, 0xc4, 0x13, 0xc4,
0x92, 0xcd, 0x6f, 0x1f, 0x5f, 0x1d, 0xea, 0x3f, 0x9f, 0xe9, 0x7b, 0xdf, 0x34, 0xd4, 0x0f, 0xa9,
0xdb, 0xe2, 0x83, 0xee, 0x32, 0x74, 0xb1, 0xa1, 0x9f, 0x57, 0xff, 0x07, 0xbb, 0x00, 0x76, 0x73,
0x23, 0x0d, 0xf1, 0x0d, 0xdb, 0x8f, 0x0e, 0x1e, 0x47, 0xfb, 0x7b, 0xb3, 0x83, 0x1f, 0xa2, 0xc3,
0x1f, 0xd8, 0x7f, 0xff, 0xfd, 0x1f, 0xc2, 0x60, 0x90, 0x04, 0xec, 0x70, 0xff, 0xf0, 0x11, 0xfb,
0xaa, 0xc6, 0x63, 0x65, 0x12, 0xad, 0xf5, 0x52, 0xc9, 0x46, 0x21, 0xdd, 0x5d, 0xe1, 0xc6, 0xb0,
0x10, 0xaa, 0x8c, 0xa2, 0x68, 0xc7, 0xa0, 0x23, 0x5a, 0x3f, 0x2a, 0xd0, 0x32, 0x90, 0x1f, 0x77,
0xad, 0xfa, 0xc9, 0x4b, 0x64, 0x3b, 0xdb, 0x9b, 0x81, 0xf6, 0x85, 0x2e, 0x30, 0x58, 0xb1, 0xe3,
0x1a, 0x93, 0xa0, 0xd9, 0x16, 0x34, 0xfe, 0xe6, 0xc4, 0x83, 0xc0, 0xf8, 0x9b, 0xac, 0xbb, 0x1f,
0x8e, 0xa3, 0x8d, 0xdc, 0x6f, 0x91, 0xb5, 0x52, 0x4b, 0x35, 0xf4, 0x77, 0x26, 0xba, 0x2a, 0xc0,
0xba, 0x3d, 0xf4, 0x84, 0xbd, 0xc4, 0xc8, 0x54, 0x51, 0x91, 0x7e, 0xe6, 0xe2, 0xee, 0x56, 0xcc,
0x2c, 0x92, 0x6e, 0x7f, 0xe0, 0x7f, 0x25, 0x9b, 0x66, 0x62, 0x2b, 0x99, 0x28, 0x70, 0xae, 0x43,
0x5f, 0x5c, 0x6e, 0x3c, 0xed, 0x1d, 0xb3, 0xac, 0x46, 0xdb, 0xf4, 0x6f, 0xfd, 0x64, 0x80, 0x06,
0x88, 0x3b, 0x8f, 0x59, 0xe3, 0x12, 0x8e, 0x8e, 0xad, 0x19, 0x8d, 0xbd, 0xc8, 0x15, 0x34, 0x87,
0xe6, 0xf7, 0x19, 0x8f, 0x5b, 0xbf, 0x43, 0xa9, 0xd7, 0x44, 0xf1, 0xe0, 0xc7, 0x3d, 0x1f, 0xca,
0x17, 0x99, 0xc1, 0x0d, 0x57, 0xa1, 0x7b, 0x4c, 0x92, 0x6c, 0x45, 0xbf, 0x0f, 0xb4, 0xcd, 0xfa,
0x02, 0x6d, 0x1c, 0x57, 0x2f, 0xe4, 0x1c, 0x8c, 0x6a, 0x66, 0x8d, 0x6f, 0x02, 0x63, 0x96, 0xeb,
0x19, 0x62, 0x8e, 0xdb, 0xb3, 0x19, 0x5e, 0x9c, 0xbf, 0x38, 0x7b, 0x3d, 0x39, 0xfb, 0x1c, 0xeb,
0xde, 0xe5, 0xf9, 0x94, 0xe5, 0x8d, 0x26, 0xef, 0x20, 0x1a, 0x7c, 0x67, 0xe8, 0x44, 0x1a, 0x78,
0x05, 0x37, 0xac, 0xc5, 0x98, 0x80, 0x86, 0x82, 0xbb, 0x6a, 0xd9, 0x31, 0xa1, 0x55, 0x15, 0x27,
0xce, 0xf2, 0xf7, 0x78, 0xe6, 0xaf, 0xe6, 0xd4, 0xea, 0x68, 0x4b, 0xd3, 0x57, 0x88, 0x27, 0x88,
0x25, 0x9b, 0xdf, 0x3e, 0xbe, 0x3a, 0xd4, 0x7f, 0x3e, 0xd3, 0xf7, 0xbe, 0x69, 0xa8, 0x1f, 0x52,
0xb7, 0xc5, 0x07, 0xdd, 0x65, 0xe8, 0x62, 0x43, 0x3f, 0xaf, 0xfe, 0x0f, 0x87, 0x6f, 0x85, 0x49,
0x6e, 0x15, 0x00, 0x00
};

View File

@@ -189,7 +189,7 @@ void sendImprovInfoResponse() {
out[11] = 4; //Firmware len ("WLED")
out[12] = 'W'; out[13] = 'L'; out[14] = 'E'; out[15] = 'D';
uint8_t lengthSum = 17;
uint8_t vlen = sprintf_P(out+lengthSum,PSTR("0.14.0-b15.24/%i"),VERSION);
uint8_t vlen = sprintf_P(out+lengthSum,PSTR("0.14.0-b15.25/%i"),VERSION);
out[16] = vlen; lengthSum += vlen;
uint8_t hlen = 7;
#ifdef ESP8266

View File

@@ -8,7 +8,7 @@
*/
// version code in format yymmddb (b = daily build)
#define VERSION 2305161
#define VERSION 2305170
//uncomment this if you have a "my_config.h" file you'd like to use
//#define WLED_USE_MY_CONFIG