Skip to content

Commit f550ae1

Browse files
committed
Fix bazel and formatting
Signed-off-by: Florin Mihut <florinmihut1@gmail.com>
1 parent c13c415 commit f550ae1

3 files changed

Lines changed: 15 additions & 19 deletions

File tree

modules/EVSE/EvseManager/BUILD.bazel

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ IMPLS = [
66
"token_provider",
77
"random_delay",
88
"dc_external_derate",
9-
"over_voltage"
9+
"over_voltage",
10+
"voltage_plausibility"
1011
]
1112

1213
cc_everest_module(

modules/EVSE/EvseManager/voltage_plausibility/VoltagePlausibilityMonitor.cpp

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55

66
#include <algorithm>
77
#include <chrono>
8-
#include <condition_variable>
98
#include <cmath>
9+
#include <condition_variable>
1010
#include <fmt/core.h>
1111
#include <thread>
1212

1313
namespace module {
1414

15-
VoltagePlausibilityMonitor::VoltagePlausibilityMonitor(
16-
ErrorCallback callback, double std_deviation_threshold_V, std::chrono::milliseconds fault_duration,
17-
std::chrono::milliseconds measurement_max_age) :
15+
VoltagePlausibilityMonitor::VoltagePlausibilityMonitor(ErrorCallback callback, double std_deviation_threshold_V,
16+
std::chrono::milliseconds fault_duration,
17+
std::chrono::milliseconds measurement_max_age) :
1818
error_callback_(std::move(callback)),
1919
std_deviation_threshold_V_(std_deviation_threshold_V),
2020
fault_duration_(fault_duration),
@@ -91,32 +91,30 @@ void VoltagePlausibilityMonitor::evaluate_voltages() {
9191
// Collect valid voltage samples (not older than max_age)
9292
// A timestamp of zero (default-initialized) means we've never received a value
9393
if (power_supply_sample_.timestamp != zero_time) {
94-
const auto age = std::chrono::duration_cast<std::chrono::milliseconds>(
95-
now - power_supply_sample_.timestamp);
94+
const auto age = std::chrono::duration_cast<std::chrono::milliseconds>(now - power_supply_sample_.timestamp);
9695
if (age <= measurement_max_age_) {
9796
valid_voltages.push_back(power_supply_sample_.voltage_V);
9897
}
9998
}
10099

101100
if (powermeter_sample_.timestamp != zero_time) {
102-
const auto age = std::chrono::duration_cast<std::chrono::milliseconds>(
103-
now - powermeter_sample_.timestamp);
101+
const auto age = std::chrono::duration_cast<std::chrono::milliseconds>(now - powermeter_sample_.timestamp);
104102
if (age <= measurement_max_age_) {
105103
valid_voltages.push_back(powermeter_sample_.voltage_V);
106104
}
107105
}
108106

109107
if (isolation_monitor_sample_.timestamp != zero_time) {
110-
const auto age = std::chrono::duration_cast<std::chrono::milliseconds>(
111-
now - isolation_monitor_sample_.timestamp);
108+
const auto age =
109+
std::chrono::duration_cast<std::chrono::milliseconds>(now - isolation_monitor_sample_.timestamp);
112110
if (age <= measurement_max_age_) {
113111
valid_voltages.push_back(isolation_monitor_sample_.voltage_V);
114112
}
115113
}
116114

117115
if (over_voltage_monitor_sample_.timestamp != zero_time) {
118-
const auto age = std::chrono::duration_cast<std::chrono::milliseconds>(
119-
now - over_voltage_monitor_sample_.timestamp);
116+
const auto age =
117+
std::chrono::duration_cast<std::chrono::milliseconds>(now - over_voltage_monitor_sample_.timestamp);
120118
if (age <= measurement_max_age_) {
121119
valid_voltages.push_back(over_voltage_monitor_sample_.voltage_V);
122120
}
@@ -174,8 +172,8 @@ void VoltagePlausibilityMonitor::trigger_fault(const std::string& reason) {
174172

175173
void VoltagePlausibilityMonitor::arm_fault_timer(double std_deviation_V) {
176174
if (fault_duration_.count() == 0) {
177-
trigger_fault(fmt::format("Voltage standard deviation {:.2f} V exceeded threshold {:.2f} V.",
178-
std_deviation_V, std_deviation_threshold_V_));
175+
trigger_fault(fmt::format("Voltage standard deviation {:.2f} V exceeded threshold {:.2f} V.", std_deviation_V,
176+
std_deviation_threshold_V_));
179177
return;
180178
}
181179

@@ -246,4 +244,3 @@ void VoltagePlausibilityMonitor::timer_thread_func() {
246244
}
247245

248246
} // namespace module
249-

modules/EVSE/EvseManager/voltage_plausibility/VoltagePlausibilityMonitor.hpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ class VoltagePlausibilityMonitor {
4343
/// \param measurement_max_age Maximum age of a voltage measurement before it is considered
4444
/// stale and excluded from standard deviation calculation.
4545
VoltagePlausibilityMonitor(ErrorCallback callback, double std_deviation_threshold_V,
46-
std::chrono::milliseconds fault_duration,
47-
std::chrono::milliseconds measurement_max_age);
46+
std::chrono::milliseconds fault_duration, std::chrono::milliseconds measurement_max_age);
4847

4948
/// \brief Destructor joins the internal timer thread before destroying the object.
5049
~VoltagePlausibilityMonitor();
@@ -123,4 +122,3 @@ class VoltagePlausibilityMonitor {
123122
};
124123

125124
} // namespace module
126-

0 commit comments

Comments
 (0)