Skip to content

Commit bddb760

Browse files
maaikezmaaikez
committed
Use correct namespace
Signed-off-by: Maaike Zijderveld, iolar <git.mail@iolar.nl>
1 parent 3f367ab commit bddb760

File tree

2 files changed

+94
-75
lines changed

2 files changed

+94
-75
lines changed

‎include/ocpp/v201/ctrlr_component_variables.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,23 @@ namespace v201 {
1515
/// First value is the 'available' variable from the specific component. Second value is a set of required variables.
1616
/// This makes it possible to check only for the required variables if a component is available.
1717
///
18-
extern std::vector<std::pair<ComponentVariable, std::vector<RequiredComponentVariable>>>
18+
extern const std::vector<std::pair<ComponentVariable, std::vector<RequiredComponentVariable>>>
1919
required_component_available_variables;
2020

2121
///
2222
/// \brief Required variables that should always exist, regardless of any available or not available controller.
2323
///
24-
extern std::vector<RequiredComponentVariable> required_variables;
24+
extern const std::vector<RequiredComponentVariable> required_variables;
2525

2626
///
2727
/// \brief Required variables of an EVSE.
2828
///
29-
extern std::vector<Variable> required_evse_variables;
29+
extern const std::vector<Variable> required_evse_variables;
3030

3131
///
3232
/// \brief Required variables of a connector.
3333
///
34-
extern std::vector<Variable> required_connector_variables;
34+
extern const std::vector<Variable> required_connector_variables;
3535

3636
namespace ControllerComponents {
3737
extern const Component InternalCtrlr;

‎lib/ocpp/v201/ctrlr_component_variables.cpp

+90-71
Original file line numberDiff line numberDiff line change
@@ -35,86 +35,105 @@ const Variable Overload = {"Overload"};
3535
const Variable Fallback = {"Fallback"};
3636
}; // namespace StandardizedVariables
3737

38-
namespace ControllerComponentVariables {
39-
40-
std::vector<std::pair<ComponentVariable, std::vector<RequiredComponentVariable>>>
38+
const std::vector<std::pair<ComponentVariable, std::vector<RequiredComponentVariable>>>
4139
required_component_available_variables{
42-
{AlignedDataCtrlrAvailable,
43-
{AlignedDataInterval, AlignedDataMeasurands, AlignedDataTxEndedInterval, AlignedDataTxEndedMeasurands}},
44-
{LocalAuthListCtrlrAvailable,
45-
{LocalAuthListCtrlrEntries, ItemsPerMessageSendLocalList, BytesPerMessageSendLocalList}},
46-
{SampledDataCtrlrAvailable,
47-
{SampledDataTxEndedMeasurands, SampledDataTxEndedInterval, SampledDataTxStartedMeasurands,
48-
SampledDataTxUpdatedMeasurands, SampledDataTxUpdatedInterval}},
49-
{SmartChargingCtrlrAvailable,
50-
{ChargingProfileMaxStackLevel, ChargingScheduleChargingRateUnit, PeriodsPerSchedule, EntriesChargingProfiles,
51-
LimitChangeSignificance, CompositeScheduleDefaultLimitAmps, CompositeScheduleDefaultLimitWatts,
52-
CompositeScheduleDefaultNumberPhases, SupplyVoltage}},
53-
{TariffCostCtrlrAvailableTariff, {TariffFallbackMessage}},
54-
{TariffCostCtrlrAvailableCost, {TotalCostFallbackMessage, TariffCostCtrlrCurrency}},
55-
{MonitoringCtrlrAvailable, {ItemsPerMessageSetVariableMonitoring, BytesPerMessageSetVariableMonitoring}},
56-
{DisplayMessageCtrlrAvailable,
57-
{NumberOfDisplayMessages, DisplayMessageSupportedFormats, DisplayMessageSupportedPriorities}}};
40+
{ControllerComponentVariables::AlignedDataCtrlrAvailable,
41+
{ControllerComponentVariables::AlignedDataInterval, ControllerComponentVariables::AlignedDataMeasurands,
42+
ControllerComponentVariables::AlignedDataTxEndedInterval,
43+
ControllerComponentVariables::AlignedDataTxEndedMeasurands}},
44+
{ControllerComponentVariables::LocalAuthListCtrlrAvailable,
45+
{ControllerComponentVariables::LocalAuthListCtrlrEntries,
46+
ControllerComponentVariables::ItemsPerMessageSendLocalList,
47+
ControllerComponentVariables::BytesPerMessageSendLocalList}},
48+
{ControllerComponentVariables::SampledDataCtrlrAvailable,
49+
{ControllerComponentVariables::SampledDataTxEndedMeasurands,
50+
ControllerComponentVariables::SampledDataTxEndedInterval,
51+
ControllerComponentVariables::SampledDataTxStartedMeasurands,
52+
ControllerComponentVariables::SampledDataTxUpdatedMeasurands,
53+
ControllerComponentVariables::SampledDataTxUpdatedInterval}},
54+
{ControllerComponentVariables::SmartChargingCtrlrAvailable,
55+
{ControllerComponentVariables::ChargingProfileMaxStackLevel,
56+
ControllerComponentVariables::ChargingScheduleChargingRateUnit,
57+
ControllerComponentVariables::PeriodsPerSchedule, ControllerComponentVariables::EntriesChargingProfiles,
58+
ControllerComponentVariables::LimitChangeSignificance,
59+
ControllerComponentVariables::CompositeScheduleDefaultLimitAmps,
60+
ControllerComponentVariables::CompositeScheduleDefaultLimitWatts,
61+
ControllerComponentVariables::CompositeScheduleDefaultNumberPhases,
62+
ControllerComponentVariables::SupplyVoltage}},
63+
{ControllerComponentVariables::TariffCostCtrlrAvailableTariff,
64+
{ControllerComponentVariables::TariffFallbackMessage}},
65+
{ControllerComponentVariables::TariffCostCtrlrAvailableCost,
66+
{ControllerComponentVariables::TotalCostFallbackMessage,
67+
ControllerComponentVariables::TariffCostCtrlrCurrency}},
68+
{ControllerComponentVariables::MonitoringCtrlrAvailable,
69+
{ControllerComponentVariables::ItemsPerMessageSetVariableMonitoring,
70+
ControllerComponentVariables::BytesPerMessageSetVariableMonitoring}},
71+
{ControllerComponentVariables::DisplayMessageCtrlrAvailable,
72+
{ControllerComponentVariables::NumberOfDisplayMessages,
73+
ControllerComponentVariables::DisplayMessageSupportedFormats,
74+
ControllerComponentVariables::DisplayMessageSupportedPriorities}}};
5875

59-
std::vector<RequiredComponentVariable> required_variables{ChargePointId,
60-
NetworkConnectionProfiles,
61-
ChargeBoxSerialNumber,
62-
ChargePointModel,
63-
ChargePointVendor,
64-
FirmwareVersion,
65-
SupportedCiphers12,
66-
SupportedCiphers13,
67-
LogMessagesFormat,
68-
NumberOfConnectors,
69-
SupportedOcppVersions,
70-
AuthorizeRemoteStart,
71-
LocalAuthorizeOffline,
72-
LocalPreAuthorize,
73-
ChargingStationAvailabilityState,
74-
ChargingStationAvailable,
75-
ChargingStationSupplyPhases,
76-
ClockCtrlrDateTime,
77-
TimeSource,
78-
BytesPerMessageGetReport,
79-
BytesPerMessageGetVariables,
80-
BytesPerMessageSetVariables,
81-
ItemsPerMessageGetReport,
82-
ItemsPerMessageGetVariables,
83-
ItemsPerMessageSetVariables,
84-
ContractValidationOffline,
85-
FileTransferProtocols,
86-
MessageTimeout,
87-
MessageAttemptInterval,
88-
MessageAttempts,
89-
NetworkConfigurationPriority,
90-
NetworkProfileConnectionAttempts,
91-
OfflineThreshold,
92-
ResetRetries,
93-
RetryBackOffRandomRange,
94-
RetryBackOffRepeatTimes,
95-
RetryBackOffWaitMinimum,
96-
UnlockOnEVSideDisconnect,
97-
WebSocketPingInterval,
98-
CertificateEntries,
99-
SecurityCtrlrIdentity,
100-
OrganizationName,
101-
SecurityProfile,
102-
EVConnectionTimeOut,
103-
StopTxOnEVSideDisconnect,
104-
StopTxOnInvalidId,
105-
TxStartPoint,
106-
TxStopPoint,
107-
TxStartPoint,
108-
TxStopPoint};
76+
const std::vector<RequiredComponentVariable> required_variables{
77+
ControllerComponentVariables::ChargePointId,
78+
ControllerComponentVariables::NetworkConnectionProfiles,
79+
ControllerComponentVariables::ChargeBoxSerialNumber,
80+
ControllerComponentVariables::ChargePointModel,
81+
ControllerComponentVariables::ChargePointVendor,
82+
ControllerComponentVariables::FirmwareVersion,
83+
ControllerComponentVariables::SupportedCiphers12,
84+
ControllerComponentVariables::SupportedCiphers13,
85+
ControllerComponentVariables::LogMessagesFormat,
86+
ControllerComponentVariables::NumberOfConnectors,
87+
ControllerComponentVariables::SupportedOcppVersions,
88+
ControllerComponentVariables::AuthorizeRemoteStart,
89+
ControllerComponentVariables::LocalAuthorizeOffline,
90+
ControllerComponentVariables::LocalPreAuthorize,
91+
ControllerComponentVariables::ChargingStationAvailabilityState,
92+
ControllerComponentVariables::ChargingStationAvailable,
93+
ControllerComponentVariables::ChargingStationSupplyPhases,
94+
ControllerComponentVariables::ClockCtrlrDateTime,
95+
ControllerComponentVariables::TimeSource,
96+
ControllerComponentVariables::BytesPerMessageGetReport,
97+
ControllerComponentVariables::BytesPerMessageGetVariables,
98+
ControllerComponentVariables::BytesPerMessageSetVariables,
99+
ControllerComponentVariables::ItemsPerMessageGetReport,
100+
ControllerComponentVariables::ItemsPerMessageGetVariables,
101+
ControllerComponentVariables::ItemsPerMessageSetVariables,
102+
ControllerComponentVariables::ContractValidationOffline,
103+
ControllerComponentVariables::FileTransferProtocols,
104+
ControllerComponentVariables::MessageTimeout,
105+
ControllerComponentVariables::MessageAttemptInterval,
106+
ControllerComponentVariables::MessageAttempts,
107+
ControllerComponentVariables::NetworkConfigurationPriority,
108+
ControllerComponentVariables::NetworkProfileConnectionAttempts,
109+
ControllerComponentVariables::OfflineThreshold,
110+
ControllerComponentVariables::ResetRetries,
111+
ControllerComponentVariables::RetryBackOffRandomRange,
112+
ControllerComponentVariables::RetryBackOffRepeatTimes,
113+
ControllerComponentVariables::RetryBackOffWaitMinimum,
114+
ControllerComponentVariables::UnlockOnEVSideDisconnect,
115+
ControllerComponentVariables::WebSocketPingInterval,
116+
ControllerComponentVariables::CertificateEntries,
117+
ControllerComponentVariables::SecurityCtrlrIdentity,
118+
ControllerComponentVariables::OrganizationName,
119+
ControllerComponentVariables::SecurityProfile,
120+
ControllerComponentVariables::EVConnectionTimeOut,
121+
ControllerComponentVariables::StopTxOnEVSideDisconnect,
122+
ControllerComponentVariables::StopTxOnInvalidId,
123+
ControllerComponentVariables::TxStartPoint,
124+
ControllerComponentVariables::TxStopPoint,
125+
ControllerComponentVariables::TxStartPoint,
126+
ControllerComponentVariables::TxStopPoint};
109127

110128
// Note: Power is also required, but the value is not required but the maxLimit. So that is why it is not added here.
111-
std::vector<Variable> required_evse_variables{
129+
const std::vector<Variable> required_evse_variables{
112130
EvseComponentVariables::Available, EvseComponentVariables::AvailabilityState, EvseComponentVariables::SupplyPhases};
113131

114-
std::vector<Variable> required_connector_variables{
132+
const std::vector<Variable> required_connector_variables{
115133
ConnectorComponentVariables::Available, ConnectorComponentVariables::AvailabilityState,
116134
ConnectorComponentVariables::SupplyPhases, ConnectorComponentVariables::Type};
117135

136+
namespace ControllerComponentVariables {
118137
const ComponentVariable InternalCtrlrEnabled = {
119138
ControllerComponents::InternalCtrlr,
120139
std::optional<Variable>({

0 commit comments

Comments
 (0)