Er í miklu veseni með git en held ég sé búinn að redda þessu, nýjasta útgáfa af part2

docs/diagrams/src/motor_state.wsd

@@ -11,13 +11,11 @@ skinparam state {
 
 state Initialization 
     Initialization : Entry / Stop motor 
-    Initialization : Do / Initialize internal parameters
-    Initialization : Do / Reset speed measurement
+    Initialization : Entry / Initialize internal parameters
+    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\n complete
+Initialization --> Operational : initialization complete
 Operational --> Initialization : reset
 Operational --> Stopped : fault detected
 

include/motor_controller.h

@@ -42,13 +42,6 @@ public:
     );
 
 
-    // void set_states(
-    //     State* initialization,
-    //     State* operational,
-    //     State* stopped
-    // );
-
-
     void begin();
 
     void update();

src/main.cpp

@@ -53,7 +53,6 @@ int main()
 
     sei();
     
-
     // motor_controller.set_states(
     //     &initialization_state,
     //     &operational_state,

src/motor_controller.cpp

@@ -120,6 +120,20 @@ void MotorController::reset_speed_measurement()
     encoder.reset_speed_measurement();
 }
 
+<<<<<<< HEAD
+=======
+
+void MotorController::led_on()
+{
+    led.set_hi();
+}
+
+
+void MotorController::led_off()
+{
+    led.set_lo();
+}
+>>>>>>> 1d93605cc37a81ea974c12e62c082be19acdb715
 void MotorController::to_stopped()
 {
     transition_to(stopped_state);
@@ -129,6 +143,7 @@ bool MotorController::fault_active()
 {
     return motor.fault_active();
 }
+<<<<<<< HEAD
 
 void MotorController::led_on()
 {
@@ -140,3 +155,5 @@ void MotorController::led_off()
 {
    led.set_lo();
 }
+=======
+>>>>>>> 1d93605cc37a81ea974c12e62c082be19acdb715