Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OCPP compile warning fixes #253

Merged
merged 1 commit into from
Oct 8, 2021
Merged

OCPP compile warning fixes #253

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 14 additions & 14 deletions src/ocpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
ArduinoOcppTask *ArduinoOcppTask::instance = NULL;

ArduinoOcppTask::ArduinoOcppTask() : MicroTasks::Task() /*, bootReadyCallback(MicroTasksCallback([](){})) */ {

}

ArduinoOcppTask::~ArduinoOcppTask() {
Expand All @@ -29,7 +29,7 @@ ArduinoOcppTask::~ArduinoOcppTask() {
}

void ArduinoOcppTask::begin(EvseManager &evse, LcdTask &lcd) {

this->evse = &evse;
this->lcd = &lcd;

Expand Down Expand Up @@ -60,7 +60,7 @@ void ArduinoOcppTask::initializeArduinoOcpp() {

OCPP_initialize(ocppSocket, (float) DEFAULT_VOLTAGE, ArduinoOcpp::FilesystemOpt::Use, clockAdapter);

bootNotification("Advanced Series", "OpenEVSE", [lcd = lcd](JsonObject payload) {
bootNotification("Advanced Series", "OpenEVSE", [this](JsonObject payload) {
LCD_DISPLAY("OCPP connected!");
});

Expand All @@ -82,24 +82,24 @@ void ArduinoOcppTask::loadEvseBehavior() {
* Synchronize OpenEVSE data with OCPP-library data
*/

setPowerActiveImportSampler([evse = evse]() {
setPowerActiveImportSampler([this]() {
return (float) (evse->getAmps() * evse->getVoltage());
});

setEnergyActiveImportSampler([evse = evse] () {
setEnergyActiveImportSampler([this] () {
return (float) evse->getTotalEnergy();
});

setOnChargingRateLimitChange([&charging_limit = charging_limit, this] (float limit) { //limit = maximum charge rate in Watts
setOnChargingRateLimitChange([this] (float limit) { //limit = maximum charge rate in Watts
charging_limit = limit;
this->updateEvseClaim();
});

setEvRequestsEnergySampler([evse = evse] () {
setEvRequestsEnergySampler([this] () {
return (bool) evse->isCharging();
});

setConnectorEnergizedSampler([evse = evse] () {
setConnectorEnergizedSampler([this] () {
return evse->isActive();
});

Expand All @@ -114,13 +114,13 @@ void ArduinoOcppTask::loadEvseBehavior() {
if (idTagIsAccepted(payload)) {
startTransaction([this] (JsonObject payload) {
this->updateEvseClaim();
}, [lcd = lcd] () {
}, [this] () {
LCD_DISPLAY("Central system error");
});
} else {
LCD_DISPLAY("ID card not recognized");
}
}, [lcd = lcd] () {
}, [this] () {
LCD_DISPLAY("OCPP timeout");
});
} else {
Expand All @@ -131,24 +131,24 @@ void ArduinoOcppTask::loadEvseBehavior() {
LCD_DISPLAY("ID tag required");
}
this->updateEvseClaim();
}, [lcd = lcd] () {
}, [this] () {
LCD_DISPLAY("Central system error");
});
}

}
this->updateEvseClaim();
};

setOnRemoteStartTransactionSendConf([this, onVehicleConnect = onVehicleConnect] (JsonObject payload) {
setOnRemoteStartTransactionSendConf([this] (JsonObject payload) {
if (!operationIsAccepted(payload)){
//RemoteStartTransaction rejected! Do nothing
return;
}

startTransaction([this] (JsonObject payload) {
this->updateEvseClaim();
}, [lcd = lcd] () {
}, [this] () {
LCD_DISPLAY("Central system error");
});
});
Expand Down