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 @@ ..\..\Modbus\modbus_data.h - 23 - 82 - 93 + 40 + 31 + 54 1 0