add 3 var

john103C6T6/Core/Src/main.c

@@ -60,7 +60,7 @@ uint8_t ralay_5v_on_var=0;
   float temperature;
 	extern uint8_t roms[MAX_DEVICES][8];
 	//extern uint8_t devices_found ;
-	uint8_t _debug_init=0;
+	uint8_t _debug_init=1;
 	//TEMP temp_sense[30];
  float set_temp_old[30];
 	char rx_buffer[64];

john103C6T6/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c

@@ -726,7 +726,6 @@ __weak void HAL_UART_MspInit(UART_HandleTypeDef *huart)
 
 /**
   * @brief  UART MSP DeInit.
-
   * @param  huart  Pointer to a UART_HandleTypeDef structure that contains
   *                the configuration information for the specified UART module.
   * @retval None

john103C6T6/MDK-ARM/john103C6T6.uvoptx

@@ -148,24 +148,7 @@
           <Name>-U37FF71064E57343625581443 -O2254 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(1BA01477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC800 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL08000 -FP0($$Device:STM32F103C6$Flash\STM32F10x_128.FLM) -WA0 -WE0 -WVCE4 -WS2710 -WM0 -WP2</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
-      <Breakpoint>
+      <Breakpoint/>
-        <Bp>
-          <Number>0</Number>
-          <Type>0</Type>
-          <LineNumber>302</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>0</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>0</BreakIfRCount>
-          <Filename>..\Modbus\modbus.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression></Expression>
-        </Bp>
-      </Breakpoint>
       <WatchWindow1>
         <Ww>
           <count>0</count>
@@ -245,17 +228,27 @@
         <Ww>
           <count>15</count>
           <WinNumber>1</WinNumber>
-          <ItemText>RS_Buffer</ItemText>
+          <ItemText>MODBUS_MSG</ItemText>
         </Ww>
         <Ww>
           <count>16</count>
           <WinNumber>1</WinNumber>
-          <ItemText>MODBUS_MSG</ItemText>
+          <ItemText>RS_RES</ItemText>
         </Ww>
         <Ww>
           <count>17</count>
           <WinNumber>1</WinNumber>
-          <ItemText>modbus_uart_buff</ItemText>
+          <ItemText>rx_buffer</ItemText>
+        </Ww>
+        <Ww>
+          <count>18</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>RS_msg</ItemText>
+        </Ww>
+        <Ww>
+          <count>19</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>pMessagePtr</ItemText>
         </Ww>
       </WatchWindow1>
       <WatchWindow2>
@@ -265,14 +258,6 @@
           <ItemText>resolution</ItemText>
         </Ww>
       </WatchWindow2>
-      <MemoryWindow1>
-        <Mm>
-          <WinNumber>1</WinNumber>
-          <SubType>0</SubType>
-          <ItemText>0x2000058c</ItemText>
-          <AccSizeX>0</AccSizeX>
-        </Mm>
-      </MemoryWindow1>
       <Tracepoint>
         <THDelay>0</THDelay>
       </Tracepoint>
@@ -281,7 +266,7 @@
         <periodic>1</periodic>
         <aLwin>1</aLwin>
         <aCover>0</aCover>
-        <aSer1>0</aSer1>
+        <aSer1>1</aSer1>
         <aSer2>0</aSer2>
         <aPa>0</aPa>
         <viewmode>1</viewmode>
@@ -316,46 +301,6 @@
       <pSingCmdsp></pSingCmdsp>
       <pMultCmdsp></pMultCmdsp>
       <SystemViewers>
-        <Entry>
-          <Name>System Viewer\BKP</Name>
-          <WinId>35895</WinId>
-        </Entry>
-        <Entry>
-          <Name>System Viewer\GPIOA</Name>
-          <WinId>35904</WinId>
-        </Entry>
-        <Entry>
-          <Name>System Viewer\GPIOB</Name>
-          <WinId>35900</WinId>
-        </Entry>
-        <Entry>
-          <Name>System Viewer\GPIOC</Name>
-          <WinId>35896</WinId>
-        </Entry>
-        <Entry>
-          <Name>System Viewer\IWDG</Name>
-          <WinId>35905</WinId>
-        </Entry>
-        <Entry>
-          <Name>System Viewer\PWR</Name>
-          <WinId>35899</WinId>
-        </Entry>
-        <Entry>
-          <Name>System Viewer\RCC</Name>
-          <WinId>35898</WinId>
-        </Entry>
-        <Entry>
-          <Name>System Viewer\RTC</Name>
-          <WinId>35897</WinId>
-        </Entry>
-        <Entry>
-          <Name>System Viewer\TIM1</Name>
-          <WinId>35903</WinId>
-        </Entry>
-        <Entry>
-          <Name>System Viewer\TIM2</Name>
-          <WinId>35901</WinId>
-        </Entry>
         <Entry>
           <Name>System Viewer\USART1</Name>
           <WinId>35902</WinId>
@@ -473,7 +418,7 @@
       <GroupNumber>2</GroupNumber>
       <FileNumber>8</FileNumber>
       <FileType>1</FileType>
-      <tvExp>1</tvExp>
+      <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
       <PathWithFileName>..\Modbus\modbus.c</PathWithFileName>

john103C6T6/Modbus/modbus.c

@@ -807,17 +807,6 @@ RS_StatusTypeDef RS_Parse_Message(RS_HandleTypeDef *hmodbus, RS_MsgTypeDef *modb
 	uint32_t check_empty_buff;
 	int ind = 0; // ind for modbus-uart buffer
 	//-----INFO ABOUT DATA/MESSAGE-------
-	#ifdef TCP_ModBus
-	modbus_msg->ID_Transaction=modbus_uart_buff[ind++]<<8;
-	modbus_msg->ID_Transaction|=modbus_uart_buff[ind++];	
-	
-	modbus_msg->ID_Prot=modbus_uart_buff[ind++]<<8;
-	modbus_msg->ID_Prot|=modbus_uart_buff[ind++];
-	modbus_msg->PDU_Length=modbus_uart_buff[ind++]<<8;
-	modbus_msg->PDU_Length|=modbus_uart_buff[ind++];
-	#else
-	
-	#endif 
 	//-----------[first bits]------------
 	// get ID of message/user
 	modbus_msg->MbAddr = modbus_uart_buff[ind++];

john103C6T6/Modbus/modbus.h

@@ -11,7 +11,7 @@
 	*************************************************************************/
 #ifndef __MODBUS_H_
 #define __MODBUS_H_
-#define TCP_ModBus
+ 
 #include "modbus_config.h"
 #include "modbus_data.h"
 //#include "settings.h"		// for modbus settings
@@ -32,10 +32,6 @@
 /////////////////////---USER MESSAGE DEFINES---//////////////////////
 //-------------DEFINES FOR STRUCTURE----------------
 /* defines for structure of modbus message */
-
-#define ID_Transaction_size			2 
-#define ID_Prot_size						2
-#define DataLength_size					2
 #define MbAddr_SIZE 						1						///< size of (MbAddr)
 #define Func_Code_SIZE					1						///< size of (Func_Code)
 #define	Addr_SIZE								2						///< size of (Addr)
@@ -45,11 +41,8 @@
 #define CRC_SIZE 								2 					///< size of (MB_CRC) in bytes
 
 /** @brief Size of whole message */
-#ifdef TCP_ModBus
-#define INFO_SIZE_MAX 					(ID_Transaction_size+ID_Prot_size+DataLength_size+MbAddr_SIZE+Func_Code_SIZE+Addr_SIZE+Qnt_SIZE)
-#else
 #define INFO_SIZE_MAX 					(MbAddr_SIZE+Func_Code_SIZE+Addr_SIZE+Qnt_SIZE+ByteCnt_SIZE)
-#endif
+
 /** @brief Size of first part of message that will be received
 first receive info part of message, than defines size of rest message*/
 #define RX_FIRST_PART_SIZE			INFO_SIZE_MAX
@@ -141,9 +134,9 @@ typedef struct
 /** @brief Structure for modbus messsage */
 typedef struct 	// RS_MsgTypeDef
 {
-	uint16_t							ID_Transaction;
+	uint16_t							Transaction_ID;     ///< Modbus TCP Transaction_ID
-	uint16_t							ID_Prot;
+	uint16_t		          Protocol_ID;				///< 
-	uint16_t							PDU_Length;
+	uint16_t							Pack_length;							
 	
 	uint8_t 							MbAddr;							///< Modbus Slave Address
 	MB_FunctonTypeDef 		Func_Code;					///< Modbus Function Code

john103C6T6/Modbus/rs_message.h

@@ -168,8 +168,6 @@ typedef struct
 typedef struct	// RS_HandleTypeDef
 {		
 	/* MESSAGE */
-	
-	
 	uint8_t										ID;										///< ID of RS "channel"
 	RS_MsgTypeDef 						*pMessagePtr;					///< pointer to message struct
 	uint8_t 									*pBufferPtr;					///< pointer to message buffer

john103C6T6/john103C6T6.ioc

@@ -33,48 +33,50 @@ Mcu.IPNb=11
 Mcu.Name=STM32F103C(4-6)Tx
 Mcu.Package=LQFP48
 Mcu.Pin0=PC13-TAMPER-RTC
-Mcu.Pin1=PD0-OSC_IN
+Mcu.Pin1=PC14-OSC32_IN
-Mcu.Pin10=PA7
+Mcu.Pin10=PA5
-Mcu.Pin11=PB0
+Mcu.Pin11=PA6
-Mcu.Pin12=PB1
+Mcu.Pin12=PA7
-Mcu.Pin13=PB2
+Mcu.Pin13=PB0
-Mcu.Pin14=PB10
+Mcu.Pin14=PB1
-Mcu.Pin15=PB11
+Mcu.Pin15=PB2
-Mcu.Pin16=PB12
+Mcu.Pin16=PB10
-Mcu.Pin17=PB13
+Mcu.Pin17=PB11
-Mcu.Pin18=PB14
+Mcu.Pin18=PB12
-Mcu.Pin19=PB15
+Mcu.Pin19=PB13
-Mcu.Pin2=PD1-OSC_OUT
+Mcu.Pin2=PC15-OSC32_OUT
-Mcu.Pin20=PA8
+Mcu.Pin20=PB14
-Mcu.Pin21=PA9
+Mcu.Pin21=PB15
-Mcu.Pin22=PA10
+Mcu.Pin22=PA8
-Mcu.Pin23=PA11
+Mcu.Pin23=PA9
-Mcu.Pin24=PA12
+Mcu.Pin24=PA10
-Mcu.Pin25=PA13
+Mcu.Pin25=PA11
-Mcu.Pin26=PA14
+Mcu.Pin26=PA12
-Mcu.Pin27=PA15
+Mcu.Pin27=PA13
-Mcu.Pin28=PB3
+Mcu.Pin28=PA14
-Mcu.Pin29=PB4
+Mcu.Pin29=PA15
-Mcu.Pin3=PA0-WKUP
+Mcu.Pin3=PD0-OSC_IN
-Mcu.Pin30=PB5
+Mcu.Pin30=PB3
-Mcu.Pin31=PB6
+Mcu.Pin31=PB4
-Mcu.Pin32=PB7
+Mcu.Pin32=PB5
-Mcu.Pin33=PB8
+Mcu.Pin33=PB6
-Mcu.Pin34=PB9
+Mcu.Pin34=PB7
-Mcu.Pin35=VP_ADC1_TempSens_Input
+Mcu.Pin35=PB8
-Mcu.Pin36=VP_ADC1_Vref_Input
+Mcu.Pin36=PB9
-Mcu.Pin37=VP_RTC_VS_RTC_Activate
+Mcu.Pin37=VP_ADC1_TempSens_Input
-Mcu.Pin38=VP_RTC_VS_RTC_Calendar
+Mcu.Pin38=VP_ADC1_Vref_Input
-Mcu.Pin39=VP_SYS_VS_tim3
+Mcu.Pin39=VP_RTC_VS_RTC_Activate
-Mcu.Pin4=PA1
+Mcu.Pin4=PD1-OSC_OUT
-Mcu.Pin40=VP_TIM1_VS_ClockSourceINT
+Mcu.Pin40=VP_RTC_VS_RTC_Calendar
-Mcu.Pin41=VP_TIM2_VS_ClockSourceINT
+Mcu.Pin41=VP_SYS_VS_tim3
-Mcu.Pin5=PA2
+Mcu.Pin42=VP_TIM1_VS_ClockSourceINT
-Mcu.Pin6=PA3
+Mcu.Pin43=VP_TIM2_VS_ClockSourceINT
-Mcu.Pin7=PA4
+Mcu.Pin5=PA0-WKUP
-Mcu.Pin8=PA5
+Mcu.Pin6=PA1
-Mcu.Pin9=PA6
+Mcu.Pin7=PA2
-Mcu.PinsNb=42
+Mcu.Pin8=PA3
+Mcu.Pin9=PA4
+Mcu.PinsNb=44
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32F103C6Tx
@@ -171,6 +173,10 @@ PB9.Mode=I2C
 PB9.Signal=I2C1_SDA
 PC13-TAMPER-RTC.Mode=RTC OUT
 PC13-TAMPER-RTC.Signal=RTC_OUT
+PC14-OSC32_IN.Mode=LSE-External-Oscillator
+PC14-OSC32_IN.Signal=RCC_OSC32_IN
+PC15-OSC32_OUT.Mode=LSE-External-Oscillator
+PC15-OSC32_OUT.Signal=RCC_OSC32_OUT
 PD0-OSC_IN.Mode=HSE-External-Oscillator
 PD0-OSC_IN.Signal=RCC_OSC_IN
 PD1-OSC_OUT.Mode=HSE-External-Oscillator