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

OCPP1.6 module: Now publishing EnhancedChargingSchedules #547

Merged
merged 3 commits into from
Feb 19, 2024
Merged

OCPP1.6 module: Now publishing EnhancedChargingSchedules #547

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
d0a25cd
OCPP1.6 module: Now publishing EnhancedChargingSchedules instead of C…
Pietfried Feb 2, 2024
0b19069
Update dependencies.yaml
Pietfried Feb 15, 2024
b06e69d
Merge branch 'main' into feature/ocpp16-enhanced-composite-schedules
Pietfried Feb 19, 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
2 changes: 1 addition & 1 deletion dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ libcurl:
# OCPP
libocpp:
git: https://github.com/EVerest/libocpp.git
git_tag: dfb29de
git_tag: c9827c5
cmake_condition: "EVEREST_DEPENDENCY_ENABLED_LIBOCPP"
# Josev
Josev:
Expand Down
13 changes: 7 additions & 6 deletions modules/OCPP/OCPP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ void create_empty_user_config(const fs::path& user_config_path) {
}
}

void OCPP::set_external_limits(const std::map<int32_t, ocpp::v16::ChargingSchedule>& charging_schedules) {
void OCPP::set_external_limits(const std::map<int32_t, ocpp::v16::EnhancedChargingSchedule>& charging_schedules) {
const auto start_time = ocpp::DateTime();

// iterate over all schedules reported by the libocpp to create ExternalLimits
Expand Down Expand Up @@ -186,7 +186,8 @@ void OCPP::set_external_limits(const std::map<int32_t, ocpp::v16::ChargingSchedu
}
}

void OCPP::publish_charging_schedules(const std::map<int32_t, ocpp::v16::ChargingSchedule>& charging_schedules) {
void OCPP::publish_charging_schedules(
const std::map<int32_t, ocpp::v16::EnhancedChargingSchedule>& charging_schedules) {
// publish the schedule over mqtt
Object j;
for (const auto charging_schedule : charging_schedules) {
Expand Down Expand Up @@ -702,8 +703,8 @@ void OCPP::ready() {
}

this->charging_schedules_timer = std::make_unique<Everest::SteadyTimer>([this]() {
const auto charging_schedules =
this->charge_point->get_all_composite_charging_schedules(this->config.PublishChargingScheduleDurationS);
const auto charging_schedules = this->charge_point->get_all_enhanced_composite_charging_schedules(
this->config.PublishChargingScheduleDurationS);
this->set_external_limits(charging_schedules);
this->publish_charging_schedules(charging_schedules);
});
Expand All @@ -715,8 +716,8 @@ void OCPP::ready() {
// this is executed when CSMS sends new ChargingProfile that is accepted by
// the ChargePoint
EVLOG_info << "Received new Charging Schedules from CSMS";
const auto charging_schedules =
this->charge_point->get_all_composite_charging_schedules(this->config.PublishChargingScheduleDurationS);
const auto charging_schedules = this->charge_point->get_all_enhanced_composite_charging_schedules(
this->config.PublishChargingScheduleDurationS);
this->set_external_limits(charging_schedules);
this->publish_charging_schedules(charging_schedules);
});
Expand Down
4 changes: 2 additions & 2 deletions modules/OCPP/OCPP.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ class OCPP : public Everest::ModuleBase {
// ev@211cfdbe-f69a-4cd6-a4ec-f8aaa3d1b6c8:v1
// insert your private definitions here
std::filesystem::path ocpp_share_path;
void set_external_limits(const std::map<int32_t, ocpp::v16::ChargingSchedule>& charging_schedules);
void publish_charging_schedules(const std::map<int32_t, ocpp::v16::ChargingSchedule>& charging_schedules);
void set_external_limits(const std::map<int32_t, ocpp::v16::EnhancedChargingSchedule>& charging_schedules);
void publish_charging_schedules(const std::map<int32_t, ocpp::v16::EnhancedChargingSchedule>& charging_schedules);

void init_evse_subscriptions(); // initialize subscriptions to all EVSEs provided by r_evse_manager
void init_evse_connector_map();
Expand Down
Loading