|
5 | 5 |
|
6 | 6 | #include <algorithm> |
7 | 7 | #include <chrono> |
8 | | -#include <condition_variable> |
9 | 8 | #include <cmath> |
| 9 | +#include <condition_variable> |
10 | 10 | #include <fmt/core.h> |
11 | 11 | #include <thread> |
12 | 12 |
|
13 | 13 | namespace module { |
14 | 14 |
|
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) : |
18 | 18 | error_callback_(std::move(callback)), |
19 | 19 | std_deviation_threshold_V_(std_deviation_threshold_V), |
20 | 20 | fault_duration_(fault_duration), |
@@ -91,32 +91,30 @@ void VoltagePlausibilityMonitor::evaluate_voltages() { |
91 | 91 | // Collect valid voltage samples (not older than max_age) |
92 | 92 | // A timestamp of zero (default-initialized) means we've never received a value |
93 | 93 | 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); |
96 | 95 | if (age <= measurement_max_age_) { |
97 | 96 | valid_voltages.push_back(power_supply_sample_.voltage_V); |
98 | 97 | } |
99 | 98 | } |
100 | 99 |
|
101 | 100 | 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); |
104 | 102 | if (age <= measurement_max_age_) { |
105 | 103 | valid_voltages.push_back(powermeter_sample_.voltage_V); |
106 | 104 | } |
107 | 105 | } |
108 | 106 |
|
109 | 107 | 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); |
112 | 110 | if (age <= measurement_max_age_) { |
113 | 111 | valid_voltages.push_back(isolation_monitor_sample_.voltage_V); |
114 | 112 | } |
115 | 113 | } |
116 | 114 |
|
117 | 115 | 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); |
120 | 118 | if (age <= measurement_max_age_) { |
121 | 119 | valid_voltages.push_back(over_voltage_monitor_sample_.voltage_V); |
122 | 120 | } |
@@ -174,8 +172,8 @@ void VoltagePlausibilityMonitor::trigger_fault(const std::string& reason) { |
174 | 172 |
|
175 | 173 | void VoltagePlausibilityMonitor::arm_fault_timer(double std_deviation_V) { |
176 | 174 | 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_)); |
179 | 177 | return; |
180 | 178 | } |
181 | 179 |
|
@@ -246,4 +244,3 @@ void VoltagePlausibilityMonitor::timer_thread_func() { |
246 | 244 | } |
247 | 245 |
|
248 | 246 | } // namespace module |
249 | | - |
0 commit comments