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 1/9] 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); From 7fe281f379647d9e963e9c735d2e9b5f17765b7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xose=20P=C3=A9rez?= Date: Mon, 19 Dec 2016 13:05:55 +0100 Subject: [PATCH 2/9] Add config placeholder for Itead's 1CH inching module --- code/platformio.ini | 9 +++++++++ code/src/config/hardware.h | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/code/platformio.ini b/code/platformio.ini index edc8d1d4..d1aa66de 100644 --- a/code/platformio.ini +++ b/code/platformio.ini @@ -190,6 +190,15 @@ upload_speed = 115200 upload_port = "192.168.4.1" upload_flags = --auth=fibonacci --port 8266 +[env:1ch-inching-debug] +platform = espressif8266 +framework = arduino +board = esp01_1m +lib_deps = ${common.lib_deps} +lib_ignore = ${common.lib_ignore} +extra_script = pio_hooks.py +build_flags = -g -Wl,-Tesp8266.flash.1m128.ld -DDEBUG_PORT=Serial -DITEAD_1CH_INCHING + [env:electrodragon-debug] platform = espressif8266 framework = arduino diff --git a/code/src/config/hardware.h b/code/src/config/hardware.h index 249a21f6..e564cf32 100644 --- a/code/src/config/hardware.h +++ b/code/src/config/hardware.h @@ -113,6 +113,15 @@ #define LED_PIN 13 #define LED_PIN_INVERSE 0 +#elif defined(ITEAD_1CH_INCHING) + + #define MANUFACTURER "ITEAD" + #define DEVICE "1CH_INCHING" + #define BUTTON1_PIN 0 + #define RELAY1_PIN 12 + #define LED_PIN 13 + #define LED_PIN_INVERSE 0 + // ----------------------------------------------------------------------------- // Electrodragon boards // ----------------------------------------------------------------------------- From 26ae5a4dd49ac0b837747ed17f39e19019df1610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xose=20P=C3=A9rez?= Date: Mon, 19 Dec 2016 13:22:50 +0100 Subject: [PATCH 3/9] Prevent inching when manually switched back --- code/src/relay.ino | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/src/relay.ino b/code/src/relay.ino index fd751a25..99e6348f 100644 --- a/code/src/relay.ino +++ b/code/src/relay.ino @@ -71,8 +71,11 @@ void relayInching(unsigned char id) { if (relayInch == RELAY_INCHING_NONE) return; bool status = relayStatus(id); - if ((relayInch == RELAY_INCHING_ON) & (status)) return; - if ((relayInch == RELAY_INCHING_OFF) & (!status)) return; + bool inchingStatus = (relayInch == RELAY_INCHING_ON); + if (inchingStatus == status) { + inching.detach(); + return; + } inching.attach( getSetting("relayInchTime", String(RELAY_INCHING_TIME)).toInt(), @@ -116,7 +119,7 @@ bool relayStatus(unsigned char id, bool status, bool report) { if (report) relayMQTT(id); if (!recursive) relayWS(); return changed; - + } void relaySync(unsigned char id) { From 9e00de6b6f842a27ac47ca8270c29cf8b639f1d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xose=20P=C3=A9rez?= Date: Tue, 20 Dec 2016 01:11:58 +0100 Subject: [PATCH 4/9] Support for hardware inching button --- code/src/button.ino | 13 +++++++++++++ code/src/config/hardware.h | 2 ++ code/src/web.ino | 5 +++++ 3 files changed, 20 insertions(+) diff --git a/code/src/button.ino b/code/src/button.ino index baaaca41..85c0ce9d 100644 --- a/code/src/button.ino +++ b/code/src/button.ino @@ -77,6 +77,10 @@ void buttonSetup() { _buttons.push_back(new DebounceEvent(BUTTON4_PIN)); #endif + #ifdef ITEAD_1CH_INCHING + pinMode(LED_INCHING, OUTPUT); + #endif + DEBUG_MSG("[BUTTON] Number of buttons: %d\n", _buttons.size()); } @@ -91,6 +95,15 @@ void buttonLoop() { if (event == EVENT_DOUBLE_CLICK) createAP(); if (event == EVENT_LONG_CLICK) ESP.reset(); } + #ifdef ITEAD_1CH_INCHING + if (i == 1) { + byte relayInch = getSetting("relayInch", String(RELAY_INCHING)).toInt(); + relayInch = (relayInch == RELAY_INCHING_NONE) ? RELAY_INCHING_OFF : RELAY_INCHING_NONE; + setSetting("relayInch", String(relayInch)); + digitalWrite(LED_INCHING, relayInch != RELAY_INCHING_NONE); + continue; + } + #endif if (event == EVENT_SINGLE_CLICK) relayToggle(i); } } diff --git a/code/src/config/hardware.h b/code/src/config/hardware.h index e564cf32..c44555e9 100644 --- a/code/src/config/hardware.h +++ b/code/src/config/hardware.h @@ -118,9 +118,11 @@ #define MANUFACTURER "ITEAD" #define DEVICE "1CH_INCHING" #define BUTTON1_PIN 0 + #define BUTTON2_PIN 9 #define RELAY1_PIN 12 #define LED_PIN 13 #define LED_PIN_INVERSE 0 + #define LED_INCHING 5 // ----------------------------------------------------------------------------- // Electrodragon boards diff --git a/code/src/web.ino b/code/src/web.ino index 58fc5d94..cee4cc56 100644 --- a/code/src/web.ino +++ b/code/src/web.ino @@ -184,6 +184,11 @@ void _wsParse(uint32_t client_id, uint8_t * payload, size_t length) { setCurrentRatio(getSetting("emonRatio").toFloat()); #endif + #if ITEAD_1CH_INCHING + byte relayInch = getSetting("relayInch", String(RELAY_INCHING)).toInt(); + digitalWrite(LED_INCHING, relayInch != RELAY_INCHING_NONE); + #endif + // Check if we should reconfigure MQTT connection if (dirtyMQTT) { mqttDisconnect(); From 09fa28f28e3dca9ec87f135994b78e8f89d5d11d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xose=20P=C3=A9rez?= Date: Tue, 20 Dec 2016 01:19:38 +0100 Subject: [PATCH 5/9] Set inching LED initial state --- code/src/button.ino | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/src/button.ino b/code/src/button.ino index 85c0ce9d..7cc0f5bf 100644 --- a/code/src/button.ino +++ b/code/src/button.ino @@ -79,6 +79,8 @@ void buttonSetup() { #ifdef ITEAD_1CH_INCHING pinMode(LED_INCHING, OUTPUT); + byte relayInch = getSetting("relayInch", String(RELAY_INCHING)).toInt(); + digitalWrite(LED_INCHING, relayInch != RELAY_INCHING_NONE); #endif DEBUG_MSG("[BUTTON] Number of buttons: %d\n", _buttons.size()); @@ -99,7 +101,7 @@ void buttonLoop() { if (i == 1) { byte relayInch = getSetting("relayInch", String(RELAY_INCHING)).toInt(); relayInch = (relayInch == RELAY_INCHING_NONE) ? RELAY_INCHING_OFF : RELAY_INCHING_NONE; - setSetting("relayInch", String(relayInch)); + setSetting("relayInch", String() + relayInch); digitalWrite(LED_INCHING, relayInch != RELAY_INCHING_NONE); continue; } From 4a580376388d4feffda93a262ecec07ef4959c73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xose=20P=C3=A9rez?= Date: Tue, 27 Dec 2016 04:53:26 +0100 Subject: [PATCH 6/9] Set inching mode through MQTT --- code/src/button.ino | 5 +-- code/src/config/hardware.h | 8 ++--- code/src/relay.ino | 69 ++++++++++++++++++++++++++++++++------ 3 files changed, 63 insertions(+), 19 deletions(-) diff --git a/code/src/button.ino b/code/src/button.ino index 7cc0f5bf..529dfcfe 100644 --- a/code/src/button.ino +++ b/code/src/button.ino @@ -99,10 +99,7 @@ void buttonLoop() { } #ifdef ITEAD_1CH_INCHING if (i == 1) { - byte relayInch = getSetting("relayInch", String(RELAY_INCHING)).toInt(); - relayInch = (relayInch == RELAY_INCHING_NONE) ? RELAY_INCHING_OFF : RELAY_INCHING_NONE; - setSetting("relayInch", String() + relayInch); - digitalWrite(LED_INCHING, relayInch != RELAY_INCHING_NONE); + relayInchingToggle(); continue; } #endif diff --git a/code/src/config/hardware.h b/code/src/config/hardware.h index ace41432..a67a7261 100644 --- a/code/src/config/hardware.h +++ b/code/src/config/hardware.h @@ -136,11 +136,11 @@ #define MANUFACTURER "ITEAD" #define DEVICE "1CH_INCHING" #define BUTTON1_PIN 0 - #define BUTTON2_PIN 9 + #define BUTTON2_PIN 15 #define RELAY1_PIN 12 - #define LED_PIN 13 - #define LED_PIN_INVERSE 0 - #define LED_INCHING 5 + #define LED1_PIN 13 + #define LED1_PIN_INVERSE 0 + #define LED_INCHING 14 // ----------------------------------------------------------------------------- // Electrodragon boards diff --git a/code/src/relay.ino b/code/src/relay.ino index 5042eab7..1396f172 100644 --- a/code/src/relay.ino +++ b/code/src/relay.ino @@ -69,9 +69,9 @@ void relayInchingBack(unsigned char id) { inching.detach(); } -void relayInching(unsigned char id) { +void relayInchingStart(unsigned char id) { - byte relayInch = getSetting("relayInch", String(RELAY_INCHING)).toInt(); + byte relayInch = getSetting("relayInch", RELAY_INCHING).toInt(); if (relayInch == RELAY_INCHING_NONE) return; bool status = relayStatus(id); @@ -82,13 +82,53 @@ void relayInching(unsigned char id) { } inching.attach( - getSetting("relayInchTime", String(RELAY_INCHING_TIME)).toInt(), + getSetting("relayInchTime", RELAY_INCHING_TIME).toInt(), relayInchingBack, id ); } +unsigned int relayInching() { + unsigned int relayInch = getSetting("relayInch", RELAY_INCHING).toInt(); + return relayInch; +} + +void relayInching(unsigned int relayInch, bool report) { + + setSetting("relayInch", relayInch); + + /* + if (report) { + String mqttGetter = getSetting("mqttGetter", MQTT_USE_GETTER); + char topic[strlen(MQTT_RELAY_TOPIC) + mqttGetter.length() + 10]; + sprintf(topic, "%s/inching%s", MQTT_RELAY_TOPIC, mqttGetter.c_str()); + char value[2]; + sprintf(value, "%d", relayInch); + mqttSend(topic, value); + } + */ + + char message[20]; + sprintf(message, "{\"relayInch\": %d}", relayInch); + wsSend(message); + + #ifdef LED_INCHING + digitalWrite(LED_INCHING, relayInch != RELAY_INCHING_NONE); + #endif + +} + +void relayInching(unsigned int relayInch) { + relayInching(relayInch, true); +} + +void relayInchingToggle() { + unsigned int relayInch = relayInching(); + relayInch = (relayInch == RELAY_INCHING_NONE) ? RELAY_INCHING_OFF : RELAY_INCHING_NONE; + relayInching(relayInch); +} + bool relayStatus(unsigned char id, bool status, bool report) { if (id >= _relays.size()) return false; @@ -115,7 +155,7 @@ bool relayStatus(unsigned char id, bool status, bool report) { #endif if (!recursive) { - relayInching(id); + relayInchingStart(id); relaySync(id); relaySave(); } @@ -209,10 +249,16 @@ void relayMQTTCallback(unsigned int type, const char * topic, const char * paylo bool sameSetGet = mqttGetter.compareTo(mqttSetter) == 0; if (type == MQTT_CONNECT_EVENT) { + relayMQTT(); - char buffer[strlen(MQTT_RELAY_TOPIC) + mqttSetter.length() + 3]; + char buffer[strlen(MQTT_RELAY_TOPIC) + mqttSetter.length() + 10]; + sprintf(buffer, "%s/+%s", MQTT_RELAY_TOPIC, mqttSetter.c_str()); mqttSubscribe(buffer); + + sprintf(buffer, "%s/inching%s", MQTT_RELAY_TOPIC, mqttSetter.c_str()); + mqttSubscribe(buffer); + } if (type == MQTT_MESSAGE_EVENT) { @@ -222,11 +268,13 @@ void relayMQTTCallback(unsigned int type, const char * topic, const char * paylo if (!t.startsWith(MQTT_RELAY_TOPIC)) return; if (!t.endsWith(mqttSetter)) return; - // If relayMode is not SAME avoid responding to a retained message - if (sameSetGet && isFirstMessage) { - isFirstMessage = false; - byte relayMode = getSetting("relayMode", RELAY_MODE).toInt(); - if (relayMode != RELAY_MODE_SAME) return; + // Get value + unsigned int value = (char)payload[0] - '0'; + + // Inching topic + if (t.indexOf("inching") > 0) { + relayInching(value, !sameSetGet); + return; } // Get relay ID @@ -234,7 +282,6 @@ void relayMQTTCallback(unsigned int type, const char * topic, const char * paylo if (relayID >= relayCount()) relayID = 0; // Action to perform - unsigned int value = (char)payload[0] - '0'; if (value == 2) { relayToggle(relayID); } else { From e2cb9fcaa0fe73abe2a36d532e8f9355ce590f29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xose=20P=C3=A9rez?= Date: Wed, 11 Jan 2017 13:52:51 +0100 Subject: [PATCH 7/9] Rename inching to pulse --- code/espurna/button.ino | 10 ++--- code/espurna/config/general.h | 14 +++---- code/espurna/config/hardware.h | 6 ++- code/espurna/data/index.html.gz | Bin 3250 -> 3418 bytes code/espurna/relay.ino | 66 ++++++++++++++++---------------- code/espurna/web.ino | 8 ++-- code/html/index.html | 14 +++---- 7 files changed, 61 insertions(+), 57 deletions(-) diff --git a/code/espurna/button.ino b/code/espurna/button.ino index 529dfcfe..1d39a35f 100644 --- a/code/espurna/button.ino +++ b/code/espurna/button.ino @@ -77,10 +77,10 @@ void buttonSetup() { _buttons.push_back(new DebounceEvent(BUTTON4_PIN)); #endif - #ifdef ITEAD_1CH_INCHING - pinMode(LED_INCHING, OUTPUT); - byte relayInch = getSetting("relayInch", String(RELAY_INCHING)).toInt(); - digitalWrite(LED_INCHING, relayInch != RELAY_INCHING_NONE); + #ifdef LED_PULSE + pinMode(LED_PULSE, OUTPUT); + byte relayPulseMode = getSetting("relayPulseMode", String(RELAY_PULSE_MODE)).toInt(); + digitalWrite(LED_PULSE, relayPulseMode != RELAY_PULSE_NONE); #endif DEBUG_MSG("[BUTTON] Number of buttons: %d\n", _buttons.size()); @@ -99,7 +99,7 @@ void buttonLoop() { } #ifdef ITEAD_1CH_INCHING if (i == 1) { - relayInchingToggle(); + relayPulseToggle(); continue; } #endif diff --git a/code/espurna/config/general.h b/code/espurna/config/general.h index c8d0fdad..7b23d978 100644 --- a/code/espurna/config/general.h +++ b/code/espurna/config/general.h @@ -20,12 +20,12 @@ #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 +#define RELAY_PULSE_NONE 0 +#define RELAY_PULSE_OFF 1 +#define RELAY_PULSE_ON 2 -// Inching time in seconds -#define RELAY_INCHING_TIME 1 +// Pulse time in seconds +#define RELAY_PULSE_TIME 1 // 0 means OFF, 1 ON and 2 whatever was before #define RELAY_MODE RELAY_MODE_OFF @@ -33,8 +33,8 @@ // 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 +// 0 means no pulses, 1 means normally off, 2 normally on +#define RELAY_PULSE_MODE RELAY_PULSE_NONE //-------------------------------------------------------------------------------- // LED diff --git a/code/espurna/config/hardware.h b/code/espurna/config/hardware.h index f5f67cf8..289bfac5 100644 --- a/code/espurna/config/hardware.h +++ b/code/espurna/config/hardware.h @@ -158,6 +158,10 @@ #elif defined(ITEAD_1CH_INCHING) + // Note: definitions for this board are based on third party data + // and have not been fully tested yet. If you have the chance to + // test them, please report back. Thank you. + #define MANUFACTURER "ITEAD" #define DEVICE "1CH_INCHING" #define BUTTON1_PIN 0 @@ -165,7 +169,7 @@ #define RELAY1_PIN 12 #define LED1_PIN 13 #define LED1_PIN_INVERSE 0 - #define LED_INCHING 14 + #define LED_PULSE 14 // ----------------------------------------------------------------------------- // Electrodragon boards diff --git a/code/espurna/data/index.html.gz b/code/espurna/data/index.html.gz index 2e18235ddda36ee699d17020c779c5483490db45..006c0967a57cc1b4832a78d2d090ab9e2adb5772 100644 GIT binary patch literal 3418 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 diff --git a/code/espurna/relay.ino b/code/espurna/relay.ino index 9e896cab..cf8eeb29 100644 --- a/code/espurna/relay.ino +++ b/code/espurna/relay.ino @@ -21,7 +21,7 @@ bool recursive = false; #ifdef SONOFF_DUAL unsigned char dualRelayStatus = 0; #endif -Ticker inching; +Ticker pulseTicker; // ----------------------------------------------------------------------------- // RELAY @@ -69,69 +69,69 @@ bool relayStatus(unsigned char id) { #endif } -void relayInchingBack(unsigned char id) { +void relayPulseBack(unsigned char id) { relayToggle(id); - inching.detach(); + pulseTicker.detach(); } -void relayInchingStart(unsigned char id) { +void relayPulseStart(unsigned char id) { - byte relayInch = getSetting("relayInch", RELAY_INCHING).toInt(); - if (relayInch == RELAY_INCHING_NONE) return; + byte relayPulseMode = getSetting("relayPulseMode", RELAY_PULSE_MODE).toInt(); + if (relayPulseMode == RELAY_PULSE_NONE) return; bool status = relayStatus(id); - bool inchingStatus = (relayInch == RELAY_INCHING_ON); - if (inchingStatus == status) { - inching.detach(); + bool pulseStatus = (relayPulseMode == RELAY_PULSE_ON); + if (pulseStatus == status) { + pulseTicker.detach(); return; } - inching.attach( - getSetting("relayInchTime", RELAY_INCHING_TIME).toInt(), - relayInchingBack, + pulseTicker.attach( + getSetting("relayPulseTime", RELAY_PULSE_TIME).toInt(), + relayPulseBack, id ); } -unsigned int relayInching() { - unsigned int relayInch = getSetting("relayInch", RELAY_INCHING).toInt(); - return relayInch; +unsigned int relayPulseMode() { + unsigned int value = getSetting("relayPulseMode", RELAY_PULSE_MODE).toInt(); + return value; } -void relayInching(unsigned int relayInch, bool report) { +void relayPulseMode(unsigned int value, bool report) { - setSetting("relayInch", relayInch); + setSetting("relayPulseMode", value); /* if (report) { String mqttGetter = getSetting("mqttGetter", MQTT_USE_GETTER); char topic[strlen(MQTT_RELAY_TOPIC) + mqttGetter.length() + 10]; - sprintf(topic, "%s/inching%s", MQTT_RELAY_TOPIC, mqttGetter.c_str()); + sprintf(topic, "%s/pulse%s", MQTT_RELAY_TOPIC, mqttGetter.c_str()); char value[2]; - sprintf(value, "%d", relayInch); + sprintf(value, "%d", value); mqttSend(topic, value); } */ char message[20]; - sprintf(message, "{\"relayInch\": %d}", relayInch); + sprintf(message, "{\"relayPulseMode\": %d}", value); wsSend(message); - #ifdef LED_INCHING - digitalWrite(LED_INCHING, relayInch != RELAY_INCHING_NONE); + #ifdef LED_PULSE + digitalWrite(LED_PULSE, relayPulseMode != RELAY_PULSE_NONE); #endif } -void relayInching(unsigned int relayInch) { - relayInching(relayInch, true); +void relayPulseMode(unsigned int value) { + relayPulseMode(value, true); } -void relayInchingToggle() { - unsigned int relayInch = relayInching(); - relayInch = (relayInch == RELAY_INCHING_NONE) ? RELAY_INCHING_OFF : RELAY_INCHING_NONE; - relayInching(relayInch); +void relayPulseToggle() { + unsigned int value = relayPulseMode(); + value = (value == RELAY_PULSE_NONE) ? RELAY_PULSE_OFF : RELAY_PULSE_NONE; + relayPulseMode(value); } bool relayStatus(unsigned char id, bool status, bool report) { @@ -160,7 +160,7 @@ bool relayStatus(unsigned char id, bool status, bool report) { #endif if (!recursive) { - relayInchingStart(id); + relayPulseStart(id); relaySync(id); relaySave(); } @@ -263,7 +263,7 @@ void relayMQTTCallback(unsigned int type, const char * topic, const char * paylo sprintf(buffer, "%s/+%s", MQTT_RELAY_TOPIC, mqttSetter.c_str()); mqttSubscribe(buffer); - sprintf(buffer, "%s/inching%s", MQTT_RELAY_TOPIC, mqttSetter.c_str()); + sprintf(buffer, "%s/pulse%s", MQTT_RELAY_TOPIC, mqttSetter.c_str()); mqttSubscribe(buffer); } @@ -278,9 +278,9 @@ void relayMQTTCallback(unsigned int type, const char * topic, const char * paylo // Get value unsigned int value = (char)payload[0] - '0'; - // Inching topic - if (t.indexOf("inching") > 0) { - relayInching(value, !sameSetGet); + // Pulse topic + if (t.indexOf("pulse") > 0) { + relayPulseMode(value, !sameSetGet); return; } diff --git a/code/espurna/web.ino b/code/espurna/web.ino index 151deb7d..bb2df58f 100644 --- a/code/espurna/web.ino +++ b/code/espurna/web.ino @@ -237,8 +237,8 @@ void _wsParse(uint32_t client_id, uint8_t * payload, size_t length) { #endif #if ITEAD_1CH_INCHING - byte relayInch = getSetting("relayInch", String(RELAY_INCHING)).toInt(); - digitalWrite(LED_INCHING, relayInch != RELAY_INCHING_NONE); + byte relayPulseMode = getSetting("relayPulseMode", String(RELAY_PULSE_MODE)).toInt(); + digitalWrite(LED_PULSE, relayPulseMode != RELAY_PULSE_NONE); #endif // Check if we should reconfigure MQTT connection @@ -291,8 +291,8 @@ void _wsStart(uint32_t client_id) { relay.add(relayStatus(relayID)); } root["relayMode"] = getSetting("relayMode", RELAY_MODE); - root["relayInch"] = getSetting("relayInch", RELAY_INCHING); - root["relayInchTime"] = getSetting("relayInchTime", RELAY_INCHING_TIME); + root["relayPulseMode"] = getSetting("relayPulseMode", RELAY_PULSE_MODE); + root["relayPulseTime"] = getSetting("relayPulseTime", RELAY_PULSE_TIME); if (relayCount() > 1) { root["multirelayVisible"] = 1; root["relaySync"] = getSetting("relaySync", RELAY_SYNC); diff --git a/code/html/index.html b/code/html/index.html index 82ab1ba9..48b1b969 100644 --- a/code/html/index.html +++ b/code/html/index.html @@ -197,23 +197,23 @@

- +
- +
 
-
When inching enable the relay will automatically switch back to its normal state after the inching time (below).
+
When pulse mode is enabled the relay will automatically switch back to its normal state after the pulse time (below).
- - + +
 
-
Inching time in seconds.
+
Pulse time in seconds.
From 17f1e09b869b3364f9ddc4770bdbca5b3e06c6e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xose=20P=C3=A9rez?= Date: Wed, 11 Jan 2017 13:58:24 +0100 Subject: [PATCH 8/9] Rename relayPulseStart to relayPulse --- code/espurna/relay.ino | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/espurna/relay.ino b/code/espurna/relay.ino index cf8eeb29..3fe65617 100644 --- a/code/espurna/relay.ino +++ b/code/espurna/relay.ino @@ -74,7 +74,7 @@ void relayPulseBack(unsigned char id) { pulseTicker.detach(); } -void relayPulseStart(unsigned char id) { +void relayPulse(unsigned char id) { byte relayPulseMode = getSetting("relayPulseMode", RELAY_PULSE_MODE).toInt(); if (relayPulseMode == RELAY_PULSE_NONE) return; @@ -160,7 +160,7 @@ bool relayStatus(unsigned char id, bool status, bool report) { #endif if (!recursive) { - relayPulseStart(id); + relayPulse(id); relaySync(id); relaySave(); } From e5b1352d4191a5a5e2024470cf7dde280fdf4a67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xose=20P=C3=A9rez?= Date: Fri, 20 Jan 2017 14:41:14 +0100 Subject: [PATCH 9/9] Added missing configuration values to 1ch-inching board --- code/espurna/config/hardware.h | 3 +++ code/espurna/data/index.html.gz | Bin 3714 -> 3716 bytes code/espurna/relay.ino | 2 +- code/html/index.html | 10 +++++----- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/code/espurna/config/hardware.h b/code/espurna/config/hardware.h index 71ddf4f7..2d0dd5f2 100644 --- a/code/espurna/config/hardware.h +++ b/code/espurna/config/hardware.h @@ -146,8 +146,11 @@ #define MANUFACTURER "ITEAD" #define DEVICE "1CH_INCHING" #define BUTTON1_PIN 0 + #define BUTTON1_RELAY 1 #define BUTTON2_PIN 15 + #define BUTTON2_RELAY 0 #define RELAY1_PIN 12 + #define RELAY1_PIN_INVERSE 0 #define LED1_PIN 13 #define LED1_PIN_INVERSE 0 #define LED_PULSE 14 diff --git a/code/espurna/data/index.html.gz b/code/espurna/data/index.html.gz index 64b44bfd24a0dbfeedfc689f0cabd679e90079e9..bde3ff451a0fbb148705fc21c8609ff56df87187 100644 GIT binary patch literal 3716 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 literal 3714 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 diff --git a/code/espurna/relay.ino b/code/espurna/relay.ino index dfdcffeb..f6cddb25 100644 --- a/code/espurna/relay.ino +++ b/code/espurna/relay.ino @@ -118,7 +118,7 @@ void relayPulseMode(unsigned int value, bool report) { wsSend(message); #ifdef LED_PULSE - digitalWrite(LED_PULSE, relayPulseMode != RELAY_PULSE_NONE); + digitalWrite(LED_PULSE, value != RELAY_PULSE_NONE); #endif } diff --git a/code/html/index.html b/code/html/index.html index defd5d43..fcbfb0d9 100644 --- a/code/html/index.html +++ b/code/html/index.html @@ -197,7 +197,7 @@
-