Mirrors/espurna
2
0
Fork 0
mirror of https://github.com/xoseperez/espurna.git synced 2026-03-06 08:24:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Small fixes

Browse Source
This commit is contained in:
Xose Pérez
2017-08-26 17:10:01 +02:00
parent e1de3327a3
commit 8737e23ff4
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/espurna/config/hardware.h
View File

@@ -68,7 +68,6 @@
// Info
#define MANUFACTURER "TINKERMAN"
#define DEVICE "ESPURNA_H"
#define HLW8012_SUPPORT 1
// Buttons
#define BUTTON1_PIN 4
@@ -84,7 +83,7 @@
#define LED1_PIN_INVERSE 0
// HLW8012
#define HLW8012_SUPPORT 1
#define HLW8012_SUPPORT 1
#define HLW8012_SEL_PIN 2
#define HLW8012_CF1_PIN 13
#define HLW8012_CF_PIN 14
@@ -231,7 +230,6 @@
// Info
#define MANUFACTURER "ITEAD_STUDIO"
#define DEVICE "SONOFF_POW"
#define HLW8012_SUPPORT 1
// Buttons
#define BUTTON1_PIN 0
@@ -247,7 +245,7 @@
#define LED1_PIN_INVERSE 0
// HLW8012
#define HLW8012_SUPPORT 1
#define HLW8012_SUPPORT 1
#define HLW8012_SEL_PIN 5
#define HLW8012_CF1_PIN 13
#define HLW8012_CF_PIN 14

12
code/espurna/emon.ino
View File

@@ -84,15 +84,9 @@ void powerMonitorSetup() {
// backwards compatibility
String tmp;
tmp = getSetting("pwMainsVoltage", EMON_MAINS_VOLTAGE);
setSetting("emonVoltage", tmp);
delSetting("pwMainsVoltage");
tmp = getSetting("emonMains", EMON_MAINS_VOLTAGE);
setSetting("emonVoltage", tmp);
delSetting("emonMains");
tmp = getSetting("pwCurrentRatio", EMON_CURRENT_RATIO);
setSetting("emonRatio", tmp);
delSetting("pwCurrentRatio");
moveSetting("pwMainsVoltage", "emonVoltage");
moveSetting("emonMains", "emonVoltage");
moveSetting("pwCurrentRatio", "emonRatio");
emon.initCurrent(
currentCallback,