From 4c06e7e280edd2163d30f01eb82d5c578bfa5e7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xose=20P=C3=A9rez?= Date: Mon, 19 Dec 2016 12:56:24 +0100 Subject: [PATCH] Added inching support --- code/data/index.html.gz | Bin 2579 -> 2753 bytes code/html/index.html | 24 ++++++++++++++++++++++-- code/src/config/general.h | 10 ++++++++++ code/src/relay.ino | 25 +++++++++++++++++++++++++ code/src/web.ino | 4 +++- 5 files changed, 60 insertions(+), 3 deletions(-) diff --git a/code/data/index.html.gz b/code/data/index.html.gz index d879c6416c1a747e0513785478c4c96b25875c19..42bf102c36f5c34bc5919cef235f24b59152e543 100644 GIT binary patch literal 2753 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 HBrpH~6-+(H literal 2579 zcmV+u3hebCiwFP!000001I=1}Z`-^P|08dK ziL&^FBK3%r9q*&<&waApk(6x7avjHUR|JS8iag#O?|%0p5B~J_)79kL-8D%}Dnx*p#ZxuoQ*3x9*28yuv}P!c9I*USuq!o;1|!Dt}3yeBym!$2o0H(_B2 z50wmvS!Qe)@RZJ2@1f(ylAOiEAf|JC?83jmla(}u$#c#Y84w8wyf#e2HVYn^WEe46 z!8-QgluK?n6&)Q?!G`B`9?ViOoiJv~&Fn}w)EegXoRCu$Ek}ch&k2u)fuKuO7(7_(kFbSiVUcsQ1SzhszI?u&d^^G>3m)@e^!4`U_6Wq&KMb7ehkr~ayNQ!j zMTKDg(#h0f@9kg>%Y)I~r?1zaR~z;UQ8V9^a@m;{#wdwyAA?V<9dAr|w04H1vmulUh2eQ=vuLDw%#pTuE)({?%OUcYa<=~nh-OZugmh_ItG0%e0?cJe# z0+k~keHEO@*y7>AHUI?29$EL{x)J#zy&pj6NearIurz~&1mTFB{P#asFAs(aOZOl_ z60@Hqi8+!ej_?nb@6a3>54X^-B{i+BM&{h0~Q& zMwqbheySdV+CC+GxUBXpXv_9`tK6uESyTP3&8Sc>cr&JRR?nPqG$4?+K(00ndI5og zHBp!tD!nUftV*7331U?W`3&(lx1gROk~tLx(>oHyr>B2uv}V5vNQDLmj_B_ihU=`c zn)V%{8-{G?l*@=c41@Dl6FX~gGx z+@*7bO9EAYPJCD=Cy6oHuf5(2VcwLYy_lIdUC8gLc-bX4Dt81x#Rdv>VibsT&j^cS zs8Ns_(TOTV1da*CLJn4&AO|sr%?!&S@nyh15AW@2co$R^PT-5)8w+{uuikxZ zyaGaFJV>g^lz~{lyPGg-yK%g3hnMFuuXhZBEFO0Vh!?S#OE~6)8fR@&X3y4@i$ult z$?A>J7|eiBc*3LDan_9}lorBpOJ;u~7%yd58i9uU=P&|G^9e@qQCSueCAoIh?}jb> zljVwlw<+lrr!Dx-*`{rLf+0IQm!mv{|5zO8l_y`!92u9yeAnvK%|OVgYnw* z$A#mP+Pc4995p0^qau@B8^~$EyGsrTgwz6@5#uQhL#DM0vkNv|i<>7fB`3dF62H7W z#c)Ze&K-NXh_H0O1){cXwZt9IQsmcM#TCmlGsXUlS3|Dw}}Wv)nAYpfqR zIN5}nYwKRf4JJP}*-4;SLbpQGgAtPu2EMd(W|6Z$plGT567+pa7|dbT6KBkzPc8sl znXhlUhr+!3FtZKf-3J>F@85j>R@PaJ6dAI0u@-v2@*7?j2)auqYv6*y8xV92e!#K8 z`9L_x`81zNDB=L?n4FoU``Dl%7!-`r=!WN@H(50<-RQn9>}|B>!dhchJ|1thnb!@u zPS4rgdg*pnx~Ze~C}Y~-1WhIw-L*%xeYiQV`Xf~923&Z}jj_&(eqM$4e=3Du>{ciM zLjDu$^VLtK&%b_0pHBce*Mr{%a_+-%`MI$IH$b`ppplX@*S(+S>K?!6`LT_52o_Zp z%0tm%gFS*>Lgma?xPbRzQWm;%PH_`UJcT3C(GT4efL6L@PPoxgtl{d99bS-$A%jPUlUvRE>^&!^uI#+mL^ zPIm%?vpo}k zo~(EbF%L?~GfZPCImaF)g-m!U6phNHH_O$WN4B~Jh5<mW67&6sk&a;M#PRG1&`+(p6{DGpMn<>X<{! z$2GTiP^w2cfcPnaWZg`mL_J+q%YaxK+iEyH<^mg18h?vaj(ft6CdLroBFzNs8uWM; zoWccSmZNN+{Mx`04SKPz27rx>*>;{-9$X*zA3JS}o&HBqW$>hePqE5!keG+RhZgcA
-
+
+ +
+ +
+
 
+
When inching enable the relay will automatically switch back to its normal state after the inching time (below).
+
+ +
+ + +
 
+
Inching time in seconds.
+
+
-
+
diff --git a/code/src/config/general.h b/code/src/config/general.h index 250ef440..bf261172 100644 --- a/code/src/config/general.h +++ b/code/src/config/general.h @@ -21,12 +21,22 @@ #define RELAY_SYNC_ONE 2 #define RELAY_SYNC_SAME 3 +#define RELAY_INCHING_NONE 0 +#define RELAY_INCHING_OFF 1 +#define RELAY_INCHING_ON 2 + +// Inching time in seconds +#define RELAY_INCHING_TIME 1 + // 0 means OFF, 1 ON and 2 whatever was before #define RELAY_MODE RELAY_MODE_OFF // 0 means ANY, 1 zero or one and 2 one and only one #define RELAY_SYNC RELAY_SYNC_ANY +// 0 means no inching, 1 means normally off, 2 normally on +#define RELAY_INCHING RELAY_INCHING_NONE + // ----------------------------------------------------------------------------- // WIFI & WEB // ----------------------------------------------------------------------------- diff --git a/code/src/relay.ino b/code/src/relay.ino index 77b7cb92..fd751a25 100644 --- a/code/src/relay.ino +++ b/code/src/relay.ino @@ -8,6 +8,7 @@ Copyright (C) 2016 by Xose Pérez */ #include +#include #include #include @@ -16,6 +17,7 @@ bool recursive = false; #ifdef SONOFF_DUAL unsigned char dualRelayStatus = 0; #endif +Ticker inching; // ----------------------------------------------------------------------------- // RELAY @@ -58,6 +60,28 @@ bool relayStatus(unsigned char id) { #endif } +void relayInchingBack(unsigned char id) { + relayToggle(id); + inching.detach(); +} + +void relayInching(unsigned char id) { + + byte relayInch = getSetting("relayInch", String(RELAY_INCHING)).toInt(); + if (relayInch == RELAY_INCHING_NONE) return; + + bool status = relayStatus(id); + if ((relayInch == RELAY_INCHING_ON) & (status)) return; + if ((relayInch == RELAY_INCHING_OFF) & (!status)) return; + + inching.attach( + getSetting("relayInchTime", String(RELAY_INCHING_TIME)).toInt(), + relayInchingBack, + id + ); + +} + bool relayStatus(unsigned char id, bool status, bool report) { bool changed = false; @@ -82,6 +106,7 @@ bool relayStatus(unsigned char id, bool status, bool report) { #endif if (!recursive) { + relayInching(id); relaySync(id); relaySave(); } diff --git a/code/src/web.ino b/code/src/web.ino index 5645a24b..58fc5d94 100644 --- a/code/src/web.ino +++ b/code/src/web.ino @@ -234,6 +234,8 @@ void _wsStart(uint32_t client_id) { relay.add(relayStatus(relayID)); } root["relayMode"] = getSetting("relayMode", String(RELAY_MODE)); + root["relayInch"] = getSetting("relayInch", String(RELAY_INCHING)); + root["relayInchTime"] = getSetting("relayInchTime", String(RELAY_INCHING_TIME)); if (relayCount() > 1) { root["multirelayVisible"] = 1; root["relaySync"] = getSetting("relaySync", String(RELAY_SYNC)); @@ -502,7 +504,7 @@ void webSetup() { char lastModified[50]; sprintf(lastModified, "%s %s GMT", __DATE__, __TIME__); server.serveStatic("/", SPIFFS, "/").setLastModified(lastModified); - + // 404 server.onNotFound([](AsyncWebServerRequest *request){ request->send(404);