discountchubbs aa74e67330 # Conflicts: ...

#	selfdrive/ui/layouts/main.py
#	selfdrive/ui/sunnypilot/layouts/settings/cruise.py
#	selfdrive/ui/sunnypilot/layouts/settings/display.py
#	selfdrive/ui/sunnypilot/layouts/settings/models.py
#	selfdrive/ui/sunnypilot/layouts/settings/navigation.py
#	selfdrive/ui/sunnypilot/layouts/settings/osm.py
#	selfdrive/ui/sunnypilot/layouts/settings/steering.py
#	selfdrive/ui/sunnypilot/layouts/settings/sunnylink.py
#	selfdrive/ui/sunnypilot/layouts/settings/trips.py
#	selfdrive/ui/sunnypilot/layouts/settings/vehicle.py
#	selfdrive/ui/sunnypilot/layouts/settings/visuals.py
#	system/ui/sunnypilot/widgets/option_control.py

2025-11-21 16:25:58 -08:00

..

api

Merge branch 'upstream/openpilot/master' into sync-20251114

2025-11-16 02:50:28 -05:00

mock

controlsd: use livePose (#33283)

2024-08-13 21:11:16 -07:00

tests

Merge branch 'upstream/openpilot/master' into sync-20251114

2025-11-16 02:50:28 -05:00

transformations

dmonitoringmodeld: use cl transform without tinygrad (#34266)

2024-12-16 16:29:06 -08:00

__init__.py

common folder

2020-01-17 10:28:44 -08:00

.gitignore

common folder

2020-01-17 10:28:44 -08:00

basedir.py

ruff: check newline (#30668)

2023-12-09 13:24:18 -08:00

clutil.cc

clutil: remove deprecated and unused code (#34793)

2025-03-06 10:17:11 -08:00

clutil.h

clutil: remove deprecated and unused code (#34793)

2025-03-06 10:17:11 -08:00

constants.py

refactor: cleanup gravity constant handling (#35866)

2025-08-02 11:20:18 -07:00

filter_simple.py

common: add BounceFilter

2025-11-18 10:42:06 -08:00

git.py

merge a bunch of misc stuff into common.utils (#36463)

2025-10-24 20:45:56 -07:00

gpio.py

sensord: rewrite in Python (#35353)

2025-05-30 13:31:07 -07:00

gps.py

timed: use gps location packet for time (#33306)

2024-08-22 23:30:29 -07:00

logging_extra.py

no more pylint (#35418)

2025-06-01 16:34:22 -07:00

markdown.py

Replace markdown-it-py with small function in common/ (#32664)

2024-06-08 15:39:26 -07:00

mat.h

cpplint: add filter whitespace/tab (#29588)

2023-08-24 08:06:58 -07:00

model.h

Merge branch 'upstream/openpilot/master' into sync-20251114

2025-11-16 02:50:28 -05:00

params_keys.h

# Conflicts:

2025-11-21 16:25:58 -08:00

params_pyx.pyx

Merge branch 'upstream/openpilot/master' into sync-20250809

2025-08-10 02:05:05 -04:00

params.cc

Merge branch 'upstream/openpilot/master' into sync-20250731

2025-08-02 00:21:14 -04:00

params.h

Merge branch 'upstream/openpilot/master' into sync-20250731

2025-08-02 00:21:14 -04:00

params.py

auto type cast for Params (#35786)

2025-07-22 19:30:47 -07:00

pid.py

PID: no more ff gain (#36398)

2025-10-18 11:12:47 -07:00

prefix.h

macos: use /tmp instead of /dev/shm (#34097)

2024-12-04 10:51:09 -08:00

prefix.py

process replay: create openpilot prefix directories once (#35864)

2025-07-31 23:42:02 -07:00

queue.h

Merge common/ and selfdrive/common (#24556)

2022-05-18 14:11:57 -07:00

ratekeeper.cc

cpplint: build/include_what_you_use (#29556)

2023-08-23 13:25:17 -07:00

ratekeeper.h

common/ratekeeper: change frame() return type from double to uint64_t (#32679)

2024-06-10 13:37:50 -07:00

realtime.py

Reapply "Mypy: Got passing on macos (#34591)" (#35126) (#35153)

2025-05-07 19:11:37 -07:00

SConscript

rm watchdog (#36425)

2025-10-22 15:36:09 -07:00

simple_kalman.py

Cython KF1D to Python (#30773)

2023-12-16 23:45:28 -08:00

spinner.py

ui: switch spinner and text window back to standalone process (#35470)

2025-06-06 13:20:05 -07:00

stat_live.py

ruff: enable UP

2024-05-20 17:43:54 -07:00

swaglog.cc

version: a new beginning (#1411)

2025-10-21 17:12:57 -04:00

swaglog.h

cpplint: add readability/braces filter (#29554)

2023-08-23 10:13:46 -07:00

swaglog.py

separate car logger forwarded to cloudlog (#33170)

2024-08-05 12:31:31 -07:00

text_window.py

ui: switch spinner and text window back to standalone process (#35470)

2025-06-06 13:20:05 -07:00

time_helpers.py

slightly more robust time validity check

2025-02-21 10:22:19 -08:00

timeout.py

Convert format strings strings to f-strings (#23241)

2021-12-16 14:58:17 +01:00

timing.h

Merge common/ and selfdrive/common (#24556)

2022-05-18 14:11:57 -07:00

util.cc

improved safe_ioctl (#35908)

2025-08-04 13:25:24 -07:00

util.h

ui: Speed Limit Information (#995)

2025-09-20 01:01:08 -04:00

util.py

sensord: rewrite in Python (#35353)

2025-05-30 13:31:07 -07:00

utils.py

merge a bunch of misc stuff into common.utils (#36463)

2025-10-24 20:45:56 -07:00

version.h

bump version to 0.10.2

2025-10-23 22:25:54 -07:00