Compare commits

..

No commits in common. "9f3f039bb0a248448555c7c1a7f1a1c9985ecc83" and "8fec829754df2cc49bde377b0dc1c7591314c21f" have entirely different histories.

2 changed files with 7 additions and 5 deletions

6
IO.hpp
View File

@ -39,6 +39,8 @@ class Motor {
ledcAttachChannel(m_pin, 5000, 12, m_channel);
ledcWriteChannel(m_channel, 0);
//ledcSetup(m_channel, 5000, 12); // Channel, Frequency, Resolution
//ledcAttachPin(m_pin, m_channel); // Attach pin to channel
return 0;
}
@ -112,9 +114,9 @@ class IO {
if(millis() - last_color_change_time > 1000 && has_color_changed)
{
m_screen.clearDisplay();
m_screen.drawBitmap(38, 0, Res::Imgs::riombotique, 52, 64, WHITE);
//m_screen.drawBitmap(38, 0, Res::Imgs::riombotique, 52, 64, WHITE);
//m_screen.drawBitmap(75, 0, Imgs::poivron_robotique, 52, 64, WHITE);
//m_screen.drawBitmap(27, 0, Res::Imgs::diable_gaga, 75, 64, WHITE);
m_screen.drawBitmap(27, 0, Res::Imgs::diable_gaga, 75, 64, WHITE);
has_color_changed = false;
}

View File

@ -138,7 +138,7 @@ void loop()
case State::Turn90Blue:
my_IO.setDirWithAngularSpeed(-90.0f);
if(my_IO.getAngle(Axes::Z) < -80.0f)
if(my_IO.getAngle(Axes::Z) < -88.0f)
{
actual_state = State::ForwardToSceneEdge;
}
@ -147,14 +147,14 @@ void loop()
case State::Turn90Yellow:
my_IO.setDirWithAngularSpeed(90.0f);
if(my_IO.getAngle(Axes::Z) >= 80.0f)
if(my_IO.getAngle(Axes::Z) >= 88.0f)
{
actual_state = State::ForwardToSceneEdge;
}
break;
case State::ForwardToSceneEdge:
my_IO.setSpeed(1100.0f);
my_IO.setSpeed(1024.0f);
if(my_IO.getAngle(Axes::Y) > 5.0f)
{