Commit Graph

674 Commits

Author SHA1 Message Date
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
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
a4de1ddecf Make building the web interface easier by automatically installing the dependencies. 2017-10-09 00:07:08 +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
Xose Pérez
d25ac6cd88 Move HLW8012 toggling to pre-loop 2017-09-20 11:38:46 +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
1503500581 Merge branch 'dev' into power 2017-09-19 22:21:48 +02:00
Xose Pérez
fe0d85f0a6 Added crash info dump from terminal, based on EspSaveCrash by krzychb 2017-09-19 22:21:28 +02:00
Xose Pérez
1f1ba1deb7 HLW8012 working with new modules 2017-09-19 21:51:45 +02:00
Xose Pérez
6f5c627625 New power modules tested with V9261F 2017-09-19 13:49:19 +02:00
Xose Pérez
270cb9accd Untested power provider modules 2017-09-19 00:58:19 +02:00
Xose Pérez
da5a74a9c6 Merge branch 'dev' into power
Conflicts:
	code/espurna/config/sensors.h
	code/espurna/espurna.ino
2017-09-18 23:02:12 +02:00
Xose Pérez
20ab2cbeec Fix magichome-led-controller flash mode 2017-09-18 22:44:10 +02:00
Xose Pérez
4aab3db2c1 Remove 500ms delay on boot 2017-09-18 22:43:49 +02:00
Xose Pérez
5f87e3ced3 Initial support for V9261F-based multimeters 2017-09-18 22:11:51 +02:00
Xose Pérez
2e6d0ab704 Change mDNS text attributes 2017-09-18 22:11:23 +02:00
Xose Pérez
5da7c24bff Removed debug line 2017-09-15 23:23:10 +02:00
Xose Pérez
7807af6115 Sort OTA devices by hostname 2017-09-15 23:22:23 +02:00
Xose Pérez
3c848d13b1 Replace MQTT_MAX_TRIES disabling feature with an increasing reconnection interval (issue #215) 2017-09-15 13:48:38 +02:00
Xose Pérez
17418d85b2 First power.ino module 2017-09-09 12:01:41 +02:00
Dylan
e5d4435251 Merge branch 'dev' of https://bitbucket.org/xoseperez/espurna into dev 2017-09-07 11:01:43 +12:00
Xose Pérez
97f3557e3f Homogenize board names and build flags 2017-09-06 10:31:43 +02:00