diff --git a/HAL_N_Middlewares/Src/main.c b/HAL_N_Middlewares/Src/main.c index 1dd11d1..3982e25 100644 --- a/HAL_N_Middlewares/Src/main.c +++ b/HAL_N_Middlewares/Src/main.c @@ -36,7 +36,6 @@ #include "bsp_usart.h" #include "bsp_can.h" #include "can.h" -#include "LK9025.h" #include "dji_motor.h" #include "motor_task.h" /* USER CODE END Includes */ diff --git a/modules/motor/LK9025.c b/modules/motor/LK9025.c index f8d4d25..abaa5d7 100644 --- a/modules/motor/LK9025.c +++ b/modules/motor/LK9025.c @@ -34,7 +34,7 @@ void DrivenControl(int16_t motor1_current,int16_t motor2_current) driven_motor_info[0]->motor_can_instance->tx_buff[1] = motor1_current>>8; driven_motor_info[0]->motor_can_instance->tx_buff[2] = motor2_current; driven_motor_info[0]->motor_can_instance->tx_buff[3] = motor2_current>>8; - CANTransmit(&driven_motor_info[0]->motor_can_instance); + CANTransmit(driven_motor_info[0]->motor_can_instance); } void SetDrivenMode(driven_mode cmd,uint16_t motor_id) diff --git a/modules/remote/remote_control.c b/modules/remote/remote_control.c index e69fa0e..027d836 100644 --- a/modules/remote/remote_control.c +++ b/modules/remote/remote_control.c @@ -55,7 +55,7 @@ static void ReceiveCallback() sbus_to_rc(rc_usart_instance.recv_buff, &rc_ctrl); } -RC_ctrl_t* RC_init(UART_HandleTypeDef *rc_usart_handle) +RC_ctrl_t *RC_init(UART_HandleTypeDef *rc_usart_handle) { rc_usart_instance.module_callback = ReceiveCallback; rc_usart_instance.usart_handle = rc_usart_handle; @@ -64,7 +64,7 @@ RC_ctrl_t* RC_init(UART_HandleTypeDef *rc_usart_handle) return &rc_ctrl; } -const *get_remote_control_point(void) +const RC_ctrl_t *get_remote_control_point(void) { - + return &rc_ctrl; } \ No newline at end of file diff --git a/modules/remote/remote_control.h b/modules/remote/remote_control.h index d9676d0..f0cdc23 100644 --- a/modules/remote/remote_control.h +++ b/modules/remote/remote_control.h @@ -75,4 +75,10 @@ typedef struct */ RC_ctrl_t *RC_init(UART_HandleTypeDef *rc_usart_handle); +/** + * @brief Get the remote control point object + * + * @return const RC_ctrl_t* + */ +const RC_ctrl_t *get_remote_control_point(void); #endif