Mirrors/espurna
2
0
Fork 0
mirror of https://github.com/xoseperez/espurna.git synced 2026-03-04 23:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
267 Commits 23 Branches 75 Tags
2f12e66b79b2861fa0545fb80c210f8cb4199df5
Commit Graph

227 Commits

Author SHA1 Message Date
Toni Arte
2f12e66b79 Add a separate incremental energy counter into the Domoticz MQTT interface 2017-02-09 12:43:37 +02:00
Xose Pérez
7e94eac0b6 Merged in ToniAr/espurna/sonoff_th10_ota (pull request #8) 
OTA for Sonoff TH10/TH16

Approved-by: Xose Pérez
 2017-02-08 21:14:52 +00:00
Toni Arte
5899648d5e Add Domoticz 'Voltage' and 'Current' support for EMON #2 2017-02-07 12:45:54 +02:00
Toni Arte
bdd041432f Revert binary files 2017-02-07 12:43:36 +02:00
Toni Arte
62311440e8 Add Domoticz 'Voltage' and 'Current' support for EMON 2017-02-07 12:42:59 +02:00
Toni Arte
d448fb6707 Add Domoticz 'current' sensor capability to Sonoff POW 2017-02-07 11:09:30 +02:00
Toni Arte
29c5ece8c0 OTA for Sonoff TH10/TH16 2017-02-07 11:01:54 +02:00
Xose Pérez
e0ea7fef2c Version 1.6.0 2017-02-05 15:32:05 +01:00
Xose Pérez
97b43cd357 Small changes 2017-02-05 15:25:42 +01:00
Xose Pérez
6d86a7108a Map button events to actions 2017-02-05 13:39:22 +01:00
Xose Pérez
ad1b62776b Reporting energy incrementals (domoticz, MQTT). Removed energy API entry point 2017-02-05 11:40:13 +01:00
Xose Pérez
1e8991e132 Sending voltage to domoticz for HLW8012 2017-02-05 10:35:02 +01:00
Xose Pérez
5982955226 Changed some config default values 2017-02-05 10:33:57 +01:00
Xose Pérez
5ac123f5f1 Merge branch 'toggle-switch' into dev 2017-02-05 10:11:56 +01:00
Xose Pérez
5fc9c703fc Merge branch 'remote-reset' into dev 2017-02-05 10:11:49 +01:00
Xose Pérez
c311139832 Merge branch 'adc121' into dev 2017-02-05 10:11:34 +01:00
Xose Pérez
f7280c579c Merge branch 'master' into dev 2017-02-03 11:25:40 +01:00
Xose Pérez
7874aec20b Version bump 2017-02-03 11:10:51 +01:00
Xose Pérez
ae11c5ea81 Issue #50. Fix type bug in window variable when calculating energy for HLW8012 devices (Sonoff POW) 2017-02-03 11:09:36 +01:00
Xose Pérez
bd4a608144 Added RPC entry point to RESET the board 2017-02-03 11:07:09 +01:00
Xose Pérez
a1a774198c Added MQTT message to reset the board 2017-02-03 10:45:43 +01:00
Xose Pérez
399949da15 Added inline documentation to hardware.h file 2017-02-02 12:34:32 +01:00
Xose Pérez
c19d58685f Merge branch 'dev' into toggle-switch 2017-02-02 12:19:02 +01:00
Xose Pérez
1f7d367492 Update apparent power in web interface from emon module 2017-02-02 12:17:37 +01:00
Xose Pérez
cec57d2611 Check if MQTT message is from domoticz previous to parse it in relay module 2017-02-02 12:02:14 +01:00
Xose Pérez
5b2a7a34ec Do not bypass current clamp measurement if relay is off 2017-02-02 12:01:18 +01:00
Xose Pérez
d4e55677ec Merge branch 'dev' into adc121 
Conflicts:
	code/espurna/emon.ino
 2017-02-02 11:43:23 +01:00
Xose Pérez
7eeacd1596 Version bump. Changelog update. 2017-02-02 11:38:23 +01:00
Xose Pérez
24d0aa0b48 Issues #50 and #54. Fix domoticz sensor message format. Added energy calculation 2017-02-02 11:34:46 +01:00
Xose Pérez
5cd20644e3 Fix typo in index.html that made hidden fields show up in the web interface even if the module they were associated to was not enabled 2017-01-30 23:10:20 +01:00
Xose Pérez
5aa7415931 Version bump 2017-01-29 22:33:12 +01:00
Xose Pérez
6175a31a8a Fix bug in emon topic payload 2017-01-29 22:31:48 +01:00
Xose Pérez
12b405a73d Version bump and changelog update 2017-01-28 18:53:05 +01:00
Xose Pérez
9604385ae2 Merged in denisfrench/espurna/mqtt_relay (pull request #7) 
Add support for WiFi MQTT Relay / Thermostat from OpenEnergyMonitor
 2017-01-28 17:48:07 +00:00
denisfrench
61f487c1ea Remove FAUXMO build define switch from mqtt-relay environment 2017-01-28 19:44:40 +11:00
denisfrench
191c4e9d3f Manually copy-in hardware.h changes after rebase 2017-01-28 17:47:58 +11:00
denisfrench
786af765af Resolve messy rebase 2017-01-28 17:32:11 +11:00
denisfrench
20646803f1 Rename wifi-relay to mqtt-relay to deconfict with other hardware 2017-01-28 17:18:25 +11:00
denisfrench
7b924a73d2 Add #define RELAY1_PIN_INVERSE 0 to hardware.h 2017-01-28 17:17:10 +11:00
denisfrench
7e6cb25552 Add support for WiFi MQTT Relay / Thermostat from OpenEnergyMonitor here; https://guide.openenergymonitor.org/integrations/mqtt-relay/ 2017-01-28 17:17:10 +11:00
Xose Pérez
925af81e9b Changed fs build command to use local gulp instance 2017-01-23 11:50:52 +01:00
Xose Pérez
dd4e2037da I2C and ADC121 implementation 2017-01-22 23:47:58 +01:00
Xose Pérez
4e0e8038b1 Reset NTP connection from the JustWifi connection callback 2017-01-22 22:00:18 +01:00
Xose Pérez
9fa301e5be Write back relay bit mask if RELAY_MODE_TOOGLE 2017-01-22 20:19:12 +01:00
Xose Pérez
50915f0fb2 Support for toggle switches 2017-01-22 05:24:28 +01:00
Xose Pérez
dad097079d Version bump and changelog update 2017-01-21 19:49:19 +01:00
Xose Pérez
d140d45438 Merge branch 'revert-state' of https://bitbucket.org/phuonglm/espurna into revert-state 
Conflicts:
	code/espurna/data/index.html.gz
	code/espurna/relay.ino
 2017-01-21 19:38:36 +01:00
Ly Minh Phuong
c7e9074510 Enable revert state mode 2017-01-21 19:36:28 +01:00
Xose Pérez
758e32d1a8 Add new boards to build script 2017-01-21 18:26:57 +01:00
Xose Pérez
69c3f40761 Fix argument type in buttonMQTT for Sonoff Dual 2017-01-21 18:26:27 +01:00