Merge pull request #44 from RoboTeamTwente/kicker_calibrate2

new calibration
RoboTeamTwente · Jul 16, 2024 · b61e33a · b61e33a
2 parents d857dd3 + 37d340f
commit b61e33a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Core/Src/kicker_chipper_board/peripherals/shoot.c b/Core/Src/kicker_chipper_board/peripherals/shoot.c
@@ -148,11 +148,11 @@ int calculateShootingTime(shoot_types type, float speed) {
     if(MAX_BALL_SPEED < speed) speed = MAX_BALL_SPEED;
 
 	if (type == shoot_Kick) {
-		int kickTime = (int)(speed * speed * 59.9f + 304.5f * speed + 1082.5f); //transfer function to convert m/s to time in us
+		int kickTime = (int)(speed * speed * 67.5f + 340.4f * speed + 1075.9f); //transfer function to convert m/s to time in us
 		return kickTime;
 
 	} else if (type == shoot_Chip) {
-		int chipTime = (int)(speed * speed * 59.9f + 304.5f * speed + 1082.5f);
+		int chipTime = (int)(speed * speed * 67.5f + 340.4f * speed + 1075.9f);
 		return chipTime;
 	}
 	return 0;