added walk through of foot and shoulder servo

src/book/03-guides/03-hardware/01-working-with-robots.mdx

@@ -8,14 +8,8 @@ slug: /guides/hardware/working-with-robots
 
 ## Aligning an Ankle
 
-<<<<<<< HEAD
 An alignment of an ankle may need to be done if the foot and the leg of the robot aren't perpendicular when standing.
 An ankle alignment may also be necessary when the foot has come loose.
-=======
-An alignment of an ankle may need to be done if the foot and the leg of the robot aren't perpendicular when standing.
-An ankle alignment may also be necessary when the foot has come loose.
-
-> > > > > > > 8f25ae92838312b8020ba3e2a14bd2ceeaf324c5
 
 To align an ankle correctly perform the following instructions:
 
@@ -37,63 +31,44 @@ To align an ankle correctly perform the following instructions:
 
 1.  Detatching the arm
 
-    - On the shoulder of the robot, there is a ring of screws front and back. Remove all the screws.
-    - Remove the arm from the shoulder socket, it will still be attatched by a wire
-    - Take off the long part of plastic between the shoudler and neck, it is held by two screws. This piece of plastic can be seen in the following photo:
-      ![shoulder cover](./images/shoulder/shoulder.jpg 'shoulder cover')
-    - Now that the piece is off, there is a port for the chord that is still keeping the arm in place, detach this and the arm will be completely detatched
-
-2.  Detatching the shoulder
-    - Looking in the shoulder socket there is another circle of screws, remove these and the shoulder will detatch
-      Note: Two plastic spacers should also fall out
-3.  Removing the servo
-
-    - Remove and disconnect the boards and fans neccessary to access the shoulder servo from the inside, make sure to note any chords you detatch
-    - On the outside of the robot where the shoulder socket detatched, remove the four screws mounting the servo to the robots body
-    - There is a plastic holder inside the robot holding each shoulder servos in place, slide this towards the robots back to unclip the servos to allow it to fall freely out of its slot
-
-4.  Mechanically testing the servo
-    - Get an screw driver that fits the middle screw in the servo horn. Rotate the hornto test if the servo rotates freely without any clunks. If it doesn't rotate or is clunky, it needs replacing
-5.  Installing a new servo
-    <<<<<<< HEAD
-
-    - Get the new servo set with the same serial number on the box (e.g. MX64 or MX106)
-    - Connect the metal circular disk (horn) that came in the box on the new servo, ensuring you line up the indents on the metal disk and servo
-    - Before placing the servo into the robot it needs to be calibrated. Using the dynamixel wizard, confirm the correct baud rate and ID of the servo. You can also check that the servo is properly calibrated by setting the goal position to a couple of different values (0 degress, +90 degrees, -90 degrees) and ensuring the arrow on the horn (the three dots) are pointing in the correct direction. It is also worth testing that the servo behaves correctly around the 180 degree point (wheel mode), if you set the goal position to 170 degrees and then to 190 degrees it should take the long way around to get there.
-    - Place the servo into the body, put back the plastic holder and reconnect all the cords that were disconnected in the 'removing servo' step
-    - Rescrew the four screws that were taken out
-    - The arm of the robot should be staight and perpendicular to the body when the shoulder is set to 0 degrees. This means you need to orientate the server before placing the shoulder back on.
-      On the horn, there are three small indents in the metal, which form an arrow. The point of the arrow needs to be towards the front of the robot, and the two dots towards its back, this ensures the robots shoulder will be correctly aligned.
-
-6.  Reconstruction
-
-    - Now attach the shoulder back on, ensuring you put back the plastic spacers and leave one hole without a screw (the biggest hole in the circle of screws). The shoulder should also be placed on
-      with correct orientation. On the shoulder there is one side of raised up plastic, two sides with the holes for the screws and a shorter side. The side with the tall bit of plastic without screw holes should be faced frontwards,
-      the same direction the horn was orientated. The shoulder should look like it is on backwards.
-      ![shoulder orientation](./images/shoulder/shoulder_orientation2.jpg 'shoulder orientation')
-    - Feed the chord through the gap in the shoulder and connect the arm again to the slot between the shoulder and head
-    - slide the arm in place and rescrew the arm to the shoulder
-
-    Note: If you don't place the cords of the arm far enough into the shoulder, they will get caught and will limit the shoulder movements. If this happens, do not force the arm to move, but take apart the shoulder and redo the attatchment.
-
-7.  Testing
-
-    - # Now the shoulder needs to be tested using Open Dynamixel Wizard. This tests if the soulder was placed on correctly, or the servo has come out of alignment during the attatchment of the shoulder and arm.
-          - Get the new servo set with the same serial number on the box
-          - Connect the metal circular disk that came in the box on the new servo, ensuring you line up the indents on the metal disk and servo
-          - Place the servo into the body, put back the plastic holder and reconnect all the chords that were disconnected in the 'removing servo' step
-          - Rescrew the four screws that were taken out
-          - The arms of the robot should be directly outwards when set to 0 degrees. This means you need to orientate the server before placing the shoulder back on.
-          On the metal circular disk that was placed on, there are small indents in the metal, two on one side and one on the other.
-          The single indent needs to be towards the front of the robot, and the two dots towards its back, this ensures the robots shoulder will be correctly aligned.
-
-8.  Reconstruction
-
-    - Now attach the shoulder back on, ensuring you put back the plastic spacers and leave one hole without a screw (the biggest hole in the circle of screws). The shoulder should also be placed on
-      with correct orientation. On the shoulder there is one side of raised up plastic, two sides with the holes for the screws and a shorter side. The side with the shortest bit of plastic should be faced frontwards,
-      the same direction the metal circular disk was orientated.
-    - Connect the chord of the arm again to the slot between the shoulder and head
-    - slide the arm in place and rescrew the arm to the shoulder
-
-9.  Testing - Now the shoulder needs to be calibrated, see servo calibration for this.
-    > > > > > > > 8f25ae92838312b8020ba3e2a14bd2ceeaf324c5
+- On the shoulder of the robot, there is a ring of screws front and back. Remove all the screws and the larger centre screw on both sides
+- Remove the arm from the shoulder socket, it will still be attatched by a wire
+- Take off the long part of plastic between the shoudler and neck, it is held by two screws. This piece of plastic can be seen in the following photo:
+  ![shoulder cover](./images/shoulder/shoulder.jpg 'shoulder cover')
+- Now that the piece is off, there is a port for the chord that is still keeping the arm in place, detach this and the arm will be completely detatched
+
+2. Detatching the shoulder
+   - Looking in the shoulder socket there is another circle of screws, remove these and the shoulder will detatch
+     Note: Two plastic spacers should also fall out
+3. Removing the servo
+
+   - Remove and disconnect the boards and fans neccessary to access the shoulder servo from the inside, make sure to note any chords you detatch
+   - On the outside of the robot where the shoulder socket detatched, remove the four screws mounting the servo to the robots body
+   - There is a plastic holder inside the robot holding each shoulder servos in place, slide this towards the robots back to unclip the servos to allow it to fall freely out of its slot
+
+4. Mechanically testing the servo
+   - Get an screw driver that fits the middle screw in the servo horn. Rotate the hornto test if the servo rotates freely without any clunks. If it doesn't rotate or is clunky, it needs replacing
+5. Installing a new servo
+
+   - Get the new servo set with the same serial number on the box (e.g. MX64 or MX106)
+   - Connect the metal circular disk (horn) that came in the box on the new servo, ensuring you line up the indents on the metal disk and servo
+   - Before placing the servo into the robot it needs to be calibrated. Using the dynamixel wizard, confirm the correct baud rate and ID of the servo. You can also check that the servo is properly calibrated by setting the goal position to a couple of different values (0 degress, +90 degrees, -90 degrees) and ensuring the arrow on the horn (the three dots) are pointing in the correct direction. It is also worth testing that the servo behaves correctly around the 180 degree point (wheel mode), if you set the goal position to 170 degrees and then to 190 degrees it should take the long way around to get there.
+   - Place the servo into the body, put back the plastic holder and reconnect all the cords that were disconnected in the 'removing servo' step
+   - Rescrew the four screws that were taken out
+   - The arm of the robot should be staight and perpendicular to the body when the shoulder is set to 0 degrees. This means you need to orientate the server before placing the shoulder back on.
+     On the horn, there are three small indents in the metal, which form an arrow. The point of the arrow needs to be towards the front of the robot, and the two dots towards its back, this ensures the robots shoulder will be correctly aligned.
+
+6. Reconstruction
+
+   - Now attach the shoulder back on, ensuring you put back the plastic spacers and leave one hole without a screw (the biggest hole in the circle of screws). The shoulder should also be placed on
+     with correct orientation. On the shoulder there is one side of raised up plastic, two sides with the holes for the screws and a shorter side. The side with the tall bit of plastic without screw holes should be faced frontwards,
+     the same direction the horn was orientated. The shoulder should look like it is on backwards.
+     ![shoulder orientation](./images/shoulder/shoulder_orientation2.jpg 'shoulder orientation')
+   - Feed the chord through the gap in the shoulder and connect the arm again to the slot between the shoulder and head
+   - slide the arm in place and rescrew the arm to the shoulder
+
+   Note: If you don't place the cords of the arm far enough into the shoulder, they will get caught and will limit the shoulder movements. If this happens, do not force the arm to move, but take apart the shoulder and redo the attatchment.
+
+7. Testing
+
+- Now the shoulder needs to be tested using Open Dynamixel Wizard. This tests if the soulder was placed on correctly, or the servo has come out of alignment during the attatchment of the shoulder and arm.