add 3 var

.gitignore

@@ -0,0 +1,48 @@
+# ---> uVision
+# git ignore file for Keil µVision Project
+
+# µVision 5 and µVision 4 Project screen layout file
+*.uvguix.*
+*.uvgui.*
+
+# Listing Files
+*.i
+*.lst
+*.m51
+*.m66
+*.map
+
+# Object Files
+*.axf
+*.b[0-2][0-9]
+*.b3[0-1]
+*.bak
+*.build_log.htm
+*.crf
+*.d
+*.dep
+*.elf
+*.htm
+*.iex
+*.lnp
+*.o
+*.obj
+*.sbr
+
+# Firmware Files
+*.bin
+*.h86
+*.hex
+
+# Build Files
+.bat
+
+# Debugger Files
+.ini
+
+# JLink Files
+JLinkLog.txt
+
+# Other Files
+
+/john103C6T6/MDK-ARM/john103C6T6.uvoptx

.gitmodules

@@ -0,0 +1,7 @@
+[submodule "external_flash_eeprom"]
+	path = external_flash_eeprom
+	url = https://git.arktika.cyou/set506/external_flash_eeprom.git
+[submodule "labview_proj"]
+	path = labview_proj
+	url = https://git.arktika.cyou/Andrey/labview_proj.git
+	branch = master

README.md

@@ -0,0 +1,2 @@
+# ds18b20-MODBUS
+

john103C6T6/Core/Inc/ds18b20_driver.h

@@ -20,12 +20,10 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include "onewire.h"
-#include "PROJ_setup.h"
-
 
 
 /* Data Structure ------------------------------------------------------------*/
-#define DS18B20_DEVICE_AMOUNT		MAX_SENSE
+#define DS18B20_DEVICE_AMOUNT		30
 
 /* Register ------------------------------------------------------------------*/
 #define DS18B20_CMD_CONVERT				    0x44
@@ -77,7 +75,7 @@ typedef struct
 {
 	uint8_t 		  DevAddr[DS18B20_DEVICE_AMOUNT][8];
 } DS18B20_Drv_t;
-extern DS18B20_Drv_t DS;
+extern DS18B20_Drv_t DS;;
 extern OneWire_t OW;
 
 /* External Function ---------------------------------------------------------*/

john103C6T6/Core/Inc/main.h

@@ -1,12 +1,5 @@
 /* USER CODE BEGIN Header */
 /**
-***************************************************************
-*  1    2    3    4    5    6    7   8	*
-* ---  +++								  						* 				
-*																				*
-*****************************************************************
-
-
   ******************************************************************************
   * @file           : main.h
   * @brief          : Header for main.c file.
@@ -38,27 +31,6 @@ extern "C" {
 
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
-#include "Proj_setup.h"
-#include "dallas_tools.h"
-#include "modbus.h"
-
-typedef enum 
-{
-	FuncOK=0,
-	FuncERROR=1
-	
-}FuncStat;
-
-
-typedef enum {
-    CONFIG_DEVICE_ID = 0,
-    CONFIG_BAUDRATE,
-    CONFIG_CALIBRATION,
-    CONFIG_SETTINGS
-} ConfigParams;
-
-
-
 typedef enum {
     STATE_OPEN_VALVE = 0,      // open
     STATE_CLOSE_VALVE= 1			// close
@@ -70,19 +42,17 @@ typedef struct
 	uint16_t location;
 	uint8_t t_open;
 	float t_set;
-	uint8_t t_close;	
-	uint8_t status_T_sense:1 ;	
+	uint8_t t_close;
+
+	
+	uint8_t status_T_sense:1 ;
+	
 	ValveState state;
-	uint16_t count;	
-}TEMP_TypeDef;
-typedef struct {
-    uint32_t init_tsens   : 1;  // Update Interrupt Flag (бит 0) — флаг переполнения/обновления
-   
-   	    // ... (другие биты могут быть зарезервированы или использоваться в расширенных таймерах)
-} Flags_TypeDef;
-
-
-
+	uint16_t count;
+			
+	
+	
+}TEMP;
 
 
 
@@ -101,18 +71,10 @@ typedef struct {
 extern void handle_command(char* cmd);
 typedef void (*FunctionPointer)(void);
 
-uint16_t handle_valves(TEMP_TypeDef* temp_sense[MAX_SENSE]);
-void init_setpoint_all_T_sense(TEMP_TypeDef* temp_sense, int size_array);
+uint16_t handle_valves(TEMP* tmp_sense);
+void init_all_T_sense(void);
 void iwdg_refresh(void);
 void led_blink(GPIO_TypeDef *GPIOx,uint16_t GPIO_Pin,uint8_t iter,uint16_t delay);
-FuncStat Field_modbus(MB_DataStructureTypeDef* MB_DATA, Flags_TypeDef* flag);
-FuncStat packStruct(MB_DataStructureTypeDef* MB_DATA,int sizeARR);
-void  Check_Tconnect(MB_DataStructureTypeDef* MB_DATA,	Flags_TypeDef* flag ,DALLAS_HandleTypeDef* hdallas, int a[50]);
-FuncStat value_control(void );
-
-void reinit_t_sens(void);
-HAL_StatusTypeDef ModbusMaster_Request(RS_MsgTypeDef *request,
-                                        void (*callback)(RS_HandleTypeDef *, RS_MsgTypeDef *));
 
 /* USER CODE END ET */
 
@@ -134,8 +96,6 @@ void Error_Handler(void);
 /* USER CODE END EFP */
 
 /* Private defines -----------------------------------------------------------*/
-#define Relay_dc5v_Pin GPIO_PIN_10
-#define Relay_dc5v_GPIO_Port GPIOA
 #define One_wire_Pin GPIO_PIN_15
 #define One_wire_GPIO_Port GPIOA
 

john103C6T6/Core/Inc/rtc.h

@@ -1,9 +1,9 @@
 /* USER CODE BEGIN Header */
 /**
   ******************************************************************************
-  * @file    can.h
+  * @file    rtc.h
   * @brief   This file contains all the function prototypes for
-  *          the can.c file
+  *          the rtc.c file
   ******************************************************************************
   * @attention
   *
@@ -18,8 +18,8 @@
   */
 /* USER CODE END Header */
 /* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __CAN_H__
-#define __CAN_H__
+#ifndef __RTC_H__
+#define __RTC_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -32,13 +32,13 @@ extern "C" {
 
 /* USER CODE END Includes */
 
-extern CAN_HandleTypeDef hcan;
+extern RTC_HandleTypeDef hrtc;
 
 /* USER CODE BEGIN Private defines */
 
 /* USER CODE END Private defines */
 
-void MX_CAN_Init(void);
+void MX_RTC_Init(void);
 
 /* USER CODE BEGIN Prototypes */
 
@@ -48,5 +48,5 @@ void MX_CAN_Init(void);
 }
 #endif
 
-#endif /* __CAN_H__ */
+#endif /* __RTC_H__ */
 

john103C6T6/Core/Inc/stm32f1xx_it.h

@@ -22,7 +22,7 @@
 #define __STM32F1xx_IT_H
 
 #ifdef __cplusplus
-extern "C" {
+ extern "C" {
 #endif
 
 /* Private includes ----------------------------------------------------------*/
@@ -62,9 +62,7 @@ void TIM1_TRG_COM_IRQHandler(void);
 void TIM1_CC_IRQHandler(void);
 void TIM2_IRQHandler(void);
 void TIM3_IRQHandler(void);
-void TIM4_IRQHandler(void);
 void USART1_IRQHandler(void);
-void USART2_IRQHandler(void);
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */

john103C6T6/Core/Inc/tim.h

@@ -35,7 +35,6 @@ extern "C" {
 extern TIM_HandleTypeDef htim1;
 
 extern TIM_HandleTypeDef htim2;
-extern TIM_HandleTypeDef htim4;
 
 /* USER CODE BEGIN Private defines */
 
@@ -43,7 +42,6 @@ extern TIM_HandleTypeDef htim4;
 
 void MX_TIM1_Init(void);
 void MX_TIM2_Init(void);
-void MX_TIM4_Init(void);
 
 /* USER CODE BEGIN Prototypes */
 

john103C6T6/Core/Inc/usart.h

@@ -33,14 +33,12 @@ extern "C" {
 /* USER CODE END Includes */
 
 extern UART_HandleTypeDef huart1;
-extern UART_HandleTypeDef huart2;
 
 /* USER CODE BEGIN Private defines */
 
 /* USER CODE END Private defines */
 
 void MX_USART1_UART_Init(void);
-void MX_USART2_UART_Init(void);
 
 /* USER CODE BEGIN Prototypes */
 

john103C6T6/Core/Src/UART_TERM.c

@@ -7,7 +7,7 @@
 //extern  uint8_t devices_found ;
 extern uint8_t roms[MAX_DEVICES][8];
 extern char rx_buffer[64];
-extern TEMP_TypeDef temp_sense[30];
+extern TEMP temp_sense[30];
 extern uint8_t init;
 int test_var=0;
 //void handle_command(char* cmd)

john103C6T6/Core/Src/gpio.c

@@ -51,24 +51,14 @@ void MX_GPIO_Init(void)
   __HAL_RCC_GPIOB_CLK_ENABLE();
 
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(GPIOC, GPIO_PIN_13, GPIO_PIN_RESET);
-
-  /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(GPIOA, GPIO_PIN_1|GPIO_PIN_4
+  HAL_GPIO_WritePin(GPIOA, GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_3|GPIO_PIN_4
                           |GPIO_PIN_5|GPIO_PIN_6|GPIO_PIN_7|GPIO_PIN_8
-                          |GPIO_PIN_9|Relay_dc5v_Pin|One_wire_Pin, GPIO_PIN_RESET);
+                          |GPIO_PIN_9|GPIO_PIN_10|One_wire_Pin, GPIO_PIN_SET);
 
   /*Configure GPIO pin Output Level */
   HAL_GPIO_WritePin(GPIOB, GPIO_PIN_0|GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_10
                           |GPIO_PIN_11|GPIO_PIN_12|GPIO_PIN_13|GPIO_PIN_14
-                          |GPIO_PIN_15, GPIO_PIN_RESET);
-
-  /*Configure GPIO pin : PC13 */
-  GPIO_InitStruct.Pin = GPIO_PIN_13;
-  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+                          |GPIO_PIN_15, GPIO_PIN_SET);
 
   /*Configure GPIO pin : PA0 */
   GPIO_InitStruct.Pin = GPIO_PIN_0;
@@ -76,12 +66,12 @@ void MX_GPIO_Init(void)
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
-  /*Configure GPIO pins : PA1 PA4
+  /*Configure GPIO pins : PA1 PA2 PA3 PA4
                            PA5 PA6 PA7 PA8
-                           PA9 Relay_dc5v_Pin One_wire_Pin */
-  GPIO_InitStruct.Pin = GPIO_PIN_1|GPIO_PIN_4
+                           PA9 PA10 PAPin */
+  GPIO_InitStruct.Pin = GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_3|GPIO_PIN_4
                           |GPIO_PIN_5|GPIO_PIN_6|GPIO_PIN_7|GPIO_PIN_8
-                          |GPIO_PIN_9|Relay_dc5v_Pin|One_wire_Pin;
+                          |GPIO_PIN_9|GPIO_PIN_10|One_wire_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;

john103C6T6/Core/Src/main.c

@@ -0,0 +1,423 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file           : main.c
+  * @brief          : Main program body
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2025 STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "adc.h"
+#include "can.h"
+#include "i2c.h"
+#include "rtc.h"
+#include "spi.h"
+#include "tim.h"
+#include "usart.h"
+#include "gpio.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+#include "dallas_tools.h"
+
+#include "def.h"
+#include <stdio.h>
+#include "rs_message.h"
+
+
+
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+int fputc(int ch, FILE *f)
+{
+    HAL_UART_Transmit(&huart1, (uint8_t *)&ch, 1, HAL_MAX_DELAY);
+    return ch;
+}
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+uint16_t iter,cnt=5;
+
+uint8_t ralay_5v_on_var=0;
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+  float temperature;
+	extern uint8_t roms[MAX_DEVICES][8];
+	//extern uint8_t devices_found ;
+	uint8_t _debug_init=1;
+	//TEMP temp_sense[30];
+ float set_temp_old[30];
+	char rx_buffer[64];
+	uint8_t rx_index = 0;
+	char command_ready = 0;
+	 uint8_t uart_byte = 0;
+ uint8_t first_in=1;
+ DALLAS_SensorHandleTypeDef sens[30];
+ 
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+void SystemClock_Config(void);
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private user code ---------------------------------------------------------*/
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/**
+  * @brief  The application entry point.
+  * @retval int
+  */
+int main(void)
+
+{
+
+  /* USER CODE BEGIN 1 */
+
+  /* USER CODE END 1 */
+
+  /* MCU Configuration--------------------------------------------------------*/
+
+  /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
+  HAL_Init();
+
+  /* USER CODE BEGIN Init */
+	
+  /* USER CODE END Init */
+
+  /* Configure the system clock */
+  SystemClock_Config();
+
+  /* USER CODE BEGIN SysInit */
+
+
+  /* USER CODE END SysInit */
+
+  /* Initialize all configured peripherals */
+  MX_GPIO_Init();
+	
+  MX_TIM1_Init();
+  MX_USART1_UART_Init();
+  MX_TIM2_Init();
+  MX_ADC1_Init();
+  MX_CAN_Init();
+  MX_I2C1_Init();
+  MX_RTC_Init();
+  MX_SPI1_Init();
+  /* USER CODE BEGIN 2 */
+
+	led_blink(GPIOC,13,rest_iter,reset_blink_delay);
+	 MODBUS_FirstInit();
+	uint8_t uart_byte = 0;
+  RS_Receive_IT(&hmodbus1, &MODBUS_MSG);
+	Dallas_BusFirstInit(&htim1);
+	// èíèöèàëèçàöèÿ ïî ïîðÿäêó íàéäåííûõ äàò÷èêîâ
+	// Èíèöèàëèçàöèÿ ïî èíäåêñó (ïîðÿäêîâîìó íîìåðó íàéäåííîãî äàò÷èêà)
+	
+		for ( int i=0; i<hdallas.onewire->RomCnt;i++)
+		{   
+				// Èíèöèàëèçàöèÿ ïî ROM-àäðåñó
+	//sens[i].Init.init_func = &Dallas_SensorInitByROM;
+	//	sens[i].Init.InitParam.ROM = rom_address;
+  sens[i].Init.InitParam.Ind = i; 
+  sens[i].Init.init_func = &Dallas_SensorInitByInd;  
+  sens[i].Init.Resolution = DALLAS_CONFIG_9_BITS;  
+	MB_DATA.HoldRegs.set_Temp[i] =sens[i].set_temp =20.;
+	MB_DATA.HoldRegs.set_hyst[i]=sens[i].hyst =1;
+  Dallas_AddNewSensors(&hdallas, &sens[i]);
+
+}	
+  /* USER CODE END 2 */
+
+  /* Infinite loop */
+  /* USER CODE BEGIN WHILE */
+  while (1)
+  {
+		
+		
+		if (_debug_init||MB_DATA.Coils.init_param)
+		{
+			_debug_init=0;
+			
+			MB_DATA.Coils.init_param=0;
+			for(int i=0;i<hdallas.onewire->RomCnt;i++)
+			{
+				sens[i].set_temp=MB_DATA.HoldRegs.set_Temp[i];
+				sens[i].hyst=MB_DATA.HoldRegs.set_hyst[i];
+			}
+		
+			
+
+		}
+		
+			
+			Dallas_StartConvertTAll(&hdallas,DALLAS_WAIT_BUS,0);
+
+			for(int i=0;i<hdallas.onewire->RomCnt;i++)
+			{
+				if(sens[i].isLost)
+				{
+					sens[i].lost_cnt ++;
+				}
+				Dallas_ReadTemperature(&sens[i]);
+				sens[i].set_temp = MB_DATA.HoldRegs.set_Temp[i];				
+				MB_DATA.InRegs.sens_Temp[i]=sens[i].temperature*10;
+				
+		
+
+				ralay_5v_on_var=MB_DATA.Coils.coils[1].state_val_bit.state_val_05;
+				if (ralay_5v_on_var)
+				{
+					GPIOA->ODR|=1<<10;
+				}
+				else
+					{
+						GPIOA->ODR&=~(1<<10);
+					}
+			
+////			if (sens[i].temperature<sens[i].set_temp-sens[i].hyst)
+////				
+////			{
+////					
+////					MB_DATA.Coils.coils[0].all|=1<<i;
+////				
+////			}
+////				
+////			else
+////				
+////			if (sens[i].temperature>sens[i].set_temp+sens[i].hyst)				
+////			{
+////							
+////					MB_DATA.Coils.coils[0].all&=~(1<<i);			
+////				
+////			}		
+////			if(GPIOB11_valve)
+////				{
+////					GPIOB->ODR|=1<<11;
+////				}
+////				else 
+////				{
+////					GPIOB->ODR&=~(1<<11);
+////					
+////				}
+			}
+			
+			
+		
+			
+    /* USER CODE END WHILE */
+
+    /* USER CODE BEGIN 3 */
+		//iwdg_refresh();
+	
+		//HAL_Delay(200);
+  }
+  /* USER CODE END 3 */
+}
+
+/**
+  * @brief System Clock Configuration
+  * @retval None
+  */
+void SystemClock_Config(void)
+{
+  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
+  RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
+  RCC_PeriphCLKInitTypeDef PeriphClkInit = {0};
+
+  /** Initializes the RCC Oscillators according to the specified parameters
+  * in the RCC_OscInitTypeDef structure.
+  */
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI|RCC_OSCILLATORTYPE_HSE;
+  RCC_OscInitStruct.HSEState = RCC_HSE_ON;
+  RCC_OscInitStruct.HSEPredivValue = RCC_HSE_PREDIV_DIV1;
+  RCC_OscInitStruct.HSIState = RCC_HSI_ON;
+  RCC_OscInitStruct.LSIState = RCC_LSI_ON;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
+  RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL9;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /** Initializes the CPU, AHB and APB buses clocks
+  */
+  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
+                              |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
+  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
+  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
+
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_ADC;
+  PeriphClkInit.RTCClockSelection = RCC_RTCCLKSOURCE_LSI;
+  PeriphClkInit.AdcClockSelection = RCC_ADCPCLK2_DIV6;
+  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
+  {
+    Error_Handler();
+  }
+}
+
+/* USER CODE BEGIN 4 */
+	void iwdg_refresh(void)
+		{
+				IWDG->KR = 0xAAAA;         // Ñáðîñèòü òàéìåð
+		}
+void led_blink(GPIO_TypeDef *GPIOx,uint16_t GPIO_Pin,uint8_t iter,uint16_t delay)
+		{
+			for(int i=0;i<iter;i++)
+			{
+				GPIOx->ODR^=(1<<GPIO_Pin);
+				HAL_Delay(delay);
+			}
+		}
+//void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart)
+//{
+//    if (huart->Instance == USART1)
+//    {
+//			if(first_in)
+//			{
+//				first_in=0;
+//				 rx_index = 0;
+//			
+//			}
+//				
+//				
+//				
+//        static uint8_t ch;
+//        HAL_UART_Receive_IT(&huart1, &ch, 1);
+
+//        if (ch == '\r' || ch == '\n')
+//        {
+//            rx_buffer[rx_index] = 0;
+//            command_ready = 1;
+//            rx_index = 0;
+//					  first_in=1;
+//					
+//        }
+//        else
+//        {
+//            if (rx_index < sizeof(rx_buffer) - 1)
+//            {
+//                rx_buffer[rx_index++] = ch;
+//            }
+//        }
+//    }
+//}
+
+//uint16_t handle_valves(TEMP* tmp_sense )
+//{
+//	
+//	if (temp_sense[0].state==STATE_OPEN_VALVE)
+//		{
+//			GPIOC->ODR|=1<<14;
+//		}
+//		else 
+//			if (temp_sense[0].state==STATE_CLOSE_VALVE)
+//		{
+//			GPIOC->ODR&=~(1<<14);
+//		} 
+//		
+//	return 1;
+//	
+//}
+
+//void init_all_T_sense(void)
+//{	
+//	//ds_search_devices();
+//	 for(int i=0;i<hdallas.onewire->RomCnt;i++)
+//{	
+//			temp_sense[i].id[0]=roms[i][0]<<0|roms[i][1]<<8|roms[i][2]<<16|roms[i][3]<<24;
+//			temp_sense[i].id[1]=roms[i][4]<<0|roms[i][5]<<8|roms[i][6]<<16|roms[i][7]<<24;
+//			temp_sense[i].count =i+1;
+//			temp_sense[i].location=1;
+//			temp_sense[i].t_open=22;
+//			temp_sense[i].t_close=18;
+//	    temp_sense[i].status_T_sense=1;
+//}
+//}
+/* USER CODE END 4 */
+
+/**
+  * @brief  Period elapsed callback in non blocking mode
+  * @note   This function is called  when TIM3 interrupt took place, inside
+  * HAL_TIM_IRQHandler(). It makes a direct call to HAL_IncTick() to increment
+  * a global variable "uwTick" used as application time base.
+  * @param  htim : TIM handle
+  * @retval None
+  */
+void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
+{
+  /* USER CODE BEGIN Callback 0 */
+
+  /* USER CODE END Callback 0 */
+  if (htim->Instance == TIM3) {
+    HAL_IncTick();
+  }
+  /* USER CODE BEGIN Callback 1 */
+
+  /* USER CODE END Callback 1 */
+}
+
+/**
+  * @brief  This function is executed in case of error occurrence.
+  * @retval None
+  */
+void Error_Handler(void)
+{
+  /* USER CODE BEGIN Error_Handler_Debug */
+  /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
+  while (1)
+  {
+  }
+  /* USER CODE END Error_Handler_Debug */
+}
+
+#ifdef  USE_FULL_ASSERT
+/**
+  * @brief  Reports the name of the source file and the source line number
+  *         where the assert_param error has occurred.
+  * @param  file: pointer to the source file name
+  * @param  line: assert_param error line source number
+  * @retval None
+  */
+void assert_failed(uint8_t *file, uint32_t line)
+{
+  /* USER CODE BEGIN 6 */
+  /* User can add his own implementation to report the file name and line number,
+     ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
+  /* USER CODE END 6 */
+}
+#endif /* USE_FULL_ASSERT */

john103C6T6/Core/Src/ow_port.c

@@ -53,7 +53,7 @@ volatile uint32_t *config_reg = (OW_Pin_Numb < 8) ? &(OW->DataPort->CRL) : &(OW-
 	}
 	HAL_GPIO_Init(OW->DataPort, &GPIO_InitStruct);
 #endif
-#endif 
+#endif
 }
 
 /**
@@ -98,7 +98,7 @@ uint8_t OneWire_Pin_Read(OneWire_t* OW)
 #else
 #ifdef LL_Driver
 	return ((OW->DataPort->IDR & OW->DataPin) != 0x00U) ? 1 : 0;
-#else
+#else6
 	return HAL_GPIO_ReadPin(OW->DataPort, OW->DataPin);
 #endif
 #endif

john103C6T6/Core/Src/rtc.c

@@ -0,0 +1,128 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    rtc.c
+  * @brief   This file provides code for the configuration
+  *          of the RTC instances.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2025 STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+/* Includes ------------------------------------------------------------------*/
+#include "rtc.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+RTC_HandleTypeDef hrtc;
+
+/* RTC init function */
+void MX_RTC_Init(void)
+{
+
+  /* USER CODE BEGIN RTC_Init 0 */
+
+  /* USER CODE END RTC_Init 0 */
+
+  RTC_TimeTypeDef sTime = {0};
+  RTC_DateTypeDef DateToUpdate = {0};
+
+  /* USER CODE BEGIN RTC_Init 1 */
+
+  /* USER CODE END RTC_Init 1 */
+
+  /** Initialize RTC Only
+  */
+  hrtc.Instance = RTC;
+  hrtc.Init.AsynchPrediv = RTC_AUTO_1_SECOND;
+  hrtc.Init.OutPut = RTC_OUTPUTSOURCE_SECOND;
+  if (HAL_RTC_Init(&hrtc) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /* USER CODE BEGIN Check_RTC_BKUP */
+
+  /* USER CODE END Check_RTC_BKUP */
+
+  /** Initialize RTC and set the Time and Date
+  */
+	
+//  sTime.Hours = 0x0;
+//  sTime.Minutes = 0x0;
+//  sTime.Seconds = 0x0;
+
+// // if (HAL_RTC_SetTime(&hrtc, &sTime, RTC_FORMAT_BCD) != HAL_OK)
+//  {
+//    Error_Handler();
+//  }
+//  DateToUpdate.WeekDay = RTC_WEEKDAY_MONDAY;
+//  DateToUpdate.Month = RTC_MONTH_JANUARY;
+//  DateToUpdate.Date = 0x1;
+//  DateToUpdate.Year = 0x0;
+
+//  if (HAL_RTC_SetDate(&hrtc, &DateToUpdate, RTC_FORMAT_BCD) != HAL_OK)
+//  {
+//    Error_Handler();
+//  }
+  /* USER CODE BEGIN RTC_Init 2 */
+
+  /* USER CODE END RTC_Init 2 */
+
+}
+
+void HAL_RTC_MspInit(RTC_HandleTypeDef* rtcHandle)
+{
+
+  if(rtcHandle->Instance==RTC)
+  {
+  /* USER CODE BEGIN RTC_MspInit 0 */
+
+  /* USER CODE END RTC_MspInit 0 */
+    HAL_PWR_EnableBkUpAccess();
+    /* Enable BKP CLK enable for backup registers */
+    __HAL_RCC_BKP_CLK_ENABLE();
+    /* RTC clock enable */
+    __HAL_RCC_RTC_ENABLE();
+
+    /* RTC interrupt Init */
+    HAL_NVIC_SetPriority(RTC_IRQn, 0, 0);
+    HAL_NVIC_EnableIRQ(RTC_IRQn);
+  /* USER CODE BEGIN RTC_MspInit 1 */
+
+  /* USER CODE END RTC_MspInit 1 */
+  }
+}
+
+void HAL_RTC_MspDeInit(RTC_HandleTypeDef* rtcHandle)
+{
+
+  if(rtcHandle->Instance==RTC)
+  {
+  /* USER CODE BEGIN RTC_MspDeInit 0 */
+
+  /* USER CODE END RTC_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_RTC_DISABLE();
+
+    /* RTC interrupt Deinit */
+    HAL_NVIC_DisableIRQ(RTC_IRQn);
+  /* USER CODE BEGIN RTC_MspDeInit 1 */
+
+  /* USER CODE END RTC_MspDeInit 1 */
+  }
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */

john103C6T6/Core/Src/spi.c

@@ -44,7 +44,7 @@ void MX_SPI1_Init(void)
   hspi1.Init.CLKPolarity = SPI_POLARITY_LOW;
   hspi1.Init.CLKPhase = SPI_PHASE_1EDGE;
   hspi1.Init.NSS = SPI_NSS_SOFT;
-  hspi1.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_4;
+  hspi1.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_2;
   hspi1.Init.FirstBit = SPI_FIRSTBIT_MSB;
   hspi1.Init.TIMode = SPI_TIMODE_DISABLE;
   hspi1.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE;

john103C6T6/Core/Src/stm32f1xx_hal_msp.c

@@ -1,3 +1,4 @@
+
 /* USER CODE BEGIN Header */
 /**
   ******************************************************************************

john103C6T6/Core/Src/stm32f1xx_hal_timebase_tim.c

@@ -46,15 +46,12 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 
   uint32_t              uwPrescalerValue = 0U;
   uint32_t              pFLatency;
-
   HAL_StatusTypeDef     status = HAL_OK;
 
   /* Enable TIM3 clock */
   __HAL_RCC_TIM3_CLK_ENABLE();
-
   /* Get clock configuration */
   HAL_RCC_GetClockConfig(&clkconfig, &pFLatency);
-
   /* Get APB1 prescaler */
   uwAPB1Prescaler = clkconfig.APB1CLKDivider;
   /* Compute TIM3 clock */
@@ -74,11 +71,12 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
   htim3.Instance = TIM3;
 
   /* Initialize TIMx peripheral as follow:
-   * Period = [(TIM3CLK/1000) - 1]. to have a (1/1000) s time base.
-   * Prescaler = (uwTimclock/1000000 - 1) to have a 1MHz counter clock.
-   * ClockDivision = 0
-   * Counter direction = Up
-   */
+
+  + Period = [(TIM3CLK/1000) - 1]. to have a (1/1000) s time base.
+  + Prescaler = (uwTimclock/1000000 - 1) to have a 1MHz counter clock.
+  + ClockDivision = 0
+  + Counter direction = Up
+  */
   htim3.Init.Period = (1000000U / 1000U) - 1U;
   htim3.Init.Prescaler = uwPrescalerValue;
   htim3.Init.ClockDivision = 0;

john103C6T6/Core/Src/stm32f1xx_it.c

@@ -22,7 +22,7 @@
 #include "stm32f1xx_it.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
-	#include "modbus.h"
+	#include "rs_message.h"
 /* USER CODE END Includes */
 
 /* Private typedef -----------------------------------------------------------*/
@@ -60,12 +60,9 @@ extern RTC_HandleTypeDef hrtc;
 extern TIM_HandleTypeDef htim1;
 extern TIM_HandleTypeDef htim2;
 extern UART_HandleTypeDef huart1;
-extern UART_HandleTypeDef huart2;
 extern TIM_HandleTypeDef htim3;
-extern TIM_HandleTypeDef htim4;
 
 /* USER CODE BEGIN EV */
-extern RS_HandleTypeDef hmodbus_master;
 
 /* USER CODE END EV */
 
@@ -284,12 +281,11 @@ void TIM1_CC_IRQHandler(void)
 void TIM2_IRQHandler(void)
 {
   /* USER CODE BEGIN TIM2_IRQn 0 */
-	 RS_TIM_Handler(&hmodbus1);
-    return;
+
   /* USER CODE END TIM2_IRQn 0 */
   HAL_TIM_IRQHandler(&htim2);
   /* USER CODE BEGIN TIM2_IRQn 1 */
-	//RS_TIM_Handler(&hmodbus1);
+	RS_TIM_Handler(&hmodbus1);
   /* USER CODE END TIM2_IRQn 1 */
 }
 
@@ -311,53 +307,22 @@ static uint8_t first_in=1;
   /* USER CODE END TIM3_IRQn 1 */
 }
 
-/**
-  * @brief This function handles TIM4 global interrupt.
-  */
-void TIM4_IRQHandler(void)
-{
-  /* USER CODE BEGIN TIM4_IRQn 0 */
-  RS_TIM_Handler(&hmodbus_master);
-  return;
-  /* USER CODE END TIM4_IRQn 0 */
-  HAL_TIM_IRQHandler(&htim4);
-  /* USER CODE BEGIN TIM4_IRQn 1 */
-
-  /* USER CODE END TIM4_IRQn 1 */
-}
-
 /**
   * @brief This function handles USART1 global interrupt.
   */
 void USART1_IRQHandler(void)
 {
   /* USER CODE BEGIN USART1_IRQn 0 */
-RS_UART_Handler(&hmodbus1);
-    return;
+
   /* USER CODE END USART1_IRQn 0 */
   HAL_UART_IRQHandler(&huart1);
   /* USER CODE BEGIN USART1_IRQn 1 */
-	//RS_UART_Handler(&hmodbus1);
+	RS_UART_Handler(&hmodbus1);
 	
 
   /* USER CODE END USART1_IRQn 1 */
 }
 
-/**
-  * @brief This function handles USART2 global interrupt.
-  */
-void USART2_IRQHandler(void)
-{
-  /* USER CODE BEGIN USART2_IRQn 0 */
-  RS_UART_Handler(&hmodbus_master);
-  return;
-  /* USER CODE END USART2_IRQn 0 */
-  HAL_UART_IRQHandler(&huart2);
-  /* USER CODE BEGIN USART2_IRQn 1 */
-
-  /* USER CODE END USART2_IRQn 1 */
-}
-
 /* USER CODE BEGIN 1 */
 
 /* USER CODE END 1 */

john103C6T6/Core/Src/tim.c

@@ -26,7 +26,6 @@
 
 TIM_HandleTypeDef htim1;
 TIM_HandleTypeDef htim2;
-TIM_HandleTypeDef htim4;
 
 /* TIM1 init function */
 void MX_TIM1_Init(void)
@@ -110,47 +109,6 @@ void MX_TIM2_Init(void)
 
 }
 
-/* TIM4 init function */
-void MX_TIM4_Init(void)
-{
-
-  /* USER CODE BEGIN TIM4_Init 0 */
-
-  /* USER CODE END TIM4_Init 0 */
-
-  TIM_ClockConfigTypeDef sClockSourceConfig = {0};
-  TIM_MasterConfigTypeDef sMasterConfig = {0};
-
-  /* USER CODE BEGIN TIM4_Init 1 */
-
-  /* USER CODE END TIM4_Init 1 */
-  htim4.Instance = TIM4;
-  htim4.Init.Prescaler = 7199;
-  htim4.Init.CounterMode = TIM_COUNTERMODE_UP;
-  htim4.Init.Period = 65535;
-  htim4.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
-  htim4.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
-  if (HAL_TIM_Base_Init(&htim4) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
-  if (HAL_TIM_ConfigClockSource(&htim4, &sClockSourceConfig) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
-  sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
-  if (HAL_TIMEx_MasterConfigSynchronization(&htim4, &sMasterConfig) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  /* USER CODE BEGIN TIM4_Init 2 */
-
-  /* USER CODE END TIM4_Init 2 */
-
-}
-
 void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* tim_baseHandle)
 {
 
@@ -190,21 +148,6 @@ void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* tim_baseHandle)
 
   /* USER CODE END TIM2_MspInit 1 */
   }
-  else if(tim_baseHandle->Instance==TIM4)
-  {
-  /* USER CODE BEGIN TIM4_MspInit 0 */
-
-  /* USER CODE END TIM4_MspInit 0 */
-    /* TIM4 clock enable */
-    __HAL_RCC_TIM4_CLK_ENABLE();
-
-    /* TIM4 interrupt Init */
-    HAL_NVIC_SetPriority(TIM4_IRQn, 0, 0);
-    HAL_NVIC_EnableIRQ(TIM4_IRQn);
-  /* USER CODE BEGIN TIM4_MspInit 1 */
-
-  /* USER CODE END TIM4_MspInit 1 */
-  }
 }
 
 void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* tim_baseHandle)
@@ -241,20 +184,6 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* tim_baseHandle)
 
   /* USER CODE END TIM2_MspDeInit 1 */
   }
-  else if(tim_baseHandle->Instance==TIM4)
-  {
-  /* USER CODE BEGIN TIM4_MspDeInit 0 */
-
-  /* USER CODE END TIM4_MspDeInit 0 */
-    /* Peripheral clock disable */
-    __HAL_RCC_TIM4_CLK_DISABLE();
-
-    /* TIM4 interrupt Deinit */
-    HAL_NVIC_DisableIRQ(TIM4_IRQn);
-  /* USER CODE BEGIN TIM4_MspDeInit 1 */
-
-  /* USER CODE END TIM4_MspDeInit 1 */
-  }
 }
 
 /* USER CODE BEGIN 1 */

john103C6T6/Core/Src/usart.c

@@ -25,7 +25,6 @@
 /* USER CODE END 0 */
 
 UART_HandleTypeDef huart1;
-UART_HandleTypeDef huart2;
 
 /* USART1 init function */
 
@@ -37,7 +36,7 @@ void MX_USART1_UART_Init(void)
   /* USER CODE END USART1_Init 0 */
 
   /* USER CODE BEGIN USART1_Init 1 */
-	huart1.ReceptionType=HAL_UART_RECEPTION_TOIDLE;
+
   /* USER CODE END USART1_Init 1 */
   huart1.Instance = USART1;
   huart1.Init.BaudRate = 115200;
@@ -57,36 +56,6 @@ void MX_USART1_UART_Init(void)
 
 }
 
-/* USART2 init function */
-
-void MX_USART2_UART_Init(void)
-{
-
-  /* USER CODE BEGIN USART2_Init 0 */
-
-  /* USER CODE END USART2_Init 0 */
-
-  /* USER CODE BEGIN USART2_Init 1 */
-  huart2.ReceptionType = HAL_UART_RECEPTION_TOIDLE;
-  /* USER CODE END USART2_Init 1 */
-  huart2.Instance = USART2;
-  huart2.Init.BaudRate = 115200;
-  huart2.Init.WordLength = UART_WORDLENGTH_8B;
-  huart2.Init.StopBits = UART_STOPBITS_1;
-  huart2.Init.Parity = UART_PARITY_NONE;
-  huart2.Init.Mode = UART_MODE_TX_RX;
-  huart2.Init.HwFlowCtl = UART_HWCONTROL_NONE;
-  huart2.Init.OverSampling = UART_OVERSAMPLING_16;
-  if (HAL_UART_Init(&huart2) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  /* USER CODE BEGIN USART2_Init 2 */
-
-  /* USER CODE END USART2_Init 2 */
-
-}
-
 void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
 {
 
@@ -123,36 +92,6 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
 
   /* USER CODE END USART1_MspInit 1 */
   }
-  else if(uartHandle->Instance==USART2)
-  {
-  /* USER CODE BEGIN USART2_MspInit 0 */
-
-  /* USER CODE END USART2_MspInit 0 */
-    /* USART2 clock enable */
-    __HAL_RCC_USART2_CLK_ENABLE();
-
-    __HAL_RCC_GPIOA_CLK_ENABLE();
-    /**USART2 GPIO Configuration
-    PA2     ------> USART2_TX
-    PA3     ------> USART2_RX
-    */
-    GPIO_InitStruct.Pin = GPIO_PIN_2;
-    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
-    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
-    GPIO_InitStruct.Pin = GPIO_PIN_3;
-    GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
-    GPIO_InitStruct.Pull = GPIO_NOPULL;
-    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
-    /* USART2 interrupt Init */
-    HAL_NVIC_SetPriority(USART2_IRQn, 0, 0);
-    HAL_NVIC_EnableIRQ(USART2_IRQn);
-  /* USER CODE BEGIN USART2_MspInit 1 */
-
-  /* USER CODE END USART2_MspInit 1 */
-  }
 }
 
 void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle)
@@ -178,26 +117,6 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle)
 
   /* USER CODE END USART1_MspDeInit 1 */
   }
-  else if(uartHandle->Instance==USART2)
-  {
-  /* USER CODE BEGIN USART2_MspDeInit 0 */
-
-  /* USER CODE END USART2_MspDeInit 0 */
-    /* Peripheral clock disable */
-    __HAL_RCC_USART2_CLK_DISABLE();
-
-    /**USART2 GPIO Configuration
-    PA2     ------> USART2_TX
-    PA3     ------> USART2_RX
-    */
-    HAL_GPIO_DeInit(GPIOA, GPIO_PIN_2|GPIO_PIN_3);
-
-    /* USART2 interrupt Deinit */
-    HAL_NVIC_DisableIRQ(USART2_IRQn);
-  /* USER CODE BEGIN USART2_MspDeInit 1 */
-
-  /* USER CODE END USART2_MspDeInit 1 */
-  }
 }
 
 /* USER CODE BEGIN 1 */