Add optional variable to control the rounding of the timestamps

Signed-off-by: Marc Emmers <m.emmers@alfen.com>

Author: marcemmers

config/v201/component_schemas/standardized/InternalCtrlr.json

@@ -537,6 +537,21 @@
           "description": "List of criteria supported for a get custom report. Enabled,Active,Problem,Available",
           "default": "Enabled,Active,Problem,Available",
           "type": "string"
+      },
+      "RoundClockAlignedTimestamps": {
+          "variable_name": "RoundClockAlignedTimestamps",
+          "characteristics": {
+              "supportsMonitoring": false,
+              "dataType": "boolean"
+          },
+          "attributes": [
+              {
+                  "type": "Actual",
+                  "mutability": "ReadOnly"
+              }
+          ],
+          "default": "0",
+          "type": "boolean"
       }
   },
   "required": [

config/v201/config.json

@@ -271,8 +271,13 @@
                 "attributes": {
                     "Actual": "0"
                 }
+            },
+            "RoundClockAlignedTimestamps": {
+                "variable_name": "RoundClockAlignedTimestamps",
+                "attributes": {
+                    "Actual": "0"
+                }
             }
-            
         }
     },
     {

include/ocpp/v201/ctrlr_component_variables.hpp

@@ -54,6 +54,7 @@ extern const ComponentVariable& LogMessages;
 extern const RequiredComponentVariable& LogMessagesFormat;
 extern const ComponentVariable& SupportedChargingProfilePurposeTypes;
 extern const ComponentVariable& SupportedCriteria;
+extern const ComponentVariable& RoundClockAlignedTimestamps;
 extern const ComponentVariable& MaxCompositeScheduleDuration;
 extern const RequiredComponentVariable& NumberOfConnectors;
 extern const ComponentVariable& UseSslDefaultVerifyPaths;

lib/ocpp/v201/charge_point.cpp

@@ -1222,13 +1222,19 @@ void ChargePoint::update_aligned_data_interval() {
                 }
             }
 
+            const bool align_timestamps =
+                this->device_model->get_optional_value<bool>(ControllerComponentVariables::RoundClockAlignedTimestamps)
+                    .value_or(false);
+
             // send evseID = 0 values
             auto meter_value = get_latest_meter_value_filtered(this->aligned_data_evse0.retrieve_processed_values(),
                                                                ReadingContextEnum::Sample_Clock,
                                                                ControllerComponentVariables::AlignedDataMeasurands);
 
             if (!meter_value.sampledValue.empty()) {
-                meter_value.timestamp = utils::align_timestamp(DateTime{}, interval);
+                if (align_timestamps) {
+                    meter_value.timestamp = utils::align_timestamp(DateTime{}, interval);
+                }
                 this->meter_values_req(0, std::vector<ocpp::v201::MeterValue>(1, meter_value));
             }
             this->aligned_data_evse0.clear_values();
@@ -1243,7 +1249,10 @@ void ChargePoint::update_aligned_data_interval() {
                 auto meter_value =
                     get_latest_meter_value_filtered(evse->get_idle_meter_value(), ReadingContextEnum::Sample_Clock,
                                                     ControllerComponentVariables::AlignedDataMeasurands);
-                meter_value.timestamp = utils::align_timestamp(DateTime{}, interval);
+
+                if (align_timestamps) {
+                    meter_value.timestamp = utils::align_timestamp(DateTime{}, interval);
+                }
 
                 if (!meter_value.sampledValue.empty()) {
                     // J01.FR.14 this is the only case where we send a MeterValue.req

lib/ocpp/v201/ctrlr_component_variables.cpp

@@ -158,6 +158,13 @@ const ComponentVariable& SupportedCriteria = {
         "SupportedCriteria",
     }),
 };
+const ComponentVariable& RoundClockAlignedTimestamps = {
+    ControllerComponents::InternalCtrlr,
+    std::nullopt,
+    std::optional<Variable>({
+        "RoundClockAlignedTimestamps",
+    }),
+};
 const ComponentVariable& SupportedChargingProfilePurposeTypes = {
     ControllerComponents::InternalCtrlr,
     std::nullopt,

lib/ocpp/v201/evse.cpp

@@ -126,7 +126,11 @@ void Evse::open_transaction(const std::string& transaction_id, const int32_t con
                 for (auto& item : meter_value.sampledValue) {
                     item.context = ReadingContextEnum::Sample_Clock;
                 }
-                meter_value.timestamp = utils::align_timestamp(DateTime{}, aligned_data_tx_updated_interval);
+                if (this->device_model
+                        .get_optional_value<bool>(ControllerComponentVariables::RoundClockAlignedTimestamps)
+                        .value_or(false)) {
+                    meter_value.timestamp = utils::align_timestamp(DateTime{}, aligned_data_tx_updated_interval);
+                }
                 this->transaction_meter_value_req(meter_value, this->transaction->get_transaction(),
                                                   transaction->get_seq_no(), this->transaction->reservation_id);
                 this->aligned_data_updated.clear_values();
@@ -147,7 +151,11 @@ void Evse::open_transaction(const std::string& transaction_id, const int32_t con
                 for (auto& item : meter_value.sampledValue) {
                     item.context = ReadingContextEnum::Sample_Clock;
                 }
-                meter_value.timestamp = utils::align_timestamp(DateTime{}, aligned_data_tx_ended_interval);
+                if (this->device_model
+                        .get_optional_value<bool>(ControllerComponentVariables::RoundClockAlignedTimestamps)
+                        .value_or(false)) {
+                    meter_value.timestamp = utils::align_timestamp(DateTime{}, aligned_data_tx_ended_interval);
+                }
                 this->database_handler->transaction_metervalues_insert(this->transaction->transactionId.get(),
                                                                        meter_value);
                 this->aligned_data_tx_end.clear_values();