From f98b720a1ce9bad501ad3abd40ace6738c21ab0d Mon Sep 17 00:00:00 2001 From: bmy <2583236812@qq.com> Date: Sat, 22 Jun 2024 20:03:08 +0800 Subject: [PATCH] =?UTF-8?q?pref:=20=E5=8A=A0=E5=BF=AB=E4=BA=86=E5=A4=8D?= =?UTF-8?q?=E4=BD=8D=E9=80=9F=E5=BA=A6=E5=B9=B6=E5=85=B3=E9=97=AD=E4=BA=86?= =?UTF-8?q?=E9=83=A8=E5=88=86=E8=B0=83=E8=AF=95=E6=97=A5=E5=BF=97=E8=BE=93?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/by_motion.c | 10 +++++----- project/src/main.c | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/by_motion.c b/app/by_motion.c index d66040d..42dbd70 100644 --- a/app/by_motion.c +++ b/app/by_motion.c @@ -123,7 +123,7 @@ void by_motion_set_distance2(float distance, int16_t speed) if (5.0 >= position_abs) { position_abs = 0; - by_motion_set_speed_m1(-10); + by_motion_set_speed_m1(-20); motion_busy_flag = 1; motion_reset_flag = 1; LOGD("RESET position_abs = %f\r\n", position_abs); @@ -180,11 +180,11 @@ void by_motion_init(void) // 上电回零 by_motion_set_speed_m1(-20); while (SET == gpio_input_data_bit_read(GPIOB, GPIO_PINS_4)) { - lwprintf("%f, %f, %f\r\n", param_m1.real_speed, param_m1.target_speed, param_m1.out_pwm); + // lwprintf("%f, %f, %f\r\n", param_m1.real_speed, param_m1.target_speed, param_m1.out_pwm); // 等待复位 } by_motion_set_speed_m1(0); - by_motion_set_distance2(100, 20); + by_motion_set_distance2(100, 30); } void by_motion_run(void) @@ -233,8 +233,8 @@ void by_motion_can_handle(uint16_t stdd_id, const uint8_t *data, uint8_t len) // #endif // } - LOGD("m1:%f,%f,%f", param_m1.real_speed, param_m1.target_speed, param_m1.out_pwm); - LOGD("m2:%f,%f,%f", param_m2.real_speed, param_m2.target_speed, param_m2.out_pwm); + // LOGD("m1:%f,%f,%f", param_m1.real_speed, param_m1.target_speed, param_m1.out_pwm); + // LOGD("m2:%f,%f,%f", param_m2.real_speed, param_m2.target_speed, param_m2.out_pwm); } void by_motion_tmr_handle(void) diff --git a/project/src/main.c b/project/src/main.c index 8cf0b8e..5495840 100644 --- a/project/src/main.c +++ b/project/src/main.c @@ -113,12 +113,13 @@ int main(void) by_motion_init(); LOGD("init motion"); + /* add user code end 2 */ while(1) { /* add user code begin 3 */ - lwprintf("%f, %f, %f\r\n", param_m1.real_speed, param_m1.target_speed, param_m1.out_pwm); + // lwprintf("%f, %f, %f\r\n", param_m1.real_speed, param_m1.target_speed, param_m1.out_pwm); /* add user code end 3 */ } }