From 88aaadec0a627d0460c3d7e4fae0337aa1bfad99 Mon Sep 17 00:00:00 2001 From: caila-marashaj Date: Tue, 25 Jun 2024 16:42:52 -0400 Subject: [PATCH 1/2] rename to using-both-sensors --- include/sensors/core/tasks/capacitive_driver.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/sensors/core/tasks/capacitive_driver.hpp b/include/sensors/core/tasks/capacitive_driver.hpp index 7e890a16b..79db667c3 100644 --- a/include/sensors/core/tasks/capacitive_driver.hpp +++ b/include/sensors/core/tasks/capacitive_driver.hpp @@ -41,14 +41,14 @@ class FDC1004 { public: FDC1004(I2CQueueWriter &writer, I2CQueuePoller &poller, CanClient &can_client, OwnQueue &own_queue, - sensors::hardware::SensorHardwareBase &hardware, bool shared_sensor, + sensors::hardware::SensorHardwareBase &hardware, bool using_both_sensors, std::array *sensor_buffer) : writer(writer), poller(poller), can_client(can_client), own_queue(own_queue), hardware(hardware), - shared_sensor(shared_sensor), + using_both_sensors(using_both_sensors), sensor_buffer(sensor_buffer) {} [[nodiscard]] auto initialized() const -> bool { return _initialized; } @@ -82,7 +82,7 @@ class FDC1004 { auto get_sensor_id() -> can::ids::SensorId { return sensor_id; } auto set_sensor_id(can::ids::SensorId _id) -> void { - if (shared_sensor && sensor_id != _id) { + if (using_both_sensors && sensor_id != _id) { if (_id == can::ids::SensorId::S1) { measure_mode = fdc1004::MeasureConfigMode::TWO; } else { @@ -398,7 +398,7 @@ class FDC1004 { fdc1004::MeasureConfigMode measure_mode = fdc1004::MeasureConfigMode::ONE; fdc1004::MeasurementRate measurement_rate = fdc1004::MeasurementRate::ONE_HUNDRED_SAMPLES_PER_SECOND; - bool shared_sensor = false; + bool using_both_sensors = false; float current_offset_pf = 0; float zero_threshold_pf = 30; From 4aa611d4b6dc4addf860471e94cfa57546d1f836 Mon Sep 17 00:00:00 2001 From: caila-marashaj Date: Wed, 26 Jun 2024 10:13:36 -0400 Subject: [PATCH 2/2] format --- include/sensors/core/tasks/capacitive_driver.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/sensors/core/tasks/capacitive_driver.hpp b/include/sensors/core/tasks/capacitive_driver.hpp index 79db667c3..21efa5164 100644 --- a/include/sensors/core/tasks/capacitive_driver.hpp +++ b/include/sensors/core/tasks/capacitive_driver.hpp @@ -41,7 +41,8 @@ class FDC1004 { public: FDC1004(I2CQueueWriter &writer, I2CQueuePoller &poller, CanClient &can_client, OwnQueue &own_queue, - sensors::hardware::SensorHardwareBase &hardware, bool using_both_sensors, + sensors::hardware::SensorHardwareBase &hardware, + bool using_both_sensors, std::array *sensor_buffer) : writer(writer), poller(poller),