add more functions to library
add more data to be sent
pull/2/head
Andrew Woodlee 3 months ago
parent c8abafe9c3
commit c34c62da31

@ -5,7 +5,7 @@ wifi:
# Your WiFi SSID
ssid: "Your-WiFi-SSID"
# Your WiFi Password
passwd: Your-Secret-WiFi-Password
password: "Your-Secret-WiFi-Password"
mqtt:
# Your MQTT server
server: your.mqtt-broker.tld

@ -54,8 +54,67 @@ void ATM90E36_IC::begin(){
ap = eic->GetActivePowerB();
break;
case 'C':
ap = this->eic->GetActivePowerC();
ap = eic->GetActivePowerC();
break;
}
return ap;
}
double ATM90E36_IC::GetVHarm()
{
double vh;
switch (ctLine)
{
case 'A':
vh = eic->GetVHarmA();
break;
case 'B':
vh = eic->GetVHarmB();
break;
case 'C':
vh = eic->GetVHarmC();
break;
}
return vh;
}
double ATM90E36_IC::GetCHarm()
{
double ch;
switch (ctLine)
{
case 'A':
ch = eic->GetVHarmA();
break;
case 'B':
ch = eic->GetVHarmB();
break;
case 'C':
ch = eic->GetVHarmC();
break;
}
return ch;
}
double ATM90E36_IC::GetPowerFactor()
{
double pf;
switch (ctLine)
{
case 'A':
pf = eic->GetPowerFactorA();
break;
case 'B':
pf = eic->GetPowerFactorB();
break;
case 'C':
pf = eic->GetPowerFactorC();
break;
}
return pf;
}
double ATM90E36_IC::GetApparentPower()
{
return eic->GetTotalApparentPower();
}

@ -12,9 +12,20 @@ public:
ATM90E36_IC(const char ctLineLetter, ATM90E36 ic);
void begin();
double GetLineVoltage();
double GetActivePower();
double GetSysStatus();
double GetPassivePower();
double GetLineCurrent();
double GetLineCurrentN();
double GetApparentPower();
double GetPowerFactor();
double GetVHarm();
double GetCHarm();
};

@ -28,7 +28,7 @@ lib_deps =
bblanchon/ArduinoJson @ ^6.21.3
paulstoffregen/OneWire@^2.3.8
milesburton/DallasTemperature@^3.11.0
build_src_filter = +<*> -<.git/> -<.svn/> -<tests/>
build_src_filter = +<transformerMonitor.cpp> -<.git/> -<.svn/> -<tests/>
[env:store-creds]
build_flags = -D DEV ${env.build_flags}

@ -190,7 +190,7 @@ void sendSensorDataOverMQTT(void *pvParameters)
strftime(timeBuffer, sizeof(timeBuffer), "%FT%TZ", mqttSensorData.timeInfo);
powerObj["active"] = eic.GetActivePower();
powerObj["passive"] = eic.GetPassivePower();
powerObj["apparent"] = eic.GetApparentPower();
lastMillis = millis();
@ -221,9 +221,9 @@ void IRAM_ATTR ReadData(){
// TODO: find and hard-code addresses of sensors
tempSensors.requestTemperatures();
// get cabinet temp sensor data
sensorData.temps.cabinetTemp = tempSensors.getTempC();
// sensorData.temps.cabinetTemp = tempSensors.getTempC();
// get oil temp sensor data
sensorData.temps.oilTemp = tempSensors.getTempC();
// sensorData.temps.oilTemp = tempSensors.getTempC();
}

Loading…
Cancel
Save