Базово всё запущено. Датчики считываются записываются в модбас регистры, и по запросу выдаются.

Есть запас на 27-30 датчиков
This commit is contained in:
2025-03-03 16:49:25 +03:00
parent b96e00b166
commit 324c26e559
15 changed files with 191 additions and 176 deletions

View File

@@ -51,7 +51,7 @@ int main(void)
MX_GPIO_Init();
MX_TIM1_Init();
HAL_TIM_Base_Start(&htim1);
MX_TIM14_Init();
MX_USART1_UART_Init();
MODBUS_FirstInit();
@@ -64,14 +64,15 @@ int main(void)
{
GPIOA->ODR ^= GPIO_LED_2;
PCHSens_Covert(&DallasBus);
PCHSens_ReadTemperature(&module1);
// PCHSens_ReadTemperature(&module2);
// PCHSens_ReadTemperature(&module3);
// PCHSens_ReadTemperature(&module4);
// PCHSens_ReadTemperature(&module5);
// PCHSens_ReadTemperature(&module6);
PCHSens_ModuleHandleAction(&module1);
PCHSens_ModuleHandleAction(&module2);
PCHSens_ModuleHandleAction(&module3);
PCHSens_ModuleHandleAction(&module4);
PCHSens_ModuleHandleAction(&module5);
PCHSens_ModuleHandleAction(&module6);
}
}

View File

@@ -24,52 +24,81 @@
/* USER CODE END 0 */
TIM_HandleTypeDef htim1;
//TIM_HandleTypeDef htim1;
TIM_HandleTypeDef htim14;
/* TIM3 init function */
void MX_TIM1_Init(void)
{
// Âêëþ÷åíèå òàêòèðîâàíèÿ TIM1
__HAL_RCC_TIM1_CLK_ENABLE();
// Óñòàíîâêà ïðåääåëèòåëÿ (Prescaler)
TIM1->PSC = 0;
// Óñòàíîâêà ðåæèìà ñ÷åòà ââåðõ
TIM1->CR1 &= ~TIM_CR1_DIR;
// Óñòàíîâêà ïåðèîäà (ARR - Auto-reload register)
TIM1->ARR = 0xFFFFFFFF;
// Óñòàíîâêà äåëèòåëÿ ÷àñòîòû (Clock Division)
TIM1->CR1 &= ~TIM_CR1_CKD;
// Îòêëþ÷åíèå ðåæèìà ïðåäçàãðóçêè
TIM1->CR1 &= ~TIM_CR1_ARPE;
// Âûáîð âíóòðåííåãî èñòî÷íèêà òàêòèðîâàíèÿ
TIM1->SMCR &= ~TIM_SMCR_SMS;
// Íàñòðîéêà òðèããåðíîãî âûõîäà (TRGO)
TIM1->CR2 &= ~TIM_CR2_MMS;
// Îòêëþ÷åíèå ðåæèìà Master/Slave
TIM1->SMCR &= ~TIM_SMCR_MSM;
// Âêëþ÷åíèå òàéìåðà
TIM1->CR1 |= TIM_CR1_CEN;
/* USER CODE BEGIN TIM3_Init 0 */
// /* USER CODE BEGIN TIM3_Init 0 */
/* USER CODE END TIM3_Init 0 */
// /* USER CODE END TIM3_Init 0 */
TIM_ClockConfigTypeDef sClockSourceConfig = {0};
TIM_MasterConfigTypeDef sMasterConfig = {0};
// TIM_ClockConfigTypeDef sClockSourceConfig = {0};
// TIM_MasterConfigTypeDef sMasterConfig = {0};
/* USER CODE BEGIN TIM3_Init 1 */
HAL_RCC_GetPCLK1Freq();
/* USER CODE END TIM3_Init 1 */
htim1.Instance = TIM1;
htim1.Init.Prescaler = 0;
htim1.Init.CounterMode = TIM_COUNTERMODE_UP;
htim1.Init.Period = 0xFFFFFFFF;
htim1.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
htim1.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
if (HAL_TIM_Base_Init(&htim1) != HAL_OK)
{
Error_Handler();
}
sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
if (HAL_TIM_ConfigClockSource(&htim1, &sClockSourceConfig) != HAL_OK)
{
Error_Handler();
}
sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
if (HAL_TIMEx_MasterConfigSynchronization(&htim1, &sMasterConfig) != HAL_OK)
{
Error_Handler();
}
/* USER CODE BEGIN TIM3_Init 2 */
// /* USER CODE BEGIN TIM3_Init 1 */
// HAL_RCC_GetPCLK1Freq();
// /* USER CODE END TIM3_Init 1 */
// htim1.Instance = TIM1;
// htim1.Init.Prescaler = 0;
// htim1.Init.CounterMode = TIM_COUNTERMODE_UP;
// htim1.Init.Period = 0xFFFFFFFF;
// htim1.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
// htim1.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
// if (HAL_TIM_Base_Init(&htim1) != HAL_OK)
// {
// Error_Handler();
// }
// sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
// if (HAL_TIM_ConfigClockSource(&htim1, &sClockSourceConfig) != HAL_OK)
// {
// Error_Handler();
// }
// sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
// sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
// if (HAL_TIMEx_MasterConfigSynchronization(&htim1, &sMasterConfig) != HAL_OK)
// {
// Error_Handler();
// }
// /* USER CODE BEGIN TIM3_Init 2 */
/* USER CODE END TIM3_Init 2 */
// /* USER CODE END TIM3_Init 2 */
}
/* TIM2 init function */
void MX_TIM2_Init(void)
void MX_TIM14_Init(void)
{
/* USER CODE BEGIN TIM2_Init 0 */

View File

@@ -92,30 +92,6 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
}
}
void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle)
{
if(uartHandle->Instance==USART1)
{
/* USER CODE BEGIN USART1_MspDeInit 0 */
/* USER CODE END USART1_MspDeInit 0 */
/* Peripheral clock disable */
__HAL_RCC_USART1_CLK_DISABLE();
/**USART1 GPIO Configuration
PA9 ------> USART1_TX
PA10 ------> USART1_RX
*/
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 */
}
}
/* USER CODE BEGIN 1 */