Mirrors/espurna
2
0
Fork 0
mirror of https://github.com/xoseperez/espurna.git synced 2026-03-18 14:17:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,474 Commits 23 Branches 75 Tags
79fa00424d4534752a1925e66e2fc3eb87fdf63a
Commit Graph

745 Commits

Author SHA1 Message Date
Hermann Kraus
ae17a82f6f Report energy in kWh in the web interface and in Joule via MQTT. 
Enable energy reporting for all supported chips in the web interface.
 2017-10-12 23:37:26 +02:00
soif
0827bacd33 Merge commit 'f165ab93390d87ff2fef7ce2d8694ed56c96a8a2' into ir_hsv 2017-10-11 14:53:21 +02:00
Xose Pérez
e9687b5ca2 Support for ESPurna board v0.7 2017-10-09 18:32:17 +02:00
Hermann Kraus
088f3b923e Add energy indicator in the web interface. 2017-10-09 00:21:21 +02:00
soif
d4b3637c12 implements ColorHsv + ColorsExtras 2017-10-05 15:15:26 +02:00
Xose Pérez
65c4164b79 Merge branch 'dev' into power 
Conflicts:
	code/espurna/data/index.html.gz
	code/espurna/emon.ino
	code/espurna/hlw8012.ino
	code/espurna/static/index.html.gz.h
	code/espurna/v9261f.ino
 2017-09-22 18:40:19 +02:00
Xose Pérez
5c294876ba Untested support for ECH1560-based powermeters 2017-09-22 17:57:21 +02:00
Xose Pérez
35e1033c76 Remove wifi gain option (#204) 2017-09-22 17:05:18 +02:00
Xose Pérez
8461686a05 Rename power settings 2017-09-20 11:24:29 +02:00
Xose Pérez
e02c249c31 Power calibration 2017-09-20 11:17:39 +02:00
Xose Pérez
6f5c627625 New power modules tested with V9261F 2017-09-19 13:49:19 +02:00
Xose Pérez
1373923758 Moving UI strings to javascript 2017-09-04 13:35:07 +02:00
Xose Pérez
f7617acaf2 Fix bug 'Fragment identifiers are not allowed in WebSocket URLs' 2017-09-04 10:31:21 +02:00
Xose Pérez
3badc85001 Web UI now supports being behind a reverse proxy 2017-09-02 14:11:02 +02:00
Xose Pérez
33c98a58ab Add Update error number to error message in web UI 2017-09-01 21:51:34 +02:00
Xose Pérez
7beceb19af Counter module 2017-08-31 11:45:12 +02:00
Xose Pérez
d53d46ce2e Updated support for NoFUSS integration 2017-08-30 14:39:29 +02:00
Xose Pérez
75b3fa6a28 Added zeroPad method in javascript 2017-08-30 14:01:24 +02:00
Xose Pérez
729e89a728 Fix character set 2017-08-29 23:49:41 +02:00
Xose Pérez
173a30c4a9 Home Assistant auto-discovery feature 2017-08-29 02:08:05 +02:00
Xose Pérez
d72855e8a4 Changed inline documentation about MQTT topics in web interface 2017-08-29 00:29:16 +02:00
Patrizio Bekerle
93b8f7bf87 Merged in patbek/espurna/patbek/changed-documentation-for-rootrelay-to-r-1503951560823 (pull request #21) 
changed documentation for `<root>/relay/#` to `<root>/relay/#/set`

Approved-by: Xose Pérez <xose.perez@gmail.com>
 2017-08-28 21:17:27 +00:00
Xose Pérez
9d14a9cc78 Option to disable MQTT connection from web interface 2017-08-28 23:08:09 +02:00
Patrizio Bekerle
ec8ca7a226 changed documentation for <root>/relay/# to <root>/relay/#/set 2017-08-28 20:19:22 +00:00
Xose Pérez
d7bb924c1c Using 'post' particles in web interface 2017-08-28 21:43:55 +02:00
Xose Pérez
4de1094eb2 Added padding 0 to uptime on web interface 2017-08-28 21:37:57 +02:00
Xose Pérez
7d56c6f07b Option to change WiFi gain from web interface 2017-08-28 20:37:32 +02:00
Xose Pérez
fa4e9e5cc4 Merge branch 'ssl' into dev 
Conflicts:
	code/espurna/data/index.html.gz
	code/espurna/static/index.html.gz.h
 2017-08-27 19:08:20 +02:00
Xose Pérez
e451fb499b Added current time, uptime, free heap, firmware size and free space to web interface 2017-08-27 18:57:34 +02:00
Xose Pérez
ce907eb2ee Option to build without NTP support 2017-08-27 14:14:28 +02:00
Xose Pérez
e9bb571fee Fix bug in CSS caused by a bad merge 2017-08-26 21:39:03 +02:00
Xose Pérez
5c58f011c1 Merge branch 'dev' into ssl 
Conflicts:
	code/espurna/static/index.html.gz.h
	code/espurna/web.ino
 2017-08-25 15:10:41 +02:00
Xose Pérez
1c5ebd3e08 Refactoring build flag names 2017-08-25 01:56:27 +02:00
Xose Pérez
60e8446d1b Process checkboxes data before sending to device 2017-08-24 16:47:15 +02:00
Xose Pérez
e722a1e677 Merge branch 'dev' into ssl 
Conflicts:
	code/espurna/static/index.html.gz.h
	code/platformio.ini
 2017-08-20 01:39:13 +02:00
Xose Pérez
36af250e10 Option to globally disable domoticz from web interface 2017-08-19 17:17:52 +02:00
Xose Pérez
a1d5082885 Fix typo in custom.js 2017-08-18 14:22:32 +02:00
Xose Pérez
3dcaf61ee6 Merge branch 'dev' into ssl 
Conflicts:
	code/espurna/static/index.html.gz.h
	code/espurna/web.ino
 2017-08-18 14:21:41 +02:00
Xose Pérez
3c21dc3e78 Merge branch 'dev' into light 
Conflicts:
	code/espurna/config/general.h
	code/espurna/config/hardware.h
	code/espurna/hardware.ino
	code/html/custom.css
	code/html/custom.js
 2017-08-18 14:17:20 +02:00
Xose Pérez
c6b26efbb7 Merge 2017-08-18 14:06:58 +02:00
Xose Pérez
8a86c66e63 Hiding channel4 when useWhite 2017-08-18 13:41:29 +02:00
Xose Pérez
6a48374fe9 Add tooltips to sliders 2017-08-18 13:00:36 +02:00
Xose Pérez
8abb8ffaff Allow to define useColor, useWhite and useGamma from web interface 2017-08-18 12:35:35 +02:00
Xose Pérez
58a8feb90b Allow to disable color picker 2017-08-18 11:39:45 +02:00
Xose Pérez
e8ee08a1a6 Prevent form autocomplete 2017-08-14 17:27:03 +02:00
Xose Pérez
e850c68c85 Testing web interface over SSL 2017-08-14 09:54:08 +02:00
Xose Pérez
91b66876af Merge branch 'dev' into ssl 
Conflicts:
	code/espurna/config/general.h
	code/espurna/static/index.html.gz.h
	code/espurna/web.ino
	code/platformio.ini
 2017-08-13 17:08:20 +02:00
Xose Pérez
899594512b Changes in HTML info 2017-08-13 17:05:45 +02:00
Xose Pérez
41189a65b4 API returns processed values for HLW and EMON. 404 means no data yet. Some clean up 2017-08-11 16:18:51 +02:00
Xose Pérez
79a5a47d87 Added help to the RFBridge panel 2017-08-10 17:44:50 +02:00