добавлен модбас

2025-02-28 19:34:21 +03:00
parent 0743e6699a
commit 0f2736b8a5
26 changed files with 4179 additions and 76 deletions
--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@@ -25,10 +25,10 @@
 #include "gpio.h"
 #include "tim.h"
 #include "pch_sensors.h"
+#include "rs_message.h"

 /* Private define ------------------------------------------------------------*/
 /* Private variables ---------------------------------------------------------*/
-uint32_t predelay = 10000;
 /* Private user code ---------------------------------------------------------*/
 /* Private macro -------------------------------------------------------------*/
 /* Private function prototypes -----------------------------------------------*/
@@ -41,6 +41,7 @@ static void APP_SystemClockConfig(void);
 int main(void)
 {
  __HAL_DBGMCU_FREEZE_TIM1();
+  __HAL_DBGMCU_FREEZE_TIM14();
  /* Reset of all peripherals, Initializes the Systick. */
  HAL_Init();
  
@@ -84,7 +85,7 @@ static void APP_SystemClockConfig(void)
  /* Configure oscillator */
  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
  {
-    APP_ErrorHandler();
+    Error_Handler();
  }

  /* Clock source configuration */
@@ -95,20 +96,23 @@ static void APP_SystemClockConfig(void)
  /* Configure clock source */
  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_0) != HAL_OK)
  {
-    APP_ErrorHandler();
+    Error_Handler();
  }
 }

 /**
-  * @brief  Error executing function.
-  * @param  None
+  * @brief  This function is executed in case of error occurrence.
  * @retval None
  */
-void APP_ErrorHandler(void)
+void Error_Handler(void)
 {
+  /* USER CODE BEGIN Error_Handler_Debug */
+  /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
  while (1)
  {
  }
+  /* USER CODE END Error_Handler_Debug */
 }

 #ifdef  USE_FULL_ASSERT
--- a/Core/Src/tim.c
+++ b/Core/Src/tim.c
@@ -25,6 +25,7 @@
 /* USER CODE END 0 */

 TIM_HandleTypeDef htim1;
+TIM_HandleTypeDef htim14;

 /* TIM3 init function */
 void MX_TIM1_Init(void)
@@ -48,18 +49,18 @@ void MX_TIM1_Init(void)
  htim1.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
  if (HAL_TIM_Base_Init(&htim1) != HAL_OK)
  {
-    while(1);
+    Error_Handler();
  }
  sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
  if (HAL_TIM_ConfigClockSource(&htim1, &sClockSourceConfig) != HAL_OK)
  {
-    while(1);
+    Error_Handler();
  }
  sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
  sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
  if (HAL_TIMEx_MasterConfigSynchronization(&htim1, &sMasterConfig) != HAL_OK)
  {
-    while(1);
+    Error_Handler();
  }
  /* USER CODE BEGIN TIM3_Init 2 */

@@ -67,19 +68,74 @@ void MX_TIM1_Init(void)

 }

+/* TIM2 init function */
+void MX_TIM2_Init(void)
+{
+
+  /* USER CODE BEGIN TIM2_Init 0 */
+
+  /* USER CODE END TIM2_Init 0 */
+
+  TIM_ClockConfigTypeDef sClockSourceConfig = {0};
+  TIM_MasterConfigTypeDef sMasterConfig = {0};
+
+  /* USER CODE BEGIN TIM2_Init 1 */
+
+  /* USER CODE END TIM2_Init 1 */
+  htim14.Instance = TIM14;
+  htim14.Init.Prescaler = (HAL_RCC_GetPCLK1Freq()/1000000) - 1;
+  htim14.Init.CounterMode = TIM_COUNTERMODE_UP;
+  htim14.Init.Period = 50000;
+  htim14.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
+  htim14.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
+  if (HAL_TIM_Base_Init(&htim14) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
+  if (HAL_TIM_ConfigClockSource(&htim14, &sClockSourceConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
+  sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
+  if (HAL_TIMEx_MasterConfigSynchronization(&htim14, &sMasterConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN TIM2_Init 2 */
+
+  /* USER CODE END TIM2_Init 2 */
+
+}
 void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* tim_baseHandle)
 {

  if(tim_baseHandle->Instance==TIM1)
  {
-  /* USER CODE BEGIN TIM3_MspInit 0 */
+    /* USER CODE BEGIN TIM1_MspInit 0 */

-  /* USER CODE END TIM3_MspInit 0 */
-    /* TIM3 clock enable */
+    /* USER CODE END TIM1_MspInit 0 */
+    /* TIM1 clock enable */
    __HAL_RCC_TIM1_CLK_ENABLE();
-  /* USER CODE BEGIN TIM3_MspInit 1 */
+    /* USER CODE BEGIN TIM1_MspInit 1 */

-  /* USER CODE END TIM3_MspInit 1 */
+    /* USER CODE END TIM1_MspInit 1 */
+  }
+  else if(tim_baseHandle->Instance==TIM14)
+  {
+    /* USER CODE BEGIN TIM14_MspInit 0 */
+
+    /* USER CODE END TIM14_MspInit 0 */
+    /* TIM14 clock enable */
+    __HAL_RCC_TIM14_CLK_ENABLE();
+
+    /* TIM14 interrupt Init */
+    HAL_NVIC_SetPriority(TIM14_IRQn, 0, 0);
+    HAL_NVIC_EnableIRQ(TIM14_IRQn);
+    /* USER CODE BEGIN TIM14_MspInit 1 */
+
+    /* USER CODE END TIM14_MspInit 1 */
  }
 }

@@ -88,17 +144,31 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* tim_baseHandle)

  if(tim_baseHandle->Instance==TIM1)
  {
-  /* USER CODE BEGIN TIM3_MspDeInit 0 */
+  /* USER CODE BEGIN TIM1_MspDeInit 0 */

-  /* USER CODE END TIM3_MspDeInit 0 */
+  /* USER CODE END TIM1_MspDeInit 0 */
    /* Peripheral clock disable */
    __HAL_RCC_TIM1_CLK_DISABLE();

-    /* TIM3 interrupt Deinit */
+    /* TIM1 interrupt Deinit */
    HAL_NVIC_DisableIRQ(TIM1_BRK_UP_TRG_COM_IRQn);
-  /* USER CODE BEGIN TIM3_MspDeInit 1 */
+  /* USER CODE BEGIN TIM1_MspDeInit 1 */

-  /* USER CODE END TIM3_MspDeInit 1 */
+  /* USER CODE END TIM1_MspDeInit 1 */
+  }
+  else if(tim_baseHandle->Instance==TIM14)
+  {
+    /* USER CODE BEGIN TIM14_MspDeInit 0 */
+
+    /* USER CODE END TIM14_MspDeInit 0 */
+    /* TIM14 clock disable */
+    __HAL_RCC_TIM14_CLK_DISABLE();
+
+    /* TIM14 interrupt Deinit */
+    HAL_NVIC_DisableIRQ(TIM14_IRQn);
+    /* USER CODE BEGIN TIM14_MspDeInit 1 */
+
+    /* USER CODE END TIM14_MspDeInit 1 */
  }
 }

--- a/Core/Src/usart.c
+++ b/Core/Src/usart.c
@@ -7,7 +7,7 @@
  ******************************************************************************
  * @attention
  *
-  * Copyright (c) 2025 STMicroelectronics.
+  * Copyright (c) 2024 STMicroelectronics.
  * All rights reserved.
  *
  * This software is licensed under terms that can be found in the LICENSE file
@@ -46,7 +46,7 @@ void MX_USART1_UART_Init(void)
  huart1.Init.Mode = UART_MODE_TX_RX;
  huart1.Init.HwFlowCtl = UART_HWCONTROL_NONE;
  huart1.Init.OverSampling = UART_OVERSAMPLING_16;
-  if (HAL_HalfDuplex_Init(&huart1) != HAL_OK)
+  if (HAL_UART_Init(&huart1) != HAL_OK)
  {
    Error_Handler();
  }
@@ -66,18 +66,27 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)

  /* USER CODE END USART1_MspInit 0 */
    /* USART1 clock enable */
+    __HAL_RCC_GPIOB_CLK_ENABLE();
    __HAL_RCC_USART1_CLK_ENABLE();
-
-    __HAL_RCC_GPIOA_CLK_ENABLE();
-    /**USART1 GPIO Configuration
-    PA9     ------> USART1_TX
+    
+    /* GPIO initialization
+    PB04:TX,
+    PB05:RX
    */
-    GPIO_InitStruct.Pin = GPIO_PIN_9;
-    GPIO_InitStruct.Mode = GPIO_MODE_AF_OD;
-    GPIO_InitStruct.Pull = GPIO_PULLUP;
-    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
-    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+    GPIO_InitStruct.Pin       = GPIO_PIN_4;
+    GPIO_InitStruct.Mode      = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull      = GPIO_PULLUP;
+    GPIO_InitStruct.Speed     = GPIO_SPEED_FREQ_HIGH;
+    GPIO_InitStruct.Alternate = GPIO_AF1_USART1;
+    HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);

+    GPIO_InitStruct.Pin = GPIO_PIN_5;
+    GPIO_InitStruct.Alternate = GPIO_AF1_USART1;
+    HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+  
+    /* USART1 interrupt Init */
+    HAL_NVIC_SetPriority(USART1_IRQn, 0, 0);
+    HAL_NVIC_EnableIRQ(USART1_IRQn);
  /* USER CODE BEGIN USART1_MspInit 1 */

  /* USER CODE END USART1_MspInit 1 */
@@ -97,9 +106,12 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle)

    /**USART1 GPIO Configuration
    PA9     ------> USART1_TX
+    PA10     ------> USART1_RX
    */
-    HAL_GPIO_DeInit(GPIOA, GPIO_PIN_9);
+    HAL_GPIO_DeInit(GPIOA, GPIO_PIN_9|GPIO_PIN_10);

+    /* USART1 interrupt Deinit */
+    HAL_NVIC_DisableIRQ(USART1_IRQn);
  /* USER CODE BEGIN USART1_MspDeInit 1 */

  /* USER CODE END USART1_MspDeInit 1 */