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

126 Commits

Author SHA1 Message Date
Xose Pérez
bc76f1d233 Merge branch 'dev' into sensors 
Conflicts:
	code/espurna/data/index.html.gz
	code/espurna/static/index.html.gz.h
 2018-01-27 10:03:50 +01:00
Xose Pérez
939a1e184a Added CSS lint to gulp file 2018-01-26 23:54:38 +01:00
Xose Pérez
a0d1d7aa7f Merge branch 'dev' into sensors 
Conflicts:
	code/espurna/data/index.html.gz
	code/espurna/static/index.html.gz.h
 2018-01-26 12:07:03 +01:00
Xose Pérez
f7295859c3 Option to disable schedules without delting them (#453) 2018-01-22 16:16:11 +01:00
Xose Pérez
85b195e27d Change CRC error copy in web interface 2018-01-21 20:03:22 +01:00
Xose Pérez
95968a97c3 Improved NTP support 2018-01-21 00:36:06 +01:00
Xose Pérez
3e4313fae3 Updated NTPClientLib. Support for non full hour time offsets (#265) 2018-01-20 01:00:13 +01:00
Xose Pérez
f97419d1a7 Move web third party files to vendor folder 2018-01-16 12:06:10 +01:00
Xose Pérez
cc873a8471 Merged in rhexel/espurna/master (pull request #43) 
Conflicts:
	code/espurna/data/index.html.gz
	code/espurna/static/index.html.gz.h
 2018-01-15 21:48:36 +01:00
Xose Pérez
90027eb2ee More js fixes 2018-01-15 20:33:27 +01:00
Xose Pérez
a843698b9f More js fixes 2018-01-15 20:30:22 +01:00
Xose Pérez
1d558891b6 Merged in espurna/dev (pull request #46) 
Conflicts:
	code/html/custom.js
 2018-01-15 19:55:02 +01:00
Xose Pérez
2f1d7fdc98 Added hostname to web UI side menu (#404) 2018-01-14 21:15:16 +01:00
Xose Pérez
a5df00b569 Option to disable network scanning (#392, #399). Scan networks from web UI 2018-01-14 13:58:16 +01:00
Lazar Obradovic
023f70d203 lintfixes, try1 2018-01-12 15:00:46 +01:00
Xose Pérez
006c8f2380 Fix delete last scheduler 2018-01-10 23:51:02 +01:00
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
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
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
ad05448603 Preliminary support for Thingspeak REST API over SSL 2018-01-07 01:18:01 +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
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
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
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
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
b2dd7e5b56 Migrate DS18B20 and counter to new sensor module 2017-12-13 11:57:09 +01:00
Xose Pérez
f6378d52e4 Some name refactoring 2017-12-12 22:11:34 +01:00
Xose Pérez
2299ce9bfd Basic sensor scafolding, DHT 90% migrated 2017-12-12 21:45:28 +01:00
Xose Pérez
569b937d6c Changed 'reset' to 'reboot' for user interaction (#315) 2017-12-08 17:18:31 +01:00