From 6cd32e662d56a34b3747f3aa6a601ebe2d77a0ed Mon Sep 17 00:00:00 2001 From: WXK <287788329@qq.com> Date: 星期二, 21 一月 2025 18:02:33 +0800 Subject: [PATCH] 2.62,加入兼容防撞跟下发蜂鸣 --- Src/main.c | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/Src/main.c b/Src/main.c index e271287..79d1898 100644 --- a/Src/main.c +++ b/Src/main.c @@ -133,12 +133,24 @@ if(g_com_map[MOTOR_ENABLE]) { -// if(motor_keeptime>0) -// { + if(motor_keeptime>0) + { // motor_state = 2; -// }else{ + if(hardware_type==NSH1) + {MOTOR_ON; + }else if(hardware_type==GP) + { + HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_3); + } + }else{ // motor_state = 0; -// } + if(hardware_type==NSH1) + {MOTOR_OFF; + }else if(hardware_type==GP) + { + HAL_TIM_PWM_Stop(&htim2, TIM_CHANNEL_3); + } + } //motor_state=2; switch(motor_state) {case 0: @@ -288,7 +300,7 @@ hardware_pici= STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+2); hardware_type= STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+4); //deca_sleep(1000); - g_com_map[VERSION] = (2<<8)|60; + g_com_map[VERSION] = (2<<8)|62; // g_com_map[DEV_ID]=0x7; #ifdef DEBUG_MODE -- Gitblit v1.9.3