From 5e1e57846db7fcc404e87cd4939515330e02643d Mon Sep 17 00:00:00 2001
From: Razvalyaev <wot890089@mail.ru>
Date: Mon, 2 Jun 2025 10:43:56 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Modbus/modbus.c                                   |  6 +-----
 Modbus/modbus_config.h                            | 12 ++++++------
 STM32F103_Example/MDK-ARM/Modbus_example.uvguix.I |  6 +++---
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/Modbus/modbus.c b/Modbus/modbus.c
index df4aeee..35e641b 100644
--- a/Modbus/modbus.c
+++ b/Modbus/modbus.c
@@ -273,11 +273,7 @@ MB_ExceptionTypeDef MB_DefineCoilsAddress(uint16_t **pCoils, uint16_t Addr, uint
 	}
 		
 		// tester settings coils
-	if(MB_Check_Address_For_Arr(Addr, Qnt, C_SETTINGS_ADDR, C_SETTINGS_QNT) == NO_ERRORS)
-	{
-		*pCoils = MB_Set_Coil_Reg_Ptr(&MB_DATA.Coils, Addr);
-	}// tester control coils
-	else if(MB_Check_Address_For_Arr(Addr, Qnt, C_CONTROL_ADDR, C_CONTROL_QNT) == NO_ERRORS)
+	if(MB_Check_Address_For_Arr(Addr, Qnt, C_CONTROL_ADDR, C_CONTROL_QNT) == NO_ERRORS)
 	{
 		*pCoils = MB_Set_Coil_Reg_Ptr(&MB_DATA.Coils, Addr);
 	}
diff --git a/Modbus/modbus_config.h b/Modbus/modbus_config.h
index c2cfead..70138cb 100644
--- a/Modbus/modbus_config.h
+++ b/Modbus/modbus_config.h
@@ -21,12 +21,12 @@
 #define MODBUS_USER_APPLICATION_NAME  ""
 
 // PERIPH FUNCTIONS AND HANDLERS
-#define RS_UART_Init                  MX_USART1_UART_Init
-#define RS_UART_DeInit                HAL_UART_MspDeInit
-#define RS_TIM_Init                   MX_TIM3_Init
-#define RS_TIM_DeInit                 HAL_TIM_Base_MspDeInit
-#define rs_huart                      huart1
-#define rs_htim                       htim3
+#define RS_UART_Init                  MX_USART1_UART_Init 	//инициализация uart
+#define RS_UART_DeInit                HAL_UART_MspDeInit	//деинициализация uart
+#define RS_TIM_Init                   MX_TIM3_Init 			//инициализация таймера
+#define RS_TIM_DeInit                 HAL_TIM_Base_MspDeInit//деинициализация таймера
+#define rs_huart                      huart1 				//используемый uart
+#define rs_htim                       htim3 				//используемый таймера
 
 
 /**
diff --git a/STM32F103_Example/MDK-ARM/Modbus_example.uvguix.I b/STM32F103_Example/MDK-ARM/Modbus_example.uvguix.I
index 138ec78..4628a48 100644
--- a/STM32F103_Example/MDK-ARM/Modbus_example.uvguix.I
+++ b/STM32F103_Example/MDK-ARM/Modbus_example.uvguix.I
@@ -1964,9 +1964,9 @@
       </Doc>
       <Doc>
         <Name>..\..\Modbus\modbus_data.h</Name>
-        <ColumnNumber>23</ColumnNumber>
-        <TopLine>82</TopLine>
-        <CurrentLine>93</CurrentLine>
+        <ColumnNumber>40</ColumnNumber>
+        <TopLine>31</TopLine>
+        <CurrentLine>54</CurrentLine>
         <Folding>1</Folding>
         <ContractedFolders></ContractedFolders>
         <PaneID>0</PaneID>