From d845d01e0ad9725732391af4e563bed764d17405 Mon Sep 17 00:00:00 2001 From: Sam Hos Date: Mon, 4 Nov 2024 12:18:08 +0100 Subject: [PATCH 1/6] reset mqtt var after running command --- src/C++/Driver/src/main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/C++/Driver/src/main.cpp b/src/C++/Driver/src/main.cpp index e9ac6b4..5e3ebdc 100644 --- a/src/C++/Driver/src/main.cpp +++ b/src/C++/Driver/src/main.cpp @@ -44,18 +44,18 @@ std::string readMQTT() void parseMQTT(std::string message){ if(message == "up"){ robot.forward(600); - message = NULL; + message = 'null'; } else if(message == "left"){ robot.Rotate(90); - message = NULL; + message = 'null'; } else if(message == "down"){ robot.Rotate(-90); - message = NULL; + message = 'null'; } - else if(message = NULL){ + else if(message = 'null'){ robot.sendNullMessage(); } else{ From 94f1b40e7465e14149b07a3ff6741ff3fa7b3beb Mon Sep 17 00:00:00 2001 From: Sam Hos Date: Mon, 4 Nov 2024 12:19:38 +0100 Subject: [PATCH 2/6] fix compile errors --- src/C++/Driver/src/main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/C++/Driver/src/main.cpp b/src/C++/Driver/src/main.cpp index 5e3ebdc..2f7b0e0 100644 --- a/src/C++/Driver/src/main.cpp +++ b/src/C++/Driver/src/main.cpp @@ -44,18 +44,18 @@ std::string readMQTT() void parseMQTT(std::string message){ if(message == "up"){ robot.forward(600); - message = 'null'; + message = "NULL"; } else if(message == "left"){ robot.Rotate(90); - message = 'null'; + message = "NULL"; } else if(message == "down"){ robot.Rotate(-90); - message = 'null'; + message = "NULL"; } - else if(message = 'null'){ + else if(message = "NULL"){ robot.sendNullMessage(); } else{ From c246258c6dc77c5d6285a4141e1f61f0dcaa779f Mon Sep 17 00:00:00 2001 From: Sam Hos Date: Mon, 4 Nov 2024 12:22:31 +0100 Subject: [PATCH 3/6] . --- src/C++/Driver/src/main.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/C++/Driver/src/main.cpp b/src/C++/Driver/src/main.cpp index 2f7b0e0..c8b9f2a 100644 --- a/src/C++/Driver/src/main.cpp +++ b/src/C++/Driver/src/main.cpp @@ -41,21 +41,18 @@ std::string readMQTT() return message; } -void parseMQTT(std::string message){ +void parseMQTT(std::string &message){ if(message == "up"){ robot.forward(600); - message = "NULL"; } else if(message == "left"){ robot.Rotate(90); - message = "NULL"; } else if(message == "down"){ robot.Rotate(-90); - message = "NULL"; } - else if(message = "NULL"){ + else if(message = "stop"){ robot.sendNullMessage(); } else{ From a3ed0f0f30d92c5396e2153958a5bf9a7988b99d Mon Sep 17 00:00:00 2001 From: Sam Hos Date: Mon, 4 Nov 2024 12:23:34 +0100 Subject: [PATCH 4/6] used wrong operator --- src/C++/Driver/src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/C++/Driver/src/main.cpp b/src/C++/Driver/src/main.cpp index c8b9f2a..661246a 100644 --- a/src/C++/Driver/src/main.cpp +++ b/src/C++/Driver/src/main.cpp @@ -52,7 +52,7 @@ void parseMQTT(std::string &message){ else if(message == "down"){ robot.Rotate(-90); } - else if(message = "stop"){ + else if(message == "stop"){ robot.sendNullMessage(); } else{ From 25a179ded608621b201e58437899d7f43c8ac670 Mon Sep 17 00:00:00 2001 From: Sam Hos Date: Mon, 4 Nov 2024 12:29:24 +0100 Subject: [PATCH 5/6] fix last build errors --- src/C++/Driver/src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/C++/Driver/src/main.cpp b/src/C++/Driver/src/main.cpp index 661246a..72aac09 100644 --- a/src/C++/Driver/src/main.cpp +++ b/src/C++/Driver/src/main.cpp @@ -41,7 +41,7 @@ std::string readMQTT() return message; } -void parseMQTT(std::string &message){ +void parseMQTT(std::string message){ if(message == "up"){ robot.forward(600); } From 3d7bcf84e4489a436d43e4c647077b7249d18544 Mon Sep 17 00:00:00 2001 From: Sam Hos Date: Mon, 4 Nov 2024 12:31:30 +0100 Subject: [PATCH 6/6] added more drive logic --- src/C++/Driver/src/main.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/C++/Driver/src/main.cpp b/src/C++/Driver/src/main.cpp index 72aac09..dd3da5f 100644 --- a/src/C++/Driver/src/main.cpp +++ b/src/C++/Driver/src/main.cpp @@ -49,9 +49,12 @@ void parseMQTT(std::string message){ robot.Rotate(90); } - else if(message == "down"){ + else if(message == "right"){ robot.Rotate(-90); } + else if(message == "down"){ + robot.forward(600); + } else if(message == "stop"){ robot.sendNullMessage(); }