diff --git a/MDK-ARM/.vscode/keil-assistant.log b/MDK-ARM/.vscode/keil-assistant.log index 33239a6..e94b1fa 100644 --- a/MDK-ARM/.vscode/keil-assistant.log +++ b/MDK-ARM/.vscode/keil-assistant.log @@ -94,3 +94,5 @@ [info] Log at : 2025/7/1|00:00:07|GMT+0800 +[info] Log at : 2025/7/1|14:59:17|GMT+0800 + diff --git a/MDK-ARM/R1.uvoptx b/MDK-ARM/R1.uvoptx index 6d65eae..e374b68 100644 --- a/MDK-ARM/R1.uvoptx +++ b/MDK-ARM/R1.uvoptx @@ -1059,7 +1059,7 @@ User/module - 0 + 1 0 0 0 @@ -1091,7 +1091,7 @@ User/task - 0 + 1 0 0 0 diff --git a/User/module/ball.cpp b/User/module/ball.cpp index 40cc84b..e6c5fba 100644 --- a/User/module/ball.cpp +++ b/User/module/ball.cpp @@ -226,13 +226,15 @@ void Ball::Move_Extend() break; case BALL_FINISH: - osDelay(50); // 延时 50ms + osDelay(200); // 延时 50ms HAL_GPIO_WritePin(CLOSE_GPIO_Port, CLOSE_Pin, GPIO_PIN_RESET); // 确保气缸爪子闭合 HAL_GPIO_WritePin(DOWN_GPIO_Port, DOWN_Pin, GPIO_PIN_RESET); // 确保下气缸关闭 runCount++; + osDelay(200); // 延时 50ms if (runCount < 2) { currentState1 = BALL_FORWARD; // 继续下一次运球 + osDelay(50); } else {