Mirrors/espurna
2
0
Fork 0
mirror of https://github.com/xoseperez/espurna.git synced 2026-03-03 06:54:16 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,677 Commits 23 Branches 75 Tags
bb33dfd1023d78b28cc67436e6cb9b9fa01b8412
Commit Graph

338 Commits

Author SHA1 Message Date
DmitryBlinov
bb33dfd102 Thermostat upgrade (#1711) 
* Add "Enable Thermostat" switch

* Add heater/cooler thermostat mode
 2019-05-02 01:06:14 +03:00
Xose Pérez
9c3a6e6548 Merge branch 'webui/switch-typo' of https://github.com/mcspr/espurna into mcspr-webui/switch-typo 2019-03-25 12:41:28 +01:00
Xose Pérez
f40b621637 Merge branch 'sync_first' of https://github.com/foxel/espurna into foxel-sync_first 2019-03-25 12:39:35 +01:00
Xose Pérez
5d5e9155e5 Merge pull request #1603 from ElderJoy/thermostat 
Add thermostat module
 2019-03-25 12:23:11 +01:00
Max Prokhorov
920c205d61 spaces 2019-03-23 06:41:55 +03:00
Xose Pérez
0987e01950 Allow to configure all LEDs from UI (#1429) 2019-03-21 22:31:11 +01:00
Dmitry Blinov
376205c9bb Merge branch 'dev' into thermostat 
# Conflicts:
#	code/espurna/config/webui.h
#	code/espurna/data/index.all.html.gz
#	code/espurna/data/index.light.html.gz
#	code/espurna/data/index.rfbridge.html.gz
#	code/espurna/data/index.rfm69.html.gz
#	code/espurna/data/index.sensor.html.gz
#	code/espurna/data/index.small.html.gz
#	code/espurna/espurna.ino
#	code/espurna/static/index.all.html.gz.h
#	code/espurna/static/index.light.html.gz.h
#	code/espurna/static/index.rfbridge.html.gz.h
#	code/espurna/static/index.rfm69.html.gz.h
#	code/espurna/static/index.sensor.html.gz.h
#	code/espurna/static/index.small.html.gz.h
#	code/espurna/web.ino
#	code/gulpfile.js
#	code/html/index.html
 2019-03-08 01:35:36 +02:00
Dmitry Blinov
ec39ac5c88 Fix conflicts: 
1. Add thermostat to the espurna_modules in progmem.h
2. Add thermostat to webui, gulp, html, js.
3. in general.h MQTT_USE_JSON returned to 0 by default and 1 if thermostat enabled.
 2019-03-08 01:02:11 +02:00
Andrey F. Kupreychik
bf705b282f SYNC_FIRST mode 2019-03-06 21:42:19 +07:00
Andrey F. Kupreychik
609e047f95 Merge remote-tracking branch 'xoseperez/dev' into lightfox-dual 2019-03-05 22:44:29 +07:00
Dmitry Blinov
af07494f00 Add thermostat module 2019-03-03 12:17:34 +02:00
Xose Pérez
c4aadd62d5 Merge pull request #1561 from mcspr/mqtt/group-receive-only 
MQTT relay group: receive-only mode
 2019-02-25 06:13:58 +01:00
Malachi Soord
c8231860ac [copyright-update] Update for 2019 2019-02-23 22:35:49 +01:00
Andrey F. Kupreychik
86bccaf74f Merge remote-tracking branch 'xoseperez/dev' into lightfox-dual 2019-02-22 11:51:56 +07:00
Max Prokhorov
65af8373cb Merge remote-tracking branch 'origin/dev' into mqtt/group-receive-only 2019-02-22 04:59:12 +03:00
Xose Pérez
c824d861cf Add note on WiFi tab about hostname (#1555) 2019-02-21 23:41:44 +01:00
Max Prokhorov
a53b66d55a Relay MQTT group sync mode setting 2019-02-20 08:36:26 +03:00
Xose Pérez
3b6c64c075 Merge pull request #1535 from mcspr/hass/stream-config 
Print each HA config entry separately
 2019-02-10 22:25:53 +01:00
Xose Pérez
e184128a77 Fix heartbeat dropdown size 2019-02-10 19:33:49 +01:00
Max Prokhorov
e1ddcc533c do html escaping on the client 2019-02-09 18:22:08 +03:00
Xose Pérez
f6b8baf37d Adding description field to web UI, reporting it via MQTT (#1523) 2019-02-08 17:08:40 +01:00
Martins Ierags
951cc77dfb Fixes regarding @xoseperez comments 2019-01-12 12:29:45 +02:00
Martins Ierags
465b5230ff Configure Heartbeat & option HEARTBEAT_REPEAT_STATUS: 
- Heartbeat mode and interval configuration added to WebUI ADMIN page
- New option HEARTBEAT_REPEAT_STATUS: on device startup full heartbeat information and after HEARTBEAT_INTERVAL only STATUS report.
- Enhanced first heartbeat message - on device startup it will send heartbeat after ntpSynced will be true to get device time.

P.S. Code is tested. Web part is not compiled, and not tested. I hope it will work :)
 2019-01-06 17:23:05 +02:00
Andrey F. Kupreychik
bcb36c1859 Merge remote-tracking branch 'xoseperez/dev' into lightfox-dual 2019-01-04 19:10:04 +07:00
Andrey F. Kupreychik
8b4713dee1 UI for LightFox 2019-01-04 18:57:07 +07:00
Erwin van Londen
7f48865fd2 Corrected typo (#1461) 2018-12-31 13:24:31 +03:00
Xose Pérez
7eef56071d Allow {hostname} and {mac} placeholder for mqtt user and client_id fields (#1338) 2018-12-12 13:06:13 +01:00
Xose Pérez
433f089c00 Show proper switches names in web UI 2018-12-09 22:48:42 +01:00
Max Prokhorov
b526060fa4 clickable link 2018-12-09 00:10:45 +03:00
Max Prokhorov
e257881e42 Move NoFUSS from Admin to separate panel 2018-12-08 23:40:57 +03:00
Xose Pérez
606ef345bf Option to not clearing cache after sending data to Thingspeak.com (#1369) 2018-12-07 14:22:11 +01:00
Jack Wilsdon
665a473d9c Fix energy ratio input for pulse meter sensor (#1394) 
* Fix energy ratio input for pulse meter sensor

* checkout origin/dev -- webui files
 2018-12-06 22:59:50 +03:00
Max Prokhorov
de7ff7722c Telnet password setting (#1382) 
* Telnet auth depends on setting

* use same define suffix as WS_

* add to web

* no initial passwd for core
 2018-12-01 07:20:13 +03:00
Xose Pérez
facb89e529 Initial version of the PulseMeter sensor 2018-10-09 11:13:47 +02:00
Xose Pérez
fb6eba57cd Merge branch 'dev' into sensors 2018-10-08 17:35:41 +02:00
Max Prokhorov
7a8949fd24 Check if password is required before showing alert 
Show alert if no input on #password page
Do not fail with empty password when on #layout
Fix password selector
 2018-09-29 04:49:15 +03:00
Xose Pérez
5488bfaf7f API is not restful (issue a PUT to change a relay status). It can be disabled from web UI (#1192) 2018-09-26 01:06:04 +02:00
Xose Pérez
50b21dd0ca Merge pull request #1209 from mcspr/webui-form-enter 
Avoid implicit type="submit" buttons
 2018-09-25 22:40:04 +02:00
Xose Pérez
227d641a9b Support for MICS-2710, MICS-5525 and MICS-4514, gas sensors 2018-09-18 18:15:41 +02:00
Max Prokhorov
bcddc44cbc Avoid implicit type="submit" 2018-09-18 09:21:56 +03:00
Max Prokhorov
399458d632 Submit password on Enter 2018-09-18 07:58:14 +03:00
Max Prokhorov
822837f7b2 Use separate form for each panel 2018-09-17 05:22:21 +03:00
Max Prokhorov
3c91389c20 Update password UI 
* revise first-time-use screen
* generate password (policy applies)
* hide/reveal password text for sta/admin settings
* changed autocomplete='...' for some inputs to avoid completion
 2018-09-17 05:22:21 +03:00
Xose Pérez
d476557329 Move string parts to progmem 2018-09-10 10:36:08 +02:00
Maxim Prokhorov
e326fbe09f hostname/password length requirements 
* fix webui regexp and input length limits
* explain requirements in webui and headers
 2018-09-03 06:47:36 +03:00
Xose Pérez
3c0a76a528 Merge branch 'dev' of github.com:xoseperez/espurna into dev 2018-09-02 10:58:56 +02:00
Xose Pérez
b84bcdc0f5 Fix eneUnits key in web UI (#1177) 2018-09-02 10:58:43 +02:00
zafrirron
a77f6d4c88 Fix typo in hint text 2018-08-31 23:21:37 +03:00
Xose Pérez
5f4bfe3782 Allow faster sensor reading intervals, down to 1 second (#848) 2018-08-30 00:28:28 +02:00
Xose Pérez
01802741f2 Tested encoder support 2018-08-29 08:26:15 +02:00