Skip to content
Open
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
64 changes: 64 additions & 0 deletions src/opendisplay/models/advertisement.py
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,72 @@ def update(
timestamp=now,
)
)
if not prev.pressed and not curr.pressed:
events.append(
ButtonChangeEvent(
address=address,
byte_index=curr.byte_index,
event_type="button_down",
button_id=curr.button_id,
pressed=True,
press_count=curr.press_count,
previous_press_count=prev.press_count,
raw=curr.raw,
previous_raw=prev.raw,
timestamp=now,
)
)
events.append(
ButtonChangeEvent(
address=address,
byte_index=curr.byte_index,
event_type="button_up",
button_id=curr.button_id,
pressed=False,
press_count=curr.press_count,
previous_press_count=prev.press_count,
raw=curr.raw,
previous_raw=prev.raw,
timestamp=now,
)
)
continue

missed_short_press = (
curr.press_count > prev.press_count
and not prev.pressed
and not curr.pressed
)
if missed_short_press:
events.append(
ButtonChangeEvent(
address=address,
byte_index=curr.byte_index,
event_type="button_down",
button_id=curr.button_id,
pressed=True,
press_count=curr.press_count,
previous_press_count=prev.press_count,
raw=curr.raw,
previous_raw=prev.raw,
timestamp=now,
)
)
events.append(
ButtonChangeEvent(
address=address,
byte_index=curr.byte_index,
event_type="button_up",
button_id=curr.button_id,
pressed=False,
press_count=curr.press_count,
previous_press_count=prev.press_count,
raw=curr.raw,
previous_raw=prev.raw,
timestamp=now,
)
)

if prev.pressed != curr.pressed:
events.append(
ButtonChangeEvent(
Expand Down
38 changes: 38 additions & 0 deletions tests/unit/test_models_advertisement.py
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,44 @@ def test_advertisement_tracker_emits_button_events(self):
assert third_events[0].button_id == 2
assert third_events[0].pressed is False

def test_advertisement_tracker_emits_synthetic_press_on_missed_short_press(self):
"""Count can increase while released if press+release fell between adverts."""
tracker = AdvertisementTracker()
address = "AA:BB:CC:DD:EE:FF"

first = parse_advertisement(_v1_payload(bytes([0x0A]) + bytes(10), loop_counter=1)) # id=2, count=1, up
second = parse_advertisement(_v1_payload(bytes([0x12]) + bytes(10), loop_counter=2)) # id=2, count=2, up

assert tracker.update(address, first, timestamp=1.0) == []

events = tracker.update(address, second, timestamp=2.0)
assert [e.event_type for e in events] == ["button_down", "button_up", "press_count_changed"]
assert events[0].button_id == 2
assert events[0].pressed is True
assert events[1].pressed is False
assert events[2].press_count == 2
assert events[2].previous_press_count == 1

def test_advertisement_tracker_emits_synthetic_press_on_missed_slot_change(self):
"""Another button in the group may tap between adverts without a held state."""
tracker = AdvertisementTracker()
address = "AA:BB:CC:DD:EE:FF"

first = parse_advertisement(_v1_payload(bytes([0x0A]) + bytes(10), loop_counter=1)) # id=2, count=1, up
second = parse_advertisement(_v1_payload(bytes([0x09]) + bytes(10), loop_counter=2)) # id=1, count=1, up

assert tracker.update(address, first, timestamp=1.0) == []

events = tracker.update(address, second, timestamp=2.0)
assert [e.event_type for e in events] == [
"button_slot_changed",
"button_down",
"button_up",
]
assert events[0].button_id == 1
assert events[1].pressed is True
assert events[2].pressed is False


class TestTouchEventData:
"""Test TouchEventData parsing from dynamic data bytes."""
Expand Down
Loading