jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-29 05:36:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6463 from pablozg/development

Browse Source 
Energy: EnergyReset can now set the usage1, usage2, return1 and retur…
This commit is contained in:
Theo Arends 2019-09-20 19:12:57 +02:00 committed by GitHub
commit e18a4f4b1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sonoff/xdrv_03_energy.ino
View File

@ -514,6 +514,43 @@ void CmndEnergyReset(void)
Response_P(PSTR("{\"%s\":{\"" D_JSON_TOTAL "\":%s,\"" D_JSON_YESTERDAY "\":%s,\"" D_JSON_TODAY "\":%s}}"),
XdrvMailbox.command, energy_total_chr, energy_yesterday_chr, energy_daily_chr);
}
if ((XdrvMailbox.index > 3) && (XdrvMailbox.index <= 5)) {
char *p;
char *str = strtok_r(XdrvMailbox.data, ", ", &p);
uint32_t position = 0;
uint32_t values[2];
while ((str != nullptr) && (position <= 1)) {
uint8_t value = strtol(str, nullptr, 10);
values[position] = value;
str = strtok_r(nullptr, ", ", &p);
position += 1;
}
switch (XdrvMailbox.index)
{
case 4:
// Reset energy_usage.usage totals
RtcSettings.energy_usage.usage1_kWhtotal = values[0];
RtcSettings.energy_usage.usage2_kWhtotal = values[1];
Settings.energy_usage.usage1_kWhtotal = RtcSettings.energy_usage.usage1_kWhtotal;
Settings.energy_usage.usage2_kWhtotal = RtcSettings.energy_usage.usage2_kWhtotal;
break;
case 5:
// Reset energy_usage.return totals
RtcSettings.energy_usage.return1_kWhtotal = values[0];
RtcSettings.energy_usage.return2_kWhtotal = values[1];
Settings.energy_usage.return1_kWhtotal = RtcSettings.energy_usage.return1_kWhtotal;
Settings.energy_usage.return2_kWhtotal = RtcSettings.energy_usage.return2_kWhtotal;
break;
}
Response_P(PSTR("{\"%s\":{\"Usage\":[%d,%d],\"Export\":[%d,%d]}}"),
XdrvMailbox.command,
Settings.energy_usage.usage1_kWhtotal, Settings.energy_usage.usage2_kWhtotal,
Settings.energy_usage.return1_kWhtotal, Settings.energy_usage.return2_kWhtotal);
}
}
void CmndTariff(void)