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

This reverts commit e46603dd6b.

.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,11 @@
+[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
+[submodule "core/STM32_Modbus"]
+	path = core/STM32_Modbus
+	url = https://git.arktika.cyou/set506/STM32_Modbus.git
+	branch = release

README.md

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

john103C6T6/Core/Inc/Proj_setup.h

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

john103C6T6/Core/Inc/main.h

@@ -38,9 +38,9 @@ extern "C" {
 
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
-#include "Proj_setup.h"
+#include "modbus_data.h"
+
 #include "dallas_tools.h" 
-#include "modbus.h"
 
 typedef enum 
 {
@@ -111,8 +111,6 @@ void  Check_Tconnect(MB_DataStructureTypeDef* MB_DATA,	Flags_TypeDef* flag ,DALL
 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 +132,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__
+#ifndef __RTC_H__
-#define __CAN_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

@@ -62,7 +62,6 @@ 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 */

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,6 +33,7 @@ extern "C" {
 /* USER CODE END Includes */
 
 extern UART_HandleTypeDef huart1;
+
 extern UART_HandleTypeDef huart2;
 
 /* USER CODE BEGIN Private defines */

john103C6T6/Core/Src/gpio.c

@@ -54,9 +54,8 @@ void MX_GPIO_Init(void)
   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_0|GPIO_PIN_1|GPIO_PIN_4|GPIO_PIN_5
-                          |GPIO_PIN_5|GPIO_PIN_6|GPIO_PIN_7|GPIO_PIN_8
+                          |GPIO_PIN_6|GPIO_PIN_7|GPIO_PIN_8|One_wire_Pin, GPIO_PIN_RESET);
-                          |GPIO_PIN_9|Relay_dc5v_Pin|One_wire_Pin, GPIO_PIN_RESET);
 
   /*Configure GPIO pin Output Level */
   HAL_GPIO_WritePin(GPIOB, GPIO_PIN_0|GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_10
@@ -70,18 +69,10 @@ void MX_GPIO_Init(void)
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
   HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
 
-  /*Configure GPIO pin : PA0 */
+  /*Configure GPIO pins : PA0 PA1 PA4 PA5
-  GPIO_InitStruct.Pin = GPIO_PIN_0;
+                           PA6 PA7 PA8 One_wire_Pin */
-  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+  GPIO_InitStruct.Pin = GPIO_PIN_0|GPIO_PIN_1|GPIO_PIN_4|GPIO_PIN_5
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
+                          |GPIO_PIN_6|GPIO_PIN_7|GPIO_PIN_8|One_wire_Pin;
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
-  /*Configure GPIO pins : PA1 PA4
-                           PA5 PA6 PA7 PA8
-                           PA9 Relay_dc5v_Pin One_wire_Pin */
-  GPIO_InitStruct.Pin = GPIO_PIN_1|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_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;

john103C6T6/Core/Src/main.c

@@ -27,17 +27,10 @@
 #include "usart.h"
 #include "gpio.h"
 
-
-
-
-
-
-
-
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 #include "dallas_tools.h"
-
+#include "PROJ_setup.h"
 #include "def.h"
 #include <stdio.h>
 #include "modbus.h"
@@ -61,6 +54,7 @@
 uint16_t iter, cnt = 5;
 uint8_t init_retries = 5;
 uint8_t ralay_5v_on_var = 0;
+uint16_t soft_reset=0;
 /* USER CODE END PD */
 
 /* Private macro -------------------------------------------------------------*/
@@ -80,7 +74,7 @@ uint8_t first_in = 1;
 DALLAS_SensorHandleTypeDef sens[30];
 int init_sens = 0;
 FlashRecord_t* record;
-uint8_t flash_buff[RECORD_SIZE-4];
+uint8_t flash_buff[RECORD_SIZE - 4];
 
 
 /* USER CODE END PM */
@@ -88,7 +82,7 @@ uint8_t flash_buff[RECORD_SIZE-4];
 /* Private variables ---------------------------------------------------------*/
 
 /* USER CODE BEGIN PV */
-int last_page_addr=LAST_PAGE_ADDR;
+int last_page_addr = LAST_PAGE_ADDR;
 
 /* USER CODE END PV */
 
@@ -110,38 +104,39 @@ void SystemClock_Config(void);
 int main(void)
 {
 
-    /* USER CODE BEGIN 1 */
+  /* USER CODE BEGIN 1 */
 
-    /* USER CODE END 1 */
+  /* USER CODE END 1 */
 
-    /* MCU Configuration--------------------------------------------------------*/
+  /* MCU Configuration--------------------------------------------------------*/
 
-    /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
+  /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
-    HAL_Init();
+  HAL_Init();
 
-    /* USER CODE BEGIN Init */
+  /* USER CODE BEGIN Init */
 
-    /* USER CODE END Init */
+  /* USER CODE END Init */
 
-    /* Configure the system clock */
+  /* Configure the system clock */
-    SystemClock_Config();
+  SystemClock_Config();
 
-    /* USER CODE BEGIN SysInit */
+  /* USER CODE BEGIN SysInit */
 
 
-    /* USER CODE END SysInit */
+  /* USER CODE END SysInit */
 
-    /* Initialize all configured peripherals */
+  /* Initialize all configured peripherals */
-    MX_GPIO_Init();
+  MX_GPIO_Init();
-    MX_TIM1_Init();
+  MX_TIM1_Init();
-    MX_USART1_UART_Init();
+  MX_USART1_UART_Init();
-    MX_TIM2_Init();
+  MX_TIM2_Init();
-    MX_ADC1_Init();
+  MX_ADC1_Init();
-    MX_CAN_Init();
+  MX_CAN_Init();
-    MX_I2C1_Init();
+  MX_I2C1_Init();
-    MX_RTC_Init();
+  MX_RTC_Init();
-    MX_SPI1_Init();
+  MX_SPI1_Init();
-    /* USER CODE BEGIN 2 */
+  MX_USART2_UART_Init();
+  /* USER CODE BEGIN 2 */
 
 
 
@@ -158,40 +153,46 @@ int main(void)
     init_setpoint_all_T_sense(temp_sense, hdallas.onewire->RomCnt);
 		
     MB_DATA.InRegs.num_Tsens = hdallas.onewire->RomCnt;
-		BufferState_t buffer_state = buffer_init();
+   // BufferState_t buffer_state = buffer_init();
+for(int i=0;i<RECORD_SIZE;i++)
+{
+	flash_buff[i]=i;
 	
-    /* USER CODE END 2 */
+}
+  /* USER CODE END 2 */
 
-    /* Infinite loop */
+  /* Infinite loop */
-    /* USER CODE BEGIN WHILE */
+  /* USER CODE BEGIN WHILE */
     while (1)
     {
+			if (soft_reset)
+			{
+				HAL_NVIC_SystemReset();
+			}
+//        if (MB_DATA.Coils.relay_struct[0].state_val_bit.Temp11_relay_isOn)
+//        {
+//            MB_DATA.Coils.relay_struct[0].state_val_bit.Temp11_relay_isOn = 0;
+//            BufferState_t state = buffer_init();
+//            uint32_t idx = (state.write_index ) % RECORDS_PER_PAGE;
+//            FlashRecord_t* record = buffer_read_record(idx);
 
+//        }
+//        if (MB_DATA.Coils.relay_struct[0].state_val_bit.Temp10_relay_isOn)
+//        {
+//            MB_DATA.Coils.relay_struct[0].state_val_bit.Temp10_relay_isOn = 0;
+//            FlashRecord_t new_record;
+//            new_record.timestamp = HAL_GetTick();
+//            memcpy(new_record.data, flash_buff, sizeof(new_record.data));
 
-if (MB_DATA.Coils.relay_struct[0].state_val_bit.Temp11_relay_isOn)
+//            HAL_StatusTypeDef status = buffer_write_record(&new_record, &buffer_state);,
-        {
-					MB_DATA.Coils.relay_struct[0].state_val_bit.Temp11_relay_isOn=0;
-					BufferState_t state = buffer_init();
-					uint32_t idx = (state.write_index ) % RECORDS_PER_PAGE;
-					FlashRecord_t* record = buffer_read_record(idx);
 
-				}
+//            if (status == HAL_OK)
-        if (MB_DATA.Coils.relay_struct[0].state_val_bit.Temp10_relay_isOn)
+//            {
-        {
+//                //                          printf("Record written successfully\n");
-            MB_DATA.Coils.relay_struct[0].state_val_bit.Temp10_relay_isOn = 0;
+//                GPIOC->ODR |= 1 << 13;
-            FlashRecord_t new_record;
+//            }
-            new_record.timestamp = HAL_GetTick();
-            memset(new_record.data, (uint8_t)*flash_buff, sizeof(new_record.data));
 
-            HAL_StatusTypeDef status = buffer_write_record(&new_record, &buffer_state);
+//        }
-
-            if (status == HAL_OK)
-            {
-    //							printf("Record written successfully\n");
-							GPIOC->ODR|=1<<13;
-            }
-
-        }
         temp_sense[0].t_close = 1;
         Field_modbus(&MB_DATA, &flag);
         Check_Tconnect(&MB_DATA, &flag, &hdallas, 0);
@@ -224,14 +225,14 @@ if (MB_DATA.Coils.relay_struct[0].state_val_bit.Temp11_relay_isOn)
 
 
 
-        /* USER CODE END WHILE */
+    /* USER CODE END WHILE */
 
-        /* USER CODE BEGIN 3 */
+    /* USER CODE BEGIN 3 */
         //iwdg_refresh();
 
         //HAL_Delay(200);
     }
-    /* USER CODE END 3 */
+  /* USER CODE END 3 */
 }
 
 /**
@@ -240,46 +241,46 @@ if (MB_DATA.Coils.relay_struct[0].state_val_bit.Temp11_relay_isOn)
   */
 void SystemClock_Config(void)
 {
-    RCC_OscInitTypeDef RCC_OscInitStruct = {0};
+  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
-    RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
+  RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
-    RCC_PeriphCLKInitTypeDef PeriphClkInit = {0};
+  RCC_PeriphCLKInitTypeDef PeriphClkInit = {0};
 
-    /** Initializes the RCC Oscillators according to the specified parameters
+  /** Initializes the RCC Oscillators according to the specified parameters
-    * in the RCC_OscInitTypeDef structure.
+  * in the RCC_OscInitTypeDef structure.
-    */
+  */
-    RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_HSE;
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI|RCC_OSCILLATORTYPE_HSE;
-    RCC_OscInitStruct.HSEState = RCC_HSE_ON;
+  RCC_OscInitStruct.HSEState = RCC_HSE_ON;
-    RCC_OscInitStruct.HSEPredivValue = RCC_HSE_PREDIV_DIV1;
+  RCC_OscInitStruct.HSEPredivValue = RCC_HSE_PREDIV_DIV1;
-    RCC_OscInitStruct.HSIState = RCC_HSI_ON;
+  RCC_OscInitStruct.HSIState = RCC_HSI_ON;
-    RCC_OscInitStruct.LSIState = RCC_LSI_ON;
+  RCC_OscInitStruct.LSIState = RCC_LSI_ON;
-    RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
-    RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
+  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
-    RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL9;
+  RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL9;
-    if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
-    {
+  {
-        Error_Handler();
+    Error_Handler();
-    }
+  }
 
-    /** Initializes the CPU, AHB and APB buses clocks
+  /** Initializes the CPU, AHB and APB buses clocks
-    */
+  */
-    RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK
+  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
-                                  | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2;
+                              |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
-    RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
+  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
-    RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
-    RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;
-    RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
 
-    if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
-    {
+  {
-        Error_Handler();
+    Error_Handler();
-    }
+  }
-    PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_RTC | RCC_PERIPHCLK_ADC;
+  PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_ADC;
-    PeriphClkInit.RTCClockSelection = RCC_RTCCLKSOURCE_LSI;
+  PeriphClkInit.RTCClockSelection = RCC_RTCCLKSOURCE_LSI;
-    PeriphClkInit.AdcClockSelection = RCC_ADCPCLK2_DIV6;
+  PeriphClkInit.AdcClockSelection = RCC_ADCPCLK2_DIV6;
-    if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
+  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
-    {
+  {
-        Error_Handler();
+    Error_Handler();
-    }
+  }
 }
 
 /* USER CODE BEGIN 4 */
@@ -429,8 +430,8 @@ FuncStat value_control(void )
 
         {
 
-            MB_DATA.Coils.coils[0].all |= 1 << i;
+            MB_DATA.Coils.relay_struct_off.all |= 1 << i;
-            MB_DATA.Coils.coils[1].all &= ~(1 << i);
+            MB_DATA.Coils.relay_struct_on.all &= ~(1 << i);
 
 
         }
@@ -440,11 +441,19 @@ FuncStat value_control(void )
             if (sens[i].temperature > sens[i].set_temp + sens[i].hyst)
             {
 
-                MB_DATA.Coils.coils[0].all &= ~(1 << i);
+                MB_DATA.Coils.relay_struct_off.all &= ~(1 << i);
-                MB_DATA.Coils.coils[1].all |= 1 << i;
+                MB_DATA.Coils.relay_struct_on.all |= 1 << i;
 
             }
 						
+				else
+
+            if (sens[i].temperature == sens[i].set_temp )
+						{
+							MB_DATA.Coils.relay_struct_on.all &= ~(1 << i);
+							MB_DATA.Coils.relay_struct_off.all &= ~(1 << i);
+							
+						}
 
 
     }
@@ -496,16 +505,16 @@ void init_setpoint_all_T_sense(TEMP_TypeDef* temp_sense, int size_array)
   */
 void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
 {
-    /* USER CODE BEGIN Callback 0 */
+  /* USER CODE BEGIN Callback 0 */
 
-    /* USER CODE END Callback 0 */
+  /* USER CODE END Callback 0 */
-    if (htim->Instance == TIM3)
+  if (htim->Instance == TIM3)
-    {
+  {
-        HAL_IncTick();
+    HAL_IncTick();
-    }
+  }
-    /* USER CODE BEGIN Callback 1 */
+  /* USER CODE BEGIN Callback 1 */
 
-    /* USER CODE END Callback 1 */
+  /* USER CODE END Callback 1 */
 }
 
 /**
@@ -514,13 +523,13 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
   */
 void Error_Handler(void)
 {
-    /* USER CODE BEGIN Error_Handler_Debug */
+  /* 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 */
+  /* USER CODE END Error_Handler_Debug */
 }
 #ifdef USE_FULL_ASSERT
 /**
@@ -532,9 +541,9 @@ void Error_Handler(void)
   */
 void assert_failed(uint8_t *file, uint32_t line)
 {
-    /* USER CODE BEGIN 6 */
+  /* 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 */
+  /* USER CODE END 6 */
 }
 #endif /* USE_FULL_ASSERT */

john103C6T6/Core/Src/rtc.c

@@ -0,0 +1,127 @@
+/* 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/stm32f1xx_it.c

@@ -62,10 +62,8 @@ 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 */
 
@@ -311,29 +309,13 @@ 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 */
@@ -349,8 +331,8 @@ RS_UART_Handler(&hmodbus1);
 void USART2_IRQHandler(void)
 {
   /* USER CODE BEGIN USART2_IRQn 0 */
-  RS_UART_Handler(&hmodbus_master);
+ RS_UART_Handler(&hmodbus1);
-  return;
+    return;
   /* USER CODE END USART2_IRQn 0 */
   HAL_UART_IRQHandler(&huart2);
   /* USER CODE BEGIN USART2_IRQn 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

@@ -56,7 +56,6 @@ void MX_USART1_UART_Init(void)
   /* USER CODE END USART1_Init 2 */
 
 }
-
 /* USART2 init function */
 
 void MX_USART2_UART_Init(void)
@@ -67,7 +66,7 @@ void MX_USART2_UART_Init(void)
   /* 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;
@@ -99,22 +98,20 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
     /* USART1 clock enable */
     __HAL_RCC_USART1_CLK_ENABLE();
 
-    __HAL_RCC_GPIOB_CLK_ENABLE();
+    __HAL_RCC_GPIOA_CLK_ENABLE();
     /**USART1 GPIO Configuration
-    PB6     ------> USART1_TX
+    PA9     ------> USART1_TX
-    PB7     ------> USART1_RX
+    PA10     ------> USART1_RX
     */
-    GPIO_InitStruct.Pin = GPIO_PIN_6;
+    GPIO_InitStruct.Pin = GPIO_PIN_9;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
     GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
-    HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
-    GPIO_InitStruct.Pin = GPIO_PIN_7;
+    GPIO_InitStruct.Pin = GPIO_PIN_10;
     GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
     GPIO_InitStruct.Pull = GPIO_NOPULL;
-    HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
-    __HAL_AFIO_REMAP_USART1_ENABLE();
 
     /* USART1 interrupt Init */
     HAL_NVIC_SetPriority(USART1_IRQn, 0, 0);
@@ -167,10 +164,10 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle)
     __HAL_RCC_USART1_CLK_DISABLE();
 
     /**USART1 GPIO Configuration
-    PB6     ------> USART1_TX
+    PA9     ------> USART1_TX
-    PB7     ------> USART1_RX
+    PA10     ------> USART1_RX
     */
-    HAL_GPIO_DeInit(GPIOB, GPIO_PIN_6|GPIO_PIN_7);
+    HAL_GPIO_DeInit(GPIOA, GPIO_PIN_9|GPIO_PIN_10);
 
     /* USART1 interrupt Deinit */
     HAL_NVIC_DisableIRQ(USART1_IRQn);