Jared Dohrman d3dbc0a063 Merge remote-tracking branch 'upstream/dev' into integrate-upstream-dev-2026-08-15 ...

# Conflicts:
#	src/helpers/ui/SH1106Display.cpp

2026-08-15 08:41:31 +10:00

..

ui-new

refactored companion interfaces to allow for multiple active connection modes

2026-07-28 03:18:54 +12:00

ui-orig

Fix X1 charge status LED always showing charged

2026-08-07 08:08:08 -05:00

ui-tiny

fix bluetooth toggle on ui tiny

2026-07-28 03:50:08 +12:00

AbstractUITask.h

refactored companion interfaces to allow for multiple active connection modes

2026-07-28 03:18:54 +12:00

DataStore.cpp

Merge remote-tracking branch 'upstream/dev' into integrate-upstream-dev-2026-08-09

2026-08-09 16:30:22 +10:00

DataStore.h

* new NodePrefs for companion

2026-07-17 16:05:10 +10:00

main.cpp

fix(companion-wifi): quiesce STA scanning so the recovery AP is joinable

2026-08-09 18:34:19 +10:00

MyMesh.cpp

Merge remote-tracking branch 'upstream/dev' into integrate-upstream-dev-2026-08-15

2026-08-15 08:41:31 +10:00

MyMesh.h

Merge remote-tracking branch 'upstream/dev' into integrate-upstream-dev-2026-08-15

2026-08-15 08:41:31 +10:00

NodePrefs.h

Merge remote-tracking branch 'upstream/dev' into integrate-upstream-dev-2026-08-15

2026-08-15 08:41:31 +10:00