ulysse
/
PAMI_Super_Star_2025
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mon_travail' into main 

# Conflicts:
#    Main.ino
This commit is contained in:
Ulysse Cura 2025-02-01 15:11:17 +01:00
parent cd937c5e50 3c80ada3d7
commit 420e49086c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Main.ino
View File

@ -123,6 +123,7 @@ void loop()
case State::ForwardToRamp: case State::ForwardToRamp:
my_IO.motorControlOn(); my_IO.motorControlOn();
my_IO.setSpeed(NORMAL_SPEED); my_IO.setSpeed(NORMAL_SPEED);
my_IO.setSpeed(2000.0f);
if(my_IO.getAngle(Axes::Y) < -5.0f) if(my_IO.getAngle(Axes::Y) < -5.0f)
{ {
@ -131,9 +132,11 @@ void loop()
break; break;
case State::ForwardToScene: case State::ForwardToScene:
my_IO.setSpeed(2000.0f);
if(my_IO.getAngle(Axes::Y) > -5.0f) if(my_IO.getAngle(Axes::Y) > -5.0f)
{ {
my_IO.setSpeed(ON_STAGE_SPEED); my_IO.setSpeed(ON_STAGE_SPEED);
my_IO.setSpeed(1300.0f);
actual_state = my_IO.isSelectedColorBlue() ? State::Turn90Blue : State::Turn90Yellow; actual_state = my_IO.isSelectedColorBlue() ? State::Turn90Blue : State::Turn90Yellow;
//actual_state = State::Dancing; //actual_state = State::Dancing;
} }
@ -159,8 +162,9 @@ void loop()
case State::ForwardToSceneEdge: case State::ForwardToSceneEdge:
my_IO.setSpeed(ON_STAGE_SPEED); my_IO.setSpeed(ON_STAGE_SPEED);
my_IO.setSpeed(1100.0f);
if(my_IO.getAngle(Axes::Y) > 5.0f) if(my_IO.getAngle(Axes::Y) > 3.0f)
{ {
actual_state = State::Dancing; actual_state = State::Dancing;
} }