Skip to content

Commit 46dc333

Browse files
c-jimenezc-jimenez
committed
[ocpp20] Start of BasicChargePoint implementation
1 parent 203e2a9 commit 46dc333

40 files changed

+5677
-730
lines changed

‎.vscode/launch.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,15 @@
1010
"arguments": "-r",
1111
"valuesFormatting": "parseText"
1212
},
13+
{
14+
"type": "gdb",
15+
"request": "launch",
16+
"name": "x86 Basic CP debug",
17+
"target": "${workspaceRoot}/bin/gcc_native/quick_start_basicchargepoint20",
18+
"cwd": "${workspaceRoot}/bin/gcc_native/",
19+
"arguments": "-r",
20+
"valuesFormatting": "parseText"
21+
},
1322
{
1423
"type": "gdb",
1524
"request": "launch",

‎examples/ocpp20/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
# Subdirectories
33
add_subdirectory(common)
4+
add_subdirectory(quick_start_basicchargepoint)
45
add_subdirectory(quick_start_centralsystem)
56
add_subdirectory(quick_start_chargepoint)
67
add_subdirectory(quick_start_localcontroller)

‎examples/ocpp20/common/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# Common utility class for examples library
33
add_library(examples_common20 OBJECT
44
DefaultChargePointEventsHandler.cpp
5+
DefaultBasicChargePointEventsHandler.cpp
56
DefaultCentralSystemEventsHandler.cpp
67
DefaultLocalControllerEventsHandler.cpp
78
)

‎examples/ocpp20/common/DefaultBasicChargePointEventsHandler.cpp‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
/*
2+
Copyright (c) 2020 Cedric Jimenez
3+
This file is part of OpenOCPP.
4+
5+
OpenOCPP is free software: you can redistribute it and/or modify
6+
it under the terms of the GNU Lesser General Public License as published by
7+
the Free Software Foundation, either version 2.1 of the License, or
8+
(at your option) any later version.
9+
10+
OpenOCPP is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
GNU Lesser General Public License for more details.
14+
15+
You should have received a copy of the GNU Lesser General Public License
16+
along with OpenOCPP. If not, see <http://www.gnu.org/licenses/>.
17+
*/
18+
19+
#include "DefaultBasicChargePointEventsHandler.h"
20+
#include "ChargePointDemoConfig.h"
21+
22+
#include <iostream>
23+
24+
using namespace std;
25+
using namespace ocpp::types;
26+
using namespace ocpp::types::ocpp20;
27+
28+
/** @brief Constructor */
29+
DefaultBasicChargePointEventsHandler::DefaultBasicChargePointEventsHandler(ChargePointDemoConfig& config,
30+
const std::filesystem::path& working_dir)
31+
: m_config(config), m_working_dir(working_dir), m_is_connected(false)
32+
{
33+
}
34+
35+
/** @brief Destructor */
36+
DefaultBasicChargePointEventsHandler::~DefaultBasicChargePointEventsHandler() { }
37+
38+
/** @copydoc void IChargePointEventsHandler20::connectionFailed(ocpp::types::ocpp20::RegistrationStatusEnumType) */
39+
void DefaultBasicChargePointEventsHandler::connectionFailed(ocpp::types::ocpp20::RegistrationStatusEnumType status)
40+
{
41+
cout << "Connection failed, previous registration status : " << RegistrationStatusEnumTypeHelper.toString(status) << endl;
42+
}
43+
44+
/** @copydoc void IChargePointEventsHandler20::connectionStateChanged(bool) */
45+
void DefaultBasicChargePointEventsHandler::connectionStateChanged(bool isConnected)
46+
{
47+
cout << "Connection state changed : " << isConnected << endl;
48+
m_is_connected = isConnected;
49+
}
50+
51+
/** @copydoc void IChargePointEventsHandler20::bootNotification(ocpp::types::ocpp20::RegistrationStatusEnumType, const ocpp::types::DateTime&) */
52+
void DefaultBasicChargePointEventsHandler::bootNotification(ocpp::types::ocpp20::RegistrationStatusEnumType status,
53+
const ocpp::types::DateTime& datetime)
54+
{
55+
cout << "Bootnotification : " << RegistrationStatusEnumTypeHelper.toString(status) << " - " << datetime.str() << endl;
56+
}
57+
58+
/** @copydoc void IChargePointEventsHandler20::datetimeReceived(ocpp::types::DateTime) */
59+
void DefaultBasicChargePointEventsHandler::datetimeReceived(const ocpp::types::DateTime& datetime)
60+
{
61+
cout << "Date time received : " << datetime.str() << endl;
62+
}
63+
64+
// IDeviceModel20 interface
65+
66+
/** @brief Called to retrieve the value of a variable */
67+
void DefaultBasicChargePointEventsHandler::getVariable(ocpp::types::ocpp20::GetVariableResultType& var)
68+
{
69+
std::string value;
70+
m_config.getDeviceModelValue(var.component, var.variable, value);
71+
var.attributeValue.value().assign(std::move(value));
72+
var.attributeStatus = GetVariableStatusEnumType::Accepted;
73+
}
74+
75+
/** @brief Called to set the value of a variable */
76+
ocpp::types::ocpp20::SetVariableStatusEnumType DefaultBasicChargePointEventsHandler::setVariable(
77+
const ocpp::types::ocpp20::SetVariableDataType& var)
78+
{
79+
m_config.setDeviceModelValue(var.component, var.variable, var.attributeValue.str());
80+
return SetVariableStatusEnumType::Accepted;
81+
}

‎examples/ocpp20/common/DefaultBasicChargePointEventsHandler.h‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
/*
2+
Copyright (c) 2020 Cedric Jimenez
3+
This file is part of OpenOCPP.
4+
5+
OpenOCPP is free software: you can redistribute it and/or modify
6+
it under the terms of the GNU Lesser General Public License as published by
7+
the Free Software Foundation, either version 2.1 of the License, or
8+
(at your option) any later version.
9+
10+
OpenOCPP is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
GNU Lesser General Public License for more details.
14+
15+
You should have received a copy of the GNU Lesser General Public License
16+
along with OpenOCPP. If not, see <http://www.gnu.org/licenses/>.
17+
*/
18+
19+
#ifndef OPENOCPP_DEFAULTBASICCHARGEPOINTEVENTSHANDLERCHARGEPOINT_H
20+
#define OPENOCPP_DEFAULTBASICCHARGEPOINTEVENTSHANDLERCHARGEPOINT_H
21+
22+
#include "IBasicChargePointEventsHandler20.h"
23+
#include "IDeviceModel20.h"
24+
25+
#include <filesystem>
26+
27+
class ChargePointDemoConfig;
28+
29+
/** @brief Interface for charge point event handlers implementations */
30+
class DefaultBasicChargePointEventsHandler : public ocpp::chargepoint::ocpp20::IBasicChargePointEventsHandler,
31+
public ocpp::chargepoint::ocpp20::IDeviceModel::IListener
32+
{
33+
public:
34+
/** @brief Constructor */
35+
DefaultBasicChargePointEventsHandler(ChargePointDemoConfig& config, const std::filesystem::path& working_dir);
36+
37+
/** @brief Destructor */
38+
virtual ~DefaultBasicChargePointEventsHandler();
39+
40+
/** @copydoc void IChargePointEventsHandler20::connectionFailed(ocpp::types::ocpp20::RegistrationStatusEnumType) */
41+
void connectionFailed(ocpp::types::ocpp20::RegistrationStatusEnumType status) override;
42+
43+
/** @copydoc void IChargePointEventsHandler20::connectionStateChanged(bool) */
44+
void connectionStateChanged(bool isConnected) override;
45+
46+
/** @copydoc void IChargePointEventsHandler20::bootNotification(ocpp::types::ocpp20::RegistrationStatusEnumType, const ocpp::types::DateTime&) */
47+
void bootNotification(ocpp::types::ocpp20::RegistrationStatusEnumType status, const ocpp::types::DateTime& datetime) override;
48+
49+
/** @copydoc void IChargePointEventsHandler20::datetimeReceived(ocpp::types::DateTime) */
50+
void datetimeReceived(const ocpp::types::DateTime& datetime) override;
51+
52+
// IDeviceModel interface
53+
54+
/** @brief Called to retrieve the value of a variable */
55+
void getVariable(ocpp::types::ocpp20::GetVariableResultType& var) override;
56+
57+
/** @brief Called to set the value of a variable */
58+
ocpp::types::ocpp20::SetVariableStatusEnumType setVariable(const ocpp::types::ocpp20::SetVariableDataType& var) override;
59+
60+
private:
61+
/** @brief Configuration */
62+
ChargePointDemoConfig& m_config;
63+
/** @brief Working directory */
64+
std::filesystem::path m_working_dir;
65+
/** @brief Indicate if the Charge Point is connected */
66+
bool m_is_connected;
67+
};
68+
69+
#endif // OPENOCPP_DEFAULTBASICCHARGEPOINTEVENTSHANDLERCHARGEPOINT_H

‎examples/ocpp20/common/DefaultChargePointEventsHandler.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ using namespace ocpp::messages;
4242
using namespace ocpp::messages::ocpp20;
4343

4444
/** @brief Constructor */
45-
DefaultChargePointEventsHandler::DefaultChargePointEventsHandler(ChargePointDemoConfig& config,
46-
ocpp::chargepoint::ocpp20::IDeviceModel20& device_model,
47-
const std::filesystem::path& working_dir)
45+
DefaultChargePointEventsHandler::DefaultChargePointEventsHandler(ChargePointDemoConfig& config,
46+
ocpp::chargepoint::ocpp20::IDeviceModel& device_model,
47+
const std::filesystem::path& working_dir)
4848
: m_config(config), m_device_model(device_model), m_chargepoint(nullptr), m_working_dir(working_dir), m_is_connected(false)
4949
{
5050
m_device_model.registerListener(*this);
@@ -74,6 +74,7 @@ void DefaultChargePointEventsHandler::getVariable(ocpp::types::ocpp20::GetVariab
7474
std::string value;
7575
m_config.getDeviceModelValue(var.component, var.variable, value);
7676
var.attributeValue.value().assign(std::move(value));
77+
var.attributeStatus = GetVariableStatusEnumType::Accepted;
7778
}
7879

7980
/** @brief Called to set the value of a variable */

‎examples/ocpp20/common/DefaultChargePointEventsHandler.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ class ChargePointDemoConfig;
3636

3737
/** @brief Default charge point event handlers implementation for the examples */
3838
class DefaultChargePointEventsHandler : public ocpp::chargepoint::ocpp20::IChargePointEventsHandler20,
39-
public ocpp::chargepoint::ocpp20::IDeviceModel20::IListener
39+
public ocpp::chargepoint::ocpp20::IDeviceModel::IListener
4040
{
4141
public:
4242
/** @brief Constructor */
43-
DefaultChargePointEventsHandler(ChargePointDemoConfig& config,
44-
ocpp::chargepoint::ocpp20::IDeviceModel20& device_model,
45-
const std::filesystem::path& working_dir);
43+
DefaultChargePointEventsHandler(ChargePointDemoConfig& config,
44+
ocpp::chargepoint::ocpp20::IDeviceModel& device_model,
45+
const std::filesystem::path& working_dir);
4646

4747
/** @brief Destructor */
4848
virtual ~DefaultChargePointEventsHandler();
@@ -53,7 +53,7 @@ class DefaultChargePointEventsHandler : public ocpp::chargepoint::ocpp20::ICharg
5353
/** @brief Indicate if the Charge Point is connected */
5454
bool isConnected() const { return m_is_connected; }
5555

56-
// IDeviceModel20 interface
56+
// IDeviceModel interface
5757

5858
/** @brief Called to retrieve the value of a variable */
5959
void getVariable(ocpp::types::ocpp20::GetVariableResultType& var) override;
@@ -325,7 +325,7 @@ class DefaultChargePointEventsHandler : public ocpp::chargepoint::ocpp20::ICharg
325325
/** @brief Configuration */
326326
ChargePointDemoConfig& m_config;
327327
/** @brief Device model */
328-
ocpp::chargepoint::ocpp20::IDeviceModel20& m_device_model;
328+
ocpp::chargepoint::ocpp20::IDeviceModel& m_device_model;
329329
/** @brief Associated Charge Point instance */
330330
ocpp::chargepoint::ocpp20::IChargePoint20* m_chargepoint;
331331
/** @brief Working directory */

‎examples/ocpp20/common/config/ChargePointConfig.h‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,21 @@ class ChargePointConfig : public ocpp::config::IChargePointConfig20
8787
* (Warning : enabling this feature is not recommended in production) */
8888
bool tlsSkipServerNameCheck() const override { return getBool("TlsSkipServerNameCheck"); }
8989

90+
// Charge point identification
91+
92+
/** @brief Charge point model */
93+
std::string chargePointModel() const override { return getString("ChargePointModel"); }
94+
/** @brief Charge point serial number */
95+
std::string chargePointSerialNumber() const override { return getString("ChargePointSerialNumber"); }
96+
/** @brief Charge point vendor */
97+
std::string chargePointVendor() const override { return getString("ChargePointVendor"); }
98+
/** @brief Firmware version */
99+
std::string firmwareVersion() const override { return getString("FirmwareVersion"); }
100+
/** @brief ICCID of the moden's SIM card */
101+
std::string iccid() const override { return getString("Iccid"); }
102+
/** @brief IMSI of the moden's SIM card */
103+
std::string imsi() const override { return getString("Imsi"); }
104+
90105
// Logs
91106

92107
/** @brief Maximum number of entries in the log (0 = no logs in database) */

‎examples/ocpp20/common/config/ChargePointDemoConfig.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ class ChargePointDemoConfig
6262
return true;
6363
}
6464

65+
/** @brief Save the configuration */
66+
bool save() { return m_config.store(); }
67+
6568
private:
6669
/** @brief Configuration file */
6770
ocpp::helpers::IniFile m_config;

‎examples/ocpp20/quick_start_basicchargepoint/CMakeLists.txt‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
######################################################
2+
# Quick start charge point example project #
3+
######################################################
4+
5+
# Executable target
6+
add_executable(quick_start_basicchargepoint20
7+
main.cpp
8+
)
9+
10+
# Additionnal libraries path
11+
target_link_directories(quick_start_basicchargepoint20 PRIVATE ${BIN_DIR})
12+
13+
# Dependencies
14+
target_link_libraries(quick_start_basicchargepoint20
15+
examples_common20
16+
)
17+
18+
19+
# Copy to binary directory
20+
ADD_CUSTOM_COMMAND(TARGET quick_start_basicchargepoint20
21+
POST_BUILD
22+
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/config/quick_start_basicchargepoint20.ini ${BIN_DIR}/
23+
)
24+
ADD_CUSTOM_COMMAND(TARGET quick_start_basicchargepoint20
25+
POST_BUILD
26+
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/config/quick_start_basicchargepoint20.json ${BIN_DIR}/
27+
)

0 commit comments

Comments
 (0)