bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix some spelling

Browse Source
This commit is contained in:
Bartosz Wieczorek 2025-07-29 15:06:22 +02:00
parent 4acafea1b0
commit 4d14a95c27
8 changed files with 48 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rims_app/src/ctrl.cpp
View File

@ -134,20 +134,20 @@ PhaseModulationOrchestrator::PhaseModulationOrchestrator() : _ctrlChannels{NoMod
for (int i = 0; i < MaxChannels; i++) { for (int i = 0; i < MaxChannels; i++) {
auto &sem = _powerLevelSamplerSem.emplace_back(0, 1); auto &sem = _powerLevelSamplerSem.emplace_back(0, 1);
_powerLevelWathdogTimer.emplace_back(sem, std::chrono::seconds{2}); _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 // thread main
void PhaseModulationOrchestrator::loop() { void PhaseModulationOrchestrator::loop() {
while (1) { while (1) {
auto ret = zephyr::event_pool::k_poll_forever(_events); auto ret = zephyr::event_poll::k_poll_forever(_events);
if (ret == 0) { if (ret == 0) {
zephyr::event_pool::k_poll_handle(_events[0], [&]() { event_zeroCrossDetection(); }); zephyr::event_poll::k_poll_handle(_events[0], [&]() { event_zeroCrossDetection(); });
zephyr::event_pool::k_poll_handle(_events[1], [&]() { event_ctrlMessageArrived(); }); zephyr::event_poll::k_poll_handle(_events[1], [&]() { event_ctrlMessageArrived(); });
for (int i = 2; i < 2 + MaxChannels; i++) { for (int i = 2; i < 2 + MaxChannels; i++) {
auto channel = valid_channel{static_cast<int>(i - 2)}; auto channel = valid_channel{static_cast<int>(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); });
} }
} }
} }

2
rims_app/src/fifo_queue.hpp
View File

@ -22,7 +22,7 @@ template <typename T, size_t N> class fifo_queue {
} }
void k_event_init(k_poll_event &event) { void k_event_init(k_poll_event &event) {
zephyr::event_pool::k_init(event, _fifo); zephyr::event_poll::k_init(event, _fifo);
} }
template <typename Fn> // template <typename Fn> //

4
rims_app/src/gpio.cpp
View File

@ -24,9 +24,9 @@ GPIO::GPIO() {
// thread main // thread main
void GPIO::loop() { void GPIO::loop() {
while (1) { while (1) {
auto ret = zephyr::event_pool::k_poll_forever(_events); auto ret = zephyr::event_poll::k_poll_forever(_events);
if (ret == 0) { if (ret == 0) {
zephyr::event_pool::k_poll_handle(_events[0], [&]() { event_gpioMessageArrived(); }); zephyr::event_poll::k_poll_handle(_events[0], [&]() { event_gpioMessageArrived(); });
} }
} }
} }

20
rims_app/src/messenger.cpp
View File

@ -206,7 +206,7 @@ std::expected<uint32_t, Error> IPCCallback::send(std::span<std::byte> subsystemM
} }
MessengerThread::MessengerThread(TStackBase &stack) : ZephyrThread{stack, 9, 0, "Messenger"} { 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() { void MessengerThread::threadMain() {
@ -219,16 +219,16 @@ void MessengerThread::threadMain() {
utilizationEgressQueue.k_event_init(_events.at(7)); utilizationEgressQueue.k_event_init(_events.at(7));
while (1) { while (1) {
auto ret = zephyr::event_pool::k_poll_forever(_events); auto ret = zephyr::event_poll::k_poll_forever(_events);
if (ret == 0) { if (ret == 0) {
zephyr::event_pool::k_poll_handle(_events[0], std::bind(&MessengerThread::event_dataArrived, this)); zephyr::event_poll::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_poll::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_poll::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_poll::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_poll::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_poll::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_poll::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[7], std::bind(&MessengerThread::event_utilization, this));
} }
} }
} }

8
rims_app/src/operation.cpp
View File

@ -53,7 +53,7 @@ constexpr std::array<handler, 5> op_handlers = {
OperationOrchestrator::OperationOrchestrator() { OperationOrchestrator::OperationOrchestrator() {
ULOG_DEBUG("OperationOrchestrator start"); 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]); operationIngressQueue.k_event_init(_events[1]);
_tickTimer.start(); _tickTimer.start();
@ -61,10 +61,10 @@ OperationOrchestrator::OperationOrchestrator() {
void OperationOrchestrator::loop() { void OperationOrchestrator::loop() {
while (1) { while (1) {
auto ret = zephyr::event_pool::k_poll_forever(_events); auto ret = zephyr::event_poll::k_poll_forever(_events);
if (ret == 0) { if (ret == 0) {
zephyr::event_pool::k_poll_handle(_events[0], [&]() { event_tick(); }); zephyr::event_poll::k_poll_handle(_events[0], [&]() { event_tick(); });
zephyr::event_pool::k_poll_handle(_events[1], [&]() { event_operationMessageArrived(); }); zephyr::event_poll::k_poll_handle(_events[1], [&]() { event_operationMessageArrived(); });
} }
} }
} }

8
rims_app/src/temperature_measurements.cpp
View File

@ -367,7 +367,7 @@ TemperatureSamplerOrchestrator::TemperatureSamplerOrchestrator()
ULOG_INFO("Initialize message events"); ULOG_INFO("Initialize message events");
temperatureIngressQueue.k_event_init(_events.at(0)); 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() { void TemperatureSamplerOrchestrator::loop() {
@ -375,10 +375,10 @@ void TemperatureSamplerOrchestrator::loop() {
_samplerTick.start(); _samplerTick.start();
while (1) { while (1) {
auto ret = zephyr::event_pool::k_poll_forever(_events); auto ret = zephyr::event_poll::k_poll_forever(_events);
if (ret == 0) { if (ret == 0) {
zephyr::event_pool::k_poll_handle(_events[0], [&]() { event_messageArrived(); }); zephyr::event_poll::k_poll_handle(_events[0], [&]() { event_messageArrived(); });
zephyr::event_pool::k_poll_handle(_events[1], [&]() { action_samplersTick(); }); zephyr::event_poll::k_poll_handle(_events[1], [&]() { action_samplersTick(); });
} }
} }
} }

19
rims_app/src/zephyr.hpp
View File

@ -124,9 +124,24 @@ inline uint32_t crc32_ieee(std::span<uint8_t> data) {
} // namespace zephyr::crc } // namespace zephyr::crc
namespace zephyr::event_pool { namespace zephyr::event_poll {
enum type { sem, msgq, fifo }; 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) { inline void k_init(k_poll_event &event, k_sem &obj) {
event.tag = type::sem; event.tag = type::sem;
::k_poll_event_init(&event, K_POLL_TYPE_SEM_AVAILABLE, K_POLL_MODE_NOTIFY_ONLY, as_voidptr(obj)); ::k_poll_event_init(&event, K_POLL_TYPE_SEM_AVAILABLE, K_POLL_MODE_NOTIFY_ONLY, as_voidptr(obj));
@ -170,7 +185,7 @@ template <typename Fn> auto k_poll_handle(k_poll_event &event, Fn &&fn) {
} }
} }
} // namespace zephyr::event_pool } // namespace zephyr::event_poll
namespace zephyr::semaphore { namespace zephyr::semaphore {
struct sem : public ::k_sem { struct sem : public ::k_sem {

10
rims_app/src/zero_cross_detection.cpp
View File

@ -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}} { ZeroCrossDetectionOrchestrator::ZeroCrossDetectionOrchestrator() : _zcd{ZeroCrossDetection{ch1ZCD_pin_spec, &ZeroCrossDetectionEventQueue, 0}, ZeroCrossDetection{ch2ZCD_pin_spec, &ZeroCrossDetectionEventQueue, 1}} {
ULOG_INFO("Events configuration"); ULOG_INFO("Events configuration");
zephyr::event_pool::k_init(_events.at(0), _zcd.at(0)._intCheckSem); zephyr::event_poll::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(1), _zcd.at(1)._intCheckSem);
ULOG_INFO("Events configuration - DONE"); ULOG_INFO("Events configuration - DONE");
} }
void ZeroCrossDetectionOrchestrator::loop() { void ZeroCrossDetectionOrchestrator::loop() {
while (1) { while (1) {
auto ret = zephyr::event_pool::k_poll_forever(_events); auto ret = zephyr::event_poll::k_poll_forever(_events);
if (ret == 0) { if (ret == 0) {
zephyr::event_pool::k_poll_handle(_events.at(0), [&]() { event_zcdCheck(_zcd.at(0)); }); zephyr::event_poll::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(1), [&]() { event_zcdCheck(_zcd.at(1)); });
} }
} }
} }