API ПОМЕНЯЛОС - Реструктуризация модбас

- Переработана архитектура: * modbus_core.h - базовые определения и структуры * modbus_coils.[h/c] - работа с коилами * modbus_holdregs.[h/c] - работа с регистрами хранения (R/W) * modbus_inputregs.[h/c] -работа с входными регистрами (R/O) * modbus_devid.[h/c] - идентификаторы устройства * modbus_data.[h/c] - карта регистров и коилов и валидация адресов - Улучшена документация: * Обновлены Doxygen-комментарии к функциям * Обновлены шапки файлов с подробным описанием * Обновлена инструкция по подключению и использованию
2025-11-03 19:32:53 +03:00
parent 52de3f9c08
commit 7e21fc7f28
36 changed files with 6269 additions and 2259 deletions
--- a/STM32F103_Example/Core/Inc/stm32f1xx_it.h
+++ b/STM32F103_Example/Core/Inc/stm32f1xx_it.h
@@ -55,6 +55,8 @@ void SVC_Handler(void);
 void DebugMon_Handler(void);
 void PendSV_Handler(void);
 void SysTick_Handler(void);
+void TIM3_IRQHandler(void);
+void USART1_IRQHandler(void);
 /* USER CODE BEGIN EFP */

 /* USER CODE END EFP */
--- a/STM32F103_Example/Core/Src/gpio.c
+++ b/STM32F103_Example/Core/Src/gpio.c
@@ -32,13 +32,19 @@

 /* USER CODE END 1 */

-/** Pinout Configuration
+/** Configure pins as
+        * Analog
+        * Input
+        * Output
+        * EVENT_OUT
+        * EXTI
 */
 void MX_GPIO_Init(void)
 {

  /* GPIO Ports Clock Enable */
  __HAL_RCC_GPIOA_CLK_ENABLE();
+  __HAL_RCC_GPIOB_CLK_ENABLE();

 }

--- a/STM32F103_Example/Core/Src/main.c
+++ b/STM32F103_Example/Core/Src/main.c
@@ -24,7 +24,7 @@

 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
-#include "rs_message.h"
+#include "modbus.h"
 /* USER CODE END Includes */

 /* Private typedef -----------------------------------------------------------*/
@@ -91,7 +91,7 @@ int main(void)
  MX_USART1_UART_Init();
  MX_TIM3_Init();
  /* USER CODE BEGIN 2 */
-  MODBUS_FirstInit();
+  MODBUS_SetupHardware(&hmodbus1, &huart1, &htim3);
  RS_Receive_IT(&hmodbus1, &MODBUS_MSG);
  /* USER CODE END 2 */

--- a/STM32F103_Example/Core/Src/stm32f1xx_hal_msp.c
+++ b/STM32F103_Example/Core/Src/stm32f1xx_hal_msp.c
@@ -73,9 +73,9 @@ void HAL_MspInit(void)

  /* System interrupt init*/

-  /** DISABLE: JTAG-DP Disabled and SW-DP Disabled
+  /** NOJTAG: JTAG-DP Disabled and SW-DP Enabled
  */
-  __HAL_AFIO_REMAP_SWJ_DISABLE();
+  __HAL_AFIO_REMAP_SWJ_NOJTAG();

  /* USER CODE BEGIN MspInit 1 */

--- a/STM32F103_Example/Core/Src/stm32f1xx_it.c
+++ b/STM32F103_Example/Core/Src/stm32f1xx_it.c
@@ -22,6 +22,7 @@
 #include "stm32f1xx_it.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
+#include "rs_message.h"
 /* USER CODE END Includes */

 /* Private typedef -----------------------------------------------------------*/
@@ -55,7 +56,8 @@
 /* USER CODE END 0 */

 /* External variables --------------------------------------------------------*/
-
+extern TIM_HandleTypeDef htim3;
+extern UART_HandleTypeDef huart1;
 /* USER CODE BEGIN EV */

 /* USER CODE END EV */
@@ -84,7 +86,7 @@ void NMI_Handler(void)
 void HardFault_Handler(void)
 {
  /* USER CODE BEGIN HardFault_IRQn 0 */
-
+  return;
  /* USER CODE END HardFault_IRQn 0 */
  while (1)
  {
@@ -198,6 +200,34 @@ void SysTick_Handler(void)
 /* please refer to the startup file (startup_stm32f1xx.s).                    */
 /******************************************************************************/

+/**
+  * @brief This function handles TIM3 global interrupt.
+  */
+void TIM3_IRQHandler(void)
+{
+  /* USER CODE BEGIN TIM3_IRQn 0 */
+  RS_TIM_Handler(&hmodbus1);
+  return;
+  /* USER CODE END TIM3_IRQn 0 */
+  HAL_TIM_IRQHandler(&htim3);
+  /* USER CODE BEGIN TIM3_IRQn 1 */
+  /* USER CODE END TIM3_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 */
+  /* USER CODE END USART1_IRQn 1 */
+}
+
 /* USER CODE BEGIN 1 */

 /* USER CODE END 1 */
--- a/STM32F103_Example/Core/Src/tim.c
+++ b/STM32F103_Example/Core/Src/tim.c
@@ -77,6 +77,10 @@ void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* tim_baseHandle)
  /* USER CODE END TIM3_MspInit 0 */
    /* TIM3 clock enable */
    __HAL_RCC_TIM3_CLK_ENABLE();
+
+    /* TIM3 interrupt Init */
+    HAL_NVIC_SetPriority(TIM3_IRQn, 0, 0);
+    HAL_NVIC_EnableIRQ(TIM3_IRQn);
  /* USER CODE BEGIN TIM3_MspInit 1 */

  /* USER CODE END TIM3_MspInit 1 */
@@ -93,6 +97,9 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* tim_baseHandle)
  /* USER CODE END TIM3_MspDeInit 0 */
    /* Peripheral clock disable */
    __HAL_RCC_TIM3_CLK_DISABLE();
+
+    /* TIM3 interrupt Deinit */
+    HAL_NVIC_DisableIRQ(TIM3_IRQn);
  /* USER CODE BEGIN TIM3_MspDeInit 1 */

  /* USER CODE END TIM3_MspDeInit 1 */
--- a/STM32F103_Example/Core/Src/usart.c
+++ b/STM32F103_Example/Core/Src/usart.c
@@ -68,21 +68,26 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
    /* USART1 clock enable */
    __HAL_RCC_USART1_CLK_ENABLE();

-    __HAL_RCC_GPIOA_CLK_ENABLE();
+    __HAL_RCC_GPIOB_CLK_ENABLE();
    /**USART1 GPIO Configuration
-    PA9     ------> USART1_TX
-    PA10     ------> USART1_RX
+    PB6     ------> USART1_TX
+    PB7     ------> USART1_RX
    */
-    GPIO_InitStruct.Pin = GPIO_PIN_9;
+    GPIO_InitStruct.Pin = GPIO_PIN_6;
    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
-    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+    HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);

-    GPIO_InitStruct.Pin = GPIO_PIN_10;
+    GPIO_InitStruct.Pin = GPIO_PIN_7;
    GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
    GPIO_InitStruct.Pull = GPIO_NOPULL;
-    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+    HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);

+    __HAL_AFIO_REMAP_USART1_ENABLE();
+
+    /* USART1 interrupt Init */
+    HAL_NVIC_SetPriority(USART1_IRQn, 0, 0);
+    HAL_NVIC_EnableIRQ(USART1_IRQn);
  /* USER CODE BEGIN USART1_MspInit 1 */

  /* USER CODE END USART1_MspInit 1 */
@@ -101,11 +106,13 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle)
    __HAL_RCC_USART1_CLK_DISABLE();

    /**USART1 GPIO Configuration
-    PA9     ------> USART1_TX
-    PA10     ------> USART1_RX
+    PB6     ------> USART1_TX
+    PB7     ------> USART1_RX
    */
-    HAL_GPIO_DeInit(GPIOA, GPIO_PIN_9|GPIO_PIN_10);
+    HAL_GPIO_DeInit(GPIOB, GPIO_PIN_6|GPIO_PIN_7);

+    /* USART1 interrupt Deinit */
+    HAL_NVIC_DisableIRQ(USART1_IRQn);
  /* USER CODE BEGIN USART1_MspDeInit 1 */

  /* USER CODE END USART1_MspDeInit 1 */
--- a/STM32F103_Example/MDK-ARM/EventRecorderStub.scvd
+++ b/STM32F103_Example/MDK-ARM/EventRecorderStub.scvd
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<component_viewer schemaVersion="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="Component_Viewer.xsd">
+
+<component name="EventRecorderStub" version="1.0.0"/>       <!--name and version of the component-->
+  <events>
+  </events>
+
+</component_viewer>
--- a/STM32F103_Example/MDK-ARM/Modbus_example.uvoptx
+++ b/STM32F103_Example/MDK-ARM/Modbus_example.uvoptx
@@ -117,6 +117,26 @@
        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
      </DebugOpt>
      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
        <SetRegEntry>
          <Number>0</Number>
          <Key>UL2CM3</Key>
@@ -125,10 +145,46 @@
        <SetRegEntry>
          <Number>0</Number>
          <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U-O142 -O2254 -S0 -C0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F10x_128 -FS08000000 -FL010000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM)</Name>
+          <Name>-U005600373433510237363934 -O2254 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(1BA01477) -L00(0) -TO131123 -TC8000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL010000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM) -WA0 -WE0 -WVCE4 -WS2710 -WM0 -WP2</Name>
        </SetRegEntry>
      </TargetDriverDllRegistry>
-      <Breakpoint/>
+      <Breakpoint>
+        <Bp>
+          <Number>0</Number>
+          <Type>0</Type>
+          <LineNumber>227</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>134230452</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>1</BreakIfRCount>
+          <Filename>E:\.WORK\STM32\STM32_Modbus\Modbus\modbus.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression>\\Modbus_example\../../Modbus/modbus.c\227</Expression>
+        </Bp>
+      </Breakpoint>
+      <WatchWindow1>
+        <Ww>
+          <count>0</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>hmodbus1,0x0A</ItemText>
+        </Ww>
+        <Ww>
+          <count>1</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>RS_Buffer</ItemText>
+        </Ww>
+      </WatchWindow1>
+      <WatchWindow2>
+        <Ww>
+          <count>0</count>
+          <WinNumber>2</WinNumber>
+          <ItemText>RS_Buffer</ItemText>
+        </Ww>
+      </WatchWindow2>
      <Tracepoint>
        <THDelay>0</THDelay>
      </Tracepoint>
@@ -171,9 +227,23 @@
      <pszMrulep></pszMrulep>
      <pSingCmdsp></pSingCmdsp>
      <pMultCmdsp></pMultCmdsp>
+      <SystemViewers>
+        <Entry>
+          <Name>System Viewer\DBG</Name>
+          <WinId>35903</WinId>
+        </Entry>
+        <Entry>
+          <Name>System Viewer\TIM3</Name>
+          <WinId>35904</WinId>
+        </Entry>
+        <Entry>
+          <Name>System Viewer\USART1</Name>
+          <WinId>35905</WinId>
+        </Entry>
+      </SystemViewers>
      <DebugDescription>
        <Enable>1</Enable>
-        <EnableFlashSeq>1</EnableFlashSeq>
+        <EnableFlashSeq>0</EnableFlashSeq>
        <EnableLog>0</EnableLog>
        <Protocol>2</Protocol>
        <DbgClock>10000000</DbgClock>
@@ -490,20 +560,20 @@
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\Modbus\crc_algs.c</PathWithFileName>
-      <FilenameWithoutPath>crc_algs.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\Modbus\Src\__crc_algs.c</PathWithFileName>
+      <FilenameWithoutPath>__crc_algs.c</FilenameWithoutPath>
      <RteFlg>0</RteFlg>
      <bShared>0</bShared>
    </File>
    <File>
      <GroupNumber>5</GroupNumber>
      <FileNumber>24</FileNumber>
-      <FileType>5</FileType>
+      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\Modbus\crc_algs.h</PathWithFileName>
-      <FilenameWithoutPath>crc_algs.h</FilenameWithoutPath>
+      <PathWithFileName>..\..\Modbus\Src\modbus.c</PathWithFileName>
+      <FilenameWithoutPath>modbus.c</FilenameWithoutPath>
      <RteFlg>0</RteFlg>
      <bShared>0</bShared>
    </File>
@@ -514,44 +584,44 @@
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\Modbus\modbus.c</PathWithFileName>
-      <FilenameWithoutPath>modbus.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\Modbus\Src\modbus_coils.c</PathWithFileName>
+      <FilenameWithoutPath>modbus_coils.c</FilenameWithoutPath>
      <RteFlg>0</RteFlg>
      <bShared>0</bShared>
    </File>
    <File>
      <GroupNumber>5</GroupNumber>
      <FileNumber>26</FileNumber>
-      <FileType>5</FileType>
+      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\Modbus\modbus.h</PathWithFileName>
-      <FilenameWithoutPath>modbus.h</FilenameWithoutPath>
+      <PathWithFileName>..\..\Modbus\Src\modbus_core.c</PathWithFileName>
+      <FilenameWithoutPath>modbus_core.c</FilenameWithoutPath>
      <RteFlg>0</RteFlg>
      <bShared>0</bShared>
    </File>
    <File>
      <GroupNumber>5</GroupNumber>
      <FileNumber>27</FileNumber>
-      <FileType>5</FileType>
+      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\Modbus\modbus_config.h</PathWithFileName>
-      <FilenameWithoutPath>modbus_config.h</FilenameWithoutPath>
+      <PathWithFileName>..\..\Modbus\Src\modbus_data.c</PathWithFileName>
+      <FilenameWithoutPath>modbus_data.c</FilenameWithoutPath>
      <RteFlg>0</RteFlg>
      <bShared>0</bShared>
    </File>
    <File>
      <GroupNumber>5</GroupNumber>
      <FileNumber>28</FileNumber>
-      <FileType>5</FileType>
+      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\Modbus\modbus_data.h</PathWithFileName>
-      <FilenameWithoutPath>modbus_data.h</FilenameWithoutPath>
+      <PathWithFileName>..\..\Modbus\Src\modbus_devid.c</PathWithFileName>
+      <FilenameWithoutPath>modbus_devid.c</FilenameWithoutPath>
      <RteFlg>0</RteFlg>
      <bShared>0</bShared>
    </File>
@@ -562,20 +632,56 @@
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\Modbus\rs_message.c</PathWithFileName>
-      <FilenameWithoutPath>rs_message.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\Modbus\Src\modbus_holdregs.c</PathWithFileName>
+      <FilenameWithoutPath>modbus_holdregs.c</FilenameWithoutPath>
      <RteFlg>0</RteFlg>
      <bShared>0</bShared>
    </File>
    <File>
      <GroupNumber>5</GroupNumber>
      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\Modbus\Src\modbus_inputregs.c</PathWithFileName>
+      <FilenameWithoutPath>modbus_inputregs.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\Modbus\Src\rs_message.c</PathWithFileName>
+      <FilenameWithoutPath>rs_message.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>32</FileNumber>
      <FileType>5</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\Modbus\rs_message.h</PathWithFileName>
-      <FilenameWithoutPath>rs_message.h</FilenameWithoutPath>
+      <PathWithFileName>..\..\Modbus\Inc\modbus_config.h</PathWithFileName>
+      <FilenameWithoutPath>modbus_config.h</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\Modbus\Inc\modbus_data.h</PathWithFileName>
+      <FilenameWithoutPath>modbus_data.h</FilenameWithoutPath>
      <RteFlg>0</RteFlg>
      <bShared>0</bShared>
    </File>
--- a/STM32F103_Example/MDK-ARM/Modbus_example.uvprojx
+++ b/STM32F103_Example/MDK-ARM/Modbus_example.uvprojx
@@ -139,7 +139,7 @@
          </Flash1>
          <bUseTDR>1</bUseTDR>
          <Flash2>BIN\UL2V8M.DLL</Flash2>
-          <Flash3></Flash3>
+          <Flash3>"" ()</Flash3>
          <Flash4></Flash4>
          <pFcarmOut></pFcarmOut>
          <pFcarmGrp></pFcarmGrp>
@@ -341,7 +341,7 @@
              <MiscControls></MiscControls>
              <Define>USE_HAL_DRIVER,STM32F103xB</Define>
              <Undefine></Undefine>
-              <IncludePath>../Core/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include;..\..\Modbus</IncludePath>
+              <IncludePath>../Core/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include;..\..\Modbus\Inc</IncludePath>
            </VariousControls>
          </Cads>
          <Aads>
@@ -567,44 +567,59 @@
          <GroupName>Modbus</GroupName>
          <Files>
            <File>
-              <FileName>crc_algs.c</FileName>
+              <FileName>__crc_algs.c</FileName>
              <FileType>1</FileType>
-              <FilePath>..\..\Modbus\crc_algs.c</FilePath>
-            </File>
-            <File>
-              <FileName>crc_algs.h</FileName>
-              <FileType>5</FileType>
-              <FilePath>..\..\Modbus\crc_algs.h</FilePath>
+              <FilePath>..\..\Modbus\Src\__crc_algs.c</FilePath>
            </File>
            <File>
              <FileName>modbus.c</FileName>
              <FileType>1</FileType>
-              <FilePath>..\..\Modbus\modbus.c</FilePath>
+              <FilePath>..\..\Modbus\Src\modbus.c</FilePath>
            </File>
            <File>
-              <FileName>modbus.h</FileName>
-              <FileType>5</FileType>
-              <FilePath>..\..\Modbus\modbus.h</FilePath>
+              <FileName>modbus_coils.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\Modbus\Src\modbus_coils.c</FilePath>
            </File>
            <File>
-              <FileName>modbus_config.h</FileName>
-              <FileType>5</FileType>
-              <FilePath>..\..\Modbus\modbus_config.h</FilePath>
+              <FileName>modbus_core.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\Modbus\Src\modbus_core.c</FilePath>
            </File>
            <File>
-              <FileName>modbus_data.h</FileName>
-              <FileType>5</FileType>
-              <FilePath>..\..\Modbus\modbus_data.h</FilePath>
+              <FileName>modbus_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\Modbus\Src\modbus_data.c</FilePath>
+            </File>
+            <File>
+              <FileName>modbus_devid.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\Modbus\Src\modbus_devid.c</FilePath>
+            </File>
+            <File>
+              <FileName>modbus_holdregs.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\Modbus\Src\modbus_holdregs.c</FilePath>
+            </File>
+            <File>
+              <FileName>modbus_inputregs.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\Modbus\Src\modbus_inputregs.c</FilePath>
            </File>
            <File>
              <FileName>rs_message.c</FileName>
              <FileType>1</FileType>
-              <FilePath>..\..\Modbus\rs_message.c</FilePath>
+              <FilePath>..\..\Modbus\Src\rs_message.c</FilePath>
            </File>
            <File>
-              <FileName>rs_message.h</FileName>
+              <FileName>modbus_config.h</FileName>
              <FileType>5</FileType>
-              <FilePath>..\..\Modbus\rs_message.h</FilePath>
+              <FilePath>..\..\Modbus\Inc\modbus_config.h</FilePath>
+            </File>
+            <File>
+              <FileName>modbus_data.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>..\..\Modbus\Inc\modbus_data.h</FilePath>
            </File>
          </Files>
        </Group>
--- a/STM32F103_Example/Modbus_example.ioc
+++ b/STM32F103_Example/Modbus_example.ioc
@@ -15,12 +15,14 @@ Mcu.IP4=USART1
 Mcu.IPNb=5
 Mcu.Name=STM32F103C(8-B)Tx
 Mcu.Package=LQFP48
-Mcu.Pin0=PA9
-Mcu.Pin1=PA10
-Mcu.Pin2=VP_SYS_VS_ND
-Mcu.Pin3=VP_SYS_VS_Systick
-Mcu.Pin4=VP_TIM3_VS_ClockSourceINT
-Mcu.PinsNb=5
+Mcu.Pin0=PA13
+Mcu.Pin1=PA14
+Mcu.Pin2=PB3
+Mcu.Pin3=PB6
+Mcu.Pin4=PB7
+Mcu.Pin5=VP_SYS_VS_Systick
+Mcu.Pin6=VP_TIM3_VS_ClockSourceINT
+Mcu.PinsNb=7
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32F103C8Tx
@@ -36,11 +38,21 @@ NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
 NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
 NVIC.SysTick_IRQn=true\:15\:0\:false\:false\:true\:false\:true\:false
+NVIC.TIM3_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
+NVIC.USART1_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
-PA10.Mode=Asynchronous
-PA10.Signal=USART1_RX
-PA9.Mode=Asynchronous
-PA9.Signal=USART1_TX
+PA13.Mode=Trace_Asynchronous_SW
+PA13.Signal=SYS_JTMS-SWDIO
+PA14.Mode=Trace_Asynchronous_SW
+PA14.Signal=SYS_JTCK-SWCLK
+PB3.Mode=Trace_Asynchronous_SW
+PB3.Signal=SYS_JTDO-TRACESWO
+PB6.Locked=true
+PB6.Mode=Asynchronous
+PB6.Signal=USART1_TX
+PB7.Locked=true
+PB7.Mode=Asynchronous
+PB7.Signal=USART1_RX
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
 ProjectManager.BackupPrevious=false
@@ -84,8 +96,6 @@ TIM3.IPParameters=Prescaler
 TIM3.Prescaler=8-1
 USART1.IPParameters=VirtualMode
 USART1.VirtualMode=VM_ASYNC
-VP_SYS_VS_ND.Mode=No_Debug
-VP_SYS_VS_ND.Signal=SYS_VS_ND
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 VP_TIM3_VS_ClockSourceINT.Mode=Internal