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 project 	new_ver//old	//new	
-#define old_ver 0
-#define project 	old_ver	//new_ver//	
 
 
 

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

john103C6T6/MDK-ARM/john103C6T6.uvoptx

@@ -148,100 +148,48 @@
           <Name>(105=-1,-1,-1,-1,0)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
-      <Breakpoint>
+      <Breakpoint/>
-        <Bp>
-          <Number>0</Number>
-          <Type>0</Type>
-          <LineNumber>334</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134249370</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>../Core/Src/stm32f1xx_it.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\john103C6T6\../Core/Src/stm32f1xx_it.c\334</Expression>
-        </Bp>
-      </Breakpoint>
       <WatchWindow1>
         <Ww>
           <count>0</count>
           <WinNumber>1</WinNumber>
-          <ItemText>sens</ItemText>
+          <ItemText>state</ItemText>
         </Ww>
         <Ww>
           <count>1</count>
           <WinNumber>1</WinNumber>
-          <ItemText>MB_DATA,0x0A</ItemText>
+          <ItemText>last_page_addr</ItemText>
         </Ww>
         <Ww>
           <count>2</count>
           <WinNumber>1</WinNumber>
-          <ItemText>temp_sense</ItemText>
+          <ItemText>\\john103C6T6\../EEPROM_Emul/src/flash_ring.c\buffer_write_record\record_addr</ItemText>
         </Ww>
         <Ww>
           <count>3</count>
           <WinNumber>1</WinNumber>
-          <ItemText>roms</ItemText>
+          <ItemText>record</ItemText>
         </Ww>
         <Ww>
           <count>4</count>
           <WinNumber>1</WinNumber>
-          <ItemText>state</ItemText>
+          <ItemText>new_record</ItemText>
         </Ww>
         <Ww>
           <count>5</count>
           <WinNumber>1</WinNumber>
-          <ItemText>last_page_addr</ItemText>
+          <ItemText>state</ItemText>
         </Ww>
         <Ww>
           <count>6</count>
           <WinNumber>1</WinNumber>
-          <ItemText>\\john103C6T6\../EEPROM_Emul/src/flash_ring.c\buffer_write_record\record_addr</ItemText>
+          <ItemText>htim</ItemText>
         </Ww>
         <Ww>
           <count>7</count>
           <WinNumber>1</WinNumber>
-          <ItemText>record</ItemText>
-        </Ww>
-        <Ww>
-          <count>8</count>
-          <WinNumber>1</WinNumber>
-          <ItemText>flash_buff</ItemText>
-        </Ww>
-        <Ww>
-          <count>9</count>
-          <WinNumber>1</WinNumber>
-          <ItemText>new_record</ItemText>
-        </Ww>
-        <Ww>
-          <count>10</count>
-          <WinNumber>1</WinNumber>
-          <ItemText>state</ItemText>
-        </Ww>
-        <Ww>
-          <count>11</count>
-          <WinNumber>1</WinNumber>
-          <ItemText>htim</ItemText>
-        </Ww>
-        <Ww>
-          <count>12</count>
-          <WinNumber>1</WinNumber>
           <ItemText>sens[i].set_temp</ItemText>
         </Ww>
-        <Ww>
-          <count>13</count>
-          <WinNumber>1</WinNumber>
-          <ItemText>hmodbus1</ItemText>
-        </Ww>
-        <Ww>
-          <count>14</count>
-          <WinNumber>1</WinNumber>
-          <ItemText>uwTick,0x0A</ItemText>
-        </Ww>
       </WatchWindow1>
       <WatchWindow2>
         <Ww>
@@ -249,11 +197,6 @@
           <WinNumber>2</WinNumber>
           <ItemText>resolution</ItemText>
         </Ww>
-        <Ww>
-          <count>1</count>
-          <WinNumber>2</WinNumber>
-          <ItemText>hmodbus1</ItemText>
-        </Ww>
       </WatchWindow2>
       <MemoryWindow1>
         <Mm>
@@ -423,7 +366,7 @@
       <GroupNumber>2</GroupNumber>
       <FileNumber>7</FileNumber>
       <FileType>1</FileType>
-      <tvExp>0</tvExp>
+      <tvExp>1</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
       <PathWithFileName>../Core/Src/main.c</PathWithFileName>

john103C6T6/Modbus/modbus_config.h

@@ -20,7 +20,7 @@
 #ifndef _MODBUS_CONFIG_H_
 #define _MODBUS_CONFIG_H_
 #include "stm32f1xx_hal.h"
-
+#include "PROJ_setup.h"
 // Общие параметры
 #define MODBUS_DEVICE_ID              3       ///< Адрес устройства в сети Modbus
 #define MODBUS_TIMEOUT                5000    ///< Таймаут в тиках таймера
@@ -38,7 +38,12 @@
 #define MODBUS_USEROBJECT_0_NAME      ""  ///< Строка пользовательского идентификатора 0. По аналогии можно определить строки до <=128 USEROBJECT
 
 // Периферия (опционально)
-#define mb_huart                      huart2        ///< Удобный дефайн для модбасовского uart
+#if (project == new_ver)
+#define mb_huart                      huart2
+#elif (project== old_ver)
+#define mb_huart                      huart1
+#endif
+        ///< Удобный дефайн для модбасовского uart
 #define mb_htim                       htim2         ///< Удобный дефайн для модбасовского таймера
 //#define RS_EnableReceive()          ///< Функция изменения направления передачи на ПРИЕМ для RS-485
 //#define RS_EnableTransmit()         ///< Функция изменения направления передачи на ПЕРЕДАЧУ для RS-485

labview_proj

@@ -1 +1 @@
-Subproject commit 7ae7a9d1ae93bbcb7d5518f976d289a7ecdff18d
+Subproject commit f6f186c60f87ddd6e336417576ace1f69cbbdc55