clean up custom allocator changes

matth-x · Aug 13, 2024 · 79eb16e · 79eb16e
1 parent 926a197
commit 79eb16e
Show file tree

Hide file tree

Showing 36 changed files with 20 additions and 51 deletions.
diff --git a/src/MicroOcpp/Core/Configuration.cpp b/src/MicroOcpp/Core/Configuration.cpp
@@ -8,7 +8,6 @@
 #include <MicroOcpp/Debug.h>
 
 #include <string.h>
-#include <vector>
 #include <algorithm>
 #include <ArduinoJson.h>
 

diff --git a/src/MicroOcpp/Core/Configuration.h b/src/MicroOcpp/Core/Configuration.h
@@ -8,9 +8,9 @@
 #include <MicroOcpp/Core/ConfigurationKeyValue.h>
 #include <MicroOcpp/Core/ConfigurationContainer.h>
 #include <MicroOcpp/Core/FilesystemAdapter.h>
+#include <MicroOcpp/Core/Memory.h>
 
 #include <memory>
-#include <vector>
 
 #define CONFIGURATION_FN (MO_FILENAME_PREFIX "ocpp-config.jsn")
 #define CONFIGURATION_VOLATILE "/volatile"

diff --git a/src/MicroOcpp/Core/ConfigurationContainer.h b/src/MicroOcpp/Core/ConfigurationContainer.h
@@ -5,7 +5,6 @@
 #ifndef MO_CONFIGURATIONCONTAINER_H
 #define MO_CONFIGURATIONCONTAINER_H
 
-#include <vector>
 #include <memory>
 
 #include <MicroOcpp/Core/ConfigurationKeyValue.h>

diff --git a/src/MicroOcpp/Core/FilesystemAdapter.cpp b/src/MicroOcpp/Core/FilesystemAdapter.cpp
@@ -22,9 +22,7 @@
 
 #if MO_ENABLE_FILE_INDEX
 
-#include <vector>
 #include <algorithm>
-#include <string>
 
 namespace MicroOcpp {
 

diff --git a/src/MicroOcpp/Core/FilesystemUtils.cpp b/src/MicroOcpp/Core/FilesystemUtils.cpp
@@ -50,7 +50,7 @@ std::unique_ptr<JsonDoc> FilesystemUtils::loadJson(std::shared_ptr<FilesystemAda
         capacity = MO_MAX_JSON_CAPACITY;
     }
 
-    auto doc = std::unique_ptr<JsonDoc>(nullptr);
+    std::unique_ptr<JsonDoc> doc;
     DeserializationError err = DeserializationError::NoMemory;
     ArduinoJsonFileAdapter fileReader {file.get()};
 

diff --git a/src/MicroOcpp/Core/FtpMbedTLS.cpp b/src/MicroOcpp/Core/FtpMbedTLS.cpp
@@ -6,7 +6,6 @@
 
 #if MO_ENABLE_MBEDTLS
 
-#include <string>
 #include <string.h>
 #include <functional>
 

diff --git a/src/MicroOcpp/Core/Memory.cpp b/src/MicroOcpp/Core/Memory.cpp
@@ -247,10 +247,10 @@ void mo_mem_print_stats() {
         MO_CONSOLE_PRINTF("%s - %zu B (max. %zu B)\n", tag.first.c_str(), tag.second.current_size, tag.second.max_size);
     }
 
-    MO_CONSOLE_PRINTF("Blocks: %zu\nTags: %zu\nCurrent usage: %zu B\nMaximum usage: %zu B\n", memBlocks.size(), memTags.size(), memTotal, memTotalMax);
+    MO_CONSOLE_PRINTF(" *** Summary ***\nBlocks: %zu\nTags: %zu\nCurrent usage: %zu B\nMaximum usage: %zu B\n", memBlocks.size(), memTags.size(), memTotal, memTotalMax);
     #if MO_DBG_LEVEL >= MO_DL_DEBUG
     {
-        MO_CONSOLE_PRINTF("Total blocks (control value 1): %zu B\nTags (control value): %zu\nTotal tagged (control value 2): %zu B\nTotal tagged (control value 3): %zu B\nUntagged: %zu\nTotal untagged: %zu B\n", size, tags.size(), size_control, size_control2, untagged, untagged_size);
+        MO_CONSOLE_PRINTF(" *** Debug information ***\nTotal blocks (control value 1): %zu B\nTags (control value): %zu\nTotal tagged (control value 2): %zu B\nTotal tagged (control value 3): %zu B\nUntagged: %zu\nTotal untagged: %zu B\n", size, tags.size(), size_control, size_control2, untagged, untagged_size);
     }
     #endif
 }

diff --git a/src/MicroOcpp/Core/OcppError.h b/src/MicroOcpp/Core/OcppError.h
@@ -12,7 +12,7 @@ namespace MicroOcpp {
 
 class NotImplemented : public Operation, public MemoryManaged {
 public:
-    NotImplemented() : MemoryManaged("v16.CallError.NotImplemented") { }
+    NotImplemented() : MemoryManaged("v16.CallError.", "NotImplemented") { }
 
     const char *getErrorCode() override {
         return "NotImplemented";
@@ -24,7 +24,7 @@ class MsgBufferExceeded : public Operation, public MemoryManaged {
     size_t maxCapacity;
     size_t msgLen;
 public:
-    MsgBufferExceeded(size_t maxCapacity, size_t msgLen) : MemoryManaged("v16.CallError.MsgBufferExceeded"), maxCapacity(maxCapacity), msgLen(msgLen) { }
+    MsgBufferExceeded(size_t maxCapacity, size_t msgLen) : MemoryManaged("v16.CallError.", "GenericError"), maxCapacity(maxCapacity), msgLen(msgLen) { }
     const char *getErrorCode() override {
         return "GenericError";
     }

diff --git a/src/MicroOcpp/Model/Authorization/AuthorizationList.h b/src/MicroOcpp/Model/Authorization/AuthorizationList.h
@@ -11,7 +11,6 @@
 
 #include <MicroOcpp/Model/Authorization/AuthorizationData.h>
 #include <MicroOcpp/Core/Memory.h>
-#include <vector>
 
 #ifndef MO_LocalAuthListMaxLength
 #define MO_LocalAuthListMaxLength 48

diff --git a/src/MicroOcpp/Model/ConnectorBase/Connector.h b/src/MicroOcpp/Model/ConnectorBase/Connector.h
@@ -15,7 +15,6 @@
 #include <MicroOcpp/Core/Memory.h>
 #include <MicroOcpp/Operations/CiStrings.h>
 
-#include <vector>
 #include <functional>
 #include <memory>
 

diff --git a/src/MicroOcpp/Model/ConnectorBase/ConnectorsCommon.cpp b/src/MicroOcpp/Model/ConnectorBase/ConnectorsCommon.cpp
@@ -2,8 +2,6 @@
 // Copyright Matthias Akstaller 2019 - 2024
 // MIT License
 
-#include <string>
-
 #include <MicroOcpp/Model/ConnectorBase/ConnectorsCommon.h>
 #include <MicroOcpp/Core/Context.h>
 #include <MicroOcpp/Core/Configuration.h>

diff --git a/src/MicroOcpp/Model/Diagnostics/DiagnosticsService.h b/src/MicroOcpp/Model/Diagnostics/DiagnosticsService.h
@@ -7,8 +7,6 @@
 
 #include <functional>
 #include <memory>
-#include <string>
-#include <deque>
 #include <MicroOcpp/Core/Time.h>
 #include <MicroOcpp/Core/Ftp.h>
 #include <MicroOcpp/Core/Memory.h>

diff --git a/src/MicroOcpp/Model/Metering/MeterValue.h b/src/MicroOcpp/Model/Metering/MeterValue.h
@@ -11,7 +11,6 @@
 #include <MicroOcpp/Core/Memory.h>
 #include <ArduinoJson.h>
 #include <memory>
-#include <vector>
 
 namespace MicroOcpp {
 

diff --git a/src/MicroOcpp/Model/Metering/MeteringConnector.h b/src/MicroOcpp/Model/Metering/MeteringConnector.h
@@ -7,7 +7,6 @@
 
 #include <functional>
 #include <memory>
-#include <vector>
 
 #include <MicroOcpp/Model/Metering/MeterValue.h>
 #include <MicroOcpp/Model/Metering/MeterStore.h>

diff --git a/src/MicroOcpp/Model/Metering/MeteringService.h b/src/MicroOcpp/Model/Metering/MeteringService.h
@@ -6,7 +6,6 @@
 #define MO_METERINGSERVICE_H
 
 #include <functional>
-#include <vector>
 #include <memory>
 
 #include <MicroOcpp/Model/Metering/MeteringConnector.h>

diff --git a/src/MicroOcpp/Model/Model.cpp b/src/MicroOcpp/Model/Model.cpp
@@ -4,8 +4,6 @@
 
 #include <MicroOcpp/Model/Model.h>
 
-#include <string>
-
 #include <MicroOcpp/Model/Transactions/TransactionStore.h>
 #include <MicroOcpp/Model/SmartCharging/SmartChargingService.h>
 #include <MicroOcpp/Model/ConnectorBase/ConnectorsCommon.h>

diff --git a/src/MicroOcpp/Model/Reset/ResetService.h b/src/MicroOcpp/Model/Reset/ResetService.h
@@ -6,7 +6,6 @@
 #define MO_RESETSERVICE_H
 
 #include <functional>
-#include <vector>
 
 #include <MicroOcpp/Version.h>
 #include <MicroOcpp/Core/ConfigurationKeyValue.h>

diff --git a/src/MicroOcpp/Model/SmartCharging/SmartChargingModel.h b/src/MicroOcpp/Model/SmartCharging/SmartChargingModel.h
@@ -18,7 +18,6 @@
 #endif
 
 #include <memory>
-#include <vector>
 #include <limits>
 
 #include <ArduinoJson.h>

diff --git a/src/MicroOcpp/Model/SmartCharging/SmartChargingService.h b/src/MicroOcpp/Model/SmartCharging/SmartChargingService.h
@@ -55,7 +55,7 @@ class SmartChargingConnector : public MemoryManaged {
 
 public:
     SmartChargingConnector(Model& model, std::shared_ptr<FilesystemAdapter> filesystem, unsigned int connectorId, ProfileStack& ChargePointMaxProfile, ProfileStack& ChargePointTxDefaultProfile);
-    SmartChargingConnector(SmartChargingConnector&& other) = default;
+    SmartChargingConnector(SmartChargingConnector&&) = default;
     ~SmartChargingConnector();
 
     void loop();

diff --git a/src/MicroOcpp/Model/Variables/Variable.h b/src/MicroOcpp/Model/Variables/Variable.h
@@ -14,7 +14,6 @@
 #if MO_ENABLE_V201
 
 #include <stdint.h>
-#include <vector>
 #include <memory>
 #include <limits>
 

diff --git a/src/MicroOcpp/Model/Variables/VariableContainer.h b/src/MicroOcpp/Model/Variables/VariableContainer.h
@@ -13,7 +13,6 @@
 
 #if MO_ENABLE_V201
 
-#include <vector>
 #include <memory>
 
 #include <MicroOcpp/Model/Variables/Variable.h>

diff --git a/src/MicroOcpp/Model/Variables/VariableService.h b/src/MicroOcpp/Model/Variables/VariableService.h
@@ -10,7 +10,6 @@
 #define MO_VARIABLESERVICE_H
 
 #include <stdint.h>
-#include <vector>
 #include <memory>
 #include <limits>
 #include <functional>

diff --git a/src/MicroOcpp/Operations/GetBaseReport.h b/src/MicroOcpp/Operations/GetBaseReport.h
@@ -9,9 +9,8 @@
 
 #if MO_ENABLE_V201
 
-#include <string>
-
 #include <MicroOcpp/Core/Operation.h>
+#include <MicroOcpp/Core/Memory.h>
 #include <MicroOcpp/Model/Variables/Variable.h>
 
 namespace MicroOcpp {

diff --git a/src/MicroOcpp/Operations/GetConfiguration.cpp b/src/MicroOcpp/Operations/GetConfiguration.cpp
@@ -21,7 +21,7 @@ void GetConfiguration::processReq(JsonObject payload) {
 
     JsonArray requestedKeys = payload["key"];
     for (size_t i = 0; i < requestedKeys.size(); i++) {
-        keys.emplace_back(makeString(getMemoryTag(), requestedKeys[i].as<const char*>()));
+        keys.push_back(makeString(getMemoryTag(), requestedKeys[i].as<const char*>()));
     }
 }
 

diff --git a/src/MicroOcpp/Operations/GetConfiguration.h b/src/MicroOcpp/Operations/GetConfiguration.h
@@ -6,8 +6,7 @@
 #define MO_GETCONFIGURATION_H
 
 #include <MicroOcpp/Core/Operation.h>
-
-#include <vector>
+#include <MicroOcpp/Core/Memory.h>
 
 namespace MicroOcpp {
 namespace Ocpp16 {

diff --git a/src/MicroOcpp/Operations/GetInstalledCertificateIds.cpp b/src/MicroOcpp/Operations/GetInstalledCertificateIds.cpp
@@ -24,7 +24,7 @@ void GetInstalledCertificateIds::processReq(JsonObject payload) {
         return;
     }
 
-    Vector<GetCertificateIdType> certificateType = makeVector<GetCertificateIdType>(getMemoryTag());
+    auto certificateType = makeVector<GetCertificateIdType>(getMemoryTag());
     for (const char *certificateTypeCstr : payload["certificateType"].as<JsonArray>()) {
         if (!strcmp(certificateTypeCstr, "V2GRootCertificate")) {
             certificateType.push_back(GetCertificateIdType_V2GRootCertificate);

diff --git a/src/MicroOcpp/Operations/GetVariables.h b/src/MicroOcpp/Operations/GetVariables.h
@@ -9,10 +9,8 @@
 
 #if MO_ENABLE_V201
 
-#include <string>
-#include <vector>
-
 #include <MicroOcpp/Core/Operation.h>
+#include <MicroOcpp/Core/Memory.h>
 #include <MicroOcpp/Model/Variables/Variable.h>
 
 namespace MicroOcpp {

diff --git a/src/MicroOcpp/Operations/MeterValues.h b/src/MicroOcpp/Operations/MeterValues.h
@@ -6,10 +6,9 @@
 #define MO_METERVALUES_H
 
 #include <MicroOcpp/Core/Operation.h>
+#include <MicroOcpp/Core/Memory.h>
 #include <MicroOcpp/Core/Time.h>
 
-#include <vector>
-
 namespace MicroOcpp {
 
 class MeterValue;

diff --git a/src/MicroOcpp/Operations/NotifyReport.h b/src/MicroOcpp/Operations/NotifyReport.h
@@ -13,8 +13,6 @@
 #include <MicroOcpp/Core/Time.h>
 #include <MicroOcpp/Core/Memory.h>
 
-#include <vector>
-
 namespace MicroOcpp {
 
 class Model;

diff --git a/src/MicroOcpp/Operations/RequestStartTransaction.h b/src/MicroOcpp/Operations/RequestStartTransaction.h
@@ -9,8 +9,8 @@
 
 #if MO_ENABLE_V201
 
-#include <string>
 #include <MicroOcpp/Core/Operation.h>
+#include <MicroOcpp/Core/Memory.h>
 #include <MicroOcpp/Model/Transactions/TransactionDefs.h>
 
 namespace MicroOcpp {

diff --git a/src/MicroOcpp/Operations/RequestStopTransaction.h b/src/MicroOcpp/Operations/RequestStopTransaction.h
@@ -9,8 +9,8 @@
 
 #if MO_ENABLE_V201
 
-#include <string>
 #include <MicroOcpp/Core/Operation.h>
+#include <MicroOcpp/Core/Memory.h>
 #include <MicroOcpp/Model/Transactions/TransactionDefs.h>
 
 namespace MicroOcpp {

diff --git a/src/MicroOcpp/Operations/SetVariables.h b/src/MicroOcpp/Operations/SetVariables.h
@@ -9,10 +9,8 @@
 
 #if MO_ENABLE_V201
 
-#include <string>
-#include <vector>
-
 #include <MicroOcpp/Core/Operation.h>
+#include <MicroOcpp/Core/Memory.h>
 #include <MicroOcpp/Model/Variables/Variable.h>
 
 namespace MicroOcpp {

diff --git a/src/MicroOcpp/Operations/StopTransaction.cpp b/src/MicroOcpp/Operations/StopTransaction.cpp
@@ -79,7 +79,7 @@ std::unique_ptr<JsonDoc> StopTransaction::createReq() {
         txDataJson.emplace_back(std::move(mvJson));
     }
 
-    JsonDoc txDataDoc = JsonDoc(JSON_ARRAY_SIZE(txDataJson.size()) + txDataJson_size);
+    auto txDataDoc = initJsonDoc(getMemoryTag(), JSON_ARRAY_SIZE(txDataJson.size()) + txDataJson_size);
     for (auto mvJson = txDataJson.begin(); mvJson != txDataJson.end(); mvJson++) {
         txDataDoc.add(**mvJson);
     }

diff --git a/src/MicroOcpp/Operations/StopTransaction.h b/src/MicroOcpp/Operations/StopTransaction.h
@@ -6,9 +6,9 @@
 #define MO_STOPTRANSACTION_H
 
 #include <MicroOcpp/Core/Operation.h>
+#include <MicroOcpp/Core/Memory.h>
 #include <MicroOcpp/Core/Time.h>
 #include <MicroOcpp/Operations/CiStrings.h>
-#include <vector>
 
 namespace MicroOcpp {
 

diff --git a/src/MicroOcpp/Operations/TriggerMessage.h b/src/MicroOcpp/Operations/TriggerMessage.h
@@ -6,8 +6,7 @@
 #define MO_TRIGGERMESSAGE_H
 
 #include <MicroOcpp/Core/Operation.h>
-
-#include <vector>
+#include <MicroOcpp/Core/Memory.h>
 
 namespace MicroOcpp {
 

diff --git a/src/MicroOcpp_c.cpp b/src/MicroOcpp_c.cpp
@@ -364,7 +364,7 @@ void ocpp_set_console_out_c(void (*console_out)(const char *msg)) {
 
 void ocpp_authorize(const char *idTag, AuthorizeConfCallback onConfirmation, AuthorizeAbortCallback onAbort, AuthorizeTimeoutCallback onTimeout, AuthorizeErrorCallback onError, void *user_data) {
 
-    MicroOcpp::String idTag_capture = MicroOcpp::makeString("MicroOcpp_c.cpp", idTag);
+    auto idTag_capture = MicroOcpp::makeString("MicroOcpp_c.cpp", idTag);
 
     authorize(idTag,
             onConfirmation ? [onConfirmation, idTag_capture, user_data] (JsonObject payload) {