Skip to content

OCPP 2.0.1 compatibility #6

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

Merged
merged 3 commits into from
Apr 21, 2024
Merged

OCPP 2.0.1 compatibility #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43ad0fc
add ProtocolVersion selector
matth-x Feb 27, 2024
c421466
backport OCPP 2.0.1 header
matth-x Apr 21, 2024
f0eadf7
update changelog
matth-x Apr 21, 2024
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### Added

- ~FTP over TLS support ([#3](https://github.com/matth-x/MicroOcppMongoose/pull/3))~ (see [#5](https://github.com/matth-x/MicroOcppMongoose/pull/5))
- OCPP 2.0.1 compatibility ([#6](https://github.com/matth-x/MicroOcppMongoose/pull/6))

### Removed

Expand Down
10 changes: 6 additions & 4 deletions src/MicroOcppMongooseClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// matth-x/MicroOcppMongoose
// Copyright Matthias Akstaller 2019 - 2023
// Copyright Matthias Akstaller 2019 - 2024
// GPL-3.0 License (see LICENSE)

#include "MicroOcppMongooseClient.h"
Expand All @@ -23,7 +23,8 @@ MOcppMongooseClient::MOcppMongooseClient(struct mg_mgr *mgr,
const char *charge_box_id_factory,
const char *auth_key_factory,
const char *CA_cert_factory,
std::shared_ptr<FilesystemAdapter> filesystem) : mgr(mgr) {
std::shared_ptr<FilesystemAdapter> filesystem,
ProtocolVersion protocolVersion) : mgr(mgr), protocolVersion(protocolVersion) {

bool readonly;

Expand Down Expand Up @@ -195,7 +196,7 @@ void MOcppMongooseClient::maintainWsConn() {
this,
opts,
url.c_str(),
"ocpp1.6",
protocolVersion.major == 2 ? "ocpp2.0.1" : "ocpp1.6",
*extra_headers ? extra_headers : nullptr);

if (websocket) {
Expand All @@ -209,7 +210,8 @@ void MOcppMongooseClient::maintainWsConn() {
url.c_str(),
ws_cb,
this,
"%s%s%s\r\n", "Sec-WebSocket-Protocol: ocpp1.6",
"Sec-WebSocket-Protocol: %s%s%s\r\n",
protocolVersion.major == 2 ? "ocpp2.0.1" : "ocpp1.6",
basic_auth64.empty() ? "" : "\r\nAuthorization: Basic ",
basic_auth64.empty() ? "" : basic_auth64.c_str()); // Create client
#endif
Expand Down
6 changes: 5 additions & 1 deletion src/MicroOcppMongooseClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

#include "mongoose.h"
#include <MicroOcpp/Core/Connection.h>
#include <MicroOcpp/Version.h>

#include <string>
#include <memory>
Expand Down Expand Up @@ -61,6 +62,8 @@ class MOcppMongooseClient : public MicroOcpp::Connection {
bool connection_closing {false};
ReceiveTXTcallback receiveTXTcallback = [] (const char *, size_t) {return false;};

ProtocolVersion protocolVersion;

void reconnect();

void maintainWsConn();
Expand All @@ -71,7 +74,8 @@ class MOcppMongooseClient : public MicroOcpp::Connection {
const char *charge_box_id_factory = nullptr,
const char *auth_key_factory = nullptr,
const char *CA_cert_factory = nullptr, //forwards this string to Mongoose as ssl_ca_cert (see https://github.com/cesanta/mongoose/blob/ab650ec5c99ceb52bb9dc59e8e8ec92a2724932b/mongoose.h#L4192)
std::shared_ptr<MicroOcpp::FilesystemAdapter> filesystem = nullptr);
std::shared_ptr<MicroOcpp::FilesystemAdapter> filesystem = nullptr,
ProtocolVersion protocolVersion = ProtocolVersion(1,6));

~MOcppMongooseClient();

Expand Down