Mirrors/espurna
2
0
Fork 0
mirror of https://github.com/xoseperez/espurna.git synced 2026-03-02 14:34:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,829 Commits 23 Branches 75 Tags
rules-rpn
Commit Graph

528 Commits

Author SHA1 Message Date
Xose Pérez
62b80bb9ea Merge branch 'dev' into rules-rpn 2019-09-27 18:22:30 +02:00
Max Prokhorov
deb465763f Fix WiFi scan results in Web (#1913) 
* web: re-add wifi scan action, send as json array

* ws: forcibly inline send functions
 2019-09-20 15:37:54 +03:00
Max Prokhorov
a2688ec376 lights: don't show v for hsv picker, use brightness instead 2019-09-10 12:39:28 +03:00
Max Prokhorov
f8deb535b5 lights: selector typo 2019-09-10 12:36:09 +03:00
Max Prokhorov
8dbd25c548 lights: initColor args 2019-09-10 12:35:12 +03:00
Max Prokhorov
e233fd5b08 web: move hsv picker conversions into functions 2019-09-07 12:48:35 +03: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
68270310c7 web: parse host query via browser api, logging 2019-09-06 14:37:39 +03:00
foxman69
d66b8a9bed Syncronize js when saving configuration (#1863) 
* Syncronize js when saving important data

* update webui
 2019-08-27 01:15:24 +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
Max Prokhorov
d4dea17f94 Fix missing WS debug messages (#1851) 
Amend #1843 , since we have updated ESPAsyncWebServer
Fixes (again) #1300

Gather WS debug messages in a buffer and flush every N times
info,keys,crash actually output data now
 2019-08-13 00:18:45 +03:00
Max Prokhorov
21423431ce Fixed size json payload & other WS bugfixes (#1843) 
- update every dynamicjsonbuffer with fixed size constructor argument
- change to ws callback registration to use a class builder (just cosmetic)
- test multiple ws data callbacks for each module
- remove some of the static strings in favour of ws data callback
- improve sensor ws callback data size, remove duplicated strings
- use static buffer in wsDebugSend
- postpone wsSend until loop, implement wsPost to allow other modules to queue message callbacks. remove Ticker based ws callbacks for data
- update WebUI files
 2019-08-12 23:24:52 +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
Xose Pérez
d9dff336ad Merge branch 'dev' into rules-rpn 2019-05-25 09:19:01 +02:00
Xose Pérez
509a954392 Improve wsSend performance 2019-05-24 23:35:47 +02:00
Xose Pérez
f8488fff6a Stickyness, rpn.ops,... 2019-05-24 13:32:06 +02:00
Xose Pérez
6e8c0780ff RPN rules web interface, MQTT inputs 2019-05-24 09:58:40 +02: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
Indu Prakash
d1c852eee5 Fix for #1653 2019-03-25 05:05:06 -05:00
Max Prokhorov
920c205d61 spaces 2019-03-23 06:41:55 +03:00
Max Prokhorov
58d911d3ed Merge remote-tracking branch 'origin/dev' into webui/switch-typo 2019-03-23 06:39:38 +03:00
Xose Pérez
0987e01950 Allow to configure all LEDs from UI (#1429) 2019-03-21 22:31:11 +01:00
Max Prokhorov
494427402a WebUI: selector typo 2019-03-21 05:14:11 +03:00
Dmitry Blinov
add499e245 Update custom.js 2019-03-08 01:57:53 +02:00
Dmitry Blinov
cb582b711d Update custom.js 2019-03-08 01:42:19 +02: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
Max Prokhorov
61411b2002 rfbridge: fix webui codes parsing 2019-02-25 17:57:06 +03: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
Max Prokhorov
860ecb7464 Merge branch 'dev' into compact-ws 2019-02-12 15:10:06 +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
2f147ec088 double-click to select textarea 2019-02-09 18:22:08 +03:00
Max Prokhorov
e1ddcc533c do html escaping on the client 2019-02-09 18:22:08 +03:00
Max Prokhorov
31a0772e37 Print each HA config entry separately 2019-02-09 18:22:08 +03:00
Max Prokhorov
3e121edf3a Merge remote-tracking branch 'origin/dev' into compact-ws 2019-02-09 12:56:55 +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