Mirrors/espurna
2
0
Fork 0
mirror of https://github.com/xoseperez/espurna.git synced 2026-03-04 23:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
729 Commits 23 Branches 75 Tags
641afc2e21680fa271fe11a68710194877bbd419
Commit Graph

108 Commits

Author SHA1 Message Date
Xose Pérez
e9687b5ca2 Support for ESPurna board v0.7 2017-10-09 18:32:17 +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
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
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
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
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
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
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
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
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
Xose Pérez
cf714106fb RFBridge web intrface 2017-08-10 15:31:15 +02:00
Xose Pérez
e6e9f9d6d4 Change the double click delay from the web interface 2017-07-24 00:22:38 +02:00
Xose Pérez
eb4855d5e6 Add option to merge messages into a JSON payload to web interface 2017-07-23 19:54:00 +02:00
Xose Pérez
a67c80de69 Small changes 2017-07-23 16:39:04 +02:00
Xose Pérez
3783b35e05 Added official (kinda) SSL support in async-mqtt-client 2017-07-17 23:35:15 +02:00
Xose Pérez
65f30c668f Merge branch 'influxdb' into dev 
Conflicts:
	code/espurna/static/index.html.gz.h
 2017-07-16 17:09:32 +02:00
Xose Pérez
79a0816053 Accept decimals in pulse time, limit it to 60s 2017-07-16 09:10:57 +02:00
Xose Pérez
55bec8f033 Direct InfluxDB HTTP support 2017-07-15 11:30:32 +02:00
Lauris
5b28c51d2d Changed Powef Factor to be dimensionless number instead of % (used more often that way) 2017-06-18 22:52:01 +03:00
Lauris
39c09a3615 Using correct units for Apparent Power and Reactive Power 
Change resolution of current to 1ma (3 decimal places)
 2017-06-18 13:33:01 +03:00
Xose Pérez
c8eba6a979 NTP configuration in web interface 2017-05-20 23:50:26 +02:00
Xose Pérez
ec963a7568 Fix typo 2017-05-20 22:08:00 +02:00
Xose Pérez
fe26513473 Changes in status tab in the web interface 2017-05-20 08:52:57 +02:00
Xose Pérez
3a872979fe Show NTP status on web interface (#126) 2017-04-24 10:45:07 +02:00
Xose Pérez
3683011239 Merge branch 'dev' into webupgrade 
Conflicts:
	code/espurna/data/index.html.gz
	code/espurna/static/index.html.gz.h
 2017-03-26 21:15:31 +02:00