diff --git a/py_project/Core/Modbus/interface_config.h b/py_project/Core/Modbus/interface_config.h index 058de92..ae088d1 100644 --- a/py_project/Core/Modbus/interface_config.h +++ b/py_project/Core/Modbus/interface_config.h @@ -40,8 +40,8 @@ #define rs_huart huart1 #define rs_htim htim14 -#define RS_EnableReceive() GPIOB->ODR |= GPIO_PIN_3 -#define RS_EnableTransmit() GPIOB->ODR &= ~GPIO_PIN_3 +//#define RS_EnableReceive() GPIOB->ODR |= GPIO_PIN_3 +//#define RS_EnableTransmit() GPIOB->ODR &= ~GPIO_PIN_3 /** * @brief Поменять комманды 0x03 и 0x04 местами (для LabView терминалки от двигателей) * @details Терминалка от двигателей использует для чтения регистров комманду R_HOLD_REGS вместо R_IN_REGS diff --git a/py_project/Core/Modbus/rs_message.h b/py_project/Core/Modbus/rs_message.h index 623c24b..835f532 100644 --- a/py_project/Core/Modbus/rs_message.h +++ b/py_project/Core/Modbus/rs_message.h @@ -28,6 +28,7 @@ #include "modbus.h" #include "crc_algs.h" +#include "string.h" ///////////////////////////////////////////////////////////////////// @@ -43,7 +44,7 @@ /* Clear message-uart buffer */ -#define RS_Clear_Buff(_buff_) for(int i=0; if.RS_Busy = 0 diff --git a/py_project/Core/Src/gpio.c b/py_project/Core/Src/gpio.c index f3433f3..56d26c3 100644 --- a/py_project/Core/Src/gpio.c +++ b/py_project/Core/Src/gpio.c @@ -69,14 +69,11 @@ void MX_GPIO_Init(void) (GPIO_SPEED_FREQ_LOW << GPIO_OSPEEDR_OSPEED4_Pos) | (GPIO_SPEED_FREQ_LOW << GPIO_OSPEEDR_OSPEED5_Pos); -#ifdef PY32F002Bx5 /*Configure LED GPIO pin : PB3 (Receive Enable) */ - /* PA1, PA4, PA5 */ GPIOB->MODER &= ~(GPIO_MODER_MODE3); GPIOB->MODER |= (GPIO_MODE_OUTPUT_PP << GPIO_MODER_MODE3_Pos); GPIOB->PUPDR &= ~(GPIO_PUPDR_PUPD3); GPIOB->PUPDR |= (GPIO_NOPULL << GPIO_PUPDR_PUPD3_Pos); GPIOB->OSPEEDR |= (GPIO_SPEED_FREQ_HIGH << GPIO_OSPEEDR_OSPEED3_Pos); -#endif } /************************ (C) COPYRIGHT Puya *****END OF FILE******************/ diff --git a/py_project/MDK-ARM/PY32Dallas.uvoptx b/py_project/MDK-ARM/PY32Dallas.uvoptx index 6ee6c5d..6068466 100644 --- a/py_project/MDK-ARM/PY32Dallas.uvoptx +++ b/py_project/MDK-ARM/PY32Dallas.uvoptx @@ -75,7 +75,7 @@ 1 0 - 0 + 1 255 @@ -284,6 +284,10 @@ + + System Viewer\TIM1 + 35903 + System Viewer\TIM14 35904 @@ -357,7 +361,7 @@ 1 0 - 1 + 0 255 @@ -987,7 +991,7 @@ Drivers/PY32F002B_HAL_Driver - 0 + 1 0 0 0 diff --git a/py_project/MDK-ARM/startup_py32f002bxx.s b/py_project/MDK-ARM/startup_py32f002bxx.s index 6b9e34e..c04c517 100644 --- a/py_project/MDK-ARM/startup_py32f002bxx.s +++ b/py_project/MDK-ARM/startup_py32f002bxx.s @@ -99,7 +99,7 @@ __Vectors DCD __initial_sp ; Top of Stack DCD 0 ; 16Reserved DCD LPTIM1_IRQHandler ; 17LPTIM1 DCD 0 ; 18Reserved - DCD TIM_MB_IRQHandler ; 19TIM14 + DCD TIM14_IRQHandler ; 19TIM14 DCD 0 ; 20Reserved DCD 0 ; 21Reserved DCD 0 ; 22Reserved @@ -167,7 +167,7 @@ Default_Handler PROC EXPORT TIM1_BRK_UP_TRG_COM_IRQHandler [WEAK] EXPORT TIM1_CC_IRQHandler [WEAK] EXPORT LPTIM1_IRQHandler [WEAK] - EXPORT TIM_MB_IRQHandler [WEAK] + EXPORT TIM14_IRQHandler [WEAK] EXPORT I2C1_IRQHandler [WEAK] EXPORT SPI1_IRQHandler [WEAK] EXPORT USART1_IRQHandler [WEAK] @@ -181,7 +181,7 @@ ADC_COMP_IRQHandler TIM1_BRK_UP_TRG_COM_IRQHandler TIM1_CC_IRQHandler LPTIM1_IRQHandler -TIM_MB_IRQHandler +TIM14_IRQHandler I2C1_IRQHandler SPI1_IRQHandler USART1_IRQHandler