format

Author: ryanthecoder

pipettes/firmware/interfaces.cpp

@@ -80,20 +80,19 @@ struct motor_hardware::UsageEEpromConfig plunger_usage_config {
             .type_key =
                 uint16_t(can::ids::MotorUsageValueType::linear_motor_distance),
             .length = usage_storage_task::distance_data_usage_len},
+            UsageRequestSet{
+                .eeprom_key = get_pipette_type() == NINETY_SIX_CHANNEL
+                                  ? P_96_ERROR_COUNT_KEY
+                                  : P_SM_ERROR_COUNT_KEY,
+                .type_key =
+                    uint16_t(can::ids::MotorUsageValueType::total_error_count),
+                .length = usage_storage_task::error_count_usage_len},
             UsageRequestSet {
-            .eeprom_key = get_pipette_type() == NINETY_SIX_CHANNEL
-                              ? P_96_ERROR_COUNT_KEY
-                              : P_SM_ERROR_COUNT_KEY,
-            .type_key =
-                uint16_t(can::ids::MotorUsageValueType::total_error_count),
-            .length = usage_storage_task::error_count_usage_len
-        },
-        UsageRequestSet {
             .eeprom_key = get_pipette_type() == NINETY_SIX_CHANNEL
                               ? OVERPRESSURE_COUNT_KEY_96
                               : OVERPRESSURE_COUNT_KEY_SM,
-            .type_key =
-                uint16_t(can::ids::MotorUsageValueType::overpressure_error_count),
+            .type_key = uint16_t(
+                can::ids::MotorUsageValueType::overpressure_error_count),
             .length = usage_storage_task::error_count_usage_len
         }
     }

pipettes/simulator/main.cpp

@@ -155,13 +155,14 @@ auto initialize_motor_tasks(
     motor_hardware_task::MotorHardwareTask& lmh_tsk,
     interfaces::gear_motor::UnavailableGearHardwareTasks&) {
     if (get_pipette_type() == EIGHT_CHANNEL) {
-        sensor_tasks::start_tasks(
-            *central_tasks::get_tasks().can_writer,
-            peripheral_tasks::get_i2c3_client(),
-            peripheral_tasks::get_i2c3_poller_client(),
-            peripheral_tasks::get_i2c1_client(),
-            peripheral_tasks::get_i2c1_poller_client(), fake_sensor_hw_primary,
-            fake_sensor_hw_secondary, version_wrapper, id, sim_eeprom, tail_accessor);
+        sensor_tasks::start_tasks(*central_tasks::get_tasks().can_writer,
+                                  peripheral_tasks::get_i2c3_client(),
+                                  peripheral_tasks::get_i2c3_poller_client(),
+                                  peripheral_tasks::get_i2c1_client(),
+                                  peripheral_tasks::get_i2c1_poller_client(),
+                                  fake_sensor_hw_primary,
+                                  fake_sensor_hw_secondary, version_wrapper, id,
+                                  sim_eeprom, tail_accessor);
 
     } else /* single channel */ {
         sensor_tasks::start_tasks(*central_tasks::get_tasks().can_writer,

sensors/tests/test_pressure_driver.cpp

@@ -70,7 +70,8 @@ SCENARIO("Testing the pressure sensor driver") {
     poller.set_queue(&i2c_poll_queue);
     auto muc = MockUsageClient();
     sensors::tasks::MMR920 driver(writer, poller, queue_client, pressure_queue,
-                                  hardware, sensor_id, &sensor_buffer, muc, overpressure_eeprom_key);
+                                  hardware, sensor_id, &sensor_buffer, muc,
+                                  overpressure_eeprom_key);
 
     can::message_writer_task::TaskMessage empty_can_msg{};
 

sensors/tests/test_pressure_sensor.cpp

@@ -68,8 +68,9 @@ SCENARIO("Receiving messages through the pressure sensor message handler") {
     poller.set_queue(&i2c_poll_queue);
     auto muc = MockUsageClient();
     auto sensor = sensors::tasks::PressureMessageHandler{
-        writer,  poller,    queue_client,  response_queue,
-        mock_hw, sensor_id, &sensor_buffer, muc, overpressure_eeprom_key};
+        writer,         poller,  queue_client,
+        response_queue, mock_hw, sensor_id,
+        &sensor_buffer, muc,     overpressure_eeprom_key};
 
     GIVEN("A TransactionResponse message") {
         can_queue.reset();