Razvalyaev/Modbus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

исправлены ошибки

Browse Source
This commit is contained in:
Razvalyaev 2025-06-02 10:43:56 +03:00
parent 25d833ca8e
commit 5e1e57846d
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modbus/modbus.c
View File

@ -273,11 +273,7 @@ MB_ExceptionTypeDef MB_DefineCoilsAddress(uint16_t **pCoils, uint16_t Addr, uint
} }
// tester settings coils // tester settings coils
if(MB_Check_Address_For_Arr(Addr, Qnt, C_SETTINGS_ADDR, C_SETTINGS_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);
}// tester control coils
else 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); *pCoils = MB_Set_Coil_Reg_Ptr(&MB_DATA.Coils, Addr);
} }

12
Modbus/modbus_config.h
View File

@ -21,12 +21,12 @@
#define MODBUS_USER_APPLICATION_NAME "" #define MODBUS_USER_APPLICATION_NAME ""
// PERIPH FUNCTIONS AND HANDLERS // PERIPH FUNCTIONS AND HANDLERS
#define RS_UART_Init MX_USART1_UART_Init #define RS_UART_Init MX_USART1_UART_Init //инициализация uart
#define RS_UART_DeInit HAL_UART_MspDeInit #define RS_UART_DeInit HAL_UART_MspDeInit //деинициализация uart
#define RS_TIM_Init MX_TIM3_Init #define RS_TIM_Init MX_TIM3_Init //инициализация таймера
#define RS_TIM_DeInit HAL_TIM_Base_MspDeInit #define RS_TIM_DeInit HAL_TIM_Base_MspDeInit//деинициализация таймера
#define rs_huart huart1 #define rs_huart huart1 //используемый uart
#define rs_htim htim3 #define rs_htim htim3 //используемый таймера
/** /**

6
STM32F103_Example/MDK-ARM/Modbus_example.uvguix.I
View File

@ -1964,9 +1964,9 @@
</Doc> </Doc>
<Doc> <Doc>
<Name>..\..\Modbus\modbus_data.h</Name> <Name>..\..\Modbus\modbus_data.h</Name>
<ColumnNumber>23</ColumnNumber> <ColumnNumber>40</ColumnNumber>
<TopLine>82</TopLine> <TopLine>31</TopLine>
<CurrentLine>93</CurrentLine> <CurrentLine>54</CurrentLine>
<Folding>1</Folding> <Folding>1</Folding>
<ContractedFolders></ContractedFolders> <ContractedFolders></ContractedFolders>
<PaneID>0</PaneID> <PaneID>0</PaneID>