From 740ba510847239bff3b4965937804c5751ffef31 Mon Sep 17 00:00:00 2001 From: Jack McRobbie Date: Mon, 31 Aug 2020 16:41:13 +1000 Subject: [PATCH 1/2] Drive command --- CMakeLists.txt | 1 + msg/mur_drive_cmd.msg | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 msg/mur_drive_cmd.msg diff --git a/CMakeLists.txt b/CMakeLists.txt index eafa543..5cc3b13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,7 @@ find_package(catkin REQUIRED COMPONENTS add_message_files(DIRECTORY msg FILES cone_msg.msg + mur_drive_cmd.msg ) generate_messages( diff --git a/msg/mur_drive_cmd.msg b/msg/mur_drive_cmd.msg new file mode 100644 index 0000000..5bc488a --- /dev/null +++ b/msg/mur_drive_cmd.msg @@ -0,0 +1,5 @@ +Header header +# Straightline velocity +float32 vel +# angular velocity +float32 omega From 4a73806c8f11a58c321536ccd8260bcd2ae6968f Mon Sep 17 00:00:00 2001 From: Jack McRobbie Date: Mon, 31 Aug 2020 16:42:02 +1000 Subject: [PATCH 2/2] init state machine branch --- src/state_machine.cpp | 8 ++++++++ src/state_machine.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 src/state_machine.cpp create mode 100644 src/state_machine.h diff --git a/src/state_machine.cpp b/src/state_machine.cpp new file mode 100644 index 0000000..a981560 --- /dev/null +++ b/src/state_machine.cpp @@ -0,0 +1,8 @@ +#include "state_machine.h" + + +void main() +{ + +} +} \ No newline at end of file diff --git a/src/state_machine.h b/src/state_machine.h new file mode 100644 index 0000000..5196831 --- /dev/null +++ b/src/state_machine.h @@ -0,0 +1,31 @@ +#ifndef STATE_MACHINE_H +#define STATE_MACHINE_H +#include "ros.h" + + +class mur_state +{ +private: + // States that this node will track + bool perceptionReady; + bool slamReady; + bool localReady; + bool lidarReady; + bool camReady; + + + +public: + mur_state(/* args */); + ~mur_state(); +}; + +mur_state::mur_state(/* args */) +{ +} + +mur_state::~mur_state() +{ +} + +#endif \ No newline at end of file