From 2378ac780e0ed8263a01101cfb764c665c0d062b Mon Sep 17 00:00:00 2001 From: Robert Strouse Date: Tue, 16 May 2023 09:47:27 -0700 Subject: [PATCH] Added timezone for Europe/Berlin #49. Publish v1.6.0 --- ConfigSettings.h | 2 +- SomfyController.ino.esp32.bin | Bin 1065456 -> 1065456 bytes SomfyController.littlefs.bin | Bin 1441792 -> 1441792 bytes Web.cpp | 52 ---------------------------------- data/index.html | 38 +++++++++++++------------ data/index.js | 3 +- 6 files changed, 23 insertions(+), 72 deletions(-) diff --git a/ConfigSettings.h b/ConfigSettings.h index bea2f18..e954c0c 100644 --- a/ConfigSettings.h +++ b/ConfigSettings.h @@ -3,7 +3,7 @@ #ifndef configsettings_h #define configsettings_h -#define FW_VERSION "v1.6.0beta" +#define FW_VERSION "v1.6.0" enum DeviceStatus { DS_OK = 0, DS_ERROR = 1, diff --git a/SomfyController.ino.esp32.bin b/SomfyController.ino.esp32.bin index 98a49d73dddb1ea12e51b71e492c30de9839618c..e9de3a7f53c0f643c1fd4c835721434535b6cd8e 100644 GIT binary patch delta 13654 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 m+Tf_`_JPt{Lb$= z&pA&pxHcGEJG47lP3((`3KWeORBkAb>g%=V^bIE~>U*O#^&4u&^*0~f-_sYZ>2IV= zaSg63wFcMcNhwz|&qi}~q+nV5WcE}wE9J&Iu8!!r{py%m?U>>kToHZuwd{ok zx6|Wz)#Hd}Ok+%ED2y0JEW^UEGHi@EMm$569tUi*(J2kejo)0#&VUBln*lAt(p1$r z8Wj~KEjs*(^mh?tP_P)5ldA-L@|*`2Fu59R%9`5Eej2HSSu~jsMRJ1|@&#$lkV@B^ zAeSO;NT8c3$9eK3PQX@f;n?SnjWy#z7p z*WAEY45JZBcm?W6U!f{A^b8;c)`Ok$YQbr=Rr>!&ILWsUY_z|P&sk9iMRac$9RIJE zha#KUW`8v_MZ3vb17q^pdT5VVE*WQkv;*969l2W?>)SUjcIQ#Ahx-pzK%6WL!0TxJ zhDE0Evo2Uj6D=a1id0M_-&U|nXAt(I@~z=h+YZa6BLv6L{vF2#XOx-ubN2Iet{viW z1+v)WKtE(tpcaxSlEpJR{RCJj?GSWGTR#j7<+5Q{F)5NszXdA&JP0XtXaLekzX>ri zYX}~j-WRajq~|yU)sw?;sZd^i1oITTrft)%a`6w0D~uC%F@eIrSj&uXR9v#ADt8g} zt6~=UP}pRiT|Ah!@M(WrQ)6>xj<&v~-jJ4*vCLgkR+Y1IzBA9MyYd$6I)6DU-EOD* z-&NTbhdM8358#1T|( znCcd;Rs!M!RBv)@aHiP36&!T7OBB*bJ*La2f?_8sKN%GnE7U}aydzXPzgNr;f58ta zScw*y6cTTv^%hG^ne(XVHHS~b?~CnIkBfJq$kD^%iU)Kuw}g&xj@DJtI=3J}kDQ@{7^Izy(nm+g{u5cLwO-BjKRV5f&`H zC|c2ahXqrjt9&tQM7)bOt@AFkotjP+cZ8e1zbEEc{aR#rFTNCL-ig@ z4Y_H8I;PN>Nl{GR`y%OthOePA!AUw*s?MVeh;H(fsj;N5!nx)Z<$ODCM(eMvF?AV! zoJ|wAMGPIDhDgqb{Di#u7@khS8~mhd$}mw5&cVOpmER28qb_`&d})|T7nkv?IKM;X zwsc&F_TM>eNDNoAwbKRYwQOn*)Hb$hyncKOmHURpxenfP(Q0&B+B>{0Tl{U5JH{ir zy9QM`$BW%){exwu^zMsl>eME62e0U&pNG)k!xB^;7*0o9xS2)G2;^-+CA@@poEpF$ zOnAsyLt&WIHm~cTSt`L=8soeMxpp8m`iOHeCSE43og1;~UiPVoE98g6P#8VMsjL~_wKlo$fk7sx1 zdFGkfnSIx?Hd)rD&pkqn|tLV0U_1YNgjbO#{t>thc2t|o50NR^?8b#$$rjB#_yP?+6MCYD^`PBJ07SLHH z9`tC6LGy!XI0j8B`mc`W|2LB(5!jti=_Z&*3!+fwoZ?}(wA3#pqgxHI9p=bAQHTi& zz6tp>*uje{v7p-dHRq{ZTDJ`Ht%nL%U!K;h|9ye8af4trbt6)RV5 z*!XaBO9RzwSVHd!bjeyb-kT-&6k<%L(Ge`AXch1O%n0ga`f;A~8e5f}{1v!@l1`z? zH~iQqWdZFH-+Q{~u^>ocEYUB|U zw+Ye$xL%uPO|}K_T|rhCE}-fVHadS`(iS#{@Pr^=Gv?6oLG+L>%Kd({Em38ezgqWF zrG?AkCX-4~wg~NO!(uXhJmRp0`}u?H&VZDefAc= zLgplvlW~*(o?{aj7W7P;s39YX)rllJY46j*pw^4%qUI!)$z&1(f{Y9wxy@;OThM`fxR^`}a%ouxE44c+yCZ||@FrV@ z=SYQEssF;9;+2cK4N*jyrDE>sQL%&9=EFidznTYJ>=yM}My2d~N-UWOPjrtBoRK{2|iBWuQ}3t1_DQn`%0F7c1njA$Z@xCqx~!nqrarcUF|Dn%Fb)=PI+-Hx%&mmPeNif?=vdewR=hl263+3 z85OSx(k;=h-)B+@cBvjq9L=Glqq #include #include #include @@ -918,57 +917,6 @@ void Web::begin() { server.send(200, _encoding_json, g_content); } }); - /* - server.on("/pairShade", []() { - webServer.sendCORSHeaders(); - HTTPMethod method = server.method(); - if (method == HTTP_PUT || method == HTTP_POST) { - uint8_t shadeId = 255; - if (server.hasArg("plain")) { - // Its coming in the body. - DynamicJsonDocument doc(512); - DeserializationError err = deserializeJson(doc, server.arg("plain")); - if (err) { - switch (err.code()) { - case DeserializationError::InvalidInput: - server.send(500, _encoding_json, F("{\"status\":\"ERROR\",\"desc\":\"Invalid JSON payload\"}")); - break; - case DeserializationError::NoMemory: - server.send(500, _encoding_json, F("{\"status\":\"ERROR\",\"desc\":\"Out of memory parsing JSON\"}")); - break; - default: - server.send(500, _encoding_json, F("{\"status\":\"ERROR\",\"desc\":\"General JSON Deserialization failed\"}")); - break; - } - } - else { - JsonObject obj = doc.as(); - if (obj.containsKey("shadeId")) shadeId = obj["shadeId"]; - } - } - else if (server.hasArg("shadeId")) - shadeId = atoi(server.arg("shadeId").c_str()); - SomfyShade* shade = nullptr; - if (shadeId != 255) shade = somfy.getShadeById(shadeId); - if (!shade) { - server.send(500, _encoding_json, F("{\"status\":\"ERROR\",\"desc\":\"Shade not found to pair\"}")); - } - else { - //if(shade->bitLength == 56) - shade->sendCommand(somfy_commands::Prog, 4); - //else - // shade->sendCommand(somfy_commands::Prog, 1); - shade->paired = true; - shade->save(); - DynamicJsonDocument doc(512); - JsonObject obj = doc.to(); - shade->toJSON(obj); - serializeJson(doc, g_content); - server.send(200, _encoding_json, g_content); - } - } - }); - */ server.on("/unpairShade", []() { webServer.sendCORSHeaders(); HTTPMethod method = server.method(); diff --git a/data/index.html b/data/index.html index c3a8cab..b9b879e 100644 --- a/data/index.html +++ b/data/index.html @@ -3,10 +3,10 @@ - - + + - +
@@ -216,23 +216,25 @@