simulator

Opentrons · Jan 17, 2024 · 58ce87e · 58ce87e
1 parent 8f9cc64
commit 58ce87e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 14 deletions.
diff --git a/hepa-uv/core/tasks.cpp b/hepa-uv/core/tasks.cpp
@@ -4,39 +4,53 @@
 #include "common/core/freertos_timer.hpp"
 #include "hepa-uv/core/can_task.hpp"
 #include "hepa-uv/firmware/gpio_drive_hardware.hpp"
+#include "hepa-uv/firmware/utility_gpio.h"
 
 #pragma GCC diagnostic push
 // NOLINTNEXTLINE(clang-diagnostic-unknown-warning-option)
 #pragma GCC diagnostic ignored "-Wvolatile"
-#include "hepa-uv/firmware/utility_gpio.h"
+#include "platform_specific_hal_conf.h"
 #pragma GCC diagnostic pop
 
 static auto tasks = hepauv_tasks::AllTask{};
 static auto queues = hepauv_tasks::QueueClient{can::ids::NodeId::hepa_uv};
 
 static auto gpio_drive_pins = gpio_drive_hardware::GpioDrivePins{
-    .door_open = gpio::PinConfig{.port = DOOR_OPEN_MCU_PORT,
-                                 .pin = DOOR_OPEN_MCU_PIN,
-                                 .active_setting = DOOR_OPEN_MCU_AS},
-    .reed_switch = gpio::PinConfig{.port = REED_SW_MCU_PORT,
-                                   .pin = REED_SW_MCU_PIN,
-                                   .active_setting = REED_SW_MCU_AS},
+    .door_open =
+        gpio::PinConfig{
+            // NOLINTNEXTLINE(cppcoreguidelines-pro-type-cstyle-cast)
+            .port = DOOR_OPEN_MCU_PORT,
+            .pin = DOOR_OPEN_MCU_PIN,
+            .active_setting = DOOR_OPEN_MCU_AS},
+    .reed_switch =
+        gpio::PinConfig{
+            // NOLINTNEXTLINE(cppcoreguidelines-pro-type-cstyle-cast)
+            .port = REED_SW_MCU_PORT,
+            .pin = REED_SW_MCU_PIN,
+            .active_setting = REED_SW_MCU_AS},
     .hepa_push_button =
         gpio::PinConfig{
+            // NOLINTNEXTLINE(cppcoreguidelines-pro-type-cstyle-cast)
             .port = HEPA_NO_MCU_PORT,
             .pin = HEPA_NO_MCU_PIN,
         },
     .uv_push_button =
         gpio::PinConfig{
+            // NOLINTNEXTLINE(cppcoreguidelines-pro-type-cstyle-cast)
             .port = UV_NO_MCU_PORT,
             .pin = UV_NO_MCU_PIN,
         },
-    .hepa_on_off = gpio::PinConfig{.port = HEPA_ON_OFF_PORT,
-                                   .pin = HEPA_ON_OFF_PIN,
-                                   .active_setting = HEPA_ON_OFF_AS},
-    .uv_on_off = gpio::PinConfig{.port = UV_ON_OFF_MCU_PORT,
-                                 .pin = UV_ON_OFF_MCU_PIN,
-                                 .active_setting = UV_ON_OFF_AS}};
+    .hepa_on_off =
+        gpio::PinConfig{
+            // NOLINTNEXTLINE(cppcoreguidelines-pro-type-cstyle-cast)
+            .port = HEPA_ON_OFF_PORT,
+            .pin = HEPA_ON_OFF_PIN,
+            .active_setting = HEPA_ON_OFF_AS},
+    .uv_on_off = gpio::PinConfig{
+        // NOLINTNEXTLINE(cppcoreguidelines-pro-type-cstyle-cast)
+        .port = UV_ON_OFF_MCU_PORT,
+        .pin = UV_ON_OFF_MCU_PIN,
+        .active_setting = UV_ON_OFF_AS}};
 
 static auto hepa_task_builder =
     freertos_task::TaskStarter<512, hepa_task::HepaTask>{};

diff --git a/include/hepa-uv/firmware/utility_gpio.h b/include/hepa-uv/firmware/utility_gpio.h
@@ -18,7 +18,6 @@ void utility_gpio_init();
 
 #pragma GCC diagnostic push
 // NOLINTNEXTLINE(clang-diagnostic-unknown-warning-option)
-#include "platform_specific_hal_conf.h"
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #pragma GCC diagnostic pop