From e9f9a6d15c51cac45c3a52044f9fed3c9fa9f0c4 Mon Sep 17 00:00:00 2001 From: helgie22 Date: Fri, 16 Oct 2026 16:04:29 +0000 Subject: [PATCH] =?UTF-8?q?b=C3=A6tti=20aftur=20vi=C3=B0=20lyklabor=C3=B0i?= =?UTF-8?q?nu=20til=20=C3=BEess=20a=C3=B0=20geta=20pr=C3=B3fa=C3=B0=20allt?= =?UTF-8?q?=20saman?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 2 ++ include/initialization_state.h | 2 +- include/operational_state.h | 2 +- include/pre_operational_state.h | 2 +- include/state.h | 2 +- include/stopped_state.h | 2 +- src/app.cpp | 4 ++-- src/initialization_state.cpp | 4 +--- src/motor_controller.cpp | 2 -- src/operational_state.cpp | 1 - src/stopped_state.cpp | 2 -- 11 files changed, 10 insertions(+), 15 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..0f09d32 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +* text=auto eol=lf +*.bat text eol=crlf \ No newline at end of file diff --git a/include/initialization_state.h b/include/initialization_state.h index 50abb10..92ca6b2 100644 --- a/include/initialization_state.h +++ b/include/initialization_state.h @@ -19,7 +19,7 @@ public: void update() override; - // void command(char c) override; + void command(char c) override; void exit() override; diff --git a/include/operational_state.h b/include/operational_state.h index 2274e55..3274815 100644 --- a/include/operational_state.h +++ b/include/operational_state.h @@ -21,7 +21,7 @@ public: void update() override; - // void command(char c) override; + void command(char c) override; void exit() override; diff --git a/include/pre_operational_state.h b/include/pre_operational_state.h index 3d9015a..81faf26 100644 --- a/include/pre_operational_state.h +++ b/include/pre_operational_state.h @@ -36,7 +36,7 @@ public: void enter() override; void update() override; - // void command(char c) override; + void command(char c) override; void exit() override; NodeState id() const override { return NodeState::PRE_OPERATIONAL; } diff --git a/include/state.h b/include/state.h index 1544bf3..167a961 100644 --- a/include/state.h +++ b/include/state.h @@ -24,7 +24,7 @@ public: virtual void update() = 0; // run motor controller - // virtual void command(char c) = 0; // Listen for reset + virtual void command(char c) = 0; // Listen for reset virtual void exit() = 0; // Stop motor diff --git a/include/stopped_state.h b/include/stopped_state.h index e9b0635..77a41d1 100644 --- a/include/stopped_state.h +++ b/include/stopped_state.h @@ -18,7 +18,7 @@ public: void update() override; - // void command(char c) override; + void command(char c) override; void exit() override; diff --git a/src/app.cpp b/src/app.cpp index 1e3b3c6..389aa8d 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -12,12 +12,12 @@ #include "motor_controller.h" #include "initialization_state.h" - #include "pre_operational_state.h" - #include "operational_state.h" #include "stopped_state.h" +#include "node_application.h" + static RotaryEncoderDriver encoder; static MotorDriver motor; diff --git a/src/initialization_state.cpp b/src/initialization_state.cpp index fa75bc8..95617e1 100644 --- a/src/initialization_state.cpp +++ b/src/initialization_state.cpp @@ -24,12 +24,10 @@ void InitializationState::update() } } - void InitializationState::command(char c) { (void)c; -} - +} void InitializationState::exit() { diff --git a/src/motor_controller.cpp b/src/motor_controller.cpp index 7c0aab2..a2225b5 100644 --- a/src/motor_controller.cpp +++ b/src/motor_controller.cpp @@ -64,7 +64,6 @@ void MotorController::update() } } - void MotorController::command(char c) { if (current_state != nullptr) @@ -73,7 +72,6 @@ void MotorController::command(char c) } } - void MotorController::to_initialization() { transition_to(initialization_state); diff --git a/src/operational_state.cpp b/src/operational_state.cpp index 9ee5422..c7ba1ec 100644 --- a/src/operational_state.cpp +++ b/src/operational_state.cpp @@ -92,7 +92,6 @@ void OperationalState::command(char c) } } - void OperationalState::exit() { context->stop_motor(); diff --git a/src/stopped_state.cpp b/src/stopped_state.cpp index 856231e..260424e 100644 --- a/src/stopped_state.cpp +++ b/src/stopped_state.cpp @@ -49,7 +49,6 @@ void StoppedState::update() // Commands for Stopped [ r = reset and o for operational] - void StoppedState::command(char c) { if (c == 'r' || c == 'R') @@ -74,7 +73,6 @@ void StoppedState::command(char c) } } - void StoppedState::exit() { context->led_off();