Skip to content

Commit

Permalink
[ocpp20] Update messages and types names
Browse files Browse the repository at this point in the history
  • Loading branch information
@c-jimenez
c-jimenez committed Oct 23, 2024
1 parent 072711c commit da82f0c
Show file tree
Hide file tree
Showing 463 changed files with 11,238 additions and 11,325 deletions.
6 changes: 3 additions & 3 deletions .vscode/launch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"type": "gdb",
"request": "launch",
"name": "x86 CP debug",
"target": "${workspaceRoot}/bin/gcc_native/quick_start_chargepoint",
"target": "${workspaceRoot}/bin/gcc_native/quick_start_chargepoint20",
"cwd": "${workspaceRoot}/bin/gcc_native/",
"arguments": "-r",
"valuesFormatting": "parseText"
Expand All @@ -14,7 +14,7 @@
"type": "gdb",
"request": "launch",
"name": "x86 CS debug",
"target": "${workspaceRoot}/bin/gcc_native/quick_start_centralsystem",
"target": "${workspaceRoot}/bin/gcc_native/quick_start_centralsystem20",
"cwd": "${workspaceRoot}/bin/gcc_native/",
"arguments": "-r",
"valuesFormatting": "parseText"
Expand All @@ -23,7 +23,7 @@
"type": "gdb",
"request": "launch",
"name": "x86 LC debug",
"target": "${workspaceRoot}/bin/gcc_native/quick_start_localcontroller",
"target": "${workspaceRoot}/bin/gcc_native/quick_start_localcontroller20",
"cwd": "${workspaceRoot}/bin/gcc_native/",
"arguments": "-r",
"valuesFormatting": "parseText"
Expand Down
310 changes: 154 additions & 156 deletions examples/ocpp20/common/DefaultCentralSystemEventsHandler.cpp
View file

Large diffs are not rendered by default.

236 changes: 118 additions & 118 deletions examples/ocpp20/common/DefaultCentralSystemEventsHandler.h
View file

Large diffs are not rendered by default.

496 changes: 248 additions & 248 deletions examples/ocpp20/common/DefaultChargePointEventsHandler.cpp
View file

Large diffs are not rendered by default.

392 changes: 196 additions & 196 deletions examples/ocpp20/common/DefaultChargePointEventsHandler.h
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions examples/ocpp20/common/DefaultLocalControllerEventsHandler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ void DefaultLocalControllerEventsHandler::chargePointConnected(
std::weak_ptr<ocpp::localcontroller::ocpp20::IChargePointProxy20> p_chargepoint = chargepoint;

// Specific handling of heartbeat message
auto heartbeat_handler = [p_chargepoint](const ocpp::messages::ocpp20::Heartbeat20Req& request,
ocpp::messages::ocpp20::Heartbeat20Conf& response,
std::string& error_code,
std::string& error_message)
auto heartbeat_handler = [p_chargepoint](const ocpp::messages::ocpp20::HeartbeatReq& request,
ocpp::messages::ocpp20::HeartbeatConf& response,
std::string& error_code,
std::string& error_message)
{
bool ret = true;
auto chargepoint = p_chargepoint.lock();
Expand Down
22 changes: 11 additions & 11 deletions examples/ocpp20/quick_start_centralsystem/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,19 +134,19 @@ int main(int argc, char* argv[])
std::cout << "---------------------------------------------" << std::endl;

std::cout << "Read whole charge point configuration..." << std::endl;
GetBaseReport20Req get_base_report_req;
GetBaseReport20Conf get_base_report_conf;
GetBaseReportReq get_base_report_req;
GetBaseReportConf get_base_report_conf;
get_base_report_req.requestId = std::chrono::system_clock::now().time_since_epoch().count();
get_base_report_req.reportBase = ReportBaseEnumType20::ConfigurationInventory;
get_base_report_req.reportBase = ReportBaseEnumType::ConfigurationInventory;
if (!chargepoint->call(get_base_report_req, get_base_report_conf, error, error_msg))
{
std::cout << "Failed : error = " << error << " error_msg = " << error_msg << std::endl;
}

std::cout << "Configure heartbeat interval..." << std::endl;
SetVariables20Req set_vars_req;
SetVariables20Conf set_vars_conf;
SetVariableDataType20 var;
SetVariablesReq set_vars_req;
SetVariablesConf set_vars_conf;
SetVariableDataType var;
var.variable.name.assign("HeartbeatInterval");
var.component.name.assign("OCPPCommCtrlr");
var.attributeValue.assign("10");
Expand All @@ -161,9 +161,9 @@ int main(int argc, char* argv[])
}

std::cout << "Trigger status notification..." << std::endl;
TriggerMessage20Req trigger_msg_req;
TriggerMessage20Conf trigger_msg_conf;
trigger_msg_req.requestedMessage = MessageTriggerEnumType20::StatusNotification;
TriggerMessageReq trigger_msg_req;
TriggerMessageConf trigger_msg_conf;
trigger_msg_req.requestedMessage = MessageTriggerEnumType::StatusNotification;
if (chargepoint->call(trigger_msg_req, trigger_msg_conf, error, error_msg))
{
std::cout << "Done!" << std::endl;
Expand All @@ -175,7 +175,7 @@ int main(int argc, char* argv[])

std::cout << "Trigger meter values on evse 1..." << std::endl;
trigger_msg_req.evse.value().id = 1;
trigger_msg_req.requestedMessage = MessageTriggerEnumType20::MeterValues;
trigger_msg_req.requestedMessage = MessageTriggerEnumType::MeterValues;
if (chargepoint->call(trigger_msg_req, trigger_msg_conf, error, error_msg))
{
std::cout << "Done!" << std::endl;
Expand All @@ -187,7 +187,7 @@ int main(int argc, char* argv[])

std::cout << "Trigger heartbeat..." << std::endl;
trigger_msg_req.evse.clear();
trigger_msg_req.requestedMessage = MessageTriggerEnumType20::Heartbeat;
trigger_msg_req.requestedMessage = MessageTriggerEnumType::Heartbeat;
if (chargepoint->call(trigger_msg_req, trigger_msg_conf, error, error_msg))
{
std::cout << "Done!" << std::endl;
Expand Down
56 changes: 28 additions & 28 deletions examples/ocpp20/quick_start_chargepoint/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ int main(int argc, char* argv[])

auto last_boot_notif = std::chrono::steady_clock::time_point();
std::chrono::seconds hb_boot_notif_interval = std::chrono::seconds(10);
RegistrationStatusEnumType20 registration_status = RegistrationStatusEnumType20::Rejected;
RegistrationStatusEnumType registration_status = RegistrationStatusEnumType::Rejected;

unsigned int transaction_id = std::chrono::system_clock::now().time_since_epoch().count();

Expand All @@ -142,17 +142,17 @@ int main(int argc, char* argv[])
std::cout << "Connected to Central System!" << std::endl;

// Wait to be accepted by Central System
while (registration_status != RegistrationStatusEnumType20::Accepted)
while (registration_status != RegistrationStatusEnumType::Accepted)
{
// Send boot notification message periodically
auto now = std::chrono::steady_clock::now();
if ((now - last_boot_notif) >= hb_boot_notif_interval)
{
std::cout << "Sending BootNotification request..." << std::endl;

BootNotification20Req boot_notif_req;
BootNotification20Conf boot_notif_conf;
boot_notif_req.reason = BootReasonEnumType20::PowerUp;
BootNotificationReq boot_notif_req;
BootNotificationConf boot_notif_conf;
boot_notif_req.reason = BootReasonEnumType::PowerUp;
boot_notif_req.chargingStation.vendorName.assign("Open OCPP");
boot_notif_req.chargingStation.model.assign("Quick Start CS OCPP 2.0.1");
boot_notif_req.chargingStation.firmwareVersion.value().assign("1.2.3.4");
Expand Down Expand Up @@ -184,21 +184,21 @@ int main(int argc, char* argv[])
{
// Ask for authorization on a tag
std::cout << "Checking for id tag " << id_tag << " authorization..." << std::endl;
Authorize20Req authorize_req;
Authorize20Conf authorize_conf;
AuthorizeReq authorize_req;
AuthorizeConf authorize_conf;
authorize_req.idToken.idToken.assign(id_tag);
authorize_req.idToken.type = IdTokenEnumType20::ISO14443;
authorize_req.idToken.type = IdTokenEnumType::ISO14443;
if (charge_point->call(authorize_req, authorize_conf, error, error_msg))
{
if (authorize_conf.idTokenInfo.status == AuthorizationStatusEnumType20::Accepted)
if (authorize_conf.idTokenInfo.status == AuthorizationStatusEnumType::Accepted)
{
std::cout << "Id tag authorized" << std::endl;

// Occupied state
StatusNotification20Req status_req;
StatusNotification20Conf status_conf;
StatusNotificationReq status_req;
StatusNotificationConf status_conf;
status_req.timestamp = DateTime::now();
status_req.connectorStatus = ConnectorStatusEnumType20::Occupied;
status_req.connectorStatus = ConnectorStatusEnumType::Occupied;
status_req.evseId = evse_id;
status_req.connectorId = connector_id;
charge_point->call(status_req, status_conf, error, error_msg);
Expand All @@ -207,49 +207,49 @@ int main(int argc, char* argv[])
// Try to start charging session
transaction_id++;

TransactionEvent20Req tx_event_req;
TransactionEvent20Conf tx_event_conf;
TransactionEventReq tx_event_req;
TransactionEventConf tx_event_conf;
tx_event_req.seqNo = 1;
tx_event_req.eventType = TransactionEventEnumType20::Started;
tx_event_req.eventType = TransactionEventEnumType::Started;
tx_event_req.timestamp = DateTime::now();
tx_event_req.triggerReason = TriggerReasonEnumType20::Authorized;
tx_event_req.triggerReason = TriggerReasonEnumType::Authorized;
tx_event_req.evse.value().id = evse_id;
tx_event_req.evse.value().connectorId = connector_id;
tx_event_req.transactionInfo.transactionId.assign(std::to_string(transaction_id));
tx_event_req.transactionInfo.chargingState.value() = ChargingStateEnumType20::EVConnected;
tx_event_req.transactionInfo.chargingState.value() = ChargingStateEnumType::EVConnected;
tx_event_req.idToken.value().idToken.assign(id_tag);
tx_event_req.idToken.value().type = IdTokenEnumType20::ISO14443;
tx_event_req.idToken.value().type = IdTokenEnumType::ISO14443;
if (charge_point->call(tx_event_req, tx_event_conf, error, error_msg))
{
if (!tx_event_conf.idTokenInfo.isSet() ||
(tx_event_conf.idTokenInfo.value().status == AuthorizationStatusEnumType20::Accepted))
(tx_event_conf.idTokenInfo.value().status == AuthorizationStatusEnumType::Accepted))
{
std::cout << "Transaction authorized, start charging" << std::endl;

// Charging state
tx_event_req.seqNo++;
tx_event_req.eventType = TransactionEventEnumType20::Updated;
tx_event_req.eventType = TransactionEventEnumType::Updated;
tx_event_req.timestamp = DateTime::now();
tx_event_req.triggerReason = TriggerReasonEnumType20::CablePluggedIn;
tx_event_req.transactionInfo.chargingState.value() = ChargingStateEnumType20::Charging;
tx_event_req.triggerReason = TriggerReasonEnumType::CablePluggedIn;
tx_event_req.transactionInfo.chargingState.value() = ChargingStateEnumType::Charging;
tx_event_req.idToken.clear();
charge_point->call(tx_event_req, tx_event_conf, error, error_msg);
std::this_thread::sleep_for(std::chrono::seconds(30u));

// End transaction
tx_event_req.seqNo++;
tx_event_req.eventType = TransactionEventEnumType20::Ended;
tx_event_req.eventType = TransactionEventEnumType::Ended;
tx_event_req.timestamp = DateTime::now();
tx_event_req.triggerReason = TriggerReasonEnumType20::EnergyLimitReached;
tx_event_req.transactionInfo.chargingState.value() = ChargingStateEnumType20::Idle;
tx_event_req.triggerReason = TriggerReasonEnumType::EnergyLimitReached;
tx_event_req.transactionInfo.chargingState.value() = ChargingStateEnumType::Idle;
charge_point->call(tx_event_req, tx_event_conf, error, error_msg);

std::this_thread::sleep_for(std::chrono::seconds(1u));
}
else
{
std::cout << "Transaction not authorized by Central System : "
<< AuthorizationStatusEnumType20Helper.toString(tx_event_conf.idTokenInfo.value().status)
<< AuthorizationStatusEnumTypeHelper.toString(tx_event_conf.idTokenInfo.value().status)
<< std::endl;
}
}
Expand All @@ -260,13 +260,13 @@ int main(int argc, char* argv[])

// Available state
status_req.timestamp = DateTime::now();
status_req.connectorStatus = ConnectorStatusEnumType20::Available;
status_req.connectorStatus = ConnectorStatusEnumType::Available;
charge_point->call(status_req, status_conf, error, error_msg);
}
else
{
std::cout << "Id tag not authorized by Central System : "
<< AuthorizationStatusEnumType20Helper.toString(authorize_conf.idTokenInfo.status) << std::endl;
<< AuthorizationStatusEnumTypeHelper.toString(authorize_conf.idTokenInfo.status) << std::endl;
}
}
else
Expand Down
22 changes: 11 additions & 11 deletions examples/ocpp20/quick_start_localcontroller/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,19 +138,19 @@ int main(int argc, char* argv[])
std::cout << "---------------------------------------------" << std::endl;

std::cout << "Read whole charge point configuration..." << std::endl;
GetBaseReport20Req get_base_report_req;
GetBaseReport20Conf get_base_report_conf;
GetBaseReportReq get_base_report_req;
GetBaseReportConf get_base_report_conf;
get_base_report_req.requestId = std::chrono::system_clock::now().time_since_epoch().count();
get_base_report_req.reportBase = ReportBaseEnumType20::ConfigurationInventory;
get_base_report_req.reportBase = ReportBaseEnumType::ConfigurationInventory;
if (!chargepoint->call(get_base_report_req, get_base_report_conf, error, error_msg))
{
std::cout << "Failed : error = " << error << " error_msg = " << error_msg << std::endl;
}

std::cout << "Configure heartbeat interval..." << std::endl;
SetVariables20Req set_vars_req;
SetVariables20Conf set_vars_conf;
SetVariableDataType20 var;
SetVariablesReq set_vars_req;
SetVariablesConf set_vars_conf;
SetVariableDataType var;
var.variable.name.assign("HeartbeatInterval");
var.component.name.assign("OCPPCommCtrlr");
var.attributeValue.assign("10");
Expand All @@ -165,9 +165,9 @@ int main(int argc, char* argv[])
}

std::cout << "Trigger status notification..." << std::endl;
TriggerMessage20Req trigger_msg_req;
TriggerMessage20Conf trigger_msg_conf;
trigger_msg_req.requestedMessage = MessageTriggerEnumType20::StatusNotification;
TriggerMessageReq trigger_msg_req;
TriggerMessageConf trigger_msg_conf;
trigger_msg_req.requestedMessage = MessageTriggerEnumType::StatusNotification;
if (chargepoint->call(trigger_msg_req, trigger_msg_conf, error, error_msg))
{
std::cout << "Done!" << std::endl;
Expand All @@ -179,7 +179,7 @@ int main(int argc, char* argv[])

std::cout << "Trigger meter values on evse 1..." << std::endl;
trigger_msg_req.evse.value().id = 1;
trigger_msg_req.requestedMessage = MessageTriggerEnumType20::MeterValues;
trigger_msg_req.requestedMessage = MessageTriggerEnumType::MeterValues;
if (chargepoint->call(trigger_msg_req, trigger_msg_conf, error, error_msg))
{
std::cout << "Done!" << std::endl;
Expand All @@ -191,7 +191,7 @@ int main(int argc, char* argv[])

std::cout << "Trigger heartbeat..." << std::endl;
trigger_msg_req.evse.clear();
trigger_msg_req.requestedMessage = MessageTriggerEnumType20::Heartbeat;
trigger_msg_req.requestedMessage = MessageTriggerEnumType::Heartbeat;
if (chargepoint->call(trigger_msg_req, trigger_msg_conf, error, error_msg))
{
std::cout << "Done!" << std::endl;
Expand Down
Loading

0 comments on commit da82f0c

Please sign in to comment.