diff --git a/lerobot/common/robot_devices/motors/feetech.py b/lerobot/common/robot_devices/motors/feetech.py
index 441d1ee0..d3024f20 100644
--- a/lerobot/common/robot_devices/motors/feetech.py
+++ b/lerobot/common/robot_devices/motors/feetech.py
@@ -140,33 +140,27 @@ def convert_steps_to_degrees(steps: int | np.ndarray, models: list[str]) -> np.n
     return degrees
 
 
-def adjusted__to_homing_ticks(
-    raw_motor_ticks: int | np.ndarray, encoder_offset: int, models: list[str]
-) -> np.ndarray:
+def adjusted_to_homing_ticks(raw_motor_ticks: int, encoder_offset: int, model: str) -> int:
     """
     raw_motor_ticks : int in [0..4095]  (the homed, shifted value)
     encoder_offset : int (the offset computed so that `home` becomes zero)
     Returns the homed servo ticks in [-2048 .. +2047].
     """
-    resolutions = np.array([MODEL_RESOLUTION[m] for m in models], dtype=float)
-    raw_motor_ticks = np.asarray(raw_motor_ticks)
+    resolutions = MODEL_RESOLUTION[model]
     shifted = (raw_motor_ticks + encoder_offset) % resolutions
-    shifted = np.where(shifted > 2047, shifted - 4096, shifted)
+    shifted = shifted - 4096 if shifted > 2047 else shifted
     return shifted
 
 
-def adjusted_to_motor_ticks(
-    adjusted_pos: int | np.ndarray, encoder_offset: int, models: list[str]
-) -> np.ndarray:
+def adjusted_to_motor_ticks(adjusted_pos: int, encoder_offset: int, model: str) -> int:
     """
-    Inverse of read_adjusted_position().
+    Inverse of adjusted_to_homing_ticks().
     adjusted_pos : int in [-2048 .. +2047]  (the homed, shifted value)
     encoder_offset : int (the offset computed so that `home` becomes zero)
     Returns the raw servo ticks in [0..4095].
     """
-    resolutions = np.array([MODEL_RESOLUTION[m] for m in models], dtype=float)
-    adjusted_pos = np.asarray(adjusted_pos)
-    adjusted_pos = np.where(adjusted_pos < 0, adjusted_pos + 4096, adjusted_pos)
+    resolutions = MODEL_RESOLUTION[model]
+    adjusted_pos = adjusted_pos + 4096 if adjusted_pos < 0 else adjusted_pos
     raw_ticks = (adjusted_pos - encoder_offset) % resolutions
     return raw_ticks
 
@@ -335,7 +329,8 @@ class FeetechMotorsBus:
         self.group_writers = {}
         self.logs = {}
 
-        self.track_positions = {}
+        # TODO(pepijn): Add multi turn support
+        self.multi_turn_index = self.multi_turn_index = [0] * len(motors)
 
     def connect(self):
         if self.is_connected:
@@ -450,7 +445,7 @@ class FeetechMotorsBus:
                 _, model = self.motors[name]
 
                 # Convert raw motor ticks to homed ticks, then convert the homed ticks to degrees
-                values[i] = adjusted__to_homing_ticks(values[i], homing_offset, [model])
+                values[i] = adjusted_to_homing_ticks(values[i], homing_offset, model)
                 values[i] = convert_steps_to_degrees(values[i], [model])
 
                 # Update direction of rotation of the motor to match between leader and follower.
@@ -507,7 +502,7 @@ class FeetechMotorsBus:
 
                 # Convert degrees to homed ticks, then convert the homed ticks to raw ticks
                 values[i] = convert_degrees_to_steps(values[i], [model])
-                values[i] = adjusted_to_motor_ticks(values[i], homing_offset, [model])
+                values[i] = adjusted_to_motor_ticks(values[i], homing_offset, model)
 
                 # Remove drive mode, which is the rotation direction of the motor, to come back to
                 # actual motor rotation direction which can be arbitrary.
diff --git a/lerobot/common/robot_devices/robots/feetech_calibration.py b/lerobot/common/robot_devices/robots/feetech_calibration.py
index c1734c09..56d1ed1c 100644
--- a/lerobot/common/robot_devices/robots/feetech_calibration.py
+++ b/lerobot/common/robot_devices/robots/feetech_calibration.py
@@ -128,16 +128,19 @@ def run_full_arm_calibration(arm: MotorsBus, robot_type: str, arm_name: str, arm
     end_positions = np.zeros(len(arm.motor_indices))
     encoder_offsets = np.zeros(len(arm.motor_indices))
 
-    # Call single motor calibration for each motor id
-    for i, id in enumerate(arm.motor_indices):
-        if id == 6:
-            start_positions[i], end_positions[i] = calibrate_linear_motor(id, arm)
-            encoder_offsets[i] = 0
-        else:
-            encoder_offsets[i] = calibrate_homing_motor(id, arm)
+    modes = get_calibration_modes(arm)
+
+    for i, motor_id in enumerate(arm.motor_indices):
+        if modes[i] == CalibrationMode.DEGREE.name:
+            encoder_offsets[i] = calibrate_homing_motor(motor_id, arm)
             start_positions[i] = 0
             end_positions[i] = 0
 
+    for i, motor_id in enumerate(arm.motor_indices):
+        if modes[i] == CalibrationMode.LINEAR.name:
+            start_positions[i], end_positions[i] = calibrate_linear_motor(motor_id, arm)
+            encoder_offsets[i] = 0
+
     print("\nMove arm to rest position")
     input("Press Enter to continue...")