diff --git a/TCPServer.cpp b/TCPServer.cpp index 636dcea..bcd824d 100644 --- a/TCPServer.cpp +++ b/TCPServer.cpp @@ -427,11 +427,11 @@ void TCPServer::checkIfAllClientsReady() void TCPServer::startGame() { for (int i = whereAmI; i < stratPatterns.size(); i++) { - /*auto time = std::chrono::system_clock::now(); + auto time = std::chrono::system_clock::now(); if (time - gameStart > std::chrono::seconds(82)) { this->goEnd(); return; - }*/ + } switch (stratPatterns[i]) { case TURN_SOLAR_PANNEL_1: @@ -734,10 +734,10 @@ void TCPServer::awaitRobotIdle() { usleep(50'000); this->sendToClient("strat;arduino;get state;1\n", this->arduinoSocket); timeout++; - /*if (timeout > 30) { + if (timeout > 30) { this->broadcastMessage("strat;arduino;clear;1"); break; - }*/ + } } } diff --git a/TCPServer.h b/TCPServer.h index 276a4bc..e32fec7 100644 --- a/TCPServer.h +++ b/TCPServer.h @@ -124,11 +124,11 @@ private: DROP_PURPLE_FLOWER, DROP_WHITE_FLOWER_J2, // GET_LIDAR_POS, - /*TAKE_FLOWER_TOP, + TAKE_FLOWER_TOP, TAKE_FLOWER_TOP, TAKE_FLOWER_TOP, DROP_WHITE_FLOWER_J2, - DROP_PURPLE_FLOWER,*/ + DROP_PURPLE_FLOWER, GO_END };