From 4d14a95c27dae6729836705e609dada8b47d4a8c Mon Sep 17 00:00:00 2001 From: Bartosz Wieczorek Date: Tue, 29 Jul 2025 15:06:22 +0200 Subject: [PATCH] fix some spelling --- rims_app/src/ctrl.cpp | 10 +++++----- rims_app/src/fifo_queue.hpp | 2 +- rims_app/src/gpio.cpp | 4 ++-- rims_app/src/messenger.cpp | 20 ++++++++++---------- rims_app/src/operation.cpp | 8 ++++---- rims_app/src/temperature_measurements.cpp | 8 ++++---- rims_app/src/zephyr.hpp | 19 +++++++++++++++++-- rims_app/src/zero_cross_detection.cpp | 10 +++++----- 8 files changed, 48 insertions(+), 33 deletions(-) diff --git a/rims_app/src/ctrl.cpp b/rims_app/src/ctrl.cpp index 8786c4087e7..339a5e5a4c0 100644 --- a/rims_app/src/ctrl.cpp +++ b/rims_app/src/ctrl.cpp @@ -134,20 +134,20 @@ PhaseModulationOrchestrator::PhaseModulationOrchestrator() : _ctrlChannels{NoMod for (int i = 0; i < MaxChannels; i++) { auto &sem = _powerLevelSamplerSem.emplace_back(0, 1); _powerLevelWathdogTimer.emplace_back(sem, std::chrono::seconds{2}); - zephyr::event_pool::k_init(_events[2 + i], sem); + zephyr::event_poll::k_init(_events[2 + i], sem); } } // thread main void PhaseModulationOrchestrator::loop() { while (1) { - auto ret = zephyr::event_pool::k_poll_forever(_events); + auto ret = zephyr::event_poll::k_poll_forever(_events); if (ret == 0) { - zephyr::event_pool::k_poll_handle(_events[0], [&]() { event_zeroCrossDetection(); }); - zephyr::event_pool::k_poll_handle(_events[1], [&]() { event_ctrlMessageArrived(); }); + zephyr::event_poll::k_poll_handle(_events[0], [&]() { event_zeroCrossDetection(); }); + zephyr::event_poll::k_poll_handle(_events[1], [&]() { event_ctrlMessageArrived(); }); for (int i = 2; i < 2 + MaxChannels; i++) { auto channel = valid_channel{static_cast(i - 2)}; - zephyr::event_pool::k_poll_handle(_events[i], [this, channel]() { event_ctrlWatchdog(channel); }); + zephyr::event_poll::k_poll_handle(_events[i], [this, channel]() { event_ctrlWatchdog(channel); }); } } } diff --git a/rims_app/src/fifo_queue.hpp b/rims_app/src/fifo_queue.hpp index d06872c7bb3..f8f835c40fd 100644 --- a/rims_app/src/fifo_queue.hpp +++ b/rims_app/src/fifo_queue.hpp @@ -22,7 +22,7 @@ template class fifo_queue { } void k_event_init(k_poll_event &event) { - zephyr::event_pool::k_init(event, _fifo); + zephyr::event_poll::k_init(event, _fifo); } template // diff --git a/rims_app/src/gpio.cpp b/rims_app/src/gpio.cpp index 0cb8c8d806c..efc5f75d360 100644 --- a/rims_app/src/gpio.cpp +++ b/rims_app/src/gpio.cpp @@ -24,9 +24,9 @@ GPIO::GPIO() { // thread main void GPIO::loop() { while (1) { - auto ret = zephyr::event_pool::k_poll_forever(_events); + auto ret = zephyr::event_poll::k_poll_forever(_events); if (ret == 0) { - zephyr::event_pool::k_poll_handle(_events[0], [&]() { event_gpioMessageArrived(); }); + zephyr::event_poll::k_poll_handle(_events[0], [&]() { event_gpioMessageArrived(); }); } } } diff --git a/rims_app/src/messenger.cpp b/rims_app/src/messenger.cpp index 678d0b042a8..9c4953a18ce 100644 --- a/rims_app/src/messenger.cpp +++ b/rims_app/src/messenger.cpp @@ -206,7 +206,7 @@ std::expected IPCCallback::send(std::span subsystemM } MessengerThread::MessengerThread(TStackBase &stack) : ZephyrThread{stack, 9, 0, "Messenger"} { - zephyr::event_pool::k_init(_events.at(0), messenger_buffer_arrived_queue); + zephyr::event_poll::k_init(_events.at(0), messenger_buffer_arrived_queue); } void MessengerThread::threadMain() { @@ -219,16 +219,16 @@ void MessengerThread::threadMain() { utilizationEgressQueue.k_event_init(_events.at(7)); while (1) { - auto ret = zephyr::event_pool::k_poll_forever(_events); + auto ret = zephyr::event_poll::k_poll_forever(_events); if (ret == 0) { - zephyr::event_pool::k_poll_handle(_events[0], std::bind(&MessengerThread::event_dataArrived, this)); - zephyr::event_pool::k_poll_handle(_events[1], std::bind(&MessengerThread::event_temperatureEgress, this)); - zephyr::event_pool::k_poll_handle(_events[2], std::bind(&MessengerThread::event_ctrlEgress, this)); - zephyr::event_pool::k_poll_handle(_events[3], std::bind(&MessengerThread::event_configEgress, this)); - zephyr::event_pool::k_poll_handle(_events[4], std::bind(&MessengerThread::event_logEgress, this)); - zephyr::event_pool::k_poll_handle(_events[5], std::bind(&MessengerThread::event_gpioEgress, this)); - zephyr::event_pool::k_poll_handle(_events[6], std::bind(&MessengerThread::event_operation, this)); - zephyr::event_pool::k_poll_handle(_events[7], std::bind(&MessengerThread::event_utilization, this)); + zephyr::event_poll::k_poll_handle(_events[0], std::bind(&MessengerThread::event_dataArrived, this)); + zephyr::event_poll::k_poll_handle(_events[1], std::bind(&MessengerThread::event_temperatureEgress, this)); + zephyr::event_poll::k_poll_handle(_events[2], std::bind(&MessengerThread::event_ctrlEgress, this)); + zephyr::event_poll::k_poll_handle(_events[3], std::bind(&MessengerThread::event_configEgress, this)); + zephyr::event_poll::k_poll_handle(_events[4], std::bind(&MessengerThread::event_logEgress, this)); + zephyr::event_poll::k_poll_handle(_events[5], std::bind(&MessengerThread::event_gpioEgress, this)); + zephyr::event_poll::k_poll_handle(_events[6], std::bind(&MessengerThread::event_operation, this)); + zephyr::event_poll::k_poll_handle(_events[7], std::bind(&MessengerThread::event_utilization, this)); } } } diff --git a/rims_app/src/operation.cpp b/rims_app/src/operation.cpp index 9df05a6d694..9240a96984a 100644 --- a/rims_app/src/operation.cpp +++ b/rims_app/src/operation.cpp @@ -53,7 +53,7 @@ constexpr std::array op_handlers = { OperationOrchestrator::OperationOrchestrator() { ULOG_DEBUG("OperationOrchestrator start"); - zephyr::event_pool::k_init(_events[0], _tickSem); + zephyr::event_poll::k_init(_events[0], _tickSem); operationIngressQueue.k_event_init(_events[1]); _tickTimer.start(); @@ -61,10 +61,10 @@ OperationOrchestrator::OperationOrchestrator() { void OperationOrchestrator::loop() { while (1) { - auto ret = zephyr::event_pool::k_poll_forever(_events); + auto ret = zephyr::event_poll::k_poll_forever(_events); if (ret == 0) { - zephyr::event_pool::k_poll_handle(_events[0], [&]() { event_tick(); }); - zephyr::event_pool::k_poll_handle(_events[1], [&]() { event_operationMessageArrived(); }); + zephyr::event_poll::k_poll_handle(_events[0], [&]() { event_tick(); }); + zephyr::event_poll::k_poll_handle(_events[1], [&]() { event_operationMessageArrived(); }); } } } diff --git a/rims_app/src/temperature_measurements.cpp b/rims_app/src/temperature_measurements.cpp index a5a3ad9e331..74effc86734 100644 --- a/rims_app/src/temperature_measurements.cpp +++ b/rims_app/src/temperature_measurements.cpp @@ -367,7 +367,7 @@ TemperatureSamplerOrchestrator::TemperatureSamplerOrchestrator() ULOG_INFO("Initialize message events"); temperatureIngressQueue.k_event_init(_events.at(0)); - zephyr::event_pool::k_init(_events.at(1), _samplerTickSem); + zephyr::event_poll::k_init(_events.at(1), _samplerTickSem); }; void TemperatureSamplerOrchestrator::loop() { @@ -375,10 +375,10 @@ void TemperatureSamplerOrchestrator::loop() { _samplerTick.start(); while (1) { - auto ret = zephyr::event_pool::k_poll_forever(_events); + auto ret = zephyr::event_poll::k_poll_forever(_events); if (ret == 0) { - zephyr::event_pool::k_poll_handle(_events[0], [&]() { event_messageArrived(); }); - zephyr::event_pool::k_poll_handle(_events[1], [&]() { action_samplersTick(); }); + zephyr::event_poll::k_poll_handle(_events[0], [&]() { event_messageArrived(); }); + zephyr::event_poll::k_poll_handle(_events[1], [&]() { action_samplersTick(); }); } } } diff --git a/rims_app/src/zephyr.hpp b/rims_app/src/zephyr.hpp index 5477ebc2d27..8966c73ba8b 100644 --- a/rims_app/src/zephyr.hpp +++ b/rims_app/src/zephyr.hpp @@ -124,9 +124,24 @@ inline uint32_t crc32_ieee(std::span data) { } // namespace zephyr::crc -namespace zephyr::event_pool { +namespace zephyr::event_poll { enum type { sem, msgq, fifo }; +// struct event_poll : public k_poll_event{ +// event_poll(k_sem &obj) { +// tag = type::sem; +// ::k_poll_event_init(this, K_POLL_TYPE_SEM_AVAILABLE, K_POLL_MODE_NOTIFY_ONLY, as_voidptr(obj)); +// } +// event_poll(k_msgq &obj) { +// tag = type::msgq; +// ::k_poll_event_init(this, K_POLL_TYPE_MSGQ_DATA_AVAILABLE, K_POLL_MODE_NOTIFY_ONLY, as_voidptr(obj)); +// } +// event_poll(k_fifo &obj) { +// tag = type::fifo; +// ::k_poll_event_init(this, K_POLL_TYPE_FIFO_DATA_AVAILABLE, K_POLL_MODE_NOTIFY_ONLY, as_voidptr(obj)); +// } +// }; + inline void k_init(k_poll_event &event, k_sem &obj) { event.tag = type::sem; ::k_poll_event_init(&event, K_POLL_TYPE_SEM_AVAILABLE, K_POLL_MODE_NOTIFY_ONLY, as_voidptr(obj)); @@ -170,7 +185,7 @@ template auto k_poll_handle(k_poll_event &event, Fn &&fn) { } } -} // namespace zephyr::event_pool +} // namespace zephyr::event_poll namespace zephyr::semaphore { struct sem : public ::k_sem { diff --git a/rims_app/src/zero_cross_detection.cpp b/rims_app/src/zero_cross_detection.cpp index ffd80cd5912..ccb7e153bb6 100644 --- a/rims_app/src/zero_cross_detection.cpp +++ b/rims_app/src/zero_cross_detection.cpp @@ -60,17 +60,17 @@ ZeroCrossDetection::ZeroCrossDetection(const gpio_dt_spec &gpio, ZCDFifo_t *queu ZeroCrossDetectionOrchestrator::ZeroCrossDetectionOrchestrator() : _zcd{ZeroCrossDetection{ch1ZCD_pin_spec, &ZeroCrossDetectionEventQueue, 0}, ZeroCrossDetection{ch2ZCD_pin_spec, &ZeroCrossDetectionEventQueue, 1}} { ULOG_INFO("Events configuration"); - zephyr::event_pool::k_init(_events.at(0), _zcd.at(0)._intCheckSem); - zephyr::event_pool::k_init(_events.at(1), _zcd.at(1)._intCheckSem); + zephyr::event_poll::k_init(_events.at(0), _zcd.at(0)._intCheckSem); + zephyr::event_poll::k_init(_events.at(1), _zcd.at(1)._intCheckSem); ULOG_INFO("Events configuration - DONE"); } void ZeroCrossDetectionOrchestrator::loop() { while (1) { - auto ret = zephyr::event_pool::k_poll_forever(_events); + auto ret = zephyr::event_poll::k_poll_forever(_events); if (ret == 0) { - zephyr::event_pool::k_poll_handle(_events.at(0), [&]() { event_zcdCheck(_zcd.at(0)); }); - zephyr::event_pool::k_poll_handle(_events.at(1), [&]() { event_zcdCheck(_zcd.at(1)); }); + zephyr::event_poll::k_poll_handle(_events.at(0), [&]() { event_zcdCheck(_zcd.at(0)); }); + zephyr::event_poll::k_poll_handle(_events.at(1), [&]() { event_zcdCheck(_zcd.at(1)); }); } } }