remove i2c dep from pump task

Author: vegano1

stm32-modules/include/vacuum-module/firmware/freertos_tasks.hpp

@@ -32,6 +32,5 @@ auto run(tasks::FirmwareTasks::QueueAggregator* aggregator,
 
 namespace pump_control_task {
 // Actual function that runs in the task
-auto run(tasks::FirmwareTasks::QueueAggregator* aggregator,
-         i2c::hardware::I2C* i2c_comms) -> void;
+auto run(tasks::FirmwareTasks::QueueAggregator* aggregator) -> void;
 }  // namespace pump_control_task

stm32-modules/include/vacuum-module/vacuum-module/MPRLL0025PA00001A.hpp

@@ -98,7 +98,7 @@ class MPRLL0025PA00001 {
         // Calculation of pressure value according to equation 2 of datasheet
         // Equation 2: Pressure Output Function
         auto press_counts =
-        // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-pointer-arithmetic)
+            // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-pointer-arithmetic)
             (double)((int32_t)raw[3] + (int32_t)raw[2] * (int32_t)256 +
                      (int32_t)raw[1] *
                          (int32_t)65536);  // calculate digital pressure counts

stm32-modules/include/vacuum-module/vacuum-module/lps22df.hpp

@@ -94,7 +94,7 @@ class LPS222DF {
         // pressure in hPa, take the complete 24-bit word and then divide by the
         // sensitivity 4096 LSB/hPa.
         int32_t pressure_lsb =
-        // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-pointer-arithmetic)
+            // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-pointer-arithmetic)
             ((int32_t)raw[3] << 16) | ((int32_t)raw[2] << 8) | (int32_t)raw[1];
 
         // Convert from 24-bit twos complement to signed 32-bit

stm32-modules/vacuum-module/firmware/main.cpp

@@ -25,8 +25,8 @@ using EntryPointUI = std::function<void(tasks::FirmwareTasks::QueueAggregator *,
 using EntryPointPressure = std::function<void(
     tasks::FirmwareTasks::QueueAggregator *, i2c::hardware::I2C *,
     i2c::hardware::I2C *, i2c::hardware::I2C *)>;
-using EntryPointPump = std::function<void(
-    tasks::FirmwareTasks::QueueAggregator *, i2c::hardware::I2C *)>;
+using EntryPointPump =
+    std::function<void(tasks::FirmwareTasks::QueueAggregator *)>;
 
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 static auto ui_task_entry = EntryPointUI(ui_control_task::run);
@@ -87,11 +87,9 @@ auto main() -> int {
     system_task.start(tasks::SYSTEM_TASK_PRIORITY, "System", &aggregator);
     host_comms_task.start(tasks::COMMS_TASK_PRIORITY, "Comms", &aggregator);
     ui_task.start(tasks::UI_TASK_PRIORITY, "UI", &aggregator, &i2c2_comms);
+    pump_task.start(tasks::PUMP_TASK_PRIORITY, "Pump", &aggregator);
     pressure_task.start(tasks::PRESSURE_TASK_PRIORITY, "Pressure", &aggregator,
-                        // TODO: switch to i2c1
-                        &i2c2_comms, &i2c2_comms, &i2c3_comms);
-    pump_task.start(tasks::PUMP_TASK_PRIORITY, "Pump", &aggregator,
-                    &i2c2_comms);
+                        &i2c1_comms, &i2c2_comms, &i2c3_comms);
 
     vTaskStartScheduler();
     return 0;

stm32-modules/vacuum-module/firmware/pump_task/freertos_pump_task.cpp

@@ -22,8 +22,7 @@ static tasks::FirmwareTasks::PumpQueue
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 static auto _top_task = pump_task::PumpTask(_queue, nullptr, nullptr);
 
-auto run(tasks::FirmwareTasks::QueueAggregator* aggregator,
-         i2c::hardware::I2C* i2c1_comms) -> void {
+auto run(tasks::FirmwareTasks::QueueAggregator* aggregator) -> void {
     auto* handle = xTaskGetCurrentTaskHandle();
     _queue.provide_handle(handle);
     aggregator->register_queue(_queue);