From 00aef50a592ea933a7aa25ed2e8546dc2ee6d4e1 Mon Sep 17 00:00:00 2001 From: ackimixs Date: Thu, 18 Apr 2024 15:33:33 +0200 Subject: [PATCH] change purple flower --- TCPServer.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/TCPServer.cpp b/TCPServer.cpp index 277b7be..baf2793 100644 --- a/TCPServer.cpp +++ b/TCPServer.cpp @@ -572,17 +572,22 @@ void TCPServer::startGameBlueTeam() { } if (!pinceHavePurpleFlower.empty()) { - this->broadcastMessage("strat;servo_moteur;lever bras;1\n"); - - this->broadcastMessage("strat;arduino;go;225,225\n"); + this->broadcastMessage("strat;arduino;go;200,200\n"); awaitRobotIdle(); - this->broadcastMessage("strat;arduino;angle;314\n"); + this->broadcastMessage("strat;arduino;angle;157\n"); awaitRobotIdle(); + this->broadcastMessage("strat;arduino;speed;130\n"); + this->broadcastMessage("strat;arduino;go;200,0\n"); + usleep(3'000'000); for (auto & toDrop : pinceHavePurpleFlower) { toSend = "strat;servo_moteur;ouvrir pince;" + std::to_string(toDrop) + "\n"; this->broadcastMessage(toSend); - usleep(500'000); + + toSend = "strat;arduino;go;" + std::to_string(static_cast(this->robotPose.pos.x)) + "," + std::to_string(static_cast(this->robotPose.pos.y + 150)) + "\n"; + this->broadcastMessage(toSend); + awaitRobotIdle(); + pinceState[toDrop] = NONE; toSend = "strat;servo_moteur;fermer pince;" + std::to_string(toDrop) + "\n"; this->broadcastMessage(toSend); @@ -591,6 +596,7 @@ void TCPServer::startGameBlueTeam() { toSend = "strat;arduino;go;" + std::to_string(static_cast(this->robotPose.pos.x + 150)) + "," + std::to_string(static_cast(this->robotPose.pos.y)) + "\n"; this->broadcastMessage(toSend); + awaitRobotIdle(); } @@ -601,6 +607,8 @@ void TCPServer::startGameBlueTeam() { this->broadcastMessage("strat;arduino;angle;157\n"); awaitRobotIdle(); + this->broadcastMessage("strat;servo_moteur;lever bras;1\n"); + this->broadcastMessage("strat;arduino;speed;130\n"); this->broadcastMessage("strat;arduino;go;762,0\n"); usleep(3'000'000);