The companion protocol reports only a battery voltage, so charging is a voltage-trend inference. Some devices could instead expose the standard GATT Battery Service (0x180F) whose Battery Level Status characteristic (0x2BED, Battery Service 1.1) carries a real, firmware-reported charging flag. Dumping the GATT table shows no current MeshCore build implements it — the BLE profile is just the Nordic UART pipe plus DFU — but wire it up now so it lights up automatically the day one does. get_hw_charging() reads 0x2BED best-effort over BLE (reaching the bleak client the forced-teardown path already uses) and prefers its flag; any failure — service absent, read refused, short value, non-BLE transport — is a quiet None, so the poller falls back to the inference and every current device behaves exactly as before. Verified against a live device: the read resolves and returns a clean, steady None. The 0x2BED bitfield decode is a pure function unit-tested against the spec's Charge State enum so the parse is correct ahead of any hardware that populates it. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
237 lines
10 KiB
Python
237 lines
10 KiB
Python
"""Battery gauge tests: the LiPo curve, the one-cell braille glyph, and the poller.
|
|
|
|
The widget is pure (percent + flags → a coloured glyph) and the poller runs against a
|
|
fake context, so charge estimation, the charging sweep, the low-battery blink, and the
|
|
charging inference are all assertable without a device or a terminal.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import time
|
|
from types import SimpleNamespace
|
|
|
|
from meshterm.core.connection import charging_from_battery_level_status
|
|
from meshterm.services.battery_service import (
|
|
_BATTERY_PRESENT_FLOOR_MV,
|
|
POLL_S,
|
|
BatteryService,
|
|
battery_percent,
|
|
)
|
|
from meshterm.ui.widgets import _BATTERY_CRITICAL, battery_cell
|
|
|
|
# --- the LiPo state-of-charge curve -------------------------------------------------------
|
|
|
|
|
|
def test_battery_percent_clamps_past_either_end() -> None:
|
|
"""Above the top rung reads 100%, below the bottom rung reads 0%."""
|
|
assert battery_percent(4300) == 100
|
|
assert battery_percent(4200) == 100
|
|
assert battery_percent(3270) == 0
|
|
assert battery_percent(3000) == 0
|
|
|
|
|
|
def test_battery_percent_interpolates_and_stays_monotonic() -> None:
|
|
"""A rung reads exactly; between rungs interpolates; more volts is never less charge."""
|
|
assert battery_percent(3840) == 50 # an exact rung
|
|
assert 40 < battery_percent(3810) < 45 # between the 3820/45 and 3800/40 rungs
|
|
pcts = [battery_percent(mv) for mv in range(3270, 4201, 10)]
|
|
assert pcts == sorted(pcts)
|
|
|
|
|
|
# --- the one-cell braille glyph -----------------------------------------------------------
|
|
|
|
|
|
def test_battery_cell_fills_from_the_bottom_by_tier() -> None:
|
|
"""Each tier drops dot rows off the top: full, six, four, two dots lit."""
|
|
assert battery_cell(100).plain[0] == "⣿" # all 8 dots
|
|
assert battery_cell(90).plain[0] == "⣿"
|
|
assert battery_cell(60).plain[0] == chr(0x2800 | 0xF6) # bottom 6 dots
|
|
assert battery_cell(30).plain[0] == chr(0x2800 | 0xE4) # bottom 4 dots
|
|
assert battery_cell(10).plain[0] == chr(0x2800 | 0xC0) # bottom 2 dots
|
|
|
|
|
|
def test_battery_cell_shows_the_true_percent() -> None:
|
|
"""The number beside the glyph is the actual charge."""
|
|
assert battery_cell(42).plain == chr(0x2800 | 0xE4) + " 42%"
|
|
|
|
|
|
def test_battery_cell_colours_by_tier() -> None:
|
|
"""Green healthy, orange at a quarter, red near empty — the fuel-gauge palette."""
|
|
assert str(battery_cell(90).style) == "batt.high" # green
|
|
assert str(battery_cell(60).style) == "batt.high" # green
|
|
assert str(battery_cell(30).style) == "batt.mid" # orange
|
|
assert str(battery_cell(5).style) == "batt.low" # red
|
|
|
|
|
|
def test_battery_cell_blinks_when_critically_low() -> None:
|
|
"""Below the critical line the red glyph flickers to a dim slate on alternate frames."""
|
|
assert 5 <= _BATTERY_CRITICAL
|
|
assert str(battery_cell(5, frame=0).style) == "batt.low" # the on-beat, red
|
|
assert str(battery_cell(5, frame=1).style) == "batt.dim" # the off-beat, dim
|
|
# Above the critical line the glyph never blinks.
|
|
assert {str(battery_cell(40, frame=f).style) for f in range(4)} == {"batt.mid"}
|
|
|
|
|
|
def test_battery_cell_charging_sweeps_bottom_to_full_holding_the_percent() -> None:
|
|
"""Charging animates the fill empty→full on a loop while the % stays the true charge."""
|
|
fills = [battery_cell(20, charging=True, frame=f).plain[0] for f in range(6)]
|
|
assert fills[0] == chr(0x2800) # empty
|
|
assert fills[4] == "⣿" # full
|
|
assert fills[5] == fills[0] # loops back
|
|
assert battery_cell(20, charging=True, frame=4).plain.endswith(" 20%")
|
|
# The charge colour tracks the real state of charge (20% → red), held across the sweep.
|
|
assert {str(battery_cell(20, charging=True, frame=f).style) for f in range(6)} == {"batt.low"}
|
|
|
|
|
|
# --- the poller ---------------------------------------------------------------------------
|
|
|
|
|
|
def _service(levels, hw_charging=None) -> BatteryService:
|
|
"""A ``BatteryService`` over a fake context whose device answers ``levels`` in turn.
|
|
|
|
``hw_charging`` is what the device's firmware charging flag reports each poll — ``None``
|
|
(the default, and every real MeshCore device) means "no flag", so the poller infers.
|
|
"""
|
|
seq = list(levels)
|
|
|
|
async def get_battery() -> dict:
|
|
return {"level": seq.pop(0)} if seq else {}
|
|
|
|
async def get_hw_charging():
|
|
return hw_charging
|
|
|
|
async def device() -> SimpleNamespace:
|
|
return SimpleNamespace(get_battery=get_battery, get_hw_charging=get_hw_charging)
|
|
|
|
ctx = SimpleNamespace(
|
|
is_connected=True,
|
|
device=device,
|
|
log=SimpleNamespace(info=lambda *a, **k: None, debug=lambda *a, **k: None),
|
|
)
|
|
return BatteryService(ctx)
|
|
|
|
|
|
def test_battery_poller_reads_and_estimates() -> None:
|
|
"""One pass reads the pack and caches a charge estimate; charging is off with one sample."""
|
|
svc = _service([3840]) # 50%
|
|
asyncio.run(svc._poll())
|
|
reading = svc.reading()
|
|
assert reading is not None
|
|
assert reading.millivolts == 3840 and reading.percent == 50 and reading.charging is False
|
|
|
|
|
|
def test_battery_poller_hides_a_device_with_no_pack() -> None:
|
|
"""An empty or sub-floor level reads as *no battery*, so the header shows nothing."""
|
|
svc = _service([0])
|
|
asyncio.run(svc._poll())
|
|
assert svc.reading() is None
|
|
svc = _service([_BATTERY_PRESENT_FLOOR_MV - 1])
|
|
asyncio.run(svc._poll())
|
|
assert svc.reading() is None
|
|
|
|
|
|
def _history_of(now: float, mvs: list[int]) -> list[tuple[float, int]]:
|
|
"""``(time, mv)`` samples one poll apart, oldest first, the last landing at ``now``."""
|
|
n = len(mvs)
|
|
return [(now - (n - 1 - i) * POLL_S, mv) for i, mv in enumerate(mvs)]
|
|
|
|
|
|
def test_battery_poller_calls_charging_only_on_a_strong_sustained_rise() -> None:
|
|
"""A large, sustained climb reads as charging; a gentle one only holds a verdict already set."""
|
|
svc = _service([])
|
|
now = 1000.0
|
|
|
|
# A clear, sustained rise from a cold (not-charging) start crosses the ON threshold.
|
|
svc._history.extend(_history_of(now, [3700, 3712, 3724, 3736, 3748, 3760, 3772, 3784]))
|
|
assert svc._charging(now) is True
|
|
|
|
# A gentle climb (over the hold floor, under the start floor) will not *start* a verdict…
|
|
svc._reading = SimpleNamespace(charging=False)
|
|
svc._history.clear()
|
|
svc._history.extend(_history_of(now, [3900, 3902, 3904, 3915, 3917, 3919]))
|
|
assert svc._charging(now) is False
|
|
# …but it *holds* one already in flight, so a real charge doesn't flicker on poll jitter.
|
|
svc._reading = SimpleNamespace(charging=True)
|
|
assert svc._charging(now) is True
|
|
|
|
|
|
def test_battery_poller_charging_ignores_load_sag_and_flat_or_falling_packs() -> None:
|
|
"""A transient TX sag, a flat pack, and a falling pack all read as *not charging*."""
|
|
svc = _service([])
|
|
now = 1000.0
|
|
|
|
# A single deep TX sag at the window's start would fool a raw first-to-last diff into
|
|
# seeing a +60 mV "rise"; the median of each half discards the spike, so it does not.
|
|
svc._reading = SimpleNamespace(charging=False)
|
|
svc._history.extend(_history_of(now, [3740, 3802, 3798, 3801, 3800, 3799, 3802, 3800]))
|
|
assert svc._charging(now) is False
|
|
|
|
# A pack held flat (topped off, or unplugged) drops a charging verdict back off.
|
|
svc._reading = SimpleNamespace(charging=True)
|
|
svc._history.clear()
|
|
svc._history.extend(_history_of(now, [3800, 3801, 3800, 3799, 3800, 3801]))
|
|
assert svc._charging(now) is False
|
|
|
|
# A clear discharge never reads as charging.
|
|
svc._reading = SimpleNamespace(charging=True)
|
|
svc._history.clear()
|
|
svc._history.extend(_history_of(now, [3900, 3890, 3880, 3870, 3860, 3850]))
|
|
assert svc._charging(now) is False
|
|
|
|
# Too little history to span the window is *not charging*, whatever the last verdict.
|
|
svc._reading = SimpleNamespace(charging=True)
|
|
svc._history.clear()
|
|
svc._history.extend(_history_of(now, [3800, 3900]))
|
|
assert svc._charging(now) is False
|
|
|
|
|
|
# --- the standard BLE charging flag (GATT Battery Level Status, 0x2BED) --------------------
|
|
|
|
|
|
def _level_status(charge_state: int, *, flags: int = 0, extra: bytes = b"") -> bytes:
|
|
"""A Battery Level Status value: flags byte, the Power State word, then optional tail."""
|
|
power_state = (charge_state & 0b11) << 5
|
|
return bytes([flags]) + power_state.to_bytes(2, "little") + extra
|
|
|
|
|
|
def test_charging_flag_decodes_the_charge_state_field() -> None:
|
|
"""The 2-bit Charge State enum maps to charging / not / unknown per the GSS."""
|
|
assert charging_from_battery_level_status(_level_status(1)) is True # charging
|
|
assert charging_from_battery_level_status(_level_status(2)) is False # discharging (active)
|
|
assert charging_from_battery_level_status(_level_status(3)) is False # discharging (inactive)
|
|
assert charging_from_battery_level_status(_level_status(0)) is None # unknown → infer
|
|
|
|
|
|
def test_charging_flag_reads_only_the_power_state_word() -> None:
|
|
"""Other Power State bits and the optional identifier/level tail don't sway the verdict."""
|
|
# Battery present + wired external power + charging, with identifier & level bytes trailing.
|
|
value = _level_status(1, flags=0b011, extra=b"\xab\xcd\x50")
|
|
assert charging_from_battery_level_status(value) is True
|
|
# A short value (no room for the Power State word) is unknown, never a guess.
|
|
assert charging_from_battery_level_status(b"\x00") is None
|
|
assert charging_from_battery_level_status(b"") is None
|
|
|
|
|
|
def test_battery_poller_prefers_the_hardware_charging_flag_over_inference() -> None:
|
|
"""A firmware charging flag wins over the voltage-trend guess, in both directions."""
|
|
now = time.monotonic()
|
|
rising = [3700, 3712, 3724, 3736, 3748, 3760, 3772, 3784]
|
|
|
|
# Baseline: with no hardware flag the rising trend is *inferred* as charging.
|
|
svc = _service([3900], hw_charging=None)
|
|
svc._history.extend(_history_of(now, rising))
|
|
asyncio.run(svc._poll())
|
|
assert svc.reading().charging is True
|
|
|
|
# Same rising trend, but the hardware reports NOT charging → the flag overrides the guess.
|
|
svc = _service([3900], hw_charging=False)
|
|
svc._history.extend(_history_of(now, rising))
|
|
asyncio.run(svc._poll())
|
|
assert svc.reading().charging is False
|
|
|
|
# And a hardware "charging" wins with no trend at all, where inference would say not.
|
|
svc = _service([3900], hw_charging=True)
|
|
asyncio.run(svc._poll())
|
|
assert svc.reading().charging is True
|