Skip to content

Commit 58ce87e

Browse files
committed
simulator
1 parent 8f9cc64 commit 58ce87e

File tree

2 files changed

+27
-14
lines changed

2 files changed

+27
-14
lines changed

hepa-uv/core/tasks.cpp

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,53 @@
44
#include "common/core/freertos_timer.hpp"
55
#include "hepa-uv/core/can_task.hpp"
66
#include "hepa-uv/firmware/gpio_drive_hardware.hpp"
7+
#include "hepa-uv/firmware/utility_gpio.h"
78

89
#pragma GCC diagnostic push
910
// NOLINTNEXTLINE(clang-diagnostic-unknown-warning-option)
1011
#pragma GCC diagnostic ignored "-Wvolatile"
11-
#include "hepa-uv/firmware/utility_gpio.h"
12+
#include "platform_specific_hal_conf.h"
1213
#pragma GCC diagnostic pop
1314

1415
static auto tasks = hepauv_tasks::AllTask{};
1516
static auto queues = hepauv_tasks::QueueClient{can::ids::NodeId::hepa_uv};
1617

1718
static auto gpio_drive_pins = gpio_drive_hardware::GpioDrivePins{
18-
.door_open = gpio::PinConfig{.port = DOOR_OPEN_MCU_PORT,
19-
.pin = DOOR_OPEN_MCU_PIN,
20-
.active_setting = DOOR_OPEN_MCU_AS},
21-
.reed_switch = gpio::PinConfig{.port = REED_SW_MCU_PORT,
22-
.pin = REED_SW_MCU_PIN,
23-
.active_setting = REED_SW_MCU_AS},
19+
.door_open =
20+
gpio::PinConfig{
21+
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-cstyle-cast)
22+
.port = DOOR_OPEN_MCU_PORT,
23+
.pin = DOOR_OPEN_MCU_PIN,
24+
.active_setting = DOOR_OPEN_MCU_AS},
25+
.reed_switch =
26+
gpio::PinConfig{
27+
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-cstyle-cast)
28+
.port = REED_SW_MCU_PORT,
29+
.pin = REED_SW_MCU_PIN,
30+
.active_setting = REED_SW_MCU_AS},
2431
.hepa_push_button =
2532
gpio::PinConfig{
33+
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-cstyle-cast)
2634
.port = HEPA_NO_MCU_PORT,
2735
.pin = HEPA_NO_MCU_PIN,
2836
},
2937
.uv_push_button =
3038
gpio::PinConfig{
39+
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-cstyle-cast)
3140
.port = UV_NO_MCU_PORT,
3241
.pin = UV_NO_MCU_PIN,
3342
},
34-
.hepa_on_off = gpio::PinConfig{.port = HEPA_ON_OFF_PORT,
35-
.pin = HEPA_ON_OFF_PIN,
36-
.active_setting = HEPA_ON_OFF_AS},
37-
.uv_on_off = gpio::PinConfig{.port = UV_ON_OFF_MCU_PORT,
38-
.pin = UV_ON_OFF_MCU_PIN,
39-
.active_setting = UV_ON_OFF_AS}};
43+
.hepa_on_off =
44+
gpio::PinConfig{
45+
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-cstyle-cast)
46+
.port = HEPA_ON_OFF_PORT,
47+
.pin = HEPA_ON_OFF_PIN,
48+
.active_setting = HEPA_ON_OFF_AS},
49+
.uv_on_off = gpio::PinConfig{
50+
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-cstyle-cast)
51+
.port = UV_ON_OFF_MCU_PORT,
52+
.pin = UV_ON_OFF_MCU_PIN,
53+
.active_setting = UV_ON_OFF_AS}};
4054

4155
static auto hepa_task_builder =
4256
freertos_task::TaskStarter<512, hepa_task::HepaTask>{};

include/hepa-uv/firmware/utility_gpio.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ void utility_gpio_init();
1818

1919
#pragma GCC diagnostic push
2020
// NOLINTNEXTLINE(clang-diagnostic-unknown-warning-option)
21-
#include "platform_specific_hal_conf.h"
2221
#pragma GCC diagnostic ignored "-Wunused-variable"
2322
#pragma GCC diagnostic pop
2423

0 commit comments

Comments
 (0)