Mirrors/espurna
2
0
Fork 0
mirror of https://github.com/xoseperez/espurna.git synced 2026-03-10 10:17:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,954 Commits 23 Branches 75 Tags
cfd2bccb4af3aa6423e46cccdeda6a6c6849940c
Commit Graph

351 Commits

Author SHA1 Message Date
Max Prokhorov
43cf926468 ha: try to avoid conflict with useCSS (#2075) 2019-12-21 00:07:10 +03:00
Max Prokhorov
0f02256860 Small fixes (#2071) 
* web: fix rfb node generator syntax, do not send as basic settings

* ha: allocate discovery object later
 2019-12-19 00:56:29 +03:00
Max Prokhorov
8e7854b04e WebUI fix change detection of input elements (#1986) 
- use setOriginalsFromValues function right after elements had changed and
**only** with those elements
- add checkbox handling to setOriginalsFromValues to match hasChanged
- apply hasChanged after value is set to refresh originals after saving
- change parts that already set 'original' attribute manually

This was sort-of broken, because original attr never worked as intended. 
Also fix possible OOM for large WebUI images, since sending full config each time means that we need more memory to buffer and parse it.
 2019-12-18 17:45:51 +03:00
foxman69
5cf687ffc1 WebUI: Fixed small aesthetic problem (#2038) 
* Fixed small esthetic problem

* Changed to legend
 2019-12-09 09:22:51 +03:00
Max Prokhorov
15accf8090 web: check sch_last existence (#2050) 2019-12-09 07:40:36 +03:00
Max Prokhorov
849f8cf920 Rules RPN (#1984) 
* RPN rules (WIP)

* RPN rules web interface, MQTT inputs

* Stickyness, rpn.ops,...

* Perform light updates only when value changes

* Improve wsSend performance

* Revert PR test

* Check TERMINAL_SUPPORT for _rpnInitCommands and remove unused variable

* Fix merge

* formatting

* disable by default (?)

* changelog

* comment

* remove debug function wrappers in favour of var activation

* fixup! comment
 2019-11-10 07:01:50 +03:00
foxman69
4343457b9e Support restore last schedule (#1948) 
* Added restore last schedule support

* Merged RestoreLastScheduleState function into the _schCheck function

* handle lights in restore action

* hide webui chbox when not using scheduler

* use settings instead of struct member, hide under ifdef scheduler_support

* relayLastSchedule uses SCHEDULER_RESTORE_LAST_SCHEDULE as default

* Changed all the variable names to be the same so there would be no confusions

* Fixed client side to create an array from relayLastschedule

* Fixed cosmetic issue with the toggle display in webui

* Fixed variable name and disabled comparison at the end

* Added another check if the switch type is light provider

* Changed variables naming

* Naming mistake
 2019-11-06 14:25:42 +03:00
Xose Pérez
8b7eea6c72 ESPurna base image for Tuya Convert 2019-10-11 17:44:47 +02:00
Max Prokhorov
0bf07f166e web: update to jquery 3.4.1 and wheelcolorpicker 3.0.8 2019-09-07 12:37:31 +03:00
Max Prokhorov
d4311211ad Lock relay status on boot (#1705) 
* relays: locked status

* remove debug

* Disable relay toggle when locked

* fixup! Disable relay toggle when locked

* Send lock with status, fix "disable" condition

* typo

* Update WebUI
 2019-08-13 00:33:27 +03:00
copyrights
9ceca44770 Two channel CCT (#1732) 
* add CCT support for 2 channel boards

* update webinterface description

* add 2 channel CCT to homeassistant and domoticz

* remove domoticz two channel cct support.
 2019-05-27 02:47:58 +03:00
m-kozlowski
471a6387fb Separate device name for alexa integration (#1727) 
Allow defining custom device name for alexa integration, other than hostname.
Still uses hostname as a fallback.
 2019-05-23 06:22:18 +03:00
Max Prokhorov
193cebdbab RF/RFBRIDGE Update (#1693) 
- remove optional RFRAW_SUPPORT
- enable module when RF_SUPPORT=1, optionally enable RCSwitch
- reorder ifdef checks to treat RFB_DIRECT and old RF_SUPPORT the same
- rename RF_PIN to RFB_RX_PIN
- depend on RF_SUPPORT instead of ITEAD_SONOFF_RFBRIDGE
- runtime TX & RX PIN setting
 2019-05-08 23:57:18 +03:00
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