Merge branch 'main' into dev-v2.3

This commit is contained in:
Gunnar Skjold
2024-04-04 13:38:14 +02:00
8 changed files with 39 additions and 2 deletions

View File

@@ -0,0 +1,2 @@
static const char JSON1_JSON[] PROGMEM = R"=="==({"id":"%s","name":"%s","up":%u,"t":%lu,"vcc":%.3f,"rssi":%d,"temp":%.2f,"data":{"P":%d},"realtime":{"h":%.2f,"d":%.1f,"t":%d,"x":%.2f,"he":%.2f,"de":%.1f}})=="==";
const int JSON1_JSON_LEN PROGMEM = 155;

View File

@@ -0,0 +1,2 @@
static const char JSON2_JSON[] PROGMEM = R"=="==({"id":"%s","name":"%s","up":%u,"t":%lu,"vcc":%.3f,"rssi":%d,"temp":%.2f,"data":{"lv":"%s","id":"%s","type":"%s","P":%d,"Q":%d,"PO":%d,"QO":%d,"I1":%.2f,"I2":%.2f,"I3":%.2f,"U1":%.2f,"U2":%.2f,"U3":%.2f},"realtime":{"h":%.2f,"d":%.1f,"t":%d,"x":%.2f,"he":%.2f,"de":%.1f}})=="==";
const int JSON2_JSON_LEN PROGMEM = 270;

View File

@@ -0,0 +1,2 @@
static const char JSON3_JSON[] PROGMEM = R"=="==({"id":"%s","name":"%s","up":%u,"t":%lu,"vcc":%.3f,"rssi":%d,"temp":%.2f,"data":{"lv":"%s","id":"%s","type":"%s","P":%d,"Q":%d,"PO":%d,"QO":%d,"I1":%.2f,"I2":%.2f,"I3":%.2f,"U1":%.2f,"U2":%.2f,"U3":%.2f,"tPI":%.3f,"tPO":%.3f,"tQI":%.3f,"tQO":%.3f,"rtc":%lu},"realtime":{"h":%.2f,"d":%.1f,"t":%d,"x":%.2f,"he":%.2f,"de":%.1f}})=="==";
const int JSON3_JSON_LEN PROGMEM = 324;

View File

@@ -0,0 +1,2 @@
static const char JSON4_JSON[] PROGMEM = R"=="==({"id":"%s","name":"%s","up":%u,"t":%lu,"vcc":%.3f,"rssi":%d,"temp":%.2f,"data":{"lv":"%s","id":"%s","type":"%s","P":%d,"P1":%.2f,"P2":%.2f,"P3":%.2f,"Q":%d,"PO":%d,"PO1":%.2f,"PO2":%.2f,"PO3":%.2f,"QO":%d,"I1":%.2f,"I2":%.2f,"I3":%.2f,"U1":%.2f,"U2":%.2f,"U3":%.2f,"PF":%.2f,"PF1":%.2f,"PF2":%.2f,"PF3":%.2f,"tPI":%.3f,"tPO":%.3f,"tQI":%.3f,"tQO":%.3f,"tPI1":%.3f,"tPI2":%.3f,"tPI3":%.3f,"tPO1":%.3f,"tPO2":%.3f,"tPO3":%.3f,"rtc":%lu},"realtime":{"h":%.2f,"d":%.1f,"t":%d,"x":%.2f,"he":%.2f,"de":%.1f}})=="==";
const int JSON4_JSON_LEN PROGMEM = 502;

View File

@@ -0,0 +1,2 @@
static const char JSONPRICES_JSON[] PROGMEM = R"=="==({"id":"%s","prices":{"0":%s,"1":%s,"2":%s,"3":%s,"4":%s,"5":%s,"6":%s,"7":%s,"8":%s,"9":%s,"10":%s,"11":%s,"12":%s,"13":%s,"14":%s,"15":%s,"16":%s,"17":%s,"18":%s,"19":%s,"20":%s,"21":%s,"22":%s,"23":%s,"24":%s,"25":%s,"26":%s,"27":%s,"28":%s,"29":%s,"30":%s,"31":%s,"32":%s,"33":%s,"34":%s,"35":%s,"36":%s,"37":%s,"min":%.4f,"max":%.4f,"cheapest1hr":"%s","cheapest3hr":"%s","cheapest6hr":"%s"}})=="==";
const int JSONPRICES_JSON_LEN PROGMEM = 395;

View File

@@ -0,0 +1,2 @@
static const char JSONSYS_JSON[] PROGMEM = R"=="==({"id":"%s","name":"%s","up":%d,"vcc":%.3f,"rssi":%d,"temp":%.2f,"version":"%s"})=="==";
const int JSONSYS_JSON_LEN PROGMEM = 79;