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
34 changes: 28 additions & 6 deletions lib/lis2mdl/lis2mdl/device.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ def __init__(
self.writebuffer = bytearray(1)
self.readbuffer = bytearray(1)

self._temp_offset = LIS2MDL_TEMP_OFFSET
self._temp_gain = 1.0
self._temp_offset = 0.0
self._temp_base_offset = LIS2MDL_TEMP_OFFSET

# Perform a soft reset to ensure the sensor starts in a known state.
self._write_reg(LIS2MDL_CFG_REG_A, 0x20) # SOFT_RST=1 (not 0x10)
Expand Down Expand Up @@ -241,19 +243,39 @@ def read_temperature_c(self) -> float:
The LIS2MDL temperature sensor has no guaranteed absolute zero
point (see datasheet Table 4). The offset defaults to 25 °C
based on empirical observation (confirmed by Zephyr RTOS
PR #35912). Use ``set_temp_offset()`` to calibrate against a
reference thermometer.
PR #35912). Use ``set_temp_offset()`` or ``calibrate_temperature()``
to calibrate against a reference thermometer.
"""
return self._temp_offset + self.read_temperature_raw() / LIS2MDL_TEMP_SENSITIVITY
factory = self._temp_base_offset + self.read_temperature_raw() / LIS2MDL_TEMP_SENSITIVITY
return self._temp_gain * factory + self._temp_offset

def set_temp_offset(self, offset_c):
"""Set the temperature offset in °C for calibration.
"""Set a temperature offset in °C (gain remains 1.0).

Args:
offset_c: offset value in degrees Celsius (default is 25).
offset_c: offset value in degrees Celsius.
"""
self._temp_gain = 1.0
self._temp_offset = float(offset_c)

def calibrate_temperature(self, ref_low, measured_low, ref_high, measured_high):
"""Two-point calibration from reference measurements.

Computes gain and offset so that the sensor reading is adjusted
to match reference values at two temperature points.

Args:
ref_low: reference temperature at the low point (°C).
measured_low: sensor reading at the low point (°C).
ref_high: reference temperature at the high point (°C).
measured_high: sensor reading at the high point (°C).
"""
delta = float(measured_high - measured_low)
if delta == 0.0:
raise ValueError("measured_low and measured_high must differ")
self._temp_gain = float(ref_high - ref_low) / delta
self._temp_offset = float(ref_low) - self._temp_gain * float(measured_low)

# --- IDENTITY & HARDWARE OFFSETS ---

def read_who_am_i(self) -> int:
Expand Down
16 changes: 16 additions & 0 deletions tests/scenarios/lis2mdl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,22 @@ tests:
expect: 25.0
mode: [mock]

- name: "Temperature with offset"
action: script
script: |
dev.set_temp_offset(-2.0)
result = dev.read_temperature_c()
expect_range: [22.0, 24.0]
mode: [mock]

- name: "Temperature with two-point calibration"
action: script
script: |
dev.calibrate_temperature(20.0, 25.0, 30.0, 35.0)
result = dev.read_temperature_c()
expect_range: [19.0, 21.0]
mode: [mock]

- name: "Magnitude in plausible range"
action: call
method: magnitude_uT
Expand Down
Loading