Merging main with Isak_part2 branch

docs/diagrams/src/motor_state.wsd

@@ -10,14 +10,12 @@ skinparam state {
 [*] --> Initialization
 
 state Initialization 
-    Initialization : Entry / Stop motor
+    Initialization : Entry / Stop motor 
-    Initialization : Do / Initialize internal parameters
+    Initialization : Entry / Initialize internal parameters
-    Initialization : Do / Reset speed measurement
+    Initialization : Entry / Reset speed measurement
     Initialization : Do / Wait 2 seconds
     Initialization : Exit / Send Boot-up message
 
-
-
 state Operational 
     Operational : Entry / LED on
     Operational : Do / Run speed controller
@@ -28,9 +26,7 @@ state Stopped
     Stopped : Do / Blink LED at 2 Hz
     Stopped : Exit / LED off
 
-
+Initialization --> Operational : initialization complete
-
-Initialization --> Operational : initialization\n complete
 Operational --> Initialization : reset
 Operational --> Stopped : fault detected
 

include/motor_controller.h

@@ -18,9 +18,9 @@ private:
 
     State* current_state;
 
-    State& initialization_state;
+    State* initialization_state;
-    State& operational_state;
+    State* operational_state;
-    State& stopped_state;
+    State* stopped_state;
 
     RotaryEncoderDriver& encoder;
     MotorDriver& motor;
@@ -38,17 +38,10 @@ public:
         P_controller& controller,
         State& initialization,
         State& operational,
-        State& stopped
+        state& stopped
     );
 
 
-    // void set_states(
-    //     State* initialization,
-    //     State* operational,
-    //     State* stopped
-    // );
-
-
     void begin();
 
     void update();

src/main.cpp

@@ -33,8 +33,7 @@ MotorController motor_controller(
     motor,
     controller,
     initialization_state,
-    operational_state,
+    operational_state
-    stopped_state
 );
 
 
@@ -54,11 +53,11 @@ int main()
     sei();
 
 
-    // motor_controller.set_states(
+    motor_controller.set_states(
-    //     &initialization_state,
+        &initialization_state,
-    //     &operational_state,
+        &operational_state,
-    //     &stopped_state
+        &stopped_state
-    // );
+    );
 
 
     motor_controller.begin();

src/motor_controller.cpp

@@ -9,8 +9,7 @@ MotorController::MotorController(
     MotorDriver& motor,
     P_controller& controller,
     State& initialization,
-    State& operational,
+    State& operational
-    State& stopped
 )
     : current_state(nullptr),
       initialization_state(initialization),
@@ -24,22 +23,9 @@ MotorController::MotorController(
 {
     initialization_state.set_context(this);
     operational_state.set_context(this);
-    stopped_state.set_context(this);
 }
 
 
-// void MotorController::set_states(
-//     State* initialization,
-//     State* operational,
-//     State* stopped
-// )
-
-    // initialization_state = initialization;
-    // operational_state = operational;
-    // stopped_state = stopped;
-
-
-
 void MotorController::begin()
 {
     led.init();
@@ -120,6 +106,17 @@ void MotorController::reset_speed_measurement()
     encoder.reset_speed_measurement();
 }
 
+
+void MotorController::led_on()
+{
+    led.set_hi();
+}
+
+
+void MotorController::led_off()
+{
+    led.set_lo();
+}
 void MotorController::to_stopped()
 {
     transition_to(stopped_state);
@@ -129,14 +126,3 @@ bool MotorController::fault_active()
 {
     return motor.fault_active();
 }
-
-void MotorController::led_on()
-{
-   led.set_hi();
-}
-
-
-void MotorController::led_off()
-{
-   led.set_lo();
-}