Changeset 66 for ctrl/firmware/Main/CubeMX/Core

Timestamp:

Jan 22, 2025, 11:40:26 AM (5 days ago)

Author:

Zed

Message:

FAN PWM control and TACHO signal measuring are working.

Location:

ctrl/firmware/Main/CubeMX/Core

Files:

• Inc/main.h (modified) (1 diff)
• Inc/stm32h7xx_it.h (modified) (1 diff)
• Inc/tim.h (added)
• Src/app_threadx.c (modified) (6 diffs)
• Src/gpio.c (modified) (1 diff)
• Src/main.c (modified) (2 diffs)
• Src/stm32h7xx_it.c (modified) (5 diffs)
• Src/tim.c (added)

ctrl/firmware/Main/CubeMX/Core/Inc/main.h

@@ -82 +82 @@
 #define GSM_STATUS_Pin GPIO_PIN_13
 #define GSM_STATUS_GPIO_Port GPIOD
+#define FAN_TACHO_Pin GPIO_PIN_6
+#define FAN_TACHO_GPIO_Port GPIOC
+#define FAN_PWM_Pin GPIO_PIN_7
+#define FAN_PWM_GPIO_Port GPIOC
 #define SD_DETECT_Pin GPIO_PIN_8
 #define SD_DETECT_GPIO_Port GPIOA

ctrl/firmware/Main/CubeMX/Core/Inc/stm32h7xx_it.h

@@ -56 +56 @@
 void DMA1_Stream1_IRQHandler(void);
 void DMA1_Stream2_IRQHandler(void);
+void TIM3_IRQHandler(void);
 void USART3_IRQHandler(void);
+void TIM8_CC_IRQHandler(void);
 void SDMMC1_IRQHandler(void);
 void TIM7_IRQHandler(void);

ctrl/firmware/Main/CubeMX/Core/Src/app_threadx.c

@@ -33 +33 @@
 #include "gsm_thread.h"
 #include "gsm_rx_thread.h"
+#include "fan_thread.h"
 
 /* USER CODE END Includes */
@@ -47 +48 @@
 #define GSM_THREAD_STACK_SIZE_BYTES                     (1024U)
 #define GSM_RX_THREAD_STACK_SIZE_BYTES          (1024U)
+#define FAN_THREAD_STACK_SIZE_BYTES                     (512U)
 
 /* USER CODE END PD */
@@ -61 +63 @@
 TX_THREAD gsm_thread_ptr;
 TX_THREAD gsm_rx_thread_ptr;
+TX_THREAD fan_thread_ptr;
 
 /* USER CODE END PV */
@@ -83 +86 @@
   VOID *gsm_thread_pointer;
   VOID *gsm_rx_thread_pointer;
+  VOID *fan_thread_pointer;
 
   /* USER CODE END App_ThreadX_MEM_POOL */
@@ -97 +101 @@
 
 
-  // Allocate the stack for gsm thread
+  // Allocate the stack for gsm send thread
   ret = tx_byte_allocate(byte_pool, &gsm_thread_pointer, GSM_THREAD_STACK_SIZE_BYTES, TX_NO_WAIT);
   if (ret != TX_SUCCESS) { printf("Cannot allocate bytes of memory!\n"); return ret; }
@@ -105 +109 @@
   if (ret != TX_SUCCESS) { printf("Cannot create %s!\n", gsm_thread_name); return ret; }
 
-  // Allocate the stack for gsm send thread
+  // Allocate the stack for gsm rx thread
   ret = tx_byte_allocate(byte_pool, &gsm_rx_thread_pointer, GSM_RX_THREAD_STACK_SIZE_BYTES, TX_NO_WAIT);
   if (ret != TX_SUCCESS) { printf("Cannot allocate bytes of memory!\n"); return ret; }
 
   char* gsm_rx_thread_name = "GSM RX Thread";
-  ret = tx_thread_create(&gsm_rx_thread_ptr, gsm_rx_thread_name, gsmRxThread, 0x0001,   gsm_rx_thread_pointer, GSM_RX_THREAD_STACK_SIZE_BYTES, TX_MAX_PRIORITIES-1, TX_MAX_PRIORITIES-1, TX_NO_TIME_SLICE, TX_AUTO_START);
+  ret = tx_thread_create(&gsm_rx_thread_ptr, gsm_rx_thread_name, gsmRxThread, 0x0001, gsm_rx_thread_pointer, GSM_RX_THREAD_STACK_SIZE_BYTES, TX_MAX_PRIORITIES-1, TX_MAX_PRIORITIES-1, TX_NO_TIME_SLICE, TX_AUTO_START);
   if (ret != TX_SUCCESS) { printf("Cannot create %s!\n", gsm_rx_thread_name); return ret; }
 
+  // Allocate the stack for fan control thread
+  ret = tx_byte_allocate(byte_pool, &fan_thread_pointer, FAN_THREAD_STACK_SIZE_BYTES, TX_NO_WAIT);
+  if (ret != TX_SUCCESS) { printf("Cannot allocate bytes of memory!\n"); return ret; }
+
+  char* fan_thread_name = "FAN Thread";
+  ret = tx_thread_create(&fan_thread_ptr, fan_thread_name, fanThread, 0x0001, fan_thread_pointer, FAN_THREAD_STACK_SIZE_BYTES, TX_MAX_PRIORITIES-1, TX_MAX_PRIORITIES-1, TX_NO_TIME_SLICE, TX_AUTO_START);
+  if (ret != TX_SUCCESS) { printf("Cannot create %s!\n", fan_thread_name); return ret; }
 
 

ctrl/firmware/Main/CubeMX/Core/Src/gpio.c

@@ -88 +88 @@
 
   /*Configure GPIO pins : PC13 PC0 PC1 PC2
-                           PC3 PC4 PC5 PC6
-                           PC7 */
+                           PC3 PC4 PC5 */
   GPIO_InitStruct.Pin = GPIO_PIN_13|GPIO_PIN_0|GPIO_PIN_1|GPIO_PIN_2
-                          |GPIO_PIN_3|GPIO_PIN_4|GPIO_PIN_5|GPIO_PIN_6
-                          |GPIO_PIN_7;
+                          |GPIO_PIN_3|GPIO_PIN_4|GPIO_PIN_5;
   GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
   GPIO_InitStruct.Pull = GPIO_NOPULL;

ctrl/firmware/Main/CubeMX/Core/Src/main.c

@@ -25 +25 @@
 #include "sdmmc.h"
 #include "spi.h"
+#include "tim.h"
 #include "usart.h"
 #include "gpio.h"
@@ -120 +121 @@
   MX_SDMMC1_SD_Init();
   MX_USART3_UART_Init();
+  MX_TIM3_Init();
+  MX_TIM8_Init();
   /* USER CODE BEGIN 2 */
 #undef MX_SDMMC1_SD_Init

ctrl/firmware/Main/CubeMX/Core/Src/stm32h7xx_it.c

@@ -25 +25 @@
 
 #include "gsm_rx_thread.h"
+#include "fan_thread.h"
 
 /* USER CODE END Includes */
@@ -62 +63 @@
 extern DMA_HandleTypeDef hdma_spi4_tx;
 extern SPI_HandleTypeDef hspi4;
+extern TIM_HandleTypeDef htim3;
+extern TIM_HandleTypeDef htim8;
 extern DMA_HandleTypeDef hdma_usart3_rx;
 extern DMA_HandleTypeDef hdma_usart3_tx;
@@ -212 +215 @@
 
 /**
+  * @brief This function handles TIM3 global interrupt.
+  */
+void TIM3_IRQHandler(void)
+{
+  /* USER CODE BEGIN TIM3_IRQn 0 */
+
+  /* USER CODE END TIM3_IRQn 0 */
+  HAL_TIM_IRQHandler(&htim3);
+  /* USER CODE BEGIN TIM3_IRQn 1 */
+
+  /* USER CODE END TIM3_IRQn 1 */
+}
+
+/**
   * @brief This function handles USART3 global interrupt.
   */
@@ -226 +243 @@
 
 /**
+  * @brief This function handles TIM8 capture compare interrupt.
+  */
+void TIM8_CC_IRQHandler(void)
+{
+  /* USER CODE BEGIN TIM8_CC_IRQn 0 */
+
+  /* USER CODE END TIM8_CC_IRQn 0 */
+  HAL_TIM_IRQHandler(&htim8);
+  /* USER CODE BEGIN TIM8_CC_IRQn 1 */
+
+  /* USER CODE END TIM8_CC_IRQn 1 */
+}
+
+/**
   * @brief This function handles SDMMC1 global interrupt.
   */
@@ -278 +309 @@
 //------------------------------------------------------------------------------
 
-/*void HAL_UART_RxCpltCallback(UART_HandleTypeDef * huart)
-{
-        //if (huart->Instance == USART3) gsmUnitSentData();
-}*/
+void HAL_TIM_IC_CaptureCallback(TIM_HandleTypeDef *htim)
+{
+        if (htim->Instance == TIM8) pulseMeasured();
+}
 
 //------------------------------------------------------------------------------