Skip to content

Commit f9aa4a4

Browse files
committed
drivers: Standardize read and measurement method naming.
1 parent 6da03de commit f9aa4a4

12 files changed

Lines changed: 38 additions & 41 deletions

File tree

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ i2c = machine.I2C(1)
250250
apds = APDS9960(i2c)
251251

252252
apds.enable_light_sensor()
253-
light = apds.read_ambient_light()
253+
light = apds.ambient_light()
254254

255255
```
256256

@@ -476,6 +476,7 @@ lib/<component>/
476476
- **Reset methods**: `reset()` for hardware reset (pin toggle), `soft_reset()` for software reset (register write), `reboot()` for memory reboot (reload trimming).
477477
- **Power methods**: `power_on()` / `power_off()`. All drivers must implement both.
478478
- **Status methods**: `_status()` returns the raw status register as an int (private), `data_ready()` returns True when all channels have new data, `<measurement>_ready()` for per-channel readiness (e.g. `temperature_ready()`, `pressure_ready()`).
479+
- **Measurement methods**: bare noun for the main unit (`temperature()`, `humidity()`, `pressure()`), `read()` for combined reading returning a tuple, `<measurement>_raw()` for raw register values. No `read_` prefix on individual measurements.
479480

480481
### Linting
481482

lib/apds9960/apds9960/device.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ def is_gesture_available(self):
169169
return val == APDS9960_BIT_GVALID
170170

171171
# processes a gesture event and returns best guessed gesture
172-
def read_gesture(self):
172+
def gesture(self):
173173
fifo_level = 0
174174
fifo_data = []
175175

@@ -258,7 +258,7 @@ def _ensure_proximity_enabled(self):
258258
raise OSError("APDS9960 proximity data ready timeout")
259259

260260
# reads the ambient (clear) light level as a 16-bit value
261-
def read_ambient_light(self):
261+
def ambient_light(self):
262262
self._ensure_light_enabled()
263263
# read value from clear channel, low byte register
264264
low = self._read_reg(APDS9960_REG_CDATAL)
@@ -269,7 +269,7 @@ def read_ambient_light(self):
269269
return low + (high << 8)
270270

271271
# reads the red light level as a 16-bit value
272-
def read_red_light(self):
272+
def red_light(self):
273273
self._ensure_light_enabled()
274274
# read value from red channel, low byte register
275275
low = self._read_reg(APDS9960_REG_RDATAL)
@@ -280,7 +280,7 @@ def read_red_light(self):
280280
return low + (high << 8)
281281

282282
# reads the green light level as a 16-bit value
283-
def read_green_light(self):
283+
def green_light(self):
284284
self._ensure_light_enabled()
285285
# read value from green channel, low byte register
286286
low = self._read_reg(APDS9960_REG_GDATAL)
@@ -291,7 +291,7 @@ def read_green_light(self):
291291
return low + (high << 8)
292292

293293
# reads the blue light level as a 16-bit value
294-
def read_blue_light(self):
294+
def blue_light(self):
295295
self._ensure_light_enabled()
296296
# read value from blue channel, low byte register
297297
low = self._read_reg(APDS9960_REG_BDATAL)
@@ -306,7 +306,7 @@ def read_blue_light(self):
306306
# *******************************************************************************
307307

308308
# reads the proximity level as an 8-bit value
309-
def read_proximity(self):
309+
def proximity(self):
310310
self._ensure_proximity_enabled()
311311
return self._read_reg(APDS9960_REG_PDATA)
312312

lib/apds9960/examples/ambient_light.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
oval = -1
1616
while True:
1717
sleep(0.25)
18-
val = apds.read_ambient_light()
18+
val = apds.ambient_light()
1919
if val != oval:
2020
print("AmbientLight={}".format(val))
2121
oval = val

lib/apds9960/examples/gesture.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,5 @@
3636
while True:
3737
sleep(0.5)
3838
if apds.is_gesture_available():
39-
motion = apds.read_gesture()
39+
motion = apds.gesture()
4040
print("Gesture={}".format(dirs.get(motion, "unknown")))

lib/apds9960/examples/proximity.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
oval = -1
1818
while True:
1919
sleep(0.25)
20-
val = apds.read_proximity()
20+
val = apds.proximity()
2121
if val != oval:
2222
print("proximity={}".format(val))
2323
oval = val

lib/hts221/hts221/device.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,3 @@ def calibrate_temperature(self, ref_low, measured_low, ref_high, measured_high):
193193
raise ValueError("measured_low and measured_high must differ")
194194
self._temp_gain = float(ref_high - ref_low) / delta
195195
self._temp_offset = float(ref_low) - self._temp_gain * float(measured_low)
196-
197-
def get(self):
198-
h, t = self.read()
199-
return [h, t]

lib/lis2mdl/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ Expected value: `0x40`
181181
### Read temperature (approximate)
182182

183183
```python
184-
print("Temperature (°C):", mag.read_temperature_c())
184+
print("Temperature (°C):", mag.temperature())
185185
```
186186

187187
### Check data readiness
@@ -209,7 +209,7 @@ print("Register dump:", regs)
209209
| `read_magnet_calibrated_norm()` | Calibrated and normalized data |
210210
| `heading_flat_only()` | Flat compass heading |
211211
| `heading_with_tilt_compensation()` | Tilt-corrected heading |
212-
| `read_temperature_c()` | Read relative temperature |
212+
| `temperature()` | Read relative temperature |
213213
| `power_on()` / `power_off()` | Power management |
214214
| `soft_reset()` / `reboot()` | Sensor reset functions |
215215

lib/lis2mdl/examples/magnet_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,9 +281,9 @@ def test_reads(dev):
281281
ok &= ok_cal_rng
282282

283283
# TEMP
284-
t1 = dev.read_temperature_c()
284+
t1 = dev.temperature()
285285
sleep_ms(50)
286-
t2 = dev.read_temperature_c()
286+
t2 = dev.temperature()
287287
print(f"TempC: t1={t1:.2f}°C, t2={t2:.2f}°C (8 LSB/°C, absolute offset unknown)")
288288
# test: type & broad plausible range
289289
ok_temp = (

lib/lis2mdl/lis2mdl/device.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ def read_temperature_raw(self) -> int:
249249
v = (hi << 8) | lo
250250
return v - 0x10000 if (v & 0x8000) else v
251251

252-
def read_temperature_c(self) -> float:
252+
def temperature(self) -> float:
253253
"""Temperature in °C (8 LSB/°C + empirical offset).
254254
255255
The LIS2MDL temperature sensor has no guaranteed absolute zero
@@ -330,7 +330,7 @@ def read_all(self) -> dict:
330330
raw = self.read_magnet_raw()
331331
mag_ut = self.read_magnet_uT()
332332
cal = self.read_magnet_calibrated_norm()
333-
temp = self.read_temperature_c()
333+
temp = self.temperature()
334334
st = self._status()
335335
return {"raw": raw, "uT": mag_ut, "cal_norm": cal, "tempC": temp, "status": st}
336336

tests/scenarios/apds9960.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,19 @@ tests:
6969

7070
- name: "Read ambient light returns expected value"
7171
action: call
72-
method: read_ambient_light
72+
method: ambient_light
7373
expect: 256
7474
mode: [mock]
7575

7676
- name: "Read proximity returns expected value"
7777
action: call
78-
method: read_proximity
78+
method: proximity
7979
expect: 80
8080
mode: [mock]
8181

8282
- name: "Read red light returns expected value"
8383
action: call
84-
method: read_red_light
84+
method: red_light
8585
expect: 128
8686
mode: [mock]
8787

@@ -92,7 +92,7 @@ tests:
9292
script: |
9393
dev.disable_light_sensor()
9494
i2c.clear_write_log()
95-
dev.read_ambient_light()
95+
dev.ambient_light()
9696
log = i2c.get_write_log()
9797
wrote_enable = any(reg == 0x80 for reg, data in log)
9898
enable_val = dev.get_mode()
@@ -107,7 +107,7 @@ tests:
107107
script: |
108108
dev.disable_proximity_sensor()
109109
i2c.clear_write_log()
110-
dev.read_proximity()
110+
dev.proximity()
111111
log = i2c.get_write_log()
112112
wrote_enable = any(reg == 0x80 for reg, data in log)
113113
enable_val = dev.get_mode()
@@ -122,7 +122,7 @@ tests:
122122
script: |
123123
dev.power_off()
124124
i2c.clear_write_log()
125-
dev.read_red_light()
125+
dev.red_light()
126126
log = i2c.get_write_log()
127127
wrote_enable = any(reg == 0x80 for reg, data in log)
128128
enable_val = dev.get_mode()
@@ -137,7 +137,7 @@ tests:
137137
script: |
138138
dev.enable_light_sensor(False)
139139
i2c.clear_write_log()
140-
dev.read_ambient_light()
140+
dev.ambient_light()
141141
log = i2c.get_write_log()
142142
result = len(log) == 0
143143
expect_true: true
@@ -147,23 +147,23 @@ tests:
147147

148148
- name: "Ambient light in plausible range"
149149
action: call
150-
method: read_ambient_light
150+
method: ambient_light
151151
expect_range: [1, 65535]
152152
mode: [hardware]
153153

154154
- name: "Proximity in plausible range"
155155
action: call
156-
method: read_proximity
156+
method: proximity
157157
expect_range: [0, 255]
158158
mode: [hardware]
159159

160160
- name: "Light and proximity values feel correct"
161161
action: manual
162162
display:
163-
- method: read_ambient_light
163+
- method: ambient_light
164164
label: "Ambient light"
165165
unit: ""
166-
- method: read_proximity
166+
- method: proximity
167167
label: "Proximity"
168168
unit: ""
169169
prompt: "Les valeurs de lumière ambiante et de proximité sont-elles cohérentes ?"

0 commit comments

Comments
 (0)