commit 669187dc91526384ca974facca870ea311750f05 parent a84f02585a4dc217b8cb4433ba12a86e45c04453 Author: Martin Kloeckner <mjkloeckner@gmail.com> Date: Sun, 29 Mar 2026 13:28:57 -0300 Eliminar archivos no utilizados Diffstat:
16 files changed, 10 insertions(+), 434 deletions(-) diff --git a/firmware/app/inc/board.h b/firmware/app/inc/board.h @@ -1,81 +0,0 @@ -/* - * Copyright (c) 2023 Juan Manuel Cruz <jcruz@fi.uba.ar> <jcruz@frba.utn.edu.ar>. - * - * See file `LICENSE` for full details - */ - -#ifndef BOARD_INC_BOARD_H_ -#define BOARD_INC_BOARD_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#define NUCLEO_F103RC (0) -#define NUCLEO_F303R8 (1) -#define NUCLEO_F401RE (2) -#define NUCLEO_F446RE (3) -#define NUCLEO_F413ZH (4) -#define NUCLEO_F429ZI (5) -#define NUCLEO_F439ZI (6) -#define NUCLEO_F767ZI (7) -#define STM32F407G_DISC1 (8) -#define STM32F429I_DISC1 (9) - -#define BOARD (NUCLEO_F103RC) - -/* STM32 Nucleo Boards - 32 Pins */ -#if (BOARD == NUCLEO_F303R8) - -#endif - -/* STM32 Nucleo Boards - 64 Pins */ -#if ((BOARD == NUCLEO_F103RC) || (BOARD == NUCLEO_F401RE) || (BOARD == NUCLEO_F446RE)) - -#define BTN_A_PIN B1_Pin -#define BTN_A_PORT B1_GPIO_Port -#define BTN_A_PRESSED GPIO_PIN_RESET -#define BTN_A_HOVER GPIO_PIN_SET - -#define LED_A_PIN LD2_Pin -#define LED_A_PORT LD2_GPIO_Port -#define LED_A_ON GPIO_PIN_SET -#define LED_A_OFF GPIO_PIN_RESET - -#endif - -/* STM32 Nucleo Boards - 144 Pins */ -#if ((BOARD == NUCLEO_F413ZH) || (BOARD == NUCLEO_F429ZI) || (BOARD == NUCLEO_F439ZI) || (BOARD == NUCLEO_F767ZI)) - -#define BTN_A_PIN USER_Btn_Pin -#define BTN_A_PORT USER_Btn_GPIO_Port -#define BTN_A_PRESSED GPIO_PIN_SET -#define BTN_A_HOVER GPIO_PIN_RESET - -#define LED_A_PIN LD1_Pin -#define LED_A_PORT LD1_GPIO_Port -#define LED_A_ON GPIO_PIN_SET -#define LED_A_OFF GPIO_PIN_RESET - -#endif - -/* STM32 Discovery Kits */ -#if ((BOARD == STM32F407G_DISC1) || (BOARD == STM32F429I_DISC1)) - -#define BTN_A_PIN B1_Pin -#define BTN_A_PORT B1_GPIO_Port -#define BTN_A_PRESSED GPIO_PIN_SET -#define BTN_A_HOVER GPIO_PIN_RESET - -#define LED_A_PIN LD3_Pin -#define LED_A_PORT LD3_GPIO_Port -#define LED_A_ON GPIO_PIN_SET -#define LED_A_OFF GPIO_PIN_RESET - -#endif - -#ifdef __cplusplus -} -#endif - -#endif /* BOARD_INC_BOARD_H_ */ diff --git a/firmware/app/inc/task_actuator.h b/firmware/app/inc/task_actuator.h @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2023 Juan Manuel Cruz <jcruz@fi.uba.ar> <jcruz@frba.utn.edu.ar>. - * Copyright (c) 2026 Martin Javier Klöckner <mklockner@fi.uba.ar> - * - * See file `LICENSE` for full details - */ - -#ifndef TASK_INC_TASK_ACTUATOR_H_ -#define TASK_INC_TASK_ACTUATOR_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -extern uint32_t g_task_actuator_cnt; -extern volatile uint32_t g_task_actuator_tick_cnt; - -extern void task_actuator_init(void *parameters); -extern void task_actuator_update(void *parameters); - -#ifdef __cplusplus -} -#endif - -#endif /* TASK_INC_TASK_ACTUATOR_H_ */ diff --git a/firmware/app/inc/task_actuator_attribute.h b/firmware/app/inc/task_actuator_attribute.h @@ -1,64 +0,0 @@ -/* - * Copyright (c) 2023 Juan Manuel Cruz <jcruz@fi.uba.ar> <jcruz@frba.utn.edu.ar>. - * Copyright (c) 2026 Martin Javier Klöckner <mklockner@fi.uba.ar> - * - * See file `LICENSE` for full details - */ - - -#ifndef TASK_INC_TASK_ACTUATOR_ATTRIBUTE_H_ -#define TASK_INC_TASK_ACTUATOR_ATTRIBUTE_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -/* Actuator Statechart - State Transition Table - * - * +--------------+--------------+---------+--------------+----------------+ - * | Current | Event | | Next | | - * | State | (Parameters) | [Guard] | State | Actions | - * +==============+==============+=========+==============+================+ - * | | EV_LED_ON | | ST_LED_BLINK | turn_led_on() | - * | ST_LED_BLINK +--------------+ +--------------+----------------+ - * | | EV_LED_OFF | | ST_LED_BLINK | turn_led_off() | - * +--------------+--------------+---------+--------------+----------------+ - * - */ - -/* Events to excite Task Actuator */ -typedef enum task_actuator_ev { - EV_LED_ON, - EV_LED_OFF -} task_actuator_ev_t; - -/* States of Task Actuator */ -typedef enum task_actuator_st { - ST_LED_BLINK -} task_actuator_st_t; - -typedef enum task_actuator_id { - ID_LED_A -} task_actuator_id_t; - -typedef struct { - task_actuator_id_t identifier; - GPIO_TypeDef *gpio_port; - uint16_t pin; - GPIO_PinState led_on; - GPIO_PinState led_off; -} task_actuator_cfg_t; - -typedef struct { - task_actuator_st_t state; - task_actuator_ev_t event; - bool flag; -} task_actuator_dta_t; - -extern task_actuator_dta_t task_actuator_dta_list[]; - -#ifdef __cplusplus -} -#endif - -#endif /* TASK_INC_TASK_ACTUATOR_ATTRIBUTE_H_ */ diff --git a/firmware/app/inc/task_actuator_interface.h b/firmware/app/inc/task_actuator_interface.h @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2023 Juan Manuel Cruz <jcruz@fi.uba.ar> <jcruz@frba.utn.edu.ar>. - * Copyright (c) 2026 Martin Javier Klöckner <mklockner@fi.uba.ar> - * - * See file `LICENSE` for full details - */ - -#ifndef TASK_INC_TASK_ACTUATOR_INTERFACE_H_ -#define TASK_INC_TASK_ACTUATOR_INTERFACE_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -extern void put_event_task_actuator(task_actuator_ev_t event, task_actuator_id_t identifier); - -#ifdef __cplusplus -} -#endif - -#endif /* TASK_INC_TASK_ACTUATOR_INTERFACE_H_ */ diff --git a/firmware/app/inc/task_temp_ctrl_attribute.h b/firmware/app/inc/task_temp_ctrl_attribute.h @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2026 Martin Javier Klöckner <mklockner@fi.uba.ar> - * - * See file `LICENSE` for full details - */ - -#ifndef TASK_INC_TASK_TEMP_CTRL_ATTRIBUTE_H_ -#define TASK_INC_TASK_TEMP_CTRL_ATTRIBUTE_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -typedef enum { - ID_TEMP_CONTROLLER_A, -} task_temp_ctrl_id_t; - -typedef struct { - task_temp_ctrl_id_t identifier; -} task_temp_ctrl_cfg_t; - -typedef struct { - uint32_t tick; -} task_temp_ctrl_dta_t; - -#ifdef __cplusplus -} -#endif - -#endif /* TASK_INC_TASK_TEMP_CTRL_ATTRIBUTE_H_ */ diff --git a/firmware/app/inc/task_temp_sensor_attribute.h b/firmware/app/inc/task_temp_sensor_attribute.h @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2026 Martin Javier Klöckner <mklockner@fi.uba.ar> - * - * See file `LICENSE` for full details - */ - -#ifndef TASK_INC_TASK_TEMP_SENSOR_ATTRIBUTE_H_ -#define TASK_INC_TASK_TEMP_SENSOR_ATTRIBUTE_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -typedef enum { - ID_DS18B20_A, -} task_temp_sensor_id_t; - -typedef struct { - task_temp_sensor_id_t identifier; -} task_temp_sensor_cfg_t; - -typedef struct { - uint32_t tick; - // task_temp_sensor_st_t state; - // task_temp_sensor_ev_t event; -} task_temp_sensor_dta_t; - -extern task_temp_sensor_dta_t task_temp_sensor_dta_list[]; - -#ifdef __cplusplus -} -#endif - -#endif /* TASK_INC_TASK_SENSOR_ATTRIBUTE_H_ */ diff --git a/firmware/app/src/app.c b/firmware/app/src/app.c @@ -11,7 +11,6 @@ #include "dwt.h" #include "app.h" -#include "board.h" #include "task_system.h" #include "task_temp_sensor.h" #include "task_temp_ctrl.h" diff --git a/firmware/app/src/task_actuator.c b/firmware/app/src/task_actuator.c @@ -1,140 +0,0 @@ -/* - * Copyright (c) 2023 Juan Manuel Cruz <jcruz@fi.uba.ar> <jcruz@frba.utn.edu.ar>. - * Copyright (c) 2026 Martin Javier Klöckner <mklockner@fi.uba.ar> - * - * See file `LICENSE` for full details - */ - -#include "main.h" - -#include "logger.h" -#include "dwt.h" - -#include "board.h" -#include "app.h" -#include "task_actuator_attribute.h" -#include "task_actuator_interface.h" - -#define G_TASK_ACT_CNT_INIT 0ul -#define G_TASK_ACT_TICK_CNT_INI 0ul - -#define DEL_LED_XX_PUL 250ul -#define DEL_LED_XX_BLI 500ul -#define DEL_LED_XX_MIN 0ul - -const task_actuator_cfg_t task_actuator_cfg_list[] = { - {ID_LED_A, LED_A_PORT, LED_A_PIN, LED_A_ON, LED_A_OFF} -}; - -#define ACTUATOR_CFG_QTY (sizeof(task_actuator_cfg_list)/sizeof(task_actuator_cfg_t)) - -task_actuator_dta_t task_actuator_dta_list[] = { - {ST_LED_BLINK} -}; - -#define ACTUATOR_DTA_QTY (sizeof(task_actuator_dta_list)/sizeof(task_actuator_dta_t)) - -void task_actuator_statechart(void); - -uint32_t g_task_actuator_cnt; - -// This variable is incremented by 1 on every ms by HAL_SysTick -volatile uint32_t g_task_actuator_tick_cnt; - -void task_actuator_init(void *parameters) -{ - uint32_t index; - const task_actuator_cfg_t *p_task_actuator_cfg; - task_actuator_dta_t *p_task_actuator_dta; - task_actuator_st_t state; - - LOGGER_INFO("Initializing `task_actuator`..."); - - for (index = 0; ACTUATOR_DTA_QTY > index; index++) - { - p_task_actuator_cfg = &task_actuator_cfg_list[index]; - p_task_actuator_dta = &task_actuator_dta_list[index]; - - state = ST_LED_BLINK; - p_task_actuator_dta->state = state; - - HAL_GPIO_WritePin(p_task_actuator_cfg->gpio_port, p_task_actuator_cfg->pin, p_task_actuator_cfg->led_off); - } - - LOGGER_INFO("Done initializing `task_actuator`"); -} - -void task_actuator_update(void *parameters) -{ - bool b_time_update_required = false; - - __asm("CPSID i"); - if (G_TASK_ACT_TICK_CNT_INI < g_task_actuator_tick_cnt) - { - g_task_actuator_tick_cnt--; - b_time_update_required = true; - } - __asm("CPSIE i"); - - while (b_time_update_required) - { - g_task_actuator_cnt++; - - task_actuator_statechart(); - - __asm("CPSID i"); - if (G_TASK_ACT_TICK_CNT_INI < g_task_actuator_tick_cnt) - { - g_task_actuator_tick_cnt--; - b_time_update_required = true; - } - else - { - b_time_update_required = false; - } - __asm("CPSIE i"); - } -} - -void task_actuator_statechart(void) -{ - uint32_t index; - const task_actuator_cfg_t *p_task_actuator_cfg; - task_actuator_dta_t *p_task_actuator_dta; - - for (index = 0; ACTUATOR_DTA_QTY > index; index++) - { - p_task_actuator_cfg = &task_actuator_cfg_list[index]; - p_task_actuator_dta = &task_actuator_dta_list[index]; - - switch (p_task_actuator_dta->state) - { - case ST_LED_BLINK: - - if (true == p_task_actuator_dta->flag) - { - switch (p_task_actuator_dta->event) - { - case EV_LED_ON: - - p_task_actuator_dta->flag = false; - HAL_GPIO_WritePin(p_task_actuator_cfg->gpio_port, - p_task_actuator_cfg->pin, - p_task_actuator_cfg->led_on); - - break; - case EV_LED_OFF: - p_task_actuator_dta->flag = false; - HAL_GPIO_WritePin(p_task_actuator_cfg->gpio_port, - p_task_actuator_cfg->pin, - p_task_actuator_cfg->led_off); - break; - default: - break; - } - } - default: - break; - } - } -} diff --git a/firmware/app/src/task_actuator_interface.c b/firmware/app/src/task_actuator_interface.c @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2023 Juan Manuel Cruz <jcruz@fi.uba.ar> <jcruz@frba.utn.edu.ar>. - * Copyright (c) 2026 Martin Javier Klöckner <mklockner@fi.uba.ar> - * - * See file `LICENSE` for full details - */ - -#include "main.h" - -#include "logger.h" -#include "dwt.h" - -#include "board.h" -#include "app.h" -#include "task_actuator_attribute.h" - -void put_event_task_actuator(task_actuator_ev_t event, task_actuator_id_t identifier) -{ - task_actuator_dta_t *p_task_actuator_dta; - - p_task_actuator_dta = &task_actuator_dta_list[identifier]; - p_task_actuator_dta->event = event; - p_task_actuator_dta->flag = true; -} diff --git a/firmware/app/src/task_buttons.c b/firmware/app/src/task_buttons.c @@ -10,7 +10,6 @@ #include "logger.h" #include "dwt.h" -#include "board.h" #include "app.h" #include "task_buttons_attribute.h" #include "task_system_attribute.h" @@ -18,17 +17,20 @@ #include "task_menu_attribute.h" #include "task_menu_interface.h" -#define G_TASK_BTN_TICK_CNT_INI 0ul +#define TASK_BTN_TICK_CNT_INI 0ul #define DEL_BTN_XX_MIN 0ul #define DEL_BTN_XX_MED 25ul #define DEL_BTN_XX_MAX 50ul +#define BTN_X_PRESSED GPIO_PIN_RESET +#define BTN_X_HOVER GPIO_PIN_SET + const task_buttons_cfg_t task_buttons_cfg_list[] = { - {ID_BTN_A, BTN_A_GPIO_Port, BTN_A_Pin, BTN_A_PRESSED, DEL_BTN_XX_MAX, EV_SYS_BTN_A_IDLE, EV_SYS_BTN_A_ACTIVE}, - {ID_BTN_B, BTN_B_GPIO_Port, BTN_B_Pin, BTN_A_PRESSED, DEL_BTN_XX_MAX, EV_SYS_BTN_B_IDLE, EV_SYS_BTN_B_ACTIVE}, - {ID_BTN_C, BTN_C_GPIO_Port, BTN_C_Pin, BTN_A_PRESSED, DEL_BTN_XX_MAX, EV_SYS_BTN_C_IDLE, EV_SYS_BTN_C_ACTIVE}, - {ID_BTN_D, BTN_D_GPIO_Port, BTN_D_Pin, BTN_A_PRESSED, DEL_BTN_XX_MAX, EV_SYS_BTN_D_IDLE, EV_SYS_BTN_D_ACTIVE}, + {ID_BTN_A, BTN_A_GPIO_Port, BTN_A_Pin, BTN_X_PRESSED, DEL_BTN_XX_MAX, EV_SYS_BTN_A_IDLE, EV_SYS_BTN_A_ACTIVE}, + {ID_BTN_B, BTN_B_GPIO_Port, BTN_B_Pin, BTN_X_PRESSED, DEL_BTN_XX_MAX, EV_SYS_BTN_B_IDLE, EV_SYS_BTN_B_ACTIVE}, + {ID_BTN_C, BTN_C_GPIO_Port, BTN_C_Pin, BTN_X_PRESSED, DEL_BTN_XX_MAX, EV_SYS_BTN_C_IDLE, EV_SYS_BTN_C_ACTIVE}, + {ID_BTN_D, BTN_D_GPIO_Port, BTN_D_Pin, BTN_X_PRESSED, DEL_BTN_XX_MAX, EV_SYS_BTN_D_IDLE, EV_SYS_BTN_D_ACTIVE}, }; #define BUTTONS_CFG_QTY (sizeof(task_buttons_cfg_list)/sizeof(task_buttons_cfg_t)) @@ -71,7 +73,7 @@ void task_buttons_update(void *parameters) bool b_time_update_required = false; __asm("CPSID i"); - if (G_TASK_BTN_TICK_CNT_INI < g_task_buttons_tick_cnt) + if (TASK_BTN_TICK_CNT_INI < g_task_buttons_tick_cnt) { g_task_buttons_tick_cnt--; b_time_update_required = true; @@ -83,7 +85,7 @@ void task_buttons_update(void *parameters) task_buttons_statechart(); __asm("CPSID i"); - if (G_TASK_BTN_TICK_CNT_INI < g_task_buttons_tick_cnt) + if (TASK_BTN_TICK_CNT_INI < g_task_buttons_tick_cnt) { g_task_buttons_tick_cnt--; b_time_update_required = true; diff --git a/firmware/app/src/task_menu.c b/firmware/app/src/task_menu.c @@ -12,7 +12,6 @@ #include "logger.h" #include "dwt.h" -#include "board.h" #include "app.h" #include "task_menu_attribute.h" #include "task_menu_interface.h" diff --git a/firmware/app/src/task_menu_interface.c b/firmware/app/src/task_menu_interface.c @@ -15,7 +15,6 @@ #include "dwt.h" /* Application & Tasks includes */ -#include "board.h" #include "app.h" #include "task_menu_attribute.h" diff --git a/firmware/app/src/task_system.c b/firmware/app/src/task_system.c @@ -10,7 +10,6 @@ #include "logger.h" #include "dwt.h" -#include "board.h" #include "app.h" #include "task_system_attribute.h" #include "task_system_interface.h" diff --git a/firmware/app/src/task_system_interface.c b/firmware/app/src/task_system_interface.c @@ -10,7 +10,6 @@ #include "logger.h" #include "dwt.h" -#include "board.h" #include "app.h" #include "task_system_attribute.h" diff --git a/firmware/app/src/task_temp_ctrl.c b/firmware/app/src/task_temp_ctrl.c @@ -11,7 +11,6 @@ #include "main.h" #include "app.h" -#include "task_temp_ctrl_attribute.h" #include "task_temp_ctrl.h" #include "logger.h" diff --git a/firmware/app/src/task_temp_sensor.c b/firmware/app/src/task_temp_sensor.c @@ -12,7 +12,6 @@ #include "main.h" #include "app.h" -#include "task_temp_sensor_attribute.h" #include "task_temp_sensor.h" #include "logger.h"