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
2,732 Commits 23 Branches 75 Tags
1d133bee16b4c953d43959cfceede12eec389e0c
Commit Graph

512 Commits

Author SHA1 Message Date
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
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
Max Prokhorov
b2ad29a660 Revert timestamp prepending, separate debug destinations 
* Simply print timestamp for supported destinations
* Update ws destination to support 'prefix' sub-key
* Avoid void casting in telnet module
 2019-02-08 01:00:47 +03:00
Max Prokhorov
cde1aba561 partial sending of rfbridge codes 2019-01-29 16:49:49 +03:00
Max Prokhorov
17e5156ebf fixup rfbridge ws-data 2019-01-29 16:33:53 +03:00
Max Prokhorov
868d153fa4 Compact WS data 
* send all ws config at once on start
* reduce ws json overhead by creating message buffer manually
* use k:[values] instead of k1:value1, k2:value2 etc. for lists
 2019-01-29 16:27:47 +03: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
4d5c0d7617 Split ws messages for relays and rf codes (#262) 2018-12-11 19:26:23 +01:00
Xose Pérez
433f089c00 Show proper switches names in web UI 2018-12-09 22:48:42 +01:00
Xose Pérez
8eb7a1831b Merge branch 'dev' into feature/atlas-scientific-ph-probe 2018-12-09 11:50:20 +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