Andrey/ds18b20-MODBUS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
andrey 2025-11-18 19:56:38 +03:00
parent 2e4b034670
commit e46603dd6b
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
john103C6T6/Core/Inc/Proj_setup.h
View File

@ -4,7 +4,9 @@
//**********BEGIN defines*********** //**********BEGIN defines***********
//#define OldVer //#define OldVer
#define MAX_SENSE 32 // НЕ ДЕЛАТЬ МЕНЬШЕ 16 #define MAX_SENSE 32 // НЕ ДЕЛАТЬ МЕНЬШЕ 16
#define project new_ver//old //new #define new_ver 1
#define old_ver 0
#define project old_ver //new_ver//

7
john103C6T6/Core/Src/stm32f1xx_it.c
View File

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