Mirrors/espurna
2
0
Fork 0
mirror of https://github.com/xoseperez/espurna.git synced 2026-03-05 07:54:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
743 Commits 23 Branches 75 Tags
8dacb87fde83dd6a7dd3922ea51e796c5cf16f45
Commit Graph

693 Commits

Author SHA1 Message Date
Xose Pérez
8dacb87fde Adding a button to wemos d1 mini boards (#239) 2017-10-17 11:28:21 +02:00
Xose Pérez
b64cef67b7 Check HLW8012_USE_INTERRUPS in _powerEnabledProvider 2017-10-17 11:26:28 +02:00
Xose Pérez
c31350c6d4 Domoticz expects energy in kWh 2017-10-17 10:49:46 +02:00
Xose Pérez
8c2d912545 Using IS units for energy 2017-10-17 10:39:30 +02:00
Xose Pérez
e8d77efdc4 Fix power report for domoticz (#236) 2017-10-17 10:21:19 +02:00
Hermann Kraus
84225d7c01 Merged in hermr2d2/espurna/energy (pull request #34) 
Use energy data from HLW8012.

Approved-by: Xose Pérez <xose.perez@gmail.com>
 2017-10-17 06:22:03 +00:00
Colin Shorts
924289b6c9 Support for QuinLED 2.6 Rev1.00 2017-10-16 17:48:16 +01:00
Colin Shorts
df9fa1d424 Initial support for QuinLED 2.6 Rev1.00 2017-10-16 17:33:20 +01:00
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
Hermann Kraus
1dea97f7cd Rename topic from "energy" to "energy_delta". 2017-10-12 23:27:02 +02:00
Xose Pérez
67335e62a9 Safer buffer handling for websocket data (thanks to Hermann Kraus & Björn Bergman) 2017-10-12 09:22:12 +02:00
Xose Pérez
641afc2e21 Check previous definitions for all sensor settings 2017-10-11 21:13:10 +02:00
Xose Pérez
f165ab9339 Beta version 1.9.6b 2017-10-09 18:55:43 +02:00
Xose Pérez
1baba3bab4 Merged Mancave Made ESPLive board definition 
Conflicts:
	code/espurna/hardware.ino
 2017-10-09 18:55:06 +02:00
Mitch Cox
fba965638d Merged in mitchcox/espurna/dev (pull request #32) 
Added ESPLive board

Approved-by: Xose Pérez <xose.perez@gmail.com>
 2017-10-09 16:45:00 +00:00
Xose Pérez
a964d84c42 Check relayParsePayload output 2017-10-09 18:41:02 +02:00
Xose Pérez
e6d84f511d Merge branch 'dev' of bitbucket.org:xoseperez/espurna into dev 2017-10-09 18:32:28 +02:00
Xose Pérez
e9687b5ca2 Support for ESPurna board v0.7 2017-10-09 18:32:17 +02:00
Wesley Tuzza
591137bb8a Merged in tuzzmaniandevil/espurna/dev (pull request #27) 
Add an option to query relay status

Approved-by: Wesley Tuzza <wesley@tuzza.co>
Approved-by: Xose Pérez <xose.perez@gmail.com>
 2017-10-09 16:31:46 +00:00
Hermann Kraus
117ff097f7 Merged in hermr2d2/espurna/npm_dependencies (pull request #33) 
Make building the web interface easier by automatically installing the dependencies.

Approved-by: Hermann Kraus <hermr2d2+git@gmail.com>
Approved-by: Tomblarom <k.nikulski@gmail.com>
Approved-by: Xose Pérez <xose.perez@gmail.com>
 2017-10-09 14:07:36 +00:00
Hermann Kraus
088f3b923e Add energy indicator in the web interface. 2017-10-09 00:21:21 +02:00
Hermann Kraus
a4de1ddecf Make building the web interface easier by automatically installing the dependencies. 2017-10-09 00:07:08 +02:00
Hermann Kraus
b2cab9684f Use energy data from HLW8012. 2017-10-08 23:55:31 +02:00
Mitchell A. Cox
b6ece41105 we can update the web insterface as often as need be since it doesn't consume resources 2017-10-08 18:03:30 +02:00
Mitchell A. Cox
20713b3f97 Merge branch 'dev' of https://bitbucket.org/mitchcox/espurna into dev 2017-10-08 18:02:40 +02:00
Mitchell A. Cox
7f83ca2daf added update on change to ds18b20 temperature sensor with default 1.0 degrees change. Saves space on MQTT server as it avoids logging pointless points.. 2017-10-08 18:01:47 +02:00
Mitch Cox
179d629ba7 fixed typo 2017-10-08 13:13:01 +00:00
Mitch Cox
5e040ec34d defualt back to nodemcu-lolin 2017-10-08 13:11:47 +00:00
Mitchell A. Cox
e104319a30 updated platformio.ini with esplive 2017-10-08 14:59:12 +02:00
Mitchell A. Cox
0d08dbdf04 ESPlive ADC config 2017-10-08 14:52:59 +02:00
Mitchell A. Cox
cdc98e1cb5 Added ESPLive board 2017-10-08 14:42:11 +02:00
Wesley
a6517bda0a Merge branch 'dev' of https://bitbucket.org/xoseperez/espurna into dev 2017-10-03 19:23:55 +13:00
Xose Pérez
924031dd74 Disable terminal support for RFBridge 2017-09-30 22:52:51 +02:00
Xose Pérez
1000d032ae Version 1.9.5 2017-09-28 18:11:50 +02:00
Xose Pérez
d2e889cda2 Typo fixes 2017-09-28 17:33:15 +02:00
Xose Pérez
f226a874c3 Revert to JustWifi 1.1.4 2017-09-28 17:33:03 +02:00
Xose Pérez
8023304dc8 Beta version 2017-09-22 23:50:26 +02:00
Xose Pérez
a3be28d47e Version 1.9.4 2017-09-22 23:20:29 +02:00
Xose Pérez
2313e36f41 Changed all esp8285 devices to use esp01_1m 2017-09-22 23:20:10 +02:00
Xose Pérez
41ebb2c358 Updated JustWifi library to 1.1.5 2017-09-22 23:00:45 +02:00
Xose Pérez
a46fbf8908 Fix BNSZ01 build flag 2017-09-22 19:08:47 +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
61ba4ecf33 Document and small fixes 2017-09-22 18:37:05 +02:00
Xose Pérez
5b2af0472f Add option to invert power values in ECH1560 2017-09-22 18:14:39 +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
b03af79ffd Align left dtostrf output 2017-09-22 15:26:02 +02:00
Xose Pérez
b0c1425044 Added several checks 2017-09-22 09:54:43 +02:00
Xose Pérez
6626e7ff67 Merge branch 'dev' into power 2017-09-22 09:50:52 +02:00
Xose Pérez
95459567d9 Small changes, caching some values 2017-09-22 09:50:39 +02:00