Mirrors/espurna
2
0
Fork 0
mirror of https://github.com/xoseperez/espurna.git synced 2026-03-03 23:14:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,141 Commits 23 Branches 75 Tags
7204c46d26b67ea53c436e69ac52d655c635df93
Commit Graph

237 Commits

Author SHA1 Message Date
Xose Pérez
2e7613af83 Scheduler: web UI layout fixes, allow toggling, change first weeday to Monday, dinamically load relays in dropdown 2018-01-10 22:21:29 +01:00
Xose Pérez
449da5203f Clean up code, stick to conventions in settings naming 2018-01-10 19:24:28 +01:00
Xose Pérez
d64f2916cb Some code fixes and movinig stuff around 2018-01-09 23:53:37 +01:00
Xose Pérez
eee4c47658 Merged in faina09/espurna/dev (pull request #42) 
Conflicts:
	code/espurna/data/index.html.gz
	code/espurna/static/index.html.gz.h
 2018-01-09 23:28:21 +01:00
Xose Pérez
9062c70e63 Removed anti-recursion check in Domoticz module 2018-01-09 23:01:46 +01:00
Stefano Cotterli
2d5e14b3a3 Merge remote-tracking branch 'remotes/upstream/dev' into dev 
# Conflicts:
#	code/espurna/config/version.h
#	code/espurna/data/index.html.gz
#	code/espurna/espurna.ino
#	code/espurna/static/index.html.gz.h
#	code/extra_scripts.py
#	code/html/index.html
#	code/ota.py
#	code/platformio.ini
 2018-01-09 22:04:07 +01:00
Xose Pérez
207726b049 Merge branch 'thingspeak' into dev 
Conflicts:
	code/espurna/data/index.html.gz
	code/espurna/static/index.html.gz.h
 2018-01-09 00:23:42 +01:00
Xose Pérez
6035ed8eee Allow MQTT keep alive value of up to 3600s 2018-01-09 00:14:26 +01:00
Xose Pérez
df97cef8d1 Merge branch 'dev' into thingspeak 
Conflicts:
	code/espurna/data/index.html.gz
	code/espurna/static/index.html.gz.h
 2018-01-07 16:02:57 +01:00
Xose Pérez
9d6a5727a5 Non SSL version of Thingspeak module 2018-01-07 15:26:29 +01:00
Stefano Cotterli
db408fbf95 Merge remote-tracking branch 'upstream/master' into dev 
# Conflicts:
#	code/espurna/data/index.html.gz
#	code/espurna/static/index.html.gz.h
 2018-01-07 12:47:02 +01:00
Xose Pérez
af805ab045 Update copyright notices 2018-01-07 01:21:23 +01:00
Xose Pérez
ad05448603 Preliminary support for Thingspeak REST API over SSL 2018-01-07 01:18:01 +01:00
Xose Pérez
4624ab9078 Added option to specify MQTT client ID 2018-01-05 13:41:05 +01:00
Ryan Jarvis
46de434674 Fix typo: TOOGLE -> TOGGLE 2018-01-05 09:31:37 +01:00
Xose Pérez
50ee5be3e4 Color synchronisation between different lights via MQTT 2018-01-03 00:07:02 +01:00
Xose Pérez
f06c841639 New LED modes: always ON and always OFF (#348) 2017-12-29 22:57:43 +01:00
Xose Pérez
a45d253a7e Clean HTML layout 2017-12-29 14:12:07 +01:00
Xose Pérez
ae979bc7b3 Change MQTT retain flag, QoS and keep alive time from web UI (#321) 2017-12-29 14:06:28 +01:00
Xose Pérez
ad62a6ad74 Support for BH1750 luminosity sensor 2017-12-28 22:38:04 +01:00
Stefano Cotterli
b7ed0ec686 a simple scheduler for relays 2017-12-28 19:37:56 +01:00
Xose Pérez
7b52eb2e25 Fix magnitude order 2017-12-28 16:13:47 +01:00
Xose Pérez
1a68f89bbf Fix mqtt group sync with different switches sharing same group 2017-12-27 15:05:15 +01:00
Xose Pérez
f3f220c6ac Fix UI layout in sync modes 2017-12-27 15:03:17 +01:00
Xose Pérez
029526532e Fixes for Explorer 2017-12-27 13:19:54 +01:00
Xose Pérez
db2e1084cc Fix websocket data sensing 2017-12-26 23:41:00 +01:00
Xose Pérez
6e35a218d9 Fix relay status updates in web UI 2017-12-26 19:09:40 +01:00
Xose Pérez
a1489d752d Clean web UI 2017-12-26 18:53:43 +01:00
Xose Pérez
439881a741 Change sensor read and report interval from web UI 2017-12-26 16:29:56 +01:00
Xose Pérez
38b2747218 Sensor indexes in web UI 2017-12-26 15:50:49 +01:00
Xose Pérez
78edb8a71e Merge branch 'dev' into sensors 
Conflicts:
	code/espurna/data/index.html.gz
	code/espurna/static/index.html.gz.h
	code/html/custom.js
 2017-12-26 14:54:23 +01:00
Xose Pérez
b3336871bf Boot mode and pulse mode per relay 2017-12-26 14:49:52 +01:00
Xose Pérez
f384d81d8e Ensure select boxes use full width 2017-12-25 19:25:30 +01:00
Xose Pérez
2c0afa7a55 Rename pure.css files 2017-12-25 12:42:37 +01:00
Xose Pérez
d2670cd06b Merge branch 'dev' into sensors 
Conflicts:
	code/espurna/config/general.h
	code/espurna/data/index.html.gz
	code/espurna/static/index.html.gz.h
	code/espurna/ws.ino
 2017-12-25 12:22:08 +01:00
Xose Pérez
44da6178f4 Refactor websocket sending 2017-12-24 02:10:06 +01:00
Xose Pérez
1ac4a61206 Migrate HLW8012 sensor to new sensor module, remove old code 2017-12-21 23:29:46 +01:00
Xose Pérez
f3c494d5da Support for ECH1560 energy monitor in new sensors, untested 2017-12-21 21:52:44 +01:00
Xose Pérez
eacaa6a918 Fixed small doc typo 2017-12-21 17:10:41 +01:00
Xose Pérez
d91d5eedb1 New sensors tab in web UI for all sensors 2017-12-21 14:45:24 +01:00
Xose Pérez
6e839e3d72 Added sensor IDs 2017-12-21 12:53:13 +01:00
Xose Pérez
de4780efbc Added getters for sensors 2017-12-20 20:18:12 +01:00
Xose Pérez
89f892ac79 Report sensor errors to web UI 2017-12-19 16:46:50 +01:00
Xose Pérez
77b05086d9 Added support for MHZ19 CO2 sensor 2017-12-19 15:22:14 +01:00
Xose Pérez
cb3297183d Simple digital sensor 2017-12-18 20:34:17 +01:00
Oscar Rovira
bf486a3b84 Add long warm up option for sensors (non-blocking), re-organize code, and non-blocking read of PMS 2017-12-17 22:09:13 +01:00
Xose Pérez
3ade0ae035 Added analog energy monitor sensor to new sensors module 2017-12-15 18:22:45 +01:00
Xose Pérez
d426969fb2 Added domoticz support to new sensor module 2017-12-14 23:52:58 +01:00
Xose Pérez
ebe0d5e410 Fixed DallasSensor 2017-12-14 00:47:05 +01:00
Xose Pérez
b2dd7e5b56 Migrate DS18B20 and counter to new sensor module 2017-12-13 11:57:09 +01:00