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

This reverts commit e46603dd6b.

john103C6T6/Core/Inc/Proj_setup.h

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

john103C6T6/Core/Inc/main.h

@@ -39,7 +39,7 @@ extern "C" {
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 #include "modbus_data.h"
-#include "PROJ_setup.h"
+
 #include "dallas_tools.h" 
 
 typedef enum 

john103C6T6/Core/Src/main.c

@@ -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"

john103C6T6/Core/Src/stm32f1xx_it.c

@@ -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 */