Browse Source
Merge branch 'dev' into ssl
Conflicts: code/espurna/static/index.html.gz.h code/espurna/web.inofastled
Xose Pérez
7 years ago
21 changed files with 5031 additions and 3447 deletions
Split View
Diff Options
-
+1 -0code/espurna/config/arduino.h
-
+1 -1code/espurna/config/debug.h
-
+45 -27code/espurna/config/general.h
-
+60 -23code/espurna/config/hardware.h
-
BINcode/espurna/data/index.html.gz
-
+15 -7code/espurna/espurna.ino
-
+38 -24code/espurna/hardware.ino
-
+436 -182code/espurna/light.ino
-
+58 -45code/espurna/mqtt.ino
-
+1 -1code/espurna/ota.ino
-
+27 -9code/espurna/relay.ino
-
+307 -0code/espurna/rfbridge.ino
-
+79 -7code/espurna/settings.ino
-
+3505 -3036code/espurna/static/index.html.gz.h
-
+89 -51code/espurna/web.ino
-
+37 -3code/html/custom.css
-
+169 -9code/html/custom.js
-
+115 -20code/html/index.html
-
+1 -0code/html/nouislider.min.css
-
+3 -0code/html/nouislider.min.js
-
+44 -2code/platformio.ini
+ 1
- 0
code/espurna/config/arduino.h
View File
+ 1
- 1
code/espurna/config/debug.h
View File
+ 45
- 27
code/espurna/config/general.h
View File
+ 60
- 23
code/espurna/config/hardware.h
View File
BIN
code/espurna/data/index.html.gz
View File
+ 15
- 7
code/espurna/espurna.ino
View File
+ 38
- 24
code/espurna/hardware.ino
View File
+ 436
- 182
code/espurna/light.ino
View File
+ 58
- 45
code/espurna/mqtt.ino
View File
+ 1
- 1
code/espurna/ota.ino
View File
+ 27
- 9
code/espurna/relay.ino
View File
+ 307
- 0
code/espurna/rfbridge.ino
View File
| @ -0,0 +1,307 @@ | |||
| /* | |||
| ITEAD RF BRIDGE MODULE | |||
| Copyright (C) 2017 by Xose Pérez <xose dot perez at gmail dot com> | |||
| */ | |||
| #ifdef SONOFF_RFBRIDGE | |||
| // ----------------------------------------------------------------------------- | |||
| // DEFINITIONS | |||
| // ----------------------------------------------------------------------------- | |||
| #define RF_MESSAGE_SIZE 9 | |||
| #define RF_CODE_START 0xAA | |||
| #define RF_CODE_ACK 0xA0 | |||
| #define RF_CODE_LEARN 0xA1 | |||
| #define RF_CODE_LEARN_KO 0xA2 | |||
| #define RF_CODE_LEARN_OK 0xA3 | |||
| #define RF_CODE_RFIN 0xA4 | |||
| #define RF_CODE_RFOUT 0xA5 | |||
| #define RF_CODE_STOP 0x55 | |||
| // ----------------------------------------------------------------------------- | |||
| // GLOBALS TO THE MODULE | |||
| // ----------------------------------------------------------------------------- | |||
| unsigned char _uartbuf[RF_MESSAGE_SIZE+3] = {0}; | |||
| unsigned char _uartpos = 0; | |||
| unsigned char _learnId = 0; | |||
| bool _learnStatus = true; | |||
| bool _rfbin = false; | |||
| // ----------------------------------------------------------------------------- | |||
| // PRIVATES | |||
| // ----------------------------------------------------------------------------- | |||
| void _rfbAck() { | |||
| DEBUG_MSG_P(PSTR("[RFBRIDGE] Sending ACK\n")); | |||
| Serial.println(); | |||
| Serial.write(RF_CODE_START); | |||
| Serial.write(RF_CODE_ACK); | |||
| Serial.write(RF_CODE_STOP); | |||
| Serial.flush(); | |||
| Serial.println(); | |||
| } | |||
| void _rfbLearn() { | |||
| DEBUG_MSG_P(PSTR("[RFBRIDGE] Sending LEARN\n")); | |||
| Serial.println(); | |||
| Serial.write(RF_CODE_START); | |||
| Serial.write(RF_CODE_LEARN); | |||
| Serial.write(RF_CODE_STOP); | |||
| Serial.flush(); | |||
| Serial.println(); | |||
| char wsb[100]; | |||
| sprintf_P(wsb, PSTR("{\"action\": \"rfbLearn\", \"data\":{\"id\": %d, \"status\": %d}}"), _learnId, _learnStatus ? 1 : 0); | |||
| wsSend(wsb); | |||
| } | |||
| void _rfbSend(byte * message) { | |||
| Serial.println(); | |||
| Serial.write(RF_CODE_START); | |||
| Serial.write(RF_CODE_RFOUT); | |||
| for (unsigned char j=0; j<RF_MESSAGE_SIZE; j++) { | |||
| Serial.write(message[j]); | |||
| } | |||
| Serial.write(RF_CODE_STOP); | |||
| Serial.flush(); | |||
| Serial.println(); | |||
| } | |||
| void _rfbSend(byte * message, int times) { | |||
| char buffer[RF_MESSAGE_SIZE]; | |||
| _rfbToChar(message, buffer); | |||
| DEBUG_MSG_P(PSTR("[RFBRIDGE] Sending MESSAGE '%s' %d time(s)\n"), buffer, times); | |||
| for (int i=0; i<times; i++) { | |||
| if (i>0) { | |||
| unsigned long start = millis(); | |||
| while (millis() - start < RF_SEND_DELAY) delay(1); | |||
| } | |||
| _rfbSend(message); | |||
| } | |||
| } | |||
| void _rfbDecode() { | |||
| byte action = _uartbuf[0]; | |||
| char buffer[RF_MESSAGE_SIZE * 2 + 1] = {0}; | |||
| DEBUG_MSG_P(PSTR("[RFBRIDGE] Action 0x%02X\n"), action); | |||
| if (action == RF_CODE_LEARN_KO) { | |||
| _rfbAck(); | |||
| DEBUG_MSG_P(PSTR("[RFBRIDGE] Learn timeout\n")); | |||
| wsSend("{\"action\": \"rfbTimeout\"}"); | |||
| } | |||
| if (action == RF_CODE_LEARN_OK || action == RF_CODE_RFIN) { | |||
| _rfbToChar(&_uartbuf[1], buffer); | |||
| mqttSend(MQTT_TOPIC_RFIN, buffer); | |||
| _rfbAck(); | |||
| } | |||
| if (action == RF_CODE_LEARN_OK) { | |||
| DEBUG_MSG_P(PSTR("[RFBRIDGE] Learn success\n")); | |||
| rfbStore(_learnId, _learnStatus, buffer); | |||
| // Websocket update | |||
| char wsb[100]; | |||
| sprintf_P(wsb, PSTR("{\"rfb\":[{\"id\": %d, \"status\": %d, \"data\": \"%s\"}]}"), _learnId, _learnStatus ? 1 : 0, buffer); | |||
| wsSend(wsb); | |||
| } | |||
| if (action == RF_CODE_RFIN) { | |||
| DEBUG_MSG_P(PSTR("[RFBRIDGE] Forward message '%s'\n"), buffer); | |||
| // Look for the code | |||
| unsigned char id, status; | |||
| bool found = false; | |||
| for (id=0; id<relayCount(); id++) { | |||
| for (status=0; status<2; status++) { | |||
| String code = rfbRetrieve(id, status == 1); | |||
| if (code.length()) { | |||
| if (code.endsWith(&buffer[12])) { | |||
| found = true; | |||
| break; | |||
| } | |||
| } | |||
| } | |||
| if (found) break; | |||
| } | |||
| if (found) { | |||
| _rfbin = true; | |||
| relayStatus(id, status == 1); | |||
| } | |||
| } | |||
| } | |||
| void _rfbReceive() { | |||
| static bool receiving = false; | |||
| while (Serial.available()) { | |||
| yield(); | |||
| byte c = Serial.read(); | |||
| //DEBUG_MSG_P(PSTR("[RFBRIDGE] Received 0x%02X\n"), c); | |||
| if (receiving) { | |||
| if (c == RF_CODE_STOP) { | |||
| _rfbDecode(); | |||
| receiving = false; | |||
| } else { | |||
| _uartbuf[_uartpos++] = c; | |||
| } | |||
| } else if (c == RF_CODE_START) { | |||
| _uartpos = 0; | |||
| receiving = true; | |||
| } | |||
| } | |||
| } | |||
| bool _rfbCompare(const char * code1, const char * code2) { | |||
| return strcmp(&code1[12], &code2[12]) == 0; | |||
| } | |||
| bool _rfbSameOnOff(unsigned char id) { | |||
| return _rfbCompare(rfbRetrieve(id, true).c_str(), rfbRetrieve(id, false).c_str()); | |||
| } | |||
| /* | |||
| From an hexa char array ("A220EE...") to a byte array (half the size) | |||
| */ | |||
| bool _rfbToArray(const char * in, byte * out) { | |||
| if (strlen(in) != RF_MESSAGE_SIZE * 2) return false; | |||
| char tmp[3] = {0}; | |||
| for (unsigned char p = 0; p<RF_MESSAGE_SIZE; p++) { | |||
| memcpy(tmp, &in[p*2], 2); | |||
| out[p] = strtol(tmp, NULL, 16); | |||
| } | |||
| return true; | |||
| } | |||
| /* | |||
| From a byte array to an hexa char array ("A220EE...", double the size) | |||
| */ | |||
| bool _rfbToChar(byte * in, char * out) { | |||
| for (unsigned char p = 0; p<RF_MESSAGE_SIZE; p++) { | |||
| sprintf(&out[p*2], "%02X", in[p]); | |||
| } | |||
| return true; | |||
| } | |||
| void _rfbMqttCallback(unsigned int type, const char * topic, const char * payload) { | |||
| if (type == MQTT_CONNECT_EVENT) { | |||
| char buffer[strlen(MQTT_TOPIC_RFLEARN) + 3]; | |||
| sprintf(buffer, "%s/+", MQTT_TOPIC_RFLEARN); | |||
| mqttSubscribe(buffer); | |||
| mqttSubscribe(MQTT_TOPIC_RFOUT); | |||
| } | |||
| if (type == MQTT_MESSAGE_EVENT) { | |||
| // Match topic | |||
| String t = mqttSubtopic((char *) topic); | |||
| // Check if should go into learn mode | |||
| if (t.startsWith(MQTT_TOPIC_RFLEARN)) { | |||
| _learnId = t.substring(strlen(MQTT_TOPIC_RFLEARN)+1).toInt(); | |||
| if (_learnId >= relayCount()) { | |||
| DEBUG_MSG_P(PSTR("[RFBRIDGE] Wrong learnID (%d)\n"), _learnId); | |||
| return; | |||
| } | |||
| _learnStatus = (char)payload[0] != '0'; | |||
| _rfbLearn(); | |||
| } | |||
| if (t.equals(MQTT_TOPIC_RFOUT)) { | |||
| byte message[RF_MESSAGE_SIZE]; | |||
| if (_rfbToArray(payload, message)) { | |||
| _rfbSend(message, 1); | |||
| } | |||
| } | |||
| } | |||
| } | |||
| // ----------------------------------------------------------------------------- | |||
| // PUBLIC | |||
| // ----------------------------------------------------------------------------- | |||
| void rfbStore(unsigned char id, bool status, const char * code) { | |||
| DEBUG_MSG_P(PSTR("[RFBRIDGE] Storing %d-%s => '%s'\n"), id, status ? "ON" : "OFF", code); | |||
| char key[8] = {0}; | |||
| sprintf(key, "rfb%d%s", id, status ? "on" : "off"); | |||
| setSetting(key, code); | |||
| } | |||
| String rfbRetrieve(unsigned char id, bool status) { | |||
| char key[8] = {0}; | |||
| sprintf(key, "rfb%d%s", id, status ? "on" : "off"); | |||
| return getSetting(key); | |||
| } | |||
| void rfbStatus(unsigned char id, bool status) { | |||
| String value = rfbRetrieve(id, status); | |||
| if (value.length() > 0) { | |||
| bool same = _rfbSameOnOff(id); | |||
| byte message[RF_MESSAGE_SIZE]; | |||
| _rfbToArray(value.c_str(), message); | |||
| unsigned char times = RF_SEND_TIMES; | |||
| if (same) times = _rfbin ? 0 : 1; | |||
| _rfbSend(message, times); | |||
| } | |||
| } | |||
| void rfbLearn(unsigned char id, bool status) { | |||
| _learnId = id; | |||
| _learnStatus = status; | |||
| _rfbLearn(); | |||
| } | |||
| void rfbForget(unsigned char id, bool status) { | |||
| char key[8] = {0}; | |||
| sprintf(key, "rfb%d%s", id, status ? "on" : "off"); | |||
| delSetting(key); | |||
| // Websocket update | |||
| char wsb[100]; | |||
| sprintf_P(wsb, PSTR("{\"rfb\":[{\"id\": %d, \"status\": %d, \"data\": \"\"}]}"), id, status ? 1 : 0); | |||
| wsSend(wsb); | |||
| } | |||
| // ----------------------------------------------------------------------------- | |||
| // SETUP & LOOP | |||
| // ----------------------------------------------------------------------------- | |||
| void rfbSetup() { | |||
| mqttRegister(_rfbMqttCallback); | |||
| } | |||
| void rfbLoop() { | |||
| _rfbReceive(); | |||
| } | |||
| #endif | |||
+ 79
- 7
code/espurna/settings.ino
View File
+ 3505
- 3036
code/espurna/static/index.html.gz.h
File diff suppressed because it is too large
View File
+ 89
- 51
code/espurna/web.ino
View File
+ 37
- 3
code/html/custom.css
View File
+ 169
- 9
code/html/custom.js
View File
+ 115
- 20
code/html/index.html
View File
+ 1
- 0
code/html/nouislider.min.css
View File
| @ -0,0 +1 @@ | |||
| /*! nouislider - 10.0.0 - 2017-05-28 14:52:48 */.noUi-target,.noUi-target *{-webkit-touch-callout:none;-webkit-tap-highlight-color:transparent;-webkit-user-select:none;-ms-touch-action:none;touch-action:none;-ms-user-select:none;-moz-user-select:none;user-select:none;-moz-box-sizing:border-box;box-sizing:border-box}.noUi-target{position:relative;direction:ltr}.noUi-base{width:100%;height:100%;position:relative;z-index:1}.noUi-connect{position:absolute;right:0;top:0;left:0;bottom:0}.noUi-origin{position:absolute;height:0;width:0}.noUi-handle{position:relative;z-index:1}.noUi-state-tap .noUi-connect,.noUi-state-tap .noUi-origin{-webkit-transition:top .3s,right .3s,bottom .3s,left .3s;transition:top .3s,right .3s,bottom .3s,left .3s}.noUi-state-drag *{cursor:inherit!important}.noUi-base,.noUi-handle{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.noUi-horizontal{height:18px}.noUi-horizontal .noUi-handle{width:34px;height:28px;left:-17px;top:-6px}.noUi-vertical{width:18px}.noUi-vertical .noUi-handle{width:28px;height:34px;left:-6px;top:-17px}.noUi-target{background:#FAFAFA;border-radius:4px;border:1px solid #D3D3D3;box-shadow:inset 0 1px 1px #F0F0F0,0 3px 6px -5px #BBB}.noUi-connect{background:#3FB8AF;border-radius:4px;box-shadow:inset 0 0 3px rgba(51,51,51,.45);-webkit-transition:background 450ms;transition:background 450ms}.noUi-draggable{cursor:ew-resize}.noUi-vertical .noUi-draggable{cursor:ns-resize}.noUi-handle{border:1px solid #D9D9D9;border-radius:3px;background:#FFF;cursor:default;box-shadow:inset 0 0 1px #FFF,inset 0 1px 7px #EBEBEB,0 3px 6px -3px #BBB}.noUi-active{box-shadow:inset 0 0 1px #FFF,inset 0 1px 7px #DDD,0 3px 6px -3px #BBB}.noUi-handle:after,.noUi-handle:before{content:"";display:block;position:absolute;height:14px;width:1px;background:#E8E7E6;left:14px;top:6px}.noUi-handle:after{left:17px}.noUi-vertical .noUi-handle:after,.noUi-vertical .noUi-handle:before{width:14px;height:1px;left:6px;top:14px}.noUi-vertical .noUi-handle:after{top:17px}[disabled] .noUi-connect{background:#B8B8B8}[disabled] .noUi-handle,[disabled].noUi-handle,[disabled].noUi-target{cursor:not-allowed}.noUi-pips,.noUi-pips *{-moz-box-sizing:border-box;box-sizing:border-box}.noUi-pips{position:absolute;color:#999}.noUi-value{position:absolute;white-space:nowrap;text-align:center}.noUi-value-sub{color:#ccc;font-size:10px}.noUi-marker{position:absolute;background:#CCC}.noUi-marker-large,.noUi-marker-sub{background:#AAA}.noUi-pips-horizontal{padding:10px 0;height:80px;top:100%;left:0;width:100%}.noUi-value-horizontal{-webkit-transform:translate3d(-50%,50%,0);transform:translate3d(-50%,50%,0)}.noUi-marker-horizontal.noUi-marker{margin-left:-1px;width:2px;height:5px}.noUi-marker-horizontal.noUi-marker-sub{height:10px}.noUi-marker-horizontal.noUi-marker-large{height:15px}.noUi-pips-vertical{padding:0 10px;height:100%;top:0;left:100%}.noUi-value-vertical{-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0);padding-left:25px}.noUi-marker-vertical.noUi-marker{width:5px;height:2px;margin-top:-1px}.noUi-marker-vertical.noUi-marker-sub{width:10px}.noUi-marker-vertical.noUi-marker-large{width:15px}.noUi-tooltip{display:block;position:absolute;border:1px solid #D9D9D9;border-radius:3px;background:#fff;color:#000;padding:5px;text-align:center;white-space:nowrap}.noUi-horizontal .noUi-tooltip{-webkit-transform:translate(-50%,0);transform:translate(-50%,0);left:50%;bottom:120%}.noUi-vertical .noUi-tooltip{-webkit-transform:translate(0,-50%);transform:translate(0,-50%);top:50%;right:120%} | |||