Lagað sameinaða kóða eftir merge. Muna fokkin kommur!!

include/motor_controller.h

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