Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/app_config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,7 @@ bool config_deserialize(DynamicJsonDocument &doc)
evse.configureCurrentSensorScale(doc["scale"], doc["offset"]);
config_modified = true;
DBUGLN("scale changed");
evse.getAmmeterSettings();
}
}
#endif
Expand Down
3 changes: 3 additions & 0 deletions src/evse_man.h
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,9 @@ class EvseManager : public MicroTasks::Task
long getCurrentSensorOffset() {
return _monitor.getCurrentSensorOffset();
}
void getAmmeterSettings() {
_monitor.getAmmeterSettings();
}

void enableFeature(uint8_t feature, bool enabled, std::function<void(int ret)> callback = NULL) {
_monitor.enableFeature(feature, enabled, callback);
Expand Down
14 changes: 13 additions & 1 deletion src/evse_monitor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,6 @@ void EvseMonitor::evseBoot(const char *firmware)
DBUGF("scale = %ld, offset = %ld", scale, offset);
_current_sensor_scale = scale;
_current_sensor_offset = offset;

_boot_ready.ready(EVSE_MONITOR_CURRENT_SENSOR_BOOT_READY);
}
});
Expand Down Expand Up @@ -802,3 +801,16 @@ bool EvseMonitor::importTotalEnergy()
});
return true;
}

void EvseMonitor::getAmmeterSettings()
{
_openevse.getAmmeterSettings([this](int ret, long scale, long offset)
{
if(RAPI_RESPONSE_OK == ret)
{
DBUGF("scale = %ld, offset = %ld", scale, offset);
_current_sensor_scale = scale;
_current_sensor_offset = offset;
}
});
}
1 change: 1 addition & 0 deletions src/evse_monitor.h
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@ class EvseMonitor : public MicroTasks::Task
return _energyMeter.reset(full, import);
}
bool importTotalEnergy();
void getAmmeterSettings();

bool publishEnergyMeter() {
return _energyMeter.publish();
Expand Down
Loading