Fix a bunch of style issues

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

Author: marcemmers

include/ocpp/common/aligned_timer.hpp

@@ -68,20 +68,23 @@ class ClockAlignedTimer : private Everest::Timer<std::chrono::system_clock> {
 
     template <class Rep, class Period>
     system_time_point interval_starting_from(const std::function<void()>& callback,
-                                const std::chrono::duration<Rep, Period> interval, system_time_point start_point) {
+                                             const std::chrono::duration<Rep, Period> interval,
+                                             system_time_point start_point) {
         this->callback = callback;
         return this->interval_starting_from(interval, start_point);
     }
 
     template <class Rep, class Period>
-    system_time_point interval_starting_from(const std::chrono::duration<Rep, Period> interval, system_time_point start_point) {
+    system_time_point interval_starting_from(const std::chrono::duration<Rep, Period> interval,
+                                             system_time_point start_point) {
         this->start_point = start_point;
         this->call_interval = interval;
 
         return this->call_next();
     }
 
-    template <class Rep, class Period> system_time_point set_interval(const std::chrono::duration<Rep, Period>& interval) {
+    template <class Rep, class Period>
+    system_time_point set_interval(const std::chrono::duration<Rep, Period>& interval) {
         this->call_interval = interval;
         return this->call_next();
     }

include/ocpp/v201/utils.hpp

@@ -33,11 +33,9 @@ MeterValue get_meter_value_with_measurands_applied(const MeterValue& _meter_valu
 /// Sample_Clock will be filtered using \p aligned_tx_ended_measurands
 /// Any metervalue after \p max_timestamp will also be removed.
 ///\retval filtered meter values
-std::vector<MeterValue>
-get_meter_values_with_measurands_applied(const std::vector<MeterValue>& meter_values,
-                                         const std::vector<MeasurandEnum>& sampled_tx_ended_measurands,
-                                         const std::vector<MeasurandEnum>& aligned_tx_ended_measurands,
-                                         ocpp::DateTime max_timestamp);
+std::vector<MeterValue> get_meter_values_with_measurands_applied(
+    const std::vector<MeterValue>& meter_values, const std::vector<MeasurandEnum>& sampled_tx_ended_measurands,
+    const std::vector<MeasurandEnum>& aligned_tx_ended_measurands, ocpp::DateTime max_timestamp);
 
 /// \brief Converts the given \p stop_reason to a TriggerReasonEnum
 /// \param stop_reason

lib/ocpp/v201/charge_point.cpp

@@ -352,7 +352,7 @@ void ChargePoint::on_transaction_finished(const int32_t evse_id, const DateTime&
             this->device_model->get_value<std::string>(ControllerComponentVariables::SampledDataTxEndedMeasurands)),
         utils::get_measurands_vec(
             this->device_model->get_value<std::string>(ControllerComponentVariables::AlignedDataTxEndedMeasurands)),
-            timestamp));
+        timestamp));
 
     if (meter_values.value().empty()) {
         meter_values.reset();

lib/ocpp/v201/evse.cpp

@@ -95,8 +95,7 @@ void Evse::open_transaction(const std::string& transaction_id, const int32_t con
                 this->transaction_meter_value_req(this->get_meter_value(), this->transaction->get_transaction(),
                                                   transaction->get_seq_no(), this->transaction->reservation_id);
             },
-            sampled_data_tx_updated_interval,
-            date::utc_clock::to_sys(timestamp.to_time_point()));
+            sampled_data_tx_updated_interval, date::utc_clock::to_sys(timestamp.to_time_point()));
     }
 
     if (sampled_data_tx_ended_interval > 0s) {
@@ -105,8 +104,7 @@ void Evse::open_transaction(const std::string& transaction_id, const int32_t con
                 this->database_handler->transaction_metervalues_insert(this->transaction->transactionId.get(),
                                                                        this->get_meter_value());
             },
-            sampled_data_tx_ended_interval,
-            date::utc_clock::to_sys(timestamp.to_time_point()));
+            sampled_data_tx_ended_interval, date::utc_clock::to_sys(timestamp.to_time_point()));
     }
 
     if (aligned_data_tx_updated_interval > 0s) {
@@ -141,25 +139,23 @@ void Evse::open_transaction(const std::string& transaction_id, const int32_t con
 
     if (aligned_data_tx_ended_interval > 0s) {
         auto store_aligned_metervalue = [this, aligned_data_tx_ended_interval] {
-                auto meter_value = this->aligned_data_tx_end.retrieve_processed_values();
+            auto meter_value = this->aligned_data_tx_end.retrieve_processed_values();
 
-                // If empty fallback on last updated metervalue
-                if (meter_value.sampledValue.empty()) {
-                    meter_value = get_meter_value();
-                }
+            // If empty fallback on last updated metervalue
+            if (meter_value.sampledValue.empty()) {
+                meter_value = get_meter_value();
+            }
 
-                for (auto& item : meter_value.sampledValue) {
-                    item.context = ReadingContextEnum::Sample_Clock;
-                }
-                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();
-            };
+            for (auto& item : meter_value.sampledValue) {
+                item.context = ReadingContextEnum::Sample_Clock;
+            }
+            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();
+        };
 
         auto next_interval = transaction->aligned_tx_ended_meter_values_timer.interval_starting_from(
             store_aligned_metervalue, aligned_data_tx_ended_interval,

lib/ocpp/v201/utils.cpp

@@ -51,11 +51,9 @@ MeterValue get_meter_value_with_measurands_applied(const MeterValue& _meter_valu
     return meter_value;
 }
 
-std::vector<MeterValue>
-get_meter_values_with_measurands_applied(const std::vector<MeterValue>& meter_values,
-                                         const std::vector<MeasurandEnum>& sampled_tx_ended_measurands,
-                                         const std::vector<MeasurandEnum>& aligned_tx_ended_measurands,
-                                         ocpp::DateTime max_timestamp) {
+std::vector<MeterValue> get_meter_values_with_measurands_applied(
+    const std::vector<MeterValue>& meter_values, const std::vector<MeasurandEnum>& sampled_tx_ended_measurands,
+    const std::vector<MeasurandEnum>& aligned_tx_ended_measurands, ocpp::DateTime max_timestamp) {
     std::vector<MeterValue> meter_values_result;
 
     for (const auto& meter_value : meter_values) {