From 6546dcbdd6b5940da2adf39bd97e01d83764b5af Mon Sep 17 00:00:00 2001 From: Sam Hos Date: Thu, 24 Oct 2024 12:13:31 +0200 Subject: [PATCH] re-orginasation --- .../Driver/src/{ => KobukiDriver}/CKobuki.cpp | 0 .../Driver/src/{ => KobukiDriver}/CKobuki.h | 0 .../src/{ => KobukiDriver}/KobukiParser.cpp | 0 .../src/{ => KobukiDriver}/KobukiParser.h | 0 src/C++/Driver/src/{ => KobukiDriver}/graph.h | 0 .../Driver/src/MQTT/{main.cpp => example.cpp} | 0 src/C++/Driver/src/main.cpp | 18 ++++++++++++++---- 7 files changed, 14 insertions(+), 4 deletions(-) rename src/C++/Driver/src/{ => KobukiDriver}/CKobuki.cpp (100%) rename src/C++/Driver/src/{ => KobukiDriver}/CKobuki.h (100%) rename src/C++/Driver/src/{ => KobukiDriver}/KobukiParser.cpp (100%) rename src/C++/Driver/src/{ => KobukiDriver}/KobukiParser.h (100%) rename src/C++/Driver/src/{ => KobukiDriver}/graph.h (100%) rename src/C++/Driver/src/MQTT/{main.cpp => example.cpp} (100%) diff --git a/src/C++/Driver/src/CKobuki.cpp b/src/C++/Driver/src/KobukiDriver/CKobuki.cpp similarity index 100% rename from src/C++/Driver/src/CKobuki.cpp rename to src/C++/Driver/src/KobukiDriver/CKobuki.cpp diff --git a/src/C++/Driver/src/CKobuki.h b/src/C++/Driver/src/KobukiDriver/CKobuki.h similarity index 100% rename from src/C++/Driver/src/CKobuki.h rename to src/C++/Driver/src/KobukiDriver/CKobuki.h diff --git a/src/C++/Driver/src/KobukiParser.cpp b/src/C++/Driver/src/KobukiDriver/KobukiParser.cpp similarity index 100% rename from src/C++/Driver/src/KobukiParser.cpp rename to src/C++/Driver/src/KobukiDriver/KobukiParser.cpp diff --git a/src/C++/Driver/src/KobukiParser.h b/src/C++/Driver/src/KobukiDriver/KobukiParser.h similarity index 100% rename from src/C++/Driver/src/KobukiParser.h rename to src/C++/Driver/src/KobukiDriver/KobukiParser.h diff --git a/src/C++/Driver/src/graph.h b/src/C++/Driver/src/KobukiDriver/graph.h similarity index 100% rename from src/C++/Driver/src/graph.h rename to src/C++/Driver/src/KobukiDriver/graph.h diff --git a/src/C++/Driver/src/MQTT/main.cpp b/src/C++/Driver/src/MQTT/example.cpp similarity index 100% rename from src/C++/Driver/src/MQTT/main.cpp rename to src/C++/Driver/src/MQTT/example.cpp diff --git a/src/C++/Driver/src/main.cpp b/src/C++/Driver/src/main.cpp index 62d4cec..71fefcf 100644 --- a/src/C++/Driver/src/main.cpp +++ b/src/C++/Driver/src/main.cpp @@ -1,18 +1,28 @@ -#include "CKobuki.h" #include #include #include -#include "graph.h" +#include "KobukiDriver/graph.h" +#include "MQTT/MqttClient.h" +#include "KobukiDriver/CKobuki.h" + using namespace std; CKobuki robot; int movement(); int checkCenterCliff(); -int main() -{ +void setup(){ unsigned char *null_ptr(0); robot.startCommunication("/dev/ttyUSB0", true, null_ptr); + MqttClient client("mqtt://localhost:1883", "raspberry_pi_client", "ishak", "kobuki"); + client.connect(); + client.subscribe("home/commands"); + +} + +int main() +{ + // thread mv(movement); // mv.join(); //only exit once thread one is done running