Skip to content

Moved iso15118-20 messages to message_d20/ #166

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

Open
Dalachowsky wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Moved iso15118-20 messages to message_d20/ #166

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion include/iso15118/d20/ac_powers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include <optional>

#include <iso15118/message/common_types.hpp>
#include <iso15118/message_d20/common_types.hpp>

namespace iso15118::d20 {

Expand Down
2 changes: 1 addition & 1 deletion include/iso15118/d20/config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <vector>

#include <iso15118/d20/limits.hpp>
#include <iso15118/message/common_types.hpp>
#include <iso15118/message_d20/common_types.hpp>

namespace iso15118::d20 {

Expand Down
4 changes: 2 additions & 2 deletions include/iso15118/d20/context.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#include <tuple>

#include <iso15118/d20/timeout.hpp>
#include <iso15118/message/payload_type.hpp>
#include <iso15118/message/variant.hpp>
#include <iso15118/message_d20/payload_type.hpp>
#include <iso15118/message_d20/variant.hpp>
#include <iso15118/session/feedback.hpp>
#include <iso15118/session/logger.hpp>

Expand Down
2 changes: 1 addition & 1 deletion include/iso15118/d20/ev_information.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright 2025 Pionix GmbH and Contributors to EVerest
#pragma once

#include <iso15118/message/supported_app_protocol.hpp>
#include <iso15118/message_d20/supported_app_protocol.hpp>

namespace iso15118::d20 {

Expand Down
2 changes: 1 addition & 1 deletion include/iso15118/d20/ev_session_info.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright 2025 Pionix GmbH and Contributors to EVerest
#pragma once

#include <iso15118/message/common_types.hpp>
#include <iso15118/message_d20/common_types.hpp>
#include <iso15118/session/feedback.hpp>

namespace iso15118::d20 {
Expand Down
2 changes: 1 addition & 1 deletion include/iso15118/d20/limits.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include <optional>

#include <iso15118/message/common_types.hpp>
#include <iso15118/message_d20/common_types.hpp>

namespace iso15118::d20 {

Expand Down
2 changes: 1 addition & 1 deletion include/iso15118/d20/session.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <vector>

#include <iso15118/io/sha_hash.hpp>
#include <iso15118/message/common_types.hpp>
#include <iso15118/message_d20/common_types.hpp>

namespace iso15118::d20 {

Expand Down
2 changes: 1 addition & 1 deletion include/iso15118/d20/state/authorization.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#pragma once

#include "../states.hpp"
#include <iso15118/message/authorization.hpp>
#include <iso15118/message_d20/authorization.hpp>

namespace iso15118::d20::state {
struct Authorization : public StateBase {
Expand Down
2 changes: 1 addition & 1 deletion include/iso15118/d20/state/power_delivery.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "../states.hpp"

#include <iso15118/message/power_delivery.hpp>
#include <iso15118/message_d20/power_delivery.hpp>
#include <optional>

namespace iso15118::d20::state {
Expand Down
2 changes: 1 addition & 1 deletion include/iso15118/detail/d20/context_helper.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include <iso15118/d20/context.hpp>
#include <iso15118/d20/session.hpp>
#include <iso15118/message/common_types.hpp>
#include <iso15118/message_d20/common_types.hpp>

namespace iso15118::d20 {

Expand Down
2 changes: 1 addition & 1 deletion include/iso15118/detail/d20/state/ac_charge_loop.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#pragma once

#include <iso15118/d20/session.hpp>
#include <iso15118/message/ac_charge_loop.hpp>
#include <iso15118/message_d20/ac_charge_loop.hpp>

#include <iso15118/d20/ac_powers.hpp>
#include <iso15118/d20/dynamic_mode_parameters.hpp>
Expand Down
2 changes: 1 addition & 1 deletion include/iso15118/detail/d20/state/ac_charge_parameter_discovery.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <iso15118/d20/ac_powers.hpp>
#include <iso15118/d20/config.hpp>
#include <iso15118/d20/session.hpp>
#include <iso15118/message/ac_charge_parameter_discovery.hpp>
#include <iso15118/message_d20/ac_charge_parameter_discovery.hpp>

namespace iso15118::d20::state {

Expand Down
2 changes: 1 addition & 1 deletion include/iso15118/detail/d20/state/authorization.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#pragma once

#include <iso15118/d20/session.hpp>
#include <iso15118/message/authorization.hpp>
#include <iso15118/message_d20/authorization.hpp>

namespace iso15118::d20::state {

Expand Down
2 changes: 1 addition & 1 deletion include/iso15118/detail/d20/state/authorization_setup.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include <iso15118/d20/config.hpp>
#include <iso15118/d20/session.hpp>
#include <iso15118/message/authorization_setup.hpp>
#include <iso15118/message_d20/authorization_setup.hpp>

namespace iso15118::d20::state {

Expand Down
2 changes: 1 addition & 1 deletion include/iso15118/detail/d20/state/dc_cable_check.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#pragma once

#include <iso15118/d20/session.hpp>
#include <iso15118/message/dc_cable_check.hpp>
#include <iso15118/message_d20/dc_cable_check.hpp>

namespace iso15118::d20::state {

Expand Down
2 changes: 1 addition & 1 deletion include/iso15118/detail/d20/state/dc_charge_loop.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <iso15118/d20/dynamic_mode_parameters.hpp>
#include <iso15118/d20/limits.hpp>
#include <iso15118/d20/session.hpp>
#include <iso15118/message/dc_charge_loop.hpp>
#include <iso15118/message_d20/dc_charge_loop.hpp>

#include <iso15118/session/feedback.hpp>

Expand Down
2 changes: 1 addition & 1 deletion include/iso15118/detail/d20/state/dc_charge_parameter_discovery.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <iso15118/d20/config.hpp>
#include <iso15118/d20/limits.hpp>
#include <iso15118/d20/session.hpp>
#include <iso15118/message/dc_charge_parameter_discovery.hpp>
#include <iso15118/message_d20/dc_charge_parameter_discovery.hpp>

namespace iso15118::d20::state {

Expand Down
2 changes: 1 addition & 1 deletion include/iso15118/detail/d20/state/dc_pre_charge.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <tuple>

#include <iso15118/d20/session.hpp>
#include <iso15118/message/dc_pre_charge.hpp>
#include <iso15118/message_d20/dc_pre_charge.hpp>

#include <iso15118/session/feedback.hpp>

Expand Down
2 changes: 1 addition & 1 deletion include/iso15118/detail/d20/state/dc_welding_detection.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#pragma once

#include <iso15118/d20/session.hpp>
#include <iso15118/message/dc_welding_detection.hpp>
#include <iso15118/message_d20/dc_welding_detection.hpp>

namespace iso15118::d20::state {

Expand Down
2 changes: 1 addition & 1 deletion include/iso15118/detail/d20/state/power_delivery.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#pragma once

#include <iso15118/d20/session.hpp>
#include <iso15118/message/power_delivery.hpp>
#include <iso15118/message_d20/power_delivery.hpp>

namespace iso15118::d20::state {

Expand Down
2 changes: 1 addition & 1 deletion include/iso15118/detail/d20/state/schedule_exchange.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#pragma once

#include <iso15118/d20/session.hpp>
#include <iso15118/message/schedule_exchange.hpp>
#include <iso15118/message_d20/schedule_exchange.hpp>

#include <cstdint>
#include <ctime>
Expand Down
2 changes: 1 addition & 1 deletion include/iso15118/detail/d20/state/service_detail.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include <iso15118/d20/config.hpp>
#include <iso15118/d20/session.hpp>
#include <iso15118/message/service_detail.hpp>
#include <iso15118/message_d20/service_detail.hpp>

namespace iso15118::d20::state {

Expand Down
4 changes: 2 additions & 2 deletions include/iso15118/detail/d20/state/service_discovery.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

#include <iso15118/d20/config.hpp>
#include <iso15118/d20/session.hpp>
#include <iso15118/message/common_types.hpp>
#include <iso15118/message/service_discovery.hpp>
#include <iso15118/message_d20/common_types.hpp>
#include <iso15118/message_d20/service_discovery.hpp>

namespace iso15118::d20::state {

Expand Down
2 changes: 1 addition & 1 deletion include/iso15118/detail/d20/state/service_selection.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include <iso15118/d20/config.hpp>
#include <iso15118/d20/session.hpp>
#include <iso15118/message/service_selection.hpp>
#include <iso15118/message_d20/service_selection.hpp>

namespace iso15118::d20::state {

Expand Down
2 changes: 1 addition & 1 deletion include/iso15118/detail/d20/state/session_setup.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#pragma once

#include <iso15118/d20/session.hpp>
#include <iso15118/message/session_setup.hpp>
#include <iso15118/message_d20/session_setup.hpp>

namespace iso15118::d20::state {

Expand Down
2 changes: 1 addition & 1 deletion include/iso15118/detail/d20/state/session_stop.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#pragma once

#include <iso15118/d20/session.hpp>
#include <iso15118/message/session_stop.hpp>
#include <iso15118/message_d20/session_stop.hpp>

namespace iso15118::d20::state {

Expand Down
2 changes: 1 addition & 1 deletion include/iso15118/detail/variant_access.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include <cassert>

#include <iso15118/message/variant.hpp>
#include <iso15118/message_d20/variant.hpp>

#include "cb_exi.hpp"

Expand Down
0 include/iso15118/message/ac_charge_loop.hpp → ...e/iso15118/message_d20/ac_charge_loop.hpp
View file
Open in desktop
File renamed without changes.
0 ...message/ac_charge_parameter_discovery.hpp → ...age_d20/ac_charge_parameter_discovery.hpp
View file
Open in desktop
File renamed without changes.
0 include/iso15118/message/authorization.hpp → ...de/iso15118/message_d20/authorization.hpp
View file
Open in desktop
File renamed without changes.
0 .../iso15118/message/authorization_setup.hpp → ...15118/message_d20/authorization_setup.hpp
View file
Open in desktop
File renamed without changes.
0 include/iso15118/message/common_types.hpp → ...ude/iso15118/message_d20/common_types.hpp
View file
Open in desktop
File renamed without changes.
0 include/iso15118/message/dc_cable_check.hpp → ...e/iso15118/message_d20/dc_cable_check.hpp
View file
Open in desktop
File renamed without changes.
0 include/iso15118/message/dc_charge_loop.hpp → ...e/iso15118/message_d20/dc_charge_loop.hpp
View file
Open in desktop
File renamed without changes.
0 ...message/dc_charge_parameter_discovery.hpp → ...age_d20/dc_charge_parameter_discovery.hpp
View file
Open in desktop
File renamed without changes.
0 include/iso15118/message/dc_pre_charge.hpp → ...de/iso15118/message_d20/dc_pre_charge.hpp
View file
Open in desktop
File renamed without changes.
0 ...iso15118/message/dc_welding_detection.hpp → ...5118/message_d20/dc_welding_detection.hpp
View file
Open in desktop
File renamed without changes.
0 include/iso15118/message/payload_type.hpp → ...ude/iso15118/message_d20/payload_type.hpp
View file
Open in desktop
File renamed without changes.
0 include/iso15118/message/power_delivery.hpp → ...e/iso15118/message_d20/power_delivery.hpp
View file
Open in desktop
File renamed without changes.
0 ...de/iso15118/message/schedule_exchange.hpp → ...so15118/message_d20/schedule_exchange.hpp
View file
Open in desktop
File renamed without changes.
0 include/iso15118/message/service_detail.hpp → ...e/iso15118/message_d20/service_detail.hpp
View file
Open in desktop
File renamed without changes.
0 ...de/iso15118/message/service_discovery.hpp → ...so15118/message_d20/service_discovery.hpp
View file
Open in desktop
File renamed without changes.
0 ...de/iso15118/message/service_selection.hpp → ...so15118/message_d20/service_selection.hpp
View file
Open in desktop
File renamed without changes.
0 include/iso15118/message/session_setup.hpp → ...de/iso15118/message_d20/session_setup.hpp
View file
Open in desktop
File renamed without changes.
0 include/iso15118/message/session_stop.hpp → ...ude/iso15118/message_d20/session_stop.hpp
View file
Open in desktop
File renamed without changes.
0 ...o15118/message/supported_app_protocol.hpp → ...18/message_d20/supported_app_protocol.hpp
View file
Open in desktop
File renamed without changes.
0 include/iso15118/message/type.hpp → include/iso15118/message_d20/type.hpp
View file
Open in desktop
File renamed without changes.
0 include/iso15118/message/variant.hpp → include/iso15118/message_d20/variant.hpp
View file
Open in desktop
File renamed without changes.
16 changes: 8 additions & 8 deletions include/iso15118/session/feedback.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
#include <iso15118/d20/ev_information.hpp>
#include <iso15118/d20/limits.hpp>
#include <iso15118/d20/session.hpp>
#include <iso15118/message/ac_charge_loop.hpp>
#include <iso15118/message/ac_charge_parameter_discovery.hpp>
#include <iso15118/message/dc_charge_loop.hpp>
#include <iso15118/message/dc_charge_parameter_discovery.hpp>
#include <iso15118/message/schedule_exchange.hpp>
#include <iso15118/message/service_detail.hpp>
#include <iso15118/message/service_selection.hpp>
#include <iso15118/message/type.hpp>
#include <iso15118/message_d20/ac_charge_loop.hpp>
#include <iso15118/message_d20/ac_charge_parameter_discovery.hpp>
#include <iso15118/message_d20/dc_charge_loop.hpp>
#include <iso15118/message_d20/dc_charge_parameter_discovery.hpp>
#include <iso15118/message_d20/schedule_exchange.hpp>
#include <iso15118/message_d20/service_detail.hpp>
#include <iso15118/message_d20/service_selection.hpp>
#include <iso15118/message_d20/type.hpp>

namespace iso15118::session {

Expand Down
2 changes: 1 addition & 1 deletion include/iso15118/tbd_controller.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <iso15118/d20/limits.hpp>
#include <iso15118/io/poll_manager.hpp>
#include <iso15118/io/sdp_server.hpp>
#include <iso15118/message/common_types.hpp>
#include <iso15118/message_d20/common_types.hpp>
#include <iso15118/session/feedback.hpp>
#include <iso15118/session/iso.hpp>

Expand Down
38 changes: 19 additions & 19 deletions src/iso15118/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,25 +48,25 @@ target_sources(iso15118
d20/state/ac_charge_loop.cpp
d20/state/session_stop.cpp

message/variant.cpp
message/supported_app_protocol.cpp
message/session_setup.cpp
message/common_types.cpp
message/authorization_setup.cpp
message/authorization.cpp
message/service_discovery.cpp
message/service_detail.cpp
message/service_selection.cpp
message/ac_charge_parameter_discovery.cpp
message/dc_charge_parameter_discovery.cpp
message/schedule_exchange.cpp
message/dc_cable_check.cpp
message/dc_pre_charge.cpp
message/power_delivery.cpp
message/ac_charge_loop.cpp
message/dc_charge_loop.cpp
message/dc_welding_detection.cpp
message/session_stop.cpp
message_d20/variant.cpp
message_d20/supported_app_protocol.cpp
message_d20/session_setup.cpp
message_d20/common_types.cpp
message_d20/authorization_setup.cpp
message_d20/authorization.cpp
message_d20/service_discovery.cpp
message_d20/service_detail.cpp
message_d20/service_selection.cpp
message_d20/ac_charge_parameter_discovery.cpp
message_d20/dc_charge_parameter_discovery.cpp
message_d20/schedule_exchange.cpp
message_d20/dc_cable_check.cpp
message_d20/dc_pre_charge.cpp
message_d20/power_delivery.cpp
message_d20/ac_charge_loop.cpp
message_d20/dc_charge_loop.cpp
message_d20/dc_welding_detection.cpp
message_d20/session_stop.cpp

tbd_controller.cpp
)
Expand Down
30 changes: 15 additions & 15 deletions src/iso15118/d20/context_helper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@
#include <iso15118/detail/d20/context_helper.hpp>
#include <iso15118/detail/helper.hpp>

#include <iso15118/message/ac_charge_parameter_discovery.hpp>
#include <iso15118/message/authorization.hpp>
#include <iso15118/message/authorization_setup.hpp>
#include <iso15118/message/dc_cable_check.hpp>
#include <iso15118/message/dc_charge_loop.hpp>
#include <iso15118/message/dc_charge_parameter_discovery.hpp>
#include <iso15118/message/dc_pre_charge.hpp>
#include <iso15118/message/dc_welding_detection.hpp>
#include <iso15118/message/power_delivery.hpp>
#include <iso15118/message/schedule_exchange.hpp>
#include <iso15118/message/service_detail.hpp>
#include <iso15118/message/service_discovery.hpp>
#include <iso15118/message/service_selection.hpp>
#include <iso15118/message/session_setup.hpp>
#include <iso15118/message/session_stop.hpp>
#include <iso15118/message_d20/ac_charge_parameter_discovery.hpp>
#include <iso15118/message_d20/authorization.hpp>
#include <iso15118/message_d20/authorization_setup.hpp>
#include <iso15118/message_d20/dc_cable_check.hpp>
#include <iso15118/message_d20/dc_charge_loop.hpp>
#include <iso15118/message_d20/dc_charge_parameter_discovery.hpp>
#include <iso15118/message_d20/dc_pre_charge.hpp>
#include <iso15118/message_d20/dc_welding_detection.hpp>
#include <iso15118/message_d20/power_delivery.hpp>
#include <iso15118/message_d20/schedule_exchange.hpp>
#include <iso15118/message_d20/service_detail.hpp>
#include <iso15118/message_d20/service_discovery.hpp>
#include <iso15118/message_d20/service_selection.hpp>
#include <iso15118/message_d20/session_setup.hpp>
#include <iso15118/message_d20/session_stop.hpp>

namespace iso15118::d20 {

Expand Down
2 changes: 1 addition & 1 deletion src/iso15118/d20/state/ac_charge_loop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright 2025 Pionix GmbH and Contributors to EVerest
#include <iso15118/d20/state/ac_charge_loop.hpp>

#include <iso15118/message/ac_charge_loop.hpp>
#include <iso15118/message_d20/ac_charge_loop.hpp>

#include <iso15118/d20/state/power_delivery.hpp>
#include <iso15118/d20/state/session_stop.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/iso15118/d20/state/supported_app_protocol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include <iso15118/d20/state/session_setup.hpp>

#include <iso15118/message/supported_app_protocol.hpp>
#include <iso15118/message_d20/supported_app_protocol.hpp>

#include <iso15118/detail/d20/context_helper.hpp>
#include <iso15118/detail/helper.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/iso15118/message/ac_charge_loop.cpp → src/iso15118/message_d20/ac_charge_loop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: Apache-2.0
// Copyright 2024 Pionix GmbH and Contributors to EVerest
#include <iso15118/message/ac_charge_loop.hpp>
#include <iso15118/message_d20/ac_charge_loop.hpp>

#include <type_traits>

Expand Down
2 changes: 1 addition & 1 deletion ...message/ac_charge_parameter_discovery.cpp → ...age_d20/ac_charge_parameter_discovery.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: Apache-2.0
// Copyright 2024 Pionix GmbH and Contributors to EVerest
#include <iso15118/message/ac_charge_parameter_discovery.hpp>
#include <iso15118/message_d20/ac_charge_parameter_discovery.hpp>

#include <type_traits>

Expand Down
Loading