Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions ardupilot_methodic_configurator/tempcal_imu.py
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,10 @@ def accel_at_temp(self, imu: int, axis: str, temperature: float) -> float:
if self.accel[imu]["T"][i] <= temperature <= self.accel[imu]["T"][i + 1]:
v1 = self.accel[imu][axis][i]
v2 = self.accel[imu][axis][i + 1]
p = (temperature - self.accel[imu]["T"][i]) / (self.accel[imu]["T"][i + 1] - self.accel[imu]["T"][i])
delta_t = self.accel[imu]["T"][i + 1] - self.accel[imu]["T"][i]
if delta_t == 0.0:
return float(v1)
p = (temperature - self.accel[imu]["T"][i]) / delta_t
return float(v1 + (v2 - v1) * p)
return float(self.accel[imu][axis][-1])

Expand All @@ -277,7 +280,11 @@ def gyro_at_temp(self, imu: int, axis: str, temperature: float) -> float:
if self.gyro[imu]["T"][i] <= temperature <= self.gyro[imu]["T"][i + 1]:
v1 = self.gyro[imu][axis][i]
v2 = self.gyro[imu][axis][i + 1]
p = (temperature - self.gyro[imu]["T"][i]) / (self.gyro[imu]["T"][i + 1] - self.gyro[imu]["T"][i])
delta_t = self.gyro[imu]["T"][i + 1] - self.gyro[imu]["T"][i]
if delta_t == 0.0:
return float(v1)
p = (temperature - self.gyro[imu]["T"][i]) / delta_t

return float(v1 + (v2 - v1) * p)
return float(self.gyro[imu][axis][-1])

Expand Down
37 changes: 37 additions & 0 deletions tests/test_tempcal_imu.py
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,43 @@ def test_accel_at_temp(self) -> None:
# Test above maximum temperature
value = self.data.accel_at_temp(0, "X", 40.0)
assert value == 2.0 # Should return last value
# Test above maximum temperature
value = self.data.accel_at_temp(0, "X", 40.0)
assert value == 2.0 # Should return last value

def test_accel_at_temp_duplicate_temperature_does_not_crash(self) -> None:
"""
Bug fix: ZeroDivisionError when two consecutive temperature readings are identical.

If IMU sensor stalls, T[i] == T[i+1], causing division by zero in interpolation.
Fixed by checking delta_t == 0.0 and returning the current value instead.
"""
self.data.add_accel(0, 25.0, 1.0, Vector3(1.0, 2.0, 3.0))
self.data.add_accel(0, 25.0, 2.0, Vector3(1.5, 2.5, 3.5)) # duplicate temperature
self.data.add_accel(0, 30.0, 3.0, Vector3(2.0, 3.0, 4.0))

try:
value = self.data.accel_at_temp(0, "X", 25.0)
assert isinstance(value, float)
except ZeroDivisionError as e:
self.fail(f"accel_at_temp raised ZeroDivisionError with duplicate temperatures: {e}")

def test_gyro_at_temp_duplicate_temperature_does_not_crash(self) -> None:
"""
Bug fix: ZeroDivisionError when two consecutive temperature readings are identical.

If IMU sensor stalls, T[i] == T[i+1], causing division by zero in interpolation.
Fixed by checking delta_t == 0.0 and returning the current value instead.
"""
self.data.add_gyro(0, 25.0, 1.0, Vector3(0.1, 0.2, 0.3))
self.data.add_gyro(0, 25.0, 2.0, Vector3(0.15, 0.25, 0.35)) # duplicate temperature
self.data.add_gyro(0, 30.0, 3.0, Vector3(0.2, 0.3, 0.4))

try:
value = self.data.gyro_at_temp(0, "X", 25.0)
assert isinstance(value, float)
except ZeroDivisionError as e:
self.fail(f"gyro_at_temp raised ZeroDivisionError with duplicate temperatures: {e}")


class TestUtilityFunctions(unittest.TestCase):
Expand Down
Loading