From a893b41c2547a3fa425ec57c3a9b3875e036c4bf Mon Sep 17 00:00:00 2001 From: algin Date: Wed, 5 Jul 2023 15:44:24 +0300 Subject: [PATCH] =?UTF-8?q?fix(UML-1462):=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D0=BF=D1=80=D0=B5=D1=84=D0=B8=D0=BA=D1=81?= =?UTF-8?q?=20free=5Frtos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/free_rtos/timer/timer.hpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/components/free_rtos/timer/timer.hpp b/components/free_rtos/timer/timer.hpp index 5fe3328..68cb080 100644 --- a/components/free_rtos/timer/timer.hpp +++ b/components/free_rtos/timer/timer.hpp @@ -1,14 +1,14 @@ /* * timer.hpp * - * Created on: 10 мар. 2023 г. + * Created on: 10 пїЅпїЅпїЅ. 2023 пїЅ. * Author: sychev */ #ifndef FREE_RTOS_TIMER_TIMER_HPP_ #define FREE_RTOS_TIMER_TIMER_HPP_ -#include +#include #include #include @@ -19,21 +19,21 @@ namespace free_rtos { class Timer { public: struct Settings { - uint32_t input_clk_Hz; /// Тактовая частота в Гц - uint32_t base_address; /// Базовый адрес - uint32_t clock_src_mux_addr; /// Адрес клока - uint32_t int_num; /// Номер прерывания - uint32_t int_priority; /// Приоритет прерывания - uint32_t period_us; /// Период таймера в мкс + uint32_t input_clk_Hz; /// пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅ пїЅпїЅ + uint32_t base_address; /// пїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅ + uint32_t clock_src_mux_addr; /// пїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅ + uint32_t int_num; /// пїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ + uint32_t int_priority; /// пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ + uint32_t period_us; /// пїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅ пїЅпїЅпїЅ }; /** - * Инициализация таймера + * пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅ */ bool Init(Settings& sett); /** - * Ожидания переполнение таймера. Блокирующее. + * пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅ. пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ. */ void Wait(); @@ -44,9 +44,9 @@ private: friend void timer_isr_callback(void * arg); private: - uint32_t base_addr_; /// Базовый адрес регистров таймера - uint32_t int_num_; /// Номер прерывания - HwiP_Object hwi_obj_; /// Управление прерываниями по таймеру + uint32_t base_addr_; /// пїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅ + uint32_t int_num_; /// пїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ + HwiP_Object hwi_obj_; /// пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅпїЅ пїЅпїЅ пїЅпїЅпїЅпїЅпїЅпїЅпїЅ Semaphore sem_; };