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

201 Commits

Author SHA1 Message Date
Xose Pérez
c19d58685f Merge branch 'dev' into toggle-switch 2017-02-02 12:19:02 +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
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
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
Xose Pérez
4890de1638 Merge branch 'inching' into dev 
Conflicts:
	code/espurna/data/index.html.gz
 2017-01-21 17:03:11 +01:00
Xose Pérez
6a368266fb Fix rare bug... 2017-01-21 17:02:38 +01:00
Xose Pérez
b32fa7f723 Merge branch 'apis' into dev 
Conflicts:
	code/espurna/data/index.html.gz
	code/espurna/pow.ino
	code/html/index.html
 2017-01-21 16:59:38 +01:00
Xose Pérez
7e51b031f6 Fix MQTT will topic 2017-01-21 15:38:38 +01:00
Xose Pérez
42da95ad7f Issue #41. Adding password requirements to initial password page 2017-01-21 15:19:32 +01:00
Ly Minh Phuong
db51756bf5 Enable revert state mode 2017-01-21 21:16:36 +07:00
Xose Pérez
f4a59468e0 Ensure hlw8012 interrupts are not working while no wifi connection (either STA or AP) 2017-01-20 23:31:02 +01:00
Xose Pérez
e5b1352d41 Added missing configuration values to 1ch-inching board 2017-01-20 14:41:14 +01:00
Xose Pérez
44ffb3fe6c Merge branch 'dev' into inching 
Conflicts:
	code/espurna/button.ino
	code/espurna/data/index.html.gz
	code/html/index.html
 2017-01-20 14:20:45 +01:00
Xose Pérez
fc20d62643 Added support for JanGoe Wifi Relay boards 2017-01-20 14:17:41 +01:00
Xose Pérez
bbac070c09 Pass safe buffer to api callbacks 2017-01-20 13:30:52 +01:00
Xose Pérez
4708c26d54 APIs for sensor data, REST & domoticz 2017-01-20 12:43:26 +01:00
Xose Pérez
32bb6c45c7 Map buttons to relays, send MQTT messages on button events 2017-01-18 02:49:31 +01:00
Xose Pérez
9e9ca87e62 Change LED pattern to make it less intrussive 2017-01-18 02:48:41 +01:00
Xose Pérez
e4ea3b0f66 Small fixes, mostly comments and debug 2017-01-17 16:13:30 +01:00
Xose Pérez
8ad3c8708e Document fauxmo and domoticz default settings 2017-01-14 00:16:24 +01:00
Xose Pérez
77e887dc6c Notify OTA updates to web clients and reload page after the update 2017-01-13 12:46:05 +01:00
Xose Pérez
a098614ca6 Adding current, voltage, apparent and reactive power reports to Sonoff POW 2017-01-13 11:27:50 +01:00
Xose Pérez
52a63b1849 Changes in file comment headers 2017-01-12 20:42:52 +01:00
Xose Pérez
252bcbdded Force MQTT close client before reconnecting. Revert back to latest ESPAsyncTCP 2017-01-12 00:16:53 +01:00
Xose Pérez
476d314498 Fix #35 using stable version of ESPAsyncTCP and updated version of JustWifi to prevent MQTT connection drop after wifi reconnection 2017-01-11 23:25:46 +01:00
Xose Pérez
4b557535e6 Defer wifi disconnection from web interface to allow request to return 2017-01-11 23:24:49 +01:00
Xose Pérez
5f5eec8f16 Move all Arduino IDE configuration values to their own file 2017-01-11 23:23:02 +01:00
Xose Pérez
ff81326846 Version and year bump 2017-01-11 14:30:14 +01:00
Xose Pérez
1715b653e4 Using forked Time library to prevent conflict with Arduino Core for ESP8266 time.h file in windows machines 2017-01-11 14:25:16 +01:00
Xose Pérez
17f1e09b86 Rename relayPulseStart to relayPulse 2017-01-11 13:58:24 +01:00