fix: compile & incorporate PR comments

Signed-off-by: James Chapman <james.chapman@pionix.de>

Author: james-ctc

lib/everest/ocpp/include/ocpp/v16/charge_point_configuration_devicemodel.hpp

@@ -8,7 +8,6 @@
 #include <ocpp/v16/charge_point_configuration_interface.hpp>
 #include <ocpp/v16/types.hpp>
 
-#include <map>
 #include <set>
 #include <vector>
 
@@ -94,6 +93,9 @@ class ChargePointConfigurationDeviceModel : private ChargePointConfigurationBase
     SetResult setInternalTimeOffsetNextTransition(const std::string& value);
     SetResult setInternalWaitForSetUserPriceTimeout(const std::string& value);
 
+    std::optional<std::string> calculateEvseIds();
+    std::string calculateSupportedMeasurands();
+
 public:
     explicit ChargePointConfigurationDeviceModel(const std::string_view& ocpp_main_path,
                                                  std::unique_ptr<v2::DeviceModelInterface> device_model_interface);

lib/everest/ocpp/include/ocpp/v16/known_keys.hpp

@@ -8,6 +8,8 @@
 #include <ocpp/v16/ocpp_types.hpp>
 #include <ocpp/v16/types.hpp>
 
+#include <cstddef>
+#include <map>
 #include <string>
 #include <vector>
 
@@ -32,6 +34,38 @@ std::string to_csl(const std::vector<std::string>& vec);
 /// \note will not contain empty strings when a comma is repeated
 std::vector<std::string> from_csl(const std::string& csl);
 
+class OrderedUniqueStringList {
+private:
+    using Store = std::map<std::string, std::size_t>;
+    std::size_t count{0};
+    Store list{};
+
+    void do_insert(std::string&& s);
+
+public:
+    void insert(const std::string& s) {
+        do_insert(std::string{s});
+    }
+    void insert(std::string&& s) {
+        do_insert(std::move(s));
+    }
+
+    void clear() {
+        count = 0;
+        list.clear();
+    }
+
+    std::vector<std::string> get();
+
+    bool empty() const {
+        return list.empty();
+    }
+
+    auto size() const {
+        return list.size();
+    }
+};
+
 } // namespace ocpp::v16::utils
 
 #endif

lib/everest/ocpp/include/ocpp/v16/utils.hpp

@@ -89,7 +89,7 @@ extern const Component SmartChargingCtrlr;
 extern const Component TariffCostCtrlr;
 extern const Component TxCtrlr;
 extern const Component
-    OCPP16MavericksCtrlr; // This controller contains OCPP1.6 configuration keys without a clear mapping to OCPP2.x.
+    OCPP16LegacyCtrlr; // This controller contains OCPP1.6 configuration keys without a clear mapping to OCPP2.x.
 } // namespace ControllerComponents
 
 namespace StandardizedVariables {
@@ -317,6 +317,7 @@ extern const ComponentVariable ISO15118CtrlrAvailable;
 // do not map to any existing component variable combination in OCPP2.x. The following definitions only control the
 // OCPP1.6 implementation
 extern const ComponentVariable BlinkRepeat;
+extern const ComponentVariable ConnectorPhaseRotation;
 extern const ComponentVariable ConnectorPhaseRotationMaxLength;
 extern const RequiredComponentVariable GetConfigurationMaxKeys;
 extern const ComponentVariable LightIntensity;
@@ -342,43 +343,6 @@ extern const ComponentVariable SupportedLanguages;
 extern const ComponentVariable CustomMultiLanguageMessages;
 extern const ComponentVariable Language;
 extern const ComponentVariable WaitForSetUserPriceTimeout;
-
-// Additional OCPP1.6 Mavericks - Configuration keys without direct OCPP 2.x equivalents
-// TODO(james-ctc): double check there is no V2 mapping
-
-extern const ComponentVariable AuthorizeRemoteTxRequests;
-extern const ComponentVariable CentralSystemURI;
-extern const ComponentVariable CertificateStoreMaxLength;
-extern const ComponentVariable ChargeProfileMaxStackLevel;
-extern const ComponentVariable ChargingScheduleAllowedChargingRateUnit;
-extern const ComponentVariable ChargingScheduleMaxPeriods;
-extern const ComponentVariable ClockAlignedDataInterval;
-extern const ComponentVariable ConnectionTimeOut;
-extern const ComponentVariable ConnectorEvseIds;
-extern const ComponentVariable ConnectorPhaseRotation;
-extern const ComponentVariable ISO15118PnCEnabled;
-extern const ComponentVariable LocalAuthListEnabled;
-extern const ComponentVariable LocalAuthListMaxLength;
-extern const ComponentVariable MaxChargingProfilesInstalled;
-extern const ComponentVariable MeterValueSampleInterval;
-extern const ComponentVariable MeterValuesAlignedData;
-extern const ComponentVariable MeterValuesAlignedDataMaxLength;
-extern const ComponentVariable MeterValuesSampledData;
-extern const ComponentVariable MeterValuesSampledDataMaxLength;
-extern const ComponentVariable RetryBackoffRandomRange;
-extern const ComponentVariable RetryBackoffRepeatTimes;
-extern const ComponentVariable RetryBackoffWaitMinimum;
-extern const ComponentVariable SendLocalListMaxLength;
-extern const ComponentVariable StopTransactionOnInvalidId;
-extern const ComponentVariable StopTxnAlignedData;
-extern const ComponentVariable StopTxnAlignedDataMaxLength;
-extern const ComponentVariable StopTxnSampledData;
-extern const ComponentVariable StopTxnSampledDataMaxLength;
-extern const ComponentVariable SupportedFileTransferProtocols;
-extern const ComponentVariable SupportedMeasurands;
-extern const ComponentVariable TransactionMessageAttempts;
-extern const ComponentVariable TransactionMessageRetryInterval;
-
 } // namespace ControllerComponentVariables
 
 namespace EvseComponentVariables {