define для выбора порта modbus"

This reverts commit e46603dd6b.
This commit is contained in:
2025-11-18 19:58:45 +03:00
parent e46603dd6b
commit 1931ac65b9
7 changed files with 20 additions and 81 deletions

View File

@@ -30,7 +30,7 @@
/* Private includes ----------------------------------------------------------*/
/* USER CODE BEGIN Includes */
#include "dallas_tools.h"
#include "PROJ_setup.h"
#include "def.h"
#include <stdio.h>
#include "modbus.h"

View File

@@ -315,12 +315,7 @@ static uint8_t first_in=1;
void USART1_IRQHandler(void)
{
/* USER CODE BEGIN USART1_IRQn 0 */
#if (project== old_ver)
RS_UART_Handler(&hmodbus1);
return;
#endif
/* USER CODE END USART1_IRQn 0 */
HAL_UART_IRQHandler(&huart1);
/* USER CODE BEGIN USART1_IRQn 1 */
@@ -336,10 +331,8 @@ void USART1_IRQHandler(void)
void USART2_IRQHandler(void)
{
/* USER CODE BEGIN USART2_IRQn 0 */
#if (project== new_ver)
RS_UART_Handler(&hmodbus1);
return;
#endif
/* USER CODE END USART2_IRQn 0 */
HAL_UART_IRQHandler(&huart2);
/* USER CODE BEGIN USART2_IRQn 1 */