From 4d827a49cf4db3660fc096153a7fecd8bbe55edb Mon Sep 17 00:00:00 2001 From: Lukas <61192133+lukasloetkolben@users.noreply.github.com> Date: Wed, 17 Dec 2025 19:39:29 +0100 Subject: [PATCH 001/229] Rivian: update mando radar interface (#2700) correct radar interface Co-authored-by: Adeeb Shihadeh --- opendbc/car/rivian/interface.py | 2 +- opendbc/car/rivian/radar_interface.py | 21 ++++++++++++------- .../rivian/rivian_mando_front_radar.py | 13 ++++++++---- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/opendbc/car/rivian/interface.py b/opendbc/car/rivian/interface.py index f1108e0811c..d3acef1cc3d 100644 --- a/opendbc/car/rivian/interface.py +++ b/opendbc/car/rivian/interface.py @@ -24,7 +24,7 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo ret.steerControlType = structs.CarParams.SteerControlType.torque ret.radarUnavailable = True - # TODO: pending finding/handling missing set speed and fixing up radar parser + # TODO: pending finding/handling missing set speed ret.alphaLongitudinalAvailable = False if alpha_long: ret.openpilotLongitudinalControl = True diff --git a/opendbc/car/rivian/radar_interface.py b/opendbc/car/rivian/radar_interface.py index f74acafe9f0..56a4034d4fa 100644 --- a/opendbc/car/rivian/radar_interface.py +++ b/opendbc/car/rivian/radar_interface.py @@ -50,22 +50,27 @@ def _update(self, updated_messages): for addr in range(RADAR_START_ADDR, RADAR_START_ADDR + RADAR_MSG_COUNT): msg = self.rcp.vl[f"RADAR_TRACK_{addr:x}"] - if addr not in self.pts: - self.pts[addr] = structs.RadarData.RadarPoint() - self.pts[addr].trackId = self.track_id - self.track_id += 1 + # STATE: 1=New, 2=New_updated, 3=Updated, 4=Coasting, 7=New_coasting + valid = msg['STATE'] in (1, 2, 3, 4, 7) + + # Rivian's Short Range Radar (SSR) detects close stationary objects like guardrails, which cause phantom braking. + # MODE: 1=SRR, 2=LRR, 3=SRR_and_LRR + valid = valid and msg['MODE'] in (2, 3) - valid = msg['STATE'] in (3, 4) and msg['STATE_2'] == 1 if valid: + if addr not in self.pts or msg['STATE'] in (1, 2, 7): + self.pts[addr] = structs.RadarData.RadarPoint() + self.pts[addr].trackId = self.track_id + self.track_id += 1 + + self.pts[addr].measured = msg['STATE'] in (2, 3) azimuth = math.radians(msg['AZIMUTH']) - self.pts[addr].measured = True self.pts[addr].dRel = math.cos(azimuth) * msg['LONG_DIST'] self.pts[addr].yRel = 0.5 * -math.sin(azimuth) * msg['LONG_DIST'] self.pts[addr].vRel = msg['REL_SPEED'] self.pts[addr].aRel = float('nan') self.pts[addr].yvRel = float('nan') - - else: + elif addr in self.pts: del self.pts[addr] ret.points = list(self.pts.values()) diff --git a/opendbc/dbc/generator/rivian/rivian_mando_front_radar.py b/opendbc/dbc/generator/rivian/rivian_mando_front_radar.py index cdddfd8f281..d9a89752fb2 100755 --- a/opendbc/dbc/generator/rivian/rivian_mando_front_radar.py +++ b/opendbc/dbc/generator/rivian/rivian_mando_front_radar.py @@ -44,16 +44,21 @@ BU_: XXX """) - # note: 0x501/0x502 seem to be special in 0x5XX range for a in range(0x500, 0x500 + 32): f.write(f""" BO_ {a} RADAR_TRACK_{a:x}: 8 RADAR SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX SG_ COUNTER : 11|4@0+ (1,0) [0|15] "" XXX SG_ UNKNOWN_1 : 23|8@0- (1,0) [-128|127] "" XXX - SG_ AZIMUTH : 28|10@0- (0.1,0) [-61.2|62.1] "" XXX + SG_ AZIMUTH : 28|10@0- (0.1,0) [-51.2|51.1] "" XXX SG_ STATE : 31|3@0+ (1,0) [0|7] "" XXX SG_ LONG_DIST : 34|11@0+ (0.1,0) [0|204.7] "" XXX - SG_ STATE_2 : 55|1@0+ (1,0) [0|1] "" XXX - SG_ REL_SPEED : 53|14@0- (0.01,0) [-81.92|81.92] "" XXX + SG_ MODE : 55|2@0+ (1,0) [0|3] "" XXX + SG_ REL_SPEED : 53|14@0- (0.01,0) [-81.92|81.92] "m/s" XXX + """) + + for a in range(0x500, 0x500 + 32): + f.write(f""" +VAL_ {a} STATE 0 "Empty" 1 "New" 2 "New_updated" 3 "Updated" 4 "Coasting" 7 "New_coasting" ; +VAL_ {a} MODE 0 "None" 1 "SRR" 2 "LRR" 3 "SRR_and_LRR" ; """) From 673076d497e4b650400c1c3e84d21256b22f6536 Mon Sep 17 00:00:00 2001 From: Matt Purnell <65473602+mpurnell1@users.noreply.github.com> Date: Thu, 18 Dec 2025 12:12:27 -0600 Subject: [PATCH 002/229] gm: Refactor to make branches clearer and remove unreachable `else` (#2948) gm: Refactor to make branches clearer --- opendbc/safety/modes/gm.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/opendbc/safety/modes/gm.h b/opendbc/safety/modes/gm.h index aa0cdac65c8..571ced42660 100644 --- a/opendbc/safety/modes/gm.h +++ b/opendbc/safety/modes/gm.h @@ -198,13 +198,12 @@ static safety_config gm_init(uint16_t param) { static const CanMsg GM_CAM_TX_MSGS[] = {{0x180, 0, 4, .check_relay = true}, // pt bus {0x1E1, 2, 7, .check_relay = false}, {0x184, 2, 8, .check_relay = true}}; // camera bus - gm_hw = GET_FLAG(param, GM_PARAM_HW_CAM) ? GM_CAM : GM_ASCM; - - if (gm_hw == GM_ASCM) { - gm_long_limits = &GM_ASCM_LONG_LIMITS; - } else if (gm_hw == GM_CAM) { + if (GET_FLAG(param, GM_PARAM_HW_CAM)) { + gm_hw = GM_CAM; gm_long_limits = &GM_CAM_LONG_LIMITS; } else { + gm_hw = GM_ASCM; + gm_long_limits = &GM_ASCM_LONG_LIMITS; } bool gm_cam_long = false; From 3ff537155e91ba8bf8df66d8e62dfafbed9f6390 Mon Sep 17 00:00:00 2001 From: Matt Purnell <65473602+mpurnell1@users.noreply.github.com> Date: Thu, 18 Dec 2025 12:13:44 -0600 Subject: [PATCH 003/229] safety: remove redundant checks in psa, rivian, and toyota (#2949) - Remove redundant address checks in rivian_get_counter, toyota_get_quality_flag_valid, and {psa,rivian}_get_checksum as these functions are securely guarded by the safety whitelist. --- opendbc/safety/modes/psa.h | 9 +-------- opendbc/safety/modes/rivian.h | 17 ++++------------- opendbc/safety/modes/toyota.h | 7 +------ 3 files changed, 6 insertions(+), 27 deletions(-) diff --git a/opendbc/safety/modes/psa.h b/opendbc/safety/modes/psa.h index 6bbd7b9c962..63026c3e1ea 100644 --- a/opendbc/safety/modes/psa.h +++ b/opendbc/safety/modes/psa.h @@ -27,14 +27,7 @@ static uint8_t psa_get_counter(const CANPacket_t *msg) { } static uint32_t psa_get_checksum(const CANPacket_t *msg) { - uint8_t chksum = 0; - if (msg->addr == PSA_HS2_DAT_MDD_CMD_452) { - chksum = msg->data[5] & 0xFU; - } else if (msg->addr == PSA_HS2_DYN_ABR_38D) { - chksum = msg->data[5] & 0xFU; - } else { - } - return chksum; + return msg->data[5] & 0xFU; } static uint8_t _psa_compute_checksum(const CANPacket_t *msg, uint8_t chk_ini, int chk_pos) { diff --git a/opendbc/safety/modes/rivian.h b/opendbc/safety/modes/rivian.h index 35645b7c56e..1209937b462 100644 --- a/opendbc/safety/modes/rivian.h +++ b/opendbc/safety/modes/rivian.h @@ -3,22 +3,13 @@ #include "opendbc/safety/declarations.h" static uint8_t rivian_get_counter(const CANPacket_t *msg) { - uint8_t cnt = 0; - if ((msg->addr == 0x208U) || (msg->addr == 0x150U)) { - // Signal: ESP_Status_Counter, VDM_PropStatus_Counter - cnt = msg->data[1] & 0xFU; - } - return cnt; + // Signal: ESP_Status_Counter, VDM_PropStatus_Counter + return msg->data[1] & 0xFU; } static uint32_t rivian_get_checksum(const CANPacket_t *msg) { - uint8_t chksum = 0; - if ((msg->addr == 0x208U) || (msg->addr == 0x150U)) { - // Signal: ESP_Status_Checksum, VDM_PropStatus_Checksum - chksum = msg->data[0]; - } else { - } - return chksum; + // Signal: ESP_Status_Checksum, VDM_PropStatus_Checksum + return msg->data[0]; } static uint8_t _rivian_compute_checksum(const CANPacket_t *msg, uint8_t poly, uint8_t xor_output) { diff --git a/opendbc/safety/modes/toyota.h b/opendbc/safety/modes/toyota.h index c2a46627121..430726d8087 100644 --- a/opendbc/safety/modes/toyota.h +++ b/opendbc/safety/modes/toyota.h @@ -77,12 +77,7 @@ static uint32_t toyota_get_checksum(const CANPacket_t *msg) { } static bool toyota_get_quality_flag_valid(const CANPacket_t *msg) { - - bool valid = false; - if (msg->addr == 0x260U) { - valid = !GET_BIT(msg, 3U); // STEER_ANGLE_INITIALIZING - } - return valid; + return !GET_BIT(msg, 3U); // STEER_ANGLE_INITIALIZING } static void toyota_rx_hook(const CANPacket_t *msg) { From f7201a23797ee336e0b32574bf13c805dafa140b Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Sat, 20 Dec 2025 16:21:57 -0500 Subject: [PATCH 004/229] HKG: Add FW for 2023 Kia Sportage Hybrid (#2974) --- opendbc/car/hyundai/fingerprints.py | 1 + 1 file changed, 1 insertion(+) diff --git a/opendbc/car/hyundai/fingerprints.py b/opendbc/car/hyundai/fingerprints.py index 9f4979f3adb..84873ff3b83 100644 --- a/opendbc/car/hyundai/fingerprints.py +++ b/opendbc/car/hyundai/fingerprints.py @@ -1111,6 +1111,7 @@ b'\xf1\x00NQ5 FR_CMR AT USA LHD 1.00 1.00 99211-P1040 663', b'\xf1\x00NQ5 FR_CMR AT USA LHD 1.00 1.00 99211-P1060 665', b'\xf1\x00NQ5 FR_CMR AT USA LHD 1.00 1.00 99211-P1070 690', + b'\xf1\x00NQ5 FR_CMR AT USA LHD 1.00 1.01 99211-P1060 680', ], (Ecu.fwdRadar, 0x7d0, None): [ b'\xf1\x00NQ5__ 1.00 1.02 99110-P1000 ', From 622f2b14b2354ac024f99e167daddbaeb58f6e25 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sat, 20 Dec 2025 14:17:28 -0800 Subject: [PATCH 005/229] CI: use tags for cppcheck update (#2976) --- .github/workflows/update-cppcheck.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update-cppcheck.yml b/.github/workflows/update-cppcheck.yml index dee72c53e57..ee2bb1a15f6 100644 --- a/.github/workflows/update-cppcheck.yml +++ b/.github/workflows/update-cppcheck.yml @@ -17,7 +17,11 @@ jobs: - name: Get latest cppcheck version id: version run: | - LATEST=$(curl -fsSL https://api.github.com/repos/danmar/cppcheck/releases/latest | jq -r .tag_name) + # Tags are sorted by time (newest first), so get the first version-like tag + LATEST=$(curl -fsSL "https://api.github.com/repos/danmar/cppcheck/tags?per_page=20" | \ + jq -r '.[].name' | \ + grep -E '^[0-9]+\.[0-9]+(\.[0-9]+)?$' | \ + head -n 1) echo "vers=$LATEST" >> "$GITHUB_OUTPUT" - name: Update VERS in install.sh run: | From 4aa7ca972290af6c6bbd314d1975eab46a888b6f Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sat, 20 Dec 2025 15:18:07 -0800 Subject: [PATCH 006/229] Add `CarInterface.DRIVABLE_GEARS` attribute (#2978) * Add CarInterface.DRIVABLE_GEARS gears attribute * lil less --- opendbc/car/chrysler/interface.py | 2 ++ opendbc/car/ford/interface.py | 2 ++ opendbc/car/gm/interface.py | 3 +++ opendbc/car/honda/interface.py | 2 ++ opendbc/car/hyundai/interface.py | 2 ++ opendbc/car/interfaces.py | 2 ++ opendbc/car/nissan/interface.py | 3 ++- opendbc/car/toyota/interface.py | 2 ++ opendbc/car/volkswagen/interface.py | 4 +++- 9 files changed, 20 insertions(+), 2 deletions(-) diff --git a/opendbc/car/chrysler/interface.py b/opendbc/car/chrysler/interface.py index 0be2ccacb0d..d28efe3419c 100755 --- a/opendbc/car/chrysler/interface.py +++ b/opendbc/car/chrysler/interface.py @@ -12,6 +12,8 @@ class CarInterface(CarInterfaceBase): CarController = CarController RadarInterface = RadarInterface + DRIVABLE_GEARS = (structs.CarState.GearShifter.low,) + @staticmethod def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_long, is_release, docs) -> structs.CarParams: ret.brand = "chrysler" diff --git a/opendbc/car/ford/interface.py b/opendbc/car/ford/interface.py index 97685df58c6..3c387542221 100644 --- a/opendbc/car/ford/interface.py +++ b/opendbc/car/ford/interface.py @@ -17,6 +17,8 @@ class CarInterface(CarInterfaceBase): CarController = CarController RadarInterface = RadarInterface + DRIVABLE_GEARS = (structs.CarState.GearShifter.low, structs.CarState.GearShifter.manumatic) + @staticmethod def get_pid_accel_limits(CP, current_speed, cruise_speed): # PCM doesn't allow acceleration near cruise_speed, diff --git a/opendbc/car/gm/interface.py b/opendbc/car/gm/interface.py index 38adf80d626..3b62ed188f1 100755 --- a/opendbc/car/gm/interface.py +++ b/opendbc/car/gm/interface.py @@ -25,6 +25,9 @@ class CarInterface(CarInterfaceBase): CarController = CarController RadarInterface = RadarInterface + DRIVABLE_GEARS = (structs.CarState.GearShifter.sport, structs.CarState.GearShifter.low, + structs.CarState.GearShifter.eco, structs.CarState.GearShifter.manumatic) + @staticmethod def get_pid_accel_limits(CP, current_speed, cruise_speed): return CarControllerParams.ACCEL_MIN, CarControllerParams.ACCEL_MAX diff --git a/opendbc/car/honda/interface.py b/opendbc/car/honda/interface.py index 897c1fcd3e6..59e300c4f07 100755 --- a/opendbc/car/honda/interface.py +++ b/opendbc/car/honda/interface.py @@ -19,6 +19,8 @@ class CarInterface(CarInterfaceBase): CarController = CarController RadarInterface = RadarInterface + DRIVABLE_GEARS = (structs.CarState.GearShifter.sport,) + @staticmethod def get_pid_accel_limits(CP, current_speed, cruise_speed): if CP.carFingerprint in HONDA_BOSCH: diff --git a/opendbc/car/hyundai/interface.py b/opendbc/car/hyundai/interface.py index 1e058c4fce7..5bf4ebb70eb 100644 --- a/opendbc/car/hyundai/interface.py +++ b/opendbc/car/hyundai/interface.py @@ -22,6 +22,8 @@ class CarInterface(CarInterfaceBase): CarController = CarController RadarInterface = RadarInterface + DRIVABLE_GEARS = (structs.CarState.GearShifter.sport, structs.CarState.GearShifter.manumatic) + @staticmethod def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_long, is_release, docs) -> structs.CarParams: ret.brand = "hyundai" diff --git a/opendbc/car/interfaces.py b/opendbc/car/interfaces.py index 8328062f23e..a2c72880c23 100644 --- a/opendbc/car/interfaces.py +++ b/opendbc/car/interfaces.py @@ -96,6 +96,8 @@ class CarInterfaceBase(ABC): CarController: 'CarControllerBase' RadarInterface: 'RadarInterfaceBase' = RadarInterfaceBase + DRIVABLE_GEARS: tuple[structs.CarState.GearShifter, ...] = () + def __init__(self, CP: structs.CarParams): self.CP = CP diff --git a/opendbc/car/nissan/interface.py b/opendbc/car/nissan/interface.py index bac7b3f1afc..12c217fe128 100644 --- a/opendbc/car/nissan/interface.py +++ b/opendbc/car/nissan/interface.py @@ -4,11 +4,12 @@ from opendbc.car.nissan.carstate import CarState from opendbc.car.nissan.values import CAR, NissanSafetyFlags - class CarInterface(CarInterfaceBase): CarState = CarState CarController = CarController + DRIVABLE_GEARS = (structs.CarState.GearShifter.brake,) + @staticmethod def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_long, is_release, docs) -> structs.CarParams: ret.brand = "nissan" diff --git a/opendbc/car/toyota/interface.py b/opendbc/car/toyota/interface.py index 27d5607631f..9e2d332f2cb 100644 --- a/opendbc/car/toyota/interface.py +++ b/opendbc/car/toyota/interface.py @@ -16,6 +16,8 @@ class CarInterface(CarInterfaceBase): CarController = CarController RadarInterface = RadarInterface + DRIVABLE_GEARS = (structs.CarState.GearShifter.sport,) + @staticmethod def get_pid_accel_limits(CP, current_speed, cruise_speed): return CarControllerParams(CP).ACCEL_MIN, CarControllerParams(CP).ACCEL_MAX diff --git a/opendbc/car/volkswagen/interface.py b/opendbc/car/volkswagen/interface.py index eaa60f4e2ef..88a38eba58c 100644 --- a/opendbc/car/volkswagen/interface.py +++ b/opendbc/car/volkswagen/interface.py @@ -4,11 +4,13 @@ from opendbc.car.volkswagen.carstate import CarState from opendbc.car.volkswagen.values import CanBus, CAR, NetworkLocation, TransmissionType, VolkswagenFlags, VolkswagenSafetyFlags - class CarInterface(CarInterfaceBase): CarState = CarState CarController = CarController + DRIVABLE_GEARS = (structs.CarState.GearShifter.eco, structs.CarState.GearShifter.sport, + structs.CarState.GearShifter.manumatic) + @staticmethod def _get_params(ret: structs.CarParams, candidate: CAR, fingerprint, car_fw, alpha_long, is_release, docs) -> structs.CarParams: ret.brand = "volkswagen" From fe7dbcfd5924a9958ea0886d7eec2a5e45d436d0 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sun, 28 Dec 2025 00:26:14 -0800 Subject: [PATCH 007/229] Add ty type checker (#2993) --- lefthook.yml | 2 ++ opendbc/can/parser.py | 2 +- opendbc/safety/tests/common.py | 2 +- pyproject.toml | 40 ++++++++++++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 2 deletions(-) diff --git a/lefthook.yml b/lefthook.yml index 91d13784334..0c70870f9f8 100644 --- a/lefthook.yml +++ b/lefthook.yml @@ -15,6 +15,8 @@ test: # *** static analysis ruff: run: ruff check . + ty: + run: ty check codespell: run: codespell {files} -L tge,stdio -S *.dbc files: git ls-tree -r HEAD --name-only diff --git a/opendbc/can/parser.py b/opendbc/can/parser.py index ffcb4a37fb1..422b4b362fb 100644 --- a/opendbc/can/parser.py +++ b/opendbc/can/parser.py @@ -91,7 +91,7 @@ def parse(self, nanos: int, dat: bytes) -> bool: if self.frequency < 1e-5 and len(self.timestamps) >= 3: dt = (self.timestamps[-1] - self.timestamps[0]) * 1e-9 - if (dt > 1.0 or len(self.timestamps) >= self.timestamps.maxlen) and dt != 0: + if (dt > 1.0 or (self.timestamps.maxlen is not None and len(self.timestamps) >= self.timestamps.maxlen)) and dt != 0: self.frequency = min(len(self.timestamps) / dt, 100.0) self.timeout_threshold = (1_000_000_000 / self.frequency) * 10 return True diff --git a/opendbc/safety/tests/common.py b/opendbc/safety/tests/common.py index ae2a30e1cff..aaac11d7b4f 100644 --- a/opendbc/safety/tests/common.py +++ b/opendbc/safety/tests/common.py @@ -182,7 +182,7 @@ class LongitudinalGasBrakeSafetyTest(SafetyTestBase, abc.ABC): MIN_GAS: int = 0 MAX_GAS: int | None = None INACTIVE_GAS = 0 - MIN_POSSIBLE_GAS: int = 0. + MIN_POSSIBLE_GAS: int = 0 MAX_POSSIBLE_GAS: int | None = None def test_gas_brake_limits_correct(self): diff --git a/pyproject.toml b/pyproject.toml index 00659b3becd..450dda5d43d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -126,6 +126,46 @@ flake8-implicit-str-concat.allow-multiline=false # TODO: re-enable when all tests are converted to pytest #"unittest".msg = "Use pytest" +[tool.ty.rules] +# Ignore rules that produce false positives due to: +# - Dynamic attributes on LibSafety (loaded from compiled C library) +# - External dependencies not installed (panda, cereal, openpilot) +# - capnp dynamically generated types +possibly-missing-attribute = "ignore" +unresolved-attribute = "ignore" +unresolved-import = "ignore" + +# Project uses mypy's implicit_optional = true style +invalid-parameter-default = "ignore" + +# Intentional LSP violations in subclass method signatures +invalid-method-override = "ignore" + +# Optional callables called without None checks in test code +call-non-callable = "ignore" + +# Complex type narrowing ty doesn't handle well (isinstance with abstract types) +invalid-argument-type = "ignore" + +# Class vs instance type assignments and test base class patterns +invalid-assignment = "ignore" + +# Dynamic type patterns (e.g., values converted from Number to list in __init__) +non-subscriptable = "ignore" +unsupported-operator = "ignore" + +# Return types with complex callable signatures +invalid-return-type = "ignore" + +# Test class optional attributes (TX_MSGS, etc.) +not-iterable = "ignore" + +# Test assertions with optional types +no-matching-overload = "ignore" + +# Test class method signature differences +too-many-positional-arguments = "ignore" + [tool.setuptools] include-package-data = true From 3981d353ec9f4f779797e7faf13f622e19e925ac Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sun, 28 Dec 2025 00:34:20 -0800 Subject: [PATCH 008/229] Remove mypy configuration and references (#2995) --- .gitignore | 1 - README.md | 2 +- pyproject.toml | 15 --------------- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 5a595d00afa..33007330a7d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ .cache/ /build/ -.mypy_cache/ *.pyc *.os *.o diff --git a/README.md b/README.md index cfbf7d359f9..a28dbddd330 100644 --- a/README.md +++ b/README.md @@ -138,7 +138,7 @@ The above tests are themselves tested by: * a [mutation test](opendbc/safety/tests/misra/test_mutation.py) on the MISRA coverage * 100% line coverage enforced on the safety unit tests -In addition, we run the [ruff linter](https://github.com/astral-sh/ruff) and [mypy](https://mypy-lang.org/) on the car interface library. +In addition, we run the [ruff linter](https://github.com/astral-sh/ruff) and [ty](https://github.com/astral-sh/ty) on the car interface library. ### Bounties diff --git a/pyproject.toml b/pyproject.toml index 450dda5d43d..98be4e3e368 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -66,20 +66,6 @@ ignore-words-list = "alo,ba,bu,deque,hda,grey,arange" builtin = "clear,rare,informal,code,names,en-GB_to_en-US" check-hidden = true -[tool.mypy] -# helpful warnings -warn_redundant_casts=true -warn_unreachable=true -warn_unused_ignores=true - -# restrict dynamic typing -warn_return_any=true - -# allow implicit optionals for default args -implicit_optional = true - -explicit_package_bases=true - # https://beta.ruff.rs/docs/configuration/#using-pyprojecttoml [tool.ruff] line-length = 160 @@ -135,7 +121,6 @@ possibly-missing-attribute = "ignore" unresolved-attribute = "ignore" unresolved-import = "ignore" -# Project uses mypy's implicit_optional = true style invalid-parameter-default = "ignore" # Intentional LSP violations in subclass method signatures From edf19be8efe06a5387265adc4650725bb56b5c46 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sun, 28 Dec 2025 00:44:48 -0800 Subject: [PATCH 009/229] ty: less ignores (#2994) * less ignore * one more * one more * lil more --- opendbc/can/parser.py | 2 +- opendbc/car/__init__.py | 2 +- opendbc/car/docs_definitions.py | 2 +- opendbc/car/ecu_addrs.py | 2 +- opendbc/car/fw_versions.py | 13 +++++++------ opendbc/car/gm/interface.py | 2 +- opendbc/car/interfaces.py | 6 +++--- opendbc/car/isotp_parallel_query.py | 2 +- opendbc/car/lateral.py | 2 +- opendbc/safety/tests/common.py | 7 ++++--- pyproject.toml | 11 ----------- 11 files changed, 21 insertions(+), 30 deletions(-) diff --git a/opendbc/can/parser.py b/opendbc/can/parser.py index 422b4b362fb..1e6088607c5 100644 --- a/opendbc/can/parser.py +++ b/opendbc/can/parser.py @@ -153,7 +153,7 @@ def __init__(self, dbc_name: str, messages: list[tuple[str | int, int]], bus: in self.last_nonempty_nanos: int = 0 self._last_update_nanos: int = 0 - def _add_message(self, name_or_addr: str | int, freq: int = None) -> None: + def _add_message(self, name_or_addr: str | int, freq: int | None = None) -> None: if isinstance(name_or_addr, numbers.Number): msg = self.dbc.addr_to_msg.get(int(name_or_addr)) else: diff --git a/opendbc/car/__init__.py b/opendbc/car/__init__.py index 79fb4553750..a45e1e83e3b 100644 --- a/opendbc/car/__init__.py +++ b/opendbc/car/__init__.py @@ -106,7 +106,7 @@ def make_tester_present_msg(addr, bus, subaddr=None, suppress_response=False): return CanData(addr, bytes(dat), bus) -def get_safety_config(safety_model: structs.CarParams.SafetyModel, safety_param: int = None) -> structs.CarParams.SafetyConfig: +def get_safety_config(safety_model: structs.CarParams.SafetyModel, safety_param: int | None = None) -> structs.CarParams.SafetyConfig: ret = structs.CarParams.SafetyConfig() ret.safetyModel = safety_model if safety_param is not None: diff --git a/opendbc/car/docs_definitions.py b/opendbc/car/docs_definitions.py index adb974d28df..0debd0a49b5 100644 --- a/opendbc/car/docs_definitions.py +++ b/opendbc/car/docs_definitions.py @@ -170,7 +170,7 @@ def __call__(self): return copy.deepcopy(self) @classmethod - def common(cls, add: list[EnumBase] = None, remove: list[EnumBase] = None): + def common(cls, add: list[EnumBase] | None = None, remove: list[EnumBase] | None = None): p = [part for part in (add or []) + DEFAULT_CAR_PARTS if part not in (remove or [])] return cls(p) diff --git a/opendbc/car/ecu_addrs.py b/opendbc/car/ecu_addrs.py index c607e2c6408..8c60f179339 100644 --- a/opendbc/car/ecu_addrs.py +++ b/opendbc/car/ecu_addrs.py @@ -6,7 +6,7 @@ from opendbc.car.fw_query_definitions import EcuAddrBusType -def _is_tester_present_response(msg: CanData, subaddr: int = None) -> bool: +def _is_tester_present_response(msg: CanData, subaddr: int | None = None) -> bool: # ISO-TP messages may use CAN frame optimization (not always 8 bytes) # tester present response is always a single frame dat_offset = 1 if subaddr is not None else 0 diff --git a/opendbc/car/fw_versions.py b/opendbc/car/fw_versions.py index 09d83b52761..8b349b2b6e4 100644 --- a/opendbc/car/fw_versions.py +++ b/opendbc/car/fw_versions.py @@ -37,7 +37,7 @@ def is_brand(brand: str, filter_brand: str | None) -> bool: return filter_brand is None or brand == filter_brand -def build_fw_dict(fw_versions: list[CarParams.CarFw], filter_brand: str = None) -> dict[AddrType, set[bytes]]: +def build_fw_dict(fw_versions: list[CarParams.CarFw], filter_brand: str | None = None) -> dict[AddrType, set[bytes]]: fw_versions_dict: defaultdict[AddrType, set[bytes]] = defaultdict(set) for fw in fw_versions: if is_brand(fw.brand, filter_brand) and not fw.logging: @@ -47,11 +47,11 @@ def build_fw_dict(fw_versions: list[CarParams.CarFw], filter_brand: str = None) class MatchFwToCar(Protocol): - def __call__(self, live_fw_versions: LiveFwVersions, match_brand: str = None, log: bool = True) -> set[str]: + def __call__(self, live_fw_versions: LiveFwVersions, match_brand: str | None = None, log: bool = True) -> set[str]: ... -def match_fw_to_car_fuzzy(live_fw_versions: LiveFwVersions, match_brand: str = None, log: bool = True, exclude: str = None) -> set[str]: +def match_fw_to_car_fuzzy(live_fw_versions: LiveFwVersions, match_brand: str | None = None, log: bool = True, exclude: str | None = None) -> set[str]: """Do a fuzzy FW match. This function will return a match, and the number of firmware version that were matched uniquely to that specific car. If multiple ECUs uniquely match to different cars the match is rejected.""" @@ -101,7 +101,8 @@ def match_fw_to_car_fuzzy(live_fw_versions: LiveFwVersions, match_brand: str = N return set() -def match_fw_to_car_exact(live_fw_versions: LiveFwVersions, match_brand: str = None, log: bool = True, extra_fw_versions: dict = None) -> set[str]: +def match_fw_to_car_exact(live_fw_versions: LiveFwVersions, match_brand: str | None = None, + log: bool = True, extra_fw_versions: dict | None = None) -> set[str]: """Do an exact FW match. Returns all cars that match the given FW versions for a list of "essential" ECUs. If an ECU is not considered essential the FW version can be missing to get a fingerprint, but if it's present it @@ -252,8 +253,8 @@ def get_fw_versions_ordered(can_recv: CanRecvCallable, can_send: CanSendCallable return all_car_fw -def get_fw_versions(can_recv: CanRecvCallable, can_send: CanSendCallable, set_obd_multiplexing: ObdCallback, query_brand: str = None, - extra: OfflineFwVersions = None, timeout: float = 0.1, num_pandas: int = 1, progress: bool = False) -> list[CarParams.CarFw]: +def get_fw_versions(can_recv: CanRecvCallable, can_send: CanSendCallable, set_obd_multiplexing: ObdCallback, query_brand: str | None = None, + extra: OfflineFwVersions | None = None, timeout: float = 0.1, num_pandas: int = 1, progress: bool = False) -> list[CarParams.CarFw]: versions = VERSIONS.copy() if query_brand is not None: diff --git a/opendbc/car/gm/interface.py b/opendbc/car/gm/interface.py index 3b62ed188f1..1cdb04fae9d 100755 --- a/opendbc/car/gm/interface.py +++ b/opendbc/car/gm/interface.py @@ -45,7 +45,7 @@ def get_steer_feedforward_function(self): else: return CarInterfaceBase.get_steer_feedforward_default - def get_lataccel_torque_siglin(self) -> float: + def get_lataccel_torque_siglin(self) -> tuple[list[float], np.ndarray]: def torque_from_lateral_accel_siglin_func(lateral_acceleration: float) -> float: # The "lat_accel vs torque" relationship is assumed to be the sum of "sigmoid + linear" curves diff --git a/opendbc/car/interfaces.py b/opendbc/car/interfaces.py index a2c72880c23..df5ef18f3a1 100644 --- a/opendbc/car/interfaces.py +++ b/opendbc/car/interfaces.py @@ -92,9 +92,9 @@ def update(self, can_packets: list[tuple[int, list[CanData]]]) -> structs.RadarD class CarInterfaceBase(ABC): - CarState: 'CarStateBase' - CarController: 'CarControllerBase' - RadarInterface: 'RadarInterfaceBase' = RadarInterfaceBase + CarState: type['CarStateBase'] + CarController: type['CarControllerBase'] + RadarInterface: type['RadarInterfaceBase'] = RadarInterfaceBase DRIVABLE_GEARS: tuple[structs.CarState.GearShifter, ...] = () diff --git a/opendbc/car/isotp_parallel_query.py b/opendbc/car/isotp_parallel_query.py index 57925e42393..ffd6af09d43 100644 --- a/opendbc/car/isotp_parallel_query.py +++ b/opendbc/car/isotp_parallel_query.py @@ -11,7 +11,7 @@ class IsoTpParallelQuery: def __init__(self, can_send: CanSendCallable, can_recv: CanRecvCallable, bus: int, addrs: list[int] | list[AddrType], request: list[bytes], response: list[bytes], response_offset: int = 0x8, - functional_addrs: list[int] = None, response_pending_timeout: float = 10) -> None: + functional_addrs: list[int] | None = None, response_pending_timeout: float = 10) -> None: self.can_send = can_send self.can_recv = can_recv self.bus = bus diff --git a/opendbc/car/lateral.py b/opendbc/car/lateral.py index 1f3706874a0..5cc5f86c33e 100644 --- a/opendbc/car/lateral.py +++ b/opendbc/car/lateral.py @@ -24,7 +24,7 @@ class AngleSteeringLimits: MAX_ANGLE_RATE: float = math.inf -def apply_driver_steer_torque_limits(apply_torque: int, apply_torque_last: int, driver_torque: float, LIMITS, steer_max: int = None): +def apply_driver_steer_torque_limits(apply_torque: int, apply_torque_last: int, driver_torque: float, LIMITS, steer_max: int | None = None): # some safety modes utilize a dynamic max steer if steer_max is None: steer_max = LIMITS.STEER_MAX diff --git a/opendbc/safety/tests/common.py b/opendbc/safety/tests/common.py index aaac11d7b4f..0bfb653242d 100644 --- a/opendbc/safety/tests/common.py +++ b/opendbc/safety/tests/common.py @@ -72,7 +72,7 @@ def _regen_test(self): class SafetyTestBase(unittest.TestCase): - safety: libsafety_py.LibSafety + safety: libsafety_py.LibSafety | None @classmethod def setUpClass(cls): @@ -189,6 +189,7 @@ def test_gas_brake_limits_correct(self): self.assertIsNotNone(self.MAX_POSSIBLE_BRAKE) self.assertIsNotNone(self.MAX_POSSIBLE_GAS) + assert self.MAX_BRAKE is not None and self.MAX_GAS is not None self.assertGreater(self.MAX_BRAKE, self.MIN_BRAKE) self.assertGreater(self.MAX_GAS, self.MIN_GAS) @@ -659,7 +660,7 @@ def test_vehicle_speed_measurements(self): class AngleSteeringSafetyTest(VehicleSpeedSafetyTest): STEER_ANGLE_MAX: float = 300 - STEER_ANGLE_TEST_MAX: float = None + STEER_ANGLE_TEST_MAX: float | None = None DEG_TO_CAN: float ANGLE_RATE_BP: list[float] ANGLE_RATE_UP: list[float] # windup limit @@ -808,7 +809,7 @@ def test_rt_limits(self): class SafetyTest(SafetyTestBase): - TX_MSGS: list[list[int]] | None = None + TX_MSGS: list[list[int]] = [] SCANNED_ADDRS = [*range(0x800), # Entire 11-bit CAN address space *range(0x18DA00F1, 0x18DB00F1, 0x100), # 29-bit UDS physical addressing *range(0x18DB00F1, 0x18DC00F1, 0x100), # 29-bit UDS functional addressing diff --git a/pyproject.toml b/pyproject.toml index 98be4e3e368..a9f40c41b92 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -121,8 +121,6 @@ possibly-missing-attribute = "ignore" unresolved-attribute = "ignore" unresolved-import = "ignore" -invalid-parameter-default = "ignore" - # Intentional LSP violations in subclass method signatures invalid-method-override = "ignore" @@ -132,9 +130,6 @@ call-non-callable = "ignore" # Complex type narrowing ty doesn't handle well (isinstance with abstract types) invalid-argument-type = "ignore" -# Class vs instance type assignments and test base class patterns -invalid-assignment = "ignore" - # Dynamic type patterns (e.g., values converted from Number to list in __init__) non-subscriptable = "ignore" unsupported-operator = "ignore" @@ -142,12 +137,6 @@ unsupported-operator = "ignore" # Return types with complex callable signatures invalid-return-type = "ignore" -# Test class optional attributes (TX_MSGS, etc.) -not-iterable = "ignore" - -# Test assertions with optional types -no-matching-overload = "ignore" - # Test class method signature differences too-many-positional-arguments = "ignore" From bb1f1a7bee6b1dbd0424c73a27d972d171e7ac62 Mon Sep 17 00:00:00 2001 From: Matt Purnell <65473602+mpurnell1@users.noreply.github.com> Date: Mon, 29 Dec 2025 17:24:38 -0600 Subject: [PATCH 010/229] ty: Fix typo in ignored rule causing failing CI (#2997) Fix typo in ignored rule --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index a9f40c41b92..bea4fbb2d84 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -131,7 +131,7 @@ call-non-callable = "ignore" invalid-argument-type = "ignore" # Dynamic type patterns (e.g., values converted from Number to list in __init__) -non-subscriptable = "ignore" +not-subscriptable = "ignore" unsupported-operator = "ignore" # Return types with complex callable signatures From c278560e7b8c89d2453298cb3efd0535143b4c27 Mon Sep 17 00:00:00 2001 From: Nikita Pylypyuk <147505783+nikitap066@users.noreply.github.com> Date: Mon, 29 Dec 2025 23:24:55 +0000 Subject: [PATCH 011/229] Hyundai: document SCC_CONTROL signal preservation for ACC cancel (#2996) hyundai: document SCC_CONTROL signal preservation for ACC cancel Co-authored-by: Adeeb Shihadeh --- opendbc/car/hyundai/hyundaicanfd.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/opendbc/car/hyundai/hyundaicanfd.py b/opendbc/car/hyundai/hyundaicanfd.py index 1537bb4fdc0..30eb1376e23 100644 --- a/opendbc/car/hyundai/hyundaicanfd.py +++ b/opendbc/car/hyundai/hyundaicanfd.py @@ -92,7 +92,9 @@ def create_buttons(packer, CP, CAN, cnt, btn): def create_acc_cancel(packer, CP, CAN, cruise_info_copy): - # TODO: why do we copy different values here? + # CAN FD camera-based SCC requires additional signals to be preserved + # verbatim from the previous SCC_CONTROL frame to avoid checksum or + # state validation faults. Classic CAN SCC only validates a subset. if CP.flags & HyundaiFlags.CANFD_CAMERA_SCC.value: values = {s: cruise_info_copy[s] for s in [ "COUNTER", From 5314249fd5ce5385c62fe955f2db0bd5d5ee2612 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Mon, 29 Dec 2025 16:25:33 -0800 Subject: [PATCH 012/229] crcmod -> crcmod-plus (#2999) --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index bea4fbb2d84..78bb9681d7f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,7 @@ urls = { "homepage" = "https://github.com/commaai/opendbc" } dependencies = [ "scons", "numpy", - "crcmod", + "crcmod-plus", "tqdm", "pycapnp==2.1.0", "pycryptodome", From 04c72ca4320a62a66742c644c03ca2a050675d42 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Mon, 29 Dec 2025 16:38:24 -0800 Subject: [PATCH 013/229] test.sh: ensure uv.lock is consistent with pyproject (#3000) --- test.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test.sh b/test.sh index d91afb03562..e81841b65d4 100755 --- a/test.sh +++ b/test.sh @@ -6,6 +6,9 @@ cd $DIR source ./setup.sh +# *** uv lockfile check *** +uv lock --check + # *** build *** scons -j8 From df0f84b160739215004cb6d70f062e7e7d4cc428 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Mon, 29 Dec 2025 17:14:04 -0800 Subject: [PATCH 014/229] libsafety: fix building with mutation env (#3001) * build_env * default * conditional * need it there * try that * fix * rm those --- .github/workflows/tests.yml | 6 +++--- opendbc/safety/tests/libsafety/SConscript | 10 ++++++---- pyproject.toml | 2 +- setup.sh | 8 ++++++-- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 074c9df559e..2744fd5619a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -58,7 +58,7 @@ jobs: scons -j8 cd opendbc/safety/tests && ./mutation.sh - # TODO: this needs to move to opendbc + # TODO: this test needs to move to opendbc test_models: name: test models runs-on: ${{ github.repository == 'commaai/opendbc' && 'namespace-profile-amd64-8x16' || 'ubuntu-latest' }} @@ -69,7 +69,7 @@ jobs: env: BASE_IMAGE: openpilot-base BUILD: selfdrive/test/docker_build.sh base - RUN: docker run --shm-size 2G -v $PWD:/tmp/openpilot -w /tmp/openpilot -e CI=1 -e PYTHONWARNINGS=error -e FILEREADER_CACHE=1 -e PYTHONPATH=/tmp/openpilot -e NUM_JOBS -e JOB_ID -e GITHUB_ACTION -e GITHUB_REF -e GITHUB_HEAD_REF -e GITHUB_SHA -e GITHUB_REPOSITORY -e GITHUB_RUN_ID -v $GITHUB_WORKSPACE/.ci_cache/scons_cache:/tmp/scons_cache -v $GITHUB_WORKSPACE/.ci_cache/comma_download_cache:/tmp/comma_download_cache -v $GITHUB_WORKSPACE/.ci_cache/openpilot_cache:/tmp/openpilot_cache $BASE_IMAGE /bin/bash -c + RUN: docker run --shm-size 2G -v $PWD:/tmp/openpilot -w /tmp/openpilot -e CI=1 -e PYTHONWARNINGS=default -e FILEREADER_CACHE=1 -e PYTHONPATH=/tmp/openpilot -e NUM_JOBS -e JOB_ID -e GITHUB_ACTION -e GITHUB_REF -e GITHUB_HEAD_REF -e GITHUB_SHA -e GITHUB_REPOSITORY -e GITHUB_RUN_ID -v $GITHUB_WORKSPACE/.ci_cache/scons_cache:/tmp/scons_cache -v $GITHUB_WORKSPACE/.ci_cache/comma_download_cache:/tmp/comma_download_cache -v $GITHUB_WORKSPACE/.ci_cache/openpilot_cache:/tmp/openpilot_cache $BASE_IMAGE /bin/bash -c PYTEST: pytest --continue-on-collection-errors --durations=0 --durations-min=5 -n logical steps: - uses: actions/checkout@v4 @@ -90,7 +90,7 @@ jobs: path: .ci_cache/comma_download_cache key: car_models-${{ hashFiles('selfdrive/car/tests/test_models.py', 'opendbc/car/tests/routes.py') }}-${{ matrix.job }} - name: Build openpilot - run: ${{ env.RUN }} "scons -j$(nproc) common/ cereal/ selfdrive/pandad/ msgq_repo/ opendbc_repo" + run: ${{ env.RUN }} "VIRTUAL_ENV= opendbc_repo/setup.sh && scons -j$(nproc) common/ cereal/ selfdrive/pandad/ msgq_repo/ opendbc_repo" - name: Test car models timeout-minutes: ${{ contains(runner.name, 'nsc') && (steps.routes-cache.outputs.cache-hit == 'true') && ((steps.setup-step.outputs.duration < 18) && 1 || 2) || 6 }} run: | diff --git a/opendbc/safety/tests/libsafety/SConscript b/opendbc/safety/tests/libsafety/SConscript index 7cab268aea7..e9bd59dbcb6 100644 --- a/opendbc/safety/tests/libsafety/SConscript +++ b/opendbc/safety/tests/libsafety/SConscript @@ -56,14 +56,16 @@ flags = [ '-grecord-command-line', ] menv['CFLAGS'] += flags -menv['LINKFLAGS'] += flags +menv['LINKFLAGS'] = flags +menv['CFLAGS'].remove('-fprofile-arcs') +menv['CFLAGS'].remove('-ftest-coverage') for build_env, suffix in ((env, ""), (menv, "_mutation")): # TODO: add macOS support if (build_env == menv) and (system == "Darwin"): continue - safety = env.SharedObject(f"safety{suffix}.os", "safety.c") - libsafety = env.SharedLibrary(f"libsafety{suffix}.so", [safety]) + safety = build_env.SharedObject(f"safety{suffix}.os", "safety.c") + libsafety = build_env.SharedLibrary(f"libsafety{suffix}.so", [safety]) # GCC note file is generated by compiler, allow scons to clean it up - env.SideEffect("safety.gcno", safety) + build_env.SideEffect("safety.gcno", safety) diff --git a/pyproject.toml b/pyproject.toml index 78bb9681d7f..1a0ace169d8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ name = "opendbc" version = "0.2.1" description = "CAN bus databases and tools" -license = { file = "LICENSE" } +license = "MIT" authors = [{ name = "Vehicle Researcher", email = "user@comma.ai" }] readme = "README.md" requires-python = ">=3.11,<3.13" # pycapnp doesn't work with 3.13 diff --git a/setup.sh b/setup.sh index dce0a22648b..3b243800337 100755 --- a/setup.sh +++ b/setup.sh @@ -10,15 +10,19 @@ export PYTHONPATH=$BASEDIR if [ "$(uname -s)" = "Linux" ]; then # TODO: add macOS support if ! command -v "mull-runner-17" > /dev/null 2>&1; then - sudo apt-get update && sudo apt-get install -y curl clang-17 curl -1sLf 'https://dl.cloudsmith.io/public/mull-project/mull-stable/setup.deb.sh' | sudo -E bash - sudo apt-get update && sudo apt-get install -y mull-17 + sudo apt-get update && sudo apt-get install -y clang-17 mull-17 fi fi if ! command -v uv &>/dev/null; then echo "'uv' is not installed. Installing 'uv'..." curl -LsSf https://astral.sh/uv/install.sh | sh + + # must source this after install on some platforms + if [ -f $HOME/.local/bin/env ]; then + source $HOME/.local/bin/env + fi fi export UV_PROJECT_ENVIRONMENT="$BASEDIR/.venv" From 7391f464de2dd61c8d6bb4b309eac4f0e2bc0d80 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Mon, 29 Dec 2025 17:23:00 -0800 Subject: [PATCH 015/229] get mutation tests running on macOS (#2998) * install mull on macOS * runs * run in ci * more readable * fail early * who doesn't have curl * fix that? * uv sourcing * unset that * mit * cleanup --- .github/workflows/tests.yml | 8 +++++++- .gitignore | 1 + opendbc/safety/tests/libsafety/SConscript | 10 ++++++---- opendbc/safety/tests/mutation.sh | 14 +++++++++----- setup.sh | 15 ++++++++++++++- 5 files changed, 37 insertions(+), 11 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2744fd5619a..c5ecf348e02 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -43,8 +43,14 @@ jobs: mutation: name: Safety mutation tests - runs-on: ${{ github.repository == 'commaai/opendbc' && 'namespace-profile-amd64-8x16' || 'ubuntu-latest' }} + runs-on: ${{ matrix.os }} timeout-minutes: 45 + strategy: + fail-fast: false + matrix: + include: + - os: ${{ github.repository == 'commaai/opendbc' && 'namespace-profile-amd64-8x16' || 'ubuntu-latest' }} + - os: ${{ github.repository == 'commaai/opendbc' && 'namespace-profile-macos-8x14' || 'macos-latest' }} env: GIT_REF: ${{ github.event_name == 'push' && github.ref == format('refs/heads/{0}', github.event.repository.default_branch) && github.event.before || format('origin/{0}', github.event.repository.default_branch) }} steps: diff --git a/.gitignore b/.gitignore index 33007330a7d..5b2213fd4fc 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ cppcheck-addon-ctu-file-list opendbc/safety/tests/coverage-out compile_commands.json +.mull/ diff --git a/opendbc/safety/tests/libsafety/SConscript b/opendbc/safety/tests/libsafety/SConscript index e9bd59dbcb6..c4b2a5d9190 100644 --- a/opendbc/safety/tests/libsafety/SConscript +++ b/opendbc/safety/tests/libsafety/SConscript @@ -47,11 +47,16 @@ if GetOption('ubsan'): # mutation env menv = env.Clone() +if system == "Darwin": + menv.PrependENVPath('PATH', '/opt/homebrew/opt/llvm@17/bin') + mull_plugin = Dir('#').abspath + '/.mull/lib/mull-ir-frontend-17' +else: + mull_plugin = '/usr/lib/mull-ir-frontend-17' menv['CC'] = 'clang-17' flags = [ '-fprofile-instr-generate', '-fcoverage-mapping', - '-fpass-plugin=/usr/lib/mull-ir-frontend-17', + f'-fpass-plugin={mull_plugin}', '-g', '-grecord-command-line', ] @@ -61,9 +66,6 @@ menv['CFLAGS'].remove('-fprofile-arcs') menv['CFLAGS'].remove('-ftest-coverage') for build_env, suffix in ((env, ""), (menv, "_mutation")): - # TODO: add macOS support - if (build_env == menv) and (system == "Darwin"): - continue safety = build_env.SharedObject(f"safety{suffix}.os", "safety.c") libsafety = build_env.SharedLibrary(f"libsafety{suffix}.so", [safety]) diff --git a/opendbc/safety/tests/mutation.sh b/opendbc/safety/tests/mutation.sh index 29bca601704..c0513357c84 100755 --- a/opendbc/safety/tests/mutation.sh +++ b/opendbc/safety/tests/mutation.sh @@ -8,10 +8,14 @@ source $DIR/../../../setup.sh GIT_REF="${GIT_REF:-origin/master}" GIT_ROOT=$(git rev-parse --show-toplevel) -MULL_OPS="mutators: [cxx_increment, cxx_decrement, cxx_comparison, cxx_boundary, cxx_bitwise_assignment, cxx_bitwise, cxx_arithmetic_assignment, cxx_arithmetic, cxx_remove_negation]" -echo -e "$MULL_OPS" > $GIT_ROOT/mull.yml -scons -j$(nproc) -D -echo -e "timeout: 1000000\ngitDiffRef: $GIT_REF\ngitProjectRoot: $GIT_ROOT" >> $GIT_ROOT/mull.yml +cat > $GIT_ROOT/mull.yml < /dev/null 2>&1; then curl -1sLf 'https://dl.cloudsmith.io/public/mull-project/mull-stable/setup.deb.sh' | sudo -E bash sudo apt-get update && sudo apt-get install -y clang-17 mull-17 fi +elif [ "$(uname -s)" = "Darwin" ]; then + if ! brew list llvm@17 &>/dev/null; then + brew install llvm@17 + fi + if [ ! -f "$BASEDIR/.mull/bin/mull-runner-17" ]; then + MULL_VERSION="0.26.1" + MULL_ZIP="Mull-17-${MULL_VERSION}-LLVM-17.0-macOS-arm64-14.7.4.zip" + MULL_DIR="Mull-17-${MULL_VERSION}-LLVM-17.0-macOS-arm64-14.7.4" + curl -LO "https://github.com/mull-project/mull/releases/download/${MULL_VERSION}/${MULL_ZIP}" + unzip -o "$MULL_ZIP" + mv "$MULL_DIR" "$BASEDIR/.mull" + rm "$MULL_ZIP" + fi + export PATH="$BASEDIR/.mull/bin:$PATH" fi if ! command -v uv &>/dev/null; then From 508fa288234cc3b8b4056624b7947ff7bb85771c Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Mon, 29 Dec 2025 19:33:34 -0800 Subject: [PATCH 016/229] board/ is dead (#3003) * board/ is dead * add that back --- opendbc/safety/tests/libsafety/SConscript | 2 +- opendbc/safety/tests/misra/test_mutation.py | 1 - opendbc/safety/tests/test.sh | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/opendbc/safety/tests/libsafety/SConscript b/opendbc/safety/tests/libsafety/SConscript index c4b2a5d9190..7d584df56d9 100644 --- a/opendbc/safety/tests/libsafety/SConscript +++ b/opendbc/safety/tests/libsafety/SConscript @@ -34,7 +34,7 @@ env = Environment( '-fprofile-arcs', '-ftest-coverage', ], - CPPPATH=["#", "../../board/"], + CPPPATH=["#"], tools=["default", "compilation_db"], ) if system == "Darwin": diff --git a/opendbc/safety/tests/misra/test_mutation.py b/opendbc/safety/tests/misra/test_mutation.py index 7c25ad862a4..c4bdc93cb44 100644 --- a/opendbc/safety/tests/misra/test_mutation.py +++ b/opendbc/safety/tests/misra/test_mutation.py @@ -13,7 +13,6 @@ IGNORED_PATHS = ( 'opendbc/safety/main.c', 'opendbc/safety/tests/', - 'opendbc/safety/board/', ) mutations = [ diff --git a/opendbc/safety/tests/test.sh b/opendbc/safety/tests/test.sh index a5cc83a9429..8865aad496c 100755 --- a/opendbc/safety/tests/test.sh +++ b/opendbc/safety/tests/test.sh @@ -25,7 +25,7 @@ if [ "$1" == "--report" ]; then fi # test coverage -GCOV="gcovr -r $DIR/../ -d --fail-under-line=100 -e ^libsafety -e ^../board" +GCOV="gcovr -r $DIR/../ -d --fail-under-line=100 -e ^libsafety" if ! GCOV_OUTPUT="$($GCOV)"; then echo -e "FAILED:\n$GCOV_OUTPUT" exit 1 From cef1bbe18f692559a149600f7cffd9fcb77db01a Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 30 Dec 2025 08:31:45 -0800 Subject: [PATCH 017/229] Ford: remove unused stock long safety (#3005) --- opendbc/safety/modes/ford.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/opendbc/safety/modes/ford.h b/opendbc/safety/modes/ford.h index 4b35cf00f63..4b1eeb25f0c 100644 --- a/opendbc/safety/modes/ford.h +++ b/opendbc/safety/modes/ford.h @@ -316,11 +316,6 @@ static safety_config ford_init(uint16_t param) { {FORD_LateralMotionControl2, 0, 8, .check_relay = true}, }; - static const CanMsg FORD_STOCK_TX_MSGS[] = { - FORD_COMMON_TX_MSGS - {FORD_LateralMotionControl, 0, 8, .check_relay = true}, - }; - static const CanMsg FORD_LONG_TX_MSGS[] = { FORD_COMMON_TX_MSGS {FORD_ACCDATA, 0, 8, .check_relay = true}, @@ -345,8 +340,7 @@ static safety_config ford_init(uint16_t param) { ret = ford_longitudinal ? BUILD_SAFETY_CFG(ford_rx_checks, FORD_CANFD_LONG_TX_MSGS) : \ BUILD_SAFETY_CFG(ford_rx_checks, FORD_CANFD_STOCK_TX_MSGS); } else { - ret = ford_longitudinal ? BUILD_SAFETY_CFG(ford_rx_checks, FORD_LONG_TX_MSGS) : \ - BUILD_SAFETY_CFG(ford_rx_checks, FORD_STOCK_TX_MSGS); + ret = BUILD_SAFETY_CFG(ford_rx_checks, FORD_LONG_TX_MSGS); } return ret; } From 34cae2f4afc8886aed8a1687ab7dc66010c5e647 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 30 Dec 2025 08:44:26 -0800 Subject: [PATCH 018/229] Chrysler: fix safety build on clang (#3006) * Chrysler: fix safety build on clang * misra --- opendbc/safety/modes/chrysler.h | 144 ++++++++++++++------------------ 1 file changed, 62 insertions(+), 82 deletions(-) diff --git a/opendbc/safety/modes/chrysler.h b/opendbc/safety/modes/chrysler.h index e8e2ac0ebba..334cf60d72f 100644 --- a/opendbc/safety/modes/chrysler.h +++ b/opendbc/safety/modes/chrysler.h @@ -2,16 +2,35 @@ #include "opendbc/safety/declarations.h" -typedef struct { - const unsigned int EPS_2; - const unsigned int ESP_1; - const unsigned int ESP_8; - const unsigned int ECM_5; - const unsigned int DAS_3; - const unsigned int DAS_6; - const unsigned int LKAS_COMMAND; - const unsigned int CRUISE_BUTTONS; -} ChryslerAddrs; +// Chrysler Pacifica/Jeep addresses +#define CHRYSLER_EPS_2 0x220 // EPS driver input torque +#define CHRYSLER_ESP_1 0x140 // Brake pedal and vehicle speed +#define CHRYSLER_ESP_8 0x11C // Brake pedal and vehicle speed +#define CHRYSLER_ECM_5 0x22F // Throttle position sensor +#define CHRYSLER_DAS_3 0x1F4 // ACC engagement states from DASM +#define CHRYSLER_DAS_6 0x2A6 // LKAS HUD and auto headlight control from DASM +#define CHRYSLER_LKAS_COMMAND 0x292 // LKAS controls from DASM +#define CHRYSLER_CRUISE_BUTTONS 0x23B // Cruise control buttons + +// RAM DT addresses +#define CHRYSLER_RAM_DT_EPS_2 0x31 +#define CHRYSLER_RAM_DT_ESP_1 0x83 +#define CHRYSLER_RAM_DT_ESP_8 0x79 +#define CHRYSLER_RAM_DT_ECM_5 0x9D +#define CHRYSLER_RAM_DT_DAS_3 0x99 +#define CHRYSLER_RAM_DT_DAS_6 0xFA +#define CHRYSLER_RAM_DT_LKAS_COMMAND 0xA6 +#define CHRYSLER_RAM_DT_CRUISE_BUTTONS 0xB1 + +// RAM HD addresses +#define CHRYSLER_RAM_HD_EPS_2 0x220 +#define CHRYSLER_RAM_HD_ESP_1 0x140 +#define CHRYSLER_RAM_HD_ESP_8 0x11C +#define CHRYSLER_RAM_HD_ECM_5 0x22F +#define CHRYSLER_RAM_HD_DAS_3 0x1F4 +#define CHRYSLER_RAM_HD_DAS_6 0x275 +#define CHRYSLER_RAM_HD_LKAS_COMMAND 0x276 +#define CHRYSLER_RAM_HD_CRUISE_BUTTONS 0x23A typedef enum { CHRYSLER_RAM_DT, @@ -19,7 +38,9 @@ typedef enum { CHRYSLER_PACIFICA, // plus Jeep } ChryslerPlatform; static ChryslerPlatform chrysler_platform; -static const ChryslerAddrs *chrysler_addrs; + +#define CHRYSLER_ADDR(name) ((uint32_t)((chrysler_platform == CHRYSLER_RAM_DT) ? CHRYSLER_RAM_DT_##name : \ + ((chrysler_platform == CHRYSLER_RAM_HD) ? CHRYSLER_RAM_HD_##name : CHRYSLER_##name))) static uint32_t chrysler_get_checksum(const CANPacket_t *msg) { int checksum_byte = GET_LEN(msg) - 1U; @@ -65,21 +86,21 @@ static uint8_t chrysler_get_counter(const CANPacket_t *msg) { static void chrysler_rx_hook(const CANPacket_t *msg) { // Measured EPS torque - if ((msg->bus == 0U) && (msg->addr == chrysler_addrs->EPS_2)) { + if ((msg->bus == 0U) && (msg->addr == CHRYSLER_ADDR(EPS_2))) { int torque_meas_new = ((msg->data[4] & 0x7U) << 8) + msg->data[5] - 1024U; update_sample(&torque_meas, torque_meas_new); } // enter controls on rising edge of ACC, exit controls on ACC off const unsigned int das_3_bus = (chrysler_platform == CHRYSLER_PACIFICA) ? 0U : 2U; - if ((msg->bus == das_3_bus) && (msg->addr == chrysler_addrs->DAS_3)) { + if ((msg->bus == das_3_bus) && (msg->addr == CHRYSLER_ADDR(DAS_3))) { bool cruise_engaged = GET_BIT(msg, 21U); pcm_cruise_check(cruise_engaged); } // TODO: use the same message for both // update vehicle moving - if ((chrysler_platform != CHRYSLER_PACIFICA) && (msg->bus == 0U) && (msg->addr == chrysler_addrs->ESP_8)) { + if ((chrysler_platform != CHRYSLER_PACIFICA) && (msg->bus == 0U) && (msg->addr == CHRYSLER_ADDR(ESP_8))) { vehicle_moving = ((msg->data[4] << 8) + msg->data[5]) != 0U; } if ((chrysler_platform == CHRYSLER_PACIFICA) && (msg->bus == 0U) && (msg->addr == 514U)) { @@ -89,12 +110,12 @@ static void chrysler_rx_hook(const CANPacket_t *msg) { } // exit controls on rising edge of gas press - if ((msg->bus == 0U) && (msg->addr == chrysler_addrs->ECM_5)) { + if ((msg->bus == 0U) && (msg->addr == CHRYSLER_ADDR(ECM_5))) { gas_pressed = msg->data[0U] != 0U; } // exit controls on rising edge of brake press - if ((msg->bus == 0U) && (msg->addr == chrysler_addrs->ESP_1)) { + if ((msg->bus == 0U) && (msg->addr == CHRYSLER_ADDR(ESP_1))) { brake_pressed = ((msg->data[0U] & 0xFU) >> 2U) == 1U; } } @@ -130,7 +151,7 @@ static bool chrysler_tx_hook(const CANPacket_t *msg) { bool tx = true; // STEERING - if (msg->addr == chrysler_addrs->LKAS_COMMAND) { + if (msg->addr == CHRYSLER_ADDR(LKAS_COMMAND)) { int start_byte = (chrysler_platform == CHRYSLER_PACIFICA) ? 0 : 1; int desired_torque = ((msg->data[start_byte] & 0x7U) << 8) | msg->data[start_byte + 1]; desired_torque -= 1024; @@ -145,7 +166,7 @@ static bool chrysler_tx_hook(const CANPacket_t *msg) { } // FORCE CANCEL: only the cancel button press is allowed - if (msg->addr == chrysler_addrs->CRUISE_BUTTONS) { + if (msg->addr == CHRYSLER_ADDR(CRUISE_BUTTONS)) { const bool is_cancel = msg->data[0] == 1U; const bool is_resume = msg->data[0] == 0x10U; const bool allowed = is_cancel || (is_resume && controls_allowed); @@ -158,87 +179,49 @@ static bool chrysler_tx_hook(const CANPacket_t *msg) { } static safety_config chrysler_init(uint16_t param) { - const uint32_t CHRYSLER_PARAM_RAM_DT = 1U; // set for Ram DT platform - // CAN messages for Chrysler/Jeep platforms - static const ChryslerAddrs CHRYSLER_ADDRS = { - .EPS_2 = 0x220, // EPS driver input torque - .ESP_1 = 0x140, // Brake pedal and vehicle speed - .ESP_8 = 0x11C, // Brake pedal and vehicle speed - .ECM_5 = 0x22F, // Throttle position sensor - .DAS_3 = 0x1F4, // ACC engagement states from DASM - .DAS_6 = 0x2A6, // LKAS HUD and auto headlight control from DASM - .LKAS_COMMAND = 0x292, // LKAS controls from DASM - .CRUISE_BUTTONS = 0x23B, // Cruise control buttons - }; - - // CAN messages for the 5th gen RAM DT platform - static const ChryslerAddrs CHRYSLER_RAM_DT_ADDRS = { - .EPS_2 = 0x31, // EPS driver input torque - .ESP_1 = 0x83, // Brake pedal and vehicle speed - .ESP_8 = 0x79, // Brake pedal and vehicle speed - .ECM_5 = 0x9D, // Throttle position sensor - .DAS_3 = 0x99, // ACC engagement states from DASM - .DAS_6 = 0xFA, // LKAS HUD and auto headlight control from DASM - .LKAS_COMMAND = 0xA6, // LKAS controls from DASM - .CRUISE_BUTTONS = 0xB1, // Cruise control buttons - }; - static RxCheck chrysler_ram_dt_rx_checks[] = { - {.msg = {{CHRYSLER_RAM_DT_ADDRS.EPS_2, 0, 8, 100U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, - {.msg = {{CHRYSLER_RAM_DT_ADDRS.ESP_1, 0, 8, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, - {.msg = {{CHRYSLER_RAM_DT_ADDRS.ESP_8, 0, 8, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, - {.msg = {{CHRYSLER_RAM_DT_ADDRS.ECM_5, 0, 8, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, - {.msg = {{CHRYSLER_RAM_DT_ADDRS.DAS_3, 2, 8, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{CHRYSLER_RAM_DT_EPS_2, 0, 8, 100U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{CHRYSLER_RAM_DT_ESP_1, 0, 8, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{CHRYSLER_RAM_DT_ESP_8, 0, 8, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{CHRYSLER_RAM_DT_ECM_5, 0, 8, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{CHRYSLER_RAM_DT_DAS_3, 2, 8, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, }; static RxCheck chrysler_rx_checks[] = { - {.msg = {{CHRYSLER_ADDRS.EPS_2, 0, 8, 100U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, - {.msg = {{CHRYSLER_ADDRS.ESP_1, 0, 8, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, - //{.msg = {{ESP_8, 0, 8, .max_counter = 15U, .ignore_quality_flag = true, .frequency = 50U}}}, + {.msg = {{CHRYSLER_EPS_2, 0, 8, 100U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{CHRYSLER_ESP_1, 0, 8, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, {.msg = {{514, 0, 8, 100U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, - {.msg = {{CHRYSLER_ADDRS.ECM_5, 0, 8, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, - {.msg = {{CHRYSLER_ADDRS.DAS_3, 0, 8, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{CHRYSLER_ECM_5, 0, 8, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{CHRYSLER_DAS_3, 0, 8, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, }; static const CanMsg CHRYSLER_TX_MSGS[] = { - {CHRYSLER_ADDRS.CRUISE_BUTTONS, 0, 3, .check_relay = false}, - {CHRYSLER_ADDRS.LKAS_COMMAND, 0, 6, .check_relay = true}, - {CHRYSLER_ADDRS.DAS_6, 0, 8, .check_relay = true}, + {CHRYSLER_CRUISE_BUTTONS, 0, 3, .check_relay = false}, + {CHRYSLER_LKAS_COMMAND, 0, 6, .check_relay = true}, + {CHRYSLER_DAS_6, 0, 8, .check_relay = true}, }; static const CanMsg CHRYSLER_RAM_DT_TX_MSGS[] = { - {CHRYSLER_RAM_DT_ADDRS.CRUISE_BUTTONS, 2, 3, .check_relay = false}, - {CHRYSLER_RAM_DT_ADDRS.LKAS_COMMAND, 0, 8, .check_relay = true}, - {CHRYSLER_RAM_DT_ADDRS.DAS_6, 0, 8, .check_relay = true}, + {CHRYSLER_RAM_DT_CRUISE_BUTTONS, 2, 3, .check_relay = false}, + {CHRYSLER_RAM_DT_LKAS_COMMAND, 0, 8, .check_relay = true}, + {CHRYSLER_RAM_DT_DAS_6, 0, 8, .check_relay = true}, }; #ifdef ALLOW_DEBUG - // CAN messages for the 5th gen RAM HD platform - static const ChryslerAddrs CHRYSLER_RAM_HD_ADDRS = { - .EPS_2 = 0x220, // EPS driver input torque - .ESP_1 = 0x140, // Brake pedal and vehicle speed - .ESP_8 = 0x11C, // Brake pedal and vehicle speed - .ECM_5 = 0x22F, // Throttle position sensor - .DAS_3 = 0x1F4, // ACC engagement states from DASM - .DAS_6 = 0x275, // LKAS HUD and auto headlight control from DASM - .LKAS_COMMAND = 0x276, // LKAS controls from DASM - .CRUISE_BUTTONS = 0x23A, // Cruise control buttons - }; - static RxCheck chrysler_ram_hd_rx_checks[] = { - {.msg = {{CHRYSLER_RAM_HD_ADDRS.EPS_2, 0, 8, 100U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, - {.msg = {{CHRYSLER_RAM_HD_ADDRS.ESP_1, 0, 8, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, - {.msg = {{CHRYSLER_RAM_HD_ADDRS.ESP_8, 0, 8, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, - {.msg = {{CHRYSLER_RAM_HD_ADDRS.ECM_5, 0, 8, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, - {.msg = {{CHRYSLER_RAM_HD_ADDRS.DAS_3, 2, 8, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{CHRYSLER_RAM_HD_EPS_2, 0, 8, 100U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{CHRYSLER_RAM_HD_ESP_1, 0, 8, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{CHRYSLER_RAM_HD_ESP_8, 0, 8, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{CHRYSLER_RAM_HD_ECM_5, 0, 8, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{CHRYSLER_RAM_HD_DAS_3, 2, 8, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, }; static const CanMsg CHRYSLER_RAM_HD_TX_MSGS[] = { - {CHRYSLER_RAM_HD_ADDRS.CRUISE_BUTTONS, 2, 3, .check_relay = false}, - {CHRYSLER_RAM_HD_ADDRS.LKAS_COMMAND, 0, 8, .check_relay = true}, - {CHRYSLER_RAM_HD_ADDRS.DAS_6, 0, 8, .check_relay = true}, + {CHRYSLER_RAM_HD_CRUISE_BUTTONS, 2, 3, .check_relay = false}, + {CHRYSLER_RAM_HD_LKAS_COMMAND, 0, 8, .check_relay = true}, + {CHRYSLER_RAM_HD_DAS_6, 0, 8, .check_relay = true}, }; const uint32_t CHRYSLER_PARAM_RAM_HD = 2U; // set for Ram HD platform @@ -251,17 +234,14 @@ static safety_config chrysler_init(uint16_t param) { if (enable_ram_dt) { chrysler_platform = CHRYSLER_RAM_DT; - chrysler_addrs = &CHRYSLER_RAM_DT_ADDRS; ret = BUILD_SAFETY_CFG(chrysler_ram_dt_rx_checks, CHRYSLER_RAM_DT_TX_MSGS); #ifdef ALLOW_DEBUG } else if (enable_ram_hd) { chrysler_platform = CHRYSLER_RAM_HD; - chrysler_addrs = &CHRYSLER_RAM_HD_ADDRS; ret = BUILD_SAFETY_CFG(chrysler_ram_hd_rx_checks, CHRYSLER_RAM_HD_TX_MSGS); #endif } else { chrysler_platform = CHRYSLER_PACIFICA; - chrysler_addrs = &CHRYSLER_ADDRS; ret = BUILD_SAFETY_CFG(chrysler_rx_checks, CHRYSLER_TX_MSGS); } return ret; From 9fc469ae0fefbe7f15f760721145b037a5602f8a Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 30 Dec 2025 08:53:12 -0800 Subject: [PATCH 019/229] safety: always run tests with UBSAN (#3007) --- .github/workflows/tests.yml | 6 +----- SConstruct | 4 ---- opendbc/safety/tests/libsafety/SConscript | 7 ++----- opendbc/safety/tests/test.sh | 6 +----- 4 files changed, 4 insertions(+), 19 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c5ecf348e02..6f04f489d35 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -28,10 +28,6 @@ jobs: safety_tests: name: safety runs-on: ${{ github.repository == 'commaai/opendbc' && 'namespace-profile-amd64-8x16' || 'ubuntu-latest' }} - strategy: - fail-fast: false - matrix: - flags: ['--ubsan'] steps: - uses: commaai/timeout@v1 with: @@ -39,7 +35,7 @@ jobs: - uses: actions/checkout@v4 - uses: ./.github/workflows/cache - name: Run safety tests - run: ./opendbc/safety/tests/test.sh ${{ matrix.flags }} + run: ./opendbc/safety/tests/test.sh mutation: name: Safety mutation tests diff --git a/SConstruct b/SConstruct index 897ae18e1de..15289e75284 100644 --- a/SConstruct +++ b/SConstruct @@ -4,8 +4,4 @@ AddOption('--minimal', default=True, help='the minimum build. no tests, tools, etc.') -AddOption('--ubsan', - action='store_true', - help='turn on UBSan') - SConscript(['SConscript']) diff --git a/opendbc/safety/tests/libsafety/SConscript b/opendbc/safety/tests/libsafety/SConscript index 7d584df56d9..3abd0375ad2 100644 --- a/opendbc/safety/tests/libsafety/SConscript +++ b/opendbc/safety/tests/libsafety/SConscript @@ -33,17 +33,14 @@ env = Environment( LINKFLAGS=[ '-fprofile-arcs', '-ftest-coverage', + '-fsanitize=undefined', + '-fno-sanitize-recover=undefined', ], CPPPATH=["#"], tools=["default", "compilation_db"], ) if system == "Darwin": env.PrependENVPath('PATH', '/opt/homebrew/bin') -if GetOption('ubsan'): - env.Prepend(LINKFLAGS=[ - "-fsanitize=undefined", - "-fno-sanitize-recover=undefined", - ]) # mutation env menv = env.Clone() diff --git a/opendbc/safety/tests/test.sh b/opendbc/safety/tests/test.sh index 8865aad496c..eae291f7f7c 100755 --- a/opendbc/safety/tests/test.sh +++ b/opendbc/safety/tests/test.sh @@ -8,11 +8,7 @@ source ../../../setup.sh # reset coverage data and generate gcc note file rm -f ./libsafety/*.gcda -if [ "$1" == "--ubsan" ]; then - scons -j$(nproc) -D --ubsan -else - scons -j$(nproc) -D -fi +scons -j$(nproc) -D # run safety tests and generate coverage data pytest -n8 --ignore-glob=misra/* From f812bf7cde0610d57569f5cc06c3beb79a95be04 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Wed, 31 Dec 2025 15:03:29 -0800 Subject: [PATCH 020/229] safety: single libsafety.so (#3013) * safety: single libsafety.so * llvm --- opendbc/safety/tests/libsafety/SConscript | 50 ++++++------------- .../safety/tests/libsafety/libsafety_py.py | 2 +- opendbc/safety/tests/mutation.sh | 3 +- opendbc/safety/tests/test.sh | 12 +++-- 4 files changed, 25 insertions(+), 42 deletions(-) diff --git a/opendbc/safety/tests/libsafety/SConscript b/opendbc/safety/tests/libsafety/SConscript index 3abd0375ad2..a8cb50cc2e0 100644 --- a/opendbc/safety/tests/libsafety/SConscript +++ b/opendbc/safety/tests/libsafety/SConscript @@ -1,19 +1,16 @@ import platform -CC = 'gcc' system = platform.system() -mac_ver = platform.mac_ver() -# gcc installed by homebrew has version suffix (e.g. gcc-12) in order to be -# distinguishable from system one - which acts as a symlink to clang -# clang works on macOS 15 and greater but has issues on earlier macOS versions. -# see: https://github.com/commaai/openpilot/issues/35093 -if system == 'Darwin' and mac_ver[0] and mac_ver[0] < '15': - CC += '-13' +# Use clang-17 for both normal tests and mutation testing +# The Mull plugin injects mutations that are dormant unless run with mull-runner +if system == "Darwin": + mull_plugin = Dir('#').abspath + '/.mull/lib/mull-ir-frontend-17' +else: + mull_plugin = '/usr/lib/mull-ir-frontend-17' -# standard env env = Environment( - CC=CC, + CC='clang-17', CFLAGS=[ '-Wall', "-Wextra", @@ -28,6 +25,8 @@ env = Environment( '-fno-omit-frame-pointer', '-fprofile-arcs', '-ftest-coverage', + f'-fpass-plugin={mull_plugin}', + '-grecord-command-line', '-DALLOW_DEBUG', ], LINKFLAGS=[ @@ -40,31 +39,10 @@ env = Environment( tools=["default", "compilation_db"], ) if system == "Darwin": - env.PrependENVPath('PATH', '/opt/homebrew/bin') - -# mutation env -menv = env.Clone() -if system == "Darwin": - menv.PrependENVPath('PATH', '/opt/homebrew/opt/llvm@17/bin') - mull_plugin = Dir('#').abspath + '/.mull/lib/mull-ir-frontend-17' -else: - mull_plugin = '/usr/lib/mull-ir-frontend-17' -menv['CC'] = 'clang-17' -flags = [ - '-fprofile-instr-generate', - '-fcoverage-mapping', - f'-fpass-plugin={mull_plugin}', - '-g', - '-grecord-command-line', -] -menv['CFLAGS'] += flags -menv['LINKFLAGS'] = flags -menv['CFLAGS'].remove('-fprofile-arcs') -menv['CFLAGS'].remove('-ftest-coverage') + env.PrependENVPath('PATH', '/opt/homebrew/opt/llvm@17/bin') -for build_env, suffix in ((env, ""), (menv, "_mutation")): - safety = build_env.SharedObject(f"safety{suffix}.os", "safety.c") - libsafety = build_env.SharedLibrary(f"libsafety{suffix}.so", [safety]) +safety = env.SharedObject("safety.os", "safety.c") +libsafety = env.SharedLibrary("libsafety.so", [safety]) - # GCC note file is generated by compiler, allow scons to clean it up - build_env.SideEffect("safety.gcno", safety) +# GCC-style note file is generated by compiler, allow scons to clean it up +env.SideEffect("safety.gcno", safety) diff --git a/opendbc/safety/tests/libsafety/libsafety_py.py b/opendbc/safety/tests/libsafety/libsafety_py.py index ee314b6e124..e93b782ea4a 100644 --- a/opendbc/safety/tests/libsafety/libsafety_py.py +++ b/opendbc/safety/tests/libsafety/libsafety_py.py @@ -4,7 +4,7 @@ from opendbc.safety import LEN_TO_DLC libsafety_dir = os.path.dirname(os.path.abspath(__file__)) -libsafety_fn = os.path.join(libsafety_dir, "libsafety_mutation.so" if "MUTATION" in os.environ else "libsafety.so") +libsafety_fn = os.path.join(libsafety_dir, "libsafety.so") ffi = FFI() diff --git a/opendbc/safety/tests/mutation.sh b/opendbc/safety/tests/mutation.sh index c0513357c84..411bab3598e 100755 --- a/opendbc/safety/tests/mutation.sh +++ b/opendbc/safety/tests/mutation.sh @@ -17,5 +17,4 @@ EOF scons -j4 -D -export MUTATION=1 -mull-runner-17 --debug --ld-search-path /lib/x86_64-linux-gnu/ ./libsafety/libsafety_mutation.so -test-program=pytest -- -n8 --ignore-glob=misra/* \ No newline at end of file +mull-runner-17 --debug --ld-search-path /lib/x86_64-linux-gnu/ ./libsafety/libsafety.so -test-program=pytest -- -n8 --ignore-glob=misra/* \ No newline at end of file diff --git a/opendbc/safety/tests/test.sh b/opendbc/safety/tests/test.sh index eae291f7f7c..e121721bcd4 100755 --- a/opendbc/safety/tests/test.sh +++ b/opendbc/safety/tests/test.sh @@ -13,16 +13,22 @@ scons -j$(nproc) -D # run safety tests and generate coverage data pytest -n8 --ignore-glob=misra/* +if [ "$(uname)" = "Darwin" ]; then + GCOV_EXEC="/opt/homebrew/opt/llvm@17/bin/llvm-cov gcov" +else + GCOV_EXEC="llvm-cov-17 gcov" +fi + # generate and open report if [ "$1" == "--report" ]; then mkdir -p coverage-out - gcovr -r ../ --html-nested coverage-out/index.html + gcovr -r ../ --gcov-executable "$GCOV_EXEC" --html-nested coverage-out/index.html sensible-browser coverage-out/index.html fi # test coverage -GCOV="gcovr -r $DIR/../ -d --fail-under-line=100 -e ^libsafety" -if ! GCOV_OUTPUT="$($GCOV)"; then +GCOV="gcovr -r $DIR/../ --gcov-executable \"$GCOV_EXEC\" -d --fail-under-line=100 -e ^libsafety" +if ! GCOV_OUTPUT="$(eval $GCOV)"; then echo -e "FAILED:\n$GCOV_OUTPUT" exit 1 else From e6d902eac27f620308e3ee1ebfa7b9cc7c72e9eb Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Sun, 4 Jan 2026 16:27:08 -0500 Subject: [PATCH 021/229] VW PQ: Revert change to gear position VAL table (#3020) --- opendbc/dbc/vw_pq.dbc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendbc/dbc/vw_pq.dbc b/opendbc/dbc/vw_pq.dbc index 97bea0cffd2..77b009a7396 100644 --- a/opendbc/dbc/vw_pq.dbc +++ b/opendbc/dbc/vw_pq.dbc @@ -1877,7 +1877,7 @@ VAL_ 1088 GE1_WK 0 "WK_open" 1 "WK_regulated" 2 "WK_closed" 3 "Failure"; VAL_ 1088 GE1_StSt_Info 0 "Engine_running_not_necessary_stop_release" 1 "Motor_start_not_mandatory_necessary_stop_prohibition" 2 "Motor_start_absolute_necessary_start_request" 3 "System_error"; VAL_ 1088 GE1_EGS_Anf 0 "no_requirement" 1 "EGS_requirement"; VAL_ 1088 GE1_Zielgang 0 "P (Park) | Disengaged" 1 "Gear 1 | Engaged" 2 "Gear 2 | Engaged" 3 "Gear 3 | Engaged" 4 "Gear 4 | Engaged" 5 "Gear 5 | Engaged" 6 "1m Gear" 7 "Gang_R" 8 "Gear 6 | Engaged" 9 "Gear 7 | Engaged" 10 "Gear 8 | Engaged" 14 "Speed Not Defined" 15 "Failure"; -VAL_ 1088 GE1_Wahl_Pos 0 "Intermediate Position" 1 "Pos_1" 2 "Pos_2" 3 "Pos_3" 4 "Pos_4" 5 "D (Drive)" 6 "Pos_N" 7 "R (Reverse)" 8 "P (Park)" 9 "Tiptronic Override" 10 "Pos_Z1" 11 "Pos_Z2" 12 "S (Sport)" 13 "Pos_L" 14 "Gas Pedal Force Downshift" 15 "Failure"; +VAL_ 1088 GE1_Wahl_Pos 8 "P" 7 "R" 6 "N" 5 "D" 9 "U" 12 "S" 14 "T" 10 "T" 11 "T"; VAL_ 1088 GE1_Notlauf 0 "No Emergency" 1 "No Switching" 2 "Switch to Neutral" 3 "50% Shifting Capacity" 4 "Driving Without UK" 5 "No Emeregency" 6 "No Emergency" 7 "No Emergency, Target Shifting Reached" 15 "Failure"; VAL_ 1088 GE1_Kuehlung 0 "No Additional Cooling Requested" 1 "20% Additional Fan Cooling Requested" 2 "40% Additional Fan Cooling Requested" 3 "Maximum Additional Fan Cooling Requested"; VAL_ 1088 GE1_Sta_OBD 0 "MIL Off" 1 "MIL On"; From 3ea2e666670df989c6ada2a7f2acbd0109fae4a6 Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Sun, 4 Jan 2026 19:45:31 -0500 Subject: [PATCH 022/229] cleanup CARS.md generation (#3021) cleanup SecOC doc generation --- docs/CARS.md | 15 +++++++++++---- opendbc/car/CARS_template.md | 9 ++++++++- opendbc/car/docs.py | 2 +- opendbc/car/docs_definitions.py | 4 +--- opendbc/car/toyota/values.py | 12 ++++++------ 5 files changed, 27 insertions(+), 15 deletions(-) diff --git a/docs/CARS.md b/docs/CARS.md index 47e41bbdfd2..e6ecbff2eae 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -338,15 +338,15 @@ |Toyota|RAV4 Hybrid 2019-21|All|[Upstream](#upstream)| |Toyota|RAV4 Hybrid 2022|All|[Upstream](#upstream)| |Toyota|RAV4 Hybrid 2023-25|All|[Upstream](#upstream)| -|Toyota|RAV4 Prime 2021-23|All|[Community](#community)| +|Toyota|RAV4 Prime 2021-23|All|[Custom](#secoc-cars-with-recoverable-keys)| |Toyota|RAV4 Prime 2024-25|Any|[Not compatible](#can-bus-security)| |Toyota|Sequoia 2023-25|Any|[Not compatible](#can-bus-security)| |Toyota|Sienna 2018-20|All|[Upstream](#upstream)| -|Toyota|Sienna 2021-23|All|[Community](#community)| +|Toyota|Sienna 2021-23|All|[Custom](#secoc-cars-with-recoverable-keys)| |Toyota|Sienna 2024-25|Any|[Not compatible](#can-bus-security)| |Toyota|Tundra 2022-25|Any|[Not compatible](#can-bus-security)| |Toyota|Venza 2021-25|Any|[Not compatible](#can-bus-security)| -|Toyota|Yaris (Non-US only) 2020, 2023|All|[Community](#community)| +|Toyota|Yaris (Non-US only) 2020, 2023|All|[Custom](#secoc-cars-with-recoverable-keys)| |Volkswagen|Arteon 2018-23|Adaptive Cruise Control (ACC) & Lane Assist|[Upstream](#upstream)| |Volkswagen|Arteon eHybrid 2020-23|Adaptive Cruise Control (ACC) & Lane Assist|[Upstream](#upstream)| |Volkswagen|Arteon R 2020-23|Adaptive Cruise Control (ACC) & Lane Assist|[Upstream](#upstream)| @@ -412,7 +412,14 @@ openpilot is installed, but custom forks may allow their use. Vehicles in this category are not considered plug-and-play. Software support is included in upstream openpilot, but these vehicles might not have a harness in the comma store, or the physical install might be at an unusual or cumbersome -location, or they might need unusual configuration after install. +location, or they might need unusual configuration after install. These vehicles will not work with release builds of +openpilot, but depending on the situation, development builds or custom forks may allow their use. + +### SecOC cars with recoverable keys + +For a small subset of SecOC-protected vehicles, tools may be available in the community to recover the SecOC keys. These +tools, and the recovery process, are not part of openpilot. If supplied with a valid SecOC key, development builds or +custom forks may work with these vehicles. Release builds of openpilot don't support SecOC. ## Dashcam diff --git a/opendbc/car/CARS_template.md b/opendbc/car/CARS_template.md index 9d71ad0a8be..5b2ac5e14be 100644 --- a/opendbc/car/CARS_template.md +++ b/opendbc/car/CARS_template.md @@ -32,7 +32,14 @@ openpilot is installed, but custom forks may allow their use. Vehicles in this category are not considered plug-and-play. Software support is included in upstream openpilot, but these vehicles might not have a harness in the comma store, or the physical install might be at an unusual or cumbersome -location, or they might need unusual configuration after install. +location, or they might need unusual configuration after install. These vehicles will not work with release builds of +openpilot, but depending on the situation, development builds or custom forks may allow their use. + +### SecOC cars with recoverable keys + +For a small subset of SecOC-protected vehicles, tools may be available in the community to recover the SecOC keys. These +tools, and the recovery process, are not part of openpilot. If supplied with a valid SecOC key, development builds or +custom forks may work with these vehicles. Release builds of openpilot don't support SecOC. ## Dashcam diff --git a/opendbc/car/docs.py b/opendbc/car/docs.py index 901b889d50b..bfd8964a58c 100755 --- a/opendbc/car/docs.py +++ b/opendbc/car/docs.py @@ -32,7 +32,7 @@ def get_params_for_docs(platform) -> CarParams: cp_platform = platform if platform in interfaces else MOCK.MOCK CP: CarParams = interfaces[cp_platform].get_params(cp_platform, fingerprint=gen_empty_fingerprint(), car_fw=[CarParams.CarFw(ecu=CarParams.Ecu.unknown)], - alpha_long=True, is_release=False, docs=True) + alpha_long=True, is_release=True, docs=True) return CP diff --git a/opendbc/car/docs_definitions.py b/opendbc/car/docs_definitions.py index 0debd0a49b5..2f49b834f61 100644 --- a/opendbc/car/docs_definitions.py +++ b/opendbc/car/docs_definitions.py @@ -256,11 +256,9 @@ def init(self, CP: CarParams, all_footnotes=None): self.longitudinal_control = CP.openpilotLongitudinalControl and not CP.alphaLongitudinalAvailable if self.merged and CP.dashcamOnly: - if self.support_type != SupportType.REVIEW: + if self.support_type not in (SupportType.CUSTOM, SupportType.REVIEW): self.support_type = SupportType.DASHCAM self.support_link = "#dashcam" - else: - self.support_link = "#under-review" # longitudinal column op_long = "Stock" diff --git a/opendbc/car/toyota/values.py b/opendbc/car/toyota/values.py index 0b85d386b00..53fca72bd43 100644 --- a/opendbc/car/toyota/values.py +++ b/opendbc/car/toyota/values.py @@ -97,9 +97,9 @@ class ToyotaCarDocs(CarDocs): @dataclass -class ToyotaCommunityCarDocs(ToyotaCarDocs): - support_type: SupportType = SupportType.COMMUNITY - support_link: str = "#community" +class ToyotaSecOcCarDocs(ToyotaCarDocs): + support_type: SupportType = SupportType.CUSTOM + support_link: str = "#secoc-cars-with-recoverable-keys" @dataclass @@ -288,11 +288,11 @@ class CAR(Platforms): flags=ToyotaFlags.RADAR_ACC | ToyotaFlags.ANGLE_CONTROL, ) TOYOTA_RAV4_PRIME = ToyotaSecOCPlatformConfig( - [ToyotaCommunityCarDocs("Toyota RAV4 Prime 2021-23", min_enable_speed=MIN_ACC_SPEED)], + [ToyotaSecOcCarDocs("Toyota RAV4 Prime 2021-23", min_enable_speed=MIN_ACC_SPEED)], CarSpecs(mass=4372. * CV.LB_TO_KG, wheelbase=2.68, steerRatio=16.88, tireStiffnessFactor=0.5533), ) TOYOTA_YARIS = ToyotaSecOCPlatformConfig( - [ToyotaCommunityCarDocs("Toyota Yaris (Non-US only) 2020, 2023", min_enable_speed=MIN_ACC_SPEED)], + [ToyotaSecOcCarDocs("Toyota Yaris (Non-US only) 2020, 2023", min_enable_speed=MIN_ACC_SPEED)], CarSpecs(mass=1170, wheelbase=2.55, steerRatio=14.80, tireStiffnessFactor=0.5533), flags=ToyotaFlags.RADAR_ACC, ) @@ -307,7 +307,7 @@ class CAR(Platforms): flags=ToyotaFlags.NO_STOP_TIMER, ) TOYOTA_SIENNA_4TH_GEN = ToyotaSecOCPlatformConfig( - [ToyotaCommunityCarDocs("Toyota Sienna 2021-23", min_enable_speed=MIN_ACC_SPEED)], + [ToyotaSecOcCarDocs("Toyota Sienna 2021-23", min_enable_speed=MIN_ACC_SPEED)], CarSpecs(mass=4625. * CV.LB_TO_KG, wheelbase=3.06, steerRatio=17.8, tireStiffnessFactor=0.444), ) From d2fa82f95979455765c6ecd484776eb8603f79e1 Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Sun, 4 Jan 2026 20:17:52 -0500 Subject: [PATCH 023/229] VW: Allow PQ/MLB cars to drive on dev builds (#3022) VW: Allow PQ/MLB cars in dev builds --- docs/CARS.md | 2 +- opendbc/car/volkswagen/interface.py | 10 ++-------- opendbc/car/volkswagen/values.py | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/docs/CARS.md b/docs/CARS.md index e6ecbff2eae..f3ee8696a4d 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -370,7 +370,7 @@ |Volkswagen|Golf SportsVan 2015-20|Adaptive Cruise Control (ACC) & Lane Assist|[Upstream](#upstream)| |Volkswagen|Grand California 2019-24|Adaptive Cruise Control (ACC) & Lane Assist|[Upstream](#upstream)| |Volkswagen|Jetta 2015-18|Adaptive Cruise Control (ACC) & Lane Assist|[Dashcam mode](#dashcam)| -|Volkswagen|Jetta 2018-23|Adaptive Cruise Control (ACC) & Lane Assist|[Upstream](#upstream)| +|Volkswagen|Jetta 2019-23|Adaptive Cruise Control (ACC) & Lane Assist|[Upstream](#upstream)| |Volkswagen|Jetta GLI 2021-23|Adaptive Cruise Control (ACC) & Lane Assist|[Upstream](#upstream)| |Volkswagen|Passat 2015-22|Adaptive Cruise Control (ACC) & Lane Assist|[Upstream](#upstream)| |Volkswagen|Passat Alltrack 2015-22|Adaptive Cruise Control (ACC) & Lane Assist|[Upstream](#upstream)| diff --git a/opendbc/car/volkswagen/interface.py b/opendbc/car/volkswagen/interface.py index 88a38eba58c..89a8e70c67e 100644 --- a/opendbc/car/volkswagen/interface.py +++ b/opendbc/car/volkswagen/interface.py @@ -31,20 +31,14 @@ def _get_params(ret: structs.CarParams, candidate: CAR, fingerprint, car_fw, alp else: ret.networkLocation = NetworkLocation.fwdCamera - # The PQ port is in dashcam-only mode due to a fixed six-minute maximum timer on HCA steering. An unsupported - # EPS flash update to work around this timer, and enable steering down to zero, is available from: - # https://github.com/pd0wm/pq-flasher - # It is documented in a four-part blog series: - # https://blog.willemmelching.nl/carhacking/2022/01/02/vw-part1/ - # Panda ALLOW_DEBUG firmware required. - ret.dashcamOnly = True + ret.dashcamOnly = is_release # Release support needs HCA timeout fix, safety validation elif ret.flags & VolkswagenFlags.MLB: # Set global MLB parameters safety_configs = [get_safety_config(structs.CarParams.SafetyModel.volkswagenMlb)] ret.enableBsm = 0x30F in fingerprint[0] # SWA_01 ret.networkLocation = NetworkLocation.gateway - ret.dashcamOnly = True # Pending HCA timeout fix, safety validation, harness termination, install procedure + ret.dashcamOnly = is_release # Release support needs HCA timeout fix, safety validation, revised J533 harness else: # Set global MQB parameters diff --git a/opendbc/car/volkswagen/values.py b/opendbc/car/volkswagen/values.py index 513affdcbf1..62bd4ff913e 100644 --- a/opendbc/car/volkswagen/values.py +++ b/opendbc/car/volkswagen/values.py @@ -335,7 +335,7 @@ class CAR(Platforms): ) VOLKSWAGEN_JETTA_MK7 = VolkswagenMQBPlatformConfig( [ - VWCarDocs("Volkswagen Jetta 2018-23"), + VWCarDocs("Volkswagen Jetta 2019-23"), VWCarDocs("Volkswagen Jetta GLI 2021-23"), ], VolkswagenCarSpecs(mass=1328, wheelbase=2.71), From 419512f8e6f60d8822ea31df844e57f538edb280 Mon Sep 17 00:00:00 2001 From: MVL Date: Sun, 4 Jan 2026 20:38:57 -0500 Subject: [PATCH 024/229] Honda - Bump CRV Hybrid to 2026 (#2988) Bump CRV Hybrid to 2026 --- opendbc/car/honda/values.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendbc/car/honda/values.py b/opendbc/car/honda/values.py index 4171a02e7b0..49b43ecd8e8 100644 --- a/opendbc/car/honda/values.py +++ b/opendbc/car/honda/values.py @@ -214,7 +214,7 @@ class CAR(Platforms): HONDA_CRV_6G = HondaBoschCANFDPlatformConfig( [ HondaCarDocs("Honda CR-V 2023-26", "All"), - HondaCarDocs("Honda CR-V Hybrid 2023-25", "All"), + HondaCarDocs("Honda CR-V Hybrid 2023-26", "All"), ], CarSpecs(mass=1703, wheelbase=2.7, steerRatio=16.2, centerToFrontRatio=0.42), ) From c866a53b04d98f51750d20b6309191411f4d6723 Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Sun, 4 Jan 2026 21:48:10 -0500 Subject: [PATCH 025/229] VW MLB: Add FW for 2026 Porsche Macan (#3023) --- opendbc/car/volkswagen/fingerprints.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/opendbc/car/volkswagen/fingerprints.py b/opendbc/car/volkswagen/fingerprints.py index f0e13e56cee..5aa37c9493f 100644 --- a/opendbc/car/volkswagen/fingerprints.py +++ b/opendbc/car/volkswagen/fingerprints.py @@ -971,6 +971,7 @@ CAR.PORSCHE_MACAN_MK1: { (Ecu.engine, 0x7e0, None): [ b'\xf1\x8795B906259BJ\xf1\x890001', + b'\xf1\x8795B906259BM\xf1\x890001', b'\xf1\x8795B90652013\xf1\x893485', b'\xf1\x8795B90654002\xf1\x893495', b'\xf1\x8795B907551D \xf1\x890006', @@ -979,6 +980,7 @@ b'\xf1\x8795B927156CE\xf1\x890022', b'\xf1\x8795B927156JH\xf1\x890001', b'\xf1\x8795B927156KK\xf1\x890001', + b'\xf1\x8795B927156KP\xf1\x890001', b'\xf1\x8795B927156R \xf1\x890021', ], (Ecu.srs, 0x715, None): [ From d12538dd9ec3ed025576c82239d2a04ed228397e Mon Sep 17 00:00:00 2001 From: T3vl <80123588+tealtwo@users.noreply.github.com> Date: Mon, 5 Jan 2026 08:09:01 -0600 Subject: [PATCH 026/229] VW PQ: Update HCA Status to use Mode 2 (Status 7) (#2722) * VW PQ: Update HCA Status to use Mode 2 (Status 7) * VW PQ: update PQ safety test to use HCA status 7 --------- Co-authored-by: Jason Young <46612682+jyoung8607@users.noreply.github.com> --- opendbc/car/volkswagen/pqcan.py | 2 +- opendbc/safety/tests/test_volkswagen_pq.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opendbc/car/volkswagen/pqcan.py b/opendbc/car/volkswagen/pqcan.py index 138e4ec5a03..897f45324fb 100644 --- a/opendbc/car/volkswagen/pqcan.py +++ b/opendbc/car/volkswagen/pqcan.py @@ -2,7 +2,7 @@ def create_steering_control(packer, bus, apply_torque, lkas_enabled): values = { "LM_Offset": abs(apply_torque), "LM_OffSign": 1 if apply_torque < 0 else 0, - "HCA_Status": 5 if (lkas_enabled and apply_torque != 0) else 3, + "HCA_Status": 7 if (lkas_enabled and apply_torque != 0) else 3, "Vib_Freq": 16, } diff --git a/opendbc/safety/tests/test_volkswagen_pq.py b/opendbc/safety/tests/test_volkswagen_pq.py index 72f0bfa6d5f..b10b4dca7a7 100755 --- a/opendbc/safety/tests/test_volkswagen_pq.py +++ b/opendbc/safety/tests/test_volkswagen_pq.py @@ -62,7 +62,7 @@ def _torque_driver_msg(self, torque): return self.packer.make_can_msg_safety("Lenkhilfe_3", 0, values) # openpilot steering output torque - def _torque_cmd_msg(self, torque, steer_req=1, hca_status=5): + def _torque_cmd_msg(self, torque, steer_req=1, hca_status=7): values = {"LM_Offset": abs(torque), "LM_OffSign": torque < 0, "HCA_Status": hca_status if steer_req else 3} return self.packer.make_can_msg_safety("HCA_1", 0, values) From 5cc41b9f10b9975532490e50242f6c55148eba53 Mon Sep 17 00:00:00 2001 From: Hacheoy <124492751+Hacheoy@users.noreply.github.com> Date: Tue, 6 Jan 2026 05:14:29 +1100 Subject: [PATCH 027/229] Toyota: Lexus LS 500 2018 (#3010) * Add Lexus LS 2018 platform configuration * Add fingerprints for Lexus LS ECUs * Add LEXUS_LS to torque substitute * Update steer ratio for Lexus LS 2018 configuration * LS steer ratio back to 13.0 * Update steer ratio for Lexus LS 2018 based on live params * Add test route for Lexus LS * Update LS car docs to exclude LSS+ A package * Fix formatting in Lexus LS 2018 documentation --- opendbc/car/tests/routes.py | 1 + opendbc/car/torque_data/substitute.toml | 1 + opendbc/car/toyota/fingerprints.py | 20 ++++++++++++++++++++ opendbc/car/toyota/values.py | 5 +++++ 4 files changed, 27 insertions(+) diff --git a/opendbc/car/tests/routes.py b/opendbc/car/tests/routes.py index 01bcd5b3051..3fef40ef93a 100644 --- a/opendbc/car/tests/routes.py +++ b/opendbc/car/tests/routes.py @@ -253,6 +253,7 @@ class CarTestRoute(NamedTuple): CarTestRoute("3fd5305f8b6ca765/2021-04-28--19-26-49", TOYOTA.LEXUS_NX_TSS2), CarTestRoute("09ae96064ed85a14/2022-06-09--12-22-31", TOYOTA.LEXUS_NX_TSS2), # hybrid CarTestRoute("4765fbbf59e3cd88/2024-02-06--17-45-32", TOYOTA.LEXUS_LC_TSS2), + CarTestRoute("5afee5161ea1dcde/00000003--b8ae16aae0", TOYOTA.LEXUS_LS), CarTestRoute("0a302ffddbb3e3d3/2020-02-08--16-19-08", TOYOTA.TOYOTA_HIGHLANDER_TSS2), CarTestRoute("437e4d2402abf524/2021-05-25--07-58-50", TOYOTA.TOYOTA_HIGHLANDER_TSS2), # hybrid CarTestRoute("3183cd9b021e89ce/2021-05-25--10-34-44", TOYOTA.TOYOTA_HIGHLANDER), diff --git a/opendbc/car/torque_data/substitute.toml b/opendbc/car/torque_data/substitute.toml index db26c1a01da..d27476e645f 100644 --- a/opendbc/car/torque_data/substitute.toml +++ b/opendbc/car/torque_data/substitute.toml @@ -17,6 +17,7 @@ legend = ["LAT_ACCEL_FACTOR", "MAX_LAT_ACCEL_MEASURED", "FRICTION"] "LEXUS_RC" = "LEXUS_NX_TSS2" "LEXUS_RC_TSS2" = "LEXUS_NX_TSS2" "LEXUS_LC_TSS2" = "LEXUS_NX_TSS2" +"LEXUS_LS" = "LEXUS_NX" "KIA_OPTIMA_G4" = "HYUNDAI_SONATA" "KIA_OPTIMA_G4_FL" = "HYUNDAI_SONATA" diff --git a/opendbc/car/toyota/fingerprints.py b/opendbc/car/toyota/fingerprints.py index df9c16d418c..65396df222d 100644 --- a/opendbc/car/toyota/fingerprints.py +++ b/opendbc/car/toyota/fingerprints.py @@ -1859,4 +1859,24 @@ b'\x028646F5205200\x00\x00\x00\x008646G5202200\x00\x00\x00\x00', ], }, + CAR.LEXUS_LS: { + (Ecu.abs, 0x7b0, None): [ + b'F152650290\x00\x00\x00\x00\x00\x00', + ], + (Ecu.dsu, 0x791, None): [ + b'881515003400\x00\x00\x00\x00', + ], + (Ecu.eps, 0x7a1, None): [ + b'8965B50022\x00\x00\x00\x00\x00\x00', + ], + (Ecu.engine, 0x700, None): [ + b'\x028966350K7200\x00\x00\x00\x00896655066200\x00\x00\x00\x00', + ], + (Ecu.fwdRadar, 0x750, 0xf): [ + b'8821F4702300\x00\x00\x00\x00', + ], + (Ecu.fwdCamera, 0x750, 0x6d): [ + b'8646F5001200\x00\x00\x00\x00', + ], + }, } diff --git a/opendbc/car/toyota/values.py b/opendbc/car/toyota/values.py index 53fca72bd43..b7206ba84d9 100644 --- a/opendbc/car/toyota/values.py +++ b/opendbc/car/toyota/values.py @@ -397,6 +397,11 @@ class CAR(Platforms): dbc_dict('toyota_new_mc_pt_generated', 'toyota_adas'), flags=ToyotaFlags.UNSUPPORTED_DSU, ) + LEXUS_LS = PlatformConfig( + [ToyotaCarDocs("Lexus LS 2018", "All except Lexus Safety System+ A")], + CarSpecs(mass=4905. * CV.LB_TO_KG, wheelbase=3.125, steerRatio=15.0, tireStiffnessFactor=0.444), + dbc_dict('toyota_nodsu_pt_generated', 'toyota_adas'), + ) def get_platform_codes(fw_versions: list[bytes]) -> dict[bytes, set[bytes]]: From f8f370b3c93f77dc4ee6cada75870b3e00ec02bc Mon Sep 17 00:00:00 2001 From: MVL Date: Mon, 5 Jan 2026 13:24:36 -0500 Subject: [PATCH 028/229] Honda: bump Acura MDX to 2026 (#2979) bump MDX to 2026 --- opendbc/car/honda/values.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendbc/car/honda/values.py b/opendbc/car/honda/values.py index 49b43ecd8e8..3cdccc1eb24 100644 --- a/opendbc/car/honda/values.py +++ b/opendbc/car/honda/values.py @@ -262,7 +262,7 @@ class CAR(Platforms): ) # mid-model refresh ACURA_MDX_4G_MMR = HondaBoschCANFDPlatformConfig( - [HondaCarDocs("Acura MDX 2025", "All except Type S")], + [HondaCarDocs("Acura MDX 2025-26", "All except Type S")], CarSpecs(mass=4544 * CV.LB_TO_KG, wheelbase=2.89, centerToFrontRatio=0.428, steerRatio=16.2), ) HONDA_ODYSSEY_5G_MMR = HondaBoschPlatformConfig( From 9e296842df1dd9b93f9d0fd2f642aa2c5c7deecb Mon Sep 17 00:00:00 2001 From: Nikita Pylypyuk <147505783+nikitap066@users.noreply.github.com> Date: Sun, 11 Jan 2026 06:42:51 +0000 Subject: [PATCH 029/229] Toyota: whitelist hybrids for standstill resume behaviour (#3009) * whitelist Toyota hybrids for standstill resume behaviour * fixed logic for hybrid check * one check --------- Co-authored-by: Shane Smiskol --- opendbc/car/toyota/carcontroller.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/opendbc/car/toyota/carcontroller.py b/opendbc/car/toyota/carcontroller.py index 627a2e1bfeb..380c64b3af9 100644 --- a/opendbc/car/toyota/carcontroller.py +++ b/opendbc/car/toyota/carcontroller.py @@ -182,13 +182,14 @@ def update(self, CC, CS, now_nanos): # if user engages at a stop with foot on brake, PCM starts in a special cruise standstill mode. on resume press, # brakes can take a while to ramp up causing a lurch forward. prevent resume press until planner wants to move. # don't use CC.cruiseControl.resume since it is gated on CS.cruiseState.standstill which goes false for 3s after resume press - # TODO: hybrids do not have this issue and can stay stopped after resume press, whitelist them - should_resume = actuators.accel > 0 - if should_resume: - self.standstill_req = False - - if not should_resume and CS.out.cruiseState.standstill: - self.standstill_req = True + # whitelist hybrids as they do not have this issue and can stay stopped after resume press + if not self.CP.flags & ToyotaFlags.HYBRID.value: + should_resume = actuators.accel > 0 + if should_resume: + self.standstill_req = False + + if not should_resume and CS.out.cruiseState.standstill: + self.standstill_req = True self.last_standstill = CS.out.standstill From c80388aece8a5cc987c9571e4413bcd8ebb19632 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Mon, 12 Jan 2026 14:37:53 -0800 Subject: [PATCH 030/229] Revert "safety: single libsafety.so" (#3030) Revert "safety: single libsafety.so (#3013)" This reverts commit f812bf7cde0610d57569f5cc06c3beb79a95be04. --- opendbc/safety/tests/libsafety/SConscript | 50 +++++++++++++------ .../safety/tests/libsafety/libsafety_py.py | 2 +- opendbc/safety/tests/mutation.sh | 3 +- opendbc/safety/tests/test.sh | 12 ++--- 4 files changed, 42 insertions(+), 25 deletions(-) diff --git a/opendbc/safety/tests/libsafety/SConscript b/opendbc/safety/tests/libsafety/SConscript index a8cb50cc2e0..3abd0375ad2 100644 --- a/opendbc/safety/tests/libsafety/SConscript +++ b/opendbc/safety/tests/libsafety/SConscript @@ -1,16 +1,19 @@ import platform +CC = 'gcc' system = platform.system() +mac_ver = platform.mac_ver() -# Use clang-17 for both normal tests and mutation testing -# The Mull plugin injects mutations that are dormant unless run with mull-runner -if system == "Darwin": - mull_plugin = Dir('#').abspath + '/.mull/lib/mull-ir-frontend-17' -else: - mull_plugin = '/usr/lib/mull-ir-frontend-17' +# gcc installed by homebrew has version suffix (e.g. gcc-12) in order to be +# distinguishable from system one - which acts as a symlink to clang +# clang works on macOS 15 and greater but has issues on earlier macOS versions. +# see: https://github.com/commaai/openpilot/issues/35093 +if system == 'Darwin' and mac_ver[0] and mac_ver[0] < '15': + CC += '-13' +# standard env env = Environment( - CC='clang-17', + CC=CC, CFLAGS=[ '-Wall', "-Wextra", @@ -25,8 +28,6 @@ env = Environment( '-fno-omit-frame-pointer', '-fprofile-arcs', '-ftest-coverage', - f'-fpass-plugin={mull_plugin}', - '-grecord-command-line', '-DALLOW_DEBUG', ], LINKFLAGS=[ @@ -39,10 +40,31 @@ env = Environment( tools=["default", "compilation_db"], ) if system == "Darwin": - env.PrependENVPath('PATH', '/opt/homebrew/opt/llvm@17/bin') + env.PrependENVPath('PATH', '/opt/homebrew/bin') + +# mutation env +menv = env.Clone() +if system == "Darwin": + menv.PrependENVPath('PATH', '/opt/homebrew/opt/llvm@17/bin') + mull_plugin = Dir('#').abspath + '/.mull/lib/mull-ir-frontend-17' +else: + mull_plugin = '/usr/lib/mull-ir-frontend-17' +menv['CC'] = 'clang-17' +flags = [ + '-fprofile-instr-generate', + '-fcoverage-mapping', + f'-fpass-plugin={mull_plugin}', + '-g', + '-grecord-command-line', +] +menv['CFLAGS'] += flags +menv['LINKFLAGS'] = flags +menv['CFLAGS'].remove('-fprofile-arcs') +menv['CFLAGS'].remove('-ftest-coverage') -safety = env.SharedObject("safety.os", "safety.c") -libsafety = env.SharedLibrary("libsafety.so", [safety]) +for build_env, suffix in ((env, ""), (menv, "_mutation")): + safety = build_env.SharedObject(f"safety{suffix}.os", "safety.c") + libsafety = build_env.SharedLibrary(f"libsafety{suffix}.so", [safety]) -# GCC-style note file is generated by compiler, allow scons to clean it up -env.SideEffect("safety.gcno", safety) + # GCC note file is generated by compiler, allow scons to clean it up + build_env.SideEffect("safety.gcno", safety) diff --git a/opendbc/safety/tests/libsafety/libsafety_py.py b/opendbc/safety/tests/libsafety/libsafety_py.py index e93b782ea4a..ee314b6e124 100644 --- a/opendbc/safety/tests/libsafety/libsafety_py.py +++ b/opendbc/safety/tests/libsafety/libsafety_py.py @@ -4,7 +4,7 @@ from opendbc.safety import LEN_TO_DLC libsafety_dir = os.path.dirname(os.path.abspath(__file__)) -libsafety_fn = os.path.join(libsafety_dir, "libsafety.so") +libsafety_fn = os.path.join(libsafety_dir, "libsafety_mutation.so" if "MUTATION" in os.environ else "libsafety.so") ffi = FFI() diff --git a/opendbc/safety/tests/mutation.sh b/opendbc/safety/tests/mutation.sh index 411bab3598e..c0513357c84 100755 --- a/opendbc/safety/tests/mutation.sh +++ b/opendbc/safety/tests/mutation.sh @@ -17,4 +17,5 @@ EOF scons -j4 -D -mull-runner-17 --debug --ld-search-path /lib/x86_64-linux-gnu/ ./libsafety/libsafety.so -test-program=pytest -- -n8 --ignore-glob=misra/* \ No newline at end of file +export MUTATION=1 +mull-runner-17 --debug --ld-search-path /lib/x86_64-linux-gnu/ ./libsafety/libsafety_mutation.so -test-program=pytest -- -n8 --ignore-glob=misra/* \ No newline at end of file diff --git a/opendbc/safety/tests/test.sh b/opendbc/safety/tests/test.sh index e121721bcd4..eae291f7f7c 100755 --- a/opendbc/safety/tests/test.sh +++ b/opendbc/safety/tests/test.sh @@ -13,22 +13,16 @@ scons -j$(nproc) -D # run safety tests and generate coverage data pytest -n8 --ignore-glob=misra/* -if [ "$(uname)" = "Darwin" ]; then - GCOV_EXEC="/opt/homebrew/opt/llvm@17/bin/llvm-cov gcov" -else - GCOV_EXEC="llvm-cov-17 gcov" -fi - # generate and open report if [ "$1" == "--report" ]; then mkdir -p coverage-out - gcovr -r ../ --gcov-executable "$GCOV_EXEC" --html-nested coverage-out/index.html + gcovr -r ../ --html-nested coverage-out/index.html sensible-browser coverage-out/index.html fi # test coverage -GCOV="gcovr -r $DIR/../ --gcov-executable \"$GCOV_EXEC\" -d --fail-under-line=100 -e ^libsafety" -if ! GCOV_OUTPUT="$(eval $GCOV)"; then +GCOV="gcovr -r $DIR/../ -d --fail-under-line=100 -e ^libsafety" +if ! GCOV_OUTPUT="$($GCOV)"; then echo -e "FAILED:\n$GCOV_OUTPUT" exit 1 else From de02716a72a23c75b3b11a23be92c450fe4c2388 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Mon, 12 Jan 2026 15:45:03 -0800 Subject: [PATCH 031/229] Reapply "safety: single libsafety.so" (#3030) This reverts commit c80388aece8a5cc987c9571e4413bcd8ebb19632. --- opendbc/safety/tests/libsafety/SConscript | 50 ++++++------------- .../safety/tests/libsafety/libsafety_py.py | 2 +- opendbc/safety/tests/mutation.sh | 3 +- opendbc/safety/tests/test.sh | 12 +++-- 4 files changed, 25 insertions(+), 42 deletions(-) diff --git a/opendbc/safety/tests/libsafety/SConscript b/opendbc/safety/tests/libsafety/SConscript index 3abd0375ad2..a8cb50cc2e0 100644 --- a/opendbc/safety/tests/libsafety/SConscript +++ b/opendbc/safety/tests/libsafety/SConscript @@ -1,19 +1,16 @@ import platform -CC = 'gcc' system = platform.system() -mac_ver = platform.mac_ver() -# gcc installed by homebrew has version suffix (e.g. gcc-12) in order to be -# distinguishable from system one - which acts as a symlink to clang -# clang works on macOS 15 and greater but has issues on earlier macOS versions. -# see: https://github.com/commaai/openpilot/issues/35093 -if system == 'Darwin' and mac_ver[0] and mac_ver[0] < '15': - CC += '-13' +# Use clang-17 for both normal tests and mutation testing +# The Mull plugin injects mutations that are dormant unless run with mull-runner +if system == "Darwin": + mull_plugin = Dir('#').abspath + '/.mull/lib/mull-ir-frontend-17' +else: + mull_plugin = '/usr/lib/mull-ir-frontend-17' -# standard env env = Environment( - CC=CC, + CC='clang-17', CFLAGS=[ '-Wall', "-Wextra", @@ -28,6 +25,8 @@ env = Environment( '-fno-omit-frame-pointer', '-fprofile-arcs', '-ftest-coverage', + f'-fpass-plugin={mull_plugin}', + '-grecord-command-line', '-DALLOW_DEBUG', ], LINKFLAGS=[ @@ -40,31 +39,10 @@ env = Environment( tools=["default", "compilation_db"], ) if system == "Darwin": - env.PrependENVPath('PATH', '/opt/homebrew/bin') - -# mutation env -menv = env.Clone() -if system == "Darwin": - menv.PrependENVPath('PATH', '/opt/homebrew/opt/llvm@17/bin') - mull_plugin = Dir('#').abspath + '/.mull/lib/mull-ir-frontend-17' -else: - mull_plugin = '/usr/lib/mull-ir-frontend-17' -menv['CC'] = 'clang-17' -flags = [ - '-fprofile-instr-generate', - '-fcoverage-mapping', - f'-fpass-plugin={mull_plugin}', - '-g', - '-grecord-command-line', -] -menv['CFLAGS'] += flags -menv['LINKFLAGS'] = flags -menv['CFLAGS'].remove('-fprofile-arcs') -menv['CFLAGS'].remove('-ftest-coverage') + env.PrependENVPath('PATH', '/opt/homebrew/opt/llvm@17/bin') -for build_env, suffix in ((env, ""), (menv, "_mutation")): - safety = build_env.SharedObject(f"safety{suffix}.os", "safety.c") - libsafety = build_env.SharedLibrary(f"libsafety{suffix}.so", [safety]) +safety = env.SharedObject("safety.os", "safety.c") +libsafety = env.SharedLibrary("libsafety.so", [safety]) - # GCC note file is generated by compiler, allow scons to clean it up - build_env.SideEffect("safety.gcno", safety) +# GCC-style note file is generated by compiler, allow scons to clean it up +env.SideEffect("safety.gcno", safety) diff --git a/opendbc/safety/tests/libsafety/libsafety_py.py b/opendbc/safety/tests/libsafety/libsafety_py.py index ee314b6e124..e93b782ea4a 100644 --- a/opendbc/safety/tests/libsafety/libsafety_py.py +++ b/opendbc/safety/tests/libsafety/libsafety_py.py @@ -4,7 +4,7 @@ from opendbc.safety import LEN_TO_DLC libsafety_dir = os.path.dirname(os.path.abspath(__file__)) -libsafety_fn = os.path.join(libsafety_dir, "libsafety_mutation.so" if "MUTATION" in os.environ else "libsafety.so") +libsafety_fn = os.path.join(libsafety_dir, "libsafety.so") ffi = FFI() diff --git a/opendbc/safety/tests/mutation.sh b/opendbc/safety/tests/mutation.sh index c0513357c84..411bab3598e 100755 --- a/opendbc/safety/tests/mutation.sh +++ b/opendbc/safety/tests/mutation.sh @@ -17,5 +17,4 @@ EOF scons -j4 -D -export MUTATION=1 -mull-runner-17 --debug --ld-search-path /lib/x86_64-linux-gnu/ ./libsafety/libsafety_mutation.so -test-program=pytest -- -n8 --ignore-glob=misra/* \ No newline at end of file +mull-runner-17 --debug --ld-search-path /lib/x86_64-linux-gnu/ ./libsafety/libsafety.so -test-program=pytest -- -n8 --ignore-glob=misra/* \ No newline at end of file diff --git a/opendbc/safety/tests/test.sh b/opendbc/safety/tests/test.sh index eae291f7f7c..e121721bcd4 100755 --- a/opendbc/safety/tests/test.sh +++ b/opendbc/safety/tests/test.sh @@ -13,16 +13,22 @@ scons -j$(nproc) -D # run safety tests and generate coverage data pytest -n8 --ignore-glob=misra/* +if [ "$(uname)" = "Darwin" ]; then + GCOV_EXEC="/opt/homebrew/opt/llvm@17/bin/llvm-cov gcov" +else + GCOV_EXEC="llvm-cov-17 gcov" +fi + # generate and open report if [ "$1" == "--report" ]; then mkdir -p coverage-out - gcovr -r ../ --html-nested coverage-out/index.html + gcovr -r ../ --gcov-executable "$GCOV_EXEC" --html-nested coverage-out/index.html sensible-browser coverage-out/index.html fi # test coverage -GCOV="gcovr -r $DIR/../ -d --fail-under-line=100 -e ^libsafety" -if ! GCOV_OUTPUT="$($GCOV)"; then +GCOV="gcovr -r $DIR/../ --gcov-executable \"$GCOV_EXEC\" -d --fail-under-line=100 -e ^libsafety" +if ! GCOV_OUTPUT="$(eval $GCOV)"; then echo -e "FAILED:\n$GCOV_OUTPUT" exit 1 else From e94b05f7ab1cb2a424017aac19d56ff90d112516 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Mon, 12 Jan 2026 16:12:13 -0800 Subject: [PATCH 032/229] EV6: add EU specification for alternate harness (#3031) likely applies to ev6 as well --- opendbc/car/hyundai/values.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendbc/car/hyundai/values.py b/opendbc/car/hyundai/values.py index e239298a00b..9d688ee8be8 100644 --- a/opendbc/car/hyundai/values.py +++ b/opendbc/car/hyundai/values.py @@ -510,7 +510,7 @@ class CAR(Platforms): ) KIA_EV6 = HyundaiCanFDPlatformConfig( [ - HyundaiCarDocs("Kia EV6 (Southeast Asia only) 2022-24", "All", car_parts=CarParts.common([CarHarness.hyundai_p])), + HyundaiCarDocs("Kia EV6 (Southeast Asia and Europe only) 2022-24", "All", car_parts=CarParts.common([CarHarness.hyundai_p])), HyundaiCarDocs("Kia EV6 (without HDA II) 2022-24", "Highway Driving Assist", car_parts=CarParts.common([CarHarness.hyundai_l])), HyundaiCarDocs("Kia EV6 (with HDA II) 2022-24", "Highway Driving Assist II", car_parts=CarParts.common([CarHarness.hyundai_p])) ], From eb6752f1d633001769cf5f699a4db70a7b245d28 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Mon, 12 Jan 2026 17:08:03 -0800 Subject: [PATCH 033/229] tests don't remove extra packages every time you run an opendbc test it removes any extra packages you might have installed --- setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.sh b/setup.sh index 0234610f89a..4aee2d16de0 100755 --- a/setup.sh +++ b/setup.sh @@ -39,7 +39,7 @@ if ! command -v uv &>/dev/null; then fi export UV_PROJECT_ENVIRONMENT="$BASEDIR/.venv" -uv sync --all-extras +uv sync --all-extras --inexact source "$PYTHONPATH/.venv/bin/activate" $BASEDIR/opendbc/safety/tests/misra/install.sh From dc67cb143dda4a0830f470c669dab756d0d9aa4f Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Mon, 12 Jan 2026 19:52:17 -0800 Subject: [PATCH 034/229] Minor Tesla cleanup --- opendbc/car/tesla/interface.py | 2 +- opendbc/safety/tests/test_tesla.py | 20 ++++++++------------ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/opendbc/car/tesla/interface.py b/opendbc/car/tesla/interface.py index baf1593238a..63cc777748e 100644 --- a/opendbc/car/tesla/interface.py +++ b/opendbc/car/tesla/interface.py @@ -31,6 +31,6 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo ret.vEgoStarting = 0.1 ret.stoppingDecelRate = 0.3 - ret.dashcamOnly = candidate in (CAR.TESLA_MODEL_X) # dashcam only, pending find invalidLkasSetting signal + ret.dashcamOnly = candidate in (CAR.TESLA_MODEL_X,) # dashcam only, pending find invalidLkasSetting signal return ret diff --git a/opendbc/safety/tests/test_tesla.py b/opendbc/safety/tests/test_tesla.py index 52390f81aa8..e234c91fecd 100755 --- a/opendbc/safety/tests/test_tesla.py +++ b/opendbc/safety/tests/test_tesla.py @@ -26,6 +26,8 @@ def round_angle(apply_angle, can_offset=0): class TestTeslaSafetyBase(common.CarSafetyTest, common.AngleSteeringSafetyTest, common.LongitudinalAccelSafetyTest): + SAFETY_PARAM = 0 + RELAY_MALFUNCTION_ADDRS = {0: (MSG_DAS_steeringControl, MSG_APS_eacMonitor)} FWD_BLACKLISTED_ADDRS = {2: [MSG_DAS_steeringControl, MSG_APS_eacMonitor]} TX_MSGS = [[MSG_DAS_steeringControl, 0], [MSG_APS_eacMonitor, 0], [MSG_DAS_Control, 0]] @@ -69,6 +71,10 @@ def setUp(self): self.steer_control_types = {d: v for v, d in self.define.dv["DAS_steeringControl"]["DAS_steeringControlType"].items()} + self.safety = libsafety_py.libsafety + self.safety.set_safety_hooks(CarParams.SafetyModel.tesla, self.SAFETY_PARAM) + self.safety.init_tests() + def _angle_cmd_msg(self, angle: float, state: bool | int, increment_timer: bool = True, bus: int = 0): values = {"DAS_steeringAngleRequest": angle, "DAS_steeringControlType": state} if increment_timer: @@ -358,12 +364,6 @@ class TestTeslaStockSafety(TestTeslaSafetyBase): LONGITUDINAL = False - def setUp(self): - super().setUp() - self.safety = libsafety_py.libsafety - self.safety.set_safety_hooks(CarParams.SafetyModel.tesla, 0) - self.safety.init_tests() - def test_cancel(self): for acc_state in range(16): self.safety.set_controls_allowed(True) @@ -396,15 +396,11 @@ def test_stock_aeb_no_cancel(self): class TestTeslaLongitudinalSafety(TestTeslaSafetyBase): + SAFETY_PARAM = TeslaSafetyFlags.LONG_CONTROL + RELAY_MALFUNCTION_ADDRS = {0: (MSG_DAS_steeringControl, MSG_APS_eacMonitor, MSG_DAS_Control)} FWD_BLACKLISTED_ADDRS = {2: [MSG_DAS_steeringControl, MSG_APS_eacMonitor, MSG_DAS_Control]} - def setUp(self): - super().setUp() - self.safety = libsafety_py.libsafety - self.safety.set_safety_hooks(CarParams.SafetyModel.tesla, TeslaSafetyFlags.LONG_CONTROL) - self.safety.init_tests() - def test_no_aeb(self): for aeb_event in range(4): self.assertEqual(self._tx(self._long_control_msg(10, aeb_event=aeb_event)), aeb_event == 0) From 58f03320267c940022d7c53a6a303aebfe3b38ef Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Mon, 12 Jan 2026 20:38:31 -0800 Subject: [PATCH 035/229] Tesla: support FSD 14 (#2934) * they switched * from https://github.com/commaai/opendbc/pull/2860 * from https://github.com/commaai/opendbc/pull/2924 * forgot to flip here * parameterize * do safety * fix * misra * ok misra, this is more confusing but sure * kinda works * simplify * same function in safety * more stuff * fix * debug * clean up * cmt * detect fsd 14 * fix --- opendbc/car/tesla/carcontroller.py | 2 +- opendbc/car/tesla/carstate.py | 7 ++++++- opendbc/car/tesla/fingerprints.py | 2 ++ opendbc/car/tesla/interface.py | 7 ++++++- opendbc/car/tesla/teslacan.py | 19 ++++++++++++++++--- opendbc/car/tesla/values.py | 10 ++++++++++ opendbc/safety/modes/tesla.h | 26 ++++++++++++++++++++++---- opendbc/safety/tests/test_tesla.py | 15 ++++++++++++++- 8 files changed, 77 insertions(+), 11 deletions(-) diff --git a/opendbc/car/tesla/carcontroller.py b/opendbc/car/tesla/carcontroller.py index 986897f8494..8b7d9989c44 100644 --- a/opendbc/car/tesla/carcontroller.py +++ b/opendbc/car/tesla/carcontroller.py @@ -20,7 +20,7 @@ def __init__(self, dbc_names, CP): super().__init__(dbc_names, CP) self.apply_angle_last = 0 self.packer = CANPacker(dbc_names[Bus.party]) - self.tesla_can = TeslaCAN(self.packer) + self.tesla_can = TeslaCAN(CP, self.packer) # Vehicle model used for lateral limiting self.VM = VehicleModel(get_safety_CP()) diff --git a/opendbc/car/tesla/carstate.py b/opendbc/car/tesla/carstate.py index fa16116b3b4..2e56a8b033e 100644 --- a/opendbc/car/tesla/carstate.py +++ b/opendbc/car/tesla/carstate.py @@ -3,6 +3,7 @@ from opendbc.car import Bus, structs from opendbc.car.common.conversions import Conversions as CV from opendbc.car.interfaces import CarStateBase +from opendbc.car.tesla.teslacan import get_steer_ctrl_type from opendbc.car.tesla.values import DBC, CANBUS, GEAR_MAP, STEER_THRESHOLD, CAR ButtonType = structs.CarState.ButtonEvent.Type @@ -105,7 +106,11 @@ def update(self, can_parsers) -> structs.CarState: ret.stockAeb = cp_ap_party.vl["DAS_control"]["DAS_aebEvent"] == 1 # LKAS - ret.stockLkas = cp_ap_party.vl["DAS_steeringControl"]["DAS_steeringControlType"] == 2 # LANE_KEEP_ASSIST + # On FSD 14+, ANGLE_CONTROL behavior changed to allow user winddown while actuating. + # FSD switched from using ANGLE_CONTROL to LANE_KEEP_ASSIST to likely keep the old steering override disengage logic. + # LKAS switched from LANE_KEEP_ASSIST to ANGLE_CONTROL to likely allow overriding LKAS events smoothly + lkas_ctrl_type = get_steer_ctrl_type(self.CP.flags, 2) + ret.stockLkas = cp_ap_party.vl["DAS_steeringControl"]["DAS_steeringControlType"] == lkas_ctrl_type # LANE_KEEP_ASSIST # Stock Autosteer should be off (includes FSD) if self.CP.carFingerprint in (CAR.TESLA_MODEL_3, CAR.TESLA_MODEL_Y): diff --git a/opendbc/car/tesla/fingerprints.py b/opendbc/car/tesla/fingerprints.py index 54705385a6e..2ebaef0b8fb 100644 --- a/opendbc/car/tesla/fingerprints.py +++ b/opendbc/car/tesla/fingerprints.py @@ -36,6 +36,8 @@ b'TeMYG4_Legacy3Y_0.0.0 (5),Y4P003.03.2', b'TeMYG4_SingleECU_0.0.0 (28),Y4S002.23.0', b'TeMYG4_SingleECU_0.0.0 (33),Y4S002.26', + b'TeMYG4_Legacy3Y_0.0.0 (6),Y4003.04.0', + b'TeMYG4_Main_0.0.0 (77),Y4003.05.4', ], }, CAR.TESLA_MODEL_X: { diff --git a/opendbc/car/tesla/interface.py b/opendbc/car/tesla/interface.py index 63cc777748e..c53ad621937 100644 --- a/opendbc/car/tesla/interface.py +++ b/opendbc/car/tesla/interface.py @@ -2,7 +2,7 @@ from opendbc.car.interfaces import CarInterfaceBase from opendbc.car.tesla.carcontroller import CarController from opendbc.car.tesla.carstate import CarState -from opendbc.car.tesla.values import TeslaSafetyFlags, CAR +from opendbc.car.tesla.values import TeslaSafetyFlags, TeslaFlags, CAR, FSD_14_FW, Ecu class CarInterface(CarInterfaceBase): @@ -31,6 +31,11 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo ret.vEgoStarting = 0.1 ret.stoppingDecelRate = 0.3 + fsd_14 = any(fw.ecu == Ecu.eps and fw.fwVersion in FSD_14_FW.get(candidate, []) for fw in car_fw) + if fsd_14: + ret.flags |= TeslaFlags.FSD_14.value + ret.safetyConfigs[0].safetyParam |= TeslaSafetyFlags.FSD_14.value + ret.dashcamOnly = candidate in (CAR.TESLA_MODEL_X,) # dashcam only, pending find invalidLkasSetting signal return ret diff --git a/opendbc/car/tesla/teslacan.py b/opendbc/car/tesla/teslacan.py index 4bfc67a4e36..7449b961f17 100644 --- a/opendbc/car/tesla/teslacan.py +++ b/opendbc/car/tesla/teslacan.py @@ -1,16 +1,29 @@ from opendbc.car.common.conversions import Conversions as CV -from opendbc.car.tesla.values import CANBUS, CarControllerParams +from opendbc.car.tesla.values import CANBUS, CarControllerParams, TeslaFlags + + +def get_steer_ctrl_type(flags: int, ctrl_type: int) -> int: + # Returns the flipped signal value for DAS_steeringControlType on FSD 14 + if flags & TeslaFlags.FSD_14: + return {1: 2, 2: 1}.get(ctrl_type, ctrl_type) + else: + return ctrl_type class TeslaCAN: - def __init__(self, packer): + def __init__(self, CP, packer): + self.CP = CP self.packer = packer def create_steering_control(self, angle, enabled): + # On FSD 14+, ANGLE_CONTROL behavior changed to allow user winddown while actuating. + # with openpilot, after overriding w/ ANGLE_CONTROL the wheel snaps back to the original angle abruptly + # so we now use LANE_KEEP_ASSIST to match stock FSD. + # see carstate.py for more details values = { "DAS_steeringAngleRequest": -angle, "DAS_steeringHapticRequest": 0, - "DAS_steeringControlType": 1 if enabled else 0, + "DAS_steeringControlType": get_steer_ctrl_type(self.CP.flags, 1 if enabled else 0), } return self.packer.make_can_msg("DAS_steeringControl", CANBUS.party, values) diff --git a/opendbc/car/tesla/values.py b/opendbc/car/tesla/values.py index 6fedfaac027..92a08d2a87f 100644 --- a/opendbc/car/tesla/values.py +++ b/opendbc/car/tesla/values.py @@ -72,6 +72,14 @@ class CAR(Platforms): ] ) +# Cars with this EPS FW have FSD 14 and use TeslaFlags.FSD_14 +FSD_14_FW = { + CAR.TESLA_MODEL_Y: [ + b'TeMYG4_Legacy3Y_0.0.0 (6),Y4003.04.0', + b'TeMYG4_Main_0.0.0 (77),Y4003.05.4', + ] +} + class CANBUS: party = 0 @@ -119,10 +127,12 @@ class CarControllerParams: class TeslaSafetyFlags(IntFlag): LONG_CONTROL = 1 + FSD_14 = 2 class TeslaFlags(IntFlag): LONG_CONTROL = 1 + FSD_14 = 2 DBC = CAR.create_dbc_map() diff --git a/opendbc/safety/modes/tesla.h b/opendbc/safety/modes/tesla.h index b8f41f0454b..33f5e14ee58 100644 --- a/opendbc/safety/modes/tesla.h +++ b/opendbc/safety/modes/tesla.h @@ -3,6 +3,7 @@ #include "opendbc/safety/declarations.h" static bool tesla_longitudinal = false; +static bool tesla_fsd_14 = false; static bool tesla_stock_aeb = false; // Only rising edges while controls are not allowed are considered for these systems: @@ -91,6 +92,20 @@ static bool tesla_get_quality_flag_valid(const CANPacket_t *msg) { return valid; } +static int tesla_get_steer_ctrl_type(const int ctrl_type) { + // Returns ANGLE_CONTROL-equivalent control type for FSD 14 + int steer_ctrl_type = ctrl_type; + if (tesla_fsd_14) { + if (ctrl_type == 1) { + steer_ctrl_type = 2; + } else if (ctrl_type == 2) { + steer_ctrl_type = 1; + } else { + } + } + return steer_ctrl_type; +} + static void tesla_rx_hook(const CANPacket_t *msg) { if (msg->bus == 0U) { @@ -176,7 +191,7 @@ static void tesla_rx_hook(const CANPacket_t *msg) { // DAS_steeringControl if (msg->addr == 0x488U) { int steering_control_type = msg->data[2] >> 6; - bool tesla_stock_lkas_now = steering_control_type == 2; // "LANE_KEEP_ASSIST" + bool tesla_stock_lkas_now = steering_control_type == tesla_get_steer_ctrl_type(2); // "LANE_KEEP_ASSIST" // Only consider rising edges while controls are not allowed if (tesla_stock_lkas_now && !tesla_stock_lkas_prev && !controls_allowed) { @@ -225,14 +240,15 @@ static bool tesla_tx_hook(const CANPacket_t *msg) { int raw_angle_can = ((msg->data[0] & 0x7FU) << 8) | msg->data[1]; int desired_angle = raw_angle_can - 16384; int steer_control_type = msg->data[2] >> 6; - bool steer_control_enabled = steer_control_type == 1; // ANGLE_CONTROL + const int angle_ctrl_type = tesla_get_steer_ctrl_type(1); + bool steer_control_enabled = steer_control_type == angle_ctrl_type; // ANGLE_CONTROL if (steer_angle_cmd_checks_vm(desired_angle, steer_control_enabled, TESLA_STEERING_LIMITS, TESLA_STEERING_PARAMS)) { violation = true; } bool valid_steer_control_type = (steer_control_type == 0) || // NONE - (steer_control_type == 1); // ANGLE_CONTROL + (steer_control_type == angle_ctrl_type); // ANGLE_CONTROL if (!valid_steer_control_type) { violation = true; } @@ -328,7 +344,9 @@ static safety_config tesla_init(uint16_t param) { {0x27D, 0, 3, .check_relay = true, .disable_static_blocking = true}, // APS_eacMonitor }; - SAFETY_UNUSED(param); + const uint16_t TESLA_FLAG_FSD_14 = 2; + tesla_fsd_14 = GET_FLAG(param, TESLA_FLAG_FSD_14); + #ifdef ALLOW_DEBUG const uint16_t TESLA_FLAG_LONGITUDINAL_CONTROL = 1; tesla_longitudinal = GET_FLAG(param, TESLA_FLAG_LONGITUDINAL_CONTROL); diff --git a/opendbc/safety/tests/test_tesla.py b/opendbc/safety/tests/test_tesla.py index e234c91fecd..a6b9265ba50 100755 --- a/opendbc/safety/tests/test_tesla.py +++ b/opendbc/safety/tests/test_tesla.py @@ -4,7 +4,8 @@ import numpy as np from opendbc.car.lateral import get_max_angle_delta_vm, get_max_angle_vm -from opendbc.car.tesla.values import CarControllerParams, TeslaSafetyFlags +from opendbc.car.tesla.teslacan import get_steer_ctrl_type +from opendbc.car.tesla.values import CarControllerParams, TeslaSafetyFlags, TeslaFlags from opendbc.car.tesla.carcontroller import get_safety_CP from opendbc.car.structs import CarParams from opendbc.car.vehicle_model import VehicleModel @@ -76,6 +77,10 @@ def setUp(self): self.safety.init_tests() def _angle_cmd_msg(self, angle: float, state: bool | int, increment_timer: bool = True, bus: int = 0): + # If FSD 14, translate steer control type to new flipped definition + if self.safety.get_current_safety_param() & TeslaSafetyFlags.FSD_14: + state = get_steer_ctrl_type(TeslaFlags.FSD_14, int(state)) + values = {"DAS_steeringAngleRequest": angle, "DAS_steeringControlType": state} if increment_timer: self.safety.set_timer(self.cnt_angle_cmd * int(1e6 / self.LATERAL_FREQUENCY)) @@ -395,6 +400,10 @@ def test_stock_aeb_no_cancel(self): self.assertFalse(self._tx(no_aeb_msg)) +class TestTeslaFSD14StockSafety(TestTeslaStockSafety): + SAFETY_PARAM = TeslaSafetyFlags.FSD_14 + + class TestTeslaLongitudinalSafety(TestTeslaSafetyBase): SAFETY_PARAM = TeslaSafetyFlags.LONG_CONTROL @@ -443,5 +452,9 @@ def test_prevent_reverse(self): self.assertFalse(self._tx(self._long_control_msg(set_speed=0, accel_limits=(-0.1, -0.1)))) +class TestTeslaFSD14LongitudinalSafety(TestTeslaLongitudinalSafety): + SAFETY_PARAM = TeslaSafetyFlags.LONG_CONTROL | TeslaSafetyFlags.FSD_14 + + if __name__ == "__main__": unittest.main() From 98428300207bbbfcea40038fdeb0ca4dc6464be3 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Mon, 12 Jan 2026 20:40:30 -0800 Subject: [PATCH 036/229] Revert "EV6: add EU specification for alternate harness (#3031)" This reverts commit e94b05f7ab1cb2a424017aac19d56ff90d112516. --- opendbc/car/hyundai/values.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendbc/car/hyundai/values.py b/opendbc/car/hyundai/values.py index 9d688ee8be8..e239298a00b 100644 --- a/opendbc/car/hyundai/values.py +++ b/opendbc/car/hyundai/values.py @@ -510,7 +510,7 @@ class CAR(Platforms): ) KIA_EV6 = HyundaiCanFDPlatformConfig( [ - HyundaiCarDocs("Kia EV6 (Southeast Asia and Europe only) 2022-24", "All", car_parts=CarParts.common([CarHarness.hyundai_p])), + HyundaiCarDocs("Kia EV6 (Southeast Asia only) 2022-24", "All", car_parts=CarParts.common([CarHarness.hyundai_p])), HyundaiCarDocs("Kia EV6 (without HDA II) 2022-24", "Highway Driving Assist", car_parts=CarParts.common([CarHarness.hyundai_l])), HyundaiCarDocs("Kia EV6 (with HDA II) 2022-24", "Highway Driving Assist II", car_parts=CarParts.common([CarHarness.hyundai_p])) ], From f38dd73422edc96351a4a4faef7f9521d2e225d0 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Wed, 14 Jan 2026 15:00:05 -0800 Subject: [PATCH 037/229] Car docs: rm coupler for four (#3034) rm coupler for four --- opendbc/car/docs_definitions.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/opendbc/car/docs_definitions.py b/opendbc/car/docs_definitions.py index 2f49b834f61..bbff2eaa3eb 100644 --- a/opendbc/car/docs_definitions.py +++ b/opendbc/car/docs_definitions.py @@ -78,7 +78,6 @@ class Cable(EnumBase): long_obdc_cable = BasePart("long OBD-C cable (9.5 ft)") usb_a_2_a_cable = BasePart("USB A-A cable") usbc_otg_cable = BasePart("USB C OTG cable") - usbc_coupler = BasePart("USB-C coupler") obd_c_cable_2ft = BasePart("OBD-C cable (2 ft)") @@ -112,7 +111,7 @@ class CarHarness(EnumBase): fca = BaseCarHarness("FCA connector") ram = BaseCarHarness("Ram connector") vw_a = BaseCarHarness("VW A connector") - vw_j533 = BaseCarHarness("VW J533 connector", parts=[Accessory.harness_box, Cable.long_obdc_cable, Cable.usbc_coupler]) + vw_j533 = BaseCarHarness("VW J533 connector", parts=[Accessory.harness_box, Cable.long_obdc_cable]) hyundai_a = BaseCarHarness("Hyundai A connector") hyundai_b = BaseCarHarness("Hyundai B connector") hyundai_c = BaseCarHarness("Hyundai C connector") @@ -132,18 +131,18 @@ class CarHarness(EnumBase): hyundai_q = BaseCarHarness("Hyundai Q connector") hyundai_r = BaseCarHarness("Hyundai R connector") custom = BaseCarHarness("Developer connector") - obd_ii = BaseCarHarness("OBD-II connector", parts=[Cable.long_obdc_cable, Cable.usbc_coupler], has_connector=False) + obd_ii = BaseCarHarness("OBD-II connector", parts=[Cable.long_obdc_cable], has_connector=False) gm = BaseCarHarness("GM connector", parts=[Accessory.harness_box]) - gmsdgm = BaseCarHarness("GM SDGM connector", parts=[Accessory.harness_box, Accessory.comma_power, Cable.long_obdc_cable, Cable.usbc_coupler]) - nissan_a = BaseCarHarness("Nissan A connector", parts=[Accessory.harness_box, Accessory.comma_power, Cable.long_obdc_cable, Cable.usbc_coupler]) - nissan_b = BaseCarHarness("Nissan B connector", parts=[Accessory.harness_box, Accessory.comma_power, Cable.long_obdc_cable, Cable.usbc_coupler]) + gmsdgm = BaseCarHarness("GM SDGM connector", parts=[Accessory.harness_box, Accessory.comma_power, Cable.long_obdc_cable]) + nissan_a = BaseCarHarness("Nissan A connector", parts=[Accessory.harness_box, Accessory.comma_power, Cable.long_obdc_cable]) + nissan_b = BaseCarHarness("Nissan B connector", parts=[Accessory.harness_box, Accessory.comma_power, Cable.long_obdc_cable]) mazda = BaseCarHarness("Mazda connector") ford_q3 = BaseCarHarness("Ford Q3 connector") - ford_q4 = BaseCarHarness("Ford Q4 connector", parts=[Accessory.harness_box, Accessory.comma_power, Cable.long_obdc_cable, Cable.usbc_coupler]) - rivian = BaseCarHarness("Rivian A connector", parts=[Accessory.harness_box, Accessory.comma_power, Cable.long_obdc_cable, Cable.usbc_coupler]) - tesla_a = BaseCarHarness("Tesla A connector", parts=[Accessory.harness_box, Cable.long_obdc_cable, Cable.usbc_coupler]) - tesla_b = BaseCarHarness("Tesla B connector", parts=[Accessory.harness_box, Cable.long_obdc_cable, Cable.usbc_coupler]) - psa_a = BaseCarHarness("PSA A connector", parts=[Accessory.harness_box, Cable.long_obdc_cable, Cable.usbc_coupler]) + ford_q4 = BaseCarHarness("Ford Q4 connector", parts=[Accessory.harness_box, Accessory.comma_power, Cable.long_obdc_cable]) + rivian = BaseCarHarness("Rivian A connector", parts=[Accessory.harness_box, Accessory.comma_power, Cable.long_obdc_cable]) + tesla_a = BaseCarHarness("Tesla A connector", parts=[Accessory.harness_box, Cable.long_obdc_cable]) + tesla_b = BaseCarHarness("Tesla B connector", parts=[Accessory.harness_box, Cable.long_obdc_cable]) + psa_a = BaseCarHarness("PSA A connector", parts=[Accessory.harness_box, Cable.long_obdc_cable]) class Device(EnumBase): From aecb99e054c20fe02fc42a915083307c4dd3fcf9 Mon Sep 17 00:00:00 2001 From: ugtthis <142481257+ugtthis@users.noreply.github.com> Date: Thu, 15 Jan 2026 07:21:16 -0600 Subject: [PATCH 038/229] Docs cleanup: Inconsistent wording (#3035) * change Any to All * cleanup --- opendbc/car/docs_definitions.py | 2 +- opendbc/car/extra_cars.py | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/opendbc/car/docs_definitions.py b/opendbc/car/docs_definitions.py index bbff2eaa3eb..c77573930a8 100644 --- a/opendbc/car/docs_definitions.py +++ b/opendbc/car/docs_definitions.py @@ -393,7 +393,7 @@ def get_extra_cars_column(self, column: ExtraCarsColumn) -> str: @dataclass class ExtraCarDocs(CarDocs): - package: str = "Any" + package: str = "All" merged: bool = False support_type: SupportType = SupportType.INCOMPATIBLE support_link: str | None = "#incompatible" diff --git a/opendbc/car/extra_cars.py b/opendbc/car/extra_cars.py index 5ffa42bf4a3..fed2f5a4914 100644 --- a/opendbc/car/extra_cars.py +++ b/opendbc/car/extra_cars.py @@ -37,19 +37,19 @@ class CAR(Platforms): EXTRA_HONDA = ExtraPlatformConfig( [ - CommunityCarDocs("Acura Integra 2023-25", "All"), + CommunityCarDocs("Acura Integra 2023-25"), CommunityCarDocs("Acura MDX 2015-16", "Advance Package"), - CommunityCarDocs("Acura MDX 2017-20", "All"), - CommunityCarDocs("Acura MDX 2022-24", "All"), - CommunityCarDocs("Acura RDX 2022-25", "All"), + CommunityCarDocs("Acura MDX 2017-20"), + CommunityCarDocs("Acura MDX 2022-24"), + CommunityCarDocs("Acura RDX 2022-25"), CommunityCarDocs("Acura RLX 2017", "Advance Package or Technology Package"), CommunityCarDocs("Acura TLX 2015-17", "Advance Package"), - CommunityCarDocs("Acura TLX 2018-20", "All"), - CommunityCarDocs("Acura TLX 2022-23", "All"), - GMSecurityCarDocs("Acura ZDX 2024", "All"), + CommunityCarDocs("Acura TLX 2018-20"), + CommunityCarDocs("Acura TLX 2022-23"), + GMSecurityCarDocs("Acura ZDX 2024"), CommunityCarDocs("Honda Accord 2016-17", "Honda Sensing"), - CommunityCarDocs("Honda Clarity 2018-21", "All"), - GMSecurityCarDocs("Honda Prologue 2024-25", "All"), + CommunityCarDocs("Honda Clarity 2018-21"), + GMSecurityCarDocs("Honda Prologue 2024-25"), ], ) @@ -78,8 +78,8 @@ class CAR(Platforms): EXTRA_VOLKSWAGEN = ExtraPlatformConfig( [ - FlexRayCarDocs("Audi A4 2016-24", package="All"), - FlexRayCarDocs("Audi A5 2016-24", package="All"), - FlexRayCarDocs("Audi Q5 2017-24", package="All"), + FlexRayCarDocs("Audi A4 2016-24"), + FlexRayCarDocs("Audi A5 2016-24"), + FlexRayCarDocs("Audi Q5 2017-24"), ], ) From ac94e0502326bee8e9c04f3759dc83d3eaac07c4 Mon Sep 17 00:00:00 2001 From: Taku Nishigaki <45715127+tknsgk@users.noreply.github.com> Date: Fri, 16 Jan 2026 07:55:53 +0900 Subject: [PATCH 039/229] Fingerprint Subaru Impreza G4 (#3033) * fingerprint subaru impreza g4 * fix --- opendbc/car/subaru/fingerprints.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/opendbc/car/subaru/fingerprints.py b/opendbc/car/subaru/fingerprints.py index 64158446bd3..9addabaa1e9 100644 --- a/opendbc/car/subaru/fingerprints.py +++ b/opendbc/car/subaru/fingerprints.py @@ -97,6 +97,7 @@ b'\xa2 \x193\x00', b'\xa2 \x194\x00', b'\xa2 \x19`\x00', + b'\xa2 5\x00', ], (Ecu.eps, 0x746, None): [ b'z\xc0\x00\x00', @@ -106,6 +107,7 @@ b'z\xc0\x0c\x00', b'\x8a\xc0\x00\x00', b'\x8a\xc0\x10\x00', + b'\x9a\xc0\x08\x00', ], (Ecu.fwdCamera, 0x787, None): [ b'\x00\x00c\xf4\x00\x00\x00\x00', @@ -122,6 +124,7 @@ b'\x00\x00e\x1c\x1f@ \x14', b'\x00\x00e+\x00\x00\x00\x00', b'\x00\x00e+\x1f@ \x14', + b'\x00\x00eq\x1f@ "', ], (Ecu.engine, 0x7e0, None): [ b'\xaa\x00Bu\x07', @@ -145,6 +148,7 @@ b'\xc5!as\x07', b'\xc5!dr\x07', b'\xc5!ds\x07', + b'\xca\x01b0\x07', ], (Ecu.transmission, 0x7e1, None): [ b'\xe3\xd0\x081\x00', @@ -163,6 +167,7 @@ b'\xe5\xf5\x04\x00\x00', b'\xe5\xf5$\x00\x00', b'\xe5\xf5B\x00\x00', + b'\xe6\xd5\x041\x00', ], }, CAR.SUBARU_IMPREZA_2020: { From c1c8a34b136da0ae56954cfaed4d7ebf641fd4d1 Mon Sep 17 00:00:00 2001 From: dzid26 Date: Fri, 16 Jan 2026 00:12:42 +0000 Subject: [PATCH 040/229] Tesla: Add FSD active state (#3036) Add 'ACTIVE_FSD' state to DAS_autopilotState --- opendbc/dbc/tesla_model3_party.dbc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendbc/dbc/tesla_model3_party.dbc b/opendbc/dbc/tesla_model3_party.dbc index 5fd94c20081..cea25397095 100644 --- a/opendbc/dbc/tesla_model3_party.dbc +++ b/opendbc/dbc/tesla_model3_party.dbc @@ -464,7 +464,7 @@ VAL_ 923 DAS_suppressSpeedWarning 1 "Suppress_Speed_Warning" 0 "Do_Not_Suppress" VAL_ 923 DAS_fusedSpeedLimit 31 "NONE" 0 "UNKNOWN_SNA" ; VAL_ 923 DAS_blindSpotRearRight 3 "SNA" 0 "NO_WARNING" 1 "WARNING_LEVEL_1" 2 "WARNING_LEVEL_2" ; VAL_ 923 DAS_blindSpotRearLeft 3 "SNA" 0 "NO_WARNING" 1 "WARNING_LEVEL_1" 2 "WARNING_LEVEL_2" ; -VAL_ 923 DAS_autopilotState 15 "SNA" 8 "ABORTING" 3 "ACTIVE_NOMINAL" 0 "DISABLED" 4 "ACTIVE_RESTRICTED" 5 "ACTIVE_NAV" 14 "FAULT" 1 "UNAVAILABLE" 9 "ABORTED" 2 "AVAILABLE" ; +VAL_ 923 DAS_autopilotState 15 "SNA" 8 "ABORTING" 3 "ACTIVE_NOMINAL" 0 "DISABLED" 4 "ACTIVE_RESTRICTED" 5 "ACTIVE_NAV" 6 "ACTIVE_FSD" 14 "FAULT" 1 "UNAVAILABLE" 9 "ABORTED" 2 "AVAILABLE" ; VAL_ 325 ESP_absBrakeEvent2 0 "NOT_ACTIVE" 1 "ACTIVE_FRONT_REAR" 2 "ACTIVE_FRONT" 3 "ACTIVE_REAR"; VAL_ 325 ESP_absFaultLamp 0 "OFF" 1 "ON"; VAL_ 325 ESP_brakeApply 0 "INACTIVE" 1 "ACTIVE"; From a9f6796ac5e760f485d2f9c34df3bd6cb0ca42a1 Mon Sep 17 00:00:00 2001 From: Lukas <61192133+lukasloetkolben@users.noreply.github.com> Date: Fri, 16 Jan 2026 07:54:51 +0100 Subject: [PATCH 041/229] Tesla: Brake to ESP_status (#2628) * docs: Scheduled auto-update CARS.md * use esp_status * Update opendbc/safety/modes/tesla.h Co-authored-by: Shane Smiskol * consistent logic * docs: Scheduled auto-update CARS.md * fix formatting * use esp_status * Update opendbc/safety/modes/tesla.h Co-authored-by: Shane Smiskol * consistent logic * Honda: 25 MDX community doc cleanup (#2655) remove due to MDX PR 2129 * Toyota: Add FW for 2020 Toyota Yaris (#2656) * Add Toyota Yaris 2020 EU * fix sorting * expand supported model-years --------- Co-authored-by: Jason Young * docs: Scheduled auto-update CARS.md * Honda: CRV 2023-2025 (canfd) (#2475) * init CANFD CRV * init CANFD CRV Hybrid * remove * remove * remove import for now * remove import for now * shane fixes * rebase fixes * fix * update * remove whitespace * new test route * remove CRV Hybrid * 2025 * rename honda pilot dbc to canfd common * rename canfd common dbc to canfd common can dbc * renaming dbc to honda_canfd_common * updating car specs * separate steer interface and increase to 5000 per testers * adding brake_error commands for canFD * autocalculate alt brake for canfd * adding canfd safety value * adding bosch canfd safety value * canfd required safety changes from pr 2129 * canfd required safety changes from pr2129 * renaming dbc to honda_canfd_common * typo fix * fix coding style per CI * move canfd altbrake to autodetection * clearer diff, for now * Adding 24 CRV Hybrid fingerprint * switch to torque controller * updating hybrid test route * applying log-determined values for CRV 6G Hybrid * updating values from additional log * updating steer threshold based on log * udpating values based on log * found higher numbers in CRV log * repoint ICE to Hybrid * typo fix * typo fix * remove CRV from car template * remove CRV from extra cars * Adding 23 ICE fingerprints (Taiwan market) * Adding CRV ICE test route * whitespace fix * collapse CRV_HYBRID_6G into CRV_6G * verified max of 2560 from dashcam route * cleanup * not seeing data to elevate this above other CAN-FD * swag after actuator rescale * it wants a little more SR * same steerActuatorDelay as the others * prepare to recreate FW lists * auto_fingerprint 864613393836f643/00000002--3cef07213f * auto_fingerprint 51dea302d9d61e22/00000006--f3732a4905 * auto_fingerprint 0a84f6dd8372aef6/00000005--aff7debbbe * auto_fingerprint ea1fc707f10a580a/00000016--a6e25f0867 * auto_fingerprint c6dc5864bedfeaa9/00000000--b11ca96af3 * auto_fingerprint 63568e3e2f56c8ad/00000001--2c87c755e1 * don't have a verified dongle with MY2023 yet * adding 2023 to community docs * auto_fingerprint 472a018ff8fd479a/0000006f--72d838b24d * Revert "adding 2023 to community docs" This reverts commit bdaf5bff0a2ca3f1c826dc4257580822f95baf1b. * Revert "don't have a verified dongle with MY2023 yet" This reverts commit 0e8b8e300168ab3404cc74980a182bec1d3f50e0. --------- Co-authored-by: vanillagorillaa <31773928+vanillagorillaa@users.noreply.github.com> Co-authored-by: Jason Young * Toyota: Add FW for 2020 Toyota Corolla Sport JDM (#2644) Japanese Toyota Corolla Sport 2019-22 * HKG: Add FW for 2019 Kia Sorento (#2641) Kia Sorento Aus 2018/2019 Co-authored-by: Jason Young <46612682+jyoung8607@users.noreply.github.com> * Honda: Add FW for 2025 Honda HR-V (#2652) * docs: Scheduled auto-update CARS.md * kotarou fingerprint --------- Co-authored-by: AlexandreSato * Tesla: Add FW for Tesla Model 3 (#2658) added new tesla fingerprint * HKG: add FW for 2023 Hyundai Kona (#2613) * Update Hyundai Kona 2022 fingerprints and docs Added new firmware versions for Hyundai Kona 2022 in fingerprints.py and updated the documentation string to 'Hyundai Kona 2022-23' in values.py to reflect model year coverage. * ALT_LIMITS * Revert "ALT_LIMITS" This reverts commit 9ad75d1d5663354f6cedcdbb433c1f229c1b5bd4. * fix sorting order --------- Co-authored-by: Jason Young * HKG: Add FW for 2022 Kia Niro EV (#2102) Update fingerprints.py * docs: Scheduled auto-update CARS.md * Hyundai: fix Kia Sportage test route the auto-selected segment has a legitimate timeout on the TCS CAN message that was just slipping by the thresholds * CANParser: determine can_valid on read (#2665) props * Torque controller: refactor calculations to be in accel space (#2528) * gains need to be in lat accel space too (but behavior is still different) * actually it may make more sense * use siglin * fix * conflict * cleanups * more cleanup * unused import * remove gravity * imports * inverse * cleanup * more cleanip * lint * whitespace * more cleanup --------- Co-authored-by: Bruce Wayne * Fix mutation test timing out for big changes (#2668) * PSA AEE2010_R3: Initial Platform Support (#2379) * spam at 100Hz * try higher STEER_MAX * delete torque based control * set measured steerActuatorDelay * add route * fix: set static status when lat not active * clean checksum * clean: carcontroller * clean: carstate, interface * clean: psacan * clean: values * fix * comments * try 0_3s actuator * enable lanechange * implement standstill * fix: blinkers * fix: e208 car specs * fix: set ovveride.toml to angle based * actuatorDelay to 0.5s * add: standstill signal * add: translated DBC * fix: recuperation * test: status change * clean up status ramp * cleanup * add: ESP and cruisestate signals * actuatorDelay to 0.2 * cleanup * test max angle * set verified STEER_MAX * test fingerprinting * match nissan angle limits * Revert "match nissan angle limits" This reverts commit 4ef75889ac9e73127a8ae6dd98b875b52604132b. * fix tests * DEBUG: test fingerprint * actuatorDelay to 0.4 * DEBUG: use non-negative ECU offsetc * DEBUG: enable Dashcam mode * DEBUG: try to fix values.py * Revert "DEBUG: enable Dashcam mode" This reverts commit 4c632bcbaf78a4185232daa96df845e073764583. * set more ecu addresses * DBC: name DIAG frames * use simple fw request * cleanup * fix: rename carname to brand * swap CAN0/2 * add: carstate signals * fix: steeringRateSign * move PSA safety to opendbc * fix: adhere to new ANGLE_LIMITS * add: mandatory ignores for chks and counter * fix: fingerprint * disable radar ECU * translate HS2_DAT_MDD_CMD_452 msg * add ACC cancel request message * translate HS2_DAT_MDD_CMD_452 signals * rename to SPEED_SETPOINT * checksum init * add acc status msg * add structure for longitudinal * update test route * remove debug code * fix: ecu version requests * adjust ActuatorDelay to 0.3 * disable bus multiplexing * disable radar * enable longitudinal * add: artiv (radar) signals * rename * implement radar fake messages * add radar tx safety * fix * implement radar spoof * fix * disable long signals * DEBUG: test checksums * set checksum chk_ini * fix checksum 2f6 * checksum helper 2f6 * checksum helper 2b6 * fix checksum 2b6 * checksum helper 3f2 * try fixed radar values * unify checksum script * enable radar control * cleanup * add acc values * adjust long params * fix radar msg * enable resume from standstill * fix braking threshold * set standstill cruise false * set long tuning to default * DEBUG: test AUTO_BREAKING always on * DEBUG: AUTO_BRAKING on after 1 s of car startup * DEBUG: spoof radar after 10 seconds * sync 2f6 and 2b6 radar signals * DEBUG: set KiV long tune * DEBUG: set mult to 1000 * fix fwd hook * fix interface * adjust tuning * ARC STATUS=1 * scale torque multiplier with speed * scale fix * use simple acc to torque factor * use factor 80 * simplify * cleanup * set mult to 70 * DEBUG: try kiV * no kiV, linear accel/brake * AEB enable test * AEB always disabled test * add 100Hz gas pedal * op long optional * add acc related signals * set steerAtStandstill * fix: dbc message name typo * add steeringSaturated debug * adapt to master changes * safety: set meas_angle * chg: set steer_driver_allowance to 1.5 Nm * fix: steering wheel nudge on disengage * safety: add torque_driver * DEBUG: enable long * fix: req_diag_artiv * disable long * chg: reduce DRIVER_ALLOWANCE to 1 Nm * remove longitudinal * cleanup * move safety_psa * fw request * decrease torque * fw query * steerLimitTimer = 0.1 * DEBUG: fix fw query for psa * query test 1 * query test 2 * fw query test 3 * add ecu versions * fix fw query * fix ECU names * add tester preset * reactivate brand_matches skip * adapt to opendbc changes * fix linter * fix misra * fix pytest: add psa fw query timings * fix: rxchecks * adapt to master changes * clean values.py * DEBUG: fw_versions.py debug print * Revert "DEBUG: fw_versions.py debug print" This reverts commit c298f4f1711c055a31600587ba25f89cfbffc0e3. * use firmware request * PSA ECUs: is_tester_present_response exception * cleanup * rename dbc * peugeot 208 * delete opel corsa * clean * fix tests * comments * align angle rates to values.h * set rx counters * refactor * add checksum and counter hooks * set chk ini bytes * remove one message * fix misra * fix main bus * Revert "PSA ECUs: is_tester_present_response exception" This reverts commit 3387200097a62b4cda14840f198657876bcdedc8. * revert fingerprints.py entry * remove leading empty line * psa safety ALLOW_DEBUG * cleanup * fix tests * enable fw query for route recording * Revert "enable fw query for route recording" This reverts commit f81915ad27f125adb6424de793b87e4b3e40142d. * add better route * remove FW Query * remove DRIVER * sort alphabetical * cleanup * fix test * clean * clean * conservative steerLimitTimer * fix names formatting * psa test setup add helper to psa test add more helper * add StockSafety test * remove ESP signal * remove steerFaultPermanent * fix parse_wheel_speed and gasPressed * move frequency in rx checks * to_push/to_send -> msg * align formatting with values.py * rm GET_BUS * rm GET_ADDR * rm GET_BYTE * fix some tests * Update opendbc/car/psa/values.py Co-authored-by: Adeeb Shihadeh * use opendbc.car.lateral import * use opendbc.car.lateral import * remove legacy fingerprint * fix misra * fix CHECKSUM/COUNTER dbc names * use can packer for psa_checksum * fix tests * fix coverage * Apply suggestions from code review Co-authored-by: Shane Smiskol Co-authored-by: Adeeb Shihadeh * clean psacan * set steerLimitTimer to 0.1 * Update opendbc/car/psa/carcontroller.py Co-authored-by: Shane Smiskol * Update opendbc/car/psa/carstate.py Co-authored-by: Shane Smiskol * Update opendbc/safety/modes/psa.h Co-authored-by: Shane Smiskol * add newline in safety_declratations.h * fix indentation * remove fwd hook * Update opendbc/car/psa/carstate.py Co-authored-by: Shane Smiskol * Update opendbc/car/psa/carstate.py Co-authored-by: Shane Smiskol * fix main/cam bus naming * use brake_pressed instead brake_pressure * fix ruff * remove manual gear * fix ChecksumState * send steering at 20Hz * replicate stock LKAS behavior * fix mutations * Update opendbc/car/psa/carcontroller.py Co-authored-by: Shane Smiskol * Update opendbc/car/psa/carstate.py Co-authored-by: Shane Smiskol * fix dbc comment --------- Co-authored-by: Adeeb Shihadeh Co-authored-by: Shane Smiskol * HKG: fix 1b5 (#2637) Update hyundai_canfd.dbc * docs: Scheduled auto-update CARS.md * Honda: remove EPS mod support (#2672) * Nissan: add new fingerprint for Nissan Leaf 2021 UK (#2669) * nissan: add new firmware version 476605SH7E to FW_VERSIONS * fix sorting order --------- Co-authored-by: chris-moming4k Co-authored-by: Jason Young * Hyundai: fix CAN errors due to CRUISE_BUTTONS ECU TX jank (#2673) * Increase timeout if cache not hit (#2678) * no cache timeout * hmm * 90 fine * [bot] Fingerprints: add missing FW versions from new users (#2677) Export fingerprints * Honda: Update package availability for Civic (#2680) * correcting documentation * changed to automatic transmission, reads better on website * Remove automatic transmission requirements * Honda: Honda City (Brazil only) 2023 (#2425) * init Honda City * tmp fix EPB status error * test route and comments * updates * add this * fix handbrake * minSteerSpeed * fix * change * fix * current test route * follow parking brake signal name change * i hope this is wrong :( * wheelbase was wrong, also wants more SR * rm torque substitute * add generation to CAR name * one more ref * separate config block, rescaled actuator range * remove, will be restored with #2481 * adjust steeringPressed threshold * ultra swag due to undetected steer overrides * one more tweak * maybe two * this thing really wants SR --------- Co-authored-by: vanillagorillaa <31773928+vanillagorillaa@users.noreply.github.com> Co-authored-by: Jason Young * docs: Scheduled auto-update CARS.md --------- Co-authored-by: lukasloetkolben Co-authored-by: Shane Smiskol Co-authored-by: mvl-boston Co-authored-by: Grzegorz Gajoch Co-authored-by: Jason Young Co-authored-by: adeebshihadeh Co-authored-by: vanillagorillaa <31773928+vanillagorillaa@users.noreply.github.com> Co-authored-by: Yasuhiro Ohno <84763339+yasu-oh@users.noreply.github.com> Co-authored-by: Andrew Frahn Co-authored-by: Jason Young <46612682+jyoung8607@users.noreply.github.com> Co-authored-by: Alexandre Nobuharu Sato <66435071+AlexandreSato@users.noreply.github.com> Co-authored-by: AlexandreSato Co-authored-by: Amy Jeanes Co-authored-by: royjr Co-authored-by: James Vecellio-Grant <159560811+Discountchubbs@users.noreply.github.com> Co-authored-by: Adeeb Shihadeh Co-authored-by: Bruce Wayne Co-authored-by: elkoled Co-authored-by: Chris Chan Co-authored-by: chris-moming4k Co-authored-by: Thales Ceolin --- opendbc/car/tesla/carstate.py | 2 +- opendbc/safety/modes/tesla.h | 20 ++++++++++---------- opendbc/safety/tests/test_tesla.py | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/opendbc/car/tesla/carstate.py b/opendbc/car/tesla/carstate.py index 2e56a8b033e..3b71ae69b90 100644 --- a/opendbc/car/tesla/carstate.py +++ b/opendbc/car/tesla/carstate.py @@ -45,7 +45,7 @@ def update(self, can_parsers) -> structs.CarState: # Brake pedal ret.brake = 0 - ret.brakePressed = cp_party.vl["IBST_status"]["IBST_driverBrakeApply"] == 2 + ret.brakePressed = cp_party.vl["ESP_status"]["ESP_driverBrakeApply"] == 2 # Steering wheel epas_status = cp_party.vl["EPAS3S_sysStatus"] diff --git a/opendbc/safety/modes/tesla.h b/opendbc/safety/modes/tesla.h index 33f5e14ee58..a137f5e4b31 100644 --- a/opendbc/safety/modes/tesla.h +++ b/opendbc/safety/modes/tesla.h @@ -24,8 +24,8 @@ static uint8_t tesla_get_counter(const CANPacket_t *msg) { } else if (msg->addr == 0x488U) { // Signal: DAS_steeringControlCounter cnt = msg->data[2] & 0x0FU; - } else if ((msg->addr == 0x257U) || (msg->addr == 0x118U) || (msg->addr == 0x39dU) || (msg->addr == 0x286U) || (msg->addr == 0x311U)) { - // Signal: DI_speedCounter, DI_systemStatusCounter, IBST_statusCounter, DI_locStatusCounter, UI_warningCounter + } else if ((msg->addr == 0x257U) || (msg->addr == 0x118U) || (msg->addr == 0x145U) || (msg->addr == 0x286U) || (msg->addr == 0x311U)) { + // Signal: DI_speedCounter, DI_systemStatusCounter, ESP_statusCounter, DI_locStatusCounter, UI_warningCounter cnt = msg->data[1] & 0x0FU; } else if (msg->addr == 0x155U) { // Signal: ESP_wheelRotationCounter @@ -46,8 +46,8 @@ static int _tesla_get_checksum_byte(const int addr) { } else if (addr == 0x488) { // Signal: DAS_steeringControlChecksum checksum_byte = 3; - } else if ((addr == 0x257) || (addr == 0x118) || (addr == 0x39d) || (addr == 0x286) || (addr == 0x311)) { - // Signal: DI_speedChecksum, DI_systemStatusChecksum, IBST_statusChecksum, DI_locStatusChecksum, UI_warningChecksum + } else if ((addr == 0x257) || (addr == 0x118) || (addr == 0x145) || (addr == 0x286) || (addr == 0x311)) { + // Signal: DI_speedChecksum, DI_systemStatusChecksum, ESP_statusChecksum, DI_locStatusChecksum, UI_warningChecksum checksum_byte = 0; } else { } @@ -84,9 +84,9 @@ static bool tesla_get_quality_flag_valid(const CANPacket_t *msg) { bool valid = false; if (msg->addr == 0x155U) { valid = (msg->data[5] & 0x1U) == 0x1U; // ESP_wheelSpeedsQF - } else if (msg->addr == 0x39dU) { - int user_brake_status = msg->data[2] & 0x03U; - valid = (user_brake_status != 0) && (user_brake_status != 3); // IBST_driverBrakeApply=NOT_INIT_OR_OFF, FAULT + } else if (msg->addr == 0x145U) { + int user_brake_status = (msg->data[3] >> 5) & 0x03U; + valid = (user_brake_status != 0) && (user_brake_status != 3); // ESP_driverBrakeApply=NotInit_orOff, Faulty_SNA } else { } return valid; @@ -143,8 +143,8 @@ static void tesla_rx_hook(const CANPacket_t *msg) { } // Brake pressed - if (msg->addr == 0x39dU) { - brake_pressed = (msg->data[2] & 0x03U) == 2U; + if (msg->addr == 0x145U) { + brake_pressed = ((msg->data[3] >> 5) & 0x03U) == 2U; } // Cruise and Autopark/Summon state @@ -367,7 +367,7 @@ static safety_config tesla_init(uint16_t param) { {.msg = {{0x155, 0, 8, 50U, .max_counter = 15U}, { 0 }, { 0 }}}, // ESP_B (2nd speed in kph) {.msg = {{0x370, 0, 8, 100U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, // EPAS3S_sysStatus (steering angle) {.msg = {{0x118, 0, 8, 100U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, // DI_systemStatus (gas pedal) - {.msg = {{0x39d, 0, 5, 25U, .max_counter = 15U}, { 0 }, { 0 }}}, // IBST_status (brakes) + {.msg = {{0x145, 0, 8, 50U, .max_counter = 15U}, { 0 }, { 0 }}}, // ESP_status (brakes) {.msg = {{0x286, 0, 8, 10U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, // DI_state (acc state) {.msg = {{0x311, 0, 7, 10U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, // UI_warning (blinkers, buckle switch & doors) }; diff --git a/opendbc/safety/tests/test_tesla.py b/opendbc/safety/tests/test_tesla.py index a6b9265ba50..8c05a7dd2e3 100755 --- a/opendbc/safety/tests/test_tesla.py +++ b/opendbc/safety/tests/test_tesla.py @@ -95,10 +95,10 @@ def _angle_meas_msg(self, angle: float, hands_on_level: int = 0, eac_status: int return self.packer.make_can_msg_safety("EPAS3S_sysStatus", 0, values) def _user_brake_msg(self, brake, quality_flag: bool = True): - values = {"IBST_driverBrakeApply": 2 if brake else 1} + values = {"ESP_driverBrakeApply": 2 if brake else 1} if not quality_flag: - values["IBST_driverBrakeApply"] = random.choice((0, 3)) # NOT_INIT_OR_OFF, FAULT - return self.packer.make_can_msg_safety("IBST_status", 0, values) + values["ESP_driverBrakeApply"] = random.choice((0, 3)) # NotInit_orOff, Faulty_SNA + return self.packer.make_can_msg_safety("ESP_status", 0, values) def _speed_msg(self, speed): values = {"DI_vehicleSpeed": speed * 3.6} From 52236c167d8b12a2763585d0e32092acd7b0afc9 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Thu, 15 Jan 2026 23:37:15 -0800 Subject: [PATCH 042/229] Kia Optima Hybrid 2019: add new FW (#3038) it was out of date range, now we have almost the whole year --- opendbc/car/hyundai/fingerprints.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/opendbc/car/hyundai/fingerprints.py b/opendbc/car/hyundai/fingerprints.py index 84873ff3b83..7b4bb1c72ee 100644 --- a/opendbc/car/hyundai/fingerprints.py +++ b/opendbc/car/hyundai/fingerprints.py @@ -860,9 +860,11 @@ CAR.KIA_OPTIMA_H_G4_FL: { (Ecu.fwdRadar, 0x7d0, None): [ b'\xf1\x00JFhe SCC FHCUP 1.00 1.01 99110-A8500 ', + b'\xf1\x00JFhe SCC FHCUP 1.00 1.03 99110-A8500 ', ], (Ecu.fwdCamera, 0x7c4, None): [ b'\xf1\x00JFH MFC AT KOR LHD 1.00 1.01 95895-A8200 180323', + b'\xf1\x00JFH MFC AT KOR LHD 1.00 1.04 95895-A8200 181217', ], }, CAR.HYUNDAI_ELANTRA: { From b899b2f84b771177412d4207862de71fd06563ce Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 16 Jan 2026 00:03:55 -0800 Subject: [PATCH 043/229] Add issue templates (#3039) * add some links * bug template from op * car-ify it * more * more * more * isn't * woops --- .github/ISSUE_TEMPLATE/car_bug_report.yml | 49 +++++++++++++++++++++++ .github/ISSUE_TEMPLATE/config.yml | 14 +++++++ 2 files changed, 63 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/car_bug_report.yml create mode 100644 .github/ISSUE_TEMPLATE/config.yml diff --git a/.github/ISSUE_TEMPLATE/car_bug_report.yml b/.github/ISSUE_TEMPLATE/car_bug_report.yml new file mode 100644 index 00000000000..0c4ba3e3d2d --- /dev/null +++ b/.github/ISSUE_TEMPLATE/car_bug_report.yml @@ -0,0 +1,49 @@ +name: Car bug report +description: For issues with a particular car make or model +labels: ["car", "bug"] +body: + + - type: markdown + attributes: + value: > + Before creating a **car bug report**, please check the following: + * If the issue likely isn't specific to your car model or make, go back and open an **openpilot bug report** instead. + * If the issue is related to the driving or driver monitoring models, you should open a [discussion](https://github.com/commaai/openpilot/discussions/categories/model-feedback) instead. + * If you are fingerprinting your car, refer to the [fingerprinting guide](https://github.com/commaai/openpilot/wiki/Fingerprinting) or visit the [community Discord server](https://discord.comma.ai) to request help. + * If you are inquiring about future car support, check the [community Discord server](https://discord.comma.ai) for progress on your vehicle and help contribute. Issues simply requesting support for new vehicles will be closed. + * Ensure you're running the latest openpilot release. + * Ensure you're using officially supported hardware. + * Ensure there isn't an existing issue for your bug. If there is, leave a comment on the existing issue. + * Ensure you're running stock openpilot. We cannot look into bug reports from forks. + + If you're unsure whether you've hit a bug, check out the #installation-help channel in the [community Discord server](https://discord.comma.ai). + + - type: textarea + attributes: + label: Describe the car bug + description: Also include a description of how to reproduce the bug + validations: + required: true + + - type: input + id: route + attributes: + label: Provide a route where the issue occurs + description: Ensure the route is fully uploaded at https://useradmin.comma.ai. We cannot look into issues without routes, or at least a Dongle ID. + placeholder: 77611a1fac303767|2020-05-11--16-37-07 + validations: + required: true + + - type: input + id: version + attributes: + label: openpilot version + description: If you're not on release, provide the commit hash + placeholder: 0.8.10 + validations: + required: true + + - type: textarea + attributes: + label: Additional info + diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 00000000000..d7df27e5c68 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,14 @@ +blank_issues_enabled: false +contact_links: + - name: openpilot bug report + url: https://github.com/commaai/openpilot/issues/new + about: For issues not limited to a particular car make or model, e.g. driving model performance or issues with your comma device. + - name: Join the Discord + url: https://discord.comma.ai + about: The community Discord is for both car port development and experience discussion + - name: Report driving behavior feedback + url: https://discord.com/channels/469524606043160576/1254834193066623017 + about: Feedback for the driving and driver monitoring models goes in the #driving-feedback in Discord + - name: Community Wiki + url: https://github.com/commaai/openpilot/wiki + about: Check out our community wiki From 05e786c2eab85c5217a3c81a81f3c055694c7367 Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Fri, 16 Jan 2026 11:57:58 -0500 Subject: [PATCH 044/229] Honda: Add FW for 2025 Honda Accord Hybrid (#3042) * Honda: Add FW for 2025 Honda Accord Hybrid * can't join a side quest right now --- opendbc/car/honda/fingerprints.py | 1 + 1 file changed, 1 insertion(+) diff --git a/opendbc/car/honda/fingerprints.py b/opendbc/car/honda/fingerprints.py index 0133dca02c8..9b5b68992e2 100644 --- a/opendbc/car/honda/fingerprints.py +++ b/opendbc/car/honda/fingerprints.py @@ -1009,6 +1009,7 @@ (Ecu.fwdCamera, 0x18dab5f1, None): [ b'8S102-30A-A050\x00\x00', b'8S102-30A-A060\x00\x00', + b'8S102-30A-A070\x00\x00', ], }, CAR.HONDA_CRV_6G: { From 9d3c88571bf244b6af831fb176f96b181bf8412f Mon Sep 17 00:00:00 2001 From: ugtthis <142481257+ugtthis@users.noreply.github.com> Date: Fri, 16 Jan 2026 18:36:31 -0600 Subject: [PATCH 045/229] fix indent to 4 spaces (#3041) fix indent --- opendbc/car/tesla/values.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendbc/car/tesla/values.py b/opendbc/car/tesla/values.py index 92a08d2a87f..58635a9a2fa 100644 --- a/opendbc/car/tesla/values.py +++ b/opendbc/car/tesla/values.py @@ -53,7 +53,7 @@ class CAR(Platforms): [ TeslaCarDocsHW3("Tesla Model Y (with HW3) 2020-23"), TeslaCarDocsHW4("Tesla Model Y (with HW4) 2024-25"), - ], + ], CarSpecs(mass=2072., wheelbase=2.890, steerRatio=12.0), ) TESLA_MODEL_X = TeslaPlatformConfig( From 80f030ac5d6391ad408c957225d9bd600de6da18 Mon Sep 17 00:00:00 2001 From: Daniel Koepping Date: Mon, 19 Jan 2026 14:31:20 -0800 Subject: [PATCH 046/229] Car diff (#3024) * Opendbc replay (#6) * add replay POC * compare HEAD to master * split in compare and worker * copy worker.py * cleanup * fix * apply tesla brake PR * fix * fix mutation test * add panda * add timestamps * simplify * add falling edge * add remaining carstate * simple lines * bump * rename * use zst as ref * ref commit * cleanup * formatting * no failing * fix git * clean * use pool.map * fix docker build * clean * Revert "fix docker build" This reverts commit da3577441eaa4b7fdc5763f73e779dd32c03a3c3. * use flat paths * format * use azure test instance * print full diff * no stderr output * use GIT_REF * Revert "apply tesla brake PR" This reverts commit f377e21f3865c574db5d618be20b4efa86fba66f. * allow overwrite blobs * supress stderr * add error on failed generation (#8) * Opendbc replay (#129) * add replay POC * compare HEAD to master * split in compare and worker * copy worker.py * cleanup * fix * apply tesla brake PR * fix * fix mutation test * add panda * add timestamps * simplify * add falling edge * add remaining carstate * simple lines * bump * rename * use zst as ref * ref commit * cleanup * formatting * no failing * fix git * clean * use pool.map * fix docker build * clean * Revert "fix docker build" This reverts commit da3577441eaa4b7fdc5763f73e779dd32c03a3c3. * use flat paths * format * use azure test instance * print full diff * no stderr output * use GIT_REF * Revert "apply tesla brake PR" This reverts commit f377e21f3865c574db5d618be20b4efa86fba66f. * allow overwrite blobs * supress stderr * print upload refs * add error on failed generation * Revert "use azure test instance" This reverts commit ba969ccda452a4841934440d3ced22829861f70f. * Revert "fix mutation test" This reverts commit 8f5e01de7743ee38c340df90751cf370634fe2b2. * detect safety changes * use logReader * only use valid platforms * use local database * Revert "use local database" This reverts commit 4ebe9fe0800fb1631efe8672817a8c21b8780b65. * Reapply "use azure test instance" This reverts commit e9968a04e4ddee00b69174fd30ee1cdcdfa506fb. * cutoff diff * parallel downloads * enable stderr * fix interface * logprint errors * add comment to PR * fix * FORMAT: lines * FORMAT: plots * FORMAT: fix * modules * Revert "use azure test instance" This reverts commit ba969ccda452a4841934440d3ced22829861f70f. * build on forks * clean * rename * replace azure with ci-artifacts * auto bootstrap * help * FORK TEST * Revert "FORMAT: fix" This reverts commit 0262b1fad446691d594adef6baf284938d2d115d. * Revert "FORMAT: plots" This reverts commit 314417db1fb4c01206d8b3880f240a44d70b5a7e. * Revert "FORMAT: lines" This reverts commit 5cdd4c567f0440874a74678ca7cb3b6f909bc0ba. * clean * no comment on empty output * output errors * fix pr comment * fix diff more * increase tolerance * less files * one file * Revert "FORK TEST" This reverts commit fc691b500c58e76a41c8f5785b6acf89ff4e1573. * Revert "fix mutation test" This reverts commit 8f5e01de7743ee38c340df90751cf370634fe2b2. * fix comment * fix comment * move car_diff.py * Revert "fix mutation test" This reverts commit 8f5e01de7743ee38c340df90751cf370634fe2b2. * move car_diff.py * inline helpers * inline helpers * fix ruff * fix ruff * use all carstate fields * add --all * use all carstate fields * add --all * bootstrap * bootstrap * Revert "bootstrap" This reverts commit c3c2ba41e8d1dbdeb74cef8498caf9fd13325fe3. * add line formatting * commit workflow * adjust formatting * return err * subprocess * comma_car_segments * dead code * minimal logreader * remove openpilot * add deps * remove all deps * fix source * request * less parallel * fix push * bootstrap * Revert "bootstrap" This reverts commit b4af0d3bbd31f119ed3f18933329dcc64c9cf634. * fix graph * push * regex * optimize dict_diff * reduce tolerance * use comma_car_segments * remove * use requests * timestamps * frame_ms * id * logreader * align logreader * use logreader * remove requests * return * more line * ruff * use test pip package * push on commaai * use zstandard lib * clean * rename * use decompress * fix * index * lr filter * union types * find edges * group frames * render waveform * format timing * signals * numeric diff * boolean diff * real timestamp * impreza fingerprint * Revert "impreza fingerprint" This reverts commit 692e34c7f8df6540c26eca79799a8eac47f352bc. * apply tesla brake PR * honda clear startup fault * Revert "honda clear startup fault" This reverts commit 91c4a5d3c896cf0936c5cf00a484127b9665d21c. * skip unrelated edges * fix exit * fix down edge * use hf pip package * comment on fail * fix * comment * no exit 1 in CI --- .github/workflows/tests.yml | 48 +++++- opendbc/car/logreader.py | 67 ++++++++ opendbc/car/rlog.capnp | 23 +++ opendbc/car/tests/car_diff.py | 314 ++++++++++++++++++++++++++++++++++ pyproject.toml | 2 + 5 files changed, 453 insertions(+), 1 deletion(-) create mode 100644 opendbc/car/logreader.py create mode 100644 opendbc/car/rlog.capnp create mode 100644 opendbc/car/tests/car_diff.py diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6f04f489d35..5ebeceed5d2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -60,7 +60,53 @@ jobs: scons -j8 cd opendbc/safety/tests && ./mutation.sh - # TODO: this test needs to move to opendbc + car_diff: + name: car diff + runs-on: ${{ github.repository == 'commaai/opendbc' && 'namespace-profile-amd64-8x16' || 'ubuntu-latest' }} + env: + GIT_REF: ${{ github.event_name == 'push' && github.ref == format('refs/heads/{0}', github.event.repository.default_branch) && github.event.before || format('origin/{0}', github.event.repository.default_branch) }} + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - uses: ./.github/workflows/cache + - name: Build opendbc + run: | + source setup.sh + scons -j8 + - name: Test car diff + if: github.event_name == 'pull_request' + run: source setup.sh && python opendbc/car/tests/car_diff.py | tee diff.txt + - name: Comment PR + if: always() && github.event_name == 'pull_request' + env: + GH_TOKEN: ${{ github.token }} + run: '[ -s diff.txt ] && gh pr comment ${{ github.event.pull_request.number }} --repo ${{ github.repository }} -F diff.txt || true' + - name: Update refs + if: github.repository == 'commaai/opendbc' && github.ref == 'refs/heads/master' + run: source setup.sh && python opendbc/car/tests/car_diff.py --update-refs + - name: Checkout ci-artifacts + if: github.repository == 'commaai/opendbc' && github.ref == 'refs/heads/master' + uses: actions/checkout@v4 + with: + repository: commaai/ci-artifacts + ssh-key: ${{ secrets.CI_ARTIFACTS_DEPLOY_KEY }} + path: ${{ github.workspace }}/ci-artifacts + - name: Push refs + if: github.repository == 'commaai/opendbc' && github.ref == 'refs/heads/master' + working-directory: ${{ github.workspace }}/ci-artifacts + run: | + ls ${{ github.workspace }}/car_diff/*.zst 2>/dev/null || exit 0 + git config user.name "GitHub Actions Bot" + git config user.email "<>" + git fetch origin car_diff || true + git checkout car_diff 2>/dev/null || git checkout --orphan car_diff + cp ${{ github.workspace }}/car_diff/*.zst . + git add *.zst + git commit -m "car_diff refs for ${{ github.sha }}" || echo "No changes to commit" + git push origin car_diff + + # TODO: this needs to move to opendbc test_models: name: test models runs-on: ${{ github.repository == 'commaai/opendbc' && 'namespace-profile-amd64-8x16' || 'ubuntu-latest' }} diff --git a/opendbc/car/logreader.py b/opendbc/car/logreader.py new file mode 100644 index 00000000000..93b2359fb5b --- /dev/null +++ b/opendbc/car/logreader.py @@ -0,0 +1,67 @@ +#!/usr/bin/env python3 +import os +import capnp +import urllib.parse +import warnings +from urllib.request import urlopen +import zstandard as zstd + +from opendbc.car.common.basedir import BASEDIR + +capnp_log = capnp.load(os.path.join(BASEDIR, "rlog.capnp")) + + +def decompress_stream(data: bytes): + dctx = zstd.ZstdDecompressor() + decompressed_data = b"" + + with dctx.stream_reader(data) as reader: + decompressed_data = reader.read() + + return decompressed_data + + +class LogReader: + def __init__(self, fn, only_union_types=False, sort_by_time=False): + self._only_union_types = only_union_types + _, ext = os.path.splitext(urllib.parse.urlparse(fn).path) + + if fn.startswith("http"): + with urlopen(fn) as f: + dat = f.read() + else: + with open(fn, "rb") as f: + dat = f.read() + + if ext == ".zst" or dat.startswith(b'\x28\xB5\x2F\xFD'): + # https://github.com/facebook/zstd/blob/dev/doc/zstd_compression_format.md#zstandard-frames + dat = decompress_stream(dat) + + ents = capnp_log.Event.read_multiple_bytes(dat) + + self._ents = [] + try: + for e in ents: + self._ents.append(e) + except capnp.KjException: + warnings.warn("Corrupted events detected", RuntimeWarning, stacklevel=1) + + if sort_by_time: + self._ents.sort(key=lambda x: x.logMonoTime) + + def __iter__(self): + for ent in self._ents: + if self._only_union_types: + try: + ent.which() + yield ent + except capnp.lib.capnp.KjException: + pass + else: + yield ent + + def filter(self, msg_type: str): + return (getattr(m, m.which()) for m in filter(lambda m: m.which() == msg_type, self)) + + def first(self, msg_type: str): + return next(self.filter(msg_type), None) diff --git a/opendbc/car/rlog.capnp b/opendbc/car/rlog.capnp new file mode 100644 index 00000000000..50cdd68b5eb --- /dev/null +++ b/opendbc/car/rlog.capnp @@ -0,0 +1,23 @@ +@0xce500edaaae36b0e; + +# Minimal schema for parsing rlog CAN messages +# Subset of cereal/log.capnp + +struct CanData { + address @0 :UInt32; + busTimeDEPRECATED @1 :UInt16; + dat @2 :Data; + src @3 :UInt8; +} + +struct Event { + logMonoTime @0 :UInt64; + + union { + initData @1 :Void; + frame @2 :Void; + gpsNMEA @3 :Void; + sensorEventDEPRECATED @4 :Void; + can @5 :List(CanData); + } +} diff --git a/opendbc/car/tests/car_diff.py b/opendbc/car/tests/car_diff.py new file mode 100644 index 00000000000..a75b8f95dff --- /dev/null +++ b/opendbc/car/tests/car_diff.py @@ -0,0 +1,314 @@ +import argparse +import os +import pickle +import re +import subprocess +import sys +import tempfile +import zstandard as zstd +from urllib.request import urlopen +from collections import defaultdict +from concurrent.futures import ProcessPoolExecutor +from pathlib import Path + +from comma_car_segments import get_comma_car_segments_database, get_url + +from opendbc.car.logreader import LogReader, decompress_stream + + +TOLERANCE = 1e-4 +DIFF_BUCKET = "car_diff" +IGNORE_FIELDS = ["cumLagMs", "canErrorCounter"] + + +def dict_diff(d1, d2, path="", ignore=None, tolerance=0): + ignore = ignore or [] + diffs = [] + for key in d1.keys() | d2.keys(): + if key in ignore: + continue + full_path = f"{path}.{key}" if path else key + v1, v2 = d1.get(key), d2.get(key) + if isinstance(v1, dict) and isinstance(v2, dict): + diffs.extend(dict_diff(v1, v2, full_path, ignore, tolerance)) + elif isinstance(v1, (int, float)) and isinstance(v2, (int, float)): + if abs(v1 - v2) > tolerance: + diffs.append(("change", full_path, (v1, v2))) + elif v1 != v2: + diffs.append(("change", full_path, (v1, v2))) + return diffs + + +def load_can_messages(seg): + parts = seg.split("/") + url = get_url(f"{parts[0]}/{parts[1]}", parts[2]) + msgs = LogReader(url, only_union_types=True) + return [m for m in msgs if m.which() == 'can'] + + +def replay_segment(platform, can_msgs): + from opendbc.car import gen_empty_fingerprint, structs + from opendbc.car.can_definitions import CanData + from opendbc.car.car_helpers import FRAME_FINGERPRINT, interfaces + + fingerprint = gen_empty_fingerprint() + for msg in can_msgs[:FRAME_FINGERPRINT]: + for m in msg.can: + if m.src < 64: + fingerprint[m.src][m.address] = len(m.dat) + + CarInterface = interfaces[platform] + CP = CarInterface.get_params(platform, fingerprint, [], False, False, False) + CI = CarInterface(CP) + CC = structs.CarControl().as_reader() + + states, timestamps = [], [] + for msg in can_msgs: + frames = [CanData(c.address, c.dat, c.src) for c in msg.can] + states.append(CI.update([(msg.logMonoTime, frames)])) + CI.apply(CC, msg.logMonoTime) + timestamps.append(msg.logMonoTime) + return states, timestamps + + +def process_segment(args): + platform, seg, ref_path, update = args + try: + can_msgs = load_can_messages(seg) + states, timestamps = replay_segment(platform, can_msgs) + ref_file = Path(ref_path) / f"{platform}_{seg.replace('/', '_')}.zst" + + if update: + data = list(zip(timestamps, states, strict=True)) + ref_file.write_bytes(zstd.compress(pickle.dumps(data), 10)) + return (platform, seg, [], None) + + if not ref_file.exists(): + return (platform, seg, [], "no ref") + + ref = pickle.loads(decompress_stream(ref_file.read_bytes())) + diffs = [] + for i, ((ts, ref_state), state) in enumerate(zip(ref, states, strict=True)): + for diff in dict_diff(ref_state.to_dict(), state.to_dict(), ignore=IGNORE_FIELDS, tolerance=TOLERANCE): + diffs.append((diff[1], i, diff[2], ts)) + return (platform, seg, diffs, None) + except Exception as e: + return (platform, seg, [], str(e)) + + +def get_changed_platforms(cwd, database, interfaces): + git_ref = os.environ.get("GIT_REF", "origin/master") + changed = subprocess.check_output(["git", "diff", "--name-only", f"{git_ref}...HEAD"], cwd=cwd, encoding='utf8').strip() + brands = set() + patterns = [r"opendbc/car/(\w+)/", r"opendbc/dbc/(\w+?)_", r"opendbc/dbc/generator/(\w+)", r"opendbc/safety/modes/(\w+?)[_.]"] + for line in changed.splitlines(): + for pattern in patterns: + m = re.search(pattern, line) + if m: + brands.add(m.group(1).lower()) + return [p for p in interfaces if any(b in p.lower() for b in brands) and p in database] + + +def download_refs(ref_path, platforms, segments): + base_url = f"https://raw.githubusercontent.com/commaai/ci-artifacts/refs/heads/{DIFF_BUCKET}" + for platform in platforms: + for seg in segments.get(platform, []): + filename = f"{platform}_{seg.replace('/', '_')}.zst" + try: + with urlopen(f"{base_url}/{filename}") as resp: + (Path(ref_path) / filename).write_bytes(resp.read()) + except Exception: + pass + + +def run_replay(platforms, segments, ref_path, update, workers=4): + work = [(platform, seg, ref_path, update) + for platform in platforms for seg in segments.get(platform, [])] + with ProcessPoolExecutor(max_workers=workers) as pool: + return list(pool.map(process_segment, work)) + + +# ASCII waveforms helpers +def find_edges(vals, init): + rises = [] + falls = [] + prev = init + for i, val in enumerate(vals): + if val and not prev: + rises.append(i) + if not val and prev: + falls.append(i) + prev = val + return rises, falls + + +def render_waveform(label, vals, init): + wave = {(False, False): "_", (True, True): "‾", (False, True): "/", (True, False): "\\"} + line = f" {label}:".ljust(12) + prev = init + for val in vals: + line += wave[(prev, val)] + prev = val + if len(line) > 80: + line = line[:80] + "..." + return line + + +def format_timing(edge_type, master_edges, pr_edges, ms_per_frame): + if not master_edges or not pr_edges: + return None + delta = pr_edges[0] - master_edges[0] + if delta == 0: + return None + direction = "lags" if delta > 0 else "leads" + ms = int(abs(delta) * ms_per_frame) + return " " * 12 + f"{edge_type}: PR {direction} by {abs(delta)} frames ({ms}ms)" + + +def group_frames(diffs, max_gap=15): + groups = [] + current = [diffs[0]] + for diff in diffs[1:]: + _, frame, _, _ = diff + _, prev_frame, _, _ = current[-1] + if frame <= prev_frame + max_gap: + current.append(diff) + else: + groups.append(current) + current = [diff] + groups.append(current) + return groups + + +def build_signals(group): + _, first_frame, _, _ = group[0] + _, last_frame, (final_master, _), _ = group[-1] + start = max(0, first_frame - 5) + end = last_frame + 6 + init = not final_master + diff_at = {frame: (m, p) for _, frame, (m, p), _ in group} + master_vals = [] + pr_vals = [] + master = init + pr = init + for frame in range(start, end): + if frame in diff_at: + master, pr = diff_at[frame] + elif frame > last_frame: + master = pr = final_master + master_vals.append(master) + pr_vals.append(pr) + return master_vals, pr_vals, init, start, end + + +def format_numeric_diffs(diffs): + lines = [] + for _, frame, (old_val, new_val), _ in diffs[:10]: + lines.append(f" frame {frame}: {old_val} -> {new_val}") + if len(diffs) > 10: + lines.append(f" (... {len(diffs) - 10} more)") + return lines + + +def format_boolean_diffs(diffs): + _, first_frame, _, first_ts = diffs[0] + _, last_frame, _, last_ts = diffs[-1] + frame_time = last_frame - first_frame + time_ms = (last_ts - first_ts) / 1e6 + ms = time_ms / frame_time if frame_time else 10.0 + lines = [] + for group in group_frames(diffs): + master_vals, pr_vals, init, start, end = build_signals(group) + master_rises, master_falls = find_edges(master_vals, init) + pr_rises, pr_falls = find_edges(pr_vals, init) + if bool(master_rises) != bool(pr_rises) or bool(master_falls) != bool(pr_falls): + continue + lines.append(f"\n frames {start}-{end - 1}") + lines.append(render_waveform("master", master_vals, init)) + lines.append(render_waveform("PR", pr_vals, init)) + for edge_type, master_edges, pr_edges in [("rise", master_rises, pr_rises), ("fall", master_falls, pr_falls)]: + msg = format_timing(edge_type, master_edges, pr_edges, ms) + if msg: + lines.append(msg) + return lines + + +def format_diff(diffs): + if not diffs: + return [] + _, _, (old, new), _ = diffs[0] + is_bool = isinstance(old, bool) and isinstance(new, bool) + if is_bool: + return format_boolean_diffs(diffs) + return format_numeric_diffs(diffs) + + +def main(platform=None, segments_per_platform=10, update_refs=False, all_platforms=False): + from opendbc.car.car_helpers import interfaces + + cwd = Path(__file__).resolve().parents[3] + ref_path = cwd / DIFF_BUCKET + if not update_refs: + ref_path = Path(tempfile.mkdtemp()) + ref_path.mkdir(exist_ok=True) + database = get_comma_car_segments_database() + + if all_platforms: + print("Running all platforms...") + platforms = [p for p in interfaces if p in database] + elif platform and platform in interfaces: + platforms = [platform] + else: + platforms = get_changed_platforms(cwd, database, interfaces) + + if not platforms: + print("No car changes detected", file=sys.stderr) + return 0 + + segments = {p: database.get(p, [])[:segments_per_platform] for p in platforms} + n_segments = sum(len(s) for s in segments.values()) + print(f"{'Generating' if update_refs else 'Testing'} {n_segments} segments for: {', '.join(platforms)}") + + if update_refs: + results = run_replay(platforms, segments, ref_path, update=True) + errors = [e for _, _, _, e in results if e] + assert len(errors) == 0, f"Segment failures: {errors}" + print(f"Generated {n_segments} refs to {ref_path}") + return 0 + + download_refs(ref_path, platforms, segments) + results = run_replay(platforms, segments, ref_path, update=False) + + with_diffs = [(p, s, d) for p, s, d, e in results if d] + errors = [(p, s, e) for p, s, d, e in results if e] + n_passed = len(results) - len(with_diffs) - len(errors) + + print(f"\nResults: {n_passed} passed, {len(with_diffs)} with diffs, {len(errors)} errors") + + for plat, seg, err in errors: + print(f"\nERROR {plat} - {seg}: {err}") + + if with_diffs: + print("```") + for plat, seg, diffs in with_diffs: + print(f"\n{plat} - {seg}") + by_field = defaultdict(list) + for d in diffs: + by_field[d[0]].append(d) + for field, fd in sorted(by_field.items()): + print(f" {field} ({len(fd)} diffs)") + for line in format_diff(fd): + print(line) + print("```") + + return 1 if errors else 0 + + +if __name__ == "__main__": + parser = argparse.ArgumentParser() + parser.add_argument("--platform", help="diff single platform") + parser.add_argument("--segments-per-platform", type=int, default=10, help="number of segments to diff per platform") + parser.add_argument("--update-refs", action="store_true", help="update refs based on current commit") + parser.add_argument("--all", action="store_true", help="run diff on all platforms") + args = parser.parse_args() + sys.exit(main(args.platform, args.segments_per_platform, args.update_refs, args.all)) diff --git a/pyproject.toml b/pyproject.toml index 1a0ace169d8..d0d3cd27065 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,6 +20,7 @@ dependencies = [ [project.optional-dependencies] testing = [ + "comma-car-segments @ https://huggingface.co/datasets/commaai/commaCarSegments/resolve/main/dist/comma_car_segments-0.1.0-py3-none-any.whl", "cffi", "gcovr", # FIXME: pytest 9.0.0 doesn't support unittest.SkipTest @@ -32,6 +33,7 @@ testing = [ "pytest-subtests", "hypothesis==6.47.*", "parameterized>=0.8,<0.9", + "zstandard", # static analysis "ruff", From 796ece26acd8b9255810ca71941ed72626589ee7 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Mon, 19 Jan 2026 15:30:32 -0800 Subject: [PATCH 047/229] libsafety: switch to clang 18 and only build mull in standalone mode (#3044) * just switch to 18 * try this * just clang * rm that * try this --- .github/workflows/tests.yml | 2 +- opendbc/safety/tests/libsafety/SConscript | 28 +++++++++++------------ opendbc/safety/tests/mutation.sh | 2 +- opendbc/safety/tests/test.sh | 4 ++-- setup.sh | 14 ++++++------ 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5ebeceed5d2..4328ffd28d6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -138,7 +138,7 @@ jobs: path: .ci_cache/comma_download_cache key: car_models-${{ hashFiles('selfdrive/car/tests/test_models.py', 'opendbc/car/tests/routes.py') }}-${{ matrix.job }} - name: Build openpilot - run: ${{ env.RUN }} "VIRTUAL_ENV= opendbc_repo/setup.sh && scons -j$(nproc) common/ cereal/ selfdrive/pandad/ msgq_repo/ opendbc_repo" + run: ${{ env.RUN }} "scons -j$(nproc) common/ cereal/ selfdrive/pandad/ msgq_repo/ opendbc_repo" - name: Test car models timeout-minutes: ${{ contains(runner.name, 'nsc') && (steps.routes-cache.outputs.cache-hit == 'true') && ((steps.setup-step.outputs.duration < 18) && 1 || 2) || 6 }} run: | diff --git a/opendbc/safety/tests/libsafety/SConscript b/opendbc/safety/tests/libsafety/SConscript index a8cb50cc2e0..78c2ad65df6 100644 --- a/opendbc/safety/tests/libsafety/SConscript +++ b/opendbc/safety/tests/libsafety/SConscript @@ -1,16 +1,10 @@ +import os import platform system = platform.system() -# Use clang-17 for both normal tests and mutation testing -# The Mull plugin injects mutations that are dormant unless run with mull-runner -if system == "Darwin": - mull_plugin = Dir('#').abspath + '/.mull/lib/mull-ir-frontend-17' -else: - mull_plugin = '/usr/lib/mull-ir-frontend-17' - env = Environment( - CC='clang-17', + CC='clang', CFLAGS=[ '-Wall', "-Wextra", @@ -23,23 +17,29 @@ env = Environment( '-g', '-O0', '-fno-omit-frame-pointer', - '-fprofile-arcs', - '-ftest-coverage', - f'-fpass-plugin={mull_plugin}', '-grecord-command-line', '-DALLOW_DEBUG', ], LINKFLAGS=[ - '-fprofile-arcs', - '-ftest-coverage', '-fsanitize=undefined', '-fno-sanitize-recover=undefined', ], CPPPATH=["#"], tools=["default", "compilation_db"], ) + +# The Mull plugin injects mutations that are dormant unless run with mull-runner if system == "Darwin": - env.PrependENVPath('PATH', '/opt/homebrew/opt/llvm@17/bin') + mull_plugin = Dir('#').abspath + '/.mull/lib/mull-ir-frontend-18' +else: + mull_plugin = '/usr/lib/mull-ir-frontend-18' +if os.path.exists(mull_plugin): + # Only use mull plugin if it exists + env['CC'] = 'clang-18' + env.Append(CFLAGS=['-fprofile-arcs', '-ftest-coverage', f'-fpass-plugin={mull_plugin}']) + env.Append(LINKFLAGS=['-fprofile-arcs', '-ftest-coverage']) + if system == "Darwin": + env.PrependENVPath('PATH', '/opt/homebrew/opt/llvm@18/bin') safety = env.SharedObject("safety.os", "safety.c") libsafety = env.SharedLibrary("libsafety.so", [safety]) diff --git a/opendbc/safety/tests/mutation.sh b/opendbc/safety/tests/mutation.sh index 411bab3598e..3a46b0056d7 100755 --- a/opendbc/safety/tests/mutation.sh +++ b/opendbc/safety/tests/mutation.sh @@ -17,4 +17,4 @@ EOF scons -j4 -D -mull-runner-17 --debug --ld-search-path /lib/x86_64-linux-gnu/ ./libsafety/libsafety.so -test-program=pytest -- -n8 --ignore-glob=misra/* \ No newline at end of file +mull-runner-18 --debug --ld-search-path /lib/x86_64-linux-gnu/ ./libsafety/libsafety.so -test-program=pytest -- -n8 --ignore-glob=misra/* \ No newline at end of file diff --git a/opendbc/safety/tests/test.sh b/opendbc/safety/tests/test.sh index e121721bcd4..1ff4ee820b4 100755 --- a/opendbc/safety/tests/test.sh +++ b/opendbc/safety/tests/test.sh @@ -14,9 +14,9 @@ scons -j$(nproc) -D pytest -n8 --ignore-glob=misra/* if [ "$(uname)" = "Darwin" ]; then - GCOV_EXEC="/opt/homebrew/opt/llvm@17/bin/llvm-cov gcov" + GCOV_EXEC="/opt/homebrew/opt/llvm@18/bin/llvm-cov gcov" else - GCOV_EXEC="llvm-cov-17 gcov" + GCOV_EXEC="llvm-cov-18 gcov" fi # generate and open report diff --git a/setup.sh b/setup.sh index 4aee2d16de0..8e243493c2e 100755 --- a/setup.sh +++ b/setup.sh @@ -8,18 +8,18 @@ export PYTHONPATH=$BASEDIR # *** dependencies install *** if [ "$(uname -s)" = "Linux" ]; then - if ! command -v "mull-runner-17" > /dev/null 2>&1; then + if ! command -v "mull-runner-18" > /dev/null 2>&1; then curl -1sLf 'https://dl.cloudsmith.io/public/mull-project/mull-stable/setup.deb.sh' | sudo -E bash - sudo apt-get update && sudo apt-get install -y clang-17 mull-17 + sudo apt-get update && sudo apt-get install -y clang-18 mull-18 fi elif [ "$(uname -s)" = "Darwin" ]; then - if ! brew list llvm@17 &>/dev/null; then - brew install llvm@17 + if ! brew list llvm@18 &>/dev/null; then + brew install llvm@18 fi - if [ ! -f "$BASEDIR/.mull/bin/mull-runner-17" ]; then + if [ ! -f "$BASEDIR/.mull/bin/mull-runner-18" ]; then MULL_VERSION="0.26.1" - MULL_ZIP="Mull-17-${MULL_VERSION}-LLVM-17.0-macOS-arm64-14.7.4.zip" - MULL_DIR="Mull-17-${MULL_VERSION}-LLVM-17.0-macOS-arm64-14.7.4" + MULL_ZIP="Mull-18-${MULL_VERSION}-LLVM-18.1-macOS-arm64-14.7.4.zip" + MULL_DIR="Mull-18-${MULL_VERSION}-LLVM-18.1-macOS-arm64-14.7.4" curl -LO "https://github.com/mull-project/mull/releases/download/${MULL_VERSION}/${MULL_ZIP}" unzip -o "$MULL_ZIP" mv "$MULL_DIR" "$BASEDIR/.mull" From a3ec54fa5a45c00414c936fec25c7b0bc9b40eea Mon Sep 17 00:00:00 2001 From: adeebshihadeh Date: Tue, 20 Jan 2026 08:10:23 +0000 Subject: [PATCH 048/229] docs: Scheduled auto-update CARS.md --- docs/CARS.md | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/docs/CARS.md b/docs/CARS.md index f3ee8696a4d..cd8d210b8df 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -1,6 +1,6 @@ -# Support Information for 384 Known Cars +# Support Information for 385 Known Cars |Make|Model|Package|Support Level| |---|---|---|:---:| @@ -10,7 +10,7 @@ |Acura|MDX 2015-16|Advance Package|[Community](#community)| |Acura|MDX 2017-20|All|[Community](#community)| |Acura|MDX 2022-24|All|[Community](#community)| -|Acura|MDX 2025|All except Type S|[Upstream](#upstream)| +|Acura|MDX 2025-26|All except Type S|[Upstream](#upstream)| |Acura|RDX 2016-18|AcuraWatch Plus or Advance Package|[Upstream](#upstream)| |Acura|RDX 2019-21|All|[Upstream](#upstream)| |Acura|RDX 2022-25|All|[Community](#community)| @@ -103,7 +103,7 @@ |Honda|CR-V 2017-22|Honda Sensing|[Upstream](#upstream)| |Honda|CR-V 2023-26|All|[Upstream](#upstream)| |Honda|CR-V Hybrid 2017-22|Honda Sensing|[Upstream](#upstream)| -|Honda|CR-V Hybrid 2023-25|All|[Upstream](#upstream)| +|Honda|CR-V Hybrid 2023-26|All|[Upstream](#upstream)| |Honda|e 2020|All|[Upstream](#upstream)| |Honda|Fit 2018-20|Honda Sensing|[Upstream](#upstream)| |Honda|Freed 2020|Honda Sensing|[Upstream](#upstream)| @@ -218,7 +218,8 @@ |Lexus|IS 2017-19|All|[Upstream](#upstream)| |Lexus|IS 2022-24|All|[Upstream](#upstream)| |Lexus|LC 2024-25|All|[Upstream](#upstream)| -|Lexus|NS 2022-25|Any|[Not compatible](#can-bus-security)| +|Lexus|LS 2018|All except Lexus Safety System+ A|[Upstream](#upstream)| +|Lexus|NS 2022-25|All|[Not compatible](#can-bus-security)| |Lexus|NX 2018-19|All|[Upstream](#upstream)| |Lexus|NX 2020-21|All|[Upstream](#upstream)| |Lexus|NX Hybrid 2018-19|All|[Upstream](#upstream)| @@ -273,7 +274,7 @@ |Subaru|Outback 2018-19|EyeSight Driver Assistance|[Dashcam mode](#dashcam)| |Subaru|Outback 2020-22|All|[Upstream](#upstream)| |Subaru|Outback 2023|All|[Dashcam mode](#dashcam)| -|Subaru|Solterra 2023-25|Any|[Not compatible](#can-bus-security)| +|Subaru|Solterra 2023-25|All|[Not compatible](#can-bus-security)| |Subaru|XV 2018-19|EyeSight Driver Assistance|[Upstream](#upstream)| |Subaru|XV 2020-21|EyeSight Driver Assistance|[Upstream](#upstream)| |Škoda|Fabia 2022-23|Adaptive Cruise Control (ACC) & Lane Assist|[Upstream](#upstream)| @@ -298,19 +299,19 @@ |Toyota|Avalon 2022|All|[Upstream](#upstream)| |Toyota|Avalon Hybrid 2019-21|All|[Upstream](#upstream)| |Toyota|Avalon Hybrid 2022|All|[Upstream](#upstream)| -|Toyota|bZ4x 2023-25|Any|[Not compatible](#can-bus-security)| +|Toyota|bZ4x 2023-25|All|[Not compatible](#can-bus-security)| |Toyota|C-HR 2017-20|All|[Upstream](#upstream)| |Toyota|C-HR 2021|All|[Upstream](#upstream)| |Toyota|C-HR Hybrid 2017-20|All|[Upstream](#upstream)| |Toyota|C-HR Hybrid 2021-22|All|[Upstream](#upstream)| |Toyota|Camry 2018-20|All|[Upstream](#upstream)| |Toyota|Camry 2021-24|All|[Upstream](#upstream)| -|Toyota|Camry 2025|Any|[Not compatible](#can-bus-security)| +|Toyota|Camry 2025|All|[Not compatible](#can-bus-security)| |Toyota|Camry Hybrid 2018-20|All|[Upstream](#upstream)| |Toyota|Camry Hybrid 2021-24|All|[Upstream](#upstream)| |Toyota|Corolla 2017-19|All|[Upstream](#upstream)| |Toyota|Corolla 2020-22|All|[Upstream](#upstream)| -|Toyota|Corolla Cross 2022-25|Any|[Not compatible](#can-bus-security)| +|Toyota|Corolla Cross 2022-25|All|[Not compatible](#can-bus-security)| |Toyota|Corolla Cross (Non-US only) 2020-23|All|[Upstream](#upstream)| |Toyota|Corolla Cross Hybrid (Non-US only) 2020-22|All|[Upstream](#upstream)| |Toyota|Corolla Hatchback 2019-22|All|[Upstream](#upstream)| @@ -318,7 +319,7 @@ |Toyota|Corolla Hybrid (South America only) 2020-23|All|[Upstream](#upstream)| |Toyota|Highlander 2017-19|All|[Upstream](#upstream)| |Toyota|Highlander 2020-23|All|[Upstream](#upstream)| -|Toyota|Highlander 2025|Any|[Not compatible](#can-bus-security)| +|Toyota|Highlander 2025|All|[Not compatible](#can-bus-security)| |Toyota|Highlander Hybrid 2017-19|All|[Upstream](#upstream)| |Toyota|Highlander Hybrid 2020-23|All|[Upstream](#upstream)| |Toyota|Mirai 2021|All|[Upstream](#upstream)| @@ -339,13 +340,13 @@ |Toyota|RAV4 Hybrid 2022|All|[Upstream](#upstream)| |Toyota|RAV4 Hybrid 2023-25|All|[Upstream](#upstream)| |Toyota|RAV4 Prime 2021-23|All|[Custom](#secoc-cars-with-recoverable-keys)| -|Toyota|RAV4 Prime 2024-25|Any|[Not compatible](#can-bus-security)| -|Toyota|Sequoia 2023-25|Any|[Not compatible](#can-bus-security)| +|Toyota|RAV4 Prime 2024-25|All|[Not compatible](#can-bus-security)| +|Toyota|Sequoia 2023-25|All|[Not compatible](#can-bus-security)| |Toyota|Sienna 2018-20|All|[Upstream](#upstream)| |Toyota|Sienna 2021-23|All|[Custom](#secoc-cars-with-recoverable-keys)| -|Toyota|Sienna 2024-25|Any|[Not compatible](#can-bus-security)| -|Toyota|Tundra 2022-25|Any|[Not compatible](#can-bus-security)| -|Toyota|Venza 2021-25|Any|[Not compatible](#can-bus-security)| +|Toyota|Sienna 2024-25|All|[Not compatible](#can-bus-security)| +|Toyota|Tundra 2022-25|All|[Not compatible](#can-bus-security)| +|Toyota|Venza 2021-25|All|[Not compatible](#can-bus-security)| |Toyota|Yaris (Non-US only) 2020, 2023|All|[Custom](#secoc-cars-with-recoverable-keys)| |Volkswagen|Arteon 2018-23|Adaptive Cruise Control (ACC) & Lane Assist|[Upstream](#upstream)| |Volkswagen|Arteon eHybrid 2020-23|Adaptive Cruise Control (ACC) & Lane Assist|[Upstream](#upstream)| From 4ec3892bcdd7c02a88e694df81db5a34f1164728 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 20 Jan 2026 09:30:31 -0800 Subject: [PATCH 049/229] pin python dependencies (#3047) * check in uv.lock * ty fixes --- .github/workflows/update-uv-lock.yml | 30 + .gitignore | 1 - opendbc/car/ccp.py | 8 +- opendbc/car/vehicle_model.py | 2 +- uv.lock | 1078 ++++++++++++++++++++++++++ 5 files changed, 1113 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/update-uv-lock.yml create mode 100644 uv.lock diff --git a/.github/workflows/update-uv-lock.yml b/.github/workflows/update-uv-lock.yml new file mode 100644 index 00000000000..3dd4e6f724b --- /dev/null +++ b/.github/workflows/update-uv-lock.yml @@ -0,0 +1,30 @@ +name: Update uv.lock + +on: + schedule: + - cron: "0 14 * * 1" # every Monday at 2am UTC (6am PST) + workflow_dispatch: + +jobs: + update-uv-lock: + runs-on: ubuntu-latest + permissions: + contents: write + pull-requests: write + steps: + - uses: actions/checkout@v4 + - uses: astral-sh/setup-uv@v5 + - name: Update uv.lock + run: uv lock --upgrade + - name: Create Pull Request + uses: peter-evans/create-pull-request@9153d834b60caba6d51c9b9510b087acf9f33f83 + with: + author: Vehicle Researcher + token: ${{ secrets.ACTIONS_CREATE_PR_PAT }} + commit-message: "[bot] Update uv.lock" + title: "[bot] Update uv.lock" + body: "Weekly update of uv.lock dependencies" + branch: "update-uv-lock" + base: "master" + delete-branch: true + labels: bot diff --git a/.gitignore b/.gitignore index 5b2213fd4fc..269017bf17c 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,6 @@ *.gcno *.dump *.gcov -uv.lock /dist/ .vscode/ __pycache__/ diff --git a/opendbc/car/ccp.py b/opendbc/car/ccp.py index c94acb802b7..577c4768561 100644 --- a/opendbc/car/ccp.py +++ b/opendbc/car/ccp.py @@ -217,7 +217,7 @@ def download(self, data: bytes) -> int: resp = self._recv_dto(0.025) # mta_addr_ext = resp[0] mta_addr = struct.unpack(f"{self.byte_order.value}I", resp[1:5])[0] - return mta_addr # type: ignore + return mta_addr def download_6_bytes(self, data: bytes) -> int: if len(data) != 6: @@ -226,7 +226,7 @@ def download_6_bytes(self, data: bytes) -> int: resp = self._recv_dto(0.025) # mta_addr_ext = resp[0] mta_addr = struct.unpack(f"{self.byte_order.value}I", resp[1:5])[0] - return mta_addr # type: ignore + return mta_addr def upload(self, size: int) -> bytes: if size > 5: @@ -325,7 +325,7 @@ def program(self, size: int, data: bytes) -> int: resp = self._recv_dto(0.1) # mta_addr_ext = resp[0] mta_addr = struct.unpack(f"{self.byte_order.value}I", resp[1:5])[0] - return mta_addr # type: ignore + return mta_addr def program_6_bytes(self, data: bytes) -> int: if len(data) != 6: @@ -334,7 +334,7 @@ def program_6_bytes(self, data: bytes) -> int: resp = self._recv_dto(0.1) # mta_addr_ext = resp[0] mta_addr = struct.unpack(f"{self.byte_order.value}I", resp[1:5])[0] - return mta_addr # type: ignore + return mta_addr def move_memory_block(self, size: int) -> None: self._send_cro(COMMAND_CODE.MOVE, struct.pack(f"{self.byte_order.value}I", size)) diff --git a/opendbc/car/vehicle_model.py b/opendbc/car/vehicle_model.py index bc87503a07e..c7d0494be6d 100755 --- a/opendbc/car/vehicle_model.py +++ b/opendbc/car/vehicle_model.py @@ -219,7 +219,7 @@ def dyn_ss_sol(sa: float, u: float, roll: float, VM: VehicleModel) -> np.ndarray """ A, B = create_dyn_state_matrices(u, VM) inp = np.array([[sa], [roll]]) - return -solve(A, B) @ inp # type: ignore + return -solve(A, B) @ inp def calc_slip_factor(VM: VehicleModel) -> float: diff --git a/uv.lock b/uv.lock new file mode 100644 index 00000000000..4b016c132a1 --- /dev/null +++ b/uv.lock @@ -0,0 +1,1078 @@ +version = 1 +revision = 3 +requires-python = ">=3.11, <3.13" + +[[package]] +name = "attrs" +version = "25.4.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/6b/5c/685e6633917e101e5dcb62b9dd76946cbb57c26e133bae9e0cd36033c0a9/attrs-25.4.0.tar.gz", hash = "sha256:16d5969b87f0859ef33a48b35d55ac1be6e42ae49d5e853b597db70c35c57e11", size = 934251, upload-time = "2025-10-06T13:54:44.725Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/3a/2a/7cc015f5b9f5db42b7d48157e23356022889fc354a2813c15934b7cb5c0e/attrs-25.4.0-py3-none-any.whl", hash = "sha256:adcf7e2a1fb3b36ac48d97835bb6d8ade15b8dcce26aba8bf1d14847b57a3373", size = 67615, upload-time = "2025-10-06T13:54:43.17Z" }, +] + +[[package]] +name = "certifi" +version = "2026.1.4" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/e0/2d/a891ca51311197f6ad14a7ef42e2399f36cf2f9bd44752b3dc4eab60fdc5/certifi-2026.1.4.tar.gz", hash = "sha256:ac726dd470482006e014ad384921ed6438c457018f4b3d204aea4281258b2120", size = 154268, upload-time = "2026-01-04T02:42:41.825Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e6/ad/3cc14f097111b4de0040c83a525973216457bbeeb63739ef1ed275c1c021/certifi-2026.1.4-py3-none-any.whl", hash = "sha256:9943707519e4add1115f44c2bc244f782c0249876bf51b6599fee1ffbedd685c", size = 152900, upload-time = "2026-01-04T02:42:40.15Z" }, +] + +[[package]] +name = "cffi" +version = "2.0.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pycparser", marker = "implementation_name != 'PyPy'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/eb/56/b1ba7935a17738ae8453301356628e8147c79dbb825bcbc73dc7401f9846/cffi-2.0.0.tar.gz", hash = "sha256:44d1b5909021139fe36001ae048dbdde8214afa20200eda0f64c068cac5d5529", size = 523588, upload-time = "2025-09-08T23:24:04.541Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/12/4a/3dfd5f7850cbf0d06dc84ba9aa00db766b52ca38d8b86e3a38314d52498c/cffi-2.0.0-cp311-cp311-macosx_10_13_x86_64.whl", hash = "sha256:b4c854ef3adc177950a8dfc81a86f5115d2abd545751a304c5bcf2c2c7283cfe", size = 184344, upload-time = "2025-09-08T23:22:26.456Z" }, + { url = "https://files.pythonhosted.org/packages/4f/8b/f0e4c441227ba756aafbe78f117485b25bb26b1c059d01f137fa6d14896b/cffi-2.0.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:2de9a304e27f7596cd03d16f1b7c72219bd944e99cc52b84d0145aefb07cbd3c", size = 180560, upload-time = "2025-09-08T23:22:28.197Z" }, + { url = "https://files.pythonhosted.org/packages/b1/b7/1200d354378ef52ec227395d95c2576330fd22a869f7a70e88e1447eb234/cffi-2.0.0-cp311-cp311-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:baf5215e0ab74c16e2dd324e8ec067ef59e41125d3eade2b863d294fd5035c92", size = 209613, upload-time = "2025-09-08T23:22:29.475Z" }, + { url = "https://files.pythonhosted.org/packages/b8/56/6033f5e86e8cc9bb629f0077ba71679508bdf54a9a5e112a3c0b91870332/cffi-2.0.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:730cacb21e1bdff3ce90babf007d0a0917cc3e6492f336c2f0134101e0944f93", size = 216476, upload-time = "2025-09-08T23:22:31.063Z" }, + { url = "https://files.pythonhosted.org/packages/dc/7f/55fecd70f7ece178db2f26128ec41430d8720f2d12ca97bf8f0a628207d5/cffi-2.0.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:6824f87845e3396029f3820c206e459ccc91760e8fa24422f8b0c3d1731cbec5", size = 203374, upload-time = "2025-09-08T23:22:32.507Z" }, + { url = "https://files.pythonhosted.org/packages/84/ef/a7b77c8bdc0f77adc3b46888f1ad54be8f3b7821697a7b89126e829e676a/cffi-2.0.0-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:9de40a7b0323d889cf8d23d1ef214f565ab154443c42737dfe52ff82cf857664", size = 202597, upload-time = "2025-09-08T23:22:34.132Z" }, + { url = "https://files.pythonhosted.org/packages/d7/91/500d892b2bf36529a75b77958edfcd5ad8e2ce4064ce2ecfeab2125d72d1/cffi-2.0.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8941aaadaf67246224cee8c3803777eed332a19d909b47e29c9842ef1e79ac26", size = 215574, upload-time = "2025-09-08T23:22:35.443Z" }, + { url = "https://files.pythonhosted.org/packages/44/64/58f6255b62b101093d5df22dcb752596066c7e89dd725e0afaed242a61be/cffi-2.0.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:a05d0c237b3349096d3981b727493e22147f934b20f6f125a3eba8f994bec4a9", size = 218971, upload-time = "2025-09-08T23:22:36.805Z" }, + { url = "https://files.pythonhosted.org/packages/ab/49/fa72cebe2fd8a55fbe14956f9970fe8eb1ac59e5df042f603ef7c8ba0adc/cffi-2.0.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:94698a9c5f91f9d138526b48fe26a199609544591f859c870d477351dc7b2414", size = 211972, upload-time = "2025-09-08T23:22:38.436Z" }, + { url = "https://files.pythonhosted.org/packages/0b/28/dd0967a76aab36731b6ebfe64dec4e981aff7e0608f60c2d46b46982607d/cffi-2.0.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:5fed36fccc0612a53f1d4d9a816b50a36702c28a2aa880cb8a122b3466638743", size = 217078, upload-time = "2025-09-08T23:22:39.776Z" }, + { url = "https://files.pythonhosted.org/packages/2b/c0/015b25184413d7ab0a410775fdb4a50fca20f5589b5dab1dbbfa3baad8ce/cffi-2.0.0-cp311-cp311-win32.whl", hash = "sha256:c649e3a33450ec82378822b3dad03cc228b8f5963c0c12fc3b1e0ab940f768a5", size = 172076, upload-time = "2025-09-08T23:22:40.95Z" }, + { url = "https://files.pythonhosted.org/packages/ae/8f/dc5531155e7070361eb1b7e4c1a9d896d0cb21c49f807a6c03fd63fc877e/cffi-2.0.0-cp311-cp311-win_amd64.whl", hash = "sha256:66f011380d0e49ed280c789fbd08ff0d40968ee7b665575489afa95c98196ab5", size = 182820, upload-time = "2025-09-08T23:22:42.463Z" }, + { url = "https://files.pythonhosted.org/packages/95/5c/1b493356429f9aecfd56bc171285a4c4ac8697f76e9bbbbb105e537853a1/cffi-2.0.0-cp311-cp311-win_arm64.whl", hash = "sha256:c6638687455baf640e37344fe26d37c404db8b80d037c3d29f58fe8d1c3b194d", size = 177635, upload-time = "2025-09-08T23:22:43.623Z" }, + { url = "https://files.pythonhosted.org/packages/ea/47/4f61023ea636104d4f16ab488e268b93008c3d0bb76893b1b31db1f96802/cffi-2.0.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:6d02d6655b0e54f54c4ef0b94eb6be0607b70853c45ce98bd278dc7de718be5d", size = 185271, upload-time = "2025-09-08T23:22:44.795Z" }, + { url = "https://files.pythonhosted.org/packages/df/a2/781b623f57358e360d62cdd7a8c681f074a71d445418a776eef0aadb4ab4/cffi-2.0.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:8eca2a813c1cb7ad4fb74d368c2ffbbb4789d377ee5bb8df98373c2cc0dee76c", size = 181048, upload-time = "2025-09-08T23:22:45.938Z" }, + { url = "https://files.pythonhosted.org/packages/ff/df/a4f0fbd47331ceeba3d37c2e51e9dfc9722498becbeec2bd8bc856c9538a/cffi-2.0.0-cp312-cp312-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:21d1152871b019407d8ac3985f6775c079416c282e431a4da6afe7aefd2bccbe", size = 212529, upload-time = "2025-09-08T23:22:47.349Z" }, + { url = "https://files.pythonhosted.org/packages/d5/72/12b5f8d3865bf0f87cf1404d8c374e7487dcf097a1c91c436e72e6badd83/cffi-2.0.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:b21e08af67b8a103c71a250401c78d5e0893beff75e28c53c98f4de42f774062", size = 220097, upload-time = "2025-09-08T23:22:48.677Z" }, + { url = "https://files.pythonhosted.org/packages/c2/95/7a135d52a50dfa7c882ab0ac17e8dc11cec9d55d2c18dda414c051c5e69e/cffi-2.0.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:1e3a615586f05fc4065a8b22b8152f0c1b00cdbc60596d187c2a74f9e3036e4e", size = 207983, upload-time = "2025-09-08T23:22:50.06Z" }, + { url = "https://files.pythonhosted.org/packages/3a/c8/15cb9ada8895957ea171c62dc78ff3e99159ee7adb13c0123c001a2546c1/cffi-2.0.0-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:81afed14892743bbe14dacb9e36d9e0e504cd204e0b165062c488942b9718037", size = 206519, upload-time = "2025-09-08T23:22:51.364Z" }, + { url = "https://files.pythonhosted.org/packages/78/2d/7fa73dfa841b5ac06c7b8855cfc18622132e365f5b81d02230333ff26e9e/cffi-2.0.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:3e17ed538242334bf70832644a32a7aae3d83b57567f9fd60a26257e992b79ba", size = 219572, upload-time = "2025-09-08T23:22:52.902Z" }, + { url = "https://files.pythonhosted.org/packages/07/e0/267e57e387b4ca276b90f0434ff88b2c2241ad72b16d31836adddfd6031b/cffi-2.0.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:3925dd22fa2b7699ed2617149842d2e6adde22b262fcbfada50e3d195e4b3a94", size = 222963, upload-time = "2025-09-08T23:22:54.518Z" }, + { url = "https://files.pythonhosted.org/packages/b6/75/1f2747525e06f53efbd878f4d03bac5b859cbc11c633d0fb81432d98a795/cffi-2.0.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:2c8f814d84194c9ea681642fd164267891702542f028a15fc97d4674b6206187", size = 221361, upload-time = "2025-09-08T23:22:55.867Z" }, + { url = "https://files.pythonhosted.org/packages/7b/2b/2b6435f76bfeb6bbf055596976da087377ede68df465419d192acf00c437/cffi-2.0.0-cp312-cp312-win32.whl", hash = "sha256:da902562c3e9c550df360bfa53c035b2f241fed6d9aef119048073680ace4a18", size = 172932, upload-time = "2025-09-08T23:22:57.188Z" }, + { url = "https://files.pythonhosted.org/packages/f8/ed/13bd4418627013bec4ed6e54283b1959cf6db888048c7cf4b4c3b5b36002/cffi-2.0.0-cp312-cp312-win_amd64.whl", hash = "sha256:da68248800ad6320861f129cd9c1bf96ca849a2771a59e0344e88681905916f5", size = 183557, upload-time = "2025-09-08T23:22:58.351Z" }, + { url = "https://files.pythonhosted.org/packages/95/31/9f7f93ad2f8eff1dbc1c3656d7ca5bfd8fb52c9d786b4dcf19b2d02217fa/cffi-2.0.0-cp312-cp312-win_arm64.whl", hash = "sha256:4671d9dd5ec934cb9a73e7ee9676f9362aba54f7f34910956b84d727b0d73fb6", size = 177762, upload-time = "2025-09-08T23:22:59.668Z" }, +] + +[[package]] +name = "charset-normalizer" +version = "3.4.4" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/13/69/33ddede1939fdd074bce5434295f38fae7136463422fe4fd3e0e89b98062/charset_normalizer-3.4.4.tar.gz", hash = "sha256:94537985111c35f28720e43603b8e7b43a6ecfb2ce1d3058bbe955b73404e21a", size = 129418, upload-time = "2025-10-14T04:42:32.879Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ed/27/c6491ff4954e58a10f69ad90aca8a1b6fe9c5d3c6f380907af3c37435b59/charset_normalizer-3.4.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:6e1fcf0720908f200cd21aa4e6750a48ff6ce4afe7ff5a79a90d5ed8a08296f8", size = 206988, upload-time = "2025-10-14T04:40:33.79Z" }, + { url = "https://files.pythonhosted.org/packages/94/59/2e87300fe67ab820b5428580a53cad894272dbb97f38a7a814a2a1ac1011/charset_normalizer-3.4.4-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5f819d5fe9234f9f82d75bdfa9aef3a3d72c4d24a6e57aeaebba32a704553aa0", size = 147324, upload-time = "2025-10-14T04:40:34.961Z" }, + { url = "https://files.pythonhosted.org/packages/07/fb/0cf61dc84b2b088391830f6274cb57c82e4da8bbc2efeac8c025edb88772/charset_normalizer-3.4.4-cp311-cp311-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:a59cb51917aa591b1c4e6a43c132f0cdc3c76dbad6155df4e28ee626cc77a0a3", size = 142742, upload-time = "2025-10-14T04:40:36.105Z" }, + { url = "https://files.pythonhosted.org/packages/62/8b/171935adf2312cd745d290ed93cf16cf0dfe320863ab7cbeeae1dcd6535f/charset_normalizer-3.4.4-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:8ef3c867360f88ac904fd3f5e1f902f13307af9052646963ee08ff4f131adafc", size = 160863, upload-time = "2025-10-14T04:40:37.188Z" }, + { url = "https://files.pythonhosted.org/packages/09/73/ad875b192bda14f2173bfc1bc9a55e009808484a4b256748d931b6948442/charset_normalizer-3.4.4-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:d9e45d7faa48ee908174d8fe84854479ef838fc6a705c9315372eacbc2f02897", size = 157837, upload-time = "2025-10-14T04:40:38.435Z" }, + { url = "https://files.pythonhosted.org/packages/6d/fc/de9cce525b2c5b94b47c70a4b4fb19f871b24995c728e957ee68ab1671ea/charset_normalizer-3.4.4-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:840c25fb618a231545cbab0564a799f101b63b9901f2569faecd6b222ac72381", size = 151550, upload-time = "2025-10-14T04:40:40.053Z" }, + { url = "https://files.pythonhosted.org/packages/55/c2/43edd615fdfba8c6f2dfbd459b25a6b3b551f24ea21981e23fb768503ce1/charset_normalizer-3.4.4-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:ca5862d5b3928c4940729dacc329aa9102900382fea192fc5e52eb69d6093815", size = 149162, upload-time = "2025-10-14T04:40:41.163Z" }, + { url = "https://files.pythonhosted.org/packages/03/86/bde4ad8b4d0e9429a4e82c1e8f5c659993a9a863ad62c7df05cf7b678d75/charset_normalizer-3.4.4-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:d9c7f57c3d666a53421049053eaacdd14bbd0a528e2186fcb2e672effd053bb0", size = 150019, upload-time = "2025-10-14T04:40:42.276Z" }, + { url = "https://files.pythonhosted.org/packages/1f/86/a151eb2af293a7e7bac3a739b81072585ce36ccfb4493039f49f1d3cae8c/charset_normalizer-3.4.4-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:277e970e750505ed74c832b4bf75dac7476262ee2a013f5574dd49075879e161", size = 143310, upload-time = "2025-10-14T04:40:43.439Z" }, + { url = "https://files.pythonhosted.org/packages/b5/fe/43dae6144a7e07b87478fdfc4dbe9efd5defb0e7ec29f5f58a55aeef7bf7/charset_normalizer-3.4.4-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:31fd66405eaf47bb62e8cd575dc621c56c668f27d46a61d975a249930dd5e2a4", size = 162022, upload-time = "2025-10-14T04:40:44.547Z" }, + { url = "https://files.pythonhosted.org/packages/80/e6/7aab83774f5d2bca81f42ac58d04caf44f0cc2b65fc6db2b3b2e8a05f3b3/charset_normalizer-3.4.4-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:0d3d8f15c07f86e9ff82319b3d9ef6f4bf907608f53fe9d92b28ea9ae3d1fd89", size = 149383, upload-time = "2025-10-14T04:40:46.018Z" }, + { url = "https://files.pythonhosted.org/packages/4f/e8/b289173b4edae05c0dde07f69f8db476a0b511eac556dfe0d6bda3c43384/charset_normalizer-3.4.4-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:9f7fcd74d410a36883701fafa2482a6af2ff5ba96b9a620e9e0721e28ead5569", size = 159098, upload-time = "2025-10-14T04:40:47.081Z" }, + { url = "https://files.pythonhosted.org/packages/d8/df/fe699727754cae3f8478493c7f45f777b17c3ef0600e28abfec8619eb49c/charset_normalizer-3.4.4-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:ebf3e58c7ec8a8bed6d66a75d7fb37b55e5015b03ceae72a8e7c74495551e224", size = 152991, upload-time = "2025-10-14T04:40:48.246Z" }, + { url = "https://files.pythonhosted.org/packages/1a/86/584869fe4ddb6ffa3bd9f491b87a01568797fb9bd8933f557dba9771beaf/charset_normalizer-3.4.4-cp311-cp311-win32.whl", hash = "sha256:eecbc200c7fd5ddb9a7f16c7decb07b566c29fa2161a16cf67b8d068bd21690a", size = 99456, upload-time = "2025-10-14T04:40:49.376Z" }, + { url = "https://files.pythonhosted.org/packages/65/f6/62fdd5feb60530f50f7e38b4f6a1d5203f4d16ff4f9f0952962c044e919a/charset_normalizer-3.4.4-cp311-cp311-win_amd64.whl", hash = "sha256:5ae497466c7901d54b639cf42d5b8c1b6a4fead55215500d2f486d34db48d016", size = 106978, upload-time = "2025-10-14T04:40:50.844Z" }, + { url = "https://files.pythonhosted.org/packages/7a/9d/0710916e6c82948b3be62d9d398cb4fcf4e97b56d6a6aeccd66c4b2f2bd5/charset_normalizer-3.4.4-cp311-cp311-win_arm64.whl", hash = "sha256:65e2befcd84bc6f37095f5961e68a6f077bf44946771354a28ad434c2cce0ae1", size = 99969, upload-time = "2025-10-14T04:40:52.272Z" }, + { url = "https://files.pythonhosted.org/packages/f3/85/1637cd4af66fa687396e757dec650f28025f2a2f5a5531a3208dc0ec43f2/charset_normalizer-3.4.4-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:0a98e6759f854bd25a58a73fa88833fba3b7c491169f86ce1180c948ab3fd394", size = 208425, upload-time = "2025-10-14T04:40:53.353Z" }, + { url = "https://files.pythonhosted.org/packages/9d/6a/04130023fef2a0d9c62d0bae2649b69f7b7d8d24ea5536feef50551029df/charset_normalizer-3.4.4-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b5b290ccc2a263e8d185130284f8501e3e36c5e02750fc6b6bdeb2e9e96f1e25", size = 148162, upload-time = "2025-10-14T04:40:54.558Z" }, + { url = "https://files.pythonhosted.org/packages/78/29/62328d79aa60da22c9e0b9a66539feae06ca0f5a4171ac4f7dc285b83688/charset_normalizer-3.4.4-cp312-cp312-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:74bb723680f9f7a6234dcf67aea57e708ec1fbdf5699fb91dfd6f511b0a320ef", size = 144558, upload-time = "2025-10-14T04:40:55.677Z" }, + { url = "https://files.pythonhosted.org/packages/86/bb/b32194a4bf15b88403537c2e120b817c61cd4ecffa9b6876e941c3ee38fe/charset_normalizer-3.4.4-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:f1e34719c6ed0b92f418c7c780480b26b5d9c50349e9a9af7d76bf757530350d", size = 161497, upload-time = "2025-10-14T04:40:57.217Z" }, + { url = "https://files.pythonhosted.org/packages/19/89/a54c82b253d5b9b111dc74aca196ba5ccfcca8242d0fb64146d4d3183ff1/charset_normalizer-3.4.4-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:2437418e20515acec67d86e12bf70056a33abdacb5cb1655042f6538d6b085a8", size = 159240, upload-time = "2025-10-14T04:40:58.358Z" }, + { url = "https://files.pythonhosted.org/packages/c0/10/d20b513afe03acc89ec33948320a5544d31f21b05368436d580dec4e234d/charset_normalizer-3.4.4-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:11d694519d7f29d6cd09f6ac70028dba10f92f6cdd059096db198c283794ac86", size = 153471, upload-time = "2025-10-14T04:40:59.468Z" }, + { url = "https://files.pythonhosted.org/packages/61/fa/fbf177b55bdd727010f9c0a3c49eefa1d10f960e5f09d1d887bf93c2e698/charset_normalizer-3.4.4-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:ac1c4a689edcc530fc9d9aa11f5774b9e2f33f9a0c6a57864e90908f5208d30a", size = 150864, upload-time = "2025-10-14T04:41:00.623Z" }, + { url = "https://files.pythonhosted.org/packages/05/12/9fbc6a4d39c0198adeebbde20b619790e9236557ca59fc40e0e3cebe6f40/charset_normalizer-3.4.4-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:21d142cc6c0ec30d2efee5068ca36c128a30b0f2c53c1c07bd78cb6bc1d3be5f", size = 150647, upload-time = "2025-10-14T04:41:01.754Z" }, + { url = "https://files.pythonhosted.org/packages/ad/1f/6a9a593d52e3e8c5d2b167daf8c6b968808efb57ef4c210acb907c365bc4/charset_normalizer-3.4.4-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:5dbe56a36425d26d6cfb40ce79c314a2e4dd6211d51d6d2191c00bed34f354cc", size = 145110, upload-time = "2025-10-14T04:41:03.231Z" }, + { url = "https://files.pythonhosted.org/packages/30/42/9a52c609e72471b0fc54386dc63c3781a387bb4fe61c20231a4ebcd58bdd/charset_normalizer-3.4.4-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:5bfbb1b9acf3334612667b61bd3002196fe2a1eb4dd74d247e0f2a4d50ec9bbf", size = 162839, upload-time = "2025-10-14T04:41:04.715Z" }, + { url = "https://files.pythonhosted.org/packages/c4/5b/c0682bbf9f11597073052628ddd38344a3d673fda35a36773f7d19344b23/charset_normalizer-3.4.4-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:d055ec1e26e441f6187acf818b73564e6e6282709e9bcb5b63f5b23068356a15", size = 150667, upload-time = "2025-10-14T04:41:05.827Z" }, + { url = "https://files.pythonhosted.org/packages/e4/24/a41afeab6f990cf2daf6cb8c67419b63b48cf518e4f56022230840c9bfb2/charset_normalizer-3.4.4-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:af2d8c67d8e573d6de5bc30cdb27e9b95e49115cd9baad5ddbd1a6207aaa82a9", size = 160535, upload-time = "2025-10-14T04:41:06.938Z" }, + { url = "https://files.pythonhosted.org/packages/2a/e5/6a4ce77ed243c4a50a1fecca6aaaab419628c818a49434be428fe24c9957/charset_normalizer-3.4.4-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:780236ac706e66881f3b7f2f32dfe90507a09e67d1d454c762cf642e6e1586e0", size = 154816, upload-time = "2025-10-14T04:41:08.101Z" }, + { url = "https://files.pythonhosted.org/packages/a8/ef/89297262b8092b312d29cdb2517cb1237e51db8ecef2e9af5edbe7b683b1/charset_normalizer-3.4.4-cp312-cp312-win32.whl", hash = "sha256:5833d2c39d8896e4e19b689ffc198f08ea58116bee26dea51e362ecc7cd3ed26", size = 99694, upload-time = "2025-10-14T04:41:09.23Z" }, + { url = "https://files.pythonhosted.org/packages/3d/2d/1e5ed9dd3b3803994c155cd9aacb60c82c331bad84daf75bcb9c91b3295e/charset_normalizer-3.4.4-cp312-cp312-win_amd64.whl", hash = "sha256:a79cfe37875f822425b89a82333404539ae63dbdddf97f84dcbc3d339aae9525", size = 107131, upload-time = "2025-10-14T04:41:10.467Z" }, + { url = "https://files.pythonhosted.org/packages/d0/d9/0ed4c7098a861482a7b6a95603edce4c0d9db2311af23da1fb2b75ec26fc/charset_normalizer-3.4.4-cp312-cp312-win_arm64.whl", hash = "sha256:376bec83a63b8021bb5c8ea75e21c4ccb86e7e45ca4eb81146091b56599b80c3", size = 100390, upload-time = "2025-10-14T04:41:11.915Z" }, + { url = "https://files.pythonhosted.org/packages/0a/4c/925909008ed5a988ccbb72dcc897407e5d6d3bd72410d69e051fc0c14647/charset_normalizer-3.4.4-py3-none-any.whl", hash = "sha256:7a32c560861a02ff789ad905a2fe94e3f840803362c84fecf1851cb4cf3dc37f", size = 53402, upload-time = "2025-10-14T04:42:31.76Z" }, +] + +[[package]] +name = "codespell" +version = "2.4.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/15/e0/709453393c0ea77d007d907dd436b3ee262e28b30995ea1aa36c6ffbccaf/codespell-2.4.1.tar.gz", hash = "sha256:299fcdcb09d23e81e35a671bbe746d5ad7e8385972e65dbb833a2eaac33c01e5", size = 344740, upload-time = "2025-01-28T18:52:39.411Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/20/01/b394922252051e97aab231d416c86da3d8a6d781eeadcdca1082867de64e/codespell-2.4.1-py3-none-any.whl", hash = "sha256:3dadafa67df7e4a3dbf51e0d7315061b80d265f9552ebd699b3dd6834b47e425", size = 344501, upload-time = "2025-01-28T18:52:37.057Z" }, +] + +[[package]] +name = "colorama" +version = "0.4.6" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d8/53/6f443c9a4a8358a93a6792e2acffb9d9d5cb0a5cfd8802644b7b1c9a02e4/colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44", size = 27697, upload-time = "2022-10-25T02:36:22.414Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335, upload-time = "2022-10-25T02:36:20.889Z" }, +] + +[[package]] +name = "colorlog" +version = "6.10.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "colorama", marker = "sys_platform == 'win32'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/a2/61/f083b5ac52e505dfc1c624eafbf8c7589a0d7f32daa398d2e7590efa5fda/colorlog-6.10.1.tar.gz", hash = "sha256:eb4ae5cb65fe7fec7773c2306061a8e63e02efc2c72eba9d27b0fa23c94f1321", size = 17162, upload-time = "2025-10-16T16:14:11.978Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/6d/c1/e419ef3723a074172b68aaa89c9f3de486ed4c2399e2dbd8113a4fdcaf9e/colorlog-6.10.1-py3-none-any.whl", hash = "sha256:2d7e8348291948af66122cff006c9f8da6255d224e7cf8e37d8de2df3bad8c9c", size = 11743, upload-time = "2025-10-16T16:14:10.512Z" }, +] + +[[package]] +name = "comma-car-segments" +version = "0.1.0" +source = { url = "https://huggingface.co/datasets/commaai/commaCarSegments/resolve/main/dist/comma_car_segments-0.1.0-py3-none-any.whl" } +dependencies = [ + { name = "requests" }, +] +wheels = [ + { url = "https://huggingface.co/datasets/commaai/commaCarSegments/resolve/main/dist/comma_car_segments-0.1.0-py3-none-any.whl", hash = "sha256:6c6483558cd90d3e9152ff7930394bb13678a7ab50ef2c79601d818c66235352" }, +] + +[package.metadata] +requires-dist = [{ name = "requests" }] + +[[package]] +name = "contourpy" +version = "1.3.3" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "numpy" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/58/01/1253e6698a07380cd31a736d248a3f2a50a7c88779a1813da27503cadc2a/contourpy-1.3.3.tar.gz", hash = "sha256:083e12155b210502d0bca491432bb04d56dc3432f95a979b429f2848c3dbe880", size = 13466174, upload-time = "2025-07-26T12:03:12.549Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/91/2e/c4390a31919d8a78b90e8ecf87cd4b4c4f05a5b48d05ec17db8e5404c6f4/contourpy-1.3.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:709a48ef9a690e1343202916450bc48b9e51c049b089c7f79a267b46cffcdaa1", size = 288773, upload-time = "2025-07-26T12:01:02.277Z" }, + { url = "https://files.pythonhosted.org/packages/0d/44/c4b0b6095fef4dc9c420e041799591e3b63e9619e3044f7f4f6c21c0ab24/contourpy-1.3.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:23416f38bfd74d5d28ab8429cc4d63fa67d5068bd711a85edb1c3fb0c3e2f381", size = 270149, upload-time = "2025-07-26T12:01:04.072Z" }, + { url = "https://files.pythonhosted.org/packages/30/2e/dd4ced42fefac8470661d7cb7e264808425e6c5d56d175291e93890cce09/contourpy-1.3.3-cp311-cp311-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:929ddf8c4c7f348e4c0a5a3a714b5c8542ffaa8c22954862a46ca1813b667ee7", size = 329222, upload-time = "2025-07-26T12:01:05.688Z" }, + { url = "https://files.pythonhosted.org/packages/f2/74/cc6ec2548e3d276c71389ea4802a774b7aa3558223b7bade3f25787fafc2/contourpy-1.3.3-cp311-cp311-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:9e999574eddae35f1312c2b4b717b7885d4edd6cb46700e04f7f02db454e67c1", size = 377234, upload-time = "2025-07-26T12:01:07.054Z" }, + { url = "https://files.pythonhosted.org/packages/03/b3/64ef723029f917410f75c09da54254c5f9ea90ef89b143ccadb09df14c15/contourpy-1.3.3-cp311-cp311-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:0bf67e0e3f482cb69779dd3061b534eb35ac9b17f163d851e2a547d56dba0a3a", size = 380555, upload-time = "2025-07-26T12:01:08.801Z" }, + { url = "https://files.pythonhosted.org/packages/5f/4b/6157f24ca425b89fe2eb7e7be642375711ab671135be21e6faa100f7448c/contourpy-1.3.3-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:51e79c1f7470158e838808d4a996fa9bac72c498e93d8ebe5119bc1e6becb0db", size = 355238, upload-time = "2025-07-26T12:01:10.319Z" }, + { url = "https://files.pythonhosted.org/packages/98/56/f914f0dd678480708a04cfd2206e7c382533249bc5001eb9f58aa693e200/contourpy-1.3.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:598c3aaece21c503615fd59c92a3598b428b2f01bfb4b8ca9c4edeecc2438620", size = 1326218, upload-time = "2025-07-26T12:01:12.659Z" }, + { url = "https://files.pythonhosted.org/packages/fb/d7/4a972334a0c971acd5172389671113ae82aa7527073980c38d5868ff1161/contourpy-1.3.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:322ab1c99b008dad206d406bb61d014cf0174df491ae9d9d0fac6a6fda4f977f", size = 1392867, upload-time = "2025-07-26T12:01:15.533Z" }, + { url = "https://files.pythonhosted.org/packages/75/3e/f2cc6cd56dc8cff46b1a56232eabc6feea52720083ea71ab15523daab796/contourpy-1.3.3-cp311-cp311-win32.whl", hash = "sha256:fd907ae12cd483cd83e414b12941c632a969171bf90fc937d0c9f268a31cafff", size = 183677, upload-time = "2025-07-26T12:01:17.088Z" }, + { url = "https://files.pythonhosted.org/packages/98/4b/9bd370b004b5c9d8045c6c33cf65bae018b27aca550a3f657cdc99acdbd8/contourpy-1.3.3-cp311-cp311-win_amd64.whl", hash = "sha256:3519428f6be58431c56581f1694ba8e50626f2dd550af225f82fb5f5814d2a42", size = 225234, upload-time = "2025-07-26T12:01:18.256Z" }, + { url = "https://files.pythonhosted.org/packages/d9/b6/71771e02c2e004450c12b1120a5f488cad2e4d5b590b1af8bad060360fe4/contourpy-1.3.3-cp311-cp311-win_arm64.whl", hash = "sha256:15ff10bfada4bf92ec8b31c62bf7c1834c244019b4a33095a68000d7075df470", size = 193123, upload-time = "2025-07-26T12:01:19.848Z" }, + { url = "https://files.pythonhosted.org/packages/be/45/adfee365d9ea3d853550b2e735f9d66366701c65db7855cd07621732ccfc/contourpy-1.3.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:b08a32ea2f8e42cf1d4be3169a98dd4be32bafe4f22b6c4cb4ba810fa9e5d2cb", size = 293419, upload-time = "2025-07-26T12:01:21.16Z" }, + { url = "https://files.pythonhosted.org/packages/53/3e/405b59cfa13021a56bba395a6b3aca8cec012b45bf177b0eaf7a202cde2c/contourpy-1.3.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:556dba8fb6f5d8742f2923fe9457dbdd51e1049c4a43fd3986a0b14a1d815fc6", size = 273979, upload-time = "2025-07-26T12:01:22.448Z" }, + { url = "https://files.pythonhosted.org/packages/d4/1c/a12359b9b2ca3a845e8f7f9ac08bdf776114eb931392fcad91743e2ea17b/contourpy-1.3.3-cp312-cp312-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:92d9abc807cf7d0e047b95ca5d957cf4792fcd04e920ca70d48add15c1a90ea7", size = 332653, upload-time = "2025-07-26T12:01:24.155Z" }, + { url = "https://files.pythonhosted.org/packages/63/12/897aeebfb475b7748ea67b61e045accdfcf0d971f8a588b67108ed7f5512/contourpy-1.3.3-cp312-cp312-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:b2e8faa0ed68cb29af51edd8e24798bb661eac3bd9f65420c1887b6ca89987c8", size = 379536, upload-time = "2025-07-26T12:01:25.91Z" }, + { url = "https://files.pythonhosted.org/packages/43/8a/a8c584b82deb248930ce069e71576fc09bd7174bbd35183b7943fb1064fd/contourpy-1.3.3-cp312-cp312-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:626d60935cf668e70a5ce6ff184fd713e9683fb458898e4249b63be9e28286ea", size = 384397, upload-time = "2025-07-26T12:01:27.152Z" }, + { url = "https://files.pythonhosted.org/packages/cc/8f/ec6289987824b29529d0dfda0d74a07cec60e54b9c92f3c9da4c0ac732de/contourpy-1.3.3-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4d00e655fcef08aba35ec9610536bfe90267d7ab5ba944f7032549c55a146da1", size = 362601, upload-time = "2025-07-26T12:01:28.808Z" }, + { url = "https://files.pythonhosted.org/packages/05/0a/a3fe3be3ee2dceb3e615ebb4df97ae6f3828aa915d3e10549ce016302bd1/contourpy-1.3.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:451e71b5a7d597379ef572de31eeb909a87246974d960049a9848c3bc6c41bf7", size = 1331288, upload-time = "2025-07-26T12:01:31.198Z" }, + { url = "https://files.pythonhosted.org/packages/33/1d/acad9bd4e97f13f3e2b18a3977fe1b4a37ecf3d38d815333980c6c72e963/contourpy-1.3.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:459c1f020cd59fcfe6650180678a9993932d80d44ccde1fa1868977438f0b411", size = 1403386, upload-time = "2025-07-26T12:01:33.947Z" }, + { url = "https://files.pythonhosted.org/packages/cf/8f/5847f44a7fddf859704217a99a23a4f6417b10e5ab1256a179264561540e/contourpy-1.3.3-cp312-cp312-win32.whl", hash = "sha256:023b44101dfe49d7d53932be418477dba359649246075c996866106da069af69", size = 185018, upload-time = "2025-07-26T12:01:35.64Z" }, + { url = "https://files.pythonhosted.org/packages/19/e8/6026ed58a64563186a9ee3f29f41261fd1828f527dd93d33b60feca63352/contourpy-1.3.3-cp312-cp312-win_amd64.whl", hash = "sha256:8153b8bfc11e1e4d75bcb0bff1db232f9e10b274e0929de9d608027e0d34ff8b", size = 226567, upload-time = "2025-07-26T12:01:36.804Z" }, + { url = "https://files.pythonhosted.org/packages/d1/e2/f05240d2c39a1ed228d8328a78b6f44cd695f7ef47beb3e684cf93604f86/contourpy-1.3.3-cp312-cp312-win_arm64.whl", hash = "sha256:07ce5ed73ecdc4a03ffe3e1b3e3c1166db35ae7584be76f65dbbe28a7791b0cc", size = 193655, upload-time = "2025-07-26T12:01:37.999Z" }, + { url = "https://files.pythonhosted.org/packages/a5/29/8dcfe16f0107943fa92388c23f6e05cff0ba58058c4c95b00280d4c75a14/contourpy-1.3.3-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:cd5dfcaeb10f7b7f9dc8941717c6c2ade08f587be2226222c12b25f0483ed497", size = 278809, upload-time = "2025-07-26T12:02:52.74Z" }, + { url = "https://files.pythonhosted.org/packages/85/a9/8b37ef4f7dafeb335daee3c8254645ef5725be4d9c6aa70b50ec46ef2f7e/contourpy-1.3.3-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:0c1fc238306b35f246d61a1d416a627348b5cf0648648a031e14bb8705fcdfe8", size = 261593, upload-time = "2025-07-26T12:02:54.037Z" }, + { url = "https://files.pythonhosted.org/packages/0a/59/ebfb8c677c75605cc27f7122c90313fd2f375ff3c8d19a1694bda74aaa63/contourpy-1.3.3-pp311-pypy311_pp73-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:70f9aad7de812d6541d29d2bbf8feb22ff7e1c299523db288004e3157ff4674e", size = 302202, upload-time = "2025-07-26T12:02:55.947Z" }, + { url = "https://files.pythonhosted.org/packages/3c/37/21972a15834d90bfbfb009b9d004779bd5a07a0ec0234e5ba8f64d5736f4/contourpy-1.3.3-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5ed3657edf08512fc3fe81b510e35c2012fbd3081d2e26160f27ca28affec989", size = 329207, upload-time = "2025-07-26T12:02:57.468Z" }, + { url = "https://files.pythonhosted.org/packages/0c/58/bd257695f39d05594ca4ad60df5bcb7e32247f9951fd09a9b8edb82d1daa/contourpy-1.3.3-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:3d1a3799d62d45c18bafd41c5fa05120b96a28079f2393af559b843d1a966a77", size = 225315, upload-time = "2025-07-26T12:02:58.801Z" }, +] + +[[package]] +name = "coverage" +version = "7.13.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/23/f9/e92df5e07f3fc8d4c7f9a0f146ef75446bf870351cd37b788cf5897f8079/coverage-7.13.1.tar.gz", hash = "sha256:b7593fe7eb5feaa3fbb461ac79aac9f9fc0387a5ca8080b0c6fe2ca27b091afd", size = 825862, upload-time = "2025-12-28T15:42:56.969Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b4/9b/77baf488516e9ced25fc215a6f75d803493fc3f6a1a1227ac35697910c2a/coverage-7.13.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1a55d509a1dc5a5b708b5dad3b5334e07a16ad4c2185e27b40e4dba796ab7f88", size = 218755, upload-time = "2025-12-28T15:40:30.812Z" }, + { url = "https://files.pythonhosted.org/packages/d7/cd/7ab01154e6eb79ee2fab76bf4d89e94c6648116557307ee4ebbb85e5c1bf/coverage-7.13.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4d010d080c4888371033baab27e47c9df7d6fb28d0b7b7adf85a4a49be9298b3", size = 219257, upload-time = "2025-12-28T15:40:32.333Z" }, + { url = "https://files.pythonhosted.org/packages/01/d5/b11ef7863ffbbdb509da0023fad1e9eda1c0eaea61a6d2ea5b17d4ac706e/coverage-7.13.1-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:d938b4a840fb1523b9dfbbb454f652967f18e197569c32266d4d13f37244c3d9", size = 249657, upload-time = "2025-12-28T15:40:34.1Z" }, + { url = "https://files.pythonhosted.org/packages/f7/7c/347280982982383621d29b8c544cf497ae07ac41e44b1ca4903024131f55/coverage-7.13.1-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:bf100a3288f9bb7f919b87eb84f87101e197535b9bd0e2c2b5b3179633324fee", size = 251581, upload-time = "2025-12-28T15:40:36.131Z" }, + { url = "https://files.pythonhosted.org/packages/82/f6/ebcfed11036ade4c0d75fa4453a6282bdd225bc073862766eec184a4c643/coverage-7.13.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ef6688db9bf91ba111ae734ba6ef1a063304a881749726e0d3575f5c10a9facf", size = 253691, upload-time = "2025-12-28T15:40:37.626Z" }, + { url = "https://files.pythonhosted.org/packages/02/92/af8f5582787f5d1a8b130b2dcba785fa5e9a7a8e121a0bb2220a6fdbdb8a/coverage-7.13.1-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:0b609fc9cdbd1f02e51f67f51e5aee60a841ef58a68d00d5ee2c0faf357481a3", size = 249799, upload-time = "2025-12-28T15:40:39.47Z" }, + { url = "https://files.pythonhosted.org/packages/24/aa/0e39a2a3b16eebf7f193863323edbff38b6daba711abaaf807d4290cf61a/coverage-7.13.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:c43257717611ff5e9a1d79dce8e47566235ebda63328718d9b65dd640bc832ef", size = 251389, upload-time = "2025-12-28T15:40:40.954Z" }, + { url = "https://files.pythonhosted.org/packages/73/46/7f0c13111154dc5b978900c0ccee2e2ca239b910890e674a77f1363d483e/coverage-7.13.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:e09fbecc007f7b6afdfb3b07ce5bd9f8494b6856dd4f577d26c66c391b829851", size = 249450, upload-time = "2025-12-28T15:40:42.489Z" }, + { url = "https://files.pythonhosted.org/packages/ac/ca/e80da6769e8b669ec3695598c58eef7ad98b0e26e66333996aee6316db23/coverage-7.13.1-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:a03a4f3a19a189919c7055098790285cc5c5b0b3976f8d227aea39dbf9f8bfdb", size = 249170, upload-time = "2025-12-28T15:40:44.279Z" }, + { url = "https://files.pythonhosted.org/packages/af/18/9e29baabdec1a8644157f572541079b4658199cfd372a578f84228e860de/coverage-7.13.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:3820778ea1387c2b6a818caec01c63adc5b3750211af6447e8dcfb9b6f08dbba", size = 250081, upload-time = "2025-12-28T15:40:45.748Z" }, + { url = "https://files.pythonhosted.org/packages/00/f8/c3021625a71c3b2f516464d322e41636aea381018319050a8114105872ee/coverage-7.13.1-cp311-cp311-win32.whl", hash = "sha256:ff10896fa55167371960c5908150b434b71c876dfab97b69478f22c8b445ea19", size = 221281, upload-time = "2025-12-28T15:40:47.232Z" }, + { url = "https://files.pythonhosted.org/packages/27/56/c216625f453df6e0559ed666d246fcbaaa93f3aa99eaa5080cea1229aa3d/coverage-7.13.1-cp311-cp311-win_amd64.whl", hash = "sha256:a998cc0aeeea4c6d5622a3754da5a493055d2d95186bad877b0a34ea6e6dbe0a", size = 222215, upload-time = "2025-12-28T15:40:49.19Z" }, + { url = "https://files.pythonhosted.org/packages/5c/9a/be342e76f6e531cae6406dc46af0d350586f24d9b67fdfa6daee02df71af/coverage-7.13.1-cp311-cp311-win_arm64.whl", hash = "sha256:fea07c1a39a22614acb762e3fbbb4011f65eedafcb2948feeef641ac78b4ee5c", size = 220886, upload-time = "2025-12-28T15:40:51.067Z" }, + { url = "https://files.pythonhosted.org/packages/ce/8a/87af46cccdfa78f53db747b09f5f9a21d5fc38d796834adac09b30a8ce74/coverage-7.13.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:6f34591000f06e62085b1865c9bc5f7858df748834662a51edadfd2c3bfe0dd3", size = 218927, upload-time = "2025-12-28T15:40:52.814Z" }, + { url = "https://files.pythonhosted.org/packages/82/a8/6e22fdc67242a4a5a153f9438d05944553121c8f4ba70cb072af4c41362e/coverage-7.13.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:b67e47c5595b9224599016e333f5ec25392597a89d5744658f837d204e16c63e", size = 219288, upload-time = "2025-12-28T15:40:54.262Z" }, + { url = "https://files.pythonhosted.org/packages/d0/0a/853a76e03b0f7c4375e2ca025df45c918beb367f3e20a0a8e91967f6e96c/coverage-7.13.1-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:3e7b8bd70c48ffb28461ebe092c2345536fb18bbbf19d287c8913699735f505c", size = 250786, upload-time = "2025-12-28T15:40:56.059Z" }, + { url = "https://files.pythonhosted.org/packages/ea/b4/694159c15c52b9f7ec7adf49d50e5f8ee71d3e9ef38adb4445d13dd56c20/coverage-7.13.1-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:c223d078112e90dc0e5c4e35b98b9584164bea9fbbd221c0b21c5241f6d51b62", size = 253543, upload-time = "2025-12-28T15:40:57.585Z" }, + { url = "https://files.pythonhosted.org/packages/96/b2/7f1f0437a5c855f87e17cf5d0dc35920b6440ff2b58b1ba9788c059c26c8/coverage-7.13.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:794f7c05af0763b1bbd1b9e6eff0e52ad068be3b12cd96c87de037b01390c968", size = 254635, upload-time = "2025-12-28T15:40:59.443Z" }, + { url = "https://files.pythonhosted.org/packages/e9/d1/73c3fdb8d7d3bddd9473c9c6a2e0682f09fc3dfbcb9c3f36412a7368bcab/coverage-7.13.1-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:0642eae483cc8c2902e4af7298bf886d605e80f26382124cddc3967c2a3df09e", size = 251202, upload-time = "2025-12-28T15:41:01.328Z" }, + { url = "https://files.pythonhosted.org/packages/66/3c/f0edf75dcc152f145d5598329e864bbbe04ab78660fe3e8e395f9fff010f/coverage-7.13.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:9f5e772ed5fef25b3de9f2008fe67b92d46831bd2bc5bdc5dd6bfd06b83b316f", size = 252566, upload-time = "2025-12-28T15:41:03.319Z" }, + { url = "https://files.pythonhosted.org/packages/17/b3/e64206d3c5f7dcbceafd14941345a754d3dbc78a823a6ed526e23b9cdaab/coverage-7.13.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:45980ea19277dc0a579e432aef6a504fe098ef3a9032ead15e446eb0f1191aee", size = 250711, upload-time = "2025-12-28T15:41:06.411Z" }, + { url = "https://files.pythonhosted.org/packages/dc/ad/28a3eb970a8ef5b479ee7f0c484a19c34e277479a5b70269dc652b730733/coverage-7.13.1-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:e4f18eca6028ffa62adbd185a8f1e1dd242f2e68164dba5c2b74a5204850b4cf", size = 250278, upload-time = "2025-12-28T15:41:08.285Z" }, + { url = "https://files.pythonhosted.org/packages/54/e3/c8f0f1a93133e3e1291ca76cbb63565bd4b5c5df63b141f539d747fff348/coverage-7.13.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:f8dca5590fec7a89ed6826fce625595279e586ead52e9e958d3237821fbc750c", size = 252154, upload-time = "2025-12-28T15:41:09.969Z" }, + { url = "https://files.pythonhosted.org/packages/d0/bf/9939c5d6859c380e405b19e736321f1c7d402728792f4c752ad1adcce005/coverage-7.13.1-cp312-cp312-win32.whl", hash = "sha256:ff86d4e85188bba72cfb876df3e11fa243439882c55957184af44a35bd5880b7", size = 221487, upload-time = "2025-12-28T15:41:11.468Z" }, + { url = "https://files.pythonhosted.org/packages/fa/dc/7282856a407c621c2aad74021680a01b23010bb8ebf427cf5eacda2e876f/coverage-7.13.1-cp312-cp312-win_amd64.whl", hash = "sha256:16cc1da46c04fb0fb128b4dc430b78fa2aba8a6c0c9f8eb391fd5103409a6ac6", size = 222299, upload-time = "2025-12-28T15:41:13.386Z" }, + { url = "https://files.pythonhosted.org/packages/10/79/176a11203412c350b3e9578620013af35bcdb79b651eb976f4a4b32044fa/coverage-7.13.1-cp312-cp312-win_arm64.whl", hash = "sha256:8d9bc218650022a768f3775dd7fdac1886437325d8d295d923ebcfef4892ad5c", size = 220941, upload-time = "2025-12-28T15:41:14.975Z" }, + { url = "https://files.pythonhosted.org/packages/cc/48/d9f421cb8da5afaa1a64570d9989e00fb7955e6acddc5a12979f7666ef60/coverage-7.13.1-py3-none-any.whl", hash = "sha256:2016745cb3ba554469d02819d78958b571792bb68e31302610e898f80dd3a573", size = 210722, upload-time = "2025-12-28T15:42:54.901Z" }, +] + +[package.optional-dependencies] +toml = [ + { name = "tomli", marker = "python_full_version <= '3.11'" }, +] + +[[package]] +name = "cpplint" +version = "2.0.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/c5/83/47a9e7513ba4d943a9dac2f6752b444377c91880f4f4968799b4f42d89cc/cpplint-2.0.2.tar.gz", hash = "sha256:8a5971e4b5490133e425284f0c566c7ade0b959e61018d2c9af3ff7f357ddc57", size = 373781, upload-time = "2025-04-08T01:22:26.017Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/66/65/08d3a5039b565231c501b31d1a973d4222e9803c03b2c31a9c08bdec3e30/cpplint-2.0.2-py3-none-any.whl", hash = "sha256:7ec188b5a08e604294ae7e7f88ec3ece2699de857f0533b305620c8cf237cad5", size = 81987, upload-time = "2025-04-08T01:22:24.101Z" }, +] + +[[package]] +name = "crcmod-plus" +version = "2.3.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/0b/0c/71733bbaf38e9f1eaecfdf7f8e350993f3dcac208a5297c41503ae66e513/crcmod_plus-2.3.1.tar.gz", hash = "sha256:732ffe3c3ce3ef9b272e1827d8fb894590c4d6ff553f2a2b41ae30f4f94b0f5d", size = 22319, upload-time = "2025-10-10T22:14:21.691Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/47/e0/2dad2e6f0cd4914b4144496d9785780ec820e200816c080df785cfa34da6/crcmod_plus-2.3.1-cp311-abi3-macosx_10_9_universal2.whl", hash = "sha256:b7e35e0f7d93d7571c2c9c3d6760e456999ea4c1eae5ead6acac247b5a79e469", size = 23279, upload-time = "2025-10-10T22:13:47.281Z" }, + { url = "https://files.pythonhosted.org/packages/66/76/53c0b65b9679b903f98fc54efa32b0e5a19634712a45200c7a80674aa6f5/crcmod_plus-2.3.1-cp311-abi3-macosx_10_9_x86_64.whl", hash = "sha256:6853243120db84677b94b625112116f0ef69cd581741d20de58dce4c34242654", size = 20185, upload-time = "2025-10-10T22:13:48.06Z" }, + { url = "https://files.pythonhosted.org/packages/98/79/2b4dc9bb26394873d7699737124408b5106264ae33053fdec600e9a9fa65/crcmod_plus-2.3.1-cp311-abi3-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:17735bc4e944d552ea18c8609fc6d08a5e64ee9b29cc216ba4d623754029cc3a", size = 26999, upload-time = "2025-10-10T22:13:48.854Z" }, + { url = "https://files.pythonhosted.org/packages/bb/e8/f5d66778b5a1bff915807016561a02b5cebf6b3840fb8a2be40bbb0c8575/crcmod_plus-2.3.1-cp311-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8ac755040a2a35f43ab331978c48a9acb4ff64b425f282a296be467a410f00c3", size = 27536, upload-time = "2025-10-10T22:13:49.956Z" }, + { url = "https://files.pythonhosted.org/packages/f3/2c/0113ad30cadad40c22eef08c0f2618f2446dd282f02268fecbcfc9fda3c1/crcmod_plus-2.3.1-cp311-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:7bdcfb838ca093ca673a3bbb37f62d1e5ec7182e00cc5ee2d00759f9f9f8ab11", size = 27385, upload-time = "2025-10-10T22:13:50.765Z" }, + { url = "https://files.pythonhosted.org/packages/8e/ba/501ef1b02119402cf1a31c01eb2cb8399660bca863c2f4dd3dc060220284/crcmod_plus-2.3.1-cp311-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:9166bc3c9b5e7b07b4e6854cac392b4a451b31d58d3950e48c140ab7b5d05394", size = 27135, upload-time = "2025-10-10T22:13:51.889Z" }, + { url = "https://files.pythonhosted.org/packages/49/90/d4556c9db69c83e726c5b88da3d656fdaac7d60c4d27b43cb939bed80069/crcmod_plus-2.3.1-cp311-abi3-win32.whl", hash = "sha256:cb99b694cce5c862560cf332a8b5e793620e28f0de3726995608bbd6f9b6e09a", size = 22384, upload-time = "2025-10-10T22:13:53.016Z" }, + { url = "https://files.pythonhosted.org/packages/4d/7e/57bb97a8c7b4e19900744f58b67dc83bc9c83aaac670deeede9fb3bfab6a/crcmod_plus-2.3.1-cp311-abi3-win_amd64.whl", hash = "sha256:82b0f7e968c430c5a80fe0fc59e75cb54f2e84df2ed0cee5a3ff9cadfbf8a220", size = 22912, upload-time = "2025-10-10T22:13:53.849Z" }, + { url = "https://files.pythonhosted.org/packages/76/66/419ae3991bb68943cb752e2f4d317c555e3f02a298dd498f26113874ee59/crcmod_plus-2.3.1-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:9397324da1be2729f894744d9031a21ed97584c17fb0289e69e0c3c60916fc5f", size = 19880, upload-time = "2025-10-10T22:14:17.269Z" }, + { url = "https://files.pythonhosted.org/packages/18/f0/d10c9b859927b2cdc38eafc33c8b66e4ede02eaa174df4575681dab5a0f1/crcmod_plus-2.3.1-pp311-pypy311_pp73-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:073c7a3b832652e66c41c8b8705eaecda704d1cbe850b9fa05fdee36cd50745a", size = 21120, upload-time = "2025-10-10T22:14:18.117Z" }, + { url = "https://files.pythonhosted.org/packages/6c/68/cbd8f1707b37b80f9a0bf643e04747b0196f69cf065b52ed56639afbecef/crcmod_plus-2.3.1-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2e5f4c62553f772ea7ae12d9484801b752622c9c288e49ee7ea34a20b94e4920", size = 21698, upload-time = "2025-10-10T22:14:20.044Z" }, + { url = "https://files.pythonhosted.org/packages/41/1b/4ab1681ecbfc48d7e4641fb178c97374eb475ae4109255bdd832110cbbe2/crcmod_plus-2.3.1-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:5e80a9860f66f339956f540d86a768f4fe8c8bfcb139811f14be864425c48d64", size = 23289, upload-time = "2025-10-10T22:14:20.875Z" }, +] + +[[package]] +name = "cycler" +version = "0.12.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/a9/95/a3dbbb5028f35eafb79008e7522a75244477d2838f38cbb722248dabc2a8/cycler-0.12.1.tar.gz", hash = "sha256:88bb128f02ba341da8ef447245a9e138fae777f6a23943da4540077d3601eb1c", size = 7615, upload-time = "2023-10-07T05:32:18.335Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e7/05/c19819d5e3d95294a6f5947fb9b9629efb316b96de511b418c53d245aae6/cycler-0.12.1-py3-none-any.whl", hash = "sha256:85cef7cff222d8644161529808465972e51340599459b8ac3ccbac5a854e0d30", size = 8321, upload-time = "2023-10-07T05:32:16.783Z" }, +] + +[[package]] +name = "execnet" +version = "2.1.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/bf/89/780e11f9588d9e7128a3f87788354c7946a9cbb1401ad38a48c4db9a4f07/execnet-2.1.2.tar.gz", hash = "sha256:63d83bfdd9a23e35b9c6a3261412324f964c2ec8dcd8d3c6916ee9373e0befcd", size = 166622, upload-time = "2025-11-12T09:56:37.75Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ab/84/02fc1827e8cdded4aa65baef11296a9bbe595c474f0d6d758af082d849fd/execnet-2.1.2-py3-none-any.whl", hash = "sha256:67fba928dd5a544b783f6056f449e5e3931a5c378b128bc18501f7ea79e296ec", size = 40708, upload-time = "2025-11-12T09:56:36.333Z" }, +] + +[[package]] +name = "fonttools" +version = "4.61.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/ec/ca/cf17b88a8df95691275a3d77dc0a5ad9907f328ae53acbe6795da1b2f5ed/fonttools-4.61.1.tar.gz", hash = "sha256:6675329885c44657f826ef01d9e4fb33b9158e9d93c537d84ad8399539bc6f69", size = 3565756, upload-time = "2025-12-12T17:31:24.246Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/69/12/bf9f4eaa2fad039356cc627587e30ed008c03f1cebd3034376b5ee8d1d44/fonttools-4.61.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:c6604b735bb12fef8e0efd5578c9fb5d3d8532d5001ea13a19cddf295673ee09", size = 2852213, upload-time = "2025-12-12T17:29:46.675Z" }, + { url = "https://files.pythonhosted.org/packages/ac/49/4138d1acb6261499bedde1c07f8c2605d1d8f9d77a151e5507fd3ef084b6/fonttools-4.61.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:5ce02f38a754f207f2f06557523cd39a06438ba3aafc0639c477ac409fc64e37", size = 2401689, upload-time = "2025-12-12T17:29:48.769Z" }, + { url = "https://files.pythonhosted.org/packages/e5/fe/e6ce0fe20a40e03aef906af60aa87668696f9e4802fa283627d0b5ed777f/fonttools-4.61.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:77efb033d8d7ff233385f30c62c7c79271c8885d5c9657d967ede124671bbdfb", size = 5058809, upload-time = "2025-12-12T17:29:51.701Z" }, + { url = "https://files.pythonhosted.org/packages/79/61/1ca198af22f7dd22c17ab86e9024ed3c06299cfdb08170640e9996d501a0/fonttools-4.61.1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:75c1a6dfac6abd407634420c93864a1e274ebc1c7531346d9254c0d8f6ca00f9", size = 5036039, upload-time = "2025-12-12T17:29:53.659Z" }, + { url = "https://files.pythonhosted.org/packages/99/cc/fa1801e408586b5fce4da9f5455af8d770f4fc57391cd5da7256bb364d38/fonttools-4.61.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:0de30bfe7745c0d1ffa2b0b7048fb7123ad0d71107e10ee090fa0b16b9452e87", size = 5034714, upload-time = "2025-12-12T17:29:55.592Z" }, + { url = "https://files.pythonhosted.org/packages/bf/aa/b7aeafe65adb1b0a925f8f25725e09f078c635bc22754f3fecb7456955b0/fonttools-4.61.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:58b0ee0ab5b1fc9921eccfe11d1435added19d6494dde14e323f25ad2bc30c56", size = 5158648, upload-time = "2025-12-12T17:29:57.861Z" }, + { url = "https://files.pythonhosted.org/packages/99/f9/08ea7a38663328881384c6e7777bbefc46fd7d282adfd87a7d2b84ec9d50/fonttools-4.61.1-cp311-cp311-win32.whl", hash = "sha256:f79b168428351d11e10c5aeb61a74e1851ec221081299f4cf56036a95431c43a", size = 2280681, upload-time = "2025-12-12T17:29:59.943Z" }, + { url = "https://files.pythonhosted.org/packages/07/ad/37dd1ae5fa6e01612a1fbb954f0927681f282925a86e86198ccd7b15d515/fonttools-4.61.1-cp311-cp311-win_amd64.whl", hash = "sha256:fe2efccb324948a11dd09d22136fe2ac8a97d6c1347cf0b58a911dcd529f66b7", size = 2331951, upload-time = "2025-12-12T17:30:02.254Z" }, + { url = "https://files.pythonhosted.org/packages/6f/16/7decaa24a1bd3a70c607b2e29f0adc6159f36a7e40eaba59846414765fd4/fonttools-4.61.1-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:f3cb4a569029b9f291f88aafc927dd53683757e640081ca8c412781ea144565e", size = 2851593, upload-time = "2025-12-12T17:30:04.225Z" }, + { url = "https://files.pythonhosted.org/packages/94/98/3c4cb97c64713a8cf499b3245c3bf9a2b8fd16a3e375feff2aed78f96259/fonttools-4.61.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:41a7170d042e8c0024703ed13b71893519a1a6d6e18e933e3ec7507a2c26a4b2", size = 2400231, upload-time = "2025-12-12T17:30:06.47Z" }, + { url = "https://files.pythonhosted.org/packages/b7/37/82dbef0f6342eb01f54bca073ac1498433d6ce71e50c3c3282b655733b31/fonttools-4.61.1-cp312-cp312-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:10d88e55330e092940584774ee5e8a6971b01fc2f4d3466a1d6c158230880796", size = 4954103, upload-time = "2025-12-12T17:30:08.432Z" }, + { url = "https://files.pythonhosted.org/packages/6c/44/f3aeac0fa98e7ad527f479e161aca6c3a1e47bb6996b053d45226fe37bf2/fonttools-4.61.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:15acc09befd16a0fb8a8f62bc147e1a82817542d72184acca9ce6e0aeda9fa6d", size = 5004295, upload-time = "2025-12-12T17:30:10.56Z" }, + { url = "https://files.pythonhosted.org/packages/14/e8/7424ced75473983b964d09f6747fa09f054a6d656f60e9ac9324cf40c743/fonttools-4.61.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:e6bcdf33aec38d16508ce61fd81838f24c83c90a1d1b8c68982857038673d6b8", size = 4944109, upload-time = "2025-12-12T17:30:12.874Z" }, + { url = "https://files.pythonhosted.org/packages/c8/8b/6391b257fa3d0b553d73e778f953a2f0154292a7a7a085e2374b111e5410/fonttools-4.61.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:5fade934607a523614726119164ff621e8c30e8fa1ffffbbd358662056ba69f0", size = 5093598, upload-time = "2025-12-12T17:30:15.79Z" }, + { url = "https://files.pythonhosted.org/packages/d9/71/fd2ea96cdc512d92da5678a1c98c267ddd4d8c5130b76d0f7a80f9a9fde8/fonttools-4.61.1-cp312-cp312-win32.whl", hash = "sha256:75da8f28eff26defba42c52986de97b22106cb8f26515b7c22443ebc9c2d3261", size = 2269060, upload-time = "2025-12-12T17:30:18.058Z" }, + { url = "https://files.pythonhosted.org/packages/80/3b/a3e81b71aed5a688e89dfe0e2694b26b78c7d7f39a5ffd8a7d75f54a12a8/fonttools-4.61.1-cp312-cp312-win_amd64.whl", hash = "sha256:497c31ce314219888c0e2fce5ad9178ca83fe5230b01a5006726cdf3ac9f24d9", size = 2319078, upload-time = "2025-12-12T17:30:22.862Z" }, + { url = "https://files.pythonhosted.org/packages/c7/4e/ce75a57ff3aebf6fc1f4e9d508b8e5810618a33d900ad6c19eb30b290b97/fonttools-4.61.1-py3-none-any.whl", hash = "sha256:17d2bf5d541add43822bcf0c43d7d847b160c9bb01d15d5007d84e2217aaa371", size = 1148996, upload-time = "2025-12-12T17:31:21.03Z" }, +] + +[[package]] +name = "gcovr" +version = "8.6" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "colorlog" }, + { name = "jinja2" }, + { name = "lxml" }, + { name = "pygments" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/07/37/b4a87dff166dc0a5002e9d03fcb6ca8eeff048247b011b67f047e31122c9/gcovr-8.6.tar.gz", hash = "sha256:b2e7042abca9321cadbab8a06eb34d19f801b831557b28cdc30a029313de8b9e", size = 199997, upload-time = "2026-01-13T20:04:30.019Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/92/be/f722c843e7875c7cf92cf0e0c1604cddda55a70278c768c6327a78fdba79/gcovr-8.6-py3-none-any.whl", hash = "sha256:dbf9d87c38042752ad6f530aa8210427e22b526611bb7b7bfed0e81977d1f1ef", size = 254618, upload-time = "2026-01-13T20:04:28.15Z" }, +] + +[[package]] +name = "hypothesis" +version = "6.47.5" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "attrs" }, + { name = "sortedcontainers" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/45/f2/f77da8271b1abb630cb2090ead2f5aa4acc9639d632e8e68187f52527e4b/hypothesis-6.47.5.tar.gz", hash = "sha256:e0c1e253fc97e7ecdb9e2bbff2cf815d8739e0d1d3d093d67c3af5bb6a7211b0", size = 326641, upload-time = "2022-06-25T20:58:48.926Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d3/a7/389bbaade2cbbb2534cb2715986041ed01c6d792152c527e71f7f68e93b5/hypothesis-6.47.5-py3-none-any.whl", hash = "sha256:87049b781ee11ec1c7948565b889ab02e428a1e32d427ab4de8fdb3649242d06", size = 387311, upload-time = "2022-06-25T20:58:45.281Z" }, +] + +[[package]] +name = "idna" +version = "3.11" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/6f/6d/0703ccc57f3a7233505399edb88de3cbd678da106337b9fcde432b65ed60/idna-3.11.tar.gz", hash = "sha256:795dafcc9c04ed0c1fb032c2aa73654d8e8c5023a7df64a53f39190ada629902", size = 194582, upload-time = "2025-10-12T14:55:20.501Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/0e/61/66938bbb5fc52dbdf84594873d5b51fb1f7c7794e9c0f5bd885f30bc507b/idna-3.11-py3-none-any.whl", hash = "sha256:771a87f49d9defaf64091e6e6fe9c18d4833f140bd19464795bc32d966ca37ea", size = 71008, upload-time = "2025-10-12T14:55:18.883Z" }, +] + +[[package]] +name = "iniconfig" +version = "2.3.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/72/34/14ca021ce8e5dfedc35312d08ba8bf51fdd999c576889fc2c24cb97f4f10/iniconfig-2.3.0.tar.gz", hash = "sha256:c76315c77db068650d49c5b56314774a7804df16fee4402c1f19d6d15d8c4730", size = 20503, upload-time = "2025-10-18T21:55:43.219Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/cb/b1/3846dd7f199d53cb17f49cba7e651e9ce294d8497c8c150530ed11865bb8/iniconfig-2.3.0-py3-none-any.whl", hash = "sha256:f631c04d2c48c52b84d0d0549c99ff3859c98df65b3101406327ecc7d53fbf12", size = 7484, upload-time = "2025-10-18T21:55:41.639Z" }, +] + +[[package]] +name = "inputs" +version = "0.5" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d1/cd/5f434220920f76eb73d19bb7aab8d857445f40aa642718e6e51e850cd663/inputs-0.5.tar.gz", hash = "sha256:a31d5b96a3525f1232f326be9e7ce8ccaf873c6b1fb84d9f3c9bc3d79b23eae4", size = 33393, upload-time = "2018-10-05T22:38:14.206Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d0/94/040a0d9c81f018c39bd887b7b825013b024deb0a6c795f9524797e2cd41b/inputs-0.5-py2.py3-none-any.whl", hash = "sha256:13f894564e52134cf1e3862b1811da034875eb1f2b62e6021e3776e9669a96ec", size = 33630, upload-time = "2018-10-05T22:38:28.28Z" }, +] + +[[package]] +name = "jinja2" +version = "3.1.6" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "markupsafe" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/df/bf/f7da0350254c0ed7c72f3e33cef02e048281fec7ecec5f032d4aac52226b/jinja2-3.1.6.tar.gz", hash = "sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d", size = 245115, upload-time = "2025-03-05T20:05:02.478Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/62/a1/3d680cbfd5f4b8f15abc1d571870c5fc3e594bb582bc3b64ea099db13e56/jinja2-3.1.6-py3-none-any.whl", hash = "sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67", size = 134899, upload-time = "2025-03-05T20:05:00.369Z" }, +] + +[[package]] +name = "kiwisolver" +version = "1.4.9" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/5c/3c/85844f1b0feb11ee581ac23fe5fce65cd049a200c1446708cc1b7f922875/kiwisolver-1.4.9.tar.gz", hash = "sha256:c3b22c26c6fd6811b0ae8363b95ca8ce4ea3c202d3d0975b2914310ceb1bcc4d", size = 97564, upload-time = "2025-08-10T21:27:49.279Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/6f/ab/c80b0d5a9d8a1a65f4f815f2afff9798b12c3b9f31f1d304dd233dd920e2/kiwisolver-1.4.9-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:eb14a5da6dc7642b0f3a18f13654847cd8b7a2550e2645a5bda677862b03ba16", size = 124167, upload-time = "2025-08-10T21:25:53.403Z" }, + { url = "https://files.pythonhosted.org/packages/a0/c0/27fe1a68a39cf62472a300e2879ffc13c0538546c359b86f149cc19f6ac3/kiwisolver-1.4.9-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:39a219e1c81ae3b103643d2aedb90f1ef22650deb266ff12a19e7773f3e5f089", size = 66579, upload-time = "2025-08-10T21:25:54.79Z" }, + { url = "https://files.pythonhosted.org/packages/31/a2/a12a503ac1fd4943c50f9822678e8015a790a13b5490354c68afb8489814/kiwisolver-1.4.9-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:2405a7d98604b87f3fc28b1716783534b1b4b8510d8142adca34ee0bc3c87543", size = 65309, upload-time = "2025-08-10T21:25:55.76Z" }, + { url = "https://files.pythonhosted.org/packages/66/e1/e533435c0be77c3f64040d68d7a657771194a63c279f55573188161e81ca/kiwisolver-1.4.9-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:dc1ae486f9abcef254b5618dfb4113dd49f94c68e3e027d03cf0143f3f772b61", size = 1435596, upload-time = "2025-08-10T21:25:56.861Z" }, + { url = "https://files.pythonhosted.org/packages/67/1e/51b73c7347f9aabdc7215aa79e8b15299097dc2f8e67dee2b095faca9cb0/kiwisolver-1.4.9-cp311-cp311-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8a1f570ce4d62d718dce3f179ee78dac3b545ac16c0c04bb363b7607a949c0d1", size = 1246548, upload-time = "2025-08-10T21:25:58.246Z" }, + { url = "https://files.pythonhosted.org/packages/21/aa/72a1c5d1e430294f2d32adb9542719cfb441b5da368d09d268c7757af46c/kiwisolver-1.4.9-cp311-cp311-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:cb27e7b78d716c591e88e0a09a2139c6577865d7f2e152488c2cc6257f460872", size = 1263618, upload-time = "2025-08-10T21:25:59.857Z" }, + { url = "https://files.pythonhosted.org/packages/a3/af/db1509a9e79dbf4c260ce0cfa3903ea8945f6240e9e59d1e4deb731b1a40/kiwisolver-1.4.9-cp311-cp311-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:15163165efc2f627eb9687ea5f3a28137217d217ac4024893d753f46bce9de26", size = 1317437, upload-time = "2025-08-10T21:26:01.105Z" }, + { url = "https://files.pythonhosted.org/packages/e0/f2/3ea5ee5d52abacdd12013a94130436e19969fa183faa1e7c7fbc89e9a42f/kiwisolver-1.4.9-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:bdee92c56a71d2b24c33a7d4c2856bd6419d017e08caa7802d2963870e315028", size = 2195742, upload-time = "2025-08-10T21:26:02.675Z" }, + { url = "https://files.pythonhosted.org/packages/6f/9b/1efdd3013c2d9a2566aa6a337e9923a00590c516add9a1e89a768a3eb2fc/kiwisolver-1.4.9-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:412f287c55a6f54b0650bd9b6dce5aceddb95864a1a90c87af16979d37c89771", size = 2290810, upload-time = "2025-08-10T21:26:04.009Z" }, + { url = "https://files.pythonhosted.org/packages/fb/e5/cfdc36109ae4e67361f9bc5b41323648cb24a01b9ade18784657e022e65f/kiwisolver-1.4.9-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:2c93f00dcba2eea70af2be5f11a830a742fe6b579a1d4e00f47760ef13be247a", size = 2461579, upload-time = "2025-08-10T21:26:05.317Z" }, + { url = "https://files.pythonhosted.org/packages/62/86/b589e5e86c7610842213994cdea5add00960076bef4ae290c5fa68589cac/kiwisolver-1.4.9-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:f117e1a089d9411663a3207ba874f31be9ac8eaa5b533787024dc07aeb74f464", size = 2268071, upload-time = "2025-08-10T21:26:06.686Z" }, + { url = "https://files.pythonhosted.org/packages/3b/c6/f8df8509fd1eee6c622febe54384a96cfaf4d43bf2ccec7a0cc17e4715c9/kiwisolver-1.4.9-cp311-cp311-win_amd64.whl", hash = "sha256:be6a04e6c79819c9a8c2373317d19a96048e5a3f90bec587787e86a1153883c2", size = 73840, upload-time = "2025-08-10T21:26:07.94Z" }, + { url = "https://files.pythonhosted.org/packages/e2/2d/16e0581daafd147bc11ac53f032a2b45eabac897f42a338d0a13c1e5c436/kiwisolver-1.4.9-cp311-cp311-win_arm64.whl", hash = "sha256:0ae37737256ba2de764ddc12aed4956460277f00c4996d51a197e72f62f5eec7", size = 65159, upload-time = "2025-08-10T21:26:09.048Z" }, + { url = "https://files.pythonhosted.org/packages/86/c9/13573a747838aeb1c76e3267620daa054f4152444d1f3d1a2324b78255b5/kiwisolver-1.4.9-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:ac5a486ac389dddcc5bef4f365b6ae3ffff2c433324fb38dd35e3fab7c957999", size = 123686, upload-time = "2025-08-10T21:26:10.034Z" }, + { url = "https://files.pythonhosted.org/packages/51/ea/2ecf727927f103ffd1739271ca19c424d0e65ea473fbaeea1c014aea93f6/kiwisolver-1.4.9-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:f2ba92255faa7309d06fe44c3a4a97efe1c8d640c2a79a5ef728b685762a6fd2", size = 66460, upload-time = "2025-08-10T21:26:11.083Z" }, + { url = "https://files.pythonhosted.org/packages/5b/5a/51f5464373ce2aeb5194508298a508b6f21d3867f499556263c64c621914/kiwisolver-1.4.9-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:4a2899935e724dd1074cb568ce7ac0dce28b2cd6ab539c8e001a8578eb106d14", size = 64952, upload-time = "2025-08-10T21:26:12.058Z" }, + { url = "https://files.pythonhosted.org/packages/70/90/6d240beb0f24b74371762873e9b7f499f1e02166a2d9c5801f4dbf8fa12e/kiwisolver-1.4.9-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:f6008a4919fdbc0b0097089f67a1eb55d950ed7e90ce2cc3e640abadd2757a04", size = 1474756, upload-time = "2025-08-10T21:26:13.096Z" }, + { url = "https://files.pythonhosted.org/packages/12/42/f36816eaf465220f683fb711efdd1bbf7a7005a2473d0e4ed421389bd26c/kiwisolver-1.4.9-cp312-cp312-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:67bb8b474b4181770f926f7b7d2f8c0248cbcb78b660fdd41a47054b28d2a752", size = 1276404, upload-time = "2025-08-10T21:26:14.457Z" }, + { url = "https://files.pythonhosted.org/packages/2e/64/bc2de94800adc830c476dce44e9b40fd0809cddeef1fde9fcf0f73da301f/kiwisolver-1.4.9-cp312-cp312-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:2327a4a30d3ee07d2fbe2e7933e8a37c591663b96ce42a00bc67461a87d7df77", size = 1294410, upload-time = "2025-08-10T21:26:15.73Z" }, + { url = "https://files.pythonhosted.org/packages/5f/42/2dc82330a70aa8e55b6d395b11018045e58d0bb00834502bf11509f79091/kiwisolver-1.4.9-cp312-cp312-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:7a08b491ec91b1d5053ac177afe5290adacf1f0f6307d771ccac5de30592d198", size = 1343631, upload-time = "2025-08-10T21:26:17.045Z" }, + { url = "https://files.pythonhosted.org/packages/22/fd/f4c67a6ed1aab149ec5a8a401c323cee7a1cbe364381bb6c9c0d564e0e20/kiwisolver-1.4.9-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:d8fc5c867c22b828001b6a38d2eaeb88160bf5783c6cb4a5e440efc981ce286d", size = 2224963, upload-time = "2025-08-10T21:26:18.737Z" }, + { url = "https://files.pythonhosted.org/packages/45/aa/76720bd4cb3713314677d9ec94dcc21ced3f1baf4830adde5bb9b2430a5f/kiwisolver-1.4.9-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:3b3115b2581ea35bb6d1f24a4c90af37e5d9b49dcff267eeed14c3893c5b86ab", size = 2321295, upload-time = "2025-08-10T21:26:20.11Z" }, + { url = "https://files.pythonhosted.org/packages/80/19/d3ec0d9ab711242f56ae0dc2fc5d70e298bb4a1f9dfab44c027668c673a1/kiwisolver-1.4.9-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:858e4c22fb075920b96a291928cb7dea5644e94c0ee4fcd5af7e865655e4ccf2", size = 2487987, upload-time = "2025-08-10T21:26:21.49Z" }, + { url = "https://files.pythonhosted.org/packages/39/e9/61e4813b2c97e86b6fdbd4dd824bf72d28bcd8d4849b8084a357bc0dd64d/kiwisolver-1.4.9-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:ed0fecd28cc62c54b262e3736f8bb2512d8dcfdc2bcf08be5f47f96bf405b145", size = 2291817, upload-time = "2025-08-10T21:26:22.812Z" }, + { url = "https://files.pythonhosted.org/packages/a0/41/85d82b0291db7504da3c2defe35c9a8a5c9803a730f297bd823d11d5fb77/kiwisolver-1.4.9-cp312-cp312-win_amd64.whl", hash = "sha256:f68208a520c3d86ea51acf688a3e3002615a7f0238002cccc17affecc86a8a54", size = 73895, upload-time = "2025-08-10T21:26:24.37Z" }, + { url = "https://files.pythonhosted.org/packages/e2/92/5f3068cf15ee5cb624a0c7596e67e2a0bb2adee33f71c379054a491d07da/kiwisolver-1.4.9-cp312-cp312-win_arm64.whl", hash = "sha256:2c1a4f57df73965f3f14df20b80ee29e6a7930a57d2d9e8491a25f676e197c60", size = 64992, upload-time = "2025-08-10T21:26:25.732Z" }, + { url = "https://files.pythonhosted.org/packages/a3/0f/36d89194b5a32c054ce93e586d4049b6c2c22887b0eb229c61c68afd3078/kiwisolver-1.4.9-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:720e05574713db64c356e86732c0f3c5252818d05f9df320f0ad8380641acea5", size = 60104, upload-time = "2025-08-10T21:27:43.287Z" }, + { url = "https://files.pythonhosted.org/packages/52/ba/4ed75f59e4658fd21fe7dde1fee0ac397c678ec3befba3fe6482d987af87/kiwisolver-1.4.9-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:17680d737d5335b552994a2008fab4c851bcd7de33094a82067ef3a576ff02fa", size = 58592, upload-time = "2025-08-10T21:27:44.314Z" }, + { url = "https://files.pythonhosted.org/packages/33/01/a8ea7c5ea32a9b45ceeaee051a04c8ed4320f5add3c51bfa20879b765b70/kiwisolver-1.4.9-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:85b5352f94e490c028926ea567fc569c52ec79ce131dadb968d3853e809518c2", size = 80281, upload-time = "2025-08-10T21:27:45.369Z" }, + { url = "https://files.pythonhosted.org/packages/da/e3/dbd2ecdce306f1d07a1aaf324817ee993aab7aee9db47ceac757deabafbe/kiwisolver-1.4.9-pp311-pypy311_pp73-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:464415881e4801295659462c49461a24fb107c140de781d55518c4b80cb6790f", size = 78009, upload-time = "2025-08-10T21:27:46.376Z" }, + { url = "https://files.pythonhosted.org/packages/da/e9/0d4add7873a73e462aeb45c036a2dead2562b825aa46ba326727b3f31016/kiwisolver-1.4.9-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:fb940820c63a9590d31d88b815e7a3aa5915cad3ce735ab45f0c730b39547de1", size = 73929, upload-time = "2025-08-10T21:27:48.236Z" }, +] + +[[package]] +name = "lefthook" +version = "2.0.15" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/7c/8f/e90724128f481c637b7e9343b6535622cfa136541959a49f8a3de0d0e7a5/lefthook-2.0.15.tar.gz", hash = "sha256:8a32c9f2d44f0ff0f3e3ab48f9802ca10f1222b491f3f14e03f577ec175b6649", size = 50175274, upload-time = "2026-01-13T10:02:58.76Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7c/d5/243d967f541d422a7252f92dbcc201cfd588bd404a66935baacc83be49c5/lefthook-2.0.15-py3-none-any.whl", hash = "sha256:54b174520f18a4fa2545ff1e5eae4c4d2515539fb25b8c4fe04b9224a2ff07ee", size = 50416709, upload-time = "2026-01-13T10:02:55.761Z" }, +] + +[[package]] +name = "lxml" +version = "6.0.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/aa/88/262177de60548e5a2bfc46ad28232c9e9cbde697bd94132aeb80364675cb/lxml-6.0.2.tar.gz", hash = "sha256:cd79f3367bd74b317dda655dc8fcfa304d9eb6e4fb06b7168c5cf27f96e0cd62", size = 4073426, upload-time = "2025-09-22T04:04:59.287Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/77/d5/becbe1e2569b474a23f0c672ead8a29ac50b2dc1d5b9de184831bda8d14c/lxml-6.0.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:13e35cbc684aadf05d8711a5d1b5857c92e5e580efa9a0d2be197199c8def607", size = 8634365, upload-time = "2025-09-22T04:00:45.672Z" }, + { url = "https://files.pythonhosted.org/packages/28/66/1ced58f12e804644426b85d0bb8a4478ca77bc1761455da310505f1a3526/lxml-6.0.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3b1675e096e17c6fe9c0e8c81434f5736c0739ff9ac6123c87c2d452f48fc938", size = 4650793, upload-time = "2025-09-22T04:00:47.783Z" }, + { url = "https://files.pythonhosted.org/packages/11/84/549098ffea39dfd167e3f174b4ce983d0eed61f9d8d25b7bf2a57c3247fc/lxml-6.0.2-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:8ac6e5811ae2870953390452e3476694196f98d447573234592d30488147404d", size = 4944362, upload-time = "2025-09-22T04:00:49.845Z" }, + { url = "https://files.pythonhosted.org/packages/ac/bd/f207f16abf9749d2037453d56b643a7471d8fde855a231a12d1e095c4f01/lxml-6.0.2-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:5aa0fc67ae19d7a64c3fe725dc9a1bb11f80e01f78289d05c6f62545affec438", size = 5083152, upload-time = "2025-09-22T04:00:51.709Z" }, + { url = "https://files.pythonhosted.org/packages/15/ae/bd813e87d8941d52ad5b65071b1affb48da01c4ed3c9c99e40abb266fbff/lxml-6.0.2-cp311-cp311-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:de496365750cc472b4e7902a485d3f152ecf57bd3ba03ddd5578ed8ceb4c5964", size = 5023539, upload-time = "2025-09-22T04:00:53.593Z" }, + { url = "https://files.pythonhosted.org/packages/02/cd/9bfef16bd1d874fbe0cb51afb00329540f30a3283beb9f0780adbb7eec03/lxml-6.0.2-cp311-cp311-manylinux_2_26_i686.manylinux_2_28_i686.whl", hash = "sha256:200069a593c5e40b8f6fc0d84d86d970ba43138c3e68619ffa234bc9bb806a4d", size = 5344853, upload-time = "2025-09-22T04:00:55.524Z" }, + { url = "https://files.pythonhosted.org/packages/b8/89/ea8f91594bc5dbb879734d35a6f2b0ad50605d7fb419de2b63d4211765cc/lxml-6.0.2-cp311-cp311-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7d2de809c2ee3b888b59f995625385f74629707c9355e0ff856445cdcae682b7", size = 5225133, upload-time = "2025-09-22T04:00:57.269Z" }, + { url = "https://files.pythonhosted.org/packages/b9/37/9c735274f5dbec726b2db99b98a43950395ba3d4a1043083dba2ad814170/lxml-6.0.2-cp311-cp311-manylinux_2_31_armv7l.whl", hash = "sha256:b2c3da8d93cf5db60e8858c17684c47d01fee6405e554fb55018dd85fc23b178", size = 4677944, upload-time = "2025-09-22T04:00:59.052Z" }, + { url = "https://files.pythonhosted.org/packages/20/28/7dfe1ba3475d8bfca3878365075abe002e05d40dfaaeb7ec01b4c587d533/lxml-6.0.2-cp311-cp311-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:442de7530296ef5e188373a1ea5789a46ce90c4847e597856570439621d9c553", size = 5284535, upload-time = "2025-09-22T04:01:01.335Z" }, + { url = "https://files.pythonhosted.org/packages/e7/cf/5f14bc0de763498fc29510e3532bf2b4b3a1c1d5d0dff2e900c16ba021ef/lxml-6.0.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:2593c77efde7bfea7f6389f1ab249b15ed4aa5bc5cb5131faa3b843c429fbedb", size = 5067343, upload-time = "2025-09-22T04:01:03.13Z" }, + { url = "https://files.pythonhosted.org/packages/1c/b0/bb8275ab5472f32b28cfbbcc6db7c9d092482d3439ca279d8d6fa02f7025/lxml-6.0.2-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:3e3cb08855967a20f553ff32d147e14329b3ae70ced6edc2f282b94afbc74b2a", size = 4725419, upload-time = "2025-09-22T04:01:05.013Z" }, + { url = "https://files.pythonhosted.org/packages/25/4c/7c222753bc72edca3b99dbadba1b064209bc8ed4ad448af990e60dcce462/lxml-6.0.2-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:2ed6c667fcbb8c19c6791bbf40b7268ef8ddf5a96940ba9404b9f9a304832f6c", size = 5275008, upload-time = "2025-09-22T04:01:07.327Z" }, + { url = "https://files.pythonhosted.org/packages/6c/8c/478a0dc6b6ed661451379447cdbec77c05741a75736d97e5b2b729687828/lxml-6.0.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:b8f18914faec94132e5b91e69d76a5c1d7b0c73e2489ea8929c4aaa10b76bbf7", size = 5248906, upload-time = "2025-09-22T04:01:09.452Z" }, + { url = "https://files.pythonhosted.org/packages/2d/d9/5be3a6ab2784cdf9accb0703b65e1b64fcdd9311c9f007630c7db0cfcce1/lxml-6.0.2-cp311-cp311-win32.whl", hash = "sha256:6605c604e6daa9e0d7f0a2137bdc47a2e93b59c60a65466353e37f8272f47c46", size = 3610357, upload-time = "2025-09-22T04:01:11.102Z" }, + { url = "https://files.pythonhosted.org/packages/e2/7d/ca6fb13349b473d5732fb0ee3eec8f6c80fc0688e76b7d79c1008481bf1f/lxml-6.0.2-cp311-cp311-win_amd64.whl", hash = "sha256:e5867f2651016a3afd8dd2c8238baa66f1e2802f44bc17e236f547ace6647078", size = 4036583, upload-time = "2025-09-22T04:01:12.766Z" }, + { url = "https://files.pythonhosted.org/packages/ab/a2/51363b5ecd3eab46563645f3a2c3836a2fc67d01a1b87c5017040f39f567/lxml-6.0.2-cp311-cp311-win_arm64.whl", hash = "sha256:4197fb2534ee05fd3e7afaab5d8bfd6c2e186f65ea7f9cd6a82809c887bd1285", size = 3680591, upload-time = "2025-09-22T04:01:14.874Z" }, + { url = "https://files.pythonhosted.org/packages/f3/c8/8ff2bc6b920c84355146cd1ab7d181bc543b89241cfb1ebee824a7c81457/lxml-6.0.2-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:a59f5448ba2ceccd06995c95ea59a7674a10de0810f2ce90c9006f3cbc044456", size = 8661887, upload-time = "2025-09-22T04:01:17.265Z" }, + { url = "https://files.pythonhosted.org/packages/37/6f/9aae1008083bb501ef63284220ce81638332f9ccbfa53765b2b7502203cf/lxml-6.0.2-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:e8113639f3296706fbac34a30813929e29247718e88173ad849f57ca59754924", size = 4667818, upload-time = "2025-09-22T04:01:19.688Z" }, + { url = "https://files.pythonhosted.org/packages/f1/ca/31fb37f99f37f1536c133476674c10b577e409c0a624384147653e38baf2/lxml-6.0.2-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:a8bef9b9825fa8bc816a6e641bb67219489229ebc648be422af695f6e7a4fa7f", size = 4950807, upload-time = "2025-09-22T04:01:21.487Z" }, + { url = "https://files.pythonhosted.org/packages/da/87/f6cb9442e4bada8aab5ae7e1046264f62fdbeaa6e3f6211b93f4c0dd97f1/lxml-6.0.2-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:65ea18d710fd14e0186c2f973dc60bb52039a275f82d3c44a0e42b43440ea534", size = 5109179, upload-time = "2025-09-22T04:01:23.32Z" }, + { url = "https://files.pythonhosted.org/packages/c8/20/a7760713e65888db79bbae4f6146a6ae5c04e4a204a3c48896c408cd6ed2/lxml-6.0.2-cp312-cp312-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c371aa98126a0d4c739ca93ceffa0fd7a5d732e3ac66a46e74339acd4d334564", size = 5023044, upload-time = "2025-09-22T04:01:25.118Z" }, + { url = "https://files.pythonhosted.org/packages/a2/b0/7e64e0460fcb36471899f75831509098f3fd7cd02a3833ac517433cb4f8f/lxml-6.0.2-cp312-cp312-manylinux_2_26_i686.manylinux_2_28_i686.whl", hash = "sha256:700efd30c0fa1a3581d80a748157397559396090a51d306ea59a70020223d16f", size = 5359685, upload-time = "2025-09-22T04:01:27.398Z" }, + { url = "https://files.pythonhosted.org/packages/b9/e1/e5df362e9ca4e2f48ed6411bd4b3a0ae737cc842e96877f5bf9428055ab4/lxml-6.0.2-cp312-cp312-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:c33e66d44fe60e72397b487ee92e01da0d09ba2d66df8eae42d77b6d06e5eba0", size = 5654127, upload-time = "2025-09-22T04:01:29.629Z" }, + { url = "https://files.pythonhosted.org/packages/c6/d1/232b3309a02d60f11e71857778bfcd4acbdb86c07db8260caf7d008b08f8/lxml-6.0.2-cp312-cp312-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:90a345bbeaf9d0587a3aaffb7006aa39ccb6ff0e96a57286c0cb2fd1520ea192", size = 5253958, upload-time = "2025-09-22T04:01:31.535Z" }, + { url = "https://files.pythonhosted.org/packages/35/35/d955a070994725c4f7d80583a96cab9c107c57a125b20bb5f708fe941011/lxml-6.0.2-cp312-cp312-manylinux_2_31_armv7l.whl", hash = "sha256:064fdadaf7a21af3ed1dcaa106b854077fbeada827c18f72aec9346847cd65d0", size = 4711541, upload-time = "2025-09-22T04:01:33.801Z" }, + { url = "https://files.pythonhosted.org/packages/1e/be/667d17363b38a78c4bd63cfd4b4632029fd68d2c2dc81f25ce9eb5224dd5/lxml-6.0.2-cp312-cp312-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:fbc74f42c3525ac4ffa4b89cbdd00057b6196bcefe8bce794abd42d33a018092", size = 5267426, upload-time = "2025-09-22T04:01:35.639Z" }, + { url = "https://files.pythonhosted.org/packages/ea/47/62c70aa4a1c26569bc958c9ca86af2bb4e1f614e8c04fb2989833874f7ae/lxml-6.0.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:6ddff43f702905a4e32bc24f3f2e2edfe0f8fde3277d481bffb709a4cced7a1f", size = 5064917, upload-time = "2025-09-22T04:01:37.448Z" }, + { url = "https://files.pythonhosted.org/packages/bd/55/6ceddaca353ebd0f1908ef712c597f8570cc9c58130dbb89903198e441fd/lxml-6.0.2-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:6da5185951d72e6f5352166e3da7b0dc27aa70bd1090b0eb3f7f7212b53f1bb8", size = 4788795, upload-time = "2025-09-22T04:01:39.165Z" }, + { url = "https://files.pythonhosted.org/packages/cf/e8/fd63e15da5e3fd4c2146f8bbb3c14e94ab850589beab88e547b2dbce22e1/lxml-6.0.2-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:57a86e1ebb4020a38d295c04fc79603c7899e0df71588043eb218722dabc087f", size = 5676759, upload-time = "2025-09-22T04:01:41.506Z" }, + { url = "https://files.pythonhosted.org/packages/76/47/b3ec58dc5c374697f5ba37412cd2728f427d056315d124dd4b61da381877/lxml-6.0.2-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:2047d8234fe735ab77802ce5f2297e410ff40f5238aec569ad7c8e163d7b19a6", size = 5255666, upload-time = "2025-09-22T04:01:43.363Z" }, + { url = "https://files.pythonhosted.org/packages/19/93/03ba725df4c3d72afd9596eef4a37a837ce8e4806010569bedfcd2cb68fd/lxml-6.0.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:6f91fd2b2ea15a6800c8e24418c0775a1694eefc011392da73bc6cef2623b322", size = 5277989, upload-time = "2025-09-22T04:01:45.215Z" }, + { url = "https://files.pythonhosted.org/packages/c6/80/c06de80bfce881d0ad738576f243911fccf992687ae09fd80b734712b39c/lxml-6.0.2-cp312-cp312-win32.whl", hash = "sha256:3ae2ce7d6fedfb3414a2b6c5e20b249c4c607f72cb8d2bb7cc9c6ec7c6f4e849", size = 3611456, upload-time = "2025-09-22T04:01:48.243Z" }, + { url = "https://files.pythonhosted.org/packages/f7/d7/0cdfb6c3e30893463fb3d1e52bc5f5f99684a03c29a0b6b605cfae879cd5/lxml-6.0.2-cp312-cp312-win_amd64.whl", hash = "sha256:72c87e5ee4e58a8354fb9c7c84cbf95a1c8236c127a5d1b7683f04bed8361e1f", size = 4011793, upload-time = "2025-09-22T04:01:50.042Z" }, + { url = "https://files.pythonhosted.org/packages/ea/7b/93c73c67db235931527301ed3785f849c78991e2e34f3fd9a6663ffda4c5/lxml-6.0.2-cp312-cp312-win_arm64.whl", hash = "sha256:61cb10eeb95570153e0c0e554f58df92ecf5109f75eacad4a95baa709e26c3d6", size = 3672836, upload-time = "2025-09-22T04:01:52.145Z" }, + { url = "https://files.pythonhosted.org/packages/0b/11/29d08bc103a62c0eba8016e7ed5aeebbf1e4312e83b0b1648dd203b0e87d/lxml-6.0.2-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:1c06035eafa8404b5cf475bb37a9f6088b0aca288d4ccc9d69389750d5543700", size = 3949829, upload-time = "2025-09-22T04:04:45.608Z" }, + { url = "https://files.pythonhosted.org/packages/12/b3/52ab9a3b31e5ab8238da241baa19eec44d2ab426532441ee607165aebb52/lxml-6.0.2-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:c7d13103045de1bdd6fe5d61802565f1a3537d70cd3abf596aa0af62761921ee", size = 4226277, upload-time = "2025-09-22T04:04:47.754Z" }, + { url = "https://files.pythonhosted.org/packages/a0/33/1eaf780c1baad88224611df13b1c2a9dfa460b526cacfe769103ff50d845/lxml-6.0.2-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:0a3c150a95fbe5ac91de323aa756219ef9cf7fde5a3f00e2281e30f33fa5fa4f", size = 4330433, upload-time = "2025-09-22T04:04:49.907Z" }, + { url = "https://files.pythonhosted.org/packages/7a/c1/27428a2ff348e994ab4f8777d3a0ad510b6b92d37718e5887d2da99952a2/lxml-6.0.2-pp311-pypy311_pp73-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:60fa43be34f78bebb27812ed90f1925ec99560b0fa1decdb7d12b84d857d31e9", size = 4272119, upload-time = "2025-09-22T04:04:51.801Z" }, + { url = "https://files.pythonhosted.org/packages/f0/d0/3020fa12bcec4ab62f97aab026d57c2f0cfd480a558758d9ca233bb6a79d/lxml-6.0.2-pp311-pypy311_pp73-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:21c73b476d3cfe836be731225ec3421fa2f048d84f6df6a8e70433dff1376d5a", size = 4417314, upload-time = "2025-09-22T04:04:55.024Z" }, + { url = "https://files.pythonhosted.org/packages/6c/77/d7f491cbc05303ac6801651aabeb262d43f319288c1ea96c66b1d2692ff3/lxml-6.0.2-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:27220da5be049e936c3aca06f174e8827ca6445a4353a1995584311487fc4e3e", size = 3518768, upload-time = "2025-09-22T04:04:57.097Z" }, +] + +[[package]] +name = "markupsafe" +version = "3.0.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/7e/99/7690b6d4034fffd95959cbe0c02de8deb3098cc577c67bb6a24fe5d7caa7/markupsafe-3.0.3.tar.gz", hash = "sha256:722695808f4b6457b320fdc131280796bdceb04ab50fe1795cd540799ebe1698", size = 80313, upload-time = "2025-09-27T18:37:40.426Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/08/db/fefacb2136439fc8dd20e797950e749aa1f4997ed584c62cfb8ef7c2be0e/markupsafe-3.0.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1cc7ea17a6824959616c525620e387f6dd30fec8cb44f649e31712db02123dad", size = 11631, upload-time = "2025-09-27T18:36:18.185Z" }, + { url = "https://files.pythonhosted.org/packages/e1/2e/5898933336b61975ce9dc04decbc0a7f2fee78c30353c5efba7f2d6ff27a/markupsafe-3.0.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4bd4cd07944443f5a265608cc6aab442e4f74dff8088b0dfc8238647b8f6ae9a", size = 12058, upload-time = "2025-09-27T18:36:19.444Z" }, + { url = "https://files.pythonhosted.org/packages/1d/09/adf2df3699d87d1d8184038df46a9c80d78c0148492323f4693df54e17bb/markupsafe-3.0.3-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6b5420a1d9450023228968e7e6a9ce57f65d148ab56d2313fcd589eee96a7a50", size = 24287, upload-time = "2025-09-27T18:36:20.768Z" }, + { url = "https://files.pythonhosted.org/packages/30/ac/0273f6fcb5f42e314c6d8cd99effae6a5354604d461b8d392b5ec9530a54/markupsafe-3.0.3-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0bf2a864d67e76e5c9a34dc26ec616a66b9888e25e7b9460e1c76d3293bd9dbf", size = 22940, upload-time = "2025-09-27T18:36:22.249Z" }, + { url = "https://files.pythonhosted.org/packages/19/ae/31c1be199ef767124c042c6c3e904da327a2f7f0cd63a0337e1eca2967a8/markupsafe-3.0.3-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:bc51efed119bc9cfdf792cdeaa4d67e8f6fcccab66ed4bfdd6bde3e59bfcbb2f", size = 21887, upload-time = "2025-09-27T18:36:23.535Z" }, + { url = "https://files.pythonhosted.org/packages/b2/76/7edcab99d5349a4532a459e1fe64f0b0467a3365056ae550d3bcf3f79e1e/markupsafe-3.0.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:068f375c472b3e7acbe2d5318dea141359e6900156b5b2ba06a30b169086b91a", size = 23692, upload-time = "2025-09-27T18:36:24.823Z" }, + { url = "https://files.pythonhosted.org/packages/a4/28/6e74cdd26d7514849143d69f0bf2399f929c37dc2b31e6829fd2045b2765/markupsafe-3.0.3-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:7be7b61bb172e1ed687f1754f8e7484f1c8019780f6f6b0786e76bb01c2ae115", size = 21471, upload-time = "2025-09-27T18:36:25.95Z" }, + { url = "https://files.pythonhosted.org/packages/62/7e/a145f36a5c2945673e590850a6f8014318d5577ed7e5920a4b3448e0865d/markupsafe-3.0.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:f9e130248f4462aaa8e2552d547f36ddadbeaa573879158d721bbd33dfe4743a", size = 22923, upload-time = "2025-09-27T18:36:27.109Z" }, + { url = "https://files.pythonhosted.org/packages/0f/62/d9c46a7f5c9adbeeeda52f5b8d802e1094e9717705a645efc71b0913a0a8/markupsafe-3.0.3-cp311-cp311-win32.whl", hash = "sha256:0db14f5dafddbb6d9208827849fad01f1a2609380add406671a26386cdf15a19", size = 14572, upload-time = "2025-09-27T18:36:28.045Z" }, + { url = "https://files.pythonhosted.org/packages/83/8a/4414c03d3f891739326e1783338e48fb49781cc915b2e0ee052aa490d586/markupsafe-3.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:de8a88e63464af587c950061a5e6a67d3632e36df62b986892331d4620a35c01", size = 15077, upload-time = "2025-09-27T18:36:29.025Z" }, + { url = "https://files.pythonhosted.org/packages/35/73/893072b42e6862f319b5207adc9ae06070f095b358655f077f69a35601f0/markupsafe-3.0.3-cp311-cp311-win_arm64.whl", hash = "sha256:3b562dd9e9ea93f13d53989d23a7e775fdfd1066c33494ff43f5418bc8c58a5c", size = 13876, upload-time = "2025-09-27T18:36:29.954Z" }, + { url = "https://files.pythonhosted.org/packages/5a/72/147da192e38635ada20e0a2e1a51cf8823d2119ce8883f7053879c2199b5/markupsafe-3.0.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:d53197da72cc091b024dd97249dfc7794d6a56530370992a5e1a08983ad9230e", size = 11615, upload-time = "2025-09-27T18:36:30.854Z" }, + { url = "https://files.pythonhosted.org/packages/9a/81/7e4e08678a1f98521201c3079f77db69fb552acd56067661f8c2f534a718/markupsafe-3.0.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:1872df69a4de6aead3491198eaf13810b565bdbeec3ae2dc8780f14458ec73ce", size = 12020, upload-time = "2025-09-27T18:36:31.971Z" }, + { url = "https://files.pythonhosted.org/packages/1e/2c/799f4742efc39633a1b54a92eec4082e4f815314869865d876824c257c1e/markupsafe-3.0.3-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3a7e8ae81ae39e62a41ec302f972ba6ae23a5c5396c8e60113e9066ef893da0d", size = 24332, upload-time = "2025-09-27T18:36:32.813Z" }, + { url = "https://files.pythonhosted.org/packages/3c/2e/8d0c2ab90a8c1d9a24f0399058ab8519a3279d1bd4289511d74e909f060e/markupsafe-3.0.3-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d6dd0be5b5b189d31db7cda48b91d7e0a9795f31430b7f271219ab30f1d3ac9d", size = 22947, upload-time = "2025-09-27T18:36:33.86Z" }, + { url = "https://files.pythonhosted.org/packages/2c/54/887f3092a85238093a0b2154bd629c89444f395618842e8b0c41783898ea/markupsafe-3.0.3-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:94c6f0bb423f739146aec64595853541634bde58b2135f27f61c1ffd1cd4d16a", size = 21962, upload-time = "2025-09-27T18:36:35.099Z" }, + { url = "https://files.pythonhosted.org/packages/c9/2f/336b8c7b6f4a4d95e91119dc8521402461b74a485558d8f238a68312f11c/markupsafe-3.0.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:be8813b57049a7dc738189df53d69395eba14fb99345e0a5994914a3864c8a4b", size = 23760, upload-time = "2025-09-27T18:36:36.001Z" }, + { url = "https://files.pythonhosted.org/packages/32/43/67935f2b7e4982ffb50a4d169b724d74b62a3964bc1a9a527f5ac4f1ee2b/markupsafe-3.0.3-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:83891d0e9fb81a825d9a6d61e3f07550ca70a076484292a70fde82c4b807286f", size = 21529, upload-time = "2025-09-27T18:36:36.906Z" }, + { url = "https://files.pythonhosted.org/packages/89/e0/4486f11e51bbba8b0c041098859e869e304d1c261e59244baa3d295d47b7/markupsafe-3.0.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:77f0643abe7495da77fb436f50f8dab76dbc6e5fd25d39589a0f1fe6548bfa2b", size = 23015, upload-time = "2025-09-27T18:36:37.868Z" }, + { url = "https://files.pythonhosted.org/packages/2f/e1/78ee7a023dac597a5825441ebd17170785a9dab23de95d2c7508ade94e0e/markupsafe-3.0.3-cp312-cp312-win32.whl", hash = "sha256:d88b440e37a16e651bda4c7c2b930eb586fd15ca7406cb39e211fcff3bf3017d", size = 14540, upload-time = "2025-09-27T18:36:38.761Z" }, + { url = "https://files.pythonhosted.org/packages/aa/5b/bec5aa9bbbb2c946ca2733ef9c4ca91c91b6a24580193e891b5f7dbe8e1e/markupsafe-3.0.3-cp312-cp312-win_amd64.whl", hash = "sha256:26a5784ded40c9e318cfc2bdb30fe164bdb8665ded9cd64d500a34fb42067b1c", size = 15105, upload-time = "2025-09-27T18:36:39.701Z" }, + { url = "https://files.pythonhosted.org/packages/e5/f1/216fc1bbfd74011693a4fd837e7026152e89c4bcf3e77b6692fba9923123/markupsafe-3.0.3-cp312-cp312-win_arm64.whl", hash = "sha256:35add3b638a5d900e807944a078b51922212fb3dedb01633a8defc4b01a3c85f", size = 13906, upload-time = "2025-09-27T18:36:40.689Z" }, +] + +[[package]] +name = "matplotlib" +version = "3.10.8" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "contourpy" }, + { name = "cycler" }, + { name = "fonttools" }, + { name = "kiwisolver" }, + { name = "numpy" }, + { name = "packaging" }, + { name = "pillow" }, + { name = "pyparsing" }, + { name = "python-dateutil" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/8a/76/d3c6e3a13fe484ebe7718d14e269c9569c4eb0020a968a327acb3b9a8fe6/matplotlib-3.10.8.tar.gz", hash = "sha256:2299372c19d56bcd35cf05a2738308758d32b9eaed2371898d8f5bd33f084aa3", size = 34806269, upload-time = "2025-12-10T22:56:51.155Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f8/86/de7e3a1cdcfc941483af70609edc06b83e7c8a0e0dc9ac325200a3f4d220/matplotlib-3.10.8-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:6be43b667360fef5c754dda5d25a32e6307a03c204f3c0fc5468b78fa87b4160", size = 8251215, upload-time = "2025-12-10T22:55:16.175Z" }, + { url = "https://files.pythonhosted.org/packages/fd/14/baad3222f424b19ce6ad243c71de1ad9ec6b2e4eb1e458a48fdc6d120401/matplotlib-3.10.8-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a2b336e2d91a3d7006864e0990c83b216fcdca64b5a6484912902cef87313d78", size = 8139625, upload-time = "2025-12-10T22:55:17.712Z" }, + { url = "https://files.pythonhosted.org/packages/8f/a0/7024215e95d456de5883e6732e708d8187d9753a21d32f8ddb3befc0c445/matplotlib-3.10.8-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:efb30e3baaea72ce5928e32bab719ab4770099079d66726a62b11b1ef7273be4", size = 8712614, upload-time = "2025-12-10T22:55:20.8Z" }, + { url = "https://files.pythonhosted.org/packages/5a/f4/b8347351da9a5b3f41e26cf547252d861f685c6867d179a7c9d60ad50189/matplotlib-3.10.8-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d56a1efd5bfd61486c8bc968fa18734464556f0fb8e51690f4ac25d85cbbbbc2", size = 9540997, upload-time = "2025-12-10T22:55:23.258Z" }, + { url = "https://files.pythonhosted.org/packages/9e/c0/c7b914e297efe0bc36917bf216b2acb91044b91e930e878ae12981e461e5/matplotlib-3.10.8-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:238b7ce5717600615c895050239ec955d91f321c209dd110db988500558e70d6", size = 9596825, upload-time = "2025-12-10T22:55:25.217Z" }, + { url = "https://files.pythonhosted.org/packages/6f/d3/a4bbc01c237ab710a1f22b4da72f4ff6d77eb4c7735ea9811a94ae239067/matplotlib-3.10.8-cp311-cp311-win_amd64.whl", hash = "sha256:18821ace09c763ec93aef5eeff087ee493a24051936d7b9ebcad9662f66501f9", size = 8135090, upload-time = "2025-12-10T22:55:27.162Z" }, + { url = "https://files.pythonhosted.org/packages/89/dd/a0b6588f102beab33ca6f5218b31725216577b2a24172f327eaf6417d5c9/matplotlib-3.10.8-cp311-cp311-win_arm64.whl", hash = "sha256:bab485bcf8b1c7d2060b4fcb6fc368a9e6f4cd754c9c2fea281f4be21df394a2", size = 8012377, upload-time = "2025-12-10T22:55:29.185Z" }, + { url = "https://files.pythonhosted.org/packages/9e/67/f997cdcbb514012eb0d10cd2b4b332667997fb5ebe26b8d41d04962fa0e6/matplotlib-3.10.8-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:64fcc24778ca0404ce0cb7b6b77ae1f4c7231cdd60e6778f999ee05cbd581b9a", size = 8260453, upload-time = "2025-12-10T22:55:30.709Z" }, + { url = "https://files.pythonhosted.org/packages/7e/65/07d5f5c7f7c994f12c768708bd2e17a4f01a2b0f44a1c9eccad872433e2e/matplotlib-3.10.8-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:b9a5ca4ac220a0cdd1ba6bcba3608547117d30468fefce49bb26f55c1a3d5c58", size = 8148321, upload-time = "2025-12-10T22:55:33.265Z" }, + { url = "https://files.pythonhosted.org/packages/3e/f3/c5195b1ae57ef85339fd7285dfb603b22c8b4e79114bae5f4f0fcf688677/matplotlib-3.10.8-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:3ab4aabc72de4ff77b3ec33a6d78a68227bf1123465887f9905ba79184a1cc04", size = 8716944, upload-time = "2025-12-10T22:55:34.922Z" }, + { url = "https://files.pythonhosted.org/packages/00/f9/7638f5cc82ec8a7aa005de48622eecc3ed7c9854b96ba15bd76b7fd27574/matplotlib-3.10.8-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:24d50994d8c5816ddc35411e50a86ab05f575e2530c02752e02538122613371f", size = 9550099, upload-time = "2025-12-10T22:55:36.789Z" }, + { url = "https://files.pythonhosted.org/packages/57/61/78cd5920d35b29fd2a0fe894de8adf672ff52939d2e9b43cb83cd5ce1bc7/matplotlib-3.10.8-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:99eefd13c0dc3b3c1b4d561c1169e65fe47aab7b8158754d7c084088e2329466", size = 9613040, upload-time = "2025-12-10T22:55:38.715Z" }, + { url = "https://files.pythonhosted.org/packages/30/4e/c10f171b6e2f44d9e3a2b96efa38b1677439d79c99357600a62cc1e9594e/matplotlib-3.10.8-cp312-cp312-win_amd64.whl", hash = "sha256:dd80ecb295460a5d9d260df63c43f4afbdd832d725a531f008dad1664f458adf", size = 8142717, upload-time = "2025-12-10T22:55:41.103Z" }, + { url = "https://files.pythonhosted.org/packages/f1/76/934db220026b5fef85f45d51a738b91dea7d70207581063cd9bd8fafcf74/matplotlib-3.10.8-cp312-cp312-win_arm64.whl", hash = "sha256:3c624e43ed56313651bc18a47f838b60d7b8032ed348911c54906b130b20071b", size = 8012751, upload-time = "2025-12-10T22:55:42.684Z" }, + { url = "https://files.pythonhosted.org/packages/04/30/3afaa31c757f34b7725ab9d2ba8b48b5e89c2019c003e7d0ead143aabc5a/matplotlib-3.10.8-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:6da7c2ce169267d0d066adcf63758f0604aa6c3eebf67458930f9d9b79ad1db1", size = 8249198, upload-time = "2025-12-10T22:56:45.584Z" }, + { url = "https://files.pythonhosted.org/packages/48/2f/6334aec331f57485a642a7c8be03cb286f29111ae71c46c38b363230063c/matplotlib-3.10.8-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:9153c3292705be9f9c64498a8872118540c3f4123d1a1c840172edf262c8be4a", size = 8136817, upload-time = "2025-12-10T22:56:47.339Z" }, + { url = "https://files.pythonhosted.org/packages/73/e4/6d6f14b2a759c622f191b2d67e9075a3f56aaccb3be4bb9bb6890030d0a0/matplotlib-3.10.8-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:1ae029229a57cd1e8fe542485f27e7ca7b23aa9e8944ddb4985d0bc444f1eca2", size = 8713867, upload-time = "2025-12-10T22:56:48.954Z" }, +] + +[[package]] +name = "natsort" +version = "8.4.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/e2/a9/a0c57aee75f77794adaf35322f8b6404cbd0f89ad45c87197a937764b7d0/natsort-8.4.0.tar.gz", hash = "sha256:45312c4a0e5507593da193dedd04abb1469253b601ecaf63445ad80f0a1ea581", size = 76575, upload-time = "2023-06-20T04:17:19.925Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ef/82/7a9d0550484a62c6da82858ee9419f3dd1ccc9aa1c26a1e43da3ecd20b0d/natsort-8.4.0-py3-none-any.whl", hash = "sha256:4732914fb471f56b5cce04d7bae6f164a592c7712e1c85f9ef585e197299521c", size = 38268, upload-time = "2023-06-20T04:17:17.522Z" }, +] + +[[package]] +name = "numpy" +version = "2.4.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/24/62/ae72ff66c0f1fd959925b4c11f8c2dea61f47f6acaea75a08512cdfe3fed/numpy-2.4.1.tar.gz", hash = "sha256:a1ceafc5042451a858231588a104093474c6a5c57dcc724841f5c888d237d690", size = 20721320, upload-time = "2026-01-10T06:44:59.619Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a5/34/2b1bc18424f3ad9af577f6ce23600319968a70575bd7db31ce66731bbef9/numpy-2.4.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:0cce2a669e3c8ba02ee563c7835f92c153cf02edff1ae05e1823f1dde21b16a5", size = 16944563, upload-time = "2026-01-10T06:42:14.615Z" }, + { url = "https://files.pythonhosted.org/packages/2c/57/26e5f97d075aef3794045a6ca9eada6a4ed70eb9a40e7a4a93f9ac80d704/numpy-2.4.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:899d2c18024984814ac7e83f8f49d8e8180e2fbe1b2e252f2e7f1d06bea92425", size = 12645658, upload-time = "2026-01-10T06:42:17.298Z" }, + { url = "https://files.pythonhosted.org/packages/8e/ba/80fc0b1e3cb2fd5c6143f00f42eb67762aa043eaa05ca924ecc3222a7849/numpy-2.4.1-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:09aa8a87e45b55a1c2c205d42e2808849ece5c484b2aab11fecabec3841cafba", size = 5474132, upload-time = "2026-01-10T06:42:19.637Z" }, + { url = "https://files.pythonhosted.org/packages/40/ae/0a5b9a397f0e865ec171187c78d9b57e5588afc439a04ba9cab1ebb2c945/numpy-2.4.1-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:edee228f76ee2dab4579fad6f51f6a305de09d444280109e0f75df247ff21501", size = 6804159, upload-time = "2026-01-10T06:42:21.44Z" }, + { url = "https://files.pythonhosted.org/packages/86/9c/841c15e691c7085caa6fd162f063eff494099c8327aeccd509d1ab1e36ab/numpy-2.4.1-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a92f227dbcdc9e4c3e193add1a189a9909947d4f8504c576f4a732fd0b54240a", size = 14708058, upload-time = "2026-01-10T06:42:23.546Z" }, + { url = "https://files.pythonhosted.org/packages/5d/9d/7862db06743f489e6a502a3b93136d73aea27d97b2cf91504f70a27501d6/numpy-2.4.1-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:538bf4ec353709c765ff75ae616c34d3c3dca1a68312727e8f2676ea644f8509", size = 16651501, upload-time = "2026-01-10T06:42:25.909Z" }, + { url = "https://files.pythonhosted.org/packages/a6/9c/6fc34ebcbd4015c6e5f0c0ce38264010ce8a546cb6beacb457b84a75dfc8/numpy-2.4.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:ac08c63cb7779b85e9d5318e6c3518b424bc1f364ac4cb2c6136f12e5ff2dccc", size = 16492627, upload-time = "2026-01-10T06:42:28.938Z" }, + { url = "https://files.pythonhosted.org/packages/aa/63/2494a8597502dacda439f61b3c0db4da59928150e62be0e99395c3ad23c5/numpy-2.4.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:4f9c360ecef085e5841c539a9a12b883dff005fbd7ce46722f5e9cef52634d82", size = 18585052, upload-time = "2026-01-10T06:42:31.312Z" }, + { url = "https://files.pythonhosted.org/packages/6a/93/098e1162ae7522fc9b618d6272b77404c4656c72432ecee3abc029aa3de0/numpy-2.4.1-cp311-cp311-win32.whl", hash = "sha256:0f118ce6b972080ba0758c6087c3617b5ba243d806268623dc34216d69099ba0", size = 6236575, upload-time = "2026-01-10T06:42:33.872Z" }, + { url = "https://files.pythonhosted.org/packages/8c/de/f5e79650d23d9e12f38a7bc6b03ea0835b9575494f8ec94c11c6e773b1b1/numpy-2.4.1-cp311-cp311-win_amd64.whl", hash = "sha256:18e14c4d09d55eef39a6ab5b08406e84bc6869c1e34eef45564804f90b7e0574", size = 12604479, upload-time = "2026-01-10T06:42:35.778Z" }, + { url = "https://files.pythonhosted.org/packages/dd/65/e1097a7047cff12ce3369bd003811516b20ba1078dbdec135e1cd7c16c56/numpy-2.4.1-cp311-cp311-win_arm64.whl", hash = "sha256:6461de5113088b399d655d45c3897fa188766415d0f568f175ab071c8873bd73", size = 10578325, upload-time = "2026-01-10T06:42:38.518Z" }, + { url = "https://files.pythonhosted.org/packages/78/7f/ec53e32bf10c813604edf07a3682616bd931d026fcde7b6d13195dfb684a/numpy-2.4.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:d3703409aac693fa82c0aee023a1ae06a6e9d065dba10f5e8e80f642f1e9d0a2", size = 16656888, upload-time = "2026-01-10T06:42:40.913Z" }, + { url = "https://files.pythonhosted.org/packages/b8/e0/1f9585d7dae8f14864e948fd7fa86c6cb72dee2676ca2748e63b1c5acfe0/numpy-2.4.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:7211b95ca365519d3596a1d8688a95874cc94219d417504d9ecb2df99fa7bfa8", size = 12373956, upload-time = "2026-01-10T06:42:43.091Z" }, + { url = "https://files.pythonhosted.org/packages/8e/43/9762e88909ff2326f5e7536fa8cb3c49fb03a7d92705f23e6e7f553d9cb3/numpy-2.4.1-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:5adf01965456a664fc727ed69cc71848f28d063217c63e1a0e200a118d5eec9a", size = 5202567, upload-time = "2026-01-10T06:42:45.107Z" }, + { url = "https://files.pythonhosted.org/packages/4b/ee/34b7930eb61e79feb4478800a4b95b46566969d837546aa7c034c742ef98/numpy-2.4.1-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:26f0bcd9c79a00e339565b303badc74d3ea2bd6d52191eeca5f95936cad107d0", size = 6549459, upload-time = "2026-01-10T06:42:48.152Z" }, + { url = "https://files.pythonhosted.org/packages/79/e3/5f115fae982565771be994867c89bcd8d7208dbfe9469185497d70de5ddf/numpy-2.4.1-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0093e85df2960d7e4049664b26afc58b03236e967fb942354deef3208857a04c", size = 14404859, upload-time = "2026-01-10T06:42:49.947Z" }, + { url = "https://files.pythonhosted.org/packages/d9/7d/9c8a781c88933725445a859cac5d01b5871588a15969ee6aeb618ba99eee/numpy-2.4.1-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7ad270f438cbdd402c364980317fb6b117d9ec5e226fff5b4148dd9aa9fc6e02", size = 16371419, upload-time = "2026-01-10T06:42:52.409Z" }, + { url = "https://files.pythonhosted.org/packages/a6/d2/8aa084818554543f17cf4162c42f162acbd3bb42688aefdba6628a859f77/numpy-2.4.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:297c72b1b98100c2e8f873d5d35fb551fce7040ade83d67dd51d38c8d42a2162", size = 16182131, upload-time = "2026-01-10T06:42:54.694Z" }, + { url = "https://files.pythonhosted.org/packages/60/db/0425216684297c58a8df35f3284ef56ec4a043e6d283f8a59c53562caf1b/numpy-2.4.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:cf6470d91d34bf669f61d515499859fa7a4c2f7c36434afb70e82df7217933f9", size = 18295342, upload-time = "2026-01-10T06:42:56.991Z" }, + { url = "https://files.pythonhosted.org/packages/31/4c/14cb9d86240bd8c386c881bafbe43f001284b7cce3bc01623ac9475da163/numpy-2.4.1-cp312-cp312-win32.whl", hash = "sha256:b6bcf39112e956594b3331316d90c90c90fb961e39696bda97b89462f5f3943f", size = 5959015, upload-time = "2026-01-10T06:42:59.631Z" }, + { url = "https://files.pythonhosted.org/packages/51/cf/52a703dbeb0c65807540d29699fef5fda073434ff61846a564d5c296420f/numpy-2.4.1-cp312-cp312-win_amd64.whl", hash = "sha256:e1a27bb1b2dee45a2a53f5ca6ff2d1a7f135287883a1689e930d44d1ff296c87", size = 12310730, upload-time = "2026-01-10T06:43:01.627Z" }, + { url = "https://files.pythonhosted.org/packages/69/80/a828b2d0ade5e74a9fe0f4e0a17c30fdc26232ad2bc8c9f8b3197cf7cf18/numpy-2.4.1-cp312-cp312-win_arm64.whl", hash = "sha256:0e6e8f9d9ecf95399982019c01223dc130542960a12edfa8edd1122dfa66a8a8", size = 10312166, upload-time = "2026-01-10T06:43:03.673Z" }, + { url = "https://files.pythonhosted.org/packages/1e/48/d86f97919e79314a1cdee4c832178763e6e98e623e123d0bada19e92c15a/numpy-2.4.1-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:8ad35f20be147a204e28b6a0575fbf3540c5e5f802634d4258d55b1ff5facce1", size = 16822202, upload-time = "2026-01-10T06:44:43.738Z" }, + { url = "https://files.pythonhosted.org/packages/51/e9/1e62a7f77e0f37dcfb0ad6a9744e65df00242b6ea37dfafb55debcbf5b55/numpy-2.4.1-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:8097529164c0f3e32bb89412a0905d9100bf434d9692d9fc275e18dcf53c9344", size = 12569985, upload-time = "2026-01-10T06:44:45.945Z" }, + { url = "https://files.pythonhosted.org/packages/c7/7e/914d54f0c801342306fdcdce3e994a56476f1b818c46c47fc21ae968088c/numpy-2.4.1-pp311-pypy311_pp73-macosx_14_0_arm64.whl", hash = "sha256:ea66d2b41ca4a1630aae5507ee0a71647d3124d1741980138aa8f28f44dac36e", size = 5398484, upload-time = "2026-01-10T06:44:48.012Z" }, + { url = "https://files.pythonhosted.org/packages/1c/d8/9570b68584e293a33474e7b5a77ca404f1dcc655e40050a600dee81d27fb/numpy-2.4.1-pp311-pypy311_pp73-macosx_14_0_x86_64.whl", hash = "sha256:d3f8f0df9f4b8be57b3bf74a1d087fec68f927a2fab68231fdb442bf2c12e426", size = 6713216, upload-time = "2026-01-10T06:44:49.725Z" }, + { url = "https://files.pythonhosted.org/packages/33/9b/9dd6e2db8d49eb24f86acaaa5258e5f4c8ed38209a4ee9de2d1a0ca25045/numpy-2.4.1-pp311-pypy311_pp73-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2023ef86243690c2791fd6353e5b4848eedaa88ca8a2d129f462049f6d484696", size = 14538937, upload-time = "2026-01-10T06:44:51.498Z" }, + { url = "https://files.pythonhosted.org/packages/53/87/d5bd995b0f798a37105b876350d346eea5838bd8f77ea3d7a48392f3812b/numpy-2.4.1-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8361ea4220d763e54cff2fbe7d8c93526b744f7cd9ddab47afeff7e14e8503be", size = 16479830, upload-time = "2026-01-10T06:44:53.931Z" }, + { url = "https://files.pythonhosted.org/packages/5b/c7/b801bf98514b6ae6475e941ac05c58e6411dd863ea92916bfd6d510b08c1/numpy-2.4.1-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:4f1b68ff47680c2925f8063402a693ede215f0257f02596b1318ecdfb1d79e33", size = 12492579, upload-time = "2026-01-10T06:44:57.094Z" }, +] + +[[package]] +name = "opendbc" +version = "0.2.1" +source = { editable = "." } +dependencies = [ + { name = "crcmod-plus" }, + { name = "numpy" }, + { name = "pycapnp" }, + { name = "pycryptodome" }, + { name = "scons" }, + { name = "tqdm" }, +] + +[package.optional-dependencies] +docs = [ + { name = "jinja2" }, + { name = "natsort" }, +] +examples = [ + { name = "inputs" }, + { name = "matplotlib" }, +] +testing = [ + { name = "cffi" }, + { name = "codespell" }, + { name = "comma-car-segments" }, + { name = "cpplint" }, + { name = "gcovr" }, + { name = "hypothesis" }, + { name = "lefthook" }, + { name = "parameterized" }, + { name = "pytest" }, + { name = "pytest-coverage" }, + { name = "pytest-mock" }, + { name = "pytest-randomly" }, + { name = "pytest-subtests" }, + { name = "pytest-xdist" }, + { name = "ruff" }, + { name = "ty" }, + { name = "zstandard" }, +] + +[package.metadata] +requires-dist = [ + { name = "cffi", marker = "extra == 'testing'" }, + { name = "codespell", marker = "extra == 'testing'" }, + { name = "comma-car-segments", marker = "extra == 'testing'", url = "https://huggingface.co/datasets/commaai/commaCarSegments/resolve/main/dist/comma_car_segments-0.1.0-py3-none-any.whl" }, + { name = "cpplint", marker = "extra == 'testing'" }, + { name = "crcmod-plus" }, + { name = "gcovr", marker = "extra == 'testing'" }, + { name = "hypothesis", marker = "extra == 'testing'", specifier = "==6.47.*" }, + { name = "inputs", marker = "extra == 'examples'" }, + { name = "jinja2", marker = "extra == 'docs'" }, + { name = "lefthook", marker = "extra == 'testing'" }, + { name = "matplotlib", marker = "extra == 'examples'" }, + { name = "natsort", marker = "extra == 'docs'" }, + { name = "numpy" }, + { name = "parameterized", marker = "extra == 'testing'", specifier = ">=0.8,<0.9" }, + { name = "pycapnp", specifier = "==2.1.0" }, + { name = "pycryptodome" }, + { name = "pytest", marker = "extra == 'testing'", specifier = "==8.4.2" }, + { name = "pytest-coverage", marker = "extra == 'testing'" }, + { name = "pytest-mock", marker = "extra == 'testing'" }, + { name = "pytest-randomly", marker = "extra == 'testing'" }, + { name = "pytest-subtests", marker = "extra == 'testing'" }, + { name = "pytest-xdist", marker = "extra == 'testing'", git = "https://github.com/sshane/pytest-xdist?rev=2b4372bd62699fb412c4fe2f95bf9f01bd2018da" }, + { name = "ruff", marker = "extra == 'testing'" }, + { name = "scons" }, + { name = "tqdm" }, + { name = "ty", marker = "extra == 'testing'" }, + { name = "zstandard", marker = "extra == 'testing'" }, +] +provides-extras = ["testing", "docs", "examples"] + +[[package]] +name = "packaging" +version = "25.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/a1/d4/1fc4078c65507b51b96ca8f8c3ba19e6a61c8253c72794544580a7b6c24d/packaging-25.0.tar.gz", hash = "sha256:d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f", size = 165727, upload-time = "2025-04-19T11:48:59.673Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/20/12/38679034af332785aac8774540895e234f4d07f7545804097de4b666afd8/packaging-25.0-py3-none-any.whl", hash = "sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484", size = 66469, upload-time = "2025-04-19T11:48:57.875Z" }, +] + +[[package]] +name = "parameterized" +version = "0.8.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/c6/23/2288f308d238b4f261c039cafcd650435d624de97c6ffc903f06ea8af50f/parameterized-0.8.1.tar.gz", hash = "sha256:41bbff37d6186430f77f900d777e5bb6a24928a1c46fb1de692f8b52b8833b5c", size = 23936, upload-time = "2021-01-09T20:35:18.235Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/31/13/fe468c8c7400a8eca204e6e160a29bf7dcd45a76e20f1c030f3eaa690d93/parameterized-0.8.1-py2.py3-none-any.whl", hash = "sha256:9cbb0b69a03e8695d68b3399a8a5825200976536fe1cb79db60ed6a4c8c9efe9", size = 26354, upload-time = "2021-01-09T20:35:16.307Z" }, +] + +[[package]] +name = "pillow" +version = "12.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d0/02/d52c733a2452ef1ffcc123b68e6606d07276b0e358db70eabad7e40042b7/pillow-12.1.0.tar.gz", hash = "sha256:5c5ae0a06e9ea030ab786b0251b32c7e4ce10e58d983c0d5c56029455180b5b9", size = 46977283, upload-time = "2026-01-02T09:13:29.892Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/43/c4/bf8328039de6cc22182c3ef007a2abfbbdab153661c0a9aa78af8d706391/pillow-12.1.0-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:a83e0850cb8f5ac975291ebfc4170ba481f41a28065277f7f735c202cd8e0af3", size = 5304057, upload-time = "2026-01-02T09:10:46.627Z" }, + { url = "https://files.pythonhosted.org/packages/43/06/7264c0597e676104cc22ca73ee48f752767cd4b1fe084662620b17e10120/pillow-12.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:b6e53e82ec2db0717eabb276aa56cf4e500c9a7cec2c2e189b55c24f65a3e8c0", size = 4657811, upload-time = "2026-01-02T09:10:49.548Z" }, + { url = "https://files.pythonhosted.org/packages/72/64/f9189e44474610daf83da31145fa56710b627b5c4c0b9c235e34058f6b31/pillow-12.1.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:40a8e3b9e8773876d6e30daed22f016509e3987bab61b3b7fe309d7019a87451", size = 6232243, upload-time = "2026-01-02T09:10:51.62Z" }, + { url = "https://files.pythonhosted.org/packages/ef/30/0df458009be6a4caca4ca2c52975e6275c387d4e5c95544e34138b41dc86/pillow-12.1.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:800429ac32c9b72909c671aaf17ecd13110f823ddb7db4dfef412a5587c2c24e", size = 8037872, upload-time = "2026-01-02T09:10:53.446Z" }, + { url = "https://files.pythonhosted.org/packages/e4/86/95845d4eda4f4f9557e25381d70876aa213560243ac1a6d619c46caaedd9/pillow-12.1.0-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0b022eaaf709541b391ee069f0022ee5b36c709df71986e3f7be312e46f42c84", size = 6345398, upload-time = "2026-01-02T09:10:55.426Z" }, + { url = "https://files.pythonhosted.org/packages/5c/1f/8e66ab9be3aaf1435bc03edd1ebdf58ffcd17f7349c1d970cafe87af27d9/pillow-12.1.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1f345e7bc9d7f368887c712aa5054558bad44d2a301ddf9248599f4161abc7c0", size = 7034667, upload-time = "2026-01-02T09:10:57.11Z" }, + { url = "https://files.pythonhosted.org/packages/f9/f6/683b83cb9b1db1fb52b87951b1c0b99bdcfceaa75febf11406c19f82cb5e/pillow-12.1.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:d70347c8a5b7ccd803ec0c85c8709f036e6348f1e6a5bf048ecd9c64d3550b8b", size = 6458743, upload-time = "2026-01-02T09:10:59.331Z" }, + { url = "https://files.pythonhosted.org/packages/9a/7d/de833d63622538c1d58ce5395e7c6cb7e7dce80decdd8bde4a484e095d9f/pillow-12.1.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:1fcc52d86ce7a34fd17cb04e87cfdb164648a3662a6f20565910a99653d66c18", size = 7159342, upload-time = "2026-01-02T09:11:01.82Z" }, + { url = "https://files.pythonhosted.org/packages/8c/40/50d86571c9e5868c42b81fe7da0c76ca26373f3b95a8dd675425f4a92ec1/pillow-12.1.0-cp311-cp311-win32.whl", hash = "sha256:3ffaa2f0659e2f740473bcf03c702c39a8d4b2b7ffc629052028764324842c64", size = 6328655, upload-time = "2026-01-02T09:11:04.556Z" }, + { url = "https://files.pythonhosted.org/packages/6c/af/b1d7e301c4cd26cd45d4af884d9ee9b6fab893b0ad2450d4746d74a6968c/pillow-12.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:806f3987ffe10e867bab0ddad45df1148a2b98221798457fa097ad85d6e8bc75", size = 7031469, upload-time = "2026-01-02T09:11:06.538Z" }, + { url = "https://files.pythonhosted.org/packages/48/36/d5716586d887fb2a810a4a61518a327a1e21c8b7134c89283af272efe84b/pillow-12.1.0-cp311-cp311-win_arm64.whl", hash = "sha256:9f5fefaca968e700ad1a4a9de98bf0869a94e397fe3524c4c9450c1445252304", size = 2452515, upload-time = "2026-01-02T09:11:08.226Z" }, + { url = "https://files.pythonhosted.org/packages/20/31/dc53fe21a2f2996e1b7d92bf671cdb157079385183ef7c1ae08b485db510/pillow-12.1.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:a332ac4ccb84b6dde65dbace8431f3af08874bf9770719d32a635c4ef411b18b", size = 5262642, upload-time = "2026-01-02T09:11:10.138Z" }, + { url = "https://files.pythonhosted.org/packages/ab/c1/10e45ac9cc79419cedf5121b42dcca5a50ad2b601fa080f58c22fb27626e/pillow-12.1.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:907bfa8a9cb790748a9aa4513e37c88c59660da3bcfffbd24a7d9e6abf224551", size = 4657464, upload-time = "2026-01-02T09:11:12.319Z" }, + { url = "https://files.pythonhosted.org/packages/ad/26/7b82c0ab7ef40ebede7a97c72d473bda5950f609f8e0c77b04af574a0ddb/pillow-12.1.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:efdc140e7b63b8f739d09a99033aa430accce485ff78e6d311973a67b6bf3208", size = 6234878, upload-time = "2026-01-02T09:11:14.096Z" }, + { url = "https://files.pythonhosted.org/packages/76/25/27abc9792615b5e886ca9411ba6637b675f1b77af3104710ac7353fe5605/pillow-12.1.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:bef9768cab184e7ae6e559c032e95ba8d07b3023c289f79a2bd36e8bf85605a5", size = 8044868, upload-time = "2026-01-02T09:11:15.903Z" }, + { url = "https://files.pythonhosted.org/packages/0a/ea/f200a4c36d836100e7bc738fc48cd963d3ba6372ebc8298a889e0cfc3359/pillow-12.1.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:742aea052cf5ab5034a53c3846165bc3ce88d7c38e954120db0ab867ca242661", size = 6349468, upload-time = "2026-01-02T09:11:17.631Z" }, + { url = "https://files.pythonhosted.org/packages/11/8f/48d0b77ab2200374c66d344459b8958c86693be99526450e7aee714e03e4/pillow-12.1.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a6dfc2af5b082b635af6e08e0d1f9f1c4e04d17d4e2ca0ef96131e85eda6eb17", size = 7041518, upload-time = "2026-01-02T09:11:19.389Z" }, + { url = "https://files.pythonhosted.org/packages/1d/23/c281182eb986b5d31f0a76d2a2c8cd41722d6fb8ed07521e802f9bba52de/pillow-12.1.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:609e89d9f90b581c8d16358c9087df76024cf058fa693dd3e1e1620823f39670", size = 6462829, upload-time = "2026-01-02T09:11:21.28Z" }, + { url = "https://files.pythonhosted.org/packages/25/ef/7018273e0faac099d7b00982abdcc39142ae6f3bd9ceb06de09779c4a9d6/pillow-12.1.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:43b4899cfd091a9693a1278c4982f3e50f7fb7cff5153b05174b4afc9593b616", size = 7166756, upload-time = "2026-01-02T09:11:23.559Z" }, + { url = "https://files.pythonhosted.org/packages/8f/c8/993d4b7ab2e341fe02ceef9576afcf5830cdec640be2ac5bee1820d693d4/pillow-12.1.0-cp312-cp312-win32.whl", hash = "sha256:aa0c9cc0b82b14766a99fbe6084409972266e82f459821cd26997a488a7261a7", size = 6328770, upload-time = "2026-01-02T09:11:25.661Z" }, + { url = "https://files.pythonhosted.org/packages/a7/87/90b358775a3f02765d87655237229ba64a997b87efa8ccaca7dd3e36e7a7/pillow-12.1.0-cp312-cp312-win_amd64.whl", hash = "sha256:d70534cea9e7966169ad29a903b99fc507e932069a881d0965a1a84bb57f6c6d", size = 7033406, upload-time = "2026-01-02T09:11:27.474Z" }, + { url = "https://files.pythonhosted.org/packages/5d/cf/881b457eccacac9e5b2ddd97d5071fb6d668307c57cbf4e3b5278e06e536/pillow-12.1.0-cp312-cp312-win_arm64.whl", hash = "sha256:65b80c1ee7e14a87d6a068dd3b0aea268ffcabfe0498d38661b00c5b4b22e74c", size = 2452612, upload-time = "2026-01-02T09:11:29.309Z" }, + { url = "https://files.pythonhosted.org/packages/8b/bc/224b1d98cffd7164b14707c91aac83c07b047fbd8f58eba4066a3e53746a/pillow-12.1.0-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:ca94b6aac0d7af2a10ba08c0f888b3d5114439b6b3ef39968378723622fed377", size = 5228605, upload-time = "2026-01-02T09:13:14.084Z" }, + { url = "https://files.pythonhosted.org/packages/0c/ca/49ca7769c4550107de049ed85208240ba0f330b3f2e316f24534795702ce/pillow-12.1.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:351889afef0f485b84078ea40fe33727a0492b9af3904661b0abbafee0355b72", size = 4622245, upload-time = "2026-01-02T09:13:15.964Z" }, + { url = "https://files.pythonhosted.org/packages/73/48/fac807ce82e5955bcc2718642b94b1bd22a82a6d452aea31cbb678cddf12/pillow-12.1.0-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:bb0984b30e973f7e2884362b7d23d0a348c7143ee559f38ef3eaab640144204c", size = 5247593, upload-time = "2026-01-02T09:13:17.913Z" }, + { url = "https://files.pythonhosted.org/packages/d2/95/3e0742fe358c4664aed4fd05d5f5373dcdad0b27af52aa0972568541e3f4/pillow-12.1.0-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:84cabc7095dd535ca934d57e9ce2a72ffd216e435a84acb06b2277b1de2689bd", size = 6989008, upload-time = "2026-01-02T09:13:20.083Z" }, + { url = "https://files.pythonhosted.org/packages/5a/74/fe2ac378e4e202e56d50540d92e1ef4ff34ed687f3c60f6a121bcf99437e/pillow-12.1.0-pp311-pypy311_pp73-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:53d8b764726d3af1a138dd353116f774e3862ec7e3794e0c8781e30db0f35dfc", size = 5313824, upload-time = "2026-01-02T09:13:22.405Z" }, + { url = "https://files.pythonhosted.org/packages/f3/77/2a60dee1adee4e2655ac328dd05c02a955c1cd683b9f1b82ec3feb44727c/pillow-12.1.0-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5da841d81b1a05ef940a8567da92decaa15bc4d7dedb540a8c219ad83d91808a", size = 5963278, upload-time = "2026-01-02T09:13:24.706Z" }, + { url = "https://files.pythonhosted.org/packages/2d/71/64e9b1c7f04ae0027f788a248e6297d7fcc29571371fe7d45495a78172c0/pillow-12.1.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:75af0b4c229ac519b155028fa1be632d812a519abba9b46b20e50c6caa184f19", size = 7029809, upload-time = "2026-01-02T09:13:26.541Z" }, +] + +[[package]] +name = "pluggy" +version = "1.6.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f9/e2/3e91f31a7d2b083fe6ef3fa267035b518369d9511ffab804f839851d2779/pluggy-1.6.0.tar.gz", hash = "sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3", size = 69412, upload-time = "2025-05-15T12:30:07.975Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/54/20/4d324d65cc6d9205fabedc306948156824eb9f0ee1633355a8f7ec5c66bf/pluggy-1.6.0-py3-none-any.whl", hash = "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746", size = 20538, upload-time = "2025-05-15T12:30:06.134Z" }, +] + +[[package]] +name = "pycapnp" +version = "2.1.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/15/86/a57e3c92acd3e1d2fc3dcad683ada191f722e4ac927e1a384b228ec2780a/pycapnp-2.1.0.tar.gz", hash = "sha256:69cc3d861fee1c9b26c73ad2e8a5d51e76ad87e4ff9be33a4fd2fc72f5846aec", size = 689734, upload-time = "2025-09-05T03:50:40.851Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/68/7c/934750a0ca77431a22e68e11521dcc6b801bea3ff37331d6a519e5ad142e/pycapnp-2.1.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:efacc439ec287d9e8a0ebf01a515404eff795659401e65ba6f1819c7b24f4380", size = 1628855, upload-time = "2025-09-05T03:48:32.317Z" }, + { url = "https://files.pythonhosted.org/packages/2e/a2/fd2c10b3f2e5010c747aa946b27fe09f665d65d5dc2afdd31838a3ef2f5d/pycapnp-2.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f3d8af535a8b44dfd71731a191386c6b821b8a4915806948893d18c79f547a8e", size = 1496942, upload-time = "2025-09-05T03:48:34.905Z" }, + { url = "https://files.pythonhosted.org/packages/0b/8a/42bd0e4c094ef534ac6890d34adae580cbbf5b0497fc0a6340bea833a617/pycapnp-2.1.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:117d1d5ebfc08cc189aca4f771b34fedc1291a3f9417167bd2d9b2a4e607e640", size = 5200170, upload-time = "2025-09-05T03:48:36.502Z" }, + { url = "https://files.pythonhosted.org/packages/af/30/2e92268383135082191c3dea4a9ad184d20b7fb2dda1477fd6ee520fd88e/pycapnp-2.1.0-cp311-cp311-manylinux_2_28_ppc64le.whl", hash = "sha256:d881ccc69e381863a88c7b6c7092a6baecb6dfc8c5558d66bc967c7f778fe7bc", size = 5684026, upload-time = "2025-09-05T03:48:38.063Z" }, + { url = "https://files.pythonhosted.org/packages/46/9c/bca1cbd7711c9c0f0f62ca95a49835369a61c4f6527a6900c8982045bf2f/pycapnp-2.1.0-cp311-cp311-manylinux_2_28_s390x.whl", hash = "sha256:8a4ea330e38ba83f6f03fbdc1f58642eb53e6f6f66734a426fa592dc988d70e9", size = 5709307, upload-time = "2025-09-05T03:48:40.127Z" }, + { url = "https://files.pythonhosted.org/packages/2d/29/cd14676d992c7b166baa7e022b369c15240d408b202410d105b23b25f737/pycapnp-2.1.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:fb2563de4619d359820de9d47b4704e4f7eda193ffc4a56e39cdcd2c8301c336", size = 5386505, upload-time = "2025-09-05T03:48:41.785Z" }, + { url = "https://files.pythonhosted.org/packages/ae/dd/2fc57cebe9be7e4cd3d6aec0b9c8a0db9772c1b17c37cfe4f04c050422cf/pycapnp-2.1.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:5265d1ae34f9c089fa6983f6c1be404ce480c82b927017290bd703328fa3f5df", size = 6095180, upload-time = "2025-09-05T03:48:43.795Z" }, + { url = "https://files.pythonhosted.org/packages/5a/16/da8c1ada7770a532c859df475533eec5a1b2f5e81a269466a2fe670c5747/pycapnp-2.1.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:b0a56370a868f752375a785bfb7e06b55cbe71605972615d1220c380bc452380", size = 6603414, upload-time = "2025-09-05T03:48:45.457Z" }, + { url = "https://files.pythonhosted.org/packages/f0/e6/a36eacaf2da6a5ac9c6565600e559edf95115ff990aa3379aee8dd7ba4fe/pycapnp-2.1.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:5d7403c25275cf4badf6f9d0c07b1cb94fcdd599df81aba9b621c32b3dcefae9", size = 6621440, upload-time = "2025-09-05T03:48:47.706Z" }, + { url = "https://files.pythonhosted.org/packages/81/54/9150c03638cf4ecdf1664867382d0049146c658d6de30f189817c502df1a/pycapnp-2.1.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:dea5d0d250fe4851b42cd380a207d773ebae76a990e542a888a5f1442f4c247e", size = 6354219, upload-time = "2025-09-05T03:48:49.336Z" }, + { url = "https://files.pythonhosted.org/packages/66/3e/e49ba2d74456d53b570c8d30a660c3b29ecfea075d5dd663132ff9049f19/pycapnp-2.1.0-cp311-cp311-win32.whl", hash = "sha256:593844c3cd92937eb5e7cd47ea3a62cde2d49a1fc05dba644f513c68f60f1318", size = 1053647, upload-time = "2025-09-05T03:48:51.108Z" }, + { url = "https://files.pythonhosted.org/packages/53/de/2b61908dc6abf25b17fed6b5a3b42a2226ec09467a3944f1d845ac29ef9b/pycapnp-2.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:ac13dd30062bb9985ae9ec4feca106af2b4fdac6468a09c7b74ad754f3921a06", size = 1208911, upload-time = "2025-09-05T03:48:53.219Z" }, + { url = "https://files.pythonhosted.org/packages/74/0e/66b41ba600e5f2523e900b7cc0d2e8496b397a1f2d6a5b7b323ab83418b7/pycapnp-2.1.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:2d2ec561bc948d11f64f43bf9601bede5d6a603d105ae311bd5583c7130624a4", size = 1619223, upload-time = "2025-09-05T03:48:54.64Z" }, + { url = "https://files.pythonhosted.org/packages/40/6e/9bcb30180bd40cb0534124ff7f8ba8746a735018d593f608bf40c97821c0/pycapnp-2.1.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:132cd97f57f6b6636323ca9b68d389dd90b96e87af38cde31e2b5c5a064f277e", size = 1484321, upload-time = "2025-09-05T03:48:55.85Z" }, + { url = "https://files.pythonhosted.org/packages/14/0a/9ee1c9ecaff499e4fd1df2f0335bc20f666ec6ce5cd80f8ab055007f3c9b/pycapnp-2.1.0-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:568e79268ba7c02a71fe558a8aec1ae3c0f0e6aff809ff618a46afe4964957d2", size = 5143502, upload-time = "2025-09-05T03:48:57.733Z" }, + { url = "https://files.pythonhosted.org/packages/4d/50/65837e1416f7a8861ca1e8fe4582a5aef37192d7ef5e2ecfe46880bfdf9c/pycapnp-2.1.0-cp312-cp312-manylinux_2_28_ppc64le.whl", hash = "sha256:bcbf6f882d78d368c8e4bb792295392f5c4d71ddffa13a48da27e7bd47b99e37", size = 5508134, upload-time = "2025-09-05T03:48:59.383Z" }, + { url = "https://files.pythonhosted.org/packages/a1/59/46df6db800e77dbc3cc940723fb3fd7bc837327c858edf464a0f904bf547/pycapnp-2.1.0-cp312-cp312-manylinux_2_28_s390x.whl", hash = "sha256:dc25b96e393410dde25c61c1df3ce644700ef94826c829426d58c2c6b3e2d2f5", size = 5631794, upload-time = "2025-09-05T03:49:03.511Z" }, + { url = "https://files.pythonhosted.org/packages/63/9d/18e978500d5f6bd8d152f4d6919e3cfb83ead8a71c14613bbb54322df8b9/pycapnp-2.1.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:48938e0436ab1be615fc0a41434119a2065490a6212b9a5e56949e89b0588b76", size = 5369378, upload-time = "2025-09-05T03:49:05.539Z" }, + { url = "https://files.pythonhosted.org/packages/96/dc/726f1917e9996dc29f9fd1cf30674a14546cdbdfa0777e1982b6bd1ad628/pycapnp-2.1.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:0c20de0f6e0b3fa9fa1df3864cf46051db3511b63bc29514d1092af65f2b82a0", size = 5999140, upload-time = "2025-09-05T03:49:07.341Z" }, + { url = "https://files.pythonhosted.org/packages/fd/3a/3bbc4c5776fc32fbf8a59df5c7c5810efd292b933cd6545eb4b16d896268/pycapnp-2.1.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:18caca6527862475167c10ea0809531130585aa8a86cc76cd1629eb87ee30637", size = 6454308, upload-time = "2025-09-05T03:49:08.998Z" }, + { url = "https://files.pythonhosted.org/packages/bf/dd/17e2d7808424f10ffddc47329b980488ed83ec716c504791787e593a7a93/pycapnp-2.1.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:9dcc11237697007b66e3bfc500d2ad892bd79672c9b50d61fbf728c6aaf936de", size = 6544212, upload-time = "2025-09-05T03:49:10.675Z" }, + { url = "https://files.pythonhosted.org/packages/6a/5b/68090013128d7853f34c43828dd4dc80a7c8516fd1b56057b134e1e4c2c0/pycapnp-2.1.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:c151edf78155b6416e7cb31e2e333d302d742ba52bb37d4dbdf71e75cc999d46", size = 6295279, upload-time = "2025-09-05T03:49:12.712Z" }, + { url = "https://files.pythonhosted.org/packages/5b/52/7d85212b4fcf127588888f71d3dbf5558ee7dc302eba760b12b1b325f9a3/pycapnp-2.1.0-cp312-cp312-win32.whl", hash = "sha256:c09b28419321dafafc644d60c57ff8ccaf3c3e686801b6060c612a7a3c580944", size = 1038995, upload-time = "2025-09-05T03:49:14.165Z" }, + { url = "https://files.pythonhosted.org/packages/f2/12/25d283ebf5c28717364647672e7494dc46196ca7a662f5420e4866f45687/pycapnp-2.1.0-cp312-cp312-win_amd64.whl", hash = "sha256:560cb69cc02b0347e85b0629e4c2f0a316240900aa905392f9df6bab0a359989", size = 1176620, upload-time = "2025-09-05T03:49:15.545Z" }, +] + +[[package]] +name = "pycparser" +version = "2.23" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/fe/cf/d2d3b9f5699fb1e4615c8e32ff220203e43b248e1dfcc6736ad9057731ca/pycparser-2.23.tar.gz", hash = "sha256:78816d4f24add8f10a06d6f05b4d424ad9e96cfebf68a4ddc99c65c0720d00c2", size = 173734, upload-time = "2025-09-09T13:23:47.91Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a0/e3/59cd50310fc9b59512193629e1984c1f95e5c8ae6e5d8c69532ccc65a7fe/pycparser-2.23-py3-none-any.whl", hash = "sha256:e5c6e8d3fbad53479cab09ac03729e0a9faf2bee3db8208a550daf5af81a5934", size = 118140, upload-time = "2025-09-09T13:23:46.651Z" }, +] + +[[package]] +name = "pycryptodome" +version = "3.23.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/8e/a6/8452177684d5e906854776276ddd34eca30d1b1e15aa1ee9cefc289a33f5/pycryptodome-3.23.0.tar.gz", hash = "sha256:447700a657182d60338bab09fdb27518f8856aecd80ae4c6bdddb67ff5da44ef", size = 4921276, upload-time = "2025-05-17T17:21:45.242Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/db/6c/a1f71542c969912bb0e106f64f60a56cc1f0fabecf9396f45accbe63fa68/pycryptodome-3.23.0-cp37-abi3-macosx_10_9_universal2.whl", hash = "sha256:187058ab80b3281b1de11c2e6842a357a1f71b42cb1e15bce373f3d238135c27", size = 2495627, upload-time = "2025-05-17T17:20:47.139Z" }, + { url = "https://files.pythonhosted.org/packages/6e/4e/a066527e079fc5002390c8acdd3aca431e6ea0a50ffd7201551175b47323/pycryptodome-3.23.0-cp37-abi3-macosx_10_9_x86_64.whl", hash = "sha256:cfb5cd445280c5b0a4e6187a7ce8de5a07b5f3f897f235caa11f1f435f182843", size = 1640362, upload-time = "2025-05-17T17:20:50.392Z" }, + { url = "https://files.pythonhosted.org/packages/50/52/adaf4c8c100a8c49d2bd058e5b551f73dfd8cb89eb4911e25a0c469b6b4e/pycryptodome-3.23.0-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:67bd81fcbe34f43ad9422ee8fd4843c8e7198dd88dd3d40e6de42ee65fbe1490", size = 2182625, upload-time = "2025-05-17T17:20:52.866Z" }, + { url = "https://files.pythonhosted.org/packages/5f/e9/a09476d436d0ff1402ac3867d933c61805ec2326c6ea557aeeac3825604e/pycryptodome-3.23.0-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c8987bd3307a39bc03df5c8e0e3d8be0c4c3518b7f044b0f4c15d1aa78f52575", size = 2268954, upload-time = "2025-05-17T17:20:55.027Z" }, + { url = "https://files.pythonhosted.org/packages/f9/c5/ffe6474e0c551d54cab931918127c46d70cab8f114e0c2b5a3c071c2f484/pycryptodome-3.23.0-cp37-abi3-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:aa0698f65e5b570426fc31b8162ed4603b0c2841cbb9088e2b01641e3065915b", size = 2308534, upload-time = "2025-05-17T17:20:57.279Z" }, + { url = "https://files.pythonhosted.org/packages/18/28/e199677fc15ecf43010f2463fde4c1a53015d1fe95fb03bca2890836603a/pycryptodome-3.23.0-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:53ecbafc2b55353edcebd64bf5da94a2a2cdf5090a6915bcca6eca6cc452585a", size = 2181853, upload-time = "2025-05-17T17:20:59.322Z" }, + { url = "https://files.pythonhosted.org/packages/ce/ea/4fdb09f2165ce1365c9eaefef36625583371ee514db58dc9b65d3a255c4c/pycryptodome-3.23.0-cp37-abi3-musllinux_1_2_i686.whl", hash = "sha256:156df9667ad9f2ad26255926524e1c136d6664b741547deb0a86a9acf5ea631f", size = 2342465, upload-time = "2025-05-17T17:21:03.83Z" }, + { url = "https://files.pythonhosted.org/packages/22/82/6edc3fc42fe9284aead511394bac167693fb2b0e0395b28b8bedaa07ef04/pycryptodome-3.23.0-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:dea827b4d55ee390dc89b2afe5927d4308a8b538ae91d9c6f7a5090f397af1aa", size = 2267414, upload-time = "2025-05-17T17:21:06.72Z" }, + { url = "https://files.pythonhosted.org/packages/59/fe/aae679b64363eb78326c7fdc9d06ec3de18bac68be4b612fc1fe8902693c/pycryptodome-3.23.0-cp37-abi3-win32.whl", hash = "sha256:507dbead45474b62b2bbe318eb1c4c8ee641077532067fec9c1aa82c31f84886", size = 1768484, upload-time = "2025-05-17T17:21:08.535Z" }, + { url = "https://files.pythonhosted.org/packages/54/2f/e97a1b8294db0daaa87012c24a7bb714147c7ade7656973fd6c736b484ff/pycryptodome-3.23.0-cp37-abi3-win_amd64.whl", hash = "sha256:c75b52aacc6c0c260f204cbdd834f76edc9fb0d8e0da9fbf8352ef58202564e2", size = 1799636, upload-time = "2025-05-17T17:21:10.393Z" }, + { url = "https://files.pythonhosted.org/packages/18/3d/f9441a0d798bf2b1e645adc3265e55706aead1255ccdad3856dbdcffec14/pycryptodome-3.23.0-cp37-abi3-win_arm64.whl", hash = "sha256:11eeeb6917903876f134b56ba11abe95c0b0fd5e3330def218083c7d98bbcb3c", size = 1703675, upload-time = "2025-05-17T17:21:13.146Z" }, +] + +[[package]] +name = "pygments" +version = "2.19.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/b0/77/a5b8c569bf593b0140bde72ea885a803b82086995367bf2037de0159d924/pygments-2.19.2.tar.gz", hash = "sha256:636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887", size = 4968631, upload-time = "2025-06-21T13:39:12.283Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c7/21/705964c7812476f378728bdf590ca4b771ec72385c533964653c68e86bdc/pygments-2.19.2-py3-none-any.whl", hash = "sha256:86540386c03d588bb81d44bc3928634ff26449851e99741617ecb9037ee5ec0b", size = 1225217, upload-time = "2025-06-21T13:39:07.939Z" }, +] + +[[package]] +name = "pyparsing" +version = "3.3.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/33/c1/1d9de9aeaa1b89b0186e5fe23294ff6517fce1bc69149185577cd31016b2/pyparsing-3.3.1.tar.gz", hash = "sha256:47fad0f17ac1e2cad3de3b458570fbc9b03560aa029ed5e16ee5554da9a2251c", size = 1550512, upload-time = "2025-12-23T03:14:04.391Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/8b/40/2614036cdd416452f5bf98ec037f38a1afb17f327cb8e6b652d4729e0af8/pyparsing-3.3.1-py3-none-any.whl", hash = "sha256:023b5e7e5520ad96642e2c6db4cb683d3970bd640cdf7115049a6e9c3682df82", size = 121793, upload-time = "2025-12-23T03:14:02.103Z" }, +] + +[[package]] +name = "pytest" +version = "8.4.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "colorama", marker = "sys_platform == 'win32'" }, + { name = "iniconfig" }, + { name = "packaging" }, + { name = "pluggy" }, + { name = "pygments" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/a3/5c/00a0e072241553e1a7496d638deababa67c5058571567b92a7eaa258397c/pytest-8.4.2.tar.gz", hash = "sha256:86c0d0b93306b961d58d62a4db4879f27fe25513d4b969df351abdddb3c30e01", size = 1519618, upload-time = "2025-09-04T14:34:22.711Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a8/a4/20da314d277121d6534b3a980b29035dcd51e6744bd79075a6ce8fa4eb8d/pytest-8.4.2-py3-none-any.whl", hash = "sha256:872f880de3fc3a5bdc88a11b39c9710c3497a547cfa9320bc3c5e62fbf272e79", size = 365750, upload-time = "2025-09-04T14:34:20.226Z" }, +] + +[[package]] +name = "pytest-cov" +version = "7.0.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "coverage", extra = ["toml"] }, + { name = "pluggy" }, + { name = "pytest" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/5e/f7/c933acc76f5208b3b00089573cf6a2bc26dc80a8aece8f52bb7d6b1855ca/pytest_cov-7.0.0.tar.gz", hash = "sha256:33c97eda2e049a0c5298e91f519302a1334c26ac65c1a483d6206fd458361af1", size = 54328, upload-time = "2025-09-09T10:57:02.113Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ee/49/1377b49de7d0c1ce41292161ea0f721913fa8722c19fb9c1e3aa0367eecb/pytest_cov-7.0.0-py3-none-any.whl", hash = "sha256:3b8e9558b16cc1479da72058bdecf8073661c7f57f7d3c5f22a1c23507f2d861", size = 22424, upload-time = "2025-09-09T10:57:00.695Z" }, +] + +[[package]] +name = "pytest-cover" +version = "3.0.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pytest-cov" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/30/27/20964101a7cdb260f8d6c4e854659026968321d10c90552b1fe7f6c5f913/pytest-cover-3.0.0.tar.gz", hash = "sha256:5bdb6c1cc3dd75583bb7bc2c57f5e1034a1bfcb79d27c71aceb0b16af981dbf4", size = 3211, upload-time = "2015-08-01T19:20:22.562Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/71/9b/7b4700c462628e169bd859c6368d596a6aedc87936bde733bead9f875fce/pytest_cover-3.0.0-py2.py3-none-any.whl", hash = "sha256:578249955eb3b5f3991209df6e532bb770b647743b7392d3d97698dc02f39ebb", size = 3769, upload-time = "2015-08-01T19:20:18.534Z" }, +] + +[[package]] +name = "pytest-coverage" +version = "0.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pytest-cover" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/01/81/1d954849aed17b254d1c397eb4447a05eedce612a56b627c071df2ce00c1/pytest-coverage-0.0.tar.gz", hash = "sha256:db6af2cbd7e458c7c9fd2b4207cee75258243c8a81cad31a7ee8cfad5be93c05", size = 873, upload-time = "2015-06-17T21:50:38.956Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/5b/4b/d95b052f87db89a2383233c0754c45f6d3b427b7a4bcb771ac9316a6fae1/pytest_coverage-0.0-py2.py3-none-any.whl", hash = "sha256:dedd084c5e74d8e669355325916dc011539b190355021b037242514dee546368", size = 2013, upload-time = "2015-06-17T22:08:36.771Z" }, +] + +[[package]] +name = "pytest-mock" +version = "3.15.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pytest" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/68/14/eb014d26be205d38ad5ad20d9a80f7d201472e08167f0bb4361e251084a9/pytest_mock-3.15.1.tar.gz", hash = "sha256:1849a238f6f396da19762269de72cb1814ab44416fa73a8686deac10b0d87a0f", size = 34036, upload-time = "2025-09-16T16:37:27.081Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/5a/cc/06253936f4a7fa2e0f48dfe6d851d9c56df896a9ab09ac019d70b760619c/pytest_mock-3.15.1-py3-none-any.whl", hash = "sha256:0a25e2eb88fe5168d535041d09a4529a188176ae608a6d249ee65abc0949630d", size = 10095, upload-time = "2025-09-16T16:37:25.734Z" }, +] + +[[package]] +name = "pytest-randomly" +version = "4.0.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "pytest" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/c4/1d/258a4bf1109258c00c35043f40433be5c16647387b6e7cd5582d638c116b/pytest_randomly-4.0.1.tar.gz", hash = "sha256:174e57bb12ac2c26f3578188490bd333f0e80620c3f47340158a86eca0593cd8", size = 14130, upload-time = "2025-09-12T15:23:00.085Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/33/3e/a4a9227807b56869790aad3e24472a554b585974fe7e551ea350f50897ae/pytest_randomly-4.0.1-py3-none-any.whl", hash = "sha256:e0dfad2fd4f35e07beff1e47c17fbafcf98f9bf4531fd369d9260e2f858bfcb7", size = 8304, upload-time = "2025-09-12T15:22:58.946Z" }, +] + +[[package]] +name = "pytest-subtests" +version = "0.15.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "attrs" }, + { name = "pytest" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/bb/d9/20097971a8d315e011e055d512fa120fd6be3bdb8f4b3aa3e3c6bf77bebc/pytest_subtests-0.15.0.tar.gz", hash = "sha256:cb495bde05551b784b8f0b8adfaa27edb4131469a27c339b80fd8d6ba33f887c", size = 18525, upload-time = "2025-10-20T16:26:18.358Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/23/64/bba465299b37448b4c1b84c7a04178399ac22d47b3dc5db1874fe55a2bd3/pytest_subtests-0.15.0-py3-none-any.whl", hash = "sha256:da2d0ce348e1f8d831d5a40d81e3aeac439fec50bd5251cbb7791402696a9493", size = 9185, upload-time = "2025-10-20T16:26:17.239Z" }, +] + +[[package]] +name = "pytest-xdist" +version = "3.7.1.dev24+g2b4372bd6" +source = { git = "https://github.com/sshane/pytest-xdist?rev=2b4372bd62699fb412c4fe2f95bf9f01bd2018da#2b4372bd62699fb412c4fe2f95bf9f01bd2018da" } +dependencies = [ + { name = "execnet" }, + { name = "pytest" }, +] + +[[package]] +name = "python-dateutil" +version = "2.9.0.post0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "six" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/66/c0/0c8b6ad9f17a802ee498c46e004a0eb49bc148f2fd230864601a86dcf6db/python-dateutil-2.9.0.post0.tar.gz", hash = "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3", size = 342432, upload-time = "2024-03-01T18:36:20.211Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ec/57/56b9bcc3c9c6a792fcbaf139543cee77261f3651ca9da0c93f5c1221264b/python_dateutil-2.9.0.post0-py2.py3-none-any.whl", hash = "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427", size = 229892, upload-time = "2024-03-01T18:36:18.57Z" }, +] + +[[package]] +name = "requests" +version = "2.32.5" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "certifi" }, + { name = "charset-normalizer" }, + { name = "idna" }, + { name = "urllib3" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/c9/74/b3ff8e6c8446842c3f5c837e9c3dfcfe2018ea6ecef224c710c85ef728f4/requests-2.32.5.tar.gz", hash = "sha256:dbba0bac56e100853db0ea71b82b4dfd5fe2bf6d3754a8893c3af500cec7d7cf", size = 134517, upload-time = "2025-08-18T20:46:02.573Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/1e/db/4254e3eabe8020b458f1a747140d32277ec7a271daf1d235b70dc0b4e6e3/requests-2.32.5-py3-none-any.whl", hash = "sha256:2462f94637a34fd532264295e186976db0f5d453d1cdd31473c85a6a161affb6", size = 64738, upload-time = "2025-08-18T20:46:00.542Z" }, +] + +[[package]] +name = "ruff" +version = "0.14.13" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/50/0a/1914efb7903174b381ee2ffeebb4253e729de57f114e63595114c8ca451f/ruff-0.14.13.tar.gz", hash = "sha256:83cd6c0763190784b99650a20fec7633c59f6ebe41c5cc9d45ee42749563ad47", size = 6059504, upload-time = "2026-01-15T20:15:16.918Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c3/ae/0deefbc65ca74b0ab1fd3917f94dc3b398233346a74b8bbb0a916a1a6bf6/ruff-0.14.13-py3-none-linux_armv6l.whl", hash = "sha256:76f62c62cd37c276cb03a275b198c7c15bd1d60c989f944db08a8c1c2dbec18b", size = 13062418, upload-time = "2026-01-15T20:14:50.779Z" }, + { url = "https://files.pythonhosted.org/packages/47/df/5916604faa530a97a3c154c62a81cb6b735c0cb05d1e26d5ad0f0c8ac48a/ruff-0.14.13-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:914a8023ece0528d5cc33f5a684f5f38199bbb566a04815c2c211d8f40b5d0ed", size = 13442344, upload-time = "2026-01-15T20:15:07.94Z" }, + { url = "https://files.pythonhosted.org/packages/4c/f3/e0e694dd69163c3a1671e102aa574a50357536f18a33375050334d5cd517/ruff-0.14.13-py3-none-macosx_11_0_arm64.whl", hash = "sha256:d24899478c35ebfa730597a4a775d430ad0d5631b8647a3ab368c29b7e7bd063", size = 12354720, upload-time = "2026-01-15T20:15:09.854Z" }, + { url = "https://files.pythonhosted.org/packages/c3/e8/67f5fcbbaee25e8fc3b56cc33e9892eca7ffe09f773c8e5907757a7e3bdb/ruff-0.14.13-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9aaf3870f14d925bbaf18b8a2347ee0ae7d95a2e490e4d4aea6813ed15ebc80e", size = 12774493, upload-time = "2026-01-15T20:15:20.908Z" }, + { url = "https://files.pythonhosted.org/packages/6b/ce/d2e9cb510870b52a9565d885c0d7668cc050e30fa2c8ac3fb1fda15c083d/ruff-0.14.13-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ac5b7f63dd3b27cc811850f5ffd8fff845b00ad70e60b043aabf8d6ecc304e09", size = 12815174, upload-time = "2026-01-15T20:15:05.74Z" }, + { url = "https://files.pythonhosted.org/packages/88/00/c38e5da58beebcf4fa32d0ddd993b63dfacefd02ab7922614231330845bf/ruff-0.14.13-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:78d2b1097750d90ba82ce4ba676e85230a0ed694178ca5e61aa9b459970b3eb9", size = 13680909, upload-time = "2026-01-15T20:15:14.537Z" }, + { url = "https://files.pythonhosted.org/packages/61/61/cd37c9dd5bd0a3099ba79b2a5899ad417d8f3b04038810b0501a80814fd7/ruff-0.14.13-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:7d0bf87705acbbcb8d4c24b2d77fbb73d40210a95c3903b443cd9e30824a5032", size = 15144215, upload-time = "2026-01-15T20:15:22.886Z" }, + { url = "https://files.pythonhosted.org/packages/56/8a/85502d7edbf98c2df7b8876f316c0157359165e16cdf98507c65c8d07d3d/ruff-0.14.13-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a3eb5da8e2c9e9f13431032fdcbe7681de9ceda5835efee3269417c13f1fed5c", size = 14706067, upload-time = "2026-01-15T20:14:48.271Z" }, + { url = "https://files.pythonhosted.org/packages/7e/2f/de0df127feb2ee8c1e54354dc1179b4a23798f0866019528c938ba439aca/ruff-0.14.13-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:642442b42957093811cd8d2140dfadd19c7417030a7a68cf8d51fcdd5f217427", size = 14133916, upload-time = "2026-01-15T20:14:57.357Z" }, + { url = "https://files.pythonhosted.org/packages/0d/77/9b99686bb9fe07a757c82f6f95e555c7a47801a9305576a9c67e0a31d280/ruff-0.14.13-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4acdf009f32b46f6e8864af19cbf6841eaaed8638e65c8dac845aea0d703c841", size = 13859207, upload-time = "2026-01-15T20:14:55.111Z" }, + { url = "https://files.pythonhosted.org/packages/7d/46/2bdcb34a87a179a4d23022d818c1c236cb40e477faf0d7c9afb6813e5876/ruff-0.14.13-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:591a7f68860ea4e003917d19b5c4f5ac39ff558f162dc753a2c5de897fd5502c", size = 14043686, upload-time = "2026-01-15T20:14:52.841Z" }, + { url = "https://files.pythonhosted.org/packages/1a/a9/5c6a4f56a0512c691cf143371bcf60505ed0f0860f24a85da8bd123b2bf1/ruff-0.14.13-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:774c77e841cc6e046fc3e91623ce0903d1cd07e3a36b1a9fe79b81dab3de506b", size = 12663837, upload-time = "2026-01-15T20:15:18.921Z" }, + { url = "https://files.pythonhosted.org/packages/fe/bb/b920016ece7651fa7fcd335d9d199306665486694d4361547ccb19394c44/ruff-0.14.13-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:61f4e40077a1248436772bb6512db5fc4457fe4c49e7a94ea7c5088655dd21ae", size = 12805867, upload-time = "2026-01-15T20:14:59.272Z" }, + { url = "https://files.pythonhosted.org/packages/7d/b3/0bd909851e5696cd21e32a8fc25727e5f58f1934b3596975503e6e85415c/ruff-0.14.13-py3-none-musllinux_1_2_i686.whl", hash = "sha256:6d02f1428357fae9e98ac7aa94b7e966fd24151088510d32cf6f902d6c09235e", size = 13208528, upload-time = "2026-01-15T20:15:03.732Z" }, + { url = "https://files.pythonhosted.org/packages/3b/3b/e2d94cb613f6bbd5155a75cbe072813756363eba46a3f2177a1fcd0cd670/ruff-0.14.13-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:e399341472ce15237be0c0ae5fbceca4b04cd9bebab1a2b2c979e015455d8f0c", size = 13929242, upload-time = "2026-01-15T20:15:11.918Z" }, + { url = "https://files.pythonhosted.org/packages/6a/c5/abd840d4132fd51a12f594934af5eba1d5d27298a6f5b5d6c3be45301caf/ruff-0.14.13-py3-none-win32.whl", hash = "sha256:ef720f529aec113968b45dfdb838ac8934e519711da53a0456038a0efecbd680", size = 12919024, upload-time = "2026-01-15T20:14:43.647Z" }, + { url = "https://files.pythonhosted.org/packages/c2/55/6384b0b8ce731b6e2ade2b5449bf07c0e4c31e8a2e68ea65b3bafadcecc5/ruff-0.14.13-py3-none-win_amd64.whl", hash = "sha256:6070bd026e409734b9257e03e3ef18c6e1a216f0435c6751d7a8ec69cb59abef", size = 14097887, upload-time = "2026-01-15T20:15:01.48Z" }, + { url = "https://files.pythonhosted.org/packages/4d/e1/7348090988095e4e39560cfc2f7555b1b2a7357deba19167b600fdf5215d/ruff-0.14.13-py3-none-win_arm64.whl", hash = "sha256:7ab819e14f1ad9fe39f246cfcc435880ef7a9390d81a2b6ac7e01039083dd247", size = 13080224, upload-time = "2026-01-15T20:14:45.853Z" }, +] + +[[package]] +name = "scons" +version = "4.10.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/7d/c9/2f430bb39e4eccba32ce8008df4a3206df651276422204e177a09e12b30b/scons-4.10.1.tar.gz", hash = "sha256:99c0e94a42a2c1182fa6859b0be697953db07ba936ecc9817ae0d218ced20b15", size = 3258403, upload-time = "2025-11-16T22:43:39.258Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ce/bf/931fb9fbb87234c32b8b1b1c15fba23472a10777c12043336675633809a7/scons-4.10.1-py3-none-any.whl", hash = "sha256:bd9d1c52f908d874eba92a8c0c0a8dcf2ed9f3b88ab956d0fce1da479c4e7126", size = 4136069, upload-time = "2025-11-16T22:43:35.933Z" }, +] + +[[package]] +name = "six" +version = "1.17.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/94/e7/b2c673351809dca68a0e064b6af791aa332cf192da575fd474ed7d6f16a2/six-1.17.0.tar.gz", hash = "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81", size = 34031, upload-time = "2024-12-04T17:35:28.174Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b7/ce/149a00dd41f10bc29e5921b496af8b574d8413afcd5e30dfa0ed46c2cc5e/six-1.17.0-py2.py3-none-any.whl", hash = "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274", size = 11050, upload-time = "2024-12-04T17:35:26.475Z" }, +] + +[[package]] +name = "sortedcontainers" +version = "2.4.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/e8/c4/ba2f8066cceb6f23394729afe52f3bf7adec04bf9ed2c820b39e19299111/sortedcontainers-2.4.0.tar.gz", hash = "sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88", size = 30594, upload-time = "2021-05-16T22:03:42.897Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl", hash = "sha256:a163dcaede0f1c021485e957a39245190e74249897e2ae4b2aa38595db237ee0", size = 29575, upload-time = "2021-05-16T22:03:41.177Z" }, +] + +[[package]] +name = "tomli" +version = "2.4.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/82/30/31573e9457673ab10aa432461bee537ce6cef177667deca369efb79df071/tomli-2.4.0.tar.gz", hash = "sha256:aa89c3f6c277dd275d8e243ad24f3b5e701491a860d5121f2cdd399fbb31fc9c", size = 17477, upload-time = "2026-01-11T11:22:38.165Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/3c/d9/3dc2289e1f3b32eb19b9785b6a006b28ee99acb37d1d47f78d4c10e28bf8/tomli-2.4.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b5ef256a3fd497d4973c11bf142e9ed78b150d36f5773f1ca6088c230ffc5867", size = 153663, upload-time = "2026-01-11T11:21:45.27Z" }, + { url = "https://files.pythonhosted.org/packages/51/32/ef9f6845e6b9ca392cd3f64f9ec185cc6f09f0a2df3db08cbe8809d1d435/tomli-2.4.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5572e41282d5268eb09a697c89a7bee84fae66511f87533a6f88bd2f7b652da9", size = 148469, upload-time = "2026-01-11T11:21:46.873Z" }, + { url = "https://files.pythonhosted.org/packages/d6/c2/506e44cce89a8b1b1e047d64bd495c22c9f71f21e05f380f1a950dd9c217/tomli-2.4.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:551e321c6ba03b55676970b47cb1b73f14a0a4dce6a3e1a9458fd6d921d72e95", size = 236039, upload-time = "2026-01-11T11:21:48.503Z" }, + { url = "https://files.pythonhosted.org/packages/b3/40/e1b65986dbc861b7e986e8ec394598187fa8aee85b1650b01dd925ca0be8/tomli-2.4.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5e3f639a7a8f10069d0e15408c0b96a2a828cfdec6fca05296ebcdcc28ca7c76", size = 243007, upload-time = "2026-01-11T11:21:49.456Z" }, + { url = "https://files.pythonhosted.org/packages/9c/6f/6e39ce66b58a5b7ae572a0f4352ff40c71e8573633deda43f6a379d56b3e/tomli-2.4.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:1b168f2731796b045128c45982d3a4874057626da0e2ef1fdd722848b741361d", size = 240875, upload-time = "2026-01-11T11:21:50.755Z" }, + { url = "https://files.pythonhosted.org/packages/aa/ad/cb089cb190487caa80204d503c7fd0f4d443f90b95cf4ef5cf5aa0f439b0/tomli-2.4.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:133e93646ec4300d651839d382d63edff11d8978be23da4cc106f5a18b7d0576", size = 246271, upload-time = "2026-01-11T11:21:51.81Z" }, + { url = "https://files.pythonhosted.org/packages/0b/63/69125220e47fd7a3a27fd0de0c6398c89432fec41bc739823bcc66506af6/tomli-2.4.0-cp311-cp311-win32.whl", hash = "sha256:b6c78bdf37764092d369722d9946cb65b8767bfa4110f902a1b2542d8d173c8a", size = 96770, upload-time = "2026-01-11T11:21:52.647Z" }, + { url = "https://files.pythonhosted.org/packages/1e/0d/a22bb6c83f83386b0008425a6cd1fa1c14b5f3dd4bad05e98cf3dbbf4a64/tomli-2.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:d3d1654e11d724760cdb37a3d7691f0be9db5fbdaef59c9f532aabf87006dbaa", size = 107626, upload-time = "2026-01-11T11:21:53.459Z" }, + { url = "https://files.pythonhosted.org/packages/2f/6d/77be674a3485e75cacbf2ddba2b146911477bd887dda9d8c9dfb2f15e871/tomli-2.4.0-cp311-cp311-win_arm64.whl", hash = "sha256:cae9c19ed12d4e8f3ebf46d1a75090e4c0dc16271c5bce1c833ac168f08fb614", size = 94842, upload-time = "2026-01-11T11:21:54.831Z" }, + { url = "https://files.pythonhosted.org/packages/3c/43/7389a1869f2f26dba52404e1ef13b4784b6b37dac93bac53457e3ff24ca3/tomli-2.4.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:920b1de295e72887bafa3ad9f7a792f811847d57ea6b1215154030cf131f16b1", size = 154894, upload-time = "2026-01-11T11:21:56.07Z" }, + { url = "https://files.pythonhosted.org/packages/e9/05/2f9bf110b5294132b2edf13fe6ca6ae456204f3d749f623307cbb7a946f2/tomli-2.4.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:7d6d9a4aee98fac3eab4952ad1d73aee87359452d1c086b5ceb43ed02ddb16b8", size = 149053, upload-time = "2026-01-11T11:21:57.467Z" }, + { url = "https://files.pythonhosted.org/packages/e8/41/1eda3ca1abc6f6154a8db4d714a4d35c4ad90adc0bcf700657291593fbf3/tomli-2.4.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:36b9d05b51e65b254ea6c2585b59d2c4cb91c8a3d91d0ed0f17591a29aaea54a", size = 243481, upload-time = "2026-01-11T11:21:58.661Z" }, + { url = "https://files.pythonhosted.org/packages/d2/6d/02ff5ab6c8868b41e7d4b987ce2b5f6a51d3335a70aa144edd999e055a01/tomli-2.4.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1c8a885b370751837c029ef9bc014f27d80840e48bac415f3412e6593bbc18c1", size = 251720, upload-time = "2026-01-11T11:22:00.178Z" }, + { url = "https://files.pythonhosted.org/packages/7b/57/0405c59a909c45d5b6f146107c6d997825aa87568b042042f7a9c0afed34/tomli-2.4.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:8768715ffc41f0008abe25d808c20c3d990f42b6e2e58305d5da280ae7d1fa3b", size = 247014, upload-time = "2026-01-11T11:22:01.238Z" }, + { url = "https://files.pythonhosted.org/packages/2c/0e/2e37568edd944b4165735687cbaf2fe3648129e440c26d02223672ee0630/tomli-2.4.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:7b438885858efd5be02a9a133caf5812b8776ee0c969fea02c45e8e3f296ba51", size = 251820, upload-time = "2026-01-11T11:22:02.727Z" }, + { url = "https://files.pythonhosted.org/packages/5a/1c/ee3b707fdac82aeeb92d1a113f803cf6d0f37bdca0849cb489553e1f417a/tomli-2.4.0-cp312-cp312-win32.whl", hash = "sha256:0408e3de5ec77cc7f81960c362543cbbd91ef883e3138e81b729fc3eea5b9729", size = 97712, upload-time = "2026-01-11T11:22:03.777Z" }, + { url = "https://files.pythonhosted.org/packages/69/13/c07a9177d0b3bab7913299b9278845fc6eaaca14a02667c6be0b0a2270c8/tomli-2.4.0-cp312-cp312-win_amd64.whl", hash = "sha256:685306e2cc7da35be4ee914fd34ab801a6acacb061b6a7abca922aaf9ad368da", size = 108296, upload-time = "2026-01-11T11:22:04.86Z" }, + { url = "https://files.pythonhosted.org/packages/18/27/e267a60bbeeee343bcc279bb9e8fbed0cbe224bc7b2a3dc2975f22809a09/tomli-2.4.0-cp312-cp312-win_arm64.whl", hash = "sha256:5aa48d7c2356055feef06a43611fc401a07337d5b006be13a30f6c58f869e3c3", size = 94553, upload-time = "2026-01-11T11:22:05.854Z" }, + { url = "https://files.pythonhosted.org/packages/23/d1/136eb2cb77520a31e1f64cbae9d33ec6df0d78bdf4160398e86eec8a8754/tomli-2.4.0-py3-none-any.whl", hash = "sha256:1f776e7d669ebceb01dee46484485f43a4048746235e683bcdffacdf1fb4785a", size = 14477, upload-time = "2026-01-11T11:22:37.446Z" }, +] + +[[package]] +name = "tqdm" +version = "4.67.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "colorama", marker = "sys_platform == 'win32'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/a8/4b/29b4ef32e036bb34e4ab51796dd745cdba7ed47ad142a9f4a1eb8e0c744d/tqdm-4.67.1.tar.gz", hash = "sha256:f8aef9c52c08c13a65f30ea34f4e5aac3fd1a34959879d7e59e63027286627f2", size = 169737, upload-time = "2024-11-24T20:12:22.481Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d0/30/dc54f88dd4a2b5dc8a0279bdd7270e735851848b762aeb1c1184ed1f6b14/tqdm-4.67.1-py3-none-any.whl", hash = "sha256:26445eca388f82e72884e0d580d5464cd801a3ea01e63e5601bdff9ba6a48de2", size = 78540, upload-time = "2024-11-24T20:12:19.698Z" }, +] + +[[package]] +name = "ty" +version = "0.0.12" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/b5/78/ba1a4ad403c748fbba8be63b7e774a90e80b67192f6443d624c64fe4aaab/ty-0.0.12.tar.gz", hash = "sha256:cd01810e106c3b652a01b8f784dd21741de9fdc47bd595d02c122a7d5cefeee7", size = 4981303, upload-time = "2026-01-14T22:30:48.537Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7d/8f/c21314d074dda5fb13d3300fa6733fd0d8ff23ea83a721818740665b6314/ty-0.0.12-py3-none-linux_armv6l.whl", hash = "sha256:eb9da1e2c68bd754e090eab39ed65edf95168d36cbeb43ff2bd9f86b4edd56d1", size = 9614164, upload-time = "2026-01-14T22:30:44.016Z" }, + { url = "https://files.pythonhosted.org/packages/09/28/f8a4d944d13519d70c486e8f96d6fa95647ac2aa94432e97d5cfec1f42f6/ty-0.0.12-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:c181f42aa19b0ed7f1b0c2d559980b1f1d77cc09419f51c8321c7ddf67758853", size = 9542337, upload-time = "2026-01-14T22:30:05.687Z" }, + { url = "https://files.pythonhosted.org/packages/e1/9c/f576e360441de7a8201daa6dc4ebc362853bc5305e059cceeb02ebdd9a48/ty-0.0.12-py3-none-macosx_11_0_arm64.whl", hash = "sha256:1f829e1eecd39c3e1b032149db7ae6a3284f72fc36b42436e65243a9ed1173db", size = 8909582, upload-time = "2026-01-14T22:30:46.089Z" }, + { url = "https://files.pythonhosted.org/packages/d6/13/0898e494032a5d8af3060733d12929e3e7716db6c75eac63fa125730a3e7/ty-0.0.12-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f45162e7826e1789cf3374627883cdeb0d56b82473a0771923e4572928e90be3", size = 9384932, upload-time = "2026-01-14T22:30:13.769Z" }, + { url = "https://files.pythonhosted.org/packages/e4/1a/b35b6c697008a11d4cedfd34d9672db2f0a0621ec80ece109e13fca4dfef/ty-0.0.12-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:d11fec40b269bec01e751b2337d1c7ffa959a2c2090a950d7e21c2792442cccd", size = 9453140, upload-time = "2026-01-14T22:30:11.131Z" }, + { url = "https://files.pythonhosted.org/packages/dd/1e/71c9edbc79a3c88a0711324458f29c7dbf6c23452c6e760dc25725483064/ty-0.0.12-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:09d99e37e761a4d2651ad9d5a610d11235fbcbf35dc6d4bc04abf54e7cf894f1", size = 9960680, upload-time = "2026-01-14T22:30:33.621Z" }, + { url = "https://files.pythonhosted.org/packages/0e/75/39375129f62dd22f6ad5a99cd2a42fd27d8b91b235ce2db86875cdad397d/ty-0.0.12-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:d9ca0cdb17bd37397da7b16a7cd23423fc65c3f9691e453ad46c723d121225a1", size = 10904518, upload-time = "2026-01-14T22:30:08.464Z" }, + { url = "https://files.pythonhosted.org/packages/32/5e/26c6d88fafa11a9d31ca9f4d12989f57782ec61e7291d4802d685b5be118/ty-0.0.12-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fcf2757b905e7eddb7e456140066335b18eb68b634a9f72d6f54a427ab042c64", size = 10525001, upload-time = "2026-01-14T22:30:16.454Z" }, + { url = "https://files.pythonhosted.org/packages/c2/a5/2f0b91894af13187110f9ad7ee926d86e4e6efa755c9c88a820ed7f84c85/ty-0.0.12-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:00cf34c1ebe1147efeda3021a1064baa222c18cdac114b7b050bbe42deb4ca80", size = 10307103, upload-time = "2026-01-14T22:30:41.221Z" }, + { url = "https://files.pythonhosted.org/packages/4b/77/13d0410827e4bc713ebb7fdaf6b3590b37dcb1b82e0a81717b65548f2442/ty-0.0.12-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2bb3a655bd869352e9a22938d707631ac9fbca1016242b1f6d132d78f347c851", size = 10072737, upload-time = "2026-01-14T22:30:51.783Z" }, + { url = "https://files.pythonhosted.org/packages/e1/dd/fc36d8bac806c74cf04b4ca735bca14d19967ca84d88f31e121767880df1/ty-0.0.12-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:4658e282c7cb82be304052f8f64f9925f23c3c4f90eeeb32663c74c4b095d7ba", size = 9368726, upload-time = "2026-01-14T22:30:18.683Z" }, + { url = "https://files.pythonhosted.org/packages/54/70/9e8e461647550f83e2fe54bc632ccbdc17a4909644783cdbdd17f7296059/ty-0.0.12-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:c167d838eaaa06e03bb66a517f75296b643d950fbd93c1d1686a187e5a8dbd1f", size = 9454704, upload-time = "2026-01-14T22:30:22.759Z" }, + { url = "https://files.pythonhosted.org/packages/04/9b/6292cf7c14a0efeca0539cf7d78f453beff0475cb039fbea0eb5d07d343d/ty-0.0.12-py3-none-musllinux_1_2_i686.whl", hash = "sha256:2956e0c9ab7023533b461d8a0e6b2ea7b78e01a8dde0688e8234d0fce10c4c1c", size = 9649829, upload-time = "2026-01-14T22:30:31.234Z" }, + { url = "https://files.pythonhosted.org/packages/49/bd/472a5d2013371e4870886cff791c94abdf0b92d43d305dd0f8e06b6ff719/ty-0.0.12-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:5c6a3fd7479580009f21002f3828320621d8a82d53b7ba36993234e3ccad58c8", size = 10162814, upload-time = "2026-01-14T22:30:36.174Z" }, + { url = "https://files.pythonhosted.org/packages/31/e9/2ecbe56826759845a7c21d80aa28187865ea62bc9757b056f6cbc06f78ed/ty-0.0.12-py3-none-win32.whl", hash = "sha256:a91c24fd75c0f1796d8ede9083e2c0ec96f106dbda73a09fe3135e075d31f742", size = 9140115, upload-time = "2026-01-14T22:30:38.903Z" }, + { url = "https://files.pythonhosted.org/packages/5d/6d/d9531eff35a5c0ec9dbc10231fac21f9dd6504814048e81d6ce1c84dc566/ty-0.0.12-py3-none-win_amd64.whl", hash = "sha256:df151894be55c22d47068b0f3b484aff9e638761e2267e115d515fcc9c5b4a4b", size = 9884532, upload-time = "2026-01-14T22:30:25.112Z" }, + { url = "https://files.pythonhosted.org/packages/e9/f3/20b49e75967023b123a221134548ad7000f9429f13fdcdda115b4c26305f/ty-0.0.12-py3-none-win_arm64.whl", hash = "sha256:cea99d334b05629de937ce52f43278acf155d3a316ad6a35356635f886be20ea", size = 9313974, upload-time = "2026-01-14T22:30:27.44Z" }, +] + +[[package]] +name = "urllib3" +version = "2.6.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/c7/24/5f1b3bdffd70275f6661c76461e25f024d5a38a46f04aaca912426a2b1d3/urllib3-2.6.3.tar.gz", hash = "sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed", size = 435556, upload-time = "2026-01-07T16:24:43.925Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/39/08/aaaad47bc4e9dc8c725e68f9d04865dbcb2052843ff09c97b08904852d84/urllib3-2.6.3-py3-none-any.whl", hash = "sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4", size = 131584, upload-time = "2026-01-07T16:24:42.685Z" }, +] + +[[package]] +name = "zstandard" +version = "0.25.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/fd/aa/3e0508d5a5dd96529cdc5a97011299056e14c6505b678fd58938792794b1/zstandard-0.25.0.tar.gz", hash = "sha256:7713e1179d162cf5c7906da876ec2ccb9c3a9dcbdffef0cc7f70c3667a205f0b", size = 711513, upload-time = "2025-09-14T22:15:54.002Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/2a/83/c3ca27c363d104980f1c9cee1101cc8ba724ac8c28a033ede6aab89585b1/zstandard-0.25.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:933b65d7680ea337180733cf9e87293cc5500cc0eb3fc8769f4d3c88d724ec5c", size = 795254, upload-time = "2025-09-14T22:16:26.137Z" }, + { url = "https://files.pythonhosted.org/packages/ac/4d/e66465c5411a7cf4866aeadc7d108081d8ceba9bc7abe6b14aa21c671ec3/zstandard-0.25.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a3f79487c687b1fc69f19e487cd949bf3aae653d181dfb5fde3bf6d18894706f", size = 640559, upload-time = "2025-09-14T22:16:27.973Z" }, + { url = "https://files.pythonhosted.org/packages/12/56/354fe655905f290d3b147b33fe946b0f27e791e4b50a5f004c802cb3eb7b/zstandard-0.25.0-cp311-cp311-manylinux2010_i686.manylinux2014_i686.manylinux_2_12_i686.manylinux_2_17_i686.whl", hash = "sha256:0bbc9a0c65ce0eea3c34a691e3c4b6889f5f3909ba4822ab385fab9057099431", size = 5348020, upload-time = "2025-09-14T22:16:29.523Z" }, + { url = "https://files.pythonhosted.org/packages/3b/13/2b7ed68bd85e69a2069bcc72141d378f22cae5a0f3b353a2c8f50ef30c1b/zstandard-0.25.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:01582723b3ccd6939ab7b3a78622c573799d5d8737b534b86d0e06ac18dbde4a", size = 5058126, upload-time = "2025-09-14T22:16:31.811Z" }, + { url = "https://files.pythonhosted.org/packages/c9/dd/fdaf0674f4b10d92cb120ccff58bbb6626bf8368f00ebfd2a41ba4a0dc99/zstandard-0.25.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:5f1ad7bf88535edcf30038f6919abe087f606f62c00a87d7e33e7fc57cb69fcc", size = 5405390, upload-time = "2025-09-14T22:16:33.486Z" }, + { url = "https://files.pythonhosted.org/packages/0f/67/354d1555575bc2490435f90d67ca4dd65238ff2f119f30f72d5cde09c2ad/zstandard-0.25.0-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:06acb75eebeedb77b69048031282737717a63e71e4ae3f77cc0c3b9508320df6", size = 5452914, upload-time = "2025-09-14T22:16:35.277Z" }, + { url = "https://files.pythonhosted.org/packages/bb/1f/e9cfd801a3f9190bf3e759c422bbfd2247db9d7f3d54a56ecde70137791a/zstandard-0.25.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:9300d02ea7c6506f00e627e287e0492a5eb0371ec1670ae852fefffa6164b072", size = 5559635, upload-time = "2025-09-14T22:16:37.141Z" }, + { url = "https://files.pythonhosted.org/packages/21/88/5ba550f797ca953a52d708c8e4f380959e7e3280af029e38fbf47b55916e/zstandard-0.25.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:bfd06b1c5584b657a2892a6014c2f4c20e0db0208c159148fa78c65f7e0b0277", size = 5048277, upload-time = "2025-09-14T22:16:38.807Z" }, + { url = "https://files.pythonhosted.org/packages/46/c0/ca3e533b4fa03112facbe7fbe7779cb1ebec215688e5df576fe5429172e0/zstandard-0.25.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:f373da2c1757bb7f1acaf09369cdc1d51d84131e50d5fa9863982fd626466313", size = 5574377, upload-time = "2025-09-14T22:16:40.523Z" }, + { url = "https://files.pythonhosted.org/packages/12/9b/3fb626390113f272abd0799fd677ea33d5fc3ec185e62e6be534493c4b60/zstandard-0.25.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:6c0e5a65158a7946e7a7affa6418878ef97ab66636f13353b8502d7ea03c8097", size = 4961493, upload-time = "2025-09-14T22:16:43.3Z" }, + { url = "https://files.pythonhosted.org/packages/cb/d3/23094a6b6a4b1343b27ae68249daa17ae0651fcfec9ed4de09d14b940285/zstandard-0.25.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:c8e167d5adf59476fa3e37bee730890e389410c354771a62e3c076c86f9f7778", size = 5269018, upload-time = "2025-09-14T22:16:45.292Z" }, + { url = "https://files.pythonhosted.org/packages/8c/a7/bb5a0c1c0f3f4b5e9d5b55198e39de91e04ba7c205cc46fcb0f95f0383c1/zstandard-0.25.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:98750a309eb2f020da61e727de7d7ba3c57c97cf6213f6f6277bb7fb42a8e065", size = 5443672, upload-time = "2025-09-14T22:16:47.076Z" }, + { url = "https://files.pythonhosted.org/packages/27/22/503347aa08d073993f25109c36c8d9f029c7d5949198050962cb568dfa5e/zstandard-0.25.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:22a086cff1b6ceca18a8dd6096ec631e430e93a8e70a9ca5efa7561a00f826fa", size = 5822753, upload-time = "2025-09-14T22:16:49.316Z" }, + { url = "https://files.pythonhosted.org/packages/e2/be/94267dc6ee64f0f8ba2b2ae7c7a2df934a816baaa7291db9e1aa77394c3c/zstandard-0.25.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:72d35d7aa0bba323965da807a462b0966c91608ef3a48ba761678cb20ce5d8b7", size = 5366047, upload-time = "2025-09-14T22:16:51.328Z" }, + { url = "https://files.pythonhosted.org/packages/7b/a3/732893eab0a3a7aecff8b99052fecf9f605cf0fb5fb6d0290e36beee47a4/zstandard-0.25.0-cp311-cp311-win32.whl", hash = "sha256:f5aeea11ded7320a84dcdd62a3d95b5186834224a9e55b92ccae35d21a8b63d4", size = 436484, upload-time = "2025-09-14T22:16:55.005Z" }, + { url = "https://files.pythonhosted.org/packages/43/a3/c6155f5c1cce691cb80dfd38627046e50af3ee9ddc5d0b45b9b063bfb8c9/zstandard-0.25.0-cp311-cp311-win_amd64.whl", hash = "sha256:daab68faadb847063d0c56f361a289c4f268706b598afbf9ad113cbe5c38b6b2", size = 506183, upload-time = "2025-09-14T22:16:52.753Z" }, + { url = "https://files.pythonhosted.org/packages/8c/3e/8945ab86a0820cc0e0cdbf38086a92868a9172020fdab8a03ac19662b0e5/zstandard-0.25.0-cp311-cp311-win_arm64.whl", hash = "sha256:22a06c5df3751bb7dc67406f5374734ccee8ed37fc5981bf1ad7041831fa1137", size = 462533, upload-time = "2025-09-14T22:16:53.878Z" }, + { url = "https://files.pythonhosted.org/packages/82/fc/f26eb6ef91ae723a03e16eddb198abcfce2bc5a42e224d44cc8b6765e57e/zstandard-0.25.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:7b3c3a3ab9daa3eed242d6ecceead93aebbb8f5f84318d82cee643e019c4b73b", size = 795738, upload-time = "2025-09-14T22:16:56.237Z" }, + { url = "https://files.pythonhosted.org/packages/aa/1c/d920d64b22f8dd028a8b90e2d756e431a5d86194caa78e3819c7bf53b4b3/zstandard-0.25.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:913cbd31a400febff93b564a23e17c3ed2d56c064006f54efec210d586171c00", size = 640436, upload-time = "2025-09-14T22:16:57.774Z" }, + { url = "https://files.pythonhosted.org/packages/53/6c/288c3f0bd9fcfe9ca41e2c2fbfd17b2097f6af57b62a81161941f09afa76/zstandard-0.25.0-cp312-cp312-manylinux2010_i686.manylinux2014_i686.manylinux_2_12_i686.manylinux_2_17_i686.whl", hash = "sha256:011d388c76b11a0c165374ce660ce2c8efa8e5d87f34996aa80f9c0816698b64", size = 5343019, upload-time = "2025-09-14T22:16:59.302Z" }, + { url = "https://files.pythonhosted.org/packages/1e/15/efef5a2f204a64bdb5571e6161d49f7ef0fffdbca953a615efbec045f60f/zstandard-0.25.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:6dffecc361d079bb48d7caef5d673c88c8988d3d33fb74ab95b7ee6da42652ea", size = 5063012, upload-time = "2025-09-14T22:17:01.156Z" }, + { url = "https://files.pythonhosted.org/packages/b7/37/a6ce629ffdb43959e92e87ebdaeebb5ac81c944b6a75c9c47e300f85abdf/zstandard-0.25.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:7149623bba7fdf7e7f24312953bcf73cae103db8cae49f8154dd1eadc8a29ecb", size = 5394148, upload-time = "2025-09-14T22:17:03.091Z" }, + { url = "https://files.pythonhosted.org/packages/e3/79/2bf870b3abeb5c070fe2d670a5a8d1057a8270f125ef7676d29ea900f496/zstandard-0.25.0-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:6a573a35693e03cf1d67799fd01b50ff578515a8aeadd4595d2a7fa9f3ec002a", size = 5451652, upload-time = "2025-09-14T22:17:04.979Z" }, + { url = "https://files.pythonhosted.org/packages/53/60/7be26e610767316c028a2cbedb9a3beabdbe33e2182c373f71a1c0b88f36/zstandard-0.25.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:5a56ba0db2d244117ed744dfa8f6f5b366e14148e00de44723413b2f3938a902", size = 5546993, upload-time = "2025-09-14T22:17:06.781Z" }, + { url = "https://files.pythonhosted.org/packages/85/c7/3483ad9ff0662623f3648479b0380d2de5510abf00990468c286c6b04017/zstandard-0.25.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:10ef2a79ab8e2974e2075fb984e5b9806c64134810fac21576f0668e7ea19f8f", size = 5046806, upload-time = "2025-09-14T22:17:08.415Z" }, + { url = "https://files.pythonhosted.org/packages/08/b3/206883dd25b8d1591a1caa44b54c2aad84badccf2f1de9e2d60a446f9a25/zstandard-0.25.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:aaf21ba8fb76d102b696781bddaa0954b782536446083ae3fdaa6f16b25a1c4b", size = 5576659, upload-time = "2025-09-14T22:17:10.164Z" }, + { url = "https://files.pythonhosted.org/packages/9d/31/76c0779101453e6c117b0ff22565865c54f48f8bd807df2b00c2c404b8e0/zstandard-0.25.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:1869da9571d5e94a85a5e8d57e4e8807b175c9e4a6294e3b66fa4efb074d90f6", size = 4953933, upload-time = "2025-09-14T22:17:11.857Z" }, + { url = "https://files.pythonhosted.org/packages/18/e1/97680c664a1bf9a247a280a053d98e251424af51f1b196c6d52f117c9720/zstandard-0.25.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:809c5bcb2c67cd0ed81e9229d227d4ca28f82d0f778fc5fea624a9def3963f91", size = 5268008, upload-time = "2025-09-14T22:17:13.627Z" }, + { url = "https://files.pythonhosted.org/packages/1e/73/316e4010de585ac798e154e88fd81bb16afc5c5cb1a72eeb16dd37e8024a/zstandard-0.25.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:f27662e4f7dbf9f9c12391cb37b4c4c3cb90ffbd3b1fb9284dadbbb8935fa708", size = 5433517, upload-time = "2025-09-14T22:17:16.103Z" }, + { url = "https://files.pythonhosted.org/packages/5b/60/dd0f8cfa8129c5a0ce3ea6b7f70be5b33d2618013a161e1ff26c2b39787c/zstandard-0.25.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:99c0c846e6e61718715a3c9437ccc625de26593fea60189567f0118dc9db7512", size = 5814292, upload-time = "2025-09-14T22:17:17.827Z" }, + { url = "https://files.pythonhosted.org/packages/fc/5f/75aafd4b9d11b5407b641b8e41a57864097663699f23e9ad4dbb91dc6bfe/zstandard-0.25.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:474d2596a2dbc241a556e965fb76002c1ce655445e4e3bf38e5477d413165ffa", size = 5360237, upload-time = "2025-09-14T22:17:19.954Z" }, + { url = "https://files.pythonhosted.org/packages/ff/8d/0309daffea4fcac7981021dbf21cdb2e3427a9e76bafbcdbdf5392ff99a4/zstandard-0.25.0-cp312-cp312-win32.whl", hash = "sha256:23ebc8f17a03133b4426bcc04aabd68f8236eb78c3760f12783385171b0fd8bd", size = 436922, upload-time = "2025-09-14T22:17:24.398Z" }, + { url = "https://files.pythonhosted.org/packages/79/3b/fa54d9015f945330510cb5d0b0501e8253c127cca7ebe8ba46a965df18c5/zstandard-0.25.0-cp312-cp312-win_amd64.whl", hash = "sha256:ffef5a74088f1e09947aecf91011136665152e0b4b359c42be3373897fb39b01", size = 506276, upload-time = "2025-09-14T22:17:21.429Z" }, + { url = "https://files.pythonhosted.org/packages/ea/6b/8b51697e5319b1f9ac71087b0af9a40d8a6288ff8025c36486e0c12abcc4/zstandard-0.25.0-cp312-cp312-win_arm64.whl", hash = "sha256:181eb40e0b6a29b3cd2849f825e0fa34397f649170673d385f3598ae17cca2e9", size = 462679, upload-time = "2025-09-14T22:17:23.147Z" }, +] From 63b25261aa05fde04ef8c6af21f93d2ed5c25c92 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Tue, 20 Jan 2026 23:32:34 -0800 Subject: [PATCH 050/229] Subaru: fix RPM size and label neutral (#3048) fix rpm size and label neutral --- opendbc/dbc/generator/subaru/_subaru_global.dbc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opendbc/dbc/generator/subaru/_subaru_global.dbc b/opendbc/dbc/generator/subaru/_subaru_global.dbc index 69c83619385..39fcda0a939 100644 --- a/opendbc/dbc/generator/subaru/_subaru_global.dbc +++ b/opendbc/dbc/generator/subaru/_subaru_global.dbc @@ -45,8 +45,8 @@ BO_ 64 Throttle: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX SG_ Signal1 : 12|4@1+ (1,0) [0|15] "" XXX - SG_ Engine_RPM : 16|12@1+ (1,0) [0|4095] "" XXX - SG_ Signal2 : 28|4@1+ (1,0) [0|15] "" XXX + SG_ Engine_RPM : 16|13@1+ (1,0) [0|8191] "" XXX + SG_ Neutral : 31|1@1+ (1,0) [0|15] "" XXX SG_ Throttle_Pedal : 32|8@1+ (1,0) [0|255] "" XXX SG_ Throttle_Cruise : 40|8@1+ (1,0) [0|255] "" XXX SG_ Throttle_Combo : 48|8@1+ (1,0) [0|255] "" XXX From 3b75bd8536a3a503447f8455b12ede304ff929ab Mon Sep 17 00:00:00 2001 From: Daniel Koepping Date: Wed, 21 Jan 2026 04:05:53 -0800 Subject: [PATCH 051/229] Car diff: fix PR comment (#3045) fix PR comment --- .github/workflows/car_diff.yml | 42 ++++++++++++++++++++++++++++++++++ .github/workflows/tests.yml | 9 ++++---- opendbc/car/tests/car_diff.py | 2 +- 3 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/car_diff.yml diff --git a/.github/workflows/car_diff.yml b/.github/workflows/car_diff.yml new file mode 100644 index 00000000000..c6f94216c76 --- /dev/null +++ b/.github/workflows/car_diff.yml @@ -0,0 +1,42 @@ +name: car diff + +on: + pull_request_target: + types: [opened, synchronize, reopened] + +jobs: + comment: + name: comment + runs-on: ubuntu-latest + timeout-minutes: 10 + continue-on-error: true + permissions: + contents: read + pull-requests: write + actions: read + steps: + - name: Wait for car diff + uses: lewagon/wait-on-check-action@v1.3.4 + with: + ref: ${{ github.event.pull_request.head.sha }} + check-name: car diff + repo-token: ${{ secrets.GITHUB_TOKEN }} + allowed-conclusions: success + wait-interval: 20 + - name: Download car diff + uses: dawidd6/action-download-artifact@v6 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + workflow: tests.yml + workflow_conclusion: '' + pr: ${{ github.event.number }} + name: car_diff_${{ github.event.number }} + path: . + allow_forks: true + - name: Comment car diff on PR + uses: thollander/actions-comment-pull-request@v2 + with: + filePath: diff.txt + comment_tag: car_diff + pr_number: ${{ github.event.number }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4328ffd28d6..6b9806b4adf 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -77,11 +77,12 @@ jobs: - name: Test car diff if: github.event_name == 'pull_request' run: source setup.sh && python opendbc/car/tests/car_diff.py | tee diff.txt - - name: Comment PR + - name: Upload diff if: always() && github.event_name == 'pull_request' - env: - GH_TOKEN: ${{ github.token }} - run: '[ -s diff.txt ] && gh pr comment ${{ github.event.pull_request.number }} --repo ${{ github.repository }} -F diff.txt || true' + uses: actions/upload-artifact@v4 + with: + name: car_diff_${{ github.event.number }} + path: diff.txt - name: Update refs if: github.repository == 'commaai/opendbc' && github.ref == 'refs/heads/master' run: source setup.sh && python opendbc/car/tests/car_diff.py --update-refs diff --git a/opendbc/car/tests/car_diff.py b/opendbc/car/tests/car_diff.py index a75b8f95dff..9a2bd250544 100644 --- a/opendbc/car/tests/car_diff.py +++ b/opendbc/car/tests/car_diff.py @@ -262,7 +262,7 @@ def main(platform=None, segments_per_platform=10, update_refs=False, all_platfor platforms = get_changed_platforms(cwd, database, interfaces) if not platforms: - print("No car changes detected", file=sys.stderr) + print("No car changes detected") return 0 segments = {p: database.get(p, [])[:segments_per_platform] for p in platforms} From 839d2396167998b369d5f65150a6e834a9c4164b Mon Sep 17 00:00:00 2001 From: Alexandre Nobuharu Sato <66435071+AlexandreSato@users.noreply.github.com> Date: Wed, 21 Jan 2026 17:28:31 -0300 Subject: [PATCH 052/229] fingerprint subaru impreza 2019 (#2980) fp subaru impreza Co-authored-by: Daniel Koepping --- opendbc/car/subaru/fingerprints.py | 1 + 1 file changed, 1 insertion(+) diff --git a/opendbc/car/subaru/fingerprints.py b/opendbc/car/subaru/fingerprints.py index 9addabaa1e9..db73598005e 100644 --- a/opendbc/car/subaru/fingerprints.py +++ b/opendbc/car/subaru/fingerprints.py @@ -146,6 +146,7 @@ b'\xc5!ap\x07', b'\xc5!ar\x07', b'\xc5!as\x07', + b'\xc5!au\x07', b'\xc5!dr\x07', b'\xc5!ds\x07', b'\xca\x01b0\x07', From 6ba695cfd5391de18e56d9c53498ae0c6a47131e Mon Sep 17 00:00:00 2001 From: eFini Date: Thu, 22 Jan 2026 04:47:22 +0800 Subject: [PATCH 053/229] Honda: Taiwan 2025 HR-V Fingerprint (#2969) * Taiwan 2025 HR-V Fingerprint * fix ordering (via auto_fingerprint) --------- Co-authored-by: Daniel Koepping Co-authored-by: Jason Young --- opendbc/car/honda/fingerprints.py | 1 + 1 file changed, 1 insertion(+) diff --git a/opendbc/car/honda/fingerprints.py b/opendbc/car/honda/fingerprints.py index 9b5b68992e2..aac2a6013e1 100644 --- a/opendbc/car/honda/fingerprints.py +++ b/opendbc/car/honda/fingerprints.py @@ -855,6 +855,7 @@ b'77959-3V0-A910\x00\x00', ], (Ecu.fwdRadar, 0x18dab0f1, None): [ + b'8S102-3M1-T050\x00\x00', b'8S102-3M3-T050\x00\x00', b'8S102-3M6-P030\x00\x00', b'8S102-3M6-PA20\x00\x00', From 23b15a7569652879c899f3be5a7156e2725d3b90 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Wed, 21 Jan 2026 15:55:21 -0800 Subject: [PATCH 054/229] Subaru: add additional steering angle and clutch depressed (#3051) add clutch and angle --- opendbc/dbc/generator/subaru/_subaru_global.dbc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/opendbc/dbc/generator/subaru/_subaru_global.dbc b/opendbc/dbc/generator/subaru/_subaru_global.dbc index 39fcda0a939..cb06822c827 100644 --- a/opendbc/dbc/generator/subaru/_subaru_global.dbc +++ b/opendbc/dbc/generator/subaru/_subaru_global.dbc @@ -46,7 +46,7 @@ BO_ 64 Throttle: 8 XXX SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX SG_ Signal1 : 12|4@1+ (1,0) [0|15] "" XXX SG_ Engine_RPM : 16|13@1+ (1,0) [0|8191] "" XXX - SG_ Neutral : 31|1@1+ (1,0) [0|15] "" XXX + SG_ Neutral : 31|1@1+ (1,0) [0|1] "" XXX SG_ Throttle_Pedal : 32|8@1+ (1,0) [0|255] "" XXX SG_ Throttle_Cruise : 40|8@1+ (1,0) [0|255] "" XXX SG_ Throttle_Combo : 48|8@1+ (1,0) [0|255] "" XXX @@ -110,6 +110,7 @@ BO_ 282 Steering_2: 8 XXX BO_ 312 Brake_Pressure_L_R: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX + SG_ Steering_Angle : 16|16@1- (-0.1,0) [-3276.8|3276.7] "" XXX SG_ Brake_1 : 48|8@1+ (1,0) [0|255] "" XXX SG_ Brake_2 : 56|8@1+ (1,0) [0|255] "" XXX @@ -158,6 +159,7 @@ BO_ 544 ES_Brake: 8 XXX BO_ 577 Cruise_Status: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX + SG_ Clutch_Depressed : 47|1@0+ (1,0) [0|1] "" XXX SG_ Cruise_Set_Speed : 51|12@0+ (1,0) [0|120] "" XXX SG_ Cruise_On : 54|1@1+ (1,0) [0|1] "" XXX SG_ Cruise_Activated : 55|1@1+ (1,0) [0|1] "" XXX From f64e0bfe8ae3c0a2473dc0f78c288b4f5f5bab09 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Wed, 21 Jan 2026 22:34:30 -0800 Subject: [PATCH 055/229] Add misc bug template (#3057) * misc bug * rm --- .github/ISSUE_TEMPLATE/misc.yml | 36 +++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/misc.yml diff --git a/.github/ISSUE_TEMPLATE/misc.yml b/.github/ISSUE_TEMPLATE/misc.yml new file mode 100644 index 00000000000..3f4a1f619fe --- /dev/null +++ b/.github/ISSUE_TEMPLATE/misc.yml @@ -0,0 +1,36 @@ +name: Miscellaneous +description: For tools or test bugs, or enhancements +labels: ["bug"] +body: + + - type: markdown + attributes: + value: > + * If the issue likely only affects your car model or make, go back and open a **car bug report** instead. + Before creating a **miscellaneous bug report**, please check the following: + * Ensure there isn't an existing issue for your bug. If there is, leave a comment on the existing issue. + + - type: textarea + attributes: + label: Describe the bug or enhancement + description: Also include a description of how to reproduce the bug or how the enhancement would work + validations: + required: true + + - type: input + id: route + attributes: + label: Provide a route where the issue occurs if applicable + description: Ensure the route is fully uploaded at https://useradmin.comma.ai + placeholder: 77611a1fac303767|2020-05-11--16-37-07 + + - type: input + id: version + attributes: + label: openpilot version if applicable + description: If you're not on release, provide the commit hash + placeholder: 0.8.10 + + - type: textarea + attributes: + label: Additional info From 01a29844a6f6f072ab28fd9172e0e22eaf33660d Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Wed, 21 Jan 2026 23:04:35 -0800 Subject: [PATCH 056/229] Fixup car differ (#3056) * start * start * carfw * use existing can fp infra * run on all * tqdm is nice to have * rm * sort too * clean up * exe --- opendbc/car/tests/car_diff.py | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) mode change 100644 => 100755 opendbc/car/tests/car_diff.py diff --git a/opendbc/car/tests/car_diff.py b/opendbc/car/tests/car_diff.py old mode 100644 new mode 100755 index 9a2bd250544..09110238dcc --- a/opendbc/car/tests/car_diff.py +++ b/opendbc/car/tests/car_diff.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 import argparse import os import pickle @@ -6,9 +7,10 @@ import sys import tempfile import zstandard as zstd +from tqdm import tqdm +from tqdm.contrib.concurrent import process_map from urllib.request import urlopen from collections import defaultdict -from concurrent.futures import ProcessPoolExecutor from pathlib import Path from comma_car_segments import get_comma_car_segments_database, get_url @@ -42,20 +44,21 @@ def dict_diff(d1, d2, path="", ignore=None, tolerance=0): def load_can_messages(seg): parts = seg.split("/") url = get_url(f"{parts[0]}/{parts[1]}", parts[2]) - msgs = LogReader(url, only_union_types=True) + msgs = LogReader(url, only_union_types=True, sort_by_time=True) return [m for m in msgs if m.which() == 'can'] def replay_segment(platform, can_msgs): - from opendbc.car import gen_empty_fingerprint, structs + from opendbc.car import structs from opendbc.car.can_definitions import CanData - from opendbc.car.car_helpers import FRAME_FINGERPRINT, interfaces + from opendbc.car.car_helpers import interfaces, can_fingerprint - fingerprint = gen_empty_fingerprint() - for msg in can_msgs[:FRAME_FINGERPRINT]: - for m in msg.can: - if m.src < 64: - fingerprint[m.src][m.address] = len(m.dat) + _can_msgs = ([CanData(can.address, can.dat, can.src) for can in m.can] for m in can_msgs) + + def can_recv(wait_for_one: bool = False) -> list[list[CanData]]: + return [next(_can_msgs, [])] + + _, fingerprint = can_fingerprint(can_recv) CarInterface = interfaces[platform] CP = CarInterface.get_params(platform, fingerprint, [], False, False, False) @@ -111,7 +114,7 @@ def get_changed_platforms(cwd, database, interfaces): def download_refs(ref_path, platforms, segments): base_url = f"https://raw.githubusercontent.com/commaai/ci-artifacts/refs/heads/{DIFF_BUCKET}" - for platform in platforms: + for platform in tqdm(platforms): for seg in segments.get(platform, []): filename = f"{platform}_{seg.replace('/', '_')}.zst" try: @@ -124,8 +127,7 @@ def download_refs(ref_path, platforms, segments): def run_replay(platforms, segments, ref_path, update, workers=4): work = [(platform, seg, ref_path, update) for platform in platforms for seg in segments.get(platform, [])] - with ProcessPoolExecutor(max_workers=workers) as pool: - return list(pool.map(process_segment, work)) + return process_map(process_segment, work, max_workers=workers) # ASCII waveforms helpers From 33c1840d0466c2983d4c87b55a73d81861289c15 Mon Sep 17 00:00:00 2001 From: MVL Date: Thu, 22 Jan 2026 11:08:17 -0500 Subject: [PATCH 057/229] Honda - CANFD Acura TLX 2025 (#3037) * add 25 TLX fingerprints * Add 25 TLX values * temp testroute exception * temporary torque data until testdrive * add 2025 TLX initial torque numbers * adding 25 TLX initial testroute * fix testroute typo * increase steermax to 3840 * Increase TLX 2G MMR steermax based on testroute * Update TLX 2G MMR torque data based on testroute * Newer TLX 2G MMR testroute * Revising torque parameters a bit more after hours of driving * Revising steer ratio a bit more after hours of driving * Clean test route for Acura TLX 2G MMR --------- Co-authored-by: Daniel Koepping Co-authored-by: Jason Young --- opendbc/car/honda/fingerprints.py | 8 ++++++++ opendbc/car/honda/interface.py | 5 +++++ opendbc/car/honda/values.py | 5 +++++ opendbc/car/tests/routes.py | 1 + opendbc/car/torque_data/override.toml | 1 + 5 files changed, 20 insertions(+) diff --git a/opendbc/car/honda/fingerprints.py b/opendbc/car/honda/fingerprints.py index aac2a6013e1..19bbcbe070d 100644 --- a/opendbc/car/honda/fingerprints.py +++ b/opendbc/car/honda/fingerprints.py @@ -1068,4 +1068,12 @@ b'36161-TGV-A030\x00\x00', ], }, + CAR.ACURA_TLX_2G_MMR: { + (Ecu.fwdRadar, 0x18dab0f1, None): [ + b'8S302-TGV-A030\x00\x00', + ], + (Ecu.fwdCamera, 0x18dab5f1, None): [ + b'8S102-TGV-A030\x00\x00', + ], + }, } diff --git a/opendbc/car/honda/interface.py b/opendbc/car/honda/interface.py index 59e300c4f07..18fd2fbc8c4 100755 --- a/opendbc/car/honda/interface.py +++ b/opendbc/car/honda/interface.py @@ -191,6 +191,11 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo # When using stock ACC, the radar intercepts and filters steering commands the EPS would otherwise accept ret.minSteerSpeed = 70. * CV.KPH_TO_MS + elif candidate == CAR.ACURA_TLX_2G_MMR: + ret.steerActuatorDelay = 0.15 + ret.lateralParams.torqueBP, ret.lateralParams.torqueV = [[0, 3840], [0, 3840]] + CarInterfaceBase.configure_torque_tune(candidate, ret.lateralTuning) + else: ret.steerActuatorDelay = 0.15 ret.lateralParams.torqueBP, ret.lateralParams.torqueV = [[0, 2560], [0, 2560]] diff --git a/opendbc/car/honda/values.py b/opendbc/car/honda/values.py index 3cdccc1eb24..80958c8b90a 100644 --- a/opendbc/car/honda/values.py +++ b/opendbc/car/honda/values.py @@ -277,6 +277,11 @@ class CAR(Platforms): {Bus.pt: 'honda_civic_hatchback_ex_2017_can_generated'}, flags=HondaFlags.BOSCH_ALT_RADAR, ) + # mid-model refresh + ACURA_TLX_2G_MMR = HondaBoschCANFDPlatformConfig( + [HondaCarDocs("Acura TLX 2025", "All")], + CarSpecs(mass=3990 * CV.LB_TO_KG, wheelbase=2.87, centerToFrontRatio=0.43, steerRatio=13.7), + ) # Nidec Cars ACURA_ILX = HondaNidecPlatformConfig( diff --git a/opendbc/car/tests/routes.py b/opendbc/car/tests/routes.py index 3fef40ef93a..9202da7a77a 100644 --- a/opendbc/car/tests/routes.py +++ b/opendbc/car/tests/routes.py @@ -127,6 +127,7 @@ class CarTestRoute(NamedTuple): # CarTestRoute("56b2cf1dacdcd033/00000017--d24ffdb376", HONDA.HONDA_CITY_7G), # Brazilian model CarTestRoute("2dc4489d7e1410ca/00000001--bbec3f5117", HONDA.HONDA_CRV_6G), CarTestRoute("a703d058f4e05aeb/00000008--f169423024", HONDA.HONDA_PASSPORT_4G), + CarTestRoute("ad9840558640c31d/000001f2--026c4f6275", HONDA.ACURA_TLX_2G_MMR), CarTestRoute("87d7f06ade479c2e/2023-09-11--23-30-11", HYUNDAI.HYUNDAI_AZERA_6TH_GEN), CarTestRoute("66189dd8ec7b50e6/2023-09-20--07-02-12", HYUNDAI.HYUNDAI_AZERA_HEV_6TH_GEN), diff --git a/opendbc/car/torque_data/override.toml b/opendbc/car/torque_data/override.toml index 69cc6048d66..d2416afc3fe 100644 --- a/opendbc/car/torque_data/override.toml +++ b/opendbc/car/torque_data/override.toml @@ -91,6 +91,7 @@ legend = ["LAT_ACCEL_FACTOR", "MAX_LAT_ACCEL_MEASURED", "FRICTION"] "HONDA_ODYSSEY_5G_MMR" = [0.9, 0.9, 0.2] "HONDA_NBOX_2G" = [1.2, 1.2, 0.2] "ACURA_TLX_2G" = [1.2, 1.2, 0.15] +"ACURA_TLX_2G_MMR" = [1.7, 1.7, 0.16] "PORSCHE_MACAN_MK1" = [2.0, 2.0, 0.2] # Dashcam or fallback configured as ideal car From d56dd7f6a71577c6730e28f57700ed7c4d1bd02c Mon Sep 17 00:00:00 2001 From: Nikita Pylypyuk <147505783+nikitap066@users.noreply.github.com> Date: Thu, 22 Jan 2026 16:27:08 +0000 Subject: [PATCH 058/229] Chrysler: correct radar lateral position sign (#3043) align radar yRel with left-positive convention Co-authored-by: Daniel Koepping --- opendbc/car/chrysler/radar_interface.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opendbc/car/chrysler/radar_interface.py b/opendbc/car/chrysler/radar_interface.py index 4ad4afa1d00..ff5d7680ccf 100755 --- a/opendbc/car/chrysler/radar_interface.py +++ b/opendbc/car/chrysler/radar_interface.py @@ -73,8 +73,8 @@ def update(self, can_strings): if 'LONG_DIST' in cpt: # c_* message self.pts[trackId].dRel = cpt['LONG_DIST'] # from front of car # our lat_dist is positive to the right in car's frame. - # TODO what does yRel want? - self.pts[trackId].yRel = cpt['LAT_DIST'] # in car frame's y axis, left is positive + # LAT_DIST is right-positive, yRel is left-positive + self.pts[trackId].yRel = -cpt['LAT_DIST'] # in car frame's y axis, left is positive else: # d_* message self.pts[trackId].vRel = cpt['REL_SPEED'] From 8f5e3204e01fa9c3750f2bdb4773f25edbe5ac76 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Thu, 22 Jan 2026 16:31:09 -0800 Subject: [PATCH 059/229] Tesla: add FSD 14 failsafe detection (#3053) * add fsd 14 failsafe detection * fix logic * dont perm set if FSD 13 user starts op with FSD/autosteer, engages to get a noEntry, and then swaps to correct TACC --- opendbc/car/tesla/carstate.py | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/opendbc/car/tesla/carstate.py b/opendbc/car/tesla/carstate.py index 3b71ae69b90..5158a40f9f5 100644 --- a/opendbc/car/tesla/carstate.py +++ b/opendbc/car/tesla/carstate.py @@ -1,10 +1,11 @@ import copy from opendbc.can import CANDefine, CANParser from opendbc.car import Bus, structs +from opendbc.car.carlog import carlog from opendbc.car.common.conversions import Conversions as CV from opendbc.car.interfaces import CarStateBase from opendbc.car.tesla.teslacan import get_steer_ctrl_type -from opendbc.car.tesla.values import DBC, CANBUS, GEAR_MAP, STEER_THRESHOLD, CAR +from opendbc.car.tesla.values import DBC, CANBUS, GEAR_MAP, STEER_THRESHOLD, CAR, TeslaFlags ButtonType = structs.CarState.ButtonEvent.Type @@ -18,6 +19,8 @@ def __init__(self, CP): self.autopark = False self.autopark_prev = False self.cruise_enabled_prev = False + self.fsd14_error_logged = False + self.suspected_fsd14 = False self.hands_on_level = 0 self.das_control = None @@ -113,10 +116,23 @@ def update(self, can_parsers) -> structs.CarState: ret.stockLkas = cp_ap_party.vl["DAS_steeringControl"]["DAS_steeringControlType"] == lkas_ctrl_type # LANE_KEEP_ASSIST # Stock Autosteer should be off (includes FSD) + # TODO: find for TESLA_MODEL_X if self.CP.carFingerprint in (CAR.TESLA_MODEL_3, CAR.TESLA_MODEL_Y): ret.invalidLkasSetting = cp_ap_party.vl["DAS_settings"]["DAS_autosteerEnabled"] != 0 - else: - pass + + # Because we don't have FSD 14 detection outside of a set of FW, we should check if this FW is accidentally missing from FSD_14_FW + # 1. If in Autosteer or FSD, already caught by invalidLkasSetting + # 2. If in TACC and DAS ever sends ANGLE_CONTROL (1), we can infer it's trying to do LKAS on FSD 14+ + angle_control = cp_ap_party.vl["DAS_steeringControl"]["DAS_steeringControlType"] == 1 # ANGLE_CONTROL + if not ret.invalidLkasSetting and angle_control and not self.CP.flags & TeslaFlags.FSD_14: + self.suspected_fsd14 = True + + if self.suspected_fsd14: + ret.invalidLkasSetting = True + if not self.fsd14_error_logged: + carlog.error("FSD 14 detected, but FW not in FSD_14_FW set") + self.fsd14_error_logged = True + # Buttons # ToDo: add Gap adjust button # Messages needed by carcontroller From fd5e5b5c3ffdd6b48c1475fe96d3e21345c49903 Mon Sep 17 00:00:00 2001 From: MVL Date: Thu, 22 Jan 2026 23:58:16 -0500 Subject: [PATCH 060/229] Honda: Allow manual for 10G Civic (#3025) * Add manual transmission to CIVIC_BOSCH * Add 19 Civic Hatchback MT fingerprint --------- Co-authored-by: Daniel Koepping --- opendbc/car/honda/fingerprints.py | 1 + opendbc/car/honda/values.py | 1 + 2 files changed, 2 insertions(+) diff --git a/opendbc/car/honda/fingerprints.py b/opendbc/car/honda/fingerprints.py index 19bbcbe070d..4d5134b9945 100644 --- a/opendbc/car/honda/fingerprints.py +++ b/opendbc/car/honda/fingerprints.py @@ -220,6 +220,7 @@ b'57114-TBG-A340\x00\x00', b'57114-TBG-A350\x00\x00', b'57114-TGG-A340\x00\x00', + b'57114-TGG-C120\x00\x00', b'57114-TGG-C320\x00\x00', b'57114-TGG-G320\x00\x00', b'57114-TGG-L320\x00\x00', diff --git a/opendbc/car/honda/values.py b/opendbc/car/honda/values.py index 80958c8b90a..389af02b040 100644 --- a/opendbc/car/honda/values.py +++ b/opendbc/car/honda/values.py @@ -185,6 +185,7 @@ class CAR(Platforms): ], CarSpecs(mass=1326, wheelbase=2.7, steerRatio=15.38, centerToFrontRatio=0.4), # steerRatio: 10.93 is end-to-end spec {Bus.pt: 'honda_civic_hatchback_ex_2017_can_generated'}, + flags=HondaFlags.ALLOW_MANUAL_TRANS, ) HONDA_CIVIC_BOSCH_DIESEL = HondaBoschPlatformConfig( [], # don't show in docs From 0020a2f5191e7a0b73dc2337ac5d40035dd8e3a7 Mon Sep 17 00:00:00 2001 From: Javier Fernandez Date: Fri, 23 Jan 2026 06:20:25 +0100 Subject: [PATCH 061/229] HKG: add FW Hyundai Tucson HEV 2022 EUR (#3061) * Update fing Update fingerprints.py hyundai Tucson EUR 2022 Hybriderprints.py The 2022-2024 Hyundai Tucson NX4 Hybrid in the European version with Can-FD and the Hyundai N harness was not detected by the official openpilot branch, it had to be selected manually. After following the steps to create a new fingerprints, I added the corresponding lines to the fingerprints.py file, and now the official branch works on this car model, it automatically selects the model. Also the file values.py was modified to add Ecu.eps to non_essential_ecus * Update values.py hyundai Tucson EUR 2022 Hybrid The 2022-2024 Hyundai Tucson NX4 Hybrid in the European version with Can-FD and the Hyundai N harness was not detected by the official openpilot branch, it had to be selected manually. After following the steps to create a new fingerprints, I added the corresponding lines to the fingerprints.py file, and now the official branch works on this car model and it automatically selects the model. Also the file values.py was modified to add Ecu.eps to non_essential_ecus * Apply suggestions from code review --------- Co-authored-by: Shane Smiskol --- opendbc/car/hyundai/fingerprints.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/opendbc/car/hyundai/fingerprints.py b/opendbc/car/hyundai/fingerprints.py index 7b4bb1c72ee..4db215b71b9 100644 --- a/opendbc/car/hyundai/fingerprints.py +++ b/opendbc/car/hyundai/fingerprints.py @@ -1084,12 +1084,14 @@ b'\xf1\x00NX4 FR_CMR AT USA LHD 1.00 1.00 99211-N9260 14Y', b'\xf1\x00NX4 FR_CMR AT USA LHD 1.00 1.01 99211-N9100 14A', b'\xf1\x00NX4 FR_CMR AT USA LHD 1.00 1.01 99211-N9240 14T', + b'\xf1\x00NX4 FR_CMR AT EUR LHD 1.00 1.00 99211-N9240 14Q', ], (Ecu.fwdRadar, 0x7d0, None): [ b'\xf1\x00NX4__ 1.00 1.00 99110-N9100 ', b'\xf1\x00NX4__ 1.00 1.01 99110-N9000 ', b'\xf1\x00NX4__ 1.00 1.02 99110-N9000 ', b'\xf1\x00NX4__ 1.01 1.00 99110-N9100 ', + b'\xf1\x00NX4__ 1.01 1.02 99110-N9000 ', ], }, CAR.HYUNDAI_SANTA_CRUZ_1ST_GEN: { From 3657bc3232ce1fbb704a50c8af06655961305da0 Mon Sep 17 00:00:00 2001 From: MVL Date: Fri, 23 Jan 2026 00:24:02 -0500 Subject: [PATCH 062/229] Honda - Euro Civic Type R FK8 support (#2986) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update fingerprints.py Added params from here {'carParams': {'alphaLongitudinalAvailable': False, 'alternativeExperience': 0, 'autoResumeSng': True, 'brand': 'mock', 'carFingerprint': 'MOCK', 'carFw': [{'address': 417001457, 'brand': 'honda', 'bus': 1, 'ecu': 'gateway', 'fwVersion': b'38897-TBA-A020\x00\x00', 'logging': False, 'obdMultiplexing': True, 'request': [b'"\xf1\x81'], 'responseAddress': 417001967, 'subAddress': 0}, {'address': 416952561, 'brand': 'honda', 'bus': 1, 'ecu': 'eps', 'fwVersion': b'39990-TGH-J020\x00\x00', 'logging': False, 'obdMultiplexing': True, 'request': [b'"\xf1\x81'], 'responseAddress': 417001776, 'subAddress': 0}, {'address': 416944369, 'brand': 'honda', 'bus': 1, 'ecu': 'programmedFuelInjection', 'fwVersion': b'37805-5BF-E030\x00\x00', 'logging': True, 'obdMultiplexing': True, 'request': [b'"\xf1\x81'], 'responseAddress': 417001744, 'subAddress': 0}, {'address': 416964849, 'brand': 'honda', 'bus': 1, 'ecu': 'combinationMeter', 'fwVersion': b'78109-TGH-E310\x00\x00', 'logging': True, 'obdMultiplexing': True, 'request': [b'"\xf1\x81'], 'responseAddress': 417001824, 'subAddress': 0}, {'address': 416950513, 'brand': 'honda', 'bus': 1, 'ecu': 'vsa', 'fwVersion': b'57114-TGH-A130\x00\x00', 'logging': False, 'obdMultiplexing': True, 'request': [b'"\xf1\x81'], 'responseAddress': 417001768, 'subAddress': 0}, {'address': 416986609, 'brand': 'honda', 'bus': 1, 'ecu': 'fwdCamera', 'fwVersion': b'36161-TGH-A020\x00\x00', 'logging': False, 'obdMultiplexing': True, 'request': [b'"\xf1\x81'], 'responseAddress': 417001909, 'subAddress': 0}, {'address': 416985329, 'brand': 'honda', 'bus': 1, 'ecu': 'fwdRadar', 'fwVersion': b'36802-TGH-A030\x00\x00', 'logging': False, 'obdMultiplexing': True, 'request': [b'"\xf1\x81'], 'responseAddress': 417001904, 'subAddress': 0}, {'address': 416961521, 'brand': 'honda', 'bus': 1, 'ecu': 'srs', 'fwVersion': b'77959-TGH-E220\x00\x00', 'logging': False, 'obdMultiplexing': True, 'request': [b'"\xf1\x81'], 'responseAddress': 417001811, 'subAddress': 0}, {'address': 417001457, 'brand': 'honda', 'bus': 1, 'ecu': 'gateway', 'fwVersion': b'\x0cH2462012\x00\x00\x00\x00 ', 'logging': True, 'obdMultiplexing': True, 'request': [b'"\xf1\x12'], 'responseAddress': 417001967, 'subAddress': 0}, {'address': 416952561, 'brand': 'honda', 'bus': 1, 'ecu': 'eps', 'fwVersion': b'\x0c BK7G255772C ', 'logging': True, 'obdMultiplexing': True, 'request': [b'"\xf1\x12'], 'responseAddress': 417001776, 'subAddress': 0}, {'address': 416944369, 'brand': 'honda', 'bus': 1, 'ecu': 'programmedFuelInjection', 'fwVersion': b'\x0e17-11-06 0131\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', 'logging': True, 'obdMultiplexing': True, 'request': [b'"\xf1\x12'], 'responseAddress': 417001744, 'subAddress': 0}, {'address': 416950513, 'brand': 'honda', 'bus': 1, 'ecu': 'vsa', 'fwVersion': b'\x0b72920747323\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', 'logging': True, 'obdMultiplexing': True, 'request': [b'"\xf1\x12'], 'responseAddress': 417001768, 'subAddress': 0}, {'address': 416986609, 'brand': 'honda', 'bus': 1, 'ecu': 'fwdCamera', 'fwVersion': b'\x0e11101711261084\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', 'logging': True, 'obdMultiplexing': True, 'request': [b'"\xf1\x12'], 'responseAddress': 417001909, 'subAddress': 0}, {'address': 416964849, 'brand': 'honda', 'bus': 1, 'ecu': 'combinationMeter', 'fwVersion': b'\x18H3344390\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', 'logging': True, 'obdMultiplexing': True, 'request': [b'"\xf1\x12'], 'responseAddress': 417001824, 'subAddress': 0}, {'address': 416985329, 'brand': 'honda', 'bus': 1, 'ecu': 'fwdRadar', 'fwVersion': b'\x0e04641711160A26\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', 'logging': True, 'obdMultiplexing': True, 'request': [b'"\xf1\x12'], 'responseAddress': 417001904, 'subAddress': 0}, {'address': 416961521, 'brand': 'honda', 'bus': 1, 'ecu': 'srs', 'fwVersion': b'\x0bC1DQ009B14Y\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', 'logging': True, 'obdMultiplexing': True, 'request': [b'"\xf1\x12'], 'responseAddress': 417001811, 'subAddress': 0}, {'address': 416952561, 'brand': 'honda', 'bus': 1, 'ecu': 'eps', 'fwVersion': b'39990-TGH-J020\x00\x00', 'logging': False, 'obdMultiplexing': False, 'request': [b'"\xf1\x81'], 'responseAddress': 417001776, 'subAddress': 0}, {'address': 416986609, 'brand': 'honda', 'bus': 1, 'ecu': 'fwdCamera', 'fwVersion': b'36161-TGH-A020\x00\x00', 'logging': False, 'obdMultiplexing': False, 'request': [b'"\xf1\x81'], 'responseAddress': 417001909, 'subAddress': 0}, {'address': 416985329, 'brand': 'honda', 'bus': 1, 'ecu': 'fwdRadar', 'fwVersion': b'36802-TGH-A030\x00\x00', 'logging': False, 'obdMultiplexing': False, 'request': [b'"\xf1\x81'], 'responseAddress': 417001904, 'subAddress': 0}, {'address': 416961521, 'brand': 'honda', 'bus': 1, 'ecu': 'srs', 'fwVersion': b'77959-TGH-E220\x00\x00', 'logging': False, 'obdMultiplexing': False, 'request': [b'"\xf1\x81'], 'responseAddress': 417001811, 'subAddress': 0}], 'carVin': 'SHHFK8790HU003163', * Update fingerprints.py Checked over them again * Update values.py Added whole new Civic Section * Update fingerprints.py CAR.HONDA_CIVIC_TYPE_R_FK8: {     (Ecu.gateway, 0x18DAF1EF, 0): [b'38897-TBA-A020\x00\x00'], # Gateway     (Ecu.abs, 0x18DAF128, 0): [b'57114-TGH-A130\x00\x00'], # VSA / ABS / ESP     (Ecu.eps, 0x18DAF130, 0): [b'39990-TGH-J020\x00\x00'], # Electric Power Steering     (Ecu.fwdCamera, 0x18DAF1B5, 0): [b'36161-TGH-A020\x00\x00'], # Forward Camera     (Ecu.engine, 0x18DAF110, 0): [b'37805-5BF-E030\x00\x00'], # Programmed Fuel Injection / ECM     (Ecu.combinationMeter, 0x18DAF160, 0): [b'78109-TGH-E310\x00\x00'],# Combination Meter     (Ecu.fwdRadar, 0x18DAF1B0, 0): [b'36802-TGH-A030\x00\x00'], # Forward Radar     (Ecu.srs, 0x18DAF153, 0): [b'77959-TGH-E220\x00\x00'], # SRS / Airbag   }, * Update values.py HONDA_CIVIC_TYPE_R_FK8 = HondaBoschPlatformConfig( [ HondaCarDocs( "Honda Civic Type R 2017-21", "EU Manual", min_steer_speed=12.0 * CV.MPH_TO_MS, ), ], CarSpecs( mass=1380, wheelbase=2.7, steerRatio=15.1, # Tuned via test drives (started at ~15.38 from stock Civic) centerToFrontRatio=0.4, # Recommended: matches standard Civic Bosch – helps lateral tuning ), {Bus.pt: 'honda_civic_hatchback_ex_2017_can_generated'}, # Same DBC as other FK8-era Civics ) * Update fingerprints.py Put the Honda_Civic_Bosch back as it was * Update fingerprints.py From ChatGPT checking * Update values.py Added Manual Trans to FK8 * Update fingerprints.py CAR.HONDA_CIVIC_TYPE_R_FK8: { (Ecu.gateway, 0x18daeff1, None): [b'38897-TBA-A020\x00\x00'], (Ecu.vsa, 0x18da28f1, None): [b'57114-TGH-A130\x00\x00'], (Ecu.eps, 0x18da30f1, None): [b'39990-TGH-J020\x00\x00'], (Ecu.programmedFuelInjection, 0x18da10f1, None): [b'37805-5BF-E030\x00\x00'], (Ecu.combinationMeter, 0x18da60f1, None): [b'78109-TGH-E310\x00\x00'], (Ecu.fwdRadar, 0x18dab0f1, None): [b'36802-TGH-A030\x00\x00'], (Ecu.fwdCamera, 0x18dab5f1, None): [b'36161-TGH-A020\x00\x00'], (Ecu.srs, 0x18da53f1, None): [b'77959-TGH-E220\x00\x00'], }, * Update values.py Added flags=HondaFlags.BOSCH | HondaFlags.ALLOW_MANUAL_TRANS, To FK8 * Keep CTR fingerprints under Bosch Civic * List FK8 as manual variant within Bosch Civic * Resort Euro FK8 fingerprints and remove duplicates --------- Co-authored-by: atmezferix Co-authored-by: Daniel Koepping Co-authored-by: Shane Smiskol --- opendbc/car/honda/fingerprints.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/opendbc/car/honda/fingerprints.py b/opendbc/car/honda/fingerprints.py index 4d5134b9945..071c87743f1 100644 --- a/opendbc/car/honda/fingerprints.py +++ b/opendbc/car/honda/fingerprints.py @@ -225,6 +225,7 @@ b'57114-TGG-G320\x00\x00', b'57114-TGG-L320\x00\x00', b'57114-TGG-L330\x00\x00', + b'57114-TGH-A130\x00\x00', b'57114-TGH-L130\x00\x00', b'57114-TGJ-Q330\x00\x00', b'57114-TGK-T320\x00\x00', @@ -239,6 +240,7 @@ b'39990-TGG-A020\x00\x00', b'39990-TGG-A120\x00\x00', b'39990-TGG-J510\x00\x00', + b'39990-TGH-J020\x00\x00', b'39990-TGH-J530\x00\x00', b'39990-TGL-E130\x00\x00', b'39990-TGN-E120\x00\x00', @@ -255,6 +257,7 @@ b'77959-TGG-J320\x00\x00', b'77959-TGG-Q810\x00\x00', b'77959-TGG-Z820\x00\x00', + b'77959-TGH-E220\x00\x00', b'77959-TGH-J110\x00\x00', ], (Ecu.fwdRadar, 0x18dab0f1, None): [ @@ -267,6 +270,7 @@ b'36802-TGG-A130\x00\x00', b'36802-TGG-G040\x00\x00', b'36802-TGG-G130\x00\x00', + b'36802-TGH-A030\x00\x00', b'36802-TGH-A140\x00\x00', b'36802-TGK-Q030\x00\x00', b'36802-TGK-Q120\x00\x00', @@ -283,6 +287,7 @@ b'36161-TGG-G070\x00\x00', b'36161-TGG-G130\x00\x00', b'36161-TGG-G140\x00\x00', + b'36161-TGH-A020\x00\x00', b'36161-TGH-A140\x00\x00', b'36161-TGK-Q040\x00\x00', b'36161-TGK-Q120\x00\x00', From 0185a52154b1b38276cf073a805b2e0d2a3537d8 Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Fri, 23 Jan 2026 00:07:06 -0600 Subject: [PATCH 063/229] Toyota: Prevent EPS fault during unwind after sharp turn (#2859) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 2019-2021 RAV4 * 2021-2023 RAV4 Prime * 2021-2023 Sienna These Toyota models can experience a rare EPS fault. After a sharp, low-speed manual turn the human lets go of the wheel. During or shortly after the unwind the EPS faults. It can be difficult to reproduce. PR #24067 "Toyota: remove 100°/sec steering lockout" attempted to prevent this high angle rate EPS fault by cutting torque if more than 18 frames. I found reducing this threshold by just one frame fixes the problem. Co-authored-by: Jason Young --- opendbc/car/toyota/carcontroller.py | 2 +- opendbc/safety/modes/toyota.h | 4 ++-- opendbc/safety/tests/test_toyota.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/opendbc/car/toyota/carcontroller.py b/opendbc/car/toyota/carcontroller.py index 380c64b3af9..e5e3df969b0 100644 --- a/opendbc/car/toyota/carcontroller.py +++ b/opendbc/car/toyota/carcontroller.py @@ -29,7 +29,7 @@ # LKA limits # EPS faults if you apply torque while the steering rate is above 100 deg/s for too long MAX_STEER_RATE = 100 # deg/s -MAX_STEER_RATE_FRAMES = 18 # tx control frames needed before torque can be cut +MAX_STEER_RATE_FRAMES = 17 # tx control frames needed before torque can be cut # EPS allows user torque above threshold for 50 frames before permanently faulting MAX_USER_TORQUE = 500 diff --git a/opendbc/safety/modes/toyota.h b/opendbc/safety/modes/toyota.h index 430726d8087..3e0a8b7c05f 100644 --- a/opendbc/safety/modes/toyota.h +++ b/opendbc/safety/modes/toyota.h @@ -168,9 +168,9 @@ static bool toyota_tx_hook(const CANPacket_t *msg) { // the EPS faults when the steering angle rate is above a certain threshold for too long. to prevent this, // we allow setting STEER_REQUEST bit to 0 while maintaining the requested torque value for a single frame - .min_valid_request_frames = 18, + .min_valid_request_frames = 17, .max_invalid_request_frames = 1, - .min_valid_request_rt_interval = 171000, // 171ms; a ~10% buffer on cutting every 19 frames + .min_valid_request_rt_interval = 162000, // 162ms; a ~10% buffer on cutting every 18 frames .has_steer_req_tolerance = true, }; diff --git a/opendbc/safety/tests/test_toyota.py b/opendbc/safety/tests/test_toyota.py index dc94ddbec60..35f1c2b1fe1 100755 --- a/opendbc/safety/tests/test_toyota.py +++ b/opendbc/safety/tests/test_toyota.py @@ -133,7 +133,7 @@ class TestToyotaSafetyTorque(TestToyotaSafetyBase, common.MotorTorqueSteeringSaf TORQUE_MEAS_TOLERANCE = 1 # toyota safety adds one to be conservative for rounding # Safety around steering req bit - MIN_VALID_STEERING_FRAMES = 18 + MIN_VALID_STEERING_FRAMES = 17 MAX_INVALID_STEERING_FRAMES = 1 def setUp(self): From 1908668b05691564ea5fc80bc11b784a9dee0714 Mon Sep 17 00:00:00 2001 From: adeebshihadeh Date: Fri, 23 Jan 2026 08:09:41 +0000 Subject: [PATCH 064/229] docs: Scheduled auto-update CARS.md --- docs/CARS.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/CARS.md b/docs/CARS.md index cd8d210b8df..792cad67cf5 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -1,6 +1,6 @@ -# Support Information for 385 Known Cars +# Support Information for 386 Known Cars |Make|Model|Package|Support Level| |---|---|---|:---:| @@ -19,6 +19,7 @@ |Acura|TLX 2018-20|All|[Community](#community)| |Acura|TLX 2021|All|[Upstream](#upstream)| |Acura|TLX 2022-23|All|[Community](#community)| +|Acura|TLX 2025|All|[Upstream](#upstream)| |Acura|ZDX 2024|All|[Not compatible](#can-bus-security)| |Audi|A3 2014-19|Adaptive Cruise Control (ACC) & Lane Assist|[Upstream](#upstream)| |Audi|A3 Sportback e-tron 2017-18|Adaptive Cruise Control (ACC) & Lane Assist|[Upstream](#upstream)| From 32bb2ac0a5d1eac060d65a436ccf69564cf99c54 Mon Sep 17 00:00:00 2001 From: gs450h Date: Fri, 23 Jan 2026 17:48:54 -0600 Subject: [PATCH 065/229] Added GS_450h ECU details to fingerprints.py file under GS_F (#3015) * Added GS_450h ECU details to fingerprints.py file under GS_F * Update opendbc/car/toyota/fingerprints.py --------- Co-authored-by: Raul Rodriguez Jr Co-authored-by: Daniel Koepping Co-authored-by: Shane Smiskol --- opendbc/car/toyota/fingerprints.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/opendbc/car/toyota/fingerprints.py b/opendbc/car/toyota/fingerprints.py index 65396df222d..67bd6665298 100644 --- a/opendbc/car/toyota/fingerprints.py +++ b/opendbc/car/toyota/fingerprints.py @@ -1439,21 +1439,26 @@ CAR.LEXUS_GS_F: { (Ecu.engine, 0x7e0, None): [ b'\x0233075200\x00\x00\x00\x00\x00\x00\x00\x00530B9000\x00\x00\x00\x00\x00\x00\x00\x00', + b'\x02330Y8000\x00\x00\x00\x00\x00\x00\x00\x00A4701000\x00\x00\x00\x00\x00\x00\x00\x00', ], (Ecu.abs, 0x7b0, None): [ b'F152630700\x00\x00\x00\x00\x00\x00', + b'F152630400\x00\x00\x00\x00\x00\x00', ], (Ecu.dsu, 0x791, None): [ b'881513016200\x00\x00\x00\x00', + b'881513011300\x00\x00\x00\x00', ], (Ecu.eps, 0x7a1, None): [ b'8965B30551\x00\x00\x00\x00\x00\x00', + b'8965B30431\x00\x00\x00\x00\x00\x00', ], (Ecu.fwdRadar, 0x750, 0xf): [ b'8821F4702000\x00\x00\x00\x00', ], (Ecu.fwdCamera, 0x750, 0x6d): [ b'8646F3002100\x00\x00\x00\x00', + b'8646F3001200\x00\x00\x00\x00', ], }, CAR.LEXUS_NX: { From 1b3e0ceab5d422345a3622dd57c51c3260c0b448 Mon Sep 17 00:00:00 2001 From: ugtthis <142481257+ugtthis@users.noreply.github.com> Date: Fri, 23 Jan 2026 22:35:45 -0600 Subject: [PATCH 066/229] CarDocs: Update car package name (#3065) update naming --- opendbc/car/extra_cars.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opendbc/car/extra_cars.py b/opendbc/car/extra_cars.py index fed2f5a4914..a2dd470e8eb 100644 --- a/opendbc/car/extra_cars.py +++ b/opendbc/car/extra_cars.py @@ -55,8 +55,8 @@ class CAR(Platforms): EXTRA_HYUNDAI = ExtraPlatformConfig( [ - CommunityCarDocs("Hyundai Palisade 2023-24", package="HDA2"), - CommunityCarDocs("Kia Telluride 2023-24", package="HDA2"), + CommunityCarDocs("Hyundai Palisade 2023-24", "Highway Driving Assist II"), + CommunityCarDocs("Kia Telluride 2023-24", "Highway Driving Assist II"), ], ) From 2000d7dafc19a5ca454553d79eb5af56e786321a Mon Sep 17 00:00:00 2001 From: smurf88sys Date: Fri, 23 Jan 2026 23:38:10 -0500 Subject: [PATCH 067/229] Tesla: Add support for Model 3 (#3050) Co-authored-by: Daniel Koepping --- opendbc/car/tesla/fingerprints.py | 1 + 1 file changed, 1 insertion(+) diff --git a/opendbc/car/tesla/fingerprints.py b/opendbc/car/tesla/fingerprints.py index 2ebaef0b8fb..8d4b185e17a 100644 --- a/opendbc/car/tesla/fingerprints.py +++ b/opendbc/car/tesla/fingerprints.py @@ -18,6 +18,7 @@ b'TeMYG4_Main_0.0.0 (59),E4H014.29.0', b'TeMYG4_Main_0.0.0 (65),E4H015.01.0', b'TeMYG4_Main_0.0.0 (67),E4H015.02.1', + b'TeMYG4_Main_0.0.0 (77),E4H015.04.5', b'TeMYG4_SingleECU_0.0.0 (33),E4S014.27', ], }, From 703b9efc527e16cedd2ade791f8c360e3955e774 Mon Sep 17 00:00:00 2001 From: Daniel Koepping Date: Fri, 23 Jan 2026 20:51:20 -0800 Subject: [PATCH 068/229] Car diff: rm except (#3062) * import to top * no except --- opendbc/car/tests/car_diff.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/opendbc/car/tests/car_diff.py b/opendbc/car/tests/car_diff.py index 09110238dcc..12b3af0552a 100755 --- a/opendbc/car/tests/car_diff.py +++ b/opendbc/car/tests/car_diff.py @@ -15,6 +15,9 @@ from comma_car_segments import get_comma_car_segments_database, get_url +from opendbc.car import structs +from opendbc.car.can_definitions import CanData +from opendbc.car.car_helpers import can_fingerprint, interfaces from opendbc.car.logreader import LogReader, decompress_stream @@ -49,10 +52,6 @@ def load_can_messages(seg): def replay_segment(platform, can_msgs): - from opendbc.car import structs - from opendbc.car.can_definitions import CanData - from opendbc.car.car_helpers import interfaces, can_fingerprint - _can_msgs = ([CanData(can.address, can.dat, can.src) for can in m.can] for m in can_msgs) def can_recv(wait_for_one: bool = False) -> list[list[CanData]]: @@ -117,11 +116,8 @@ def download_refs(ref_path, platforms, segments): for platform in tqdm(platforms): for seg in segments.get(platform, []): filename = f"{platform}_{seg.replace('/', '_')}.zst" - try: - with urlopen(f"{base_url}/{filename}") as resp: - (Path(ref_path) / filename).write_bytes(resp.read()) - except Exception: - pass + with urlopen(f"{base_url}/{filename}") as resp: + (Path(ref_path) / filename).write_bytes(resp.read()) def run_replay(platforms, segments, ref_path, update, workers=4): @@ -246,8 +242,6 @@ def format_diff(diffs): def main(platform=None, segments_per_platform=10, update_refs=False, all_platforms=False): - from opendbc.car.car_helpers import interfaces - cwd = Path(__file__).resolve().parents[3] ref_path = cwd / DIFF_BUCKET if not update_refs: From 1538c5351a54967f6412e020b324308bcc5c9d9a Mon Sep 17 00:00:00 2001 From: MVL Date: Fri, 23 Jan 2026 23:51:55 -0500 Subject: [PATCH 069/229] Honda - support RDX 3G variants with brake booster (alt_brake) (#2973) Add ACURA_RDX_3G to alternate brake message check Co-authored-by: Daniel Koepping --- opendbc/car/honda/interface.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendbc/car/honda/interface.py b/opendbc/car/honda/interface.py index 18fd2fbc8c4..f8c60a5cbe3 100755 --- a/opendbc/car/honda/interface.py +++ b/opendbc/car/honda/interface.py @@ -202,7 +202,7 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo CarInterfaceBase.configure_torque_tune(candidate, ret.lateralTuning) # These cars use alternate user brake msg (0x1BE) - if 0x1BE in fingerprint[CAN.pt] and candidate in (CAR.HONDA_ACCORD, CAR.HONDA_HRV_3G, *HONDA_BOSCH_CANFD): + if 0x1BE in fingerprint[CAN.pt] and candidate in (CAR.HONDA_ACCORD, CAR.HONDA_HRV_3G, CAR.ACURA_RDX_3G, *HONDA_BOSCH_CANFD): ret.flags |= HondaFlags.BOSCH_ALT_BRAKE.value if ret.flags & HondaFlags.BOSCH_ALT_BRAKE: From 2dc68791400ea0d65af50e69ffe0e8dec38ef224 Mon Sep 17 00:00:00 2001 From: royjr Date: Fri, 23 Jan 2026 23:58:31 -0500 Subject: [PATCH 070/229] HKG: add FW for 2022 Hyundai Kona Electric (#2981) Update fingerprints.py Co-authored-by: Daniel Koepping --- opendbc/car/hyundai/fingerprints.py | 1 + 1 file changed, 1 insertion(+) diff --git a/opendbc/car/hyundai/fingerprints.py b/opendbc/car/hyundai/fingerprints.py index 4db215b71b9..98da5215942 100644 --- a/opendbc/car/hyundai/fingerprints.py +++ b/opendbc/car/hyundai/fingerprints.py @@ -698,6 +698,7 @@ b'\xf1\x00OSP MDPS C 1.00 1.02 56310-K4271 4OEPC102', b'\xf1\x00OSP MDPS C 1.00 1.02 56310/K4271 4OEPC102', b'\xf1\x00OSP MDPS C 1.00 1.02 56310/K4970 4OEPC102', + b'\xf1\x00OSP MDPS C 1.00 1.02 56310/K4971 4OEPC102', b'\xf1\x00OSP MDPS C 1.00 1.02 56310K4260\x00 4OEPC102', b'\xf1\x00OSP MDPS C 1.00 1.02 56310K4261\x00 4OEPC102', b'\xf1\x00OSP MDPS C 1.00 1.02 56310K4971\x00 4OEPC102', From eaba233b3502b8f8ce25f3eff92a3efa880fad34 Mon Sep 17 00:00:00 2001 From: Daniel Koepping Date: Fri, 23 Jan 2026 21:28:00 -0800 Subject: [PATCH 071/229] Car diff: add trace (#3066) --- opendbc/car/tests/car_diff.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/opendbc/car/tests/car_diff.py b/opendbc/car/tests/car_diff.py index 12b3af0552a..482d67436db 100755 --- a/opendbc/car/tests/car_diff.py +++ b/opendbc/car/tests/car_diff.py @@ -6,6 +6,7 @@ import subprocess import sys import tempfile +import traceback import zstandard as zstd from tqdm import tqdm from tqdm.contrib.concurrent import process_map @@ -94,8 +95,8 @@ def process_segment(args): for diff in dict_diff(ref_state.to_dict(), state.to_dict(), ignore=IGNORE_FIELDS, tolerance=TOLERANCE): diffs.append((diff[1], i, diff[2], ts)) return (platform, seg, diffs, None) - except Exception as e: - return (platform, seg, [], str(e)) + except Exception: + return (platform, seg, [], traceback.format_exc()) def get_changed_platforms(cwd, database, interfaces): From f88c531576bb62a30edd9090c3e2c60efbd20061 Mon Sep 17 00:00:00 2001 From: commaci-public <60409688+commaci-public@users.noreply.github.com> Date: Fri, 23 Jan 2026 21:55:27 -0800 Subject: [PATCH 072/229] [bot] Update cppcheck to 2.19.1 (#2982) * [bot] Update cppcheck to 2.19.1 * update table * try assistance * not needed with --platform? * rm --------- Co-authored-by: Vehicle Researcher Co-authored-by: Shane Smiskol --- opendbc/safety/tests/misra/coverage_table | 2 +- opendbc/safety/tests/misra/install.sh | 2 +- opendbc/safety/tests/misra/test_misra.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/opendbc/safety/tests/misra/coverage_table b/opendbc/safety/tests/misra/coverage_table index 0395aba0d67..8753003fe9f 100644 --- a/opendbc/safety/tests/misra/coverage_table +++ b/opendbc/safety/tests/misra/coverage_table @@ -9,7 +9,7 @@ 2.6 X (Cppcheck) 2.7 X (Addon) 3.1 X (Addon) -3.2 X (Addon) +3.2 4.1 X (Addon) 4.2 X (Addon) 5.1 X (Addon) diff --git a/opendbc/safety/tests/misra/install.sh b/opendbc/safety/tests/misra/install.sh index 25bb5a4e940..f586fc32d53 100755 --- a/opendbc/safety/tests/misra/install.sh +++ b/opendbc/safety/tests/misra/install.sh @@ -15,7 +15,7 @@ fi cd $CPPCHECK_DIR -VERS="2.18.3" +VERS="2.19.1" if [ "$(git describe --tags --always)" != "$VERS" ]; then git fetch --all --tags --force git checkout $VERS diff --git a/opendbc/safety/tests/misra/test_misra.sh b/opendbc/safety/tests/misra/test_misra.sh index 072c51b030f..6707842880f 100755 --- a/opendbc/safety/tests/misra/test_misra.sh +++ b/opendbc/safety/tests/misra/test_misra.sh @@ -37,7 +37,7 @@ cppcheck() { OPENDBC_ROOT=${OPENDBC_ROOT:-$BASEDIR} $CPPCHECK_DIR/cppcheck --inline-suppr -I $OPENDBC_ROOT \ - -I "$(gcc -print-file-name=include)" --suppress=*:/usr/lib/gcc/* --suppress=*:*/usr/lib/clang/* \ + --suppress=missingIncludeSystem \ --suppressions-list=$DIR/suppressions.txt \ --error-exitcode=2 --check-level=exhaustive --safety \ --platform=arm32-wchar_t4 $COMMON_DEFINES --checkers-report=$CHECKLIST.tmp \ From 1196a244b74751fd75b93c730e8430a3bdd0646b Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Sat, 24 Jan 2026 01:31:31 -0500 Subject: [PATCH 073/229] tesla: add radar CAN parsing and radar interface for model 3 (#3011) * tesla radar interface * add cmt --------- Co-authored-by: Daniel Koepping Co-authored-by: Shane Smiskol --- opendbc/car/tesla/interface.py | 14 ++++- opendbc/car/tesla/radar_interface.py | 89 +++++++++++++++++++++++++++ opendbc/car/tesla/tests/__init__.py | 0 opendbc/car/tesla/tests/test_tesla.py | 24 ++++++++ opendbc/car/tesla/values.py | 2 + 5 files changed, 126 insertions(+), 3 deletions(-) create mode 100644 opendbc/car/tesla/radar_interface.py create mode 100644 opendbc/car/tesla/tests/__init__.py create mode 100644 opendbc/car/tesla/tests/test_tesla.py diff --git a/opendbc/car/tesla/interface.py b/opendbc/car/tesla/interface.py index c53ad621937..a6e695280e0 100644 --- a/opendbc/car/tesla/interface.py +++ b/opendbc/car/tesla/interface.py @@ -1,13 +1,15 @@ -from opendbc.car import get_safety_config, structs +from opendbc.car import Bus, get_safety_config, structs from opendbc.car.interfaces import CarInterfaceBase from opendbc.car.tesla.carcontroller import CarController from opendbc.car.tesla.carstate import CarState -from opendbc.car.tesla.values import TeslaSafetyFlags, TeslaFlags, CAR, FSD_14_FW, Ecu +from opendbc.car.tesla.values import TeslaSafetyFlags, TeslaFlags, CAR, DBC, FSD_14_FW, Ecu +from opendbc.car.tesla.radar_interface import RadarInterface, RADAR_START_ADDR class CarInterface(CarInterfaceBase): CarState = CarState CarController = CarController + RadarInterface = RadarInterface @staticmethod def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_long, is_release, docs) -> structs.CarParams: @@ -20,7 +22,13 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo ret.steerAtStandstill = True ret.steerControlType = structs.CarParams.SteerControlType.angle - ret.radarUnavailable = True + + # Radar support is intended to work for: + # - Tesla Model 3 vehicles built approximately mid-2017 through early-2021 + # - Tesla Model Y vehicles built approximately mid-2020 through early-2021 + # - Vehicles equipped with the Continental ARS4-B radar (used on HW2 / HW2.5 / early HW3) + # - Radar CAN lines must be tapped and connected to CAN bus 1 (normally not used for tesla vehicles) + ret.radarUnavailable = RADAR_START_ADDR not in fingerprint[1] or Bus.radar not in DBC[candidate] ret.alphaLongitudinalAvailable = True if alpha_long: diff --git a/opendbc/car/tesla/radar_interface.py b/opendbc/car/tesla/radar_interface.py new file mode 100644 index 00000000000..e0cfcd1bbcc --- /dev/null +++ b/opendbc/car/tesla/radar_interface.py @@ -0,0 +1,89 @@ +from opendbc.can import CANParser +from opendbc.car import Bus, structs +from opendbc.car.interfaces import RadarInterfaceBase +from opendbc.car.tesla.values import DBC + +RADAR_START_ADDR = 0x410 +RADAR_MSG_COUNT = 80 # 40 points * 2 messages each + + +def get_radar_can_parser(CP): + if Bus.radar not in DBC[CP.carFingerprint]: + return None + + messages = [('RadarStatus', 16)] + for i in range(RADAR_MSG_COUNT // 2): + messages.extend([ + (f'RadarPoint{i}_A', 16), + (f'RadarPoint{i}_B', 16), + ]) + + return CANParser(DBC[CP.carFingerprint][Bus.radar], messages, 1) + + +class RadarInterface(RadarInterfaceBase): + def __init__(self, CP): + super().__init__(CP) + self.updated_messages = set() + self.trigger_msg = RADAR_START_ADDR + RADAR_MSG_COUNT - 1 + self.track_id = 0 + + self.radar_off_can = CP.radarUnavailable + self.rcp = get_radar_can_parser(CP) + + def update(self, can_strings): + if self.radar_off_can or self.rcp is None: + return super().update(None) + + vls = self.rcp.update(can_strings) + self.updated_messages.update(vls) + + if self.trigger_msg not in self.updated_messages: + return None + + rr = self._update(self.updated_messages) + self.updated_messages.clear() + + return rr + + def _update(self, updated_messages): + ret = structs.RadarData() + if self.rcp is None: + return ret + + if not self.rcp.can_valid: + ret.errors.canError = True + + radar_status = self.rcp.vl['RadarStatus'] + if radar_status['shortTermUnavailable']: + ret.errors.radarUnavailableTemporary = True + if radar_status['sensorBlocked'] or radar_status['vehDynamicsError']: + ret.errors.radarFault = True + + for i in range(RADAR_MSG_COUNT // 2): + msg_a = self.rcp.vl[f'RadarPoint{i}_A'] + msg_b = self.rcp.vl[f'RadarPoint{i}_B'] + + # Make sure msg A and B are together + if msg_a['Index'] != msg_b['Index2']: + continue + + if not msg_a['Tracked']: + if i in self.pts: + del self.pts[i] + continue + + if i not in self.pts: + self.pts[i] = structs.RadarData.RadarPoint() + self.pts[i].trackId = self.track_id + self.track_id += 1 + + self.pts[i].dRel = msg_a['LongDist'] + self.pts[i].yRel = msg_a['LatDist'] + self.pts[i].vRel = msg_a['LongSpeed'] + self.pts[i].aRel = msg_a['LongAccel'] + self.pts[i].yvRel = msg_b['LatSpeed'] + self.pts[i].measured = bool(msg_a['Meas']) + + ret.points = list(self.pts.values()) + return ret diff --git a/opendbc/car/tesla/tests/__init__.py b/opendbc/car/tesla/tests/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/opendbc/car/tesla/tests/test_tesla.py b/opendbc/car/tesla/tests/test_tesla.py new file mode 100644 index 00000000000..2ccc777fd24 --- /dev/null +++ b/opendbc/car/tesla/tests/test_tesla.py @@ -0,0 +1,24 @@ +from opendbc.car import gen_empty_fingerprint +from opendbc.car.tesla.interface import CarInterface +from opendbc.car.tesla.radar_interface import RADAR_START_ADDR +from opendbc.car.tesla.values import CAR + + +class TestTeslaFingerprint: + def test_radar_detection(self): + # Test radar availability detection for cars with radar DBC defined + for radar in (True, False): + fingerprint = gen_empty_fingerprint() + if radar: + fingerprint[1][RADAR_START_ADDR] = 8 + CP = CarInterface.get_params(CAR.TESLA_MODEL_3, fingerprint, [], False, False, False) + assert CP.radarUnavailable != radar + + def test_no_radar_car(self): + # Model X doesn't have radar DBC defined, should always be unavailable + for radar in (True, False): + fingerprint = gen_empty_fingerprint() + if radar: + fingerprint[1][RADAR_START_ADDR] = 8 + CP = CarInterface.get_params(CAR.TESLA_MODEL_X, fingerprint, [], False, False, False) + assert CP.radarUnavailable # Always unavailable since no radar DBC diff --git a/opendbc/car/tesla/values.py b/opendbc/car/tesla/values.py index 58635a9a2fa..c8e1e2a9a94 100644 --- a/opendbc/car/tesla/values.py +++ b/opendbc/car/tesla/values.py @@ -48,6 +48,7 @@ class CAR(Platforms): TeslaCarDocsHW4("Tesla Model 3 (with HW4) 2024-25"), ], CarSpecs(mass=1899., wheelbase=2.875, steerRatio=12.0), + {Bus.party: 'tesla_model3_party', Bus.radar: 'tesla_radar_continental_generated'}, ) TESLA_MODEL_Y = TeslaPlatformConfig( [ @@ -55,6 +56,7 @@ class CAR(Platforms): TeslaCarDocsHW4("Tesla Model Y (with HW4) 2024-25"), ], CarSpecs(mass=2072., wheelbase=2.890, steerRatio=12.0), + {Bus.party: 'tesla_model3_party', Bus.radar: 'tesla_radar_continental_generated'}, ) TESLA_MODEL_X = TeslaPlatformConfig( [TeslaCarDocsHW4("Tesla Model X (with HW4) 2024")], From d424d1f247384b68923b8093875e1a370ef8221d Mon Sep 17 00:00:00 2001 From: adeebshihadeh Date: Sat, 24 Jan 2026 08:08:20 +0000 Subject: [PATCH 074/229] docs: Scheduled auto-update CARS.md --- docs/CARS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/CARS.md b/docs/CARS.md index 792cad67cf5..da8cb49c3fc 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -150,7 +150,7 @@ |Hyundai|Kona Hybrid 2020|Smart Cruise Control (SCC)|[Upstream](#upstream)| |Hyundai|Nexo 2021|All|[Upstream](#upstream)| |Hyundai|Palisade 2020-22|All|[Upstream](#upstream)| -|Hyundai|Palisade 2023-24|HDA2|[Community](#community)| +|Hyundai|Palisade 2023-24|Highway Driving Assist II|[Community](#community)| |Hyundai|Santa Cruz 2022-24|Smart Cruise Control (SCC)|[Upstream](#upstream)| |Hyundai|Santa Fe 2019-20|All|[Upstream](#upstream)| |Hyundai|Santa Fe 2021-23|All|[Upstream](#upstream)| @@ -209,7 +209,7 @@ |Kia|Stinger 2018-20|Smart Cruise Control (SCC)|[Upstream](#upstream)| |Kia|Stinger 2022-23|All|[Upstream](#upstream)| |Kia|Telluride 2020-22|All|[Upstream](#upstream)| -|Kia|Telluride 2023-24|HDA2|[Community](#community)| +|Kia|Telluride 2023-24|Highway Driving Assist II|[Community](#community)| |Lexus|CT Hybrid 2017-18|Lexus Safety System+|[Upstream](#upstream)| |Lexus|ES 2017-18|All|[Upstream](#upstream)| |Lexus|ES 2019-25|All|[Upstream](#upstream)| From 2a1ba5e40bd56b7c5211c45bb6df01906f5e9313 Mon Sep 17 00:00:00 2001 From: Nikita Pylypyuk <147505783+nikitap066@users.noreply.github.com> Date: Tue, 27 Jan 2026 03:57:31 +0000 Subject: [PATCH 075/229] Mazda: Add cruise button events for accel and decel (#3027) * added button events for accel and decel * move down --------- Co-authored-by: Daniel Koepping Co-authored-by: Shane Smiskol --- opendbc/car/mazda/carstate.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/opendbc/car/mazda/carstate.py b/opendbc/car/mazda/carstate.py index 074a13c26ea..34919e04dd6 100644 --- a/opendbc/car/mazda/carstate.py +++ b/opendbc/car/mazda/carstate.py @@ -19,6 +19,8 @@ def __init__(self, CP): self.lkas_allowed_speed = False self.distance_button = 0 + self.accel_button = 0 + self.decel_button = 0 def update(self, can_parsers) -> structs.CarState: cp = can_parsers[Bus.pt] @@ -26,9 +28,6 @@ def update(self, can_parsers) -> structs.CarState: ret = structs.CarState() - prev_distance_button = self.distance_button - self.distance_button = cp.vl["CRZ_BTNS"]["DISTANCE_LESS"] - self.parse_wheel_speeds(ret, cp.vl["WHEEL_SPEEDS"]["FL"], cp.vl["WHEEL_SPEEDS"]["FR"], @@ -112,8 +111,19 @@ def update(self, can_parsers) -> structs.CarState: self.cam_laneinfo = cp_cam.vl["CAM_LANEINFO"] ret.steerFaultPermanent = cp_cam.vl["CAM_LKAS"]["ERR_BIT_1"] == 1 - # TODO: add button types for inc and dec - ret.buttonEvents = create_button_events(self.distance_button, prev_distance_button, {1: ButtonType.gapAdjustCruise}) + # cruise control button events: distance, inc, and dec + prev_distance_button = self.distance_button + prev_accel_button = self.accel_button + prev_decel_button = self.decel_button + self.distance_button = cp.vl["CRZ_BTNS"]["DISTANCE_LESS"] + self.accel_button = cp.vl["CRZ_BTNS"]["RES"] + self.decel_button = cp.vl["CRZ_BTNS"]["SET_M"] + + ret.buttonEvents = [ + *create_button_events(self.distance_button, prev_distance_button, {1: ButtonType.gapAdjustCruise}), + *create_button_events(self.accel_button, prev_accel_button, {1: ButtonType.accelCruise}), + *create_button_events(self.decel_button, prev_decel_button, {1: ButtonType.decelCruise}), + ] return ret From dd606ee88b273a77415fb1d46cca5c7d0b5b39da Mon Sep 17 00:00:00 2001 From: FELMONON <125313419+FELMONON@users.noreply.github.com> Date: Mon, 26 Jan 2026 22:00:38 -0700 Subject: [PATCH 076/229] car tests: cache hypothesis strategies (#3052) * car tests: cache hypothesis strategies at module level Move strategy creation from inside get_fuzzy_car_interface() to module level to avoid recreating strategies on every test call. Strategy creation is expensive and doing it once at import time significantly speeds up test execution. This addresses commaai/openpilot#32536 - "Speedup test_car_interfaces" Co-Authored-By: Claude Opus 4.5 * use cache instead --------- Co-authored-by: Felmon Fekadu Co-authored-by: Claude Opus 4.5 Co-authored-by: Shane Smiskol --- opendbc/car/tests/test_car_interfaces.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/opendbc/car/tests/test_car_interfaces.py b/opendbc/car/tests/test_car_interfaces.py index a329ee3b6b2..1945bb5a291 100644 --- a/opendbc/car/tests/test_car_interfaces.py +++ b/opendbc/car/tests/test_car_interfaces.py @@ -2,6 +2,7 @@ import math import hypothesis.strategies as st import pytest +from functools import cache from hypothesis import Phase, given, settings from collections.abc import Callable from typing import Any @@ -27,7 +28,8 @@ MAX_EXAMPLES = int(os.environ.get('MAX_EXAMPLES', '15')) -def get_fuzzy_car_interface(car_name: str, draw: DrawType) -> CarInterfaceBase: +@cache +def get_fuzzy_strategy(): # Fuzzy CAN fingerprints and FW versions to test more states of the CarInterface fingerprint_strategy = st.fixed_dictionaries({0: st.dictionaries(st.integers(min_value=0, max_value=0x800), st.sampled_from(DLC_TO_LEN))}) @@ -44,8 +46,11 @@ def get_fuzzy_car_interface(car_name: str, draw: DrawType) -> CarInterfaceBase: 'car_fw': car_fw_strategy, 'alpha_long': st.booleans(), }) + return params_strategy + - params: dict = draw(params_strategy) +def get_fuzzy_car_interface(car_name: str, draw: DrawType) -> CarInterfaceBase: + params: dict = draw(get_fuzzy_strategy()) # reduce search space by duplicating CAN fingerprints across all buses params['fingerprints'] |= {key + 1: params['fingerprints'][0] for key in range(6)} From c7319ff209432598de41879b6c1f670c20d685a9 Mon Sep 17 00:00:00 2001 From: commaci-public <60409688+commaci-public@users.noreply.github.com> Date: Mon, 26 Jan 2026 21:02:10 -0800 Subject: [PATCH 077/229] [bot] Update uv.lock (#3071) Co-authored-by: Vehicle Researcher --- uv.lock | 153 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 76 insertions(+), 77 deletions(-) diff --git a/uv.lock b/uv.lock index 4b016c132a1..a5a81f540bf 100644 --- a/uv.lock +++ b/uv.lock @@ -181,37 +181,37 @@ wheels = [ [[package]] name = "coverage" -version = "7.13.1" +version = "7.13.2" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/23/f9/e92df5e07f3fc8d4c7f9a0f146ef75446bf870351cd37b788cf5897f8079/coverage-7.13.1.tar.gz", hash = "sha256:b7593fe7eb5feaa3fbb461ac79aac9f9fc0387a5ca8080b0c6fe2ca27b091afd", size = 825862, upload-time = "2025-12-28T15:42:56.969Z" } +sdist = { url = "https://files.pythonhosted.org/packages/ad/49/349848445b0e53660e258acbcc9b0d014895b6739237920886672240f84b/coverage-7.13.2.tar.gz", hash = "sha256:044c6951ec37146b72a50cc81ef02217d27d4c3640efd2640311393cbbf143d3", size = 826523, upload-time = "2026-01-25T13:00:04.889Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/b4/9b/77baf488516e9ced25fc215a6f75d803493fc3f6a1a1227ac35697910c2a/coverage-7.13.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1a55d509a1dc5a5b708b5dad3b5334e07a16ad4c2185e27b40e4dba796ab7f88", size = 218755, upload-time = "2025-12-28T15:40:30.812Z" }, - { url = "https://files.pythonhosted.org/packages/d7/cd/7ab01154e6eb79ee2fab76bf4d89e94c6648116557307ee4ebbb85e5c1bf/coverage-7.13.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4d010d080c4888371033baab27e47c9df7d6fb28d0b7b7adf85a4a49be9298b3", size = 219257, upload-time = "2025-12-28T15:40:32.333Z" }, - { url = "https://files.pythonhosted.org/packages/01/d5/b11ef7863ffbbdb509da0023fad1e9eda1c0eaea61a6d2ea5b17d4ac706e/coverage-7.13.1-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:d938b4a840fb1523b9dfbbb454f652967f18e197569c32266d4d13f37244c3d9", size = 249657, upload-time = "2025-12-28T15:40:34.1Z" }, - { url = "https://files.pythonhosted.org/packages/f7/7c/347280982982383621d29b8c544cf497ae07ac41e44b1ca4903024131f55/coverage-7.13.1-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:bf100a3288f9bb7f919b87eb84f87101e197535b9bd0e2c2b5b3179633324fee", size = 251581, upload-time = "2025-12-28T15:40:36.131Z" }, - { url = "https://files.pythonhosted.org/packages/82/f6/ebcfed11036ade4c0d75fa4453a6282bdd225bc073862766eec184a4c643/coverage-7.13.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ef6688db9bf91ba111ae734ba6ef1a063304a881749726e0d3575f5c10a9facf", size = 253691, upload-time = "2025-12-28T15:40:37.626Z" }, - { url = "https://files.pythonhosted.org/packages/02/92/af8f5582787f5d1a8b130b2dcba785fa5e9a7a8e121a0bb2220a6fdbdb8a/coverage-7.13.1-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:0b609fc9cdbd1f02e51f67f51e5aee60a841ef58a68d00d5ee2c0faf357481a3", size = 249799, upload-time = "2025-12-28T15:40:39.47Z" }, - { url = "https://files.pythonhosted.org/packages/24/aa/0e39a2a3b16eebf7f193863323edbff38b6daba711abaaf807d4290cf61a/coverage-7.13.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:c43257717611ff5e9a1d79dce8e47566235ebda63328718d9b65dd640bc832ef", size = 251389, upload-time = "2025-12-28T15:40:40.954Z" }, - { url = "https://files.pythonhosted.org/packages/73/46/7f0c13111154dc5b978900c0ccee2e2ca239b910890e674a77f1363d483e/coverage-7.13.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:e09fbecc007f7b6afdfb3b07ce5bd9f8494b6856dd4f577d26c66c391b829851", size = 249450, upload-time = "2025-12-28T15:40:42.489Z" }, - { url = "https://files.pythonhosted.org/packages/ac/ca/e80da6769e8b669ec3695598c58eef7ad98b0e26e66333996aee6316db23/coverage-7.13.1-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:a03a4f3a19a189919c7055098790285cc5c5b0b3976f8d227aea39dbf9f8bfdb", size = 249170, upload-time = "2025-12-28T15:40:44.279Z" }, - { url = "https://files.pythonhosted.org/packages/af/18/9e29baabdec1a8644157f572541079b4658199cfd372a578f84228e860de/coverage-7.13.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:3820778ea1387c2b6a818caec01c63adc5b3750211af6447e8dcfb9b6f08dbba", size = 250081, upload-time = "2025-12-28T15:40:45.748Z" }, - { url = "https://files.pythonhosted.org/packages/00/f8/c3021625a71c3b2f516464d322e41636aea381018319050a8114105872ee/coverage-7.13.1-cp311-cp311-win32.whl", hash = "sha256:ff10896fa55167371960c5908150b434b71c876dfab97b69478f22c8b445ea19", size = 221281, upload-time = "2025-12-28T15:40:47.232Z" }, - { url = "https://files.pythonhosted.org/packages/27/56/c216625f453df6e0559ed666d246fcbaaa93f3aa99eaa5080cea1229aa3d/coverage-7.13.1-cp311-cp311-win_amd64.whl", hash = "sha256:a998cc0aeeea4c6d5622a3754da5a493055d2d95186bad877b0a34ea6e6dbe0a", size = 222215, upload-time = "2025-12-28T15:40:49.19Z" }, - { url = "https://files.pythonhosted.org/packages/5c/9a/be342e76f6e531cae6406dc46af0d350586f24d9b67fdfa6daee02df71af/coverage-7.13.1-cp311-cp311-win_arm64.whl", hash = "sha256:fea07c1a39a22614acb762e3fbbb4011f65eedafcb2948feeef641ac78b4ee5c", size = 220886, upload-time = "2025-12-28T15:40:51.067Z" }, - { url = "https://files.pythonhosted.org/packages/ce/8a/87af46cccdfa78f53db747b09f5f9a21d5fc38d796834adac09b30a8ce74/coverage-7.13.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:6f34591000f06e62085b1865c9bc5f7858df748834662a51edadfd2c3bfe0dd3", size = 218927, upload-time = "2025-12-28T15:40:52.814Z" }, - { url = "https://files.pythonhosted.org/packages/82/a8/6e22fdc67242a4a5a153f9438d05944553121c8f4ba70cb072af4c41362e/coverage-7.13.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:b67e47c5595b9224599016e333f5ec25392597a89d5744658f837d204e16c63e", size = 219288, upload-time = "2025-12-28T15:40:54.262Z" }, - { url = "https://files.pythonhosted.org/packages/d0/0a/853a76e03b0f7c4375e2ca025df45c918beb367f3e20a0a8e91967f6e96c/coverage-7.13.1-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:3e7b8bd70c48ffb28461ebe092c2345536fb18bbbf19d287c8913699735f505c", size = 250786, upload-time = "2025-12-28T15:40:56.059Z" }, - { url = "https://files.pythonhosted.org/packages/ea/b4/694159c15c52b9f7ec7adf49d50e5f8ee71d3e9ef38adb4445d13dd56c20/coverage-7.13.1-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:c223d078112e90dc0e5c4e35b98b9584164bea9fbbd221c0b21c5241f6d51b62", size = 253543, upload-time = "2025-12-28T15:40:57.585Z" }, - { url = "https://files.pythonhosted.org/packages/96/b2/7f1f0437a5c855f87e17cf5d0dc35920b6440ff2b58b1ba9788c059c26c8/coverage-7.13.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:794f7c05af0763b1bbd1b9e6eff0e52ad068be3b12cd96c87de037b01390c968", size = 254635, upload-time = "2025-12-28T15:40:59.443Z" }, - { url = "https://files.pythonhosted.org/packages/e9/d1/73c3fdb8d7d3bddd9473c9c6a2e0682f09fc3dfbcb9c3f36412a7368bcab/coverage-7.13.1-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:0642eae483cc8c2902e4af7298bf886d605e80f26382124cddc3967c2a3df09e", size = 251202, upload-time = "2025-12-28T15:41:01.328Z" }, - { url = "https://files.pythonhosted.org/packages/66/3c/f0edf75dcc152f145d5598329e864bbbe04ab78660fe3e8e395f9fff010f/coverage-7.13.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:9f5e772ed5fef25b3de9f2008fe67b92d46831bd2bc5bdc5dd6bfd06b83b316f", size = 252566, upload-time = "2025-12-28T15:41:03.319Z" }, - { url = "https://files.pythonhosted.org/packages/17/b3/e64206d3c5f7dcbceafd14941345a754d3dbc78a823a6ed526e23b9cdaab/coverage-7.13.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:45980ea19277dc0a579e432aef6a504fe098ef3a9032ead15e446eb0f1191aee", size = 250711, upload-time = "2025-12-28T15:41:06.411Z" }, - { url = "https://files.pythonhosted.org/packages/dc/ad/28a3eb970a8ef5b479ee7f0c484a19c34e277479a5b70269dc652b730733/coverage-7.13.1-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:e4f18eca6028ffa62adbd185a8f1e1dd242f2e68164dba5c2b74a5204850b4cf", size = 250278, upload-time = "2025-12-28T15:41:08.285Z" }, - { url = "https://files.pythonhosted.org/packages/54/e3/c8f0f1a93133e3e1291ca76cbb63565bd4b5c5df63b141f539d747fff348/coverage-7.13.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:f8dca5590fec7a89ed6826fce625595279e586ead52e9e958d3237821fbc750c", size = 252154, upload-time = "2025-12-28T15:41:09.969Z" }, - { url = "https://files.pythonhosted.org/packages/d0/bf/9939c5d6859c380e405b19e736321f1c7d402728792f4c752ad1adcce005/coverage-7.13.1-cp312-cp312-win32.whl", hash = "sha256:ff86d4e85188bba72cfb876df3e11fa243439882c55957184af44a35bd5880b7", size = 221487, upload-time = "2025-12-28T15:41:11.468Z" }, - { url = "https://files.pythonhosted.org/packages/fa/dc/7282856a407c621c2aad74021680a01b23010bb8ebf427cf5eacda2e876f/coverage-7.13.1-cp312-cp312-win_amd64.whl", hash = "sha256:16cc1da46c04fb0fb128b4dc430b78fa2aba8a6c0c9f8eb391fd5103409a6ac6", size = 222299, upload-time = "2025-12-28T15:41:13.386Z" }, - { url = "https://files.pythonhosted.org/packages/10/79/176a11203412c350b3e9578620013af35bcdb79b651eb976f4a4b32044fa/coverage-7.13.1-cp312-cp312-win_arm64.whl", hash = "sha256:8d9bc218650022a768f3775dd7fdac1886437325d8d295d923ebcfef4892ad5c", size = 220941, upload-time = "2025-12-28T15:41:14.975Z" }, - { url = "https://files.pythonhosted.org/packages/cc/48/d9f421cb8da5afaa1a64570d9989e00fb7955e6acddc5a12979f7666ef60/coverage-7.13.1-py3-none-any.whl", hash = "sha256:2016745cb3ba554469d02819d78958b571792bb68e31302610e898f80dd3a573", size = 210722, upload-time = "2025-12-28T15:42:54.901Z" }, + { url = "https://files.pythonhosted.org/packages/6c/01/abca50583a8975bb6e1c59eff67ed8e48bb127c07dad5c28d9e96ccc09ec/coverage-7.13.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:060ebf6f2c51aff5ba38e1f43a2095e087389b1c69d559fde6049a4b0001320e", size = 218971, upload-time = "2026-01-25T12:57:36.953Z" }, + { url = "https://files.pythonhosted.org/packages/eb/0e/b6489f344d99cd1e5b4d5e1be52dfd3f8a3dc5112aa6c33948da8cabad4e/coverage-7.13.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:c1ea8ca9db5e7469cd364552985e15911548ea5b69c48a17291f0cac70484b2e", size = 219473, upload-time = "2026-01-25T12:57:38.934Z" }, + { url = "https://files.pythonhosted.org/packages/17/11/db2f414915a8e4ec53f60b17956c27f21fb68fcf20f8a455ce7c2ccec638/coverage-7.13.2-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:b780090d15fd58f07cf2011943e25a5f0c1c894384b13a216b6c86c8a8a7c508", size = 249896, upload-time = "2026-01-25T12:57:40.365Z" }, + { url = "https://files.pythonhosted.org/packages/80/06/0823fe93913663c017e508e8810c998c8ebd3ec2a5a85d2c3754297bdede/coverage-7.13.2-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:88a800258d83acb803c38175b4495d293656d5fac48659c953c18e5f539a274b", size = 251810, upload-time = "2026-01-25T12:57:42.045Z" }, + { url = "https://files.pythonhosted.org/packages/61/dc/b151c3cc41b28cdf7f0166c5fa1271cbc305a8ec0124cce4b04f74791a18/coverage-7.13.2-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6326e18e9a553e674d948536a04a80d850a5eeefe2aae2e6d7cf05d54046c01b", size = 253920, upload-time = "2026-01-25T12:57:44.026Z" }, + { url = "https://files.pythonhosted.org/packages/2d/35/e83de0556e54a4729a2b94ea816f74ce08732e81945024adee46851c2264/coverage-7.13.2-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:59562de3f797979e1ff07c587e2ac36ba60ca59d16c211eceaa579c266c5022f", size = 250025, upload-time = "2026-01-25T12:57:45.624Z" }, + { url = "https://files.pythonhosted.org/packages/39/67/af2eb9c3926ce3ea0d58a0d2516fcbdacf7a9fc9559fe63076beaf3f2596/coverage-7.13.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:27ba1ed6f66b0e2d61bfa78874dffd4f8c3a12f8e2b5410e515ab345ba7bc9c3", size = 251612, upload-time = "2026-01-25T12:57:47.713Z" }, + { url = "https://files.pythonhosted.org/packages/26/62/5be2e25f3d6c711d23b71296f8b44c978d4c8b4e5b26871abfc164297502/coverage-7.13.2-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:8be48da4d47cc68754ce643ea50b3234557cbefe47c2f120495e7bd0a2756f2b", size = 249670, upload-time = "2026-01-25T12:57:49.378Z" }, + { url = "https://files.pythonhosted.org/packages/b3/51/400d1b09a8344199f9b6a6fc1868005d766b7ea95e7882e494fa862ca69c/coverage-7.13.2-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:2a47a4223d3361b91176aedd9d4e05844ca67d7188456227b6bf5e436630c9a1", size = 249395, upload-time = "2026-01-25T12:57:50.86Z" }, + { url = "https://files.pythonhosted.org/packages/e0/36/f02234bc6e5230e2f0a63fd125d0a2093c73ef20fdf681c7af62a140e4e7/coverage-7.13.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:c6f141b468740197d6bd38f2b26ade124363228cc3f9858bd9924ab059e00059", size = 250298, upload-time = "2026-01-25T12:57:52.287Z" }, + { url = "https://files.pythonhosted.org/packages/b0/06/713110d3dd3151b93611c9cbfc65c15b4156b44f927fced49ac0b20b32a4/coverage-7.13.2-cp311-cp311-win32.whl", hash = "sha256:89567798404af067604246e01a49ef907d112edf2b75ef814b1364d5ce267031", size = 221485, upload-time = "2026-01-25T12:57:53.876Z" }, + { url = "https://files.pythonhosted.org/packages/16/0c/3ae6255fa1ebcb7dec19c9a59e85ef5f34566d1265c70af5b2fc981da834/coverage-7.13.2-cp311-cp311-win_amd64.whl", hash = "sha256:21dd57941804ae2ac7e921771a5e21bbf9aabec317a041d164853ad0a96ce31e", size = 222421, upload-time = "2026-01-25T12:57:55.433Z" }, + { url = "https://files.pythonhosted.org/packages/b5/37/fabc3179af4d61d89ea47bd04333fec735cd5e8b59baad44fed9fc4170d7/coverage-7.13.2-cp311-cp311-win_arm64.whl", hash = "sha256:10758e0586c134a0bafa28f2d37dd2cdb5e4a90de25c0fc0c77dabbad46eca28", size = 221088, upload-time = "2026-01-25T12:57:57.41Z" }, + { url = "https://files.pythonhosted.org/packages/46/39/e92a35f7800222d3f7b2cbb7bbc3b65672ae8d501cb31801b2d2bd7acdf1/coverage-7.13.2-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:f106b2af193f965d0d3234f3f83fc35278c7fb935dfbde56ae2da3dd2c03b84d", size = 219142, upload-time = "2026-01-25T12:58:00.448Z" }, + { url = "https://files.pythonhosted.org/packages/45/7a/8bf9e9309c4c996e65c52a7c5a112707ecdd9fbaf49e10b5a705a402bbb4/coverage-7.13.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:78f45d21dc4d5d6bd29323f0320089ef7eae16e4bef712dff79d184fa7330af3", size = 219503, upload-time = "2026-01-25T12:58:02.451Z" }, + { url = "https://files.pythonhosted.org/packages/87/93/17661e06b7b37580923f3f12406ac91d78aeed293fb6da0b69cc7957582f/coverage-7.13.2-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:fae91dfecd816444c74531a9c3d6ded17a504767e97aa674d44f638107265b99", size = 251006, upload-time = "2026-01-25T12:58:04.059Z" }, + { url = "https://files.pythonhosted.org/packages/12/f0/f9e59fb8c310171497f379e25db060abef9fa605e09d63157eebec102676/coverage-7.13.2-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:264657171406c114787b441484de620e03d8f7202f113d62fcd3d9688baa3e6f", size = 253750, upload-time = "2026-01-25T12:58:05.574Z" }, + { url = "https://files.pythonhosted.org/packages/e5/b1/1935e31add2232663cf7edd8269548b122a7d100047ff93475dbaaae673e/coverage-7.13.2-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ae47d8dcd3ded0155afbb59c62bd8ab07ea0fd4902e1c40567439e6db9dcaf2f", size = 254862, upload-time = "2026-01-25T12:58:07.647Z" }, + { url = "https://files.pythonhosted.org/packages/af/59/b5e97071ec13df5f45da2b3391b6cdbec78ba20757bc92580a5b3d5fa53c/coverage-7.13.2-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:8a0b33e9fd838220b007ce8f299114d406c1e8edb21336af4c97a26ecfd185aa", size = 251420, upload-time = "2026-01-25T12:58:09.309Z" }, + { url = "https://files.pythonhosted.org/packages/3f/75/9495932f87469d013dc515fb0ce1aac5fa97766f38f6b1a1deb1ee7b7f3a/coverage-7.13.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:b3becbea7f3ce9a2d4d430f223ec15888e4deb31395840a79e916368d6004cce", size = 252786, upload-time = "2026-01-25T12:58:10.909Z" }, + { url = "https://files.pythonhosted.org/packages/6a/59/af550721f0eb62f46f7b8cb7e6f1860592189267b1c411a4e3a057caacee/coverage-7.13.2-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:f819c727a6e6eeb8711e4ce63d78c620f69630a2e9d53bc95ca5379f57b6ba94", size = 250928, upload-time = "2026-01-25T12:58:12.449Z" }, + { url = "https://files.pythonhosted.org/packages/9b/b1/21b4445709aae500be4ab43bbcfb4e53dc0811c3396dcb11bf9f23fd0226/coverage-7.13.2-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:4f7b71757a3ab19f7ba286e04c181004c1d61be921795ee8ba6970fd0ec91da5", size = 250496, upload-time = "2026-01-25T12:58:14.047Z" }, + { url = "https://files.pythonhosted.org/packages/ba/b1/0f5d89dfe0392990e4f3980adbde3eb34885bc1effb2dc369e0bf385e389/coverage-7.13.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:b7fc50d2afd2e6b4f6f2f403b70103d280a8e0cb35320cbbe6debcda02a1030b", size = 252373, upload-time = "2026-01-25T12:58:15.976Z" }, + { url = "https://files.pythonhosted.org/packages/01/c9/0cf1a6a57a9968cc049a6b896693faa523c638a5314b1fc374eb2b2ac904/coverage-7.13.2-cp312-cp312-win32.whl", hash = "sha256:292250282cf9bcf206b543d7608bda17ca6fc151f4cbae949fc7e115112fbd41", size = 221696, upload-time = "2026-01-25T12:58:17.517Z" }, + { url = "https://files.pythonhosted.org/packages/4d/05/d7540bf983f09d32803911afed135524570f8c47bb394bf6206c1dc3a786/coverage-7.13.2-cp312-cp312-win_amd64.whl", hash = "sha256:eeea10169fac01549a7921d27a3e517194ae254b542102267bef7a93ed38c40e", size = 222504, upload-time = "2026-01-25T12:58:19.115Z" }, + { url = "https://files.pythonhosted.org/packages/15/8b/1a9f037a736ced0a12aacf6330cdaad5008081142a7070bc58b0f7930cbc/coverage-7.13.2-cp312-cp312-win_arm64.whl", hash = "sha256:2a5b567f0b635b592c917f96b9a9cb3dbd4c320d03f4bf94e9084e494f2e8894", size = 221120, upload-time = "2026-01-25T12:58:21.334Z" }, + { url = "https://files.pythonhosted.org/packages/d2/db/d291e30fdf7ea617a335531e72294e0c723356d7fdde8fba00610a76bda9/coverage-7.13.2-py3-none-any.whl", hash = "sha256:40ce1ea1e25125556d8e76bd0b61500839a07944cc287ac21d5626f3e620cad5", size = 210943, upload-time = "2026-01-25T13:00:02.388Z" }, ] [package.optional-dependencies] @@ -642,11 +642,11 @@ provides-extras = ["testing", "docs", "examples"] [[package]] name = "packaging" -version = "25.0" +version = "26.0" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/a1/d4/1fc4078c65507b51b96ca8f8c3ba19e6a61c8253c72794544580a7b6c24d/packaging-25.0.tar.gz", hash = "sha256:d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f", size = 165727, upload-time = "2025-04-19T11:48:59.673Z" } +sdist = { url = "https://files.pythonhosted.org/packages/65/ee/299d360cdc32edc7d2cf530f3accf79c4fca01e96ffc950d8a52213bd8e4/packaging-26.0.tar.gz", hash = "sha256:00243ae351a257117b6a241061796684b084ed1c516a08c48a3f7e147a9d80b4", size = 143416, upload-time = "2026-01-21T20:50:39.064Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/20/12/38679034af332785aac8774540895e234f4d07f7545804097de4b666afd8/packaging-25.0-py3-none-any.whl", hash = "sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484", size = 66469, upload-time = "2025-04-19T11:48:57.875Z" }, + { url = "https://files.pythonhosted.org/packages/b7/b9/c538f279a4e237a006a2c98387d081e9eb060d203d8ed34467cc0f0b9b53/packaging-26.0-py3-none-any.whl", hash = "sha256:b36f1fef9334a5588b4166f8bcd26a14e521f2b55e6b9de3aaa80d3ff7a37529", size = 74366, upload-time = "2026-01-21T20:50:37.788Z" }, ] [[package]] @@ -738,11 +738,11 @@ wheels = [ [[package]] name = "pycparser" -version = "2.23" +version = "3.0" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/fe/cf/d2d3b9f5699fb1e4615c8e32ff220203e43b248e1dfcc6736ad9057731ca/pycparser-2.23.tar.gz", hash = "sha256:78816d4f24add8f10a06d6f05b4d424ad9e96cfebf68a4ddc99c65c0720d00c2", size = 173734, upload-time = "2025-09-09T13:23:47.91Z" } +sdist = { url = "https://files.pythonhosted.org/packages/1b/7d/92392ff7815c21062bea51aa7b87d45576f649f16458d78b7cf94b9ab2e6/pycparser-3.0.tar.gz", hash = "sha256:600f49d217304a5902ac3c37e1281c9fe94e4d0489de643a9504c5cdfdfc6b29", size = 103492, upload-time = "2026-01-21T14:26:51.89Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/a0/e3/59cd50310fc9b59512193629e1984c1f95e5c8ae6e5d8c69532ccc65a7fe/pycparser-2.23-py3-none-any.whl", hash = "sha256:e5c6e8d3fbad53479cab09ac03729e0a9faf2bee3db8208a550daf5af81a5934", size = 118140, upload-time = "2025-09-09T13:23:46.651Z" }, + { url = "https://files.pythonhosted.org/packages/0c/c3/44f3fbbfa403ea2a7c779186dc20772604442dde72947e7d01069cbe98e3/pycparser-3.0-py3-none-any.whl", hash = "sha256:b727414169a36b7d524c1c3e31839a521725078d7b2ff038656844266160a992", size = 48172, upload-time = "2026-01-21T14:26:50.693Z" }, ] [[package]] @@ -775,11 +775,11 @@ wheels = [ [[package]] name = "pyparsing" -version = "3.3.1" +version = "3.3.2" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/33/c1/1d9de9aeaa1b89b0186e5fe23294ff6517fce1bc69149185577cd31016b2/pyparsing-3.3.1.tar.gz", hash = "sha256:47fad0f17ac1e2cad3de3b458570fbc9b03560aa029ed5e16ee5554da9a2251c", size = 1550512, upload-time = "2025-12-23T03:14:04.391Z" } +sdist = { url = "https://files.pythonhosted.org/packages/f3/91/9c6ee907786a473bf81c5f53cf703ba0957b23ab84c264080fb5a450416f/pyparsing-3.3.2.tar.gz", hash = "sha256:c777f4d763f140633dcb6d8a3eda953bf7a214dc4eff598413c070bcdc117cbc", size = 6851574, upload-time = "2026-01-21T03:57:59.36Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/8b/40/2614036cdd416452f5bf98ec037f38a1afb17f327cb8e6b652d4729e0af8/pyparsing-3.3.1-py3-none-any.whl", hash = "sha256:023b5e7e5520ad96642e2c6db4cb683d3970bd640cdf7115049a6e9c3682df82", size = 121793, upload-time = "2025-12-23T03:14:02.103Z" }, + { url = "https://files.pythonhosted.org/packages/10/bd/c038d7cc38edc1aa5bf91ab8068b63d4308c66c4c8bb3cbba7dfbc049f9c/pyparsing-3.3.2-py3-none-any.whl", hash = "sha256:850ba148bd908d7e2411587e247a1e4f0327839c40e2e5e6d05a007ecc69911d", size = 122781, upload-time = "2026-01-21T03:57:55.912Z" }, ] [[package]] @@ -911,28 +911,28 @@ wheels = [ [[package]] name = "ruff" -version = "0.14.13" +version = "0.14.14" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/50/0a/1914efb7903174b381ee2ffeebb4253e729de57f114e63595114c8ca451f/ruff-0.14.13.tar.gz", hash = "sha256:83cd6c0763190784b99650a20fec7633c59f6ebe41c5cc9d45ee42749563ad47", size = 6059504, upload-time = "2026-01-15T20:15:16.918Z" } +sdist = { url = "https://files.pythonhosted.org/packages/2e/06/f71e3a86b2df0dfa2d2f72195941cd09b44f87711cb7fa5193732cb9a5fc/ruff-0.14.14.tar.gz", hash = "sha256:2d0f819c9a90205f3a867dbbd0be083bee9912e170fd7d9704cc8ae45824896b", size = 4515732, upload-time = "2026-01-22T22:30:17.527Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/c3/ae/0deefbc65ca74b0ab1fd3917f94dc3b398233346a74b8bbb0a916a1a6bf6/ruff-0.14.13-py3-none-linux_armv6l.whl", hash = "sha256:76f62c62cd37c276cb03a275b198c7c15bd1d60c989f944db08a8c1c2dbec18b", size = 13062418, upload-time = "2026-01-15T20:14:50.779Z" }, - { url = "https://files.pythonhosted.org/packages/47/df/5916604faa530a97a3c154c62a81cb6b735c0cb05d1e26d5ad0f0c8ac48a/ruff-0.14.13-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:914a8023ece0528d5cc33f5a684f5f38199bbb566a04815c2c211d8f40b5d0ed", size = 13442344, upload-time = "2026-01-15T20:15:07.94Z" }, - { url = "https://files.pythonhosted.org/packages/4c/f3/e0e694dd69163c3a1671e102aa574a50357536f18a33375050334d5cd517/ruff-0.14.13-py3-none-macosx_11_0_arm64.whl", hash = "sha256:d24899478c35ebfa730597a4a775d430ad0d5631b8647a3ab368c29b7e7bd063", size = 12354720, upload-time = "2026-01-15T20:15:09.854Z" }, - { url = "https://files.pythonhosted.org/packages/c3/e8/67f5fcbbaee25e8fc3b56cc33e9892eca7ffe09f773c8e5907757a7e3bdb/ruff-0.14.13-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9aaf3870f14d925bbaf18b8a2347ee0ae7d95a2e490e4d4aea6813ed15ebc80e", size = 12774493, upload-time = "2026-01-15T20:15:20.908Z" }, - { url = "https://files.pythonhosted.org/packages/6b/ce/d2e9cb510870b52a9565d885c0d7668cc050e30fa2c8ac3fb1fda15c083d/ruff-0.14.13-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ac5b7f63dd3b27cc811850f5ffd8fff845b00ad70e60b043aabf8d6ecc304e09", size = 12815174, upload-time = "2026-01-15T20:15:05.74Z" }, - { url = "https://files.pythonhosted.org/packages/88/00/c38e5da58beebcf4fa32d0ddd993b63dfacefd02ab7922614231330845bf/ruff-0.14.13-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:78d2b1097750d90ba82ce4ba676e85230a0ed694178ca5e61aa9b459970b3eb9", size = 13680909, upload-time = "2026-01-15T20:15:14.537Z" }, - { url = "https://files.pythonhosted.org/packages/61/61/cd37c9dd5bd0a3099ba79b2a5899ad417d8f3b04038810b0501a80814fd7/ruff-0.14.13-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:7d0bf87705acbbcb8d4c24b2d77fbb73d40210a95c3903b443cd9e30824a5032", size = 15144215, upload-time = "2026-01-15T20:15:22.886Z" }, - { url = "https://files.pythonhosted.org/packages/56/8a/85502d7edbf98c2df7b8876f316c0157359165e16cdf98507c65c8d07d3d/ruff-0.14.13-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a3eb5da8e2c9e9f13431032fdcbe7681de9ceda5835efee3269417c13f1fed5c", size = 14706067, upload-time = "2026-01-15T20:14:48.271Z" }, - { url = "https://files.pythonhosted.org/packages/7e/2f/de0df127feb2ee8c1e54354dc1179b4a23798f0866019528c938ba439aca/ruff-0.14.13-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:642442b42957093811cd8d2140dfadd19c7417030a7a68cf8d51fcdd5f217427", size = 14133916, upload-time = "2026-01-15T20:14:57.357Z" }, - { url = "https://files.pythonhosted.org/packages/0d/77/9b99686bb9fe07a757c82f6f95e555c7a47801a9305576a9c67e0a31d280/ruff-0.14.13-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4acdf009f32b46f6e8864af19cbf6841eaaed8638e65c8dac845aea0d703c841", size = 13859207, upload-time = "2026-01-15T20:14:55.111Z" }, - { url = "https://files.pythonhosted.org/packages/7d/46/2bdcb34a87a179a4d23022d818c1c236cb40e477faf0d7c9afb6813e5876/ruff-0.14.13-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:591a7f68860ea4e003917d19b5c4f5ac39ff558f162dc753a2c5de897fd5502c", size = 14043686, upload-time = "2026-01-15T20:14:52.841Z" }, - { url = "https://files.pythonhosted.org/packages/1a/a9/5c6a4f56a0512c691cf143371bcf60505ed0f0860f24a85da8bd123b2bf1/ruff-0.14.13-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:774c77e841cc6e046fc3e91623ce0903d1cd07e3a36b1a9fe79b81dab3de506b", size = 12663837, upload-time = "2026-01-15T20:15:18.921Z" }, - { url = "https://files.pythonhosted.org/packages/fe/bb/b920016ece7651fa7fcd335d9d199306665486694d4361547ccb19394c44/ruff-0.14.13-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:61f4e40077a1248436772bb6512db5fc4457fe4c49e7a94ea7c5088655dd21ae", size = 12805867, upload-time = "2026-01-15T20:14:59.272Z" }, - { url = "https://files.pythonhosted.org/packages/7d/b3/0bd909851e5696cd21e32a8fc25727e5f58f1934b3596975503e6e85415c/ruff-0.14.13-py3-none-musllinux_1_2_i686.whl", hash = "sha256:6d02f1428357fae9e98ac7aa94b7e966fd24151088510d32cf6f902d6c09235e", size = 13208528, upload-time = "2026-01-15T20:15:03.732Z" }, - { url = "https://files.pythonhosted.org/packages/3b/3b/e2d94cb613f6bbd5155a75cbe072813756363eba46a3f2177a1fcd0cd670/ruff-0.14.13-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:e399341472ce15237be0c0ae5fbceca4b04cd9bebab1a2b2c979e015455d8f0c", size = 13929242, upload-time = "2026-01-15T20:15:11.918Z" }, - { url = "https://files.pythonhosted.org/packages/6a/c5/abd840d4132fd51a12f594934af5eba1d5d27298a6f5b5d6c3be45301caf/ruff-0.14.13-py3-none-win32.whl", hash = "sha256:ef720f529aec113968b45dfdb838ac8934e519711da53a0456038a0efecbd680", size = 12919024, upload-time = "2026-01-15T20:14:43.647Z" }, - { url = "https://files.pythonhosted.org/packages/c2/55/6384b0b8ce731b6e2ade2b5449bf07c0e4c31e8a2e68ea65b3bafadcecc5/ruff-0.14.13-py3-none-win_amd64.whl", hash = "sha256:6070bd026e409734b9257e03e3ef18c6e1a216f0435c6751d7a8ec69cb59abef", size = 14097887, upload-time = "2026-01-15T20:15:01.48Z" }, - { url = "https://files.pythonhosted.org/packages/4d/e1/7348090988095e4e39560cfc2f7555b1b2a7357deba19167b600fdf5215d/ruff-0.14.13-py3-none-win_arm64.whl", hash = "sha256:7ab819e14f1ad9fe39f246cfcc435880ef7a9390d81a2b6ac7e01039083dd247", size = 13080224, upload-time = "2026-01-15T20:14:45.853Z" }, + { url = "https://files.pythonhosted.org/packages/d2/89/20a12e97bc6b9f9f68343952da08a8099c57237aef953a56b82711d55edd/ruff-0.14.14-py3-none-linux_armv6l.whl", hash = "sha256:7cfe36b56e8489dee8fbc777c61959f60ec0f1f11817e8f2415f429552846aed", size = 10467650, upload-time = "2026-01-22T22:30:08.578Z" }, + { url = "https://files.pythonhosted.org/packages/a3/b1/c5de3fd2d5a831fcae21beda5e3589c0ba67eec8202e992388e4b17a6040/ruff-0.14.14-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:6006a0082336e7920b9573ef8a7f52eec837add1265cc74e04ea8a4368cd704c", size = 10883245, upload-time = "2026-01-22T22:30:04.155Z" }, + { url = "https://files.pythonhosted.org/packages/b8/7c/3c1db59a10e7490f8f6f8559d1db8636cbb13dccebf18686f4e3c9d7c772/ruff-0.14.14-py3-none-macosx_11_0_arm64.whl", hash = "sha256:026c1d25996818f0bf498636686199d9bd0d9d6341c9c2c3b62e2a0198b758de", size = 10231273, upload-time = "2026-01-22T22:30:34.642Z" }, + { url = "https://files.pythonhosted.org/packages/a1/6e/5e0e0d9674be0f8581d1f5e0f0a04761203affce3232c1a1189d0e3b4dad/ruff-0.14.14-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f666445819d31210b71e0a6d1c01e24447a20b85458eea25a25fe8142210ae0e", size = 10585753, upload-time = "2026-01-22T22:30:31.781Z" }, + { url = "https://files.pythonhosted.org/packages/23/09/754ab09f46ff1884d422dc26d59ba18b4e5d355be147721bb2518aa2a014/ruff-0.14.14-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:3c0f18b922c6d2ff9a5e6c3ee16259adc513ca775bcf82c67ebab7cbd9da5bc8", size = 10286052, upload-time = "2026-01-22T22:30:24.827Z" }, + { url = "https://files.pythonhosted.org/packages/c8/cc/e71f88dd2a12afb5f50733851729d6b571a7c3a35bfdb16c3035132675a0/ruff-0.14.14-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1629e67489c2dea43e8658c3dba659edbfd87361624b4040d1df04c9740ae906", size = 11043637, upload-time = "2026-01-22T22:30:13.239Z" }, + { url = "https://files.pythonhosted.org/packages/67/b2/397245026352494497dac935d7f00f1468c03a23a0c5db6ad8fc49ca3fb2/ruff-0.14.14-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:27493a2131ea0f899057d49d303e4292b2cae2bb57253c1ed1f256fbcd1da480", size = 12194761, upload-time = "2026-01-22T22:30:22.542Z" }, + { url = "https://files.pythonhosted.org/packages/5b/06/06ef271459f778323112c51b7587ce85230785cd64e91772034ddb88f200/ruff-0.14.14-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:01ff589aab3f5b539e35db38425da31a57521efd1e4ad1ae08fc34dbe30bd7df", size = 12005701, upload-time = "2026-01-22T22:30:20.499Z" }, + { url = "https://files.pythonhosted.org/packages/41/d6/99364514541cf811ccc5ac44362f88df66373e9fec1b9d1c4cc830593fe7/ruff-0.14.14-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1cc12d74eef0f29f51775f5b755913eb523546b88e2d733e1d701fe65144e89b", size = 11282455, upload-time = "2026-01-22T22:29:59.679Z" }, + { url = "https://files.pythonhosted.org/packages/ca/71/37daa46f89475f8582b7762ecd2722492df26421714a33e72ccc9a84d7a5/ruff-0.14.14-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bb8481604b7a9e75eff53772496201690ce2687067e038b3cc31aaf16aa0b974", size = 11215882, upload-time = "2026-01-22T22:29:57.032Z" }, + { url = "https://files.pythonhosted.org/packages/2c/10/a31f86169ec91c0705e618443ee74ede0bdd94da0a57b28e72db68b2dbac/ruff-0.14.14-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:14649acb1cf7b5d2d283ebd2f58d56b75836ed8c6f329664fa91cdea19e76e66", size = 11180549, upload-time = "2026-01-22T22:30:27.175Z" }, + { url = "https://files.pythonhosted.org/packages/fd/1e/c723f20536b5163adf79bdd10c5f093414293cdf567eed9bdb7b83940f3f/ruff-0.14.14-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:e8058d2145566510790eab4e2fad186002e288dec5e0d343a92fe7b0bc1b3e13", size = 10543416, upload-time = "2026-01-22T22:30:01.964Z" }, + { url = "https://files.pythonhosted.org/packages/3e/34/8a84cea7e42c2d94ba5bde1d7a4fae164d6318f13f933d92da6d7c2041ff/ruff-0.14.14-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:e651e977a79e4c758eb807f0481d673a67ffe53cfa92209781dfa3a996cf8412", size = 10285491, upload-time = "2026-01-22T22:30:29.51Z" }, + { url = "https://files.pythonhosted.org/packages/55/ef/b7c5ea0be82518906c978e365e56a77f8de7678c8bb6651ccfbdc178c29f/ruff-0.14.14-py3-none-musllinux_1_2_i686.whl", hash = "sha256:cc8b22da8d9d6fdd844a68ae937e2a0adf9b16514e9a97cc60355e2d4b219fc3", size = 10733525, upload-time = "2026-01-22T22:30:06.499Z" }, + { url = "https://files.pythonhosted.org/packages/6a/5b/aaf1dfbcc53a2811f6cc0a1759de24e4b03e02ba8762daabd9b6bd8c59e3/ruff-0.14.14-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:16bc890fb4cc9781bb05beb5ab4cd51be9e7cb376bf1dd3580512b24eb3fda2b", size = 11315626, upload-time = "2026-01-22T22:30:36.848Z" }, + { url = "https://files.pythonhosted.org/packages/2c/aa/9f89c719c467dfaf8ad799b9bae0df494513fb21d31a6059cb5870e57e74/ruff-0.14.14-py3-none-win32.whl", hash = "sha256:b530c191970b143375b6a68e6f743800b2b786bbcf03a7965b06c4bf04568167", size = 10502442, upload-time = "2026-01-22T22:30:38.93Z" }, + { url = "https://files.pythonhosted.org/packages/87/44/90fa543014c45560cae1fffc63ea059fb3575ee6e1cb654562197e5d16fb/ruff-0.14.14-py3-none-win_amd64.whl", hash = "sha256:3dde1435e6b6fe5b66506c1dff67a421d0b7f6488d466f651c07f4cab3bf20fd", size = 11630486, upload-time = "2026-01-22T22:30:10.852Z" }, + { url = "https://files.pythonhosted.org/packages/9e/6a/40fee331a52339926a92e17ae748827270b288a35ef4a15c9c8f2ec54715/ruff-0.14.14-py3-none-win_arm64.whl", hash = "sha256:56e6981a98b13a32236a72a8da421d7839221fa308b223b9283312312e5ac76c", size = 10920448, upload-time = "2026-01-22T22:30:15.417Z" }, ] [[package]] @@ -1003,27 +1003,26 @@ wheels = [ [[package]] name = "ty" -version = "0.0.12" +version = "0.0.13" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/b5/78/ba1a4ad403c748fbba8be63b7e774a90e80b67192f6443d624c64fe4aaab/ty-0.0.12.tar.gz", hash = "sha256:cd01810e106c3b652a01b8f784dd21741de9fdc47bd595d02c122a7d5cefeee7", size = 4981303, upload-time = "2026-01-14T22:30:48.537Z" } +sdist = { url = "https://files.pythonhosted.org/packages/5a/dc/b607f00916f5a7c52860b84a66dc17bc6988e8445e96b1d6e175a3837397/ty-0.0.13.tar.gz", hash = "sha256:7a1d135a400ca076407ea30012d1f75419634160ed3b9cad96607bf2956b23b3", size = 4999183, upload-time = "2026-01-21T13:21:16.133Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/7d/8f/c21314d074dda5fb13d3300fa6733fd0d8ff23ea83a721818740665b6314/ty-0.0.12-py3-none-linux_armv6l.whl", hash = "sha256:eb9da1e2c68bd754e090eab39ed65edf95168d36cbeb43ff2bd9f86b4edd56d1", size = 9614164, upload-time = "2026-01-14T22:30:44.016Z" }, - { url = "https://files.pythonhosted.org/packages/09/28/f8a4d944d13519d70c486e8f96d6fa95647ac2aa94432e97d5cfec1f42f6/ty-0.0.12-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:c181f42aa19b0ed7f1b0c2d559980b1f1d77cc09419f51c8321c7ddf67758853", size = 9542337, upload-time = "2026-01-14T22:30:05.687Z" }, - { url = "https://files.pythonhosted.org/packages/e1/9c/f576e360441de7a8201daa6dc4ebc362853bc5305e059cceeb02ebdd9a48/ty-0.0.12-py3-none-macosx_11_0_arm64.whl", hash = "sha256:1f829e1eecd39c3e1b032149db7ae6a3284f72fc36b42436e65243a9ed1173db", size = 8909582, upload-time = "2026-01-14T22:30:46.089Z" }, - { url = "https://files.pythonhosted.org/packages/d6/13/0898e494032a5d8af3060733d12929e3e7716db6c75eac63fa125730a3e7/ty-0.0.12-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f45162e7826e1789cf3374627883cdeb0d56b82473a0771923e4572928e90be3", size = 9384932, upload-time = "2026-01-14T22:30:13.769Z" }, - { url = "https://files.pythonhosted.org/packages/e4/1a/b35b6c697008a11d4cedfd34d9672db2f0a0621ec80ece109e13fca4dfef/ty-0.0.12-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:d11fec40b269bec01e751b2337d1c7ffa959a2c2090a950d7e21c2792442cccd", size = 9453140, upload-time = "2026-01-14T22:30:11.131Z" }, - { url = "https://files.pythonhosted.org/packages/dd/1e/71c9edbc79a3c88a0711324458f29c7dbf6c23452c6e760dc25725483064/ty-0.0.12-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:09d99e37e761a4d2651ad9d5a610d11235fbcbf35dc6d4bc04abf54e7cf894f1", size = 9960680, upload-time = "2026-01-14T22:30:33.621Z" }, - { url = "https://files.pythonhosted.org/packages/0e/75/39375129f62dd22f6ad5a99cd2a42fd27d8b91b235ce2db86875cdad397d/ty-0.0.12-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:d9ca0cdb17bd37397da7b16a7cd23423fc65c3f9691e453ad46c723d121225a1", size = 10904518, upload-time = "2026-01-14T22:30:08.464Z" }, - { url = "https://files.pythonhosted.org/packages/32/5e/26c6d88fafa11a9d31ca9f4d12989f57782ec61e7291d4802d685b5be118/ty-0.0.12-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fcf2757b905e7eddb7e456140066335b18eb68b634a9f72d6f54a427ab042c64", size = 10525001, upload-time = "2026-01-14T22:30:16.454Z" }, - { url = "https://files.pythonhosted.org/packages/c2/a5/2f0b91894af13187110f9ad7ee926d86e4e6efa755c9c88a820ed7f84c85/ty-0.0.12-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:00cf34c1ebe1147efeda3021a1064baa222c18cdac114b7b050bbe42deb4ca80", size = 10307103, upload-time = "2026-01-14T22:30:41.221Z" }, - { url = "https://files.pythonhosted.org/packages/4b/77/13d0410827e4bc713ebb7fdaf6b3590b37dcb1b82e0a81717b65548f2442/ty-0.0.12-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2bb3a655bd869352e9a22938d707631ac9fbca1016242b1f6d132d78f347c851", size = 10072737, upload-time = "2026-01-14T22:30:51.783Z" }, - { url = "https://files.pythonhosted.org/packages/e1/dd/fc36d8bac806c74cf04b4ca735bca14d19967ca84d88f31e121767880df1/ty-0.0.12-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:4658e282c7cb82be304052f8f64f9925f23c3c4f90eeeb32663c74c4b095d7ba", size = 9368726, upload-time = "2026-01-14T22:30:18.683Z" }, - { url = "https://files.pythonhosted.org/packages/54/70/9e8e461647550f83e2fe54bc632ccbdc17a4909644783cdbdd17f7296059/ty-0.0.12-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:c167d838eaaa06e03bb66a517f75296b643d950fbd93c1d1686a187e5a8dbd1f", size = 9454704, upload-time = "2026-01-14T22:30:22.759Z" }, - { url = "https://files.pythonhosted.org/packages/04/9b/6292cf7c14a0efeca0539cf7d78f453beff0475cb039fbea0eb5d07d343d/ty-0.0.12-py3-none-musllinux_1_2_i686.whl", hash = "sha256:2956e0c9ab7023533b461d8a0e6b2ea7b78e01a8dde0688e8234d0fce10c4c1c", size = 9649829, upload-time = "2026-01-14T22:30:31.234Z" }, - { url = "https://files.pythonhosted.org/packages/49/bd/472a5d2013371e4870886cff791c94abdf0b92d43d305dd0f8e06b6ff719/ty-0.0.12-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:5c6a3fd7479580009f21002f3828320621d8a82d53b7ba36993234e3ccad58c8", size = 10162814, upload-time = "2026-01-14T22:30:36.174Z" }, - { url = "https://files.pythonhosted.org/packages/31/e9/2ecbe56826759845a7c21d80aa28187865ea62bc9757b056f6cbc06f78ed/ty-0.0.12-py3-none-win32.whl", hash = "sha256:a91c24fd75c0f1796d8ede9083e2c0ec96f106dbda73a09fe3135e075d31f742", size = 9140115, upload-time = "2026-01-14T22:30:38.903Z" }, - { url = "https://files.pythonhosted.org/packages/5d/6d/d9531eff35a5c0ec9dbc10231fac21f9dd6504814048e81d6ce1c84dc566/ty-0.0.12-py3-none-win_amd64.whl", hash = "sha256:df151894be55c22d47068b0f3b484aff9e638761e2267e115d515fcc9c5b4a4b", size = 9884532, upload-time = "2026-01-14T22:30:25.112Z" }, - { url = "https://files.pythonhosted.org/packages/e9/f3/20b49e75967023b123a221134548ad7000f9429f13fdcdda115b4c26305f/ty-0.0.12-py3-none-win_arm64.whl", hash = "sha256:cea99d334b05629de937ce52f43278acf155d3a316ad6a35356635f886be20ea", size = 9313974, upload-time = "2026-01-14T22:30:27.44Z" }, + { url = "https://files.pythonhosted.org/packages/1a/df/3632f1918f4c0a33184f107efc5d436ab6da147fd3d3b94b3af6461efbf4/ty-0.0.13-py3-none-linux_armv6l.whl", hash = "sha256:1b2b8e02697c3a94c722957d712a0615bcc317c9b9497be116ef746615d892f2", size = 9993501, upload-time = "2026-01-21T13:21:26.628Z" }, + { url = "https://files.pythonhosted.org/packages/92/87/6a473ced5ac280c6ce5b1627c71a8a695c64481b99aabc798718376a441e/ty-0.0.13-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:f15cdb8e233e2b5adfce673bb21f4c5e8eaf3334842f7eea3c70ac6fda8c1de5", size = 9860986, upload-time = "2026-01-21T13:21:24.425Z" }, + { url = "https://files.pythonhosted.org/packages/5d/9b/d89ae375cf0a7cd9360e1164ce017f8c753759be63b6a11ed4c944abe8c6/ty-0.0.13-py3-none-macosx_11_0_arm64.whl", hash = "sha256:0819e89ac9f0d8af7a062837ce197f0461fee2fc14fd07e2c368780d3a397b73", size = 9350748, upload-time = "2026-01-21T13:21:28.502Z" }, + { url = "https://files.pythonhosted.org/packages/a8/a6/9ad58518056fab344b20c0bb2c1911936ebe195318e8acc3bc45ac1c6b6b/ty-0.0.13-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1de79f481084b7cc7a202ba0d7a75e10970d10ffa4f025b23f2e6b7324b74886", size = 9849884, upload-time = "2026-01-21T13:21:21.886Z" }, + { url = "https://files.pythonhosted.org/packages/b1/c3/8add69095fa179f523d9e9afcc15a00818af0a37f2b237a9b59bc0046c34/ty-0.0.13-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:4fb2154cff7c6e95d46bfaba283c60642616f20d73e5f96d0c89c269f3e1bcec", size = 9822975, upload-time = "2026-01-21T13:21:14.292Z" }, + { url = "https://files.pythonhosted.org/packages/a4/05/4c0927c68a0a6d43fb02f3f0b6c19c64e3461dc8ed6c404dde0efb8058f7/ty-0.0.13-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:00be58d89337c27968a20d58ca553458608c5b634170e2bec82824c2e4cf4d96", size = 10294045, upload-time = "2026-01-21T13:21:30.505Z" }, + { url = "https://files.pythonhosted.org/packages/b4/86/6dc190838aba967557fe0bfd494c595d00b5081315a98aaf60c0e632aaeb/ty-0.0.13-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:72435eade1fa58c6218abb4340f43a6c3ff856ae2dc5722a247d3a6dd32e9737", size = 10916460, upload-time = "2026-01-21T13:21:07.788Z" }, + { url = "https://files.pythonhosted.org/packages/04/40/9ead96b7c122e1109dfcd11671184c3506996bf6a649306ec427e81d9544/ty-0.0.13-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:77a548742ee8f621d718159e7027c3b555051d096a49bb580249a6c5fc86c271", size = 10597154, upload-time = "2026-01-21T13:21:18.064Z" }, + { url = "https://files.pythonhosted.org/packages/aa/7d/e832a2c081d2be845dc6972d0c7998914d168ccbc0b9c86794419ab7376e/ty-0.0.13-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:da067c57c289b7cf914669704b552b6207c2cc7f50da4118c3e12388642e6b3f", size = 10410710, upload-time = "2026-01-21T13:21:12.388Z" }, + { url = "https://files.pythonhosted.org/packages/31/e3/898be3a96237a32f05c4c29b43594dc3b46e0eedfe8243058e46153b324f/ty-0.0.13-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:d1b50a01fffa140417fca5a24b658fbe0734074a095d5b6f0552484724474343", size = 9826299, upload-time = "2026-01-21T13:21:00.845Z" }, + { url = "https://files.pythonhosted.org/packages/bb/eb/db2d852ce0ed742505ff18ee10d7d252f3acfd6fc60eca7e9c7a0288a6d8/ty-0.0.13-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:0f33c46f52e5e9378378eca0d8059f026f3c8073ace02f7f2e8d079ddfe5207e", size = 9831610, upload-time = "2026-01-21T13:21:05.842Z" }, + { url = "https://files.pythonhosted.org/packages/9e/61/149f59c8abaddcbcbb0bd13b89c7741ae1c637823c5cf92ed2c644fcadef/ty-0.0.13-py3-none-musllinux_1_2_i686.whl", hash = "sha256:168eda24d9a0b202cf3758c2962cc295878842042b7eca9ed2965259f59ce9f2", size = 9978885, upload-time = "2026-01-21T13:21:10.306Z" }, + { url = "https://files.pythonhosted.org/packages/a0/cd/026d4e4af60a80918a8d73d2c42b8262dd43ab2fa7b28d9743004cb88d57/ty-0.0.13-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:d4917678b95dc8cb399cc459fab568ba8d5f0f33b7a94bf840d9733043c43f29", size = 10506453, upload-time = "2026-01-21T13:20:56.633Z" }, + { url = "https://files.pythonhosted.org/packages/63/06/8932833a4eca2df49c997a29afb26721612de8078ae79074c8fe87e17516/ty-0.0.13-py3-none-win32.whl", hash = "sha256:c1f2ec40daa405508b053e5b8e440fbae5fdb85c69c9ab0ee078f8bc00eeec3d", size = 9433482, upload-time = "2026-01-21T13:20:58.717Z" }, + { url = "https://files.pythonhosted.org/packages/aa/fd/e8d972d1a69df25c2cecb20ea50e49ad5f27a06f55f1f5f399a563e71645/ty-0.0.13-py3-none-win_amd64.whl", hash = "sha256:8b7b1ab9f187affbceff89d51076038363b14113be29bda2ddfa17116de1d476", size = 10319156, upload-time = "2026-01-21T13:21:03.266Z" }, + { url = "https://files.pythonhosted.org/packages/2d/c2/05fdd64ac003a560d4fbd1faa7d9a31d75df8f901675e5bed1ee2ceeff87/ty-0.0.13-py3-none-win_arm64.whl", hash = "sha256:1c9630333497c77bb9bcabba42971b96ee1f36c601dd3dcac66b4134f9fa38f0", size = 9808316, upload-time = "2026-01-21T13:20:54.053Z" }, ] [[package]] From d88e0aa827133d910f2506758c1676168cd3595f Mon Sep 17 00:00:00 2001 From: Daniel Koepping Date: Mon, 26 Jan 2026 21:04:37 -0800 Subject: [PATCH 078/229] Car diff: padding (#3068) padding --- opendbc/car/tests/car_diff.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/opendbc/car/tests/car_diff.py b/opendbc/car/tests/car_diff.py index 482d67436db..f4b5bd68e5d 100755 --- a/opendbc/car/tests/car_diff.py +++ b/opendbc/car/tests/car_diff.py @@ -25,6 +25,7 @@ TOLERANCE = 1e-4 DIFF_BUCKET = "car_diff" IGNORE_FIELDS = ["cumLagMs", "canErrorCounter"] +PADDING = 5 def dict_diff(d1, d2, path="", ignore=None, tolerance=0): @@ -182,8 +183,8 @@ def group_frames(diffs, max_gap=15): def build_signals(group): _, first_frame, _, _ = group[0] _, last_frame, (final_master, _), _ = group[-1] - start = max(0, first_frame - 5) - end = last_frame + 6 + start = max(0, first_frame - PADDING) + end = last_frame + PADDING + 1 init = not final_master diff_at = {frame: (m, p) for _, frame, (m, p), _ in group} master_vals = [] From b038e6e19964bb6c06184afac61dac028e44eb8f Mon Sep 17 00:00:00 2001 From: Daniel Koepping Date: Mon, 26 Jan 2026 21:04:55 -0800 Subject: [PATCH 079/229] Car diff: skip comment on first timer PR (#3067) skip comment if tests.yml never ran --- .github/workflows/car_diff.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/car_diff.yml b/.github/workflows/car_diff.yml index c6f94216c76..bb8d88329f0 100644 --- a/.github/workflows/car_diff.yml +++ b/.github/workflows/car_diff.yml @@ -9,13 +9,14 @@ jobs: name: comment runs-on: ubuntu-latest timeout-minutes: 10 - continue-on-error: true permissions: contents: read pull-requests: write actions: read steps: - name: Wait for car diff + id: wait + continue-on-error: true uses: lewagon/wait-on-check-action@v1.3.4 with: ref: ${{ github.event.pull_request.head.sha }} @@ -24,6 +25,7 @@ jobs: allowed-conclusions: success wait-interval: 20 - name: Download car diff + if: steps.wait.outcome == 'success' uses: dawidd6/action-download-artifact@v6 with: github_token: ${{ secrets.GITHUB_TOKEN }} @@ -34,6 +36,7 @@ jobs: path: . allow_forks: true - name: Comment car diff on PR + if: steps.wait.outcome == 'success' uses: thollander/actions-comment-pull-request@v2 with: filePath: diff.txt From 8a25621e97fc022a56d0f3eb47be691832169cf7 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Tue, 27 Jan 2026 20:34:30 -0800 Subject: [PATCH 080/229] Toyota: clean up alpha long (#3074) * toyota: clean up alpha long * yes we have a test --- opendbc/car/toyota/interface.py | 9 ++++----- opendbc/car/toyota/tests/test_toyota.py | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/opendbc/car/toyota/interface.py b/opendbc/car/toyota/interface.py index 9e2d332f2cb..bda0a03a8aa 100644 --- a/opendbc/car/toyota/interface.py +++ b/opendbc/car/toyota/interface.py @@ -106,12 +106,11 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo # TODO: make an adas dbc file for dsu-less models ret.radarUnavailable = Bus.radar not in DBC[candidate] or candidate in (NO_DSU_CAR - TSS2_CAR) - # since we don't yet parse radar on TSS2/TSS-P radar-based ACC cars, gate longitudinal behind experimental toggle - if candidate in (RADAR_ACC_CAR | NO_DSU_CAR): - ret.alphaLongitudinalAvailable = candidate in RADAR_ACC_CAR + # since we don't yet parse radar on TSS2 radar-based ACC cars, gate longitudinal behind experimental toggle + if candidate in RADAR_ACC_CAR: + ret.alphaLongitudinalAvailable = True - # Disabling radar is only supported on TSS2 radar-ACC cars - if alpha_long and candidate in RADAR_ACC_CAR: + if alpha_long: ret.flags |= ToyotaFlags.DISABLE_RADAR.value # openpilot longitudinal enabled by default: diff --git a/opendbc/car/toyota/tests/test_toyota.py b/opendbc/car/toyota/tests/test_toyota.py index 5ab47f35651..2d07af5485e 100644 --- a/opendbc/car/toyota/tests/test_toyota.py +++ b/opendbc/car/toyota/tests/test_toyota.py @@ -18,6 +18,7 @@ def check_fw_version(fw_version: bytes) -> bool: class TestToyotaInterfaces: def test_car_sets(self): + # Angle and radar-ACC cars are always TSS2 cars assert len(ANGLE_CONTROL_CAR - TSS2_CAR) == 0 assert len(RADAR_ACC_CAR - TSS2_CAR) == 0 From cbff382e5bb42a705ba880ca8feaf20298df8f7a Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Tue, 27 Jan 2026 20:48:17 -0800 Subject: [PATCH 081/229] Toyota: clean up radarUnavailable (#3075) * toyota: clean up alpha long * yes we have a test * not critical * test the differ * add more * this stems back to /one, so maybe they do * un print * it doesn't detect --- opendbc/car/toyota/interface.py | 9 +++------ opendbc/car/toyota/values.py | 5 +++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/opendbc/car/toyota/interface.py b/opendbc/car/toyota/interface.py index bda0a03a8aa..c86b8bee65f 100644 --- a/opendbc/car/toyota/interface.py +++ b/opendbc/car/toyota/interface.py @@ -2,9 +2,8 @@ from opendbc.car.toyota.carstate import CarState from opendbc.car.toyota.carcontroller import CarController from opendbc.car.toyota.radar_interface import RadarInterface -from opendbc.car.toyota.values import Ecu, CAR, DBC, ToyotaFlags, CarControllerParams, TSS2_CAR, RADAR_ACC_CAR, NO_DSU_CAR, \ - MIN_ACC_SPEED, EPS_SCALE, NO_STOP_TIMER_CAR, ANGLE_CONTROL_CAR, \ - ToyotaSafetyFlags +from opendbc.car.toyota.values import Ecu, CAR, DBC, ToyotaFlags, CarControllerParams, TSS2_CAR, RADAR_ACC_CAR, MIN_ACC_SPEED, \ + EPS_SCALE, NO_STOP_TIMER_CAR, ANGLE_CONTROL_CAR, ToyotaSafetyFlags from opendbc.car.disable_ecu import disable_ecu from opendbc.car.interfaces import CarInterfaceBase @@ -102,9 +101,7 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo # Detect flipped signals and enable for C-HR and others ret.enableBsm = 0x3F6 in fingerprint[0] and candidate in TSS2_CAR - # No radar dbc for cars without DSU which are not TSS 2.0 - # TODO: make an adas dbc file for dsu-less models - ret.radarUnavailable = Bus.radar not in DBC[candidate] or candidate in (NO_DSU_CAR - TSS2_CAR) + ret.radarUnavailable = Bus.radar not in DBC[candidate] # since we don't yet parse radar on TSS2 radar-based ACC cars, gate longitudinal behind experimental toggle if candidate in RADAR_ACC_CAR: diff --git a/opendbc/car/toyota/values.py b/opendbc/car/toyota/values.py index b7206ba84d9..e482e86ff7a 100644 --- a/opendbc/car/toyota/values.py +++ b/opendbc/car/toyota/values.py @@ -156,13 +156,14 @@ class CAR(Platforms): ], TOYOTA_AVALON.specs, ) + # TODO: determine if TSS-P NO_DSU cars can work with toyota_adas radar DBC and re-enable TOYOTA_CAMRY = PlatformConfig( [ ToyotaCarDocs("Toyota Camry 2018-20", video="https://www.youtube.com/watch?v=fkcjviZY9CM", footnotes=[Footnote.CAMRY]), ToyotaCarDocs("Toyota Camry Hybrid 2018-20", video="https://www.youtube.com/watch?v=Q2DYY0AWKgk"), ], CarSpecs(mass=3400. * CV.LB_TO_KG, wheelbase=2.82448, steerRatio=13.7, tireStiffnessFactor=0.7933), - dbc_dict('toyota_nodsu_pt_generated', 'toyota_adas'), + {Bus.pt: 'toyota_nodsu_pt_generated'}, flags=ToyotaFlags.NO_DSU, ) TOYOTA_CAMRY_TSS2 = ToyotaTSS2PlatformConfig( # TSS 2.5 @@ -178,7 +179,7 @@ class CAR(Platforms): ToyotaCarDocs("Toyota C-HR Hybrid 2017-20"), ], CarSpecs(mass=3300. * CV.LB_TO_KG, wheelbase=2.63906, steerRatio=13.6, tireStiffnessFactor=0.7933), - dbc_dict('toyota_nodsu_pt_generated', 'toyota_adas'), + {Bus.pt: 'toyota_nodsu_pt_generated'}, flags=ToyotaFlags.NO_DSU, ) TOYOTA_CHR_TSS2 = ToyotaTSS2PlatformConfig( From c3dd56199d2ee0a8c3cbf4d1aa6b1ddde949bda7 Mon Sep 17 00:00:00 2001 From: Daniel Koepping Date: Tue, 27 Jan 2026 21:03:19 -0800 Subject: [PATCH 082/229] Car diff: add typing (#3073) * typing * add alias --- opendbc/car/tests/car_diff.py | 39 ++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/opendbc/car/tests/car_diff.py b/opendbc/car/tests/car_diff.py index f4b5bd68e5d..a7221490e88 100755 --- a/opendbc/car/tests/car_diff.py +++ b/opendbc/car/tests/car_diff.py @@ -13,6 +13,7 @@ from urllib.request import urlopen from collections import defaultdict from pathlib import Path +from typing import Any from comma_car_segments import get_comma_car_segments_database, get_url @@ -27,8 +28,12 @@ IGNORE_FIELDS = ["cumLagMs", "canErrorCounter"] PADDING = 5 +Diff = tuple[str, int, tuple[Any, Any], int] +Ref = tuple[int, structs.CarState] +Result = tuple[str, str, list[Diff], str | None] -def dict_diff(d1, d2, path="", ignore=None, tolerance=0): + +def dict_diff(d1: dict[str, Any], d2: dict[str, Any], path: str = "", ignore: list[str] | None = None, tolerance: float = 0) -> list[tuple]: ignore = ignore or [] diffs = [] for key in d1.keys() | d2.keys(): @@ -46,14 +51,14 @@ def dict_diff(d1, d2, path="", ignore=None, tolerance=0): return diffs -def load_can_messages(seg): +def load_can_messages(seg: str) -> list[Any]: parts = seg.split("/") url = get_url(f"{parts[0]}/{parts[1]}", parts[2]) msgs = LogReader(url, only_union_types=True, sort_by_time=True) return [m for m in msgs if m.which() == 'can'] -def replay_segment(platform, can_msgs): +def replay_segment(platform: str, can_msgs: list[Any]) -> tuple[list[structs.CarState], list[int]]: _can_msgs = ([CanData(can.address, can.dat, can.src) for can in m.can] for m in can_msgs) def can_recv(wait_for_one: bool = False) -> list[list[CanData]]: @@ -75,7 +80,7 @@ def can_recv(wait_for_one: bool = False) -> list[list[CanData]]: return states, timestamps -def process_segment(args): +def process_segment(args: tuple) -> Result: platform, seg, ref_path, update = args try: can_msgs = load_can_messages(seg) @@ -90,7 +95,7 @@ def process_segment(args): if not ref_file.exists(): return (platform, seg, [], "no ref") - ref = pickle.loads(decompress_stream(ref_file.read_bytes())) + ref: list[Ref] = pickle.loads(decompress_stream(ref_file.read_bytes())) diffs = [] for i, ((ts, ref_state), state) in enumerate(zip(ref, states, strict=True)): for diff in dict_diff(ref_state.to_dict(), state.to_dict(), ignore=IGNORE_FIELDS, tolerance=TOLERANCE): @@ -100,7 +105,7 @@ def process_segment(args): return (platform, seg, [], traceback.format_exc()) -def get_changed_platforms(cwd, database, interfaces): +def get_changed_platforms(cwd: Path, database: dict[str, Any], interfaces: dict[str, Any]) -> list[str]: git_ref = os.environ.get("GIT_REF", "origin/master") changed = subprocess.check_output(["git", "diff", "--name-only", f"{git_ref}...HEAD"], cwd=cwd, encoding='utf8').strip() brands = set() @@ -113,7 +118,7 @@ def get_changed_platforms(cwd, database, interfaces): return [p for p in interfaces if any(b in p.lower() for b in brands) and p in database] -def download_refs(ref_path, platforms, segments): +def download_refs(ref_path: Path, platforms: list[str], segments: dict[str, list[str]]) -> None: base_url = f"https://raw.githubusercontent.com/commaai/ci-artifacts/refs/heads/{DIFF_BUCKET}" for platform in tqdm(platforms): for seg in segments.get(platform, []): @@ -122,14 +127,14 @@ def download_refs(ref_path, platforms, segments): (Path(ref_path) / filename).write_bytes(resp.read()) -def run_replay(platforms, segments, ref_path, update, workers=4): +def run_replay(platforms: list[str], segments: dict[str, list[str]], ref_path: Path, update: bool, workers: int = 4) -> list[Result]: work = [(platform, seg, ref_path, update) for platform in platforms for seg in segments.get(platform, [])] return process_map(process_segment, work, max_workers=workers) # ASCII waveforms helpers -def find_edges(vals, init): +def find_edges(vals: list[bool], init: bool) -> tuple[list[int], list[int]]: rises = [] falls = [] prev = init @@ -142,7 +147,7 @@ def find_edges(vals, init): return rises, falls -def render_waveform(label, vals, init): +def render_waveform(label: str, vals: list[bool], init: bool) -> str: wave = {(False, False): "_", (True, True): "‾", (False, True): "/", (True, False): "\\"} line = f" {label}:".ljust(12) prev = init @@ -154,7 +159,7 @@ def render_waveform(label, vals, init): return line -def format_timing(edge_type, master_edges, pr_edges, ms_per_frame): +def format_timing(edge_type: str, master_edges: list[int], pr_edges: list[int], ms_per_frame: float) -> str | None: if not master_edges or not pr_edges: return None delta = pr_edges[0] - master_edges[0] @@ -165,7 +170,7 @@ def format_timing(edge_type, master_edges, pr_edges, ms_per_frame): return " " * 12 + f"{edge_type}: PR {direction} by {abs(delta)} frames ({ms}ms)" -def group_frames(diffs, max_gap=15): +def group_frames(diffs: list[Diff], max_gap: int = 15) -> list[list[Diff]]: groups = [] current = [diffs[0]] for diff in diffs[1:]: @@ -180,7 +185,7 @@ def group_frames(diffs, max_gap=15): return groups -def build_signals(group): +def build_signals(group: list[Diff]) -> tuple[list[bool], list[bool], bool, int, int]: _, first_frame, _, _ = group[0] _, last_frame, (final_master, _), _ = group[-1] start = max(0, first_frame - PADDING) @@ -201,7 +206,7 @@ def build_signals(group): return master_vals, pr_vals, init, start, end -def format_numeric_diffs(diffs): +def format_numeric_diffs(diffs: list[Diff]) -> list[str]: lines = [] for _, frame, (old_val, new_val), _ in diffs[:10]: lines.append(f" frame {frame}: {old_val} -> {new_val}") @@ -210,7 +215,7 @@ def format_numeric_diffs(diffs): return lines -def format_boolean_diffs(diffs): +def format_boolean_diffs(diffs: list[Diff]) -> list[str]: _, first_frame, _, first_ts = diffs[0] _, last_frame, _, last_ts = diffs[-1] frame_time = last_frame - first_frame @@ -233,7 +238,7 @@ def format_boolean_diffs(diffs): return lines -def format_diff(diffs): +def format_diff(diffs: list[Diff]) -> list[str]: if not diffs: return [] _, _, (old, new), _ = diffs[0] @@ -243,7 +248,7 @@ def format_diff(diffs): return format_numeric_diffs(diffs) -def main(platform=None, segments_per_platform=10, update_refs=False, all_platforms=False): +def main(platform: str | None = None, segments_per_platform: int = 10, update_refs: bool = False, all_platforms: bool = False) -> int: cwd = Path(__file__).resolve().parents[3] ref_path = cwd / DIFF_BUCKET if not update_refs: From 1cd92abbf86b50ccd0a5782e6a5d598c14d94e7e Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Tue, 27 Jan 2026 22:11:29 -0800 Subject: [PATCH 083/229] Toyota: remove NO_STOP_TIMER flag (#3076) * move inside op long control * this isn't a real code path anymore * fully remove NO_STOP_TIMER * we'll turn this around * rev --- opendbc/car/toyota/carcontroller.py | 29 +++++++---------------------- opendbc/car/toyota/carstate.py | 13 +++++-------- opendbc/car/toyota/interface.py | 9 ++++----- opendbc/car/toyota/values.py | 15 ++++----------- 4 files changed, 20 insertions(+), 46 deletions(-) diff --git a/opendbc/car/toyota/carcontroller.py b/opendbc/car/toyota/carcontroller.py index e5e3df969b0..82371d43602 100644 --- a/opendbc/car/toyota/carcontroller.py +++ b/opendbc/car/toyota/carcontroller.py @@ -8,9 +8,7 @@ from opendbc.car.secoc import add_mac, build_sync_mac from opendbc.car.interfaces import CarControllerBase from opendbc.car.toyota import toyotacan -from opendbc.car.toyota.values import CAR, NO_STOP_TIMER_CAR, TSS2_CAR, \ - CarControllerParams, ToyotaFlags, \ - UNSUPPORTED_DSU_CAR +from opendbc.car.toyota.values import CAR, TSS2_CAR, UNSUPPORTED_DSU_CAR, CarControllerParams, ToyotaFlags from opendbc.can import CANPacker Ecu = structs.CarParams.Ecu @@ -55,7 +53,6 @@ def __init__(self, dbc_names, CP): self.last_torque = 0 self.last_angle = 0 self.alert_active = False - self.last_standstill = False self.standstill_req = False self.permit_braking = True self.steer_rate_counter = 0 @@ -168,17 +165,13 @@ def update(self, CC, CS, now_nanos): self.secoc_lta_message_counter += 1 can_sends.append(lta_steer_2) - # *** gas and brake *** - - # on entering standstill, send standstill request for older TSS-P cars that aren't designed to stay engaged at a stop - if self.CP.carFingerprint not in NO_STOP_TIMER_CAR: - if CS.out.standstill and not self.last_standstill: - self.standstill_req = True - if CS.pcm_acc_status != 8: - # pcm entered standstill or it's disabled - self.standstill_req = False + # handle UI messages + fcw_alert = hud_control.visualAlert == VisualAlert.fcw + steer_alert = hud_control.visualAlert in (VisualAlert.steerRequired, VisualAlert.ldw) + lead = hud_control.leadVisible or CS.out.vEgo < 12. # at low speed we always assume the lead is present so ACC can be engaged - else: + # *** gas and brake *** + if self.CP.openpilotLongitudinalControl: # if user engages at a stop with foot on brake, PCM starts in a special cruise standstill mode. on resume press, # brakes can take a while to ramp up causing a lurch forward. prevent resume press until planner wants to move. # don't use CC.cruiseControl.resume since it is gated on CS.cruiseState.standstill which goes false for 3s after resume press @@ -191,14 +184,6 @@ def update(self, CC, CS, now_nanos): if not should_resume and CS.out.cruiseState.standstill: self.standstill_req = True - self.last_standstill = CS.out.standstill - - # handle UI messages - fcw_alert = hud_control.visualAlert == VisualAlert.fcw - steer_alert = hud_control.visualAlert in (VisualAlert.steerRequired, VisualAlert.ldw) - lead = hud_control.leadVisible or CS.out.vEgo < 12. # at low speed we always assume the lead is present so ACC can be engaged - - if self.CP.openpilotLongitudinalControl: if self.frame % 3 == 0: # Press distance button until we are at the correct bar length. Only change while enabled to avoid skipping startup popup if self.frame % 6 == 0 and self.CP.openpilotLongitudinalControl: diff --git a/opendbc/car/toyota/carstate.py b/opendbc/car/toyota/carstate.py index 3fb22740987..ca50e70b4cf 100644 --- a/opendbc/car/toyota/carstate.py +++ b/opendbc/car/toyota/carstate.py @@ -5,9 +5,8 @@ from opendbc.car.common.conversions import Conversions as CV from opendbc.car.common.filter_simple import FirstOrderFilter from opendbc.car.interfaces import CarStateBase -from opendbc.car.toyota.values import ToyotaFlags, CAR, DBC, STEER_THRESHOLD, NO_STOP_TIMER_CAR, \ - TSS2_CAR, RADAR_ACC_CAR, EPS_SCALE, UNSUPPORTED_DSU_CAR, \ - SECOC_CAR +from opendbc.car.toyota.values import ToyotaFlags, CAR, DBC, STEER_THRESHOLD, TSS2_CAR, RADAR_ACC_CAR, \ + EPS_SCALE, UNSUPPORTED_DSU_CAR, SECOC_CAR ButtonType = structs.CarState.ButtonEvent.Type SteerControlType = structs.CarParams.SteerControlType @@ -160,12 +159,10 @@ def update(self, can_parsers) -> structs.CarState: if self.CP.openpilotLongitudinalControl: ret.accFaulted = ret.accFaulted or cp.vl["PCM_CRUISE_2"]["LOW_SPEED_LOCKOUT"] == 2 - self.pcm_acc_status = cp.vl["PCM_CRUISE"]["CRUISE_STATE"] - if self.CP.carFingerprint not in (NO_STOP_TIMER_CAR - TSS2_CAR): - # ignore standstill state in certain vehicles, since pcm allows to restart with just an acceleration request - ret.cruiseState.standstill = self.pcm_acc_status == 7 + pcm_acc_status = cp.vl["PCM_CRUISE"]["CRUISE_STATE"] + ret.cruiseState.standstill = pcm_acc_status == 7 ret.cruiseState.enabled = bool(cp.vl["PCM_CRUISE"]["CRUISE_ACTIVE"]) - ret.cruiseState.nonAdaptive = self.pcm_acc_status in (1, 2, 3, 4, 5, 6) + ret.cruiseState.nonAdaptive = pcm_acc_status in (1, 2, 3, 4, 5, 6) ret.genericToggle = bool(cp.vl["LIGHT_STALK"]["AUTO_HIGH_BEAM"]) ret.espDisabled = cp.vl["ESP_CONTROL"]["TC_DISABLED"] != 0 diff --git a/opendbc/car/toyota/interface.py b/opendbc/car/toyota/interface.py index c86b8bee65f..9d3e82dd246 100644 --- a/opendbc/car/toyota/interface.py +++ b/opendbc/car/toyota/interface.py @@ -3,7 +3,7 @@ from opendbc.car.toyota.carcontroller import CarController from opendbc.car.toyota.radar_interface import RadarInterface from opendbc.car.toyota.values import Ecu, CAR, DBC, ToyotaFlags, CarControllerParams, TSS2_CAR, RADAR_ACC_CAR, MIN_ACC_SPEED, \ - EPS_SCALE, NO_STOP_TIMER_CAR, ANGLE_CONTROL_CAR, ToyotaSafetyFlags + EPS_SCALE, ANGLE_CONTROL_CAR, ToyotaSafetyFlags from opendbc.car.disable_ecu import disable_ecu from opendbc.car.interfaces import CarInterfaceBase @@ -103,7 +103,7 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo ret.radarUnavailable = Bus.radar not in DBC[candidate] - # since we don't yet parse radar on TSS2 radar-based ACC cars, gate longitudinal behind experimental toggle + # since we don't yet parse radar on TSS2 radar-based ACC cars, gate longitudinal behind alpha toggle if candidate in RADAR_ACC_CAR: ret.alphaLongitudinalAvailable = True @@ -111,15 +111,14 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo ret.flags |= ToyotaFlags.DISABLE_RADAR.value # openpilot longitudinal enabled by default: - # - cars w/ DSU disconnected # - TSS2 cars with camera sending ACC_CONTROL where we can block it - # openpilot longitudinal behind experimental long toggle: + # openpilot longitudinal behind alpha long toggle: # - TSS2 radar ACC cars (disables radar) ret.openpilotLongitudinalControl = (candidate in (TSS2_CAR - RADAR_ACC_CAR) or bool(ret.flags & ToyotaFlags.DISABLE_RADAR.value)) - ret.autoResumeSng = ret.openpilotLongitudinalControl and candidate in NO_STOP_TIMER_CAR + ret.autoResumeSng = ret.openpilotLongitudinalControl if not ret.openpilotLongitudinalControl: ret.safetyConfigs[0].safetyParam |= ToyotaSafetyFlags.STOCK_LONGITUDINAL.value diff --git a/opendbc/car/toyota/values.py b/opendbc/car/toyota/values.py index e482e86ff7a..69d9b33090d 100644 --- a/opendbc/car/toyota/values.py +++ b/opendbc/car/toyota/values.py @@ -70,7 +70,6 @@ class ToyotaFlags(IntFlag): RADAR_ACC = 64 # these cars use the Lane Tracing Assist (LTA) message for lateral control ANGLE_CONTROL = 128 - NO_STOP_TIMER = 256 # these cars can utilize 2.0 m/s^2 RAISED_ACCEL_LIMIT = 1024 SECOC = 2048 @@ -78,6 +77,8 @@ class ToyotaFlags(IntFlag): # deprecated flags # these cars are speculated to allow stop and go when the DSU is unplugged SNG_WITHOUT_DSU_DEPRECATED = 512 + # no resume button press required + NO_STOP_TIMER_DEPRECATED = 256 def dbc_dict(pt, radar): @@ -107,7 +108,7 @@ class ToyotaTSS2PlatformConfig(PlatformConfig): dbc_dict: dict = field(default_factory=lambda: dbc_dict('toyota_nodsu_pt_generated', 'toyota_tss2_adas')) def init(self): - self.flags |= ToyotaFlags.TSS2 | ToyotaFlags.NO_STOP_TIMER | ToyotaFlags.NO_DSU + self.flags |= ToyotaFlags.TSS2 | ToyotaFlags.NO_DSU if self.flags & ToyotaFlags.RADAR_ACC: self.dbc_dict = {Bus.pt: 'toyota_nodsu_pt_generated'} @@ -118,7 +119,7 @@ class ToyotaSecOCPlatformConfig(PlatformConfig): dbc_dict: dict = field(default_factory=lambda: dbc_dict('toyota_secoc_pt_generated', 'toyota_tss2_adas')) def init(self): - self.flags |= ToyotaFlags.TSS2 | ToyotaFlags.NO_STOP_TIMER | ToyotaFlags.NO_DSU | ToyotaFlags.SECOC + self.flags |= ToyotaFlags.TSS2 | ToyotaFlags.NO_DSU | ToyotaFlags.SECOC if self.flags & ToyotaFlags.RADAR_ACC: self.dbc_dict = {Bus.pt: 'toyota_secoc_pt_generated'} @@ -216,7 +217,6 @@ class CAR(Platforms): ], CarSpecs(mass=4516. * CV.LB_TO_KG, wheelbase=2.8194, steerRatio=16.0, tireStiffnessFactor=0.8), dbc_dict('toyota_tnga_k_pt_generated', 'toyota_adas'), - flags=ToyotaFlags.NO_STOP_TIMER, ) TOYOTA_HIGHLANDER_TSS2 = ToyotaTSS2PlatformConfig( [ @@ -238,7 +238,6 @@ class CAR(Platforms): [ToyotaCarDocs("Toyota Prius v 2017", "Toyota Safety Sense P", min_enable_speed=MIN_ACC_SPEED)], CarSpecs(mass=3340. * CV.LB_TO_KG, wheelbase=2.78, steerRatio=17.4, tireStiffnessFactor=0.5533), dbc_dict('toyota_new_mc_pt_generated', 'toyota_adas'), - flags=ToyotaFlags.NO_STOP_TIMER, ) TOYOTA_PRIUS_TSS2 = ToyotaTSS2PlatformConfig( [ @@ -262,8 +261,6 @@ class CAR(Platforms): ], TOYOTA_RAV4.specs, dbc_dict('toyota_tnga_k_pt_generated', 'toyota_adas'), - # Note that the ICE RAV4 does not respect positive acceleration commands under 19 mph - flags=ToyotaFlags.NO_STOP_TIMER, ) TOYOTA_RAV4_TSS2 = ToyotaTSS2PlatformConfig( [ @@ -305,7 +302,6 @@ class CAR(Platforms): [ToyotaCarDocs("Toyota Sienna 2018-20", video="https://www.youtube.com/watch?v=q1UPOo4Sh68", min_enable_speed=MIN_ACC_SPEED)], CarSpecs(mass=4590. * CV.LB_TO_KG, wheelbase=3.03, steerRatio=15.5, tireStiffnessFactor=0.444), dbc_dict('toyota_tnga_k_pt_generated', 'toyota_adas'), - flags=ToyotaFlags.NO_STOP_TIMER, ) TOYOTA_SIENNA_4TH_GEN = ToyotaSecOCPlatformConfig( [ToyotaSecOcCarDocs("Toyota Sienna 2021-23", min_enable_speed=MIN_ACC_SPEED)], @@ -605,7 +601,4 @@ def match_fw_to_car_fuzzy(live_fw_versions, vin, offline_fw_versions) -> set[str SECOC_CAR = CAR.with_flags(ToyotaFlags.SECOC) -# no resume button press required -NO_STOP_TIMER_CAR = CAR.with_flags(ToyotaFlags.NO_STOP_TIMER) - DBC = CAR.create_dbc_map() From c79e6758aa8e63b4b793c56c9482ea7e5a8277cd Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Tue, 27 Jan 2026 22:51:45 -0800 Subject: [PATCH 084/229] honda: init class variables in __init__ --- opendbc/car/honda/carstate.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/opendbc/car/honda/carstate.py b/opendbc/car/honda/carstate.py index 334491968fe..3794ed7b5f7 100644 --- a/opendbc/car/honda/carstate.py +++ b/opendbc/car/honda/carstate.py @@ -48,6 +48,8 @@ def __init__(self, CP): # When available we use cp.vl["CAR_SPEED"]["ROUGH_CAR_SPEED_2"] to populate vEgoCluster # However, on cars without a digital speedometer this is not always present (HRV, FIT, CRV 2016, ILX and RDX) self.dash_speed_seen = False + self.is_metric = False + self.v_cruise_factor = 1. def update(self, can_parsers) -> structs.CarState: cp = can_parsers[Bus.pt] From d8d9e9b0de3565b64ee6b12cd2b4223f19c2e51a Mon Sep 17 00:00:00 2001 From: eFini Date: Wed, 28 Jan 2026 14:56:53 +0800 Subject: [PATCH 085/229] Honda: Taiwan Odyssey 2019 (#2985) * Taiwan Honda Odyssey 2019 Port * refactor per review comments * flip * can do detection, but only if there we support one more car to avoid early generilzation --------- Co-authored-by: Shane Smiskol --- opendbc/car/honda/carstate.py | 12 +++++++----- opendbc/car/honda/fingerprints.py | 11 +++++++++++ opendbc/car/honda/interface.py | 11 ++++++++++- opendbc/car/honda/values.py | 6 ++++++ opendbc/car/tests/routes.py | 1 + opendbc/car/tests/test_docs.py | 2 +- opendbc/car/torque_data/substitute.toml | 1 + .../dbc/generator/honda/_steering_control_c.dbc | 17 +++++++++++++++++ .../dbc/generator/honda/_steering_sensors_c.dbc | 7 +++++++ .../generator/honda/honda_odyssey_twn_2018.dbc | 7 +++++++ 10 files changed, 68 insertions(+), 7 deletions(-) create mode 100644 opendbc/dbc/generator/honda/_steering_control_c.dbc create mode 100644 opendbc/dbc/generator/honda/_steering_sensors_c.dbc create mode 100644 opendbc/dbc/generator/honda/honda_odyssey_twn_2018.dbc diff --git a/opendbc/car/honda/carstate.py b/opendbc/car/honda/carstate.py index 3794ed7b5f7..52519eef260 100644 --- a/opendbc/car/honda/carstate.py +++ b/opendbc/car/honda/carstate.py @@ -70,7 +70,8 @@ def update(self, can_parsers) -> structs.CarState: self.cruise_buttons = cp.vl["SCM_BUTTONS"]["CRUISE_BUTTONS"] # used for car hud message - self.is_metric = not cp.vl["CAR_SPEED"]["IMPERIAL_UNIT"] + # TODO: find CAR_SPEED for HONDA_ODYSSEY_TWN or use ACC_HUD w/ detection + self.is_metric = self.CP.carFingerprint in (CAR.HONDA_ODYSSEY_TWN,) or not cp.vl["CAR_SPEED"]["IMPERIAL_UNIT"] self.v_cruise_factor = CV.MPH_TO_MS if self.dynamic_v_cruise_units and not self.is_metric else CV.KPH_TO_MS # ******************* parse out can ******************* @@ -129,10 +130,11 @@ def update(self, can_parsers) -> structs.CarState: ret.espDisabled = cp.vl["VSA_STATUS"]["ESP_DISABLED"] != 0 - self.dash_speed_seen = self.dash_speed_seen or cp.vl["CAR_SPEED"]["ROUGH_CAR_SPEED_2"] > 1e-3 - if self.dash_speed_seen: - conversion = CV.KPH_TO_MS if self.is_metric else CV.MPH_TO_MS - ret.vEgoCluster = cp.vl["CAR_SPEED"]["ROUGH_CAR_SPEED_2"] * conversion + if self.CP.carFingerprint not in (CAR.HONDA_ODYSSEY_TWN,): + self.dash_speed_seen = self.dash_speed_seen or cp.vl["CAR_SPEED"]["ROUGH_CAR_SPEED_2"] > 1e-3 + if self.dash_speed_seen: + conversion = CV.KPH_TO_MS if self.is_metric else CV.MPH_TO_MS + ret.vEgoCluster = cp.vl["CAR_SPEED"]["ROUGH_CAR_SPEED_2"] * conversion ret.steeringAngleDeg = cp.vl["STEERING_SENSORS"]["STEER_ANGLE"] ret.steeringRateDeg = cp.vl["STEERING_SENSORS"]["STEER_ANGLE_RATE"] diff --git a/opendbc/car/honda/fingerprints.py b/opendbc/car/honda/fingerprints.py index 071c87743f1..0080610534f 100644 --- a/opendbc/car/honda/fingerprints.py +++ b/opendbc/car/honda/fingerprints.py @@ -583,6 +583,17 @@ b'54008-THR-A020\x00\x00', ], }, + CAR.HONDA_ODYSSEY_TWN: { + (Ecu.eps, 0x18da30f1, None): [ + b'39990-T6A-J210\x00\x00', + ], + (Ecu.srs, 0x18da53f1, None): [ + b'77959-T6A-P110\x00\x00', + ], + (Ecu.fwdRadar, 0x18dab0f1, None): [ + b'36161-T6A-P040\x00\x00', + ], + }, CAR.HONDA_ODYSSEY_5G_MMR: { (Ecu.vsa, 0x18da28f1, None): [ b'57114-THR-A240\x00\x00', diff --git a/opendbc/car/honda/interface.py b/opendbc/car/honda/interface.py index f8c60a5cbe3..3ee165d534e 100755 --- a/opendbc/car/honda/interface.py +++ b/opendbc/car/honda/interface.py @@ -163,6 +163,10 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo ret.lateralTuning.pid.kpV, ret.lateralTuning.pid.kiV = [[0.28], [0.08]] ret.lateralParams.torqueBP, ret.lateralParams.torqueV = [[0, 4096], [0, 4096]] # TODO: determine if there is a dead zone at the top end + elif candidate == CAR.HONDA_ODYSSEY_TWN: + ret.lateralTuning.pid.kpV, ret.lateralTuning.pid.kiV = [[0.28], [0.08]] + ret.lateralParams.torqueBP, ret.lateralParams.torqueV = [[0, 32767], [0, 32767]] # TODO: determine if there is a dead zone at the top end + elif candidate == CAR.HONDA_PILOT: ret.lateralParams.torqueBP, ret.lateralParams.torqueV = [[0, 4096], [0, 4096]] # TODO: determine if there is a dead zone at the top end ret.lateralTuning.pid.kpV, ret.lateralTuning.pid.kiV = [[0.38], [0.11]] @@ -220,7 +224,12 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo # to a negative value, so it won't matter. Otherwise, add 0.5 mph margin to not # conflict with PCM acc ret.autoResumeSng = candidate in (HONDA_BOSCH | {CAR.HONDA_CIVIC}) - ret.minEnableSpeed = -1. if ret.autoResumeSng else 25.51 * CV.MPH_TO_MS + if ret.autoResumeSng: + ret.minEnableSpeed = -1. + elif candidate == CAR.HONDA_ODYSSEY_TWN: + ret.minEnableSpeed = 19. * CV.MPH_TO_MS + else: + ret.minEnableSpeed = 25.51 * CV.MPH_TO_MS ret.steerLimitTimer = 0.8 ret.radarDelay = 0.1 diff --git a/opendbc/car/honda/values.py b/opendbc/car/honda/values.py index 389af02b040..48214f58ad9 100644 --- a/opendbc/car/honda/values.py +++ b/opendbc/car/honda/values.py @@ -330,6 +330,12 @@ class CAR(Platforms): radar_dbc_dict('honda_odyssey_exl_2018_generated'), flags=HondaFlags.NIDEC_ALT_PCM_ACCEL | HondaFlags.HAS_ALL_DOOR_STATES, ) + HONDA_ODYSSEY_TWN = HondaNidecPlatformConfig( + [HondaCarDocs("Honda Odyssey (Taiwan) 2018-19")], + CarSpecs(mass=1865, wheelbase=2.9, steerRatio=14.35, centerToFrontRatio=0.44, tireStiffnessFactor=0.82), + radar_dbc_dict('honda_odyssey_twn_2018_generated'), + flags=HondaFlags.NIDEC_ALT_SCM_MESSAGES, + ) ACURA_RDX = HondaNidecPlatformConfig( [HondaCarDocs("Acura RDX 2016-18", "AcuraWatch Plus or Advance Package", min_steer_speed=12. * CV.MPH_TO_MS)], CarSpecs(mass=3925 * CV.LB_TO_KG, wheelbase=2.68, steerRatio=15.0, centerToFrontRatio=0.38, tireStiffnessFactor=0.444), # as spec diff --git a/opendbc/car/tests/routes.py b/opendbc/car/tests/routes.py index 9202da7a77a..1120026d006 100644 --- a/opendbc/car/tests/routes.py +++ b/opendbc/car/tests/routes.py @@ -110,6 +110,7 @@ class CarTestRoute(NamedTuple): CarTestRoute("f29e2b57a55e7ad5/2021-03-24--20-52-38", HONDA.HONDA_ACCORD), # hybrid, 2021 with new style HUD msgs CarTestRoute("1ad763dd22ef1a0e/2020-02-29--18-37-03", HONDA.HONDA_CRV_5G), CarTestRoute("0a96f86fcfe35964/2020-02-05--07-25-51", HONDA.HONDA_ODYSSEY), + CarTestRoute("7817fe954aff07b8/00000001--fdaaf36c4f", HONDA.HONDA_ODYSSEY_TWN), CarTestRoute("d7233a428eb7d0b5/00000001--9b99b04d43", HONDA.HONDA_ODYSSEY_5G_MMR), CarTestRoute("d83f36766f8012a5/2020-02-05--18-42-21", HONDA.HONDA_CIVIC_BOSCH_DIESEL), CarTestRoute("f0890d16a07a236b/2021-05-25--17-27-22", HONDA.HONDA_INSIGHT), diff --git a/opendbc/car/tests/test_docs.py b/opendbc/car/tests/test_docs.py index 8f0d862cd7f..940f117fda4 100644 --- a/opendbc/car/tests/test_docs.py +++ b/opendbc/car/tests/test_docs.py @@ -52,7 +52,7 @@ def test_torque_star(self, subtests): for car in self.all_cars: with subtests.test(car=car.name): # honda sanity check, it's the definition of a no torque star - if car.car_fingerprint in (HONDA.HONDA_ACCORD, HONDA.HONDA_CIVIC, HONDA.HONDA_CRV, HONDA.HONDA_ODYSSEY, HONDA.HONDA_PILOT): + if car.car_fingerprint in (HONDA.HONDA_ACCORD, HONDA.HONDA_CIVIC, HONDA.HONDA_CRV, HONDA.HONDA_ODYSSEY, HONDA.HONDA_ODYSSEY_TWN, HONDA.HONDA_PILOT): assert car.row[Column.STEERING_TORQUE] == Star.EMPTY, f"{car.name} has full torque star" elif car.brand in ("toyota", "hyundai"): assert car.row[Column.STEERING_TORQUE] != Star.EMPTY, f"{car.name} has no torque star" diff --git a/opendbc/car/torque_data/substitute.toml b/opendbc/car/torque_data/substitute.toml index d27476e645f..bbbf7f970fc 100644 --- a/opendbc/car/torque_data/substitute.toml +++ b/opendbc/car/torque_data/substitute.toml @@ -52,6 +52,7 @@ legend = ["LAT_ACCEL_FACTOR", "MAX_LAT_ACCEL_MEASURED", "FRICTION"] "HONDA_CRV_EU" = "HONDA_CRV" "HONDA_CIVIC_BOSCH_DIESEL" = "HONDA_CIVIC_BOSCH" "HONDA_E" = "HONDA_CIVIC_BOSCH" +"HONDA_ODYSSEY_TWN" = "HONDA_ODYSSEY" "BUICK_LACROSSE" = "CHEVROLET_VOLT" "BUICK_REGAL" = "CHEVROLET_VOLT" diff --git a/opendbc/dbc/generator/honda/_steering_control_c.dbc b/opendbc/dbc/generator/honda/_steering_control_c.dbc new file mode 100644 index 00000000000..6dc4b6dcb3a --- /dev/null +++ b/opendbc/dbc/generator/honda/_steering_control_c.dbc @@ -0,0 +1,17 @@ +BO_ 404 STEERING_CONTROL: 4 EON + SG_ SET_ME_X00 : 22|7@0+ (1,0) [0|127] "" EPS + SG_ STEER_TORQUE_REQUEST : 23|1@0+ (1,0) [0|1] "" EPS + SG_ COUNTER : 29|2@0+ (1,0) [0|15] "" EPS + SG_ CHECKSUM : 27|4@0+ (1,0) [0|3] "" EPS + SG_ STEER_TORQUE : 7|16@0- (-1,0) [-32767|32767] "" EPS + +BO_ 399 STEER_STATUS: 7 EPS + SG_ STEER_TORQUE_SENSOR : 7|16@0- (-1,0) [-2985|2985] "tbd" EON + SG_ STEER_ANGLE_RATE : 23|16@0- (-0.1,0) [-31000|31000] "deg/s" EON + SG_ STEER_STATUS : 43|4@0+ (1,0) [0|15] "" EON + SG_ STEER_CONTROL_ACTIVE : 35|1@0+ (1,0) [0|1] "" EON + SG_ STEER_CONFIG_INDEX : 43|4@0+ (1,0) [0|15] "" EON + SG_ CHECKSUM : 51|4@0+ (1,0) [0|15] "" EON + SG_ COUNTER : 53|2@0+ (1,0) [0|3] "" EON + +VAL_ 399 STEER_STATUS 7 "permanent_fault" 6 "tmp_fault" 5 "fault_1" 4 "no_torque_alert_2" 3 "low_speed_lockout" 2 "no_torque_alert_1" 1 "driver_steering" 0 "normal" ; \ No newline at end of file diff --git a/opendbc/dbc/generator/honda/_steering_sensors_c.dbc b/opendbc/dbc/generator/honda/_steering_sensors_c.dbc new file mode 100644 index 00000000000..8d70ac9369f --- /dev/null +++ b/opendbc/dbc/generator/honda/_steering_sensors_c.dbc @@ -0,0 +1,7 @@ +CM_ "steer_angle_rate is negative vs _steering_sensors_b.dbc"; + +BO_ 342 STEERING_SENSORS: 6 EPS + SG_ STEER_ANGLE : 7|16@0- (-0.1,0) [-500|500] "deg" EON + SG_ STEER_ANGLE_RATE : 23|16@0- (1,0) [-3000|3000] "deg/s" EON + SG_ COUNTER : 45|2@0+ (1,0) [0|3] "" EON + SG_ CHECKSUM : 43|4@0+ (1,0) [0|15] "" EON diff --git a/opendbc/dbc/generator/honda/honda_odyssey_twn_2018.dbc b/opendbc/dbc/generator/honda/honda_odyssey_twn_2018.dbc new file mode 100644 index 00000000000..4dc4ea5caeb --- /dev/null +++ b/opendbc/dbc/generator/honda/honda_odyssey_twn_2018.dbc @@ -0,0 +1,7 @@ +CM_ "IMPORT _honda_common.dbc"; +CM_ "IMPORT _nidec_common.dbc"; +CM_ "IMPORT _lkas_hud_5byte.dbc"; +CM_ "IMPORT _nidec_scm_group_a.dbc"; +CM_ "IMPORT _steering_sensors_c.dbc"; +CM_ "IMPORT _steering_control_c.dbc"; +CM_ "IMPORT _gearbox_common.dbc"; From 9b3aef1def4c765ecc25f0a3e2f8c15393f5a187 Mon Sep 17 00:00:00 2001 From: adeebshihadeh Date: Wed, 28 Jan 2026 08:10:04 +0000 Subject: [PATCH 086/229] docs: Scheduled auto-update CARS.md --- docs/CARS.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/CARS.md b/docs/CARS.md index da8cb49c3fc..4d3f6b4c368 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -1,6 +1,6 @@ -# Support Information for 386 Known Cars +# Support Information for 387 Known Cars |Make|Model|Package|Support Level| |---|---|---|:---:| @@ -115,6 +115,7 @@ |Honda|N-Box 2018|All|[Upstream](#upstream)| |Honda|Odyssey 2018-20|Honda Sensing|[Upstream](#upstream)| |Honda|Odyssey 2021-26|All|[Upstream](#upstream)| +|Honda|Odyssey (Taiwan) 2018-19|Honda Sensing|[Upstream](#upstream)| |Honda|Passport 2019-25|All|[Upstream](#upstream)| |Honda|Passport 2026|All|[Upstream](#upstream)| |Honda|Pilot 2016-22|Honda Sensing|[Upstream](#upstream)| From 0702326e7c027c5bd3aebb5cfcbf299cb921259d Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Wed, 28 Jan 2026 14:14:15 -0500 Subject: [PATCH 087/229] VW MLB: Add FW for 2023 Porsche Macan S (#3078) --- opendbc/car/volkswagen/fingerprints.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/opendbc/car/volkswagen/fingerprints.py b/opendbc/car/volkswagen/fingerprints.py index 5aa37c9493f..a9b12184d8a 100644 --- a/opendbc/car/volkswagen/fingerprints.py +++ b/opendbc/car/volkswagen/fingerprints.py @@ -974,11 +974,13 @@ b'\xf1\x8795B906259BM\xf1\x890001', b'\xf1\x8795B90652013\xf1\x893485', b'\xf1\x8795B90654002\xf1\x893495', + b'\xf1\x8795B907551AD\xf1\x890001', b'\xf1\x8795B907551D \xf1\x890006', ], (Ecu.transmission, 0x7e1, None): [ b'\xf1\x8795B927156CE\xf1\x890022', b'\xf1\x8795B927156JH\xf1\x890001', + b'\xf1\x8795B927156KD\xf1\x890001', b'\xf1\x8795B927156KK\xf1\x890001', b'\xf1\x8795B927156KP\xf1\x890001', b'\xf1\x8795B927156R \xf1\x890021', @@ -987,6 +989,7 @@ b'\xf1\x8795B959655F \xf1\x890130\xf1\x82\x05065Q033513', b'\xf1\x8795B959655F \xf1\x890130\xf1\x82\x050682033514', b'\xf1\x8795B959655G \xf1\x890150\xf1\x82\x0506B1033514', + b'\xf1\x8795B959655G \xf1\x890150\xf1\x82\x0506CG033517', b'\xf1\x8795B959655G \xf1\x890150\xf1\x82\x0506CJ02D417', ], (Ecu.eps, 0x712, None): [ @@ -996,6 +999,7 @@ (Ecu.fwdRadar, 0x757, None): [ b'\xf1\x8795B907567B\x00\xf1\x890800\xf1\x82108', b'\xf1\x8795B907567G\x00\xf1\x890410\xf1\x82104', + b'\xf1\x8795B907567H\x00\xf1\x890430\xf1\x82104', b'\xf1\x8795B907567J \xf1\x890440\xf1\x82104', ], }, From ffbe6094a3d9dd9a043d2b16dab3a84ae30a9276 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Wed, 28 Jan 2026 19:31:52 -0800 Subject: [PATCH 088/229] Tesla: detect missing DAS_settings (#3082) * detect das_settings * clean up * rm * clean up --- opendbc/car/tesla/carstate.py | 6 +++--- opendbc/car/tesla/interface.py | 6 +++++- opendbc/car/tesla/values.py | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/opendbc/car/tesla/carstate.py b/opendbc/car/tesla/carstate.py index 5158a40f9f5..863089784ed 100644 --- a/opendbc/car/tesla/carstate.py +++ b/opendbc/car/tesla/carstate.py @@ -5,7 +5,7 @@ from opendbc.car.common.conversions import Conversions as CV from opendbc.car.interfaces import CarStateBase from opendbc.car.tesla.teslacan import get_steer_ctrl_type -from opendbc.car.tesla.values import DBC, CANBUS, GEAR_MAP, STEER_THRESHOLD, CAR, TeslaFlags +from opendbc.car.tesla.values import DBC, CANBUS, GEAR_MAP, STEER_THRESHOLD, TeslaFlags ButtonType = structs.CarState.ButtonEvent.Type @@ -116,8 +116,8 @@ def update(self, can_parsers) -> structs.CarState: ret.stockLkas = cp_ap_party.vl["DAS_steeringControl"]["DAS_steeringControlType"] == lkas_ctrl_type # LANE_KEEP_ASSIST # Stock Autosteer should be off (includes FSD) - # TODO: find for TESLA_MODEL_X - if self.CP.carFingerprint in (CAR.TESLA_MODEL_3, CAR.TESLA_MODEL_Y): + # TODO: find for TESLA_MODEL_X and HW2.5 vehicles + if not (self.CP.flags & TeslaFlags.MISSING_DAS_SETTINGS): ret.invalidLkasSetting = cp_ap_party.vl["DAS_settings"]["DAS_autosteerEnabled"] != 0 # Because we don't have FSD 14 detection outside of a set of FW, we should check if this FW is accidentally missing from FSD_14_FW diff --git a/opendbc/car/tesla/interface.py b/opendbc/car/tesla/interface.py index a6e695280e0..c43baad0881 100644 --- a/opendbc/car/tesla/interface.py +++ b/opendbc/car/tesla/interface.py @@ -2,7 +2,7 @@ from opendbc.car.interfaces import CarInterfaceBase from opendbc.car.tesla.carcontroller import CarController from opendbc.car.tesla.carstate import CarState -from opendbc.car.tesla.values import TeslaSafetyFlags, TeslaFlags, CAR, DBC, FSD_14_FW, Ecu +from opendbc.car.tesla.values import TeslaSafetyFlags, TeslaFlags, CANBUS, CAR, DBC, FSD_14_FW, Ecu from opendbc.car.tesla.radar_interface import RadarInterface, RADAR_START_ADDR @@ -23,6 +23,10 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo ret.steerControlType = structs.CarParams.SteerControlType.angle + # Model X and HW 2.5 vehicles are missing DAS_settings + if 0x293 not in fingerprint[CANBUS.autopilot_party]: + ret.flags |= TeslaFlags.MISSING_DAS_SETTINGS.value + # Radar support is intended to work for: # - Tesla Model 3 vehicles built approximately mid-2017 through early-2021 # - Tesla Model Y vehicles built approximately mid-2020 through early-2021 diff --git a/opendbc/car/tesla/values.py b/opendbc/car/tesla/values.py index c8e1e2a9a94..8f5e1ec9ee2 100644 --- a/opendbc/car/tesla/values.py +++ b/opendbc/car/tesla/values.py @@ -135,6 +135,7 @@ class TeslaSafetyFlags(IntFlag): class TeslaFlags(IntFlag): LONG_CONTROL = 1 FSD_14 = 2 + MISSING_DAS_SETTINGS = 4 DBC = CAR.create_dbc_map() From 9b93deb8a7429dbd1db1e317b97fddaf594f7da6 Mon Sep 17 00:00:00 2001 From: Gavin Phratsachack <37220586+gncnpk@users.noreply.github.com> Date: Wed, 28 Jan 2026 22:03:55 -0600 Subject: [PATCH 089/229] Nissan: Enable steering at standstill (#2812) * Enable steering at standstill for Nissan cars * Update LKAS_MAX_TORQUE value to improve steering speed Increased LKAS_MAX_TORQUE from 1 to 2.54 for better performance. * Update carcontroller.py * Revert "Update LKAS_MAX_TORQUE value to improve steering speed" This reverts commit d490162da4a47cca6683c5c9a710b291cce61080. * Revert "Update carcontroller.py" This reverts commit 431b6c021b1f3523e30693e4dcf41819ee8819a1. --- opendbc/car/nissan/interface.py | 1 + 1 file changed, 1 insertion(+) diff --git a/opendbc/car/nissan/interface.py b/opendbc/car/nissan/interface.py index 12c217fe128..3ac55c5406a 100644 --- a/opendbc/car/nissan/interface.py +++ b/opendbc/car/nissan/interface.py @@ -15,6 +15,7 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo ret.brand = "nissan" ret.safetyConfigs = [get_safety_config(structs.CarParams.SafetyModel.nissan)] ret.autoResumeSng = False + ret.steerAtStandstill = True ret.steerLimitTimer = 1.0 From 900cb87c6146487338215d4978008a1da600d8e1 Mon Sep 17 00:00:00 2001 From: Hacheoy <124492751+Hacheoy@users.noreply.github.com> Date: Thu, 29 Jan 2026 15:20:11 +1100 Subject: [PATCH 090/229] Toyota: Add SnG to Lexus LS, update torque data. (#3080) * Add Lexus LS 2018 platform configuration * Add fingerprints for Lexus LS ECUs * Add LEXUS_LS to torque substitute * Update steer ratio for Lexus LS 2018 configuration * LS steer ratio back to 13.0 * Update steer ratio for Lexus LS 2018 based on live params * Add test route for Lexus LS * Update LS car docs to exclude LSS+ A package * Fix formatting in Lexus LS 2018 documentation * Remove LEXUS_LS mapping from substitute.toml * Add better torque data for LEXUS_LS * Modify torque values for LEXUS_LS Better torque values for LEXUS_LS based on learned values after long drive. * Add Lexus LS 2018 to sng = true * Update MAX_LAT_ACCEL_MEASURED for LEXUS_LS --- opendbc/car/torque_data/override.toml | 1 + opendbc/car/torque_data/substitute.toml | 1 - opendbc/car/toyota/interface.py | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opendbc/car/torque_data/override.toml b/opendbc/car/torque_data/override.toml index d2416afc3fe..2471b278893 100644 --- a/opendbc/car/torque_data/override.toml +++ b/opendbc/car/torque_data/override.toml @@ -93,6 +93,7 @@ legend = ["LAT_ACCEL_FACTOR", "MAX_LAT_ACCEL_MEASURED", "FRICTION"] "ACURA_TLX_2G" = [1.2, 1.2, 0.15] "ACURA_TLX_2G_MMR" = [1.7, 1.7, 0.16] "PORSCHE_MACAN_MK1" = [2.0, 2.0, 0.2] +"LEXUS_LS" = [1.35, 1.7, 0.17] # Dashcam or fallback configured as ideal car "MOCK" = [10.0, 10, 0.0] diff --git a/opendbc/car/torque_data/substitute.toml b/opendbc/car/torque_data/substitute.toml index bbbf7f970fc..678d4018dfc 100644 --- a/opendbc/car/torque_data/substitute.toml +++ b/opendbc/car/torque_data/substitute.toml @@ -17,7 +17,6 @@ legend = ["LAT_ACCEL_FACTOR", "MAX_LAT_ACCEL_MEASURED", "FRICTION"] "LEXUS_RC" = "LEXUS_NX_TSS2" "LEXUS_RC_TSS2" = "LEXUS_NX_TSS2" "LEXUS_LC_TSS2" = "LEXUS_NX_TSS2" -"LEXUS_LS" = "LEXUS_NX" "KIA_OPTIMA_G4" = "HYUNDAI_SONATA" "KIA_OPTIMA_G4_FL" = "HYUNDAI_SONATA" diff --git a/opendbc/car/toyota/interface.py b/opendbc/car/toyota/interface.py index 9d3e82dd246..d4404046057 100644 --- a/opendbc/car/toyota/interface.py +++ b/opendbc/car/toyota/interface.py @@ -91,7 +91,7 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo ret.lateralTuning.pid.kf = 0.00004 break - elif candidate in (CAR.TOYOTA_CHR, CAR.TOYOTA_CAMRY, CAR.TOYOTA_SIENNA, CAR.LEXUS_CTH, CAR.LEXUS_NX): + elif candidate in (CAR.TOYOTA_CHR, CAR.TOYOTA_CAMRY, CAR.TOYOTA_SIENNA, CAR.LEXUS_CTH, CAR.LEXUS_LS, CAR.LEXUS_NX): # TODO: Some of these platforms are not advertised to have full range ACC, do they really all have sng? stop_and_go = True From 5e71fde25ae660e563ddedc96cd2d80285b78b60 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Thu, 29 Jan 2026 14:10:12 -0800 Subject: [PATCH 091/229] Toyota SecOC platforms should use torque control (#3086) * use torque control for secoc platforms * checked 5 dongles for each platform. sienna was closer to 1.5, but within margin of error --- opendbc/car/torque_data/override.toml | 1 + opendbc/car/torque_data/substitute.toml | 3 +-- opendbc/car/toyota/interface.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/opendbc/car/torque_data/override.toml b/opendbc/car/torque_data/override.toml index 2471b278893..e1e9c7e10a0 100644 --- a/opendbc/car/torque_data/override.toml +++ b/opendbc/car/torque_data/override.toml @@ -94,6 +94,7 @@ legend = ["LAT_ACCEL_FACTOR", "MAX_LAT_ACCEL_MEASURED", "FRICTION"] "ACURA_TLX_2G_MMR" = [1.7, 1.7, 0.16] "PORSCHE_MACAN_MK1" = [2.0, 2.0, 0.2] "LEXUS_LS" = [1.35, 1.7, 0.17] +"TOYOTA_RAV4_PRIME" = [1.7, 2.0, 0.14] # Dashcam or fallback configured as ideal car "MOCK" = [10.0, 10, 0.0] diff --git a/opendbc/car/torque_data/substitute.toml b/opendbc/car/torque_data/substitute.toml index 678d4018dfc..134f85a2a14 100644 --- a/opendbc/car/torque_data/substitute.toml +++ b/opendbc/car/torque_data/substitute.toml @@ -9,8 +9,7 @@ legend = ["LAT_ACCEL_FACTOR", "MAX_LAT_ACCEL_MEASURED", "FRICTION"] "TOYOTA_ALPHARD_TSS2" = "TOYOTA_SIENNA" "TOYOTA_PRIUS_V" = "TOYOTA_PRIUS" -"TOYOTA_RAV4_PRIME" = "TOYOTA_RAV4_TSS2" -"TOYOTA_SIENNA_4TH_GEN" = "TOYOTA_RAV4_TSS2" +"TOYOTA_SIENNA_4TH_GEN" = "TOYOTA_RAV4_PRIME" "LEXUS_IS" = "LEXUS_NX" "LEXUS_CTH" = "LEXUS_NX" "LEXUS_ES" = "TOYOTA_CAMRY" diff --git a/opendbc/car/toyota/interface.py b/opendbc/car/toyota/interface.py index d4404046057..d1a3a2b90c6 100644 --- a/opendbc/car/toyota/interface.py +++ b/opendbc/car/toyota/interface.py @@ -74,7 +74,7 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo # https://engage.toyota.com/static/images/toyota_safety_sense/TSS_Applicability_Chart.pdf stop_and_go = candidate != CAR.TOYOTA_AVALON - elif candidate in (CAR.TOYOTA_RAV4_TSS2, CAR.TOYOTA_RAV4_TSS2_2022, CAR.TOYOTA_RAV4_TSS2_2023, CAR.TOYOTA_RAV4_PRIME, CAR.TOYOTA_SIENNA_4TH_GEN): + elif candidate in (CAR.TOYOTA_RAV4_TSS2, CAR.TOYOTA_RAV4_TSS2_2022, CAR.TOYOTA_RAV4_TSS2_2023): ret.lateralTuning.init('pid') ret.lateralTuning.pid.kiBP = [0.0] ret.lateralTuning.pid.kpBP = [0.0] From 83614718e2cb3fe54da6b3489aa23ea249a31c1f Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Thu, 29 Jan 2026 14:11:32 -0800 Subject: [PATCH 092/229] Remove angle RAV4 platform from PID list (#3085) * rm * just * rm --- opendbc/car/toyota/interface.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendbc/car/toyota/interface.py b/opendbc/car/toyota/interface.py index d1a3a2b90c6..c3ab9348126 100644 --- a/opendbc/car/toyota/interface.py +++ b/opendbc/car/toyota/interface.py @@ -74,7 +74,7 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo # https://engage.toyota.com/static/images/toyota_safety_sense/TSS_Applicability_Chart.pdf stop_and_go = candidate != CAR.TOYOTA_AVALON - elif candidate in (CAR.TOYOTA_RAV4_TSS2, CAR.TOYOTA_RAV4_TSS2_2022, CAR.TOYOTA_RAV4_TSS2_2023): + elif candidate in (CAR.TOYOTA_RAV4_TSS2, CAR.TOYOTA_RAV4_TSS2_2022): ret.lateralTuning.init('pid') ret.lateralTuning.pid.kiBP = [0.0] ret.lateralTuning.pid.kpBP = [0.0] From c8e92d046324be54cfedccd2a27101060861e82b Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Thu, 29 Jan 2026 15:46:41 -0800 Subject: [PATCH 093/229] Remove RAV4 2022 from PID lateral control (#3087) * this platform doesn't have any known special eps fw * bump down to 1.9 --- opendbc/car/torque_data/override.toml | 1 + opendbc/car/torque_data/params.toml | 1 - opendbc/car/toyota/interface.py | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opendbc/car/torque_data/override.toml b/opendbc/car/torque_data/override.toml index e1e9c7e10a0..d2a6ece905e 100644 --- a/opendbc/car/torque_data/override.toml +++ b/opendbc/car/torque_data/override.toml @@ -95,6 +95,7 @@ legend = ["LAT_ACCEL_FACTOR", "MAX_LAT_ACCEL_MEASURED", "FRICTION"] "PORSCHE_MACAN_MK1" = [2.0, 2.0, 0.2] "LEXUS_LS" = [1.35, 1.7, 0.17] "TOYOTA_RAV4_PRIME" = [1.7, 2.0, 0.14] +"TOYOTA_RAV4_TSS2_2022" = [1.9, 1.9304407208090029, 0.112174] # Dashcam or fallback configured as ideal car "MOCK" = [10.0, 10, 0.0] diff --git a/opendbc/car/torque_data/params.toml b/opendbc/car/torque_data/params.toml index fde2ca221dc..7d37f466712 100644 --- a/opendbc/car/torque_data/params.toml +++ b/opendbc/car/torque_data/params.toml @@ -71,7 +71,6 @@ legend = ["LAT_ACCEL_FACTOR", "MAX_LAT_ACCEL_MEASURED", "FRICTION"] "TOYOTA_RAV4" = [2.085695074355425, 2.2142832316984733, 0.13339165270103975] "TOYOTA_RAV4_TSS2" = [2.279239424615458, 2.087101966779332, 0.13682208413446817] "TOYOTA_RAV4H" = [1.9796257271652042, 1.7503987331707576, 0.14628860048885406] -"TOYOTA_RAV4_TSS2_2022" = [2.241883248393209, 1.9304407208090029, 0.112174] "TOYOTA_SIENNA" = [1.689726, 1.3208264576110418, 0.140456] "TOYOTA_YARIS" = [2.22984, 1.86145, 0.168189] "VOLKSWAGEN_ARTEON_MK1" = [1.45136518053819, 1.3639364049316804, 0.23806361745695032] diff --git a/opendbc/car/toyota/interface.py b/opendbc/car/toyota/interface.py index c3ab9348126..66b78d11a23 100644 --- a/opendbc/car/toyota/interface.py +++ b/opendbc/car/toyota/interface.py @@ -74,7 +74,7 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo # https://engage.toyota.com/static/images/toyota_safety_sense/TSS_Applicability_Chart.pdf stop_and_go = candidate != CAR.TOYOTA_AVALON - elif candidate in (CAR.TOYOTA_RAV4_TSS2, CAR.TOYOTA_RAV4_TSS2_2022): + elif candidate == CAR.TOYOTA_RAV4_TSS2: ret.lateralTuning.init('pid') ret.lateralTuning.pid.kiBP = [0.0] ret.lateralTuning.pid.kpBP = [0.0] From 7d7cf050e92e721973a6a238133fc91462612430 Mon Sep 17 00:00:00 2001 From: Daniel Koepping Date: Thu, 29 Jan 2026 19:39:45 -0800 Subject: [PATCH 094/229] Car diff: add CarParams (#3077) * signals from refs * use vals as prev * show all waveforms * get nested * use full refs * use explicit pr signal * Update opendbc/car/tests/car_diff.py Co-authored-by: Shane Smiskol * var names * hints * more * more * Revert "more" This reverts commit aa31c7ddb0cdbc7f236126887ad964f12d731665. * Revert "more" This reverts commit b998c6049d68c6a94dec6f7a4a54db647e30d27b. * Revert "hints" This reverts commit 1cbfb879b05be572ccf2ddc099c861b3bba175fe. * add typing * typing * add CarParams --------- Co-authored-by: Shane Smiskol --- opendbc/car/tests/car_diff.py | 87 +++++++++++++++++------------------ 1 file changed, 43 insertions(+), 44 deletions(-) diff --git a/opendbc/car/tests/car_diff.py b/opendbc/car/tests/car_diff.py index a7221490e88..66cee6c3183 100755 --- a/opendbc/car/tests/car_diff.py +++ b/opendbc/car/tests/car_diff.py @@ -30,7 +30,7 @@ Diff = tuple[str, int, tuple[Any, Any], int] Ref = tuple[int, structs.CarState] -Result = tuple[str, str, list[Diff], str | None] +Result = tuple[str, str, list[Diff], list[Ref] | None, list[structs.CarState] | None, str | None] def dict_diff(d1: dict[str, Any], d2: dict[str, Any], path: str = "", ignore: list[str] | None = None, tolerance: float = 0) -> list[tuple]: @@ -58,7 +58,7 @@ def load_can_messages(seg: str) -> list[Any]: return [m for m in msgs if m.which() == 'can'] -def replay_segment(platform: str, can_msgs: list[Any]) -> tuple[list[structs.CarState], list[int]]: +def replay_segment(platform: str, can_msgs: list[Any]) -> tuple[structs.CarParams, list[structs.CarState], list[int]]: _can_msgs = ([CanData(can.address, can.dat, can.src) for can in m.can] for m in can_msgs) def can_recv(wait_for_one: bool = False) -> list[list[CanData]]: @@ -77,32 +77,36 @@ def can_recv(wait_for_one: bool = False) -> list[list[CanData]]: states.append(CI.update([(msg.logMonoTime, frames)])) CI.apply(CC, msg.logMonoTime) timestamps.append(msg.logMonoTime) - return states, timestamps + return CP, states, timestamps def process_segment(args: tuple) -> Result: platform, seg, ref_path, update = args try: can_msgs = load_can_messages(seg) - states, timestamps = replay_segment(platform, can_msgs) + CP, states, timestamps = replay_segment(platform, can_msgs) ref_file = Path(ref_path) / f"{platform}_{seg.replace('/', '_')}.zst" if update: - data = list(zip(timestamps, states, strict=True)) + data = {"cp": CP.to_dict(), "frames": list(zip(timestamps, states, strict=True))} ref_file.write_bytes(zstd.compress(pickle.dumps(data), 10)) - return (platform, seg, [], None) + return (platform, seg, [], None, None, None) if not ref_file.exists(): - return (platform, seg, [], "no ref") + return (platform, seg, [], None, None, "no ref") - ref: list[Ref] = pickle.loads(decompress_stream(ref_file.read_bytes())) + ref_data = pickle.loads(decompress_stream(ref_file.read_bytes())) + cp: dict[str, Any] = ref_data["cp"] + ref: list[Ref] = ref_data["frames"] diffs = [] + for diff in dict_diff(cp, CP.to_dict(), path="carParams", ignore=IGNORE_FIELDS, tolerance=TOLERANCE): + diffs.append((diff[1], -1, diff[2], 0)) for i, ((ts, ref_state), state) in enumerate(zip(ref, states, strict=True)): for diff in dict_diff(ref_state.to_dict(), state.to_dict(), ignore=IGNORE_FIELDS, tolerance=TOLERANCE): diffs.append((diff[1], i, diff[2], ts)) - return (platform, seg, diffs, None) + return (platform, seg, diffs, ref, states, None) except Exception: - return (platform, seg, [], traceback.format_exc()) + return (platform, seg, [], None, None, traceback.format_exc()) def get_changed_platforms(cwd: Path, database: dict[str, Any], interfaces: dict[str, Any]) -> list[str]: @@ -134,10 +138,10 @@ def run_replay(platforms: list[str], segments: dict[str, list[str]], ref_path: P # ASCII waveforms helpers -def find_edges(vals: list[bool], init: bool) -> tuple[list[int], list[int]]: +def find_edges(vals: list[bool]) -> tuple[list[int], list[int]]: rises = [] falls = [] - prev = init + prev = vals[0] for i, val in enumerate(vals): if val and not prev: rises.append(i) @@ -147,10 +151,10 @@ def find_edges(vals: list[bool], init: bool) -> tuple[list[int], list[int]]: return rises, falls -def render_waveform(label: str, vals: list[bool], init: bool) -> str: +def render_waveform(label: str, vals: list[bool]) -> str: wave = {(False, False): "_", (True, True): "‾", (False, True): "/", (True, False): "\\"} line = f" {label}:".ljust(12) - prev = init + prev = vals[0] for val in vals: line += wave[(prev, val)] prev = val @@ -185,25 +189,22 @@ def group_frames(diffs: list[Diff], max_gap: int = 15) -> list[list[Diff]]: return groups -def build_signals(group: list[Diff]) -> tuple[list[bool], list[bool], bool, int, int]: +def build_signals(group: list[Diff], ref: list[Ref], states: list[structs.CarState], field: str) -> tuple[list[Any], list[Any], int, int]: _, first_frame, _, _ = group[0] - _, last_frame, (final_master, _), _ = group[-1] + _, last_frame, _, _ = group[-1] start = max(0, first_frame - PADDING) - end = last_frame + PADDING + 1 - init = not final_master - diff_at = {frame: (m, p) for _, frame, (m, p), _ in group} + end = min(last_frame + PADDING + 1, len(ref)) master_vals = [] pr_vals = [] - master = init - pr = init for frame in range(start, end): - if frame in diff_at: - master, pr = diff_at[frame] - elif frame > last_frame: - master = pr = final_master - master_vals.append(master) - pr_vals.append(pr) - return master_vals, pr_vals, init, start, end + mval = ref[frame][1].to_dict() + pval = states[frame].to_dict() + for k in field.split("."): + mval = mval.get(k) if isinstance(mval, dict) else None + pval = pval.get(k) if isinstance(pval, dict) else None + master_vals.append(mval) + pr_vals.append(pval) + return master_vals, pr_vals, start, end def format_numeric_diffs(diffs: list[Diff]) -> list[str]: @@ -215,7 +216,7 @@ def format_numeric_diffs(diffs: list[Diff]) -> list[str]: return lines -def format_boolean_diffs(diffs: list[Diff]) -> list[str]: +def format_boolean_diffs(diffs: list[Diff], ref: list[Ref], states: list[structs.CarState], field: str) -> list[str]: _, first_frame, _, first_ts = diffs[0] _, last_frame, _, last_ts = diffs[-1] frame_time = last_frame - first_frame @@ -223,14 +224,12 @@ def format_boolean_diffs(diffs: list[Diff]) -> list[str]: ms = time_ms / frame_time if frame_time else 10.0 lines = [] for group in group_frames(diffs): - master_vals, pr_vals, init, start, end = build_signals(group) - master_rises, master_falls = find_edges(master_vals, init) - pr_rises, pr_falls = find_edges(pr_vals, init) - if bool(master_rises) != bool(pr_rises) or bool(master_falls) != bool(pr_falls): - continue + master_vals, pr_vals, start, end = build_signals(group, ref, states, field) + master_rises, master_falls = find_edges(master_vals) + pr_rises, pr_falls = find_edges(pr_vals) lines.append(f"\n frames {start}-{end - 1}") - lines.append(render_waveform("master", master_vals, init)) - lines.append(render_waveform("PR", pr_vals, init)) + lines.append(render_waveform("master", master_vals)) + lines.append(render_waveform("PR", pr_vals)) for edge_type, master_edges, pr_edges in [("rise", master_rises, pr_rises), ("fall", master_falls, pr_falls)]: msg = format_timing(edge_type, master_edges, pr_edges, ms) if msg: @@ -238,13 +237,13 @@ def format_boolean_diffs(diffs: list[Diff]) -> list[str]: return lines -def format_diff(diffs: list[Diff]) -> list[str]: +def format_diff(diffs: list[Diff], ref: list[Ref], states: list[structs.CarState], field: str) -> list[str]: if not diffs: return [] _, _, (old, new), _ = diffs[0] is_bool = isinstance(old, bool) and isinstance(new, bool) if is_bool: - return format_boolean_diffs(diffs) + return format_boolean_diffs(diffs, ref, states, field) return format_numeric_diffs(diffs) @@ -274,16 +273,16 @@ def main(platform: str | None = None, segments_per_platform: int = 10, update_re if update_refs: results = run_replay(platforms, segments, ref_path, update=True) - errors = [e for _, _, _, e in results if e] + errors = [e for _, _, _, _, _, e in results if e] assert len(errors) == 0, f"Segment failures: {errors}" print(f"Generated {n_segments} refs to {ref_path}") return 0 download_refs(ref_path, platforms, segments) results = run_replay(platforms, segments, ref_path, update=False) - - with_diffs = [(p, s, d) for p, s, d, e in results if d] - errors = [(p, s, e) for p, s, d, e in results if e] + with_diffs = [(platform, seg, diffs, ref, states) + for platform, seg, diffs, ref, states, err in results if diffs] + errors = [(platform, seg, err) for platform, seg, diffs, ref, states, err in results if err] n_passed = len(results) - len(with_diffs) - len(errors) print(f"\nResults: {n_passed} passed, {len(with_diffs)} with diffs, {len(errors)} errors") @@ -293,14 +292,14 @@ def main(platform: str | None = None, segments_per_platform: int = 10, update_re if with_diffs: print("```") - for plat, seg, diffs in with_diffs: + for plat, seg, diffs, ref, states in with_diffs: print(f"\n{plat} - {seg}") by_field = defaultdict(list) for d in diffs: by_field[d[0]].append(d) for field, fd in sorted(by_field.items()): print(f" {field} ({len(fd)} diffs)") - for line in format_diff(fd): + for line in format_diff(fd, ref, states, field): print(line) print("```") From e76c2cf5bb0042bc5822efa78fff0362feed7b54 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 30 Jan 2026 00:13:10 -0800 Subject: [PATCH 095/229] Toyota: make RAV4 TSS2 use torque control (#3091) * need to do fric * it's real params * wrong one * wtf --- opendbc/car/torque_data/params.toml | 2 +- opendbc/car/toyota/interface.py | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/opendbc/car/torque_data/params.toml b/opendbc/car/torque_data/params.toml index 7d37f466712..1fbabf6f76b 100644 --- a/opendbc/car/torque_data/params.toml +++ b/opendbc/car/torque_data/params.toml @@ -69,7 +69,7 @@ legend = ["LAT_ACCEL_FACTOR", "MAX_LAT_ACCEL_MEASURED", "FRICTION"] "TOYOTA_PRIUS" = [1.60, 1.5023147650693636, 0.151515] "TOYOTA_PRIUS_TSS2" = [1.972600, 1.9104337425537743, 0.170968] "TOYOTA_RAV4" = [2.085695074355425, 2.2142832316984733, 0.13339165270103975] -"TOYOTA_RAV4_TSS2" = [2.279239424615458, 2.087101966779332, 0.13682208413446817] +"TOYOTA_RAV4_TSS2" = [1.9557514786720276, 2.087101966779332, 0.12075843289494514] "TOYOTA_RAV4H" = [1.9796257271652042, 1.7503987331707576, 0.14628860048885406] "TOYOTA_SIENNA" = [1.689726, 1.3208264576110418, 0.140456] "TOYOTA_YARIS" = [2.22984, 1.86145, 0.168189] diff --git a/opendbc/car/toyota/interface.py b/opendbc/car/toyota/interface.py index 66b78d11a23..5f44a58e23e 100644 --- a/opendbc/car/toyota/interface.py +++ b/opendbc/car/toyota/interface.py @@ -74,23 +74,6 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo # https://engage.toyota.com/static/images/toyota_safety_sense/TSS_Applicability_Chart.pdf stop_and_go = candidate != CAR.TOYOTA_AVALON - elif candidate == CAR.TOYOTA_RAV4_TSS2: - ret.lateralTuning.init('pid') - ret.lateralTuning.pid.kiBP = [0.0] - ret.lateralTuning.pid.kpBP = [0.0] - ret.lateralTuning.pid.kpV = [0.6] - ret.lateralTuning.pid.kiV = [0.1] - ret.lateralTuning.pid.kf = 0.00007818594 - - # 2019+ RAV4 TSS2 uses two different steering racks and specific tuning seems to be necessary. - # See https://github.com/commaai/openpilot/pull/21429#issuecomment-873652891 - for fw in car_fw: - if fw.ecu == "eps" and (fw.fwVersion.startswith(b'\x02') or fw.fwVersion in [b'8965B42181\x00\x00\x00\x00\x00\x00']): - ret.lateralTuning.pid.kpV = [0.15] - ret.lateralTuning.pid.kiV = [0.05] - ret.lateralTuning.pid.kf = 0.00004 - break - elif candidate in (CAR.TOYOTA_CHR, CAR.TOYOTA_CAMRY, CAR.TOYOTA_SIENNA, CAR.LEXUS_CTH, CAR.LEXUS_LS, CAR.LEXUS_NX): # TODO: Some of these platforms are not advertised to have full range ACC, do they really all have sng? stop_and_go = True From 3b342d76aa6e92306384ed61a4df5e297b038c10 Mon Sep 17 00:00:00 2001 From: MVL Date: Fri, 30 Jan 2026 17:08:30 -0500 Subject: [PATCH 096/229] Honda - move brakehold_alt to honda_common (#2758) * add brakehold_hybrid_alt * remove brake hold --- opendbc/dbc/generator/honda/_honda_common.dbc | 7 +++++++ opendbc/dbc/generator/honda/_nidec_common.dbc | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/opendbc/dbc/generator/honda/_honda_common.dbc b/opendbc/dbc/generator/honda/_honda_common.dbc index 24d3ed564bd..fdf86ec7d56 100644 --- a/opendbc/dbc/generator/honda/_honda_common.dbc +++ b/opendbc/dbc/generator/honda/_honda_common.dbc @@ -85,6 +85,13 @@ BO_ 490 VEHICLE_DYNAMICS: 8 VSA SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EON SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" EON +BO_ 547 BRAKE_HOLD_HYBRID_ALT: 6 XXX + SG_ BRAKE_HOLD_FAULT_BIT : 33|1@0+ (1,0) [0|1] "" XXX + SG_ BRAKE_HOLD_ENABLED : 37|2@0+ (1,0) [0|7] "" XXX + SG_ BRAKE_HOLD_ACTIVE : 38|1@0+ (1,0) [0|1] "" XXX + SG_ CHECKSUM : 43|4@0+ (1,0) [0|15] "" XXX + SG_ COUNTER : 45|2@0+ (1,0) [0|3] "" XXX + BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA SG_ WHEEL_SPEED_FL : 7|8@0+ (1,0) [0|255] "kph" EON SG_ WHEEL_SPEED_FR : 15|8@0+ (1,0) [0|255] "kph" EON diff --git a/opendbc/dbc/generator/honda/_nidec_common.dbc b/opendbc/dbc/generator/honda/_nidec_common.dbc index d22c28a56e4..12896d8f6c2 100644 --- a/opendbc/dbc/generator/honda/_nidec_common.dbc +++ b/opendbc/dbc/generator/honda/_nidec_common.dbc @@ -35,13 +35,6 @@ BO_ 506 BRAKE_COMMAND: 8 ADAS SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EBCM SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EBCM -BO_ 547 BRAKE_HOLD_HYBRID_ALT: 6 XXX - SG_ BRAKE_HOLD_FAULT_BIT : 33|1@0+ (1,0) [0|1] "" XXX - SG_ BRAKE_HOLD_ENABLED : 37|2@0+ (1,0) [0|7] "" XXX - SG_ BRAKE_HOLD_ACTIVE : 38|1@0+ (1,0) [0|1] "" XXX - SG_ CHECKSUM : 43|4@0+ (1,0) [0|15] "" XXX - SG_ COUNTER : 45|2@0+ (1,0) [0|3] "" XXX - BO_ 892 CRUISE_PARAMS: 8 PCM SG_ CRUISE_SPEED_OFFSET : 31|8@0- (0.1,0) [-128|127] "kph" EON SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" EON From f80dc22894f719a3bb96261c537384318c28c885 Mon Sep 17 00:00:00 2001 From: Alexandre Nobuharu Sato <66435071+AlexandreSato@users.noreply.github.com> Date: Fri, 30 Jan 2026 19:19:32 -0300 Subject: [PATCH 097/229] add STEERING_DIRECTION bit to gwm_haval_h6_phev_2024.dbc (#3093) * add STEERING_DIRECTION bit to gwm_haval_h6_phev_2024.dbc * add back crc --------- Co-authored-by: Shane Smiskol --- opendbc/dbc/gwm_haval_h6_phev_2024.dbc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/opendbc/dbc/gwm_haval_h6_phev_2024.dbc b/opendbc/dbc/gwm_haval_h6_phev_2024.dbc index 960f3e87ec9..b9f85d7a511 100644 --- a/opendbc/dbc/gwm_haval_h6_phev_2024.dbc +++ b/opendbc/dbc/gwm_haval_h6_phev_2024.dbc @@ -23,8 +23,9 @@ BO_ 147 IMPRECISE_SPEED_INFORMATION: 8 XXX BO_ 161 STEER_AND_AP_STALK: 8 XXX SG_ CRC : 7|8@0+ (1,0) [0|255] "" XXX - SG_ STEERING_ANGLE : 15|16@0+ (0.05,0) [0|65535] "degs" XXX - SG_ STEERING_TORQUE : 31|16@0+ (1,0) [0|65535] "??" XXX + SG_ STEERING_ANGLE : 13|13@0+ (0.05,0) [0|65535] "degs" XXX + SG_ STEERING_DIRECTION : 16|1@0+ (1,0) [0|1] "" XXX + SG_ STEERING_TORQUE : 29|14@0+ (1,0) [0|65535] "??" XXX SG_ AP_REDUCE_DISTANCE_COMMAND : 44|1@0+ (1,0) [0|1] "" XXX SG_ AP_INCREASE_DISTANCE_COMMAND : 45|1@0+ (1,0) [0|1] "AUTOPILOT_STALK" XXX SG_ AP_CANCEL_COMMAND : 46|1@0+ (1,0) [0|1] "" XXX From 6a18a5f470e81d8534ac3f62f5d4b12ba849f775 Mon Sep 17 00:00:00 2001 From: MVL Date: Fri, 30 Jan 2026 17:31:01 -0500 Subject: [PATCH 098/229] Honda: Update to latest community car support (#3089) Update to latest community car support --- opendbc/car/extra_cars.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/opendbc/car/extra_cars.py b/opendbc/car/extra_cars.py index a2dd470e8eb..cbc2b33d777 100644 --- a/opendbc/car/extra_cars.py +++ b/opendbc/car/extra_cars.py @@ -37,9 +37,11 @@ class CAR(Platforms): EXTRA_HONDA = ExtraPlatformConfig( [ + CommunityCarDocs("Acura ADX 2025-26"), CommunityCarDocs("Acura Integra 2023-25"), CommunityCarDocs("Acura MDX 2015-16", "Advance Package"), CommunityCarDocs("Acura MDX 2017-20"), + CommunityCarDocs("Acura MDX Hybrid 2017-20"), CommunityCarDocs("Acura MDX 2022-24"), CommunityCarDocs("Acura RDX 2022-25"), CommunityCarDocs("Acura RLX 2017", "Advance Package or Technology Package"), @@ -48,6 +50,7 @@ class CAR(Platforms): CommunityCarDocs("Acura TLX 2022-23"), GMSecurityCarDocs("Acura ZDX 2024"), CommunityCarDocs("Honda Accord 2016-17", "Honda Sensing"), + CommunityCarDocs("Honda Accord Hybrid 2017"), CommunityCarDocs("Honda Clarity 2018-21"), GMSecurityCarDocs("Honda Prologue 2024-25"), ], From 2da21d7b4a15d350fcf6824c02d193c3ebd8ff04 Mon Sep 17 00:00:00 2001 From: Kevin Turcios <106575910+KRRT7@users.noreply.github.com> Date: Sat, 31 Jan 2026 00:51:47 +0000 Subject: [PATCH 099/229] body: optimize CRC-8 checksum with lookup table (#3028) * body: optimize CRC-8 checksum with lookup table * Add CRC8BODY lookup table for body checksum Generate CRC-8 table with polynomial 0xD5 at import time, following the existing pattern for other CRC tables. * Use CRC8BODY from crc module in body checksum Replace hardcoded 256-entry lookup table with import from shared crc module, following reviewer feedback. --------- Co-authored-by: Daniel Koepping --- opendbc/car/body/bodycan.py | 11 ++++------- opendbc/car/crc.py | 1 + 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/opendbc/car/body/bodycan.py b/opendbc/car/body/bodycan.py index 201bfe718f3..bec099fc501 100644 --- a/opendbc/car/body/bodycan.py +++ b/opendbc/car/body/bodycan.py @@ -1,3 +1,6 @@ +from opendbc.car.crc import CRC8BODY + + def create_control(packer, torque_l, torque_r): values = { "TORQUE_L": torque_l, @@ -9,12 +12,6 @@ def create_control(packer, torque_l, torque_r): def body_checksum(address: int, sig, d: bytearray) -> int: crc = 0xFF - poly = 0xD5 for i in range(len(d) - 2, -1, -1): - crc ^= d[i] - for _ in range(8): - if crc & 0x80: - crc = ((crc << 1) ^ poly) & 0xFF - else: - crc = (crc << 1) & 0xFF + crc = CRC8BODY[crc ^ d[i]] return crc diff --git a/opendbc/car/crc.py b/opendbc/car/crc.py index 2518286d8f6..4aa721aaf5a 100644 --- a/opendbc/car/crc.py +++ b/opendbc/car/crc.py @@ -27,4 +27,5 @@ def _gen_crc16_table(poly: int) -> list[int]: CRC8H2F = _gen_crc8_table(0x2F) CRC8J1850 = _gen_crc8_table(0x1D) +CRC8BODY = _gen_crc8_table(0xD5) CRC16_XMODEM = _gen_crc16_table(0x1021) From 7048ac6bfa44d93f6af75d059e251c0bebd485d6 Mon Sep 17 00:00:00 2001 From: Daniel Koepping Date: Fri, 30 Jan 2026 16:53:07 -0800 Subject: [PATCH 100/229] Car Diff: better comment (#3090) * add explainer * func * change text * icons * lines * test changes * Revert "test changes" This reverts commit 2b71f820025e6f857ae01e9847859a1b444b80e1. * test change * Revert "test change" This reverts commit d3c4f3d425977965b4cfb8ba96b8dc9c01e79650. * Update opendbc/car/tests/car_diff.py Co-authored-by: Shane Smiskol * Update opendbc/car/tests/car_diff.py Co-authored-by: Shane Smiskol * Update opendbc/car/tests/car_diff.py Co-authored-by: Shane Smiskol --------- Co-authored-by: Shane Smiskol --- opendbc/car/tests/car_diff.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/opendbc/car/tests/car_diff.py b/opendbc/car/tests/car_diff.py index 66cee6c3183..fe9a138a761 100755 --- a/opendbc/car/tests/car_diff.py +++ b/opendbc/car/tests/car_diff.py @@ -263,8 +263,12 @@ def main(platform: str | None = None, segments_per_platform: int = 10, update_re else: platforms = get_changed_platforms(cwd, database, interfaces) + print("## Car behavior report") + print("Replays driving segments through this PR and compares the behavior to master.") + print("Please review any changes carefully to ensure they are expected.\n") + if not platforms: - print("No car changes detected") + print("✅ No changes detected") return 0 segments = {p: database.get(p, [])[:segments_per_platform] for p in platforms} @@ -285,7 +289,8 @@ def main(platform: str | None = None, segments_per_platform: int = 10, update_re errors = [(platform, seg, err) for platform, seg, diffs, ref, states, err in results if err] n_passed = len(results) - len(with_diffs) - len(errors) - print(f"\nResults: {n_passed} passed, {len(with_diffs)} with diffs, {len(errors)} errors") + icon = "⚠️" if with_diffs else "✅" + print(f"\n{icon} {len(with_diffs)} changed, {n_passed} passed, {len(errors)} errors") for plat, seg, err in errors: print(f"\nERROR {plat} - {seg}: {err}") @@ -298,7 +303,7 @@ def main(platform: str | None = None, segments_per_platform: int = 10, update_re for d in diffs: by_field[d[0]].append(d) for field, fd in sorted(by_field.items()): - print(f" {field} ({len(fd)} diffs)") + print(f"\n {field} ({len(fd)} diffs)") for line in format_diff(fd, ref, states, field): print(line) print("```") From 50f1b43fd6c2ee068c78e1596e69dbf34a88fae0 Mon Sep 17 00:00:00 2001 From: Daniel Koepping Date: Fri, 30 Jan 2026 19:29:24 -0800 Subject: [PATCH 101/229] Car diff: lazy load (#3092) lazy load to import from openpilot --- opendbc/car/tests/car_diff.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/opendbc/car/tests/car_diff.py b/opendbc/car/tests/car_diff.py index fe9a138a761..74c9c9591f1 100755 --- a/opendbc/car/tests/car_diff.py +++ b/opendbc/car/tests/car_diff.py @@ -15,7 +15,6 @@ from pathlib import Path from typing import Any -from comma_car_segments import get_comma_car_segments_database, get_url from opendbc.car import structs from opendbc.car.can_definitions import CanData @@ -52,6 +51,7 @@ def dict_diff(d1: dict[str, Any], d2: dict[str, Any], path: str = "", ignore: li def load_can_messages(seg: str) -> list[Any]: + from comma_car_segments import get_url parts = seg.split("/") url = get_url(f"{parts[0]}/{parts[1]}", parts[2]) msgs = LogReader(url, only_union_types=True, sort_by_time=True) @@ -248,6 +248,7 @@ def format_diff(diffs: list[Diff], ref: list[Ref], states: list[structs.CarState def main(platform: str | None = None, segments_per_platform: int = 10, update_refs: bool = False, all_platforms: bool = False) -> int: + from comma_car_segments import get_comma_car_segments_database cwd = Path(__file__).resolve().parents[3] ref_path = cwd / DIFF_BUCKET if not update_refs: From 8a60a647d7e77d6e6f1c2c701e0849cdd80e154c Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 30 Jan 2026 20:38:00 -0800 Subject: [PATCH 102/229] Subaru global: use universal angle signal for angle cars (#3094) * swap * self explan * combine into if right below * split by lkas angle --- opendbc/car/subaru/carstate.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/opendbc/car/subaru/carstate.py b/opendbc/car/subaru/carstate.py index 76bc4ff8f77..1cc42da0918 100644 --- a/opendbc/car/subaru/carstate.py +++ b/opendbc/car/subaru/carstate.py @@ -60,7 +60,13 @@ def update(self, can_parsers) -> structs.CarState: can_gear = int(cp_transmission.vl["Transmission"]["Gear"]) ret.gearShifter = self.parse_gear_shifter(self.shifter_values.get(can_gear, None)) - ret.steeringAngleDeg = cp.vl["Steering_Torque"]["Steering_Angle"] + if not (self.CP.flags & SubaruFlags.LKAS_ANGLE): + ret.steeringAngleDeg = cp.vl["Steering_Torque"]["Steering_Angle"] + else: + # Steering_Torque->Steering_Angle exists on SUBARU_FORESTER_2022, SUBARU_OUTBACK_2023, SUBARU_ASCENT_2023 where + # it is identical to Steering_2's signal. However, it is always zero on newer LKAS_ANGLE cars + # such as 2024+ Crosstrek, 2023+ Ascent, etc. Use a universal signal for LKAS_ANGLE cars. + ret.steeringAngleDeg = cp.vl["Steering_2"]["Steering_Angle"] if not (self.CP.flags & SubaruFlags.PREGLOBAL): # ideally we get this from the car, but unclear if it exists. diagnostic software doesn't even have it From b5a90e97d018082f556e1880583469d9399d93bf Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 30 Jan 2026 20:44:03 -0800 Subject: [PATCH 103/229] Fix Subaru steering angle rate (#3095) what is going on --- opendbc/car/__init__.py | 8 +++----- opendbc/car/subaru/carstate.py | 4 +++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/opendbc/car/__init__.py b/opendbc/car/__init__.py index a45e1e83e3b..376b27c338d 100644 --- a/opendbc/car/__init__.py +++ b/opendbc/car/__init__.py @@ -131,17 +131,15 @@ class CanSignalRateCalculator: Calculates the instantaneous rate of a CAN signal by using the counter variable and the known frequency of the CAN message that contains it. """ - def __init__(self, frequency): + def __init__(self, frequency: int): self.frequency = frequency - self.previous_counter = 0 self.previous_value = 0 self.rate = 0 - def update(self, current_value, current_counter): - if current_counter != self.previous_counter: + def update(self, current_value: float, updated: bool): + if updated: self.rate = (current_value - self.previous_value) * self.frequency - self.previous_counter = current_counter self.previous_value = current_value return self.rate diff --git a/opendbc/car/subaru/carstate.py b/opendbc/car/subaru/carstate.py index 1cc42da0918..fdef22e4e0f 100644 --- a/opendbc/car/subaru/carstate.py +++ b/opendbc/car/subaru/carstate.py @@ -62,15 +62,17 @@ def update(self, can_parsers) -> structs.CarState: if not (self.CP.flags & SubaruFlags.LKAS_ANGLE): ret.steeringAngleDeg = cp.vl["Steering_Torque"]["Steering_Angle"] + steering_updated = len(cp.vl_all["Steering_Torque"]["Steering_Angle"]) > 0 else: # Steering_Torque->Steering_Angle exists on SUBARU_FORESTER_2022, SUBARU_OUTBACK_2023, SUBARU_ASCENT_2023 where # it is identical to Steering_2's signal. However, it is always zero on newer LKAS_ANGLE cars # such as 2024+ Crosstrek, 2023+ Ascent, etc. Use a universal signal for LKAS_ANGLE cars. ret.steeringAngleDeg = cp.vl["Steering_2"]["Steering_Angle"] + steering_updated = len(cp.vl_all["Steering_2"]["Steering_Angle"]) > 0 if not (self.CP.flags & SubaruFlags.PREGLOBAL): # ideally we get this from the car, but unclear if it exists. diagnostic software doesn't even have it - ret.steeringRateDeg = self.angle_rate_calulator.update(ret.steeringAngleDeg, cp.vl["Steering_Torque"]["COUNTER"]) + ret.steeringRateDeg = self.angle_rate_calulator.update(ret.steeringAngleDeg, steering_updated) ret.steeringTorque = cp.vl["Steering_Torque"]["Steer_Torque_Sensor"] ret.steeringTorqueEps = cp.vl["Steering_Torque"]["Steer_Torque_Output"] From 197b55eb0d03d9107c233ec134fe63a7e61a6f9a Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 30 Jan 2026 22:12:01 -0800 Subject: [PATCH 104/229] Subaru hybrid: fix cruise enabled signal (#3097) * brake or status works * hmm which name * better * rest * cmt * cmt * what --- opendbc/car/subaru/carstate.py | 4 +++- opendbc/car/subaru/subarucan.py | 9 +++++---- opendbc/dbc/generator/subaru/_subaru_global.dbc | 5 +++-- opendbc/dbc/generator/subaru/subaru_forester_2017.dbc | 2 +- opendbc/dbc/generator/subaru/subaru_outback_2015.dbc | 2 +- opendbc/dbc/generator/subaru/subaru_outback_2019.dbc | 2 +- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/opendbc/car/subaru/carstate.py b/opendbc/car/subaru/carstate.py index fdef22e4e0f..01b92925e1a 100644 --- a/opendbc/car/subaru/carstate.py +++ b/opendbc/car/subaru/carstate.py @@ -81,8 +81,10 @@ def update(self, can_parsers) -> structs.CarState: ret.steeringPressed = abs(ret.steeringTorque) > steer_threshold cp_cruise = cp_alt if self.CP.flags & SubaruFlags.GLOBAL_GEN2 else cp + # ES_DashStatus->Cruise_Activated_Dash is likely intended for the dash display only, as it falls + # during user gas override and at standstill. ES_Status is missing on hybrid, so we use ES_Brake instead if self.CP.flags & SubaruFlags.HYBRID: - ret.cruiseState.enabled = cp_cam.vl["ES_DashStatus"]['Cruise_Activated'] != 0 + ret.cruiseState.enabled = cp_cam.vl["ES_Brake"]['Cruise_Activated'] != 0 ret.cruiseState.available = cp_cam.vl["ES_DashStatus"]['Cruise_On'] != 0 else: ret.cruiseState.enabled = cp_cruise.vl["CruiseControl"]["Cruise_Activated"] != 0 diff --git a/opendbc/car/subaru/subarucan.py b/opendbc/car/subaru/subarucan.py index 64cab421cec..09b552ab52b 100644 --- a/opendbc/car/subaru/subarucan.py +++ b/opendbc/car/subaru/subarucan.py @@ -147,8 +147,8 @@ def create_es_dashstatus(packer, frame, dashstatus_msg, enabled, long_enabled, l "Signal4", "Conventional_Cruise", "Signal5", - "Cruise_Disengaged", - "Cruise_Activated", + "Cruise_Disengaged_Dash", + "Cruise_Activated_Dash", "Signal6", "Cruise_Set_Speed", "Cruise_Fault", @@ -165,8 +165,9 @@ def create_es_dashstatus(packer, frame, dashstatus_msg, enabled, long_enabled, l if long_enabled: values["Cruise_State"] = 0 - values["Cruise_Activated"] = enabled - values["Cruise_Disengaged"] = 0 + # TODO: Cruise_Activated_dash should respect gas pressed and standstill stock behavior + values["Cruise_Activated_Dash"] = enabled + values["Cruise_Disengaged_Dash"] = 0 values["Car_Follow"] = int(lead_visible) values["PCB_Off"] = 1 # AEB is not presevered, so show the PCB_Off on dash diff --git a/opendbc/dbc/generator/subaru/_subaru_global.dbc b/opendbc/dbc/generator/subaru/_subaru_global.dbc index cb06822c827..67f63216a52 100644 --- a/opendbc/dbc/generator/subaru/_subaru_global.dbc +++ b/opendbc/dbc/generator/subaru/_subaru_global.dbc @@ -213,8 +213,8 @@ BO_ 801 ES_DashStatus: 8 XXX SG_ Signal4 : 31|1@1+ (1,0) [0|1] "" XXX SG_ Conventional_Cruise : 32|1@1+ (1,0) [0|1] "" XXX SG_ Signal5 : 33|2@1+ (1,0) [0|3] "" XXX - SG_ Cruise_Disengaged : 35|1@1+ (1,0) [0|1] "" XXX - SG_ Cruise_Activated : 36|1@1+ (1,0) [0|1] "" XXX + SG_ Cruise_Disengaged_Dash : 35|1@1+ (1,0) [0|1] "" XXX + SG_ Cruise_Activated_Dash : 36|1@1+ (1,0) [0|1] "" XXX SG_ Signal6 : 37|3@1+ (1,0) [0|1] "" XXX SG_ Cruise_Set_Speed : 40|8@1+ (1,0) [0|255] "" XXX SG_ Cruise_Fault : 48|1@1+ (1,0) [0|1] "" XXX @@ -285,6 +285,7 @@ CM_ SG_ 544 Cruise_Brake_Lights "1 = switch on brake lights"; CM_ SG_ 544 Brake_Pressure "Winds down after cruise disabled. Also can be non-zero when likely preparing for AEB"; CM_ SG_ 544 Signal3 "Usually goes to 2 if AEB_Status is 4"; CM_ SG_ 544 AEB_Status "Occasionally is 4 instead of 8 while Brake_Pressure is non-zero, unsure why"; +CM_ SG_ 801 Cruise_Activated_Dash "Falls during user gas or standstill. This is likely only a UI signal to the dash to show if ACC is actually actuating"; CM_ SG_ 801 PCB_Off "Pre-Collision Braking off"; CM_ SG_ 801 Brake_Lights "Driver or Cruise brake on"; CM_ SG_ 801 Cruise_State "0 = Normal, 1 = Hold+User Brake, 2 = Ready, 3 = Hold"; diff --git a/opendbc/dbc/generator/subaru/subaru_forester_2017.dbc b/opendbc/dbc/generator/subaru/subaru_forester_2017.dbc index 6d5d46bc9ab..34dc730a58b 100644 --- a/opendbc/dbc/generator/subaru/subaru_forester_2017.dbc +++ b/opendbc/dbc/generator/subaru/subaru_forester_2017.dbc @@ -3,7 +3,7 @@ CM_ "IMPORT _subaru_preglobal_2015.dbc"; BO_ 355 ES_DashStatus: 8 XXX SG_ Not_Ready_Startup : 4|2@1+ (1,0) [0|3] "" XXX SG_ Cruise_On : 16|1@1+ (1,0) [0|1] "" XXX - SG_ Cruise_Activated : 17|1@0+ (1,0) [0|1] "" XXX + SG_ Cruise_Activated_Dash : 17|1@0+ (1,0) [0|1] "" XXX SG_ Cruise_Set_Speed : 24|8@1+ (1,0) [0|255] "" XXX SG_ COUNTER : 40|3@1+ (1,0) [0|7] "" XXX SG_ Brake : 43|1@1+ (1,0) [0|1] "" XXX diff --git a/opendbc/dbc/generator/subaru/subaru_outback_2015.dbc b/opendbc/dbc/generator/subaru/subaru_outback_2015.dbc index cc1fa16d19e..8134dd42098 100644 --- a/opendbc/dbc/generator/subaru/subaru_outback_2015.dbc +++ b/opendbc/dbc/generator/subaru/subaru_outback_2015.dbc @@ -5,7 +5,7 @@ BO_ 358 ES_DashStatus: 8 XXX SG_ Seatbelt_Disengage : 12|2@1+ (1,0) [0|3] "" XXX SG_ Disengage_Alert : 14|2@1+ (1,0) [0|3] "" XXX SG_ Cruise_On : 16|1@1+ (1,0) [0|1] "" XXX - SG_ Cruise_Activated : 17|1@1+ (1,0) [0|1] "" XXX + SG_ Cruise_Activated_Dash : 17|1@1+ (1,0) [0|1] "" XXX SG_ Signal1 : 18|1@1+ (1,0) [0|1] "" XXX SG_ WHEELS_MOVING_2015 : 19|1@1+ (1,0) [0|1] "" XXX SG_ Driver_Input : 20|1@1+ (1,0) [0|1] "" XXX diff --git a/opendbc/dbc/generator/subaru/subaru_outback_2019.dbc b/opendbc/dbc/generator/subaru/subaru_outback_2019.dbc index d886954cfe7..b04142fbc5d 100644 --- a/opendbc/dbc/generator/subaru/subaru_outback_2019.dbc +++ b/opendbc/dbc/generator/subaru/subaru_outback_2019.dbc @@ -5,7 +5,7 @@ BO_ 358 ES_DashStatus: 8 XXX SG_ Seatbelt_Disengage : 12|2@1+ (1,0) [0|3] "" XXX SG_ Disengage_Alert : 14|2@1+ (1,0) [0|3] "" XXX SG_ Cruise_On : 16|1@1+ (1,0) [0|1] "" XXX - SG_ Cruise_Activated : 17|1@1+ (1,0) [0|1] "" XXX + SG_ Cruise_Activated_Dash : 17|1@1+ (1,0) [0|1] "" XXX SG_ Signal1 : 18|1@1+ (1,0) [0|1] "" XXX SG_ WHEELS_MOVING_2015 : 19|1@1+ (1,0) [0|1] "" XXX SG_ Driver_Input : 20|1@1+ (1,0) [0|1] "" XXX From 497727cbed95e9fd77de7f2483eed0e446aa0a5a Mon Sep 17 00:00:00 2001 From: adeebshihadeh Date: Sat, 31 Jan 2026 08:09:39 +0000 Subject: [PATCH 105/229] docs: Scheduled auto-update CARS.md --- docs/CARS.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/CARS.md b/docs/CARS.md index 4d3f6b4c368..88514042286 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -1,9 +1,10 @@ -# Support Information for 387 Known Cars +# Support Information for 390 Known Cars |Make|Model|Package|Support Level| |---|---|---|:---:| +|Acura|ADX 2025-26|All|[Community](#community)| |Acura|ILX 2016-18|Technology Plus Package or AcuraWatch Plus|[Upstream](#upstream)| |Acura|ILX 2019|All|[Upstream](#upstream)| |Acura|Integra 2023-25|All|[Community](#community)| @@ -11,6 +12,7 @@ |Acura|MDX 2017-20|All|[Community](#community)| |Acura|MDX 2022-24|All|[Community](#community)| |Acura|MDX 2025-26|All except Type S|[Upstream](#upstream)| +|Acura|MDX Hybrid 2017-20|All|[Community](#community)| |Acura|RDX 2016-18|AcuraWatch Plus or Advance Package|[Upstream](#upstream)| |Acura|RDX 2019-21|All|[Upstream](#upstream)| |Acura|RDX 2022-25|All|[Community](#community)| @@ -87,6 +89,7 @@ |Honda|Accord 2016-17|Honda Sensing|[Community](#community)| |Honda|Accord 2018-22|All|[Upstream](#upstream)| |Honda|Accord 2023-25|All|[Upstream](#upstream)| +|Honda|Accord Hybrid 2017|All|[Community](#community)| |Honda|Accord Hybrid 2018-22|All|[Upstream](#upstream)| |Honda|Accord Hybrid 2023-25|All|[Upstream](#upstream)| |Honda|City (Brazil only) 2023|All|[Upstream](#upstream)| From 3392232f3236ff5b1bb95e6be7793b0f9e2f8d83 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Sat, 31 Jan 2026 01:52:37 -0800 Subject: [PATCH 106/229] Subaru ANGLE_LKAS: fix cruise control signals (#3096) * outback is always zero? * move inside * fix bus --- opendbc/car/subaru/carstate.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/opendbc/car/subaru/carstate.py b/opendbc/car/subaru/carstate.py index 01b92925e1a..adb4f7b65d0 100644 --- a/opendbc/car/subaru/carstate.py +++ b/opendbc/car/subaru/carstate.py @@ -81,10 +81,12 @@ def update(self, can_parsers) -> structs.CarState: ret.steeringPressed = abs(ret.steeringTorque) > steer_threshold cp_cruise = cp_alt if self.CP.flags & SubaruFlags.GLOBAL_GEN2 else cp - # ES_DashStatus->Cruise_Activated_Dash is likely intended for the dash display only, as it falls - # during user gas override and at standstill. ES_Status is missing on hybrid, so we use ES_Brake instead - if self.CP.flags & SubaruFlags.HYBRID: - ret.cruiseState.enabled = cp_cam.vl["ES_Brake"]['Cruise_Activated'] != 0 + cp_es_brake = cp_alt if self.CP.flags & SubaruFlags.GLOBAL_GEN2 else cp_cam + + if self.CP.flags & (SubaruFlags.HYBRID | SubaruFlags.LKAS_ANGLE): + # ES_DashStatus->Cruise_Activated_Dash is likely intended for the dash display only, as it falls + # during user gas override and at standstill. ES_Status is missing on hybrid, so we use ES_Brake instead + ret.cruiseState.enabled = cp_es_brake.vl["ES_Brake"]['Cruise_Activated'] != 0 ret.cruiseState.available = cp_cam.vl["ES_DashStatus"]['Cruise_On'] != 0 else: ret.cruiseState.enabled = cp_cruise.vl["CruiseControl"]["Cruise_Activated"] != 0 @@ -113,9 +115,7 @@ def update(self, can_parsers) -> structs.CarState: (cp_cam.vl["ES_LKAS_State"]["LKAS_Alert"] == 2) self.es_lkas_state_msg = copy.copy(cp_cam.vl["ES_LKAS_State"]) - cp_es_brake = cp_alt if self.CP.flags & SubaruFlags.GLOBAL_GEN2 else cp_cam self.es_brake_msg = copy.copy(cp_es_brake.vl["ES_Brake"]) - cp_es_status = cp_alt if self.CP.flags & SubaruFlags.GLOBAL_GEN2 else cp_cam # TODO: Hybrid cars don't have ES_Distance, need a replacement if not (self.CP.flags & SubaruFlags.HYBRID): @@ -123,7 +123,7 @@ def update(self, can_parsers) -> structs.CarState: ret.stockAeb = (cp_es_distance.vl["ES_Brake"]["AEB_Status"] == 8) and \ (cp_es_distance.vl["ES_Brake"]["Brake_Pressure"] != 0) - self.es_status_msg = copy.copy(cp_es_status.vl["ES_Status"]) + self.es_status_msg = copy.copy(cp_es_brake.vl["ES_Status"]) self.cruise_control_msg = copy.copy(cp_cruise.vl["CruiseControl"]) if not (self.CP.flags & SubaruFlags.HYBRID): From 3676621a723232ddcaf578efd15c5554f98892a7 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Sat, 31 Jan 2026 02:07:43 -0800 Subject: [PATCH 107/229] Clean up Subaru interface/angle cars (#3099) * clean up * unset too?1 * prob fine at 0.1 --- opendbc/car/subaru/interface.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/opendbc/car/subaru/interface.py b/opendbc/car/subaru/interface.py index b11a987d55d..5b16f17d253 100644 --- a/opendbc/car/subaru/interface.py +++ b/opendbc/car/subaru/interface.py @@ -37,12 +37,13 @@ def _get_params(ret: structs.CarParams, candidate: CAR, fingerprint, car_fw, alp ret.steerLimitTimer = 0.4 ret.steerActuatorDelay = 0.1 + if not (ret.flags & SubaruFlags.LKAS_ANGLE): + CarInterfaceBase.configure_torque_tune(candidate, ret.lateralTuning) + if ret.flags & SubaruFlags.LKAS_ANGLE: ret.steerControlType = structs.CarParams.SteerControlType.angle - else: - CarInterfaceBase.configure_torque_tune(candidate, ret.lateralTuning) - if candidate in (CAR.SUBARU_ASCENT, CAR.SUBARU_ASCENT_2023): + elif candidate == CAR.SUBARU_ASCENT: ret.steerActuatorDelay = 0.3 # end-to-end angle controller ret.lateralTuning.init('pid') ret.lateralTuning.pid.kf = 0.00003 @@ -65,13 +66,13 @@ def _get_params(ret: structs.CarParams, candidate: CAR, fingerprint, car_fw, alp elif candidate == CAR.SUBARU_CROSSTREK_HYBRID: ret.steerActuatorDelay = 0.1 - elif candidate in (CAR.SUBARU_FORESTER, CAR.SUBARU_FORESTER_2022, CAR.SUBARU_FORESTER_HYBRID): + elif candidate in (CAR.SUBARU_FORESTER, CAR.SUBARU_FORESTER_HYBRID): ret.lateralTuning.init('pid') ret.lateralTuning.pid.kf = 0.000038 ret.lateralTuning.pid.kiBP, ret.lateralTuning.pid.kpBP = [[0., 14., 23.], [0., 14., 23.]] ret.lateralTuning.pid.kpV, ret.lateralTuning.pid.kiV = [[0.01, 0.065, 0.2], [0.001, 0.015, 0.025]] - elif candidate in (CAR.SUBARU_OUTBACK, CAR.SUBARU_LEGACY, CAR.SUBARU_OUTBACK_2023): + elif candidate in (CAR.SUBARU_OUTBACK, CAR.SUBARU_LEGACY): ret.steerActuatorDelay = 0.1 elif candidate in (CAR.SUBARU_FORESTER_PREGLOBAL, CAR.SUBARU_OUTBACK_PREGLOBAL_2018): From cc29c459792c491c39b1bf19353c6267a2e95d84 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Sat, 31 Jan 2026 02:14:39 -0800 Subject: [PATCH 108/229] Subaru: remove unused safety angle measurement (#3100) * we simply don't use this * as well --- opendbc/safety/modes/subaru.h | 5 ----- opendbc/safety/tests/test_subaru.py | 4 ---- 2 files changed, 9 deletions(-) diff --git a/opendbc/safety/modes/subaru.h b/opendbc/safety/modes/subaru.h index 9b01d39d635..f5487a6773f 100644 --- a/opendbc/safety/modes/subaru.h +++ b/opendbc/safety/modes/subaru.h @@ -98,11 +98,6 @@ static void subaru_rx_hook(const CANPacket_t *msg) { torque_driver_new = ((GET_BYTES(msg, 0, 4) >> 16) & 0x7FFU); torque_driver_new = -1 * to_signed(torque_driver_new, 11); update_sample(&torque_driver, torque_driver_new); - - int angle_meas_new = (GET_BYTES(msg, 4, 2) & 0xFFFFU); - // convert Steering_Torque -> Steering_Angle to centidegrees, to match the ES_LKAS_ANGLE angle request units - angle_meas_new = ROUND(to_signed(angle_meas_new, 16) * -2.17); - update_sample(&angle_meas, angle_meas_new); } // enter controls on rising edge of ACC, exit controls on ACC off diff --git a/opendbc/safety/tests/test_subaru.py b/opendbc/safety/tests/test_subaru.py index a0ad42d8d67..d5183eecd4c 100755 --- a/opendbc/safety/tests/test_subaru.py +++ b/opendbc/safety/tests/test_subaru.py @@ -95,10 +95,6 @@ def _speed_msg(self, speed): values = {s: speed for s in ["FR", "FL", "RR", "RL"]} return self.packer.make_can_msg_safety("Wheel_Speeds", self.ALT_MAIN_BUS, values) - def _angle_meas_msg(self, angle): - values = {"Steering_Angle": angle} - return self.packer.make_can_msg_safety("Steering_Torque", 0, values) - def _user_brake_msg(self, brake): values = {"Brake": brake} return self.packer.make_can_msg_safety("Brake_Status", self.ALT_MAIN_BUS, values) From c2eba0b51deb51a99380391c469859d3fc65cc0f Mon Sep 17 00:00:00 2001 From: Jacob Waller Date: Sat, 31 Jan 2026 23:18:21 -0600 Subject: [PATCH 109/229] Fix Subaru message definitions for HighBeamAssist and static messages (#3102) Co-authored-by: Jacob Waller --- opendbc/safety/modes/subaru.h | 6 +++--- opendbc/safety/tests/test_subaru.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/opendbc/safety/modes/subaru.h b/opendbc/safety/modes/subaru.h index f5487a6773f..a27b6e590cb 100644 --- a/opendbc/safety/modes/subaru.h +++ b/opendbc/safety/modes/subaru.h @@ -35,9 +35,9 @@ #define MSG_SUBARU_ES_UDS_Request 0x787U -#define MSG_SUBARU_ES_HighBeamAssist 0x121U -#define MSG_SUBARU_ES_STATIC_1 0x22aU -#define MSG_SUBARU_ES_STATIC_2 0x325U +#define MSG_SUBARU_ES_HighBeamAssist 0x22AU +#define MSG_SUBARU_ES_STATIC_1 0x325U +#define MSG_SUBARU_ES_STATIC_2 0x121U #define SUBARU_MAIN_BUS 0U #define SUBARU_ALT_BUS 1U diff --git a/opendbc/safety/tests/test_subaru.py b/opendbc/safety/tests/test_subaru.py index d5183eecd4c..a882f07224a 100755 --- a/opendbc/safety/tests/test_subaru.py +++ b/opendbc/safety/tests/test_subaru.py @@ -25,9 +25,9 @@ class SubaruMsg(enum.IntEnum): ES_LKAS_State = 0x322 ES_Infotainment = 0x323 ES_UDS_Request = 0x787 - ES_HighBeamAssist = 0x121 - ES_STATIC_1 = 0x22a - ES_STATIC_2 = 0x325 + ES_HighBeamAssist = 0x22A + ES_STATIC_1 = 0x325 + ES_STATIC_2 = 0x121 SUBARU_MAIN_BUS = 0 From de9d0ef4509a9a55da4c14d6d20c0714da7909f4 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Sat, 31 Jan 2026 21:44:27 -0800 Subject: [PATCH 110/229] add Subaru angle/hybrid cruise TODO --- opendbc/car/subaru/carstate.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/opendbc/car/subaru/carstate.py b/opendbc/car/subaru/carstate.py index adb4f7b65d0..d90dfa98d36 100644 --- a/opendbc/car/subaru/carstate.py +++ b/opendbc/car/subaru/carstate.py @@ -86,6 +86,10 @@ def update(self, can_parsers) -> structs.CarState: if self.CP.flags & (SubaruFlags.HYBRID | SubaruFlags.LKAS_ANGLE): # ES_DashStatus->Cruise_Activated_Dash is likely intended for the dash display only, as it falls # during user gas override and at standstill. ES_Status is missing on hybrid, so we use ES_Brake instead + + # TODO: ES_Brake->Cruise_Activated has been seen staying high when Crosstrek 2025 angle LKAs user pressed + # brake while engaged at a stop. ES_Status and ES_DashStatus->Signal7 correctly fell, but is either missing or + # always zero on hybrids. Probably need to split angle & hybrid. 0x27 and 0x225 on hybrids may work for them. ret.cruiseState.enabled = cp_es_brake.vl["ES_Brake"]['Cruise_Activated'] != 0 ret.cruiseState.available = cp_cam.vl["ES_DashStatus"]['Cruise_On'] != 0 else: From fe3bf2383c7e18aca45368c7e6d7540999ca64cf Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Sat, 31 Jan 2026 21:45:15 -0800 Subject: [PATCH 111/229] typo route is 38b065e31c0a9ed7/000000cf--a4a20815a6 --- opendbc/car/subaru/carstate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendbc/car/subaru/carstate.py b/opendbc/car/subaru/carstate.py index d90dfa98d36..4d242f8352d 100644 --- a/opendbc/car/subaru/carstate.py +++ b/opendbc/car/subaru/carstate.py @@ -87,7 +87,7 @@ def update(self, can_parsers) -> structs.CarState: # ES_DashStatus->Cruise_Activated_Dash is likely intended for the dash display only, as it falls # during user gas override and at standstill. ES_Status is missing on hybrid, so we use ES_Brake instead - # TODO: ES_Brake->Cruise_Activated has been seen staying high when Crosstrek 2025 angle LKAs user pressed + # TODO: ES_Brake->Cruise_Activated has been seen staying high when Crosstrek 2025 angle LKAS user pressed # brake while engaged at a stop. ES_Status and ES_DashStatus->Signal7 correctly fell, but is either missing or # always zero on hybrids. Probably need to split angle & hybrid. 0x27 and 0x225 on hybrids may work for them. ret.cruiseState.enabled = cp_es_brake.vl["ES_Brake"]['Cruise_Activated'] != 0 From 3d6860a4b638b9522033835895a03a683cc9de4a Mon Sep 17 00:00:00 2001 From: Daniel Koepping Date: Sat, 31 Jan 2026 22:36:25 -0800 Subject: [PATCH 112/229] Car Diff: wrap output (#3098) hide changes --- opendbc/car/tests/car_diff.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opendbc/car/tests/car_diff.py b/opendbc/car/tests/car_diff.py index 74c9c9591f1..b4424be8975 100755 --- a/opendbc/car/tests/car_diff.py +++ b/opendbc/car/tests/car_diff.py @@ -297,7 +297,7 @@ def main(platform: str | None = None, segments_per_platform: int = 10, update_re print(f"\nERROR {plat} - {seg}: {err}") if with_diffs: - print("```") + print("
Show changes\n\n```") for plat, seg, diffs, ref, states in with_diffs: print(f"\n{plat} - {seg}") by_field = defaultdict(list) @@ -307,7 +307,7 @@ def main(platform: str | None = None, segments_per_platform: int = 10, update_re print(f"\n {field} ({len(fd)} diffs)") for line in format_diff(fd, ref, states, field): print(line) - print("```") + print("```\n
") return 1 if errors else 0 From ccbf96e0ded81e3674d8bee454f7890f48478061 Mon Sep 17 00:00:00 2001 From: commaci-public <60409688+commaci-public@users.noreply.github.com> Date: Mon, 2 Feb 2026 07:49:32 -0800 Subject: [PATCH 113/229] [bot] Update uv.lock (#3104) Co-authored-by: Vehicle Researcher --- uv.lock | 104 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/uv.lock b/uv.lock index a5a81f540bf..42c7d21d296 100644 --- a/uv.lock +++ b/uv.lock @@ -531,39 +531,39 @@ wheels = [ [[package]] name = "numpy" -version = "2.4.1" +version = "2.4.2" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/24/62/ae72ff66c0f1fd959925b4c11f8c2dea61f47f6acaea75a08512cdfe3fed/numpy-2.4.1.tar.gz", hash = "sha256:a1ceafc5042451a858231588a104093474c6a5c57dcc724841f5c888d237d690", size = 20721320, upload-time = "2026-01-10T06:44:59.619Z" } +sdist = { url = "https://files.pythonhosted.org/packages/57/fd/0005efbd0af48e55eb3c7208af93f2862d4b1a56cd78e84309a2d959208d/numpy-2.4.2.tar.gz", hash = "sha256:659a6107e31a83c4e33f763942275fd278b21d095094044eb35569e86a21ddae", size = 20723651, upload-time = "2026-01-31T23:13:10.135Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/a5/34/2b1bc18424f3ad9af577f6ce23600319968a70575bd7db31ce66731bbef9/numpy-2.4.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:0cce2a669e3c8ba02ee563c7835f92c153cf02edff1ae05e1823f1dde21b16a5", size = 16944563, upload-time = "2026-01-10T06:42:14.615Z" }, - { url = "https://files.pythonhosted.org/packages/2c/57/26e5f97d075aef3794045a6ca9eada6a4ed70eb9a40e7a4a93f9ac80d704/numpy-2.4.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:899d2c18024984814ac7e83f8f49d8e8180e2fbe1b2e252f2e7f1d06bea92425", size = 12645658, upload-time = "2026-01-10T06:42:17.298Z" }, - { url = "https://files.pythonhosted.org/packages/8e/ba/80fc0b1e3cb2fd5c6143f00f42eb67762aa043eaa05ca924ecc3222a7849/numpy-2.4.1-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:09aa8a87e45b55a1c2c205d42e2808849ece5c484b2aab11fecabec3841cafba", size = 5474132, upload-time = "2026-01-10T06:42:19.637Z" }, - { url = "https://files.pythonhosted.org/packages/40/ae/0a5b9a397f0e865ec171187c78d9b57e5588afc439a04ba9cab1ebb2c945/numpy-2.4.1-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:edee228f76ee2dab4579fad6f51f6a305de09d444280109e0f75df247ff21501", size = 6804159, upload-time = "2026-01-10T06:42:21.44Z" }, - { url = "https://files.pythonhosted.org/packages/86/9c/841c15e691c7085caa6fd162f063eff494099c8327aeccd509d1ab1e36ab/numpy-2.4.1-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a92f227dbcdc9e4c3e193add1a189a9909947d4f8504c576f4a732fd0b54240a", size = 14708058, upload-time = "2026-01-10T06:42:23.546Z" }, - { url = "https://files.pythonhosted.org/packages/5d/9d/7862db06743f489e6a502a3b93136d73aea27d97b2cf91504f70a27501d6/numpy-2.4.1-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:538bf4ec353709c765ff75ae616c34d3c3dca1a68312727e8f2676ea644f8509", size = 16651501, upload-time = "2026-01-10T06:42:25.909Z" }, - { url = "https://files.pythonhosted.org/packages/a6/9c/6fc34ebcbd4015c6e5f0c0ce38264010ce8a546cb6beacb457b84a75dfc8/numpy-2.4.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:ac08c63cb7779b85e9d5318e6c3518b424bc1f364ac4cb2c6136f12e5ff2dccc", size = 16492627, upload-time = "2026-01-10T06:42:28.938Z" }, - { url = "https://files.pythonhosted.org/packages/aa/63/2494a8597502dacda439f61b3c0db4da59928150e62be0e99395c3ad23c5/numpy-2.4.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:4f9c360ecef085e5841c539a9a12b883dff005fbd7ce46722f5e9cef52634d82", size = 18585052, upload-time = "2026-01-10T06:42:31.312Z" }, - { url = "https://files.pythonhosted.org/packages/6a/93/098e1162ae7522fc9b618d6272b77404c4656c72432ecee3abc029aa3de0/numpy-2.4.1-cp311-cp311-win32.whl", hash = "sha256:0f118ce6b972080ba0758c6087c3617b5ba243d806268623dc34216d69099ba0", size = 6236575, upload-time = "2026-01-10T06:42:33.872Z" }, - { url = "https://files.pythonhosted.org/packages/8c/de/f5e79650d23d9e12f38a7bc6b03ea0835b9575494f8ec94c11c6e773b1b1/numpy-2.4.1-cp311-cp311-win_amd64.whl", hash = "sha256:18e14c4d09d55eef39a6ab5b08406e84bc6869c1e34eef45564804f90b7e0574", size = 12604479, upload-time = "2026-01-10T06:42:35.778Z" }, - { url = "https://files.pythonhosted.org/packages/dd/65/e1097a7047cff12ce3369bd003811516b20ba1078dbdec135e1cd7c16c56/numpy-2.4.1-cp311-cp311-win_arm64.whl", hash = "sha256:6461de5113088b399d655d45c3897fa188766415d0f568f175ab071c8873bd73", size = 10578325, upload-time = "2026-01-10T06:42:38.518Z" }, - { url = "https://files.pythonhosted.org/packages/78/7f/ec53e32bf10c813604edf07a3682616bd931d026fcde7b6d13195dfb684a/numpy-2.4.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:d3703409aac693fa82c0aee023a1ae06a6e9d065dba10f5e8e80f642f1e9d0a2", size = 16656888, upload-time = "2026-01-10T06:42:40.913Z" }, - { url = "https://files.pythonhosted.org/packages/b8/e0/1f9585d7dae8f14864e948fd7fa86c6cb72dee2676ca2748e63b1c5acfe0/numpy-2.4.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:7211b95ca365519d3596a1d8688a95874cc94219d417504d9ecb2df99fa7bfa8", size = 12373956, upload-time = "2026-01-10T06:42:43.091Z" }, - { url = "https://files.pythonhosted.org/packages/8e/43/9762e88909ff2326f5e7536fa8cb3c49fb03a7d92705f23e6e7f553d9cb3/numpy-2.4.1-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:5adf01965456a664fc727ed69cc71848f28d063217c63e1a0e200a118d5eec9a", size = 5202567, upload-time = "2026-01-10T06:42:45.107Z" }, - { url = "https://files.pythonhosted.org/packages/4b/ee/34b7930eb61e79feb4478800a4b95b46566969d837546aa7c034c742ef98/numpy-2.4.1-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:26f0bcd9c79a00e339565b303badc74d3ea2bd6d52191eeca5f95936cad107d0", size = 6549459, upload-time = "2026-01-10T06:42:48.152Z" }, - { url = "https://files.pythonhosted.org/packages/79/e3/5f115fae982565771be994867c89bcd8d7208dbfe9469185497d70de5ddf/numpy-2.4.1-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0093e85df2960d7e4049664b26afc58b03236e967fb942354deef3208857a04c", size = 14404859, upload-time = "2026-01-10T06:42:49.947Z" }, - { url = "https://files.pythonhosted.org/packages/d9/7d/9c8a781c88933725445a859cac5d01b5871588a15969ee6aeb618ba99eee/numpy-2.4.1-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7ad270f438cbdd402c364980317fb6b117d9ec5e226fff5b4148dd9aa9fc6e02", size = 16371419, upload-time = "2026-01-10T06:42:52.409Z" }, - { url = "https://files.pythonhosted.org/packages/a6/d2/8aa084818554543f17cf4162c42f162acbd3bb42688aefdba6628a859f77/numpy-2.4.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:297c72b1b98100c2e8f873d5d35fb551fce7040ade83d67dd51d38c8d42a2162", size = 16182131, upload-time = "2026-01-10T06:42:54.694Z" }, - { url = "https://files.pythonhosted.org/packages/60/db/0425216684297c58a8df35f3284ef56ec4a043e6d283f8a59c53562caf1b/numpy-2.4.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:cf6470d91d34bf669f61d515499859fa7a4c2f7c36434afb70e82df7217933f9", size = 18295342, upload-time = "2026-01-10T06:42:56.991Z" }, - { url = "https://files.pythonhosted.org/packages/31/4c/14cb9d86240bd8c386c881bafbe43f001284b7cce3bc01623ac9475da163/numpy-2.4.1-cp312-cp312-win32.whl", hash = "sha256:b6bcf39112e956594b3331316d90c90c90fb961e39696bda97b89462f5f3943f", size = 5959015, upload-time = "2026-01-10T06:42:59.631Z" }, - { url = "https://files.pythonhosted.org/packages/51/cf/52a703dbeb0c65807540d29699fef5fda073434ff61846a564d5c296420f/numpy-2.4.1-cp312-cp312-win_amd64.whl", hash = "sha256:e1a27bb1b2dee45a2a53f5ca6ff2d1a7f135287883a1689e930d44d1ff296c87", size = 12310730, upload-time = "2026-01-10T06:43:01.627Z" }, - { url = "https://files.pythonhosted.org/packages/69/80/a828b2d0ade5e74a9fe0f4e0a17c30fdc26232ad2bc8c9f8b3197cf7cf18/numpy-2.4.1-cp312-cp312-win_arm64.whl", hash = "sha256:0e6e8f9d9ecf95399982019c01223dc130542960a12edfa8edd1122dfa66a8a8", size = 10312166, upload-time = "2026-01-10T06:43:03.673Z" }, - { url = "https://files.pythonhosted.org/packages/1e/48/d86f97919e79314a1cdee4c832178763e6e98e623e123d0bada19e92c15a/numpy-2.4.1-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:8ad35f20be147a204e28b6a0575fbf3540c5e5f802634d4258d55b1ff5facce1", size = 16822202, upload-time = "2026-01-10T06:44:43.738Z" }, - { url = "https://files.pythonhosted.org/packages/51/e9/1e62a7f77e0f37dcfb0ad6a9744e65df00242b6ea37dfafb55debcbf5b55/numpy-2.4.1-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:8097529164c0f3e32bb89412a0905d9100bf434d9692d9fc275e18dcf53c9344", size = 12569985, upload-time = "2026-01-10T06:44:45.945Z" }, - { url = "https://files.pythonhosted.org/packages/c7/7e/914d54f0c801342306fdcdce3e994a56476f1b818c46c47fc21ae968088c/numpy-2.4.1-pp311-pypy311_pp73-macosx_14_0_arm64.whl", hash = "sha256:ea66d2b41ca4a1630aae5507ee0a71647d3124d1741980138aa8f28f44dac36e", size = 5398484, upload-time = "2026-01-10T06:44:48.012Z" }, - { url = "https://files.pythonhosted.org/packages/1c/d8/9570b68584e293a33474e7b5a77ca404f1dcc655e40050a600dee81d27fb/numpy-2.4.1-pp311-pypy311_pp73-macosx_14_0_x86_64.whl", hash = "sha256:d3f8f0df9f4b8be57b3bf74a1d087fec68f927a2fab68231fdb442bf2c12e426", size = 6713216, upload-time = "2026-01-10T06:44:49.725Z" }, - { url = "https://files.pythonhosted.org/packages/33/9b/9dd6e2db8d49eb24f86acaaa5258e5f4c8ed38209a4ee9de2d1a0ca25045/numpy-2.4.1-pp311-pypy311_pp73-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2023ef86243690c2791fd6353e5b4848eedaa88ca8a2d129f462049f6d484696", size = 14538937, upload-time = "2026-01-10T06:44:51.498Z" }, - { url = "https://files.pythonhosted.org/packages/53/87/d5bd995b0f798a37105b876350d346eea5838bd8f77ea3d7a48392f3812b/numpy-2.4.1-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8361ea4220d763e54cff2fbe7d8c93526b744f7cd9ddab47afeff7e14e8503be", size = 16479830, upload-time = "2026-01-10T06:44:53.931Z" }, - { url = "https://files.pythonhosted.org/packages/5b/c7/b801bf98514b6ae6475e941ac05c58e6411dd863ea92916bfd6d510b08c1/numpy-2.4.1-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:4f1b68ff47680c2925f8063402a693ede215f0257f02596b1318ecdfb1d79e33", size = 12492579, upload-time = "2026-01-10T06:44:57.094Z" }, + { url = "https://files.pythonhosted.org/packages/d3/44/71852273146957899753e69986246d6a176061ea183407e95418c2aa4d9a/numpy-2.4.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:e7e88598032542bd49af7c4747541422884219056c268823ef6e5e89851c8825", size = 16955478, upload-time = "2026-01-31T23:10:25.623Z" }, + { url = "https://files.pythonhosted.org/packages/74/41/5d17d4058bd0cd96bcbd4d9ff0fb2e21f52702aab9a72e4a594efa18692f/numpy-2.4.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:7edc794af8b36ca37ef5fcb5e0d128c7e0595c7b96a2318d1badb6fcd8ee86b1", size = 14965467, upload-time = "2026-01-31T23:10:28.186Z" }, + { url = "https://files.pythonhosted.org/packages/49/48/fb1ce8136c19452ed15f033f8aee91d5defe515094e330ce368a0647846f/numpy-2.4.2-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:6e9f61981ace1360e42737e2bae58b27bf28a1b27e781721047d84bd754d32e7", size = 5475172, upload-time = "2026-01-31T23:10:30.848Z" }, + { url = "https://files.pythonhosted.org/packages/40/a9/3feb49f17bbd1300dd2570432961f5c8a4ffeff1db6f02c7273bd020a4c9/numpy-2.4.2-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:cb7bbb88aa74908950d979eeaa24dbdf1a865e3c7e45ff0121d8f70387b55f73", size = 6805145, upload-time = "2026-01-31T23:10:32.352Z" }, + { url = "https://files.pythonhosted.org/packages/3f/39/fdf35cbd6d6e2fcad42fcf85ac04a85a0d0fbfbf34b30721c98d602fd70a/numpy-2.4.2-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4f069069931240b3fc703f1e23df63443dbd6390614c8c44a87d96cd0ec81eb1", size = 15966084, upload-time = "2026-01-31T23:10:34.502Z" }, + { url = "https://files.pythonhosted.org/packages/1b/46/6fa4ea94f1ddf969b2ee941290cca6f1bfac92b53c76ae5f44afe17ceb69/numpy-2.4.2-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c02ef4401a506fb60b411467ad501e1429a3487abca4664871d9ae0b46c8ba32", size = 16899477, upload-time = "2026-01-31T23:10:37.075Z" }, + { url = "https://files.pythonhosted.org/packages/09/a1/2a424e162b1a14a5bd860a464ab4e07513916a64ab1683fae262f735ccd2/numpy-2.4.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:2653de5c24910e49c2b106499803124dde62a5a1fe0eedeaecf4309a5f639390", size = 17323429, upload-time = "2026-01-31T23:10:39.704Z" }, + { url = "https://files.pythonhosted.org/packages/ce/a2/73014149ff250628df72c58204822ac01d768697913881aacf839ff78680/numpy-2.4.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:1ae241bbfc6ae276f94a170b14785e561cb5e7f626b6688cf076af4110887413", size = 18635109, upload-time = "2026-01-31T23:10:41.924Z" }, + { url = "https://files.pythonhosted.org/packages/6c/0c/73e8be2f1accd56df74abc1c5e18527822067dced5ec0861b5bb882c2ce0/numpy-2.4.2-cp311-cp311-win32.whl", hash = "sha256:df1b10187212b198dd45fa943d8985a3c8cf854aed4923796e0e019e113a1bda", size = 6237915, upload-time = "2026-01-31T23:10:45.26Z" }, + { url = "https://files.pythonhosted.org/packages/76/ae/e0265e0163cf127c24c3969d29f1c4c64551a1e375d95a13d32eab25d364/numpy-2.4.2-cp311-cp311-win_amd64.whl", hash = "sha256:b9c618d56a29c9cb1c4da979e9899be7578d2e0b3c24d52079c166324c9e8695", size = 12607972, upload-time = "2026-01-31T23:10:47.021Z" }, + { url = "https://files.pythonhosted.org/packages/29/a5/c43029af9b8014d6ea157f192652c50042e8911f4300f8f6ed3336bf437f/numpy-2.4.2-cp311-cp311-win_arm64.whl", hash = "sha256:47c5a6ed21d9452b10227e5e8a0e1c22979811cad7dcc19d8e3e2fb8fa03f1a3", size = 10485763, upload-time = "2026-01-31T23:10:50.087Z" }, + { url = "https://files.pythonhosted.org/packages/51/6e/6f394c9c77668153e14d4da83bcc247beb5952f6ead7699a1a2992613bea/numpy-2.4.2-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:21982668592194c609de53ba4933a7471880ccbaadcc52352694a59ecc860b3a", size = 16667963, upload-time = "2026-01-31T23:10:52.147Z" }, + { url = "https://files.pythonhosted.org/packages/1f/f8/55483431f2b2fd015ae6ed4fe62288823ce908437ed49db5a03d15151678/numpy-2.4.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40397bda92382fcec844066efb11f13e1c9a3e2a8e8f318fb72ed8b6db9f60f1", size = 14693571, upload-time = "2026-01-31T23:10:54.789Z" }, + { url = "https://files.pythonhosted.org/packages/2f/20/18026832b1845cdc82248208dd929ca14c9d8f2bac391f67440707fff27c/numpy-2.4.2-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:b3a24467af63c67829bfaa61eecf18d5432d4f11992688537be59ecd6ad32f5e", size = 5203469, upload-time = "2026-01-31T23:10:57.343Z" }, + { url = "https://files.pythonhosted.org/packages/7d/33/2eb97c8a77daaba34eaa3fa7241a14ac5f51c46a6bd5911361b644c4a1e2/numpy-2.4.2-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:805cc8de9fd6e7a22da5aed858e0ab16be5a4db6c873dde1d7451c541553aa27", size = 6550820, upload-time = "2026-01-31T23:10:59.429Z" }, + { url = "https://files.pythonhosted.org/packages/b1/91/b97fdfd12dc75b02c44e26c6638241cc004d4079a0321a69c62f51470c4c/numpy-2.4.2-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6d82351358ffbcdcd7b686b90742a9b86632d6c1c051016484fa0b326a0a1548", size = 15663067, upload-time = "2026-01-31T23:11:01.291Z" }, + { url = "https://files.pythonhosted.org/packages/f5/c6/a18e59f3f0b8071cc85cbc8d80cd02d68aa9710170b2553a117203d46936/numpy-2.4.2-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9e35d3e0144137d9fdae62912e869136164534d64a169f86438bc9561b6ad49f", size = 16619782, upload-time = "2026-01-31T23:11:03.669Z" }, + { url = "https://files.pythonhosted.org/packages/b7/83/9751502164601a79e18847309f5ceec0b1446d7b6aa12305759b72cf98b2/numpy-2.4.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:adb6ed2ad29b9e15321d167d152ee909ec73395901b70936f029c3bc6d7f4460", size = 17013128, upload-time = "2026-01-31T23:11:05.913Z" }, + { url = "https://files.pythonhosted.org/packages/61/c4/c4066322256ec740acc1c8923a10047818691d2f8aec254798f3dd90f5f2/numpy-2.4.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:8906e71fd8afcb76580404e2a950caef2685df3d2a57fe82a86ac8d33cc007ba", size = 18345324, upload-time = "2026-01-31T23:11:08.248Z" }, + { url = "https://files.pythonhosted.org/packages/ab/af/6157aa6da728fa4525a755bfad486ae7e3f76d4c1864138003eb84328497/numpy-2.4.2-cp312-cp312-win32.whl", hash = "sha256:ec055f6dae239a6299cace477b479cca2fc125c5675482daf1dd886933a1076f", size = 5960282, upload-time = "2026-01-31T23:11:10.497Z" }, + { url = "https://files.pythonhosted.org/packages/92/0f/7ceaaeaacb40567071e94dbf2c9480c0ae453d5bb4f52bea3892c39dc83c/numpy-2.4.2-cp312-cp312-win_amd64.whl", hash = "sha256:209fae046e62d0ce6435fcfe3b1a10537e858249b3d9b05829e2a05218296a85", size = 12314210, upload-time = "2026-01-31T23:11:12.176Z" }, + { url = "https://files.pythonhosted.org/packages/2f/a3/56c5c604fae6dd40fa2ed3040d005fca97e91bd320d232ac9931d77ba13c/numpy-2.4.2-cp312-cp312-win_arm64.whl", hash = "sha256:fbde1b0c6e81d56f5dccd95dd4a711d9b95df1ae4009a60887e56b27e8d903fa", size = 10220171, upload-time = "2026-01-31T23:11:14.684Z" }, + { url = "https://files.pythonhosted.org/packages/f4/f8/50e14d36d915ef64d8f8bc4a087fc8264d82c785eda6711f80ab7e620335/numpy-2.4.2-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:89f7268c009bc492f506abd6f5265defa7cb3f7487dc21d357c3d290add45082", size = 16833179, upload-time = "2026-01-31T23:12:53.5Z" }, + { url = "https://files.pythonhosted.org/packages/17/17/809b5cad63812058a8189e91a1e2d55a5a18fd04611dbad244e8aeae465c/numpy-2.4.2-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:e6dee3bb76aa4009d5a912180bf5b2de012532998d094acee25d9cb8dee3e44a", size = 14889755, upload-time = "2026-01-31T23:12:55.933Z" }, + { url = "https://files.pythonhosted.org/packages/3e/ea/181b9bcf7627fc8371720316c24db888dcb9829b1c0270abf3d288b2e29b/numpy-2.4.2-pp311-pypy311_pp73-macosx_14_0_arm64.whl", hash = "sha256:cd2bd2bbed13e213d6b55dc1d035a4f91748a7d3edc9480c13898b0353708920", size = 5399500, upload-time = "2026-01-31T23:12:58.671Z" }, + { url = "https://files.pythonhosted.org/packages/33/9f/413adf3fc955541ff5536b78fcf0754680b3c6d95103230252a2c9408d23/numpy-2.4.2-pp311-pypy311_pp73-macosx_14_0_x86_64.whl", hash = "sha256:cf28c0c1d4c4bf00f509fa7eb02c58d7caf221b50b467bcb0d9bbf1584d5c821", size = 6714252, upload-time = "2026-01-31T23:13:00.518Z" }, + { url = "https://files.pythonhosted.org/packages/91/da/643aad274e29ccbdf42ecd94dafe524b81c87bcb56b83872d54827f10543/numpy-2.4.2-pp311-pypy311_pp73-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e04ae107ac591763a47398bb45b568fc38f02dbc4aa44c063f67a131f99346cb", size = 15797142, upload-time = "2026-01-31T23:13:02.219Z" }, + { url = "https://files.pythonhosted.org/packages/66/27/965b8525e9cb5dc16481b30a1b3c21e50c7ebf6e9dbd48d0c4d0d5089c7e/numpy-2.4.2-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:602f65afdef699cda27ec0b9224ae5dc43e328f4c24c689deaf77133dbee74d0", size = 16727979, upload-time = "2026-01-31T23:13:04.62Z" }, + { url = "https://files.pythonhosted.org/packages/de/e5/b7d20451657664b07986c2f6e3be564433f5dcaf3482d68eaecd79afaf03/numpy-2.4.2-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:be71bf1edb48ebbbf7f6337b5bfd2f895d1902f6335a5830b20141fc126ffba0", size = 12502577, upload-time = "2026-01-31T23:13:07.08Z" }, ] [[package]] @@ -991,38 +991,38 @@ wheels = [ [[package]] name = "tqdm" -version = "4.67.1" +version = "4.67.2" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "colorama", marker = "sys_platform == 'win32'" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/a8/4b/29b4ef32e036bb34e4ab51796dd745cdba7ed47ad142a9f4a1eb8e0c744d/tqdm-4.67.1.tar.gz", hash = "sha256:f8aef9c52c08c13a65f30ea34f4e5aac3fd1a34959879d7e59e63027286627f2", size = 169737, upload-time = "2024-11-24T20:12:22.481Z" } +sdist = { url = "https://files.pythonhosted.org/packages/27/89/4b0001b2dab8df0a5ee2787dcbe771de75ded01f18f1f8d53dedeea2882b/tqdm-4.67.2.tar.gz", hash = "sha256:649aac53964b2cb8dec76a14b405a4c0d13612cb8933aae547dd144eacc99653", size = 169514, upload-time = "2026-01-30T23:12:06.555Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/d0/30/dc54f88dd4a2b5dc8a0279bdd7270e735851848b762aeb1c1184ed1f6b14/tqdm-4.67.1-py3-none-any.whl", hash = "sha256:26445eca388f82e72884e0d580d5464cd801a3ea01e63e5601bdff9ba6a48de2", size = 78540, upload-time = "2024-11-24T20:12:19.698Z" }, + { url = "https://files.pythonhosted.org/packages/f5/e2/31eac96de2915cf20ccaed0225035db149dfb9165a9ed28d4b252ef3f7f7/tqdm-4.67.2-py3-none-any.whl", hash = "sha256:9a12abcbbff58b6036b2167d9d3853042b9d436fe7330f06ae047867f2f8e0a7", size = 78354, upload-time = "2026-01-30T23:12:04.368Z" }, ] [[package]] name = "ty" -version = "0.0.13" +version = "0.0.14" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/5a/dc/b607f00916f5a7c52860b84a66dc17bc6988e8445e96b1d6e175a3837397/ty-0.0.13.tar.gz", hash = "sha256:7a1d135a400ca076407ea30012d1f75419634160ed3b9cad96607bf2956b23b3", size = 4999183, upload-time = "2026-01-21T13:21:16.133Z" } +sdist = { url = "https://files.pythonhosted.org/packages/af/57/22c3d6bf95c2229120c49ffc2f0da8d9e8823755a1c3194da56e51f1cc31/ty-0.0.14.tar.gz", hash = "sha256:a691010565f59dd7f15cf324cdcd1d9065e010c77a04f887e1ea070ba34a7de2", size = 5036573, upload-time = "2026-01-27T00:57:31.427Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/1a/df/3632f1918f4c0a33184f107efc5d436ab6da147fd3d3b94b3af6461efbf4/ty-0.0.13-py3-none-linux_armv6l.whl", hash = "sha256:1b2b8e02697c3a94c722957d712a0615bcc317c9b9497be116ef746615d892f2", size = 9993501, upload-time = "2026-01-21T13:21:26.628Z" }, - { url = "https://files.pythonhosted.org/packages/92/87/6a473ced5ac280c6ce5b1627c71a8a695c64481b99aabc798718376a441e/ty-0.0.13-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:f15cdb8e233e2b5adfce673bb21f4c5e8eaf3334842f7eea3c70ac6fda8c1de5", size = 9860986, upload-time = "2026-01-21T13:21:24.425Z" }, - { url = "https://files.pythonhosted.org/packages/5d/9b/d89ae375cf0a7cd9360e1164ce017f8c753759be63b6a11ed4c944abe8c6/ty-0.0.13-py3-none-macosx_11_0_arm64.whl", hash = "sha256:0819e89ac9f0d8af7a062837ce197f0461fee2fc14fd07e2c368780d3a397b73", size = 9350748, upload-time = "2026-01-21T13:21:28.502Z" }, - { url = "https://files.pythonhosted.org/packages/a8/a6/9ad58518056fab344b20c0bb2c1911936ebe195318e8acc3bc45ac1c6b6b/ty-0.0.13-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1de79f481084b7cc7a202ba0d7a75e10970d10ffa4f025b23f2e6b7324b74886", size = 9849884, upload-time = "2026-01-21T13:21:21.886Z" }, - { url = "https://files.pythonhosted.org/packages/b1/c3/8add69095fa179f523d9e9afcc15a00818af0a37f2b237a9b59bc0046c34/ty-0.0.13-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:4fb2154cff7c6e95d46bfaba283c60642616f20d73e5f96d0c89c269f3e1bcec", size = 9822975, upload-time = "2026-01-21T13:21:14.292Z" }, - { url = "https://files.pythonhosted.org/packages/a4/05/4c0927c68a0a6d43fb02f3f0b6c19c64e3461dc8ed6c404dde0efb8058f7/ty-0.0.13-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:00be58d89337c27968a20d58ca553458608c5b634170e2bec82824c2e4cf4d96", size = 10294045, upload-time = "2026-01-21T13:21:30.505Z" }, - { url = "https://files.pythonhosted.org/packages/b4/86/6dc190838aba967557fe0bfd494c595d00b5081315a98aaf60c0e632aaeb/ty-0.0.13-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:72435eade1fa58c6218abb4340f43a6c3ff856ae2dc5722a247d3a6dd32e9737", size = 10916460, upload-time = "2026-01-21T13:21:07.788Z" }, - { url = "https://files.pythonhosted.org/packages/04/40/9ead96b7c122e1109dfcd11671184c3506996bf6a649306ec427e81d9544/ty-0.0.13-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:77a548742ee8f621d718159e7027c3b555051d096a49bb580249a6c5fc86c271", size = 10597154, upload-time = "2026-01-21T13:21:18.064Z" }, - { url = "https://files.pythonhosted.org/packages/aa/7d/e832a2c081d2be845dc6972d0c7998914d168ccbc0b9c86794419ab7376e/ty-0.0.13-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:da067c57c289b7cf914669704b552b6207c2cc7f50da4118c3e12388642e6b3f", size = 10410710, upload-time = "2026-01-21T13:21:12.388Z" }, - { url = "https://files.pythonhosted.org/packages/31/e3/898be3a96237a32f05c4c29b43594dc3b46e0eedfe8243058e46153b324f/ty-0.0.13-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:d1b50a01fffa140417fca5a24b658fbe0734074a095d5b6f0552484724474343", size = 9826299, upload-time = "2026-01-21T13:21:00.845Z" }, - { url = "https://files.pythonhosted.org/packages/bb/eb/db2d852ce0ed742505ff18ee10d7d252f3acfd6fc60eca7e9c7a0288a6d8/ty-0.0.13-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:0f33c46f52e5e9378378eca0d8059f026f3c8073ace02f7f2e8d079ddfe5207e", size = 9831610, upload-time = "2026-01-21T13:21:05.842Z" }, - { url = "https://files.pythonhosted.org/packages/9e/61/149f59c8abaddcbcbb0bd13b89c7741ae1c637823c5cf92ed2c644fcadef/ty-0.0.13-py3-none-musllinux_1_2_i686.whl", hash = "sha256:168eda24d9a0b202cf3758c2962cc295878842042b7eca9ed2965259f59ce9f2", size = 9978885, upload-time = "2026-01-21T13:21:10.306Z" }, - { url = "https://files.pythonhosted.org/packages/a0/cd/026d4e4af60a80918a8d73d2c42b8262dd43ab2fa7b28d9743004cb88d57/ty-0.0.13-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:d4917678b95dc8cb399cc459fab568ba8d5f0f33b7a94bf840d9733043c43f29", size = 10506453, upload-time = "2026-01-21T13:20:56.633Z" }, - { url = "https://files.pythonhosted.org/packages/63/06/8932833a4eca2df49c997a29afb26721612de8078ae79074c8fe87e17516/ty-0.0.13-py3-none-win32.whl", hash = "sha256:c1f2ec40daa405508b053e5b8e440fbae5fdb85c69c9ab0ee078f8bc00eeec3d", size = 9433482, upload-time = "2026-01-21T13:20:58.717Z" }, - { url = "https://files.pythonhosted.org/packages/aa/fd/e8d972d1a69df25c2cecb20ea50e49ad5f27a06f55f1f5f399a563e71645/ty-0.0.13-py3-none-win_amd64.whl", hash = "sha256:8b7b1ab9f187affbceff89d51076038363b14113be29bda2ddfa17116de1d476", size = 10319156, upload-time = "2026-01-21T13:21:03.266Z" }, - { url = "https://files.pythonhosted.org/packages/2d/c2/05fdd64ac003a560d4fbd1faa7d9a31d75df8f901675e5bed1ee2ceeff87/ty-0.0.13-py3-none-win_arm64.whl", hash = "sha256:1c9630333497c77bb9bcabba42971b96ee1f36c601dd3dcac66b4134f9fa38f0", size = 9808316, upload-time = "2026-01-21T13:20:54.053Z" }, + { url = "https://files.pythonhosted.org/packages/99/cb/cc6d1d8de59beb17a41f9a614585f884ec2d95450306c173b3b7cc090d2e/ty-0.0.14-py3-none-linux_armv6l.whl", hash = "sha256:32cf2a7596e693094621d3ae568d7ee16707dce28c34d1762947874060fdddaa", size = 10034228, upload-time = "2026-01-27T00:57:53.133Z" }, + { url = "https://files.pythonhosted.org/packages/f3/96/dd42816a2075a8f31542296ae687483a8d047f86a6538dfba573223eaf9a/ty-0.0.14-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:f971bf9805f49ce8c0968ad53e29624d80b970b9eb597b7cbaba25d8a18ce9a2", size = 9939162, upload-time = "2026-01-27T00:57:43.857Z" }, + { url = "https://files.pythonhosted.org/packages/ff/b4/73c4859004e0f0a9eead9ecb67021438b2e8e5fdd8d03e7f5aca77623992/ty-0.0.14-py3-none-macosx_11_0_arm64.whl", hash = "sha256:45448b9e4806423523268bc15e9208c4f3f2ead7c344f615549d2e2354d6e924", size = 9418661, upload-time = "2026-01-27T00:58:03.411Z" }, + { url = "https://files.pythonhosted.org/packages/58/35/839c4551b94613db4afa20ee555dd4f33bfa7352d5da74c5fa416ffa0fd2/ty-0.0.14-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ee94a9b747ff40114085206bdb3205a631ef19a4d3fb89e302a88754cbbae54c", size = 9837872, upload-time = "2026-01-27T00:57:23.718Z" }, + { url = "https://files.pythonhosted.org/packages/41/2b/bbecf7e2faa20c04bebd35fc478668953ca50ee5847ce23e08acf20ea119/ty-0.0.14-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:6756715a3c33182e9ab8ffca2bb314d3c99b9c410b171736e145773ee0ae41c3", size = 9848819, upload-time = "2026-01-27T00:57:58.501Z" }, + { url = "https://files.pythonhosted.org/packages/be/60/3c0ba0f19c0f647ad9d2b5b5ac68c0f0b4dc899001bd53b3a7537fb247a2/ty-0.0.14-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:89d0038a2f698ba8b6fec5cf216a4e44e2f95e4a5095a8c0f57fe549f87087c2", size = 10324371, upload-time = "2026-01-27T00:57:29.291Z" }, + { url = "https://files.pythonhosted.org/packages/24/32/99d0a0b37d0397b0a989ffc2682493286aa3bc252b24004a6714368c2c3d/ty-0.0.14-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2c64a83a2d669b77f50a4957039ca1450626fb474619f18f6f8a3eb885bf7544", size = 10865898, upload-time = "2026-01-27T00:57:33.542Z" }, + { url = "https://files.pythonhosted.org/packages/1a/88/30b583a9e0311bb474269cfa91db53350557ebec09002bfc3fb3fc364e8c/ty-0.0.14-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:242488bfb547ef080199f6fd81369ab9cb638a778bb161511d091ffd49c12129", size = 10555777, upload-time = "2026-01-27T00:58:05.853Z" }, + { url = "https://files.pythonhosted.org/packages/cd/a2/cb53fb6325dcf3d40f2b1d0457a25d55bfbae633c8e337bde8ec01a190eb/ty-0.0.14-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4790c3866f6c83a4f424fc7d09ebdb225c1f1131647ba8bdc6fcdc28f09ed0ff", size = 10412913, upload-time = "2026-01-27T00:57:38.834Z" }, + { url = "https://files.pythonhosted.org/packages/42/8f/f2f5202d725ed1e6a4e5ffaa32b190a1fe70c0b1a2503d38515da4130b4c/ty-0.0.14-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:950f320437f96d4ea9a2332bbfb5b68f1c1acd269ebfa4c09b6970cc1565bd9d", size = 9837608, upload-time = "2026-01-27T00:57:55.898Z" }, + { url = "https://files.pythonhosted.org/packages/f7/ba/59a2a0521640c489dafa2c546ae1f8465f92956fede18660653cce73b4c5/ty-0.0.14-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:4a0ec3ee70d83887f86925bbc1c56f4628bd58a0f47f6f32ddfe04e1f05466df", size = 9884324, upload-time = "2026-01-27T00:57:46.786Z" }, + { url = "https://files.pythonhosted.org/packages/03/95/8d2a49880f47b638743212f011088552ecc454dd7a665ddcbdabea25772a/ty-0.0.14-py3-none-musllinux_1_2_i686.whl", hash = "sha256:a1a4e6b6da0c58b34415955279eff754d6206b35af56a18bb70eb519d8d139ef", size = 10033537, upload-time = "2026-01-27T00:58:01.149Z" }, + { url = "https://files.pythonhosted.org/packages/e9/40/4523b36f2ce69f92ccf783855a9e0ebbbd0f0bb5cdce6211ee1737159ed3/ty-0.0.14-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:dc04384e874c5de4c5d743369c277c8aa73d1edea3c7fc646b2064b637db4db3", size = 10495910, upload-time = "2026-01-27T00:57:26.691Z" }, + { url = "https://files.pythonhosted.org/packages/08/d5/655beb51224d1bfd4f9ddc0bb209659bfe71ff141bcf05c418ab670698f0/ty-0.0.14-py3-none-win32.whl", hash = "sha256:b20e22cf54c66b3e37e87377635da412d9a552c9bf4ad9fc449fed8b2e19dad2", size = 9507626, upload-time = "2026-01-27T00:57:41.43Z" }, + { url = "https://files.pythonhosted.org/packages/b6/d9/c569c9961760e20e0a4bc008eeb1415754564304fd53997a371b7cf3f864/ty-0.0.14-py3-none-win_amd64.whl", hash = "sha256:e312ff9475522d1a33186657fe74d1ec98e4a13e016d66f5758a452c90ff6409", size = 10437980, upload-time = "2026-01-27T00:57:36.422Z" }, + { url = "https://files.pythonhosted.org/packages/ad/0c/186829654f5bfd9a028f6648e9caeb11271960a61de97484627d24443f91/ty-0.0.14-py3-none-win_arm64.whl", hash = "sha256:b6facdbe9b740cb2c15293a1d178e22ffc600653646452632541d01c36d5e378", size = 9885831, upload-time = "2026-01-27T00:57:49.747Z" }, ] [[package]] From 7c78ee87b7b54bb2179d86d5e28c1f65bbf96669 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Mon, 2 Feb 2026 08:07:10 -0800 Subject: [PATCH 114/229] replace natsort with lil function (#3105) * replace natsort with lil function * sort --- .github/workflows/update-cars-docs.yml | 2 +- opendbc/car/docs.py | 17 ++++++++++++----- pyproject.toml | 1 - uv.lock | 11 ----------- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/.github/workflows/update-cars-docs.yml b/.github/workflows/update-cars-docs.yml index bf72e5280f0..1d2adefc66f 100644 --- a/.github/workflows/update-cars-docs.yml +++ b/.github/workflows/update-cars-docs.yml @@ -16,7 +16,7 @@ jobs: run: | pip install -e . scons -c && scons -j$(nproc) - python -m pip install jinja2==3.1.4 natsort==8.4.0 + python -m pip install jinja2==3.1.4 python opendbc/car/docs.py - uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 with: diff --git a/opendbc/car/docs.py b/opendbc/car/docs.py index bfd8964a58c..505de6aeb40 100755 --- a/opendbc/car/docs.py +++ b/opendbc/car/docs.py @@ -1,12 +1,13 @@ #!/usr/bin/env python3 -import argparse +import re import os +import jinja2 +import argparse +import unicodedata from typing import get_args -from collections import defaultdict -import jinja2 from enum import Enum -from natsort import natsorted +from collections import defaultdict from opendbc.car.common.basedir import BASEDIR from opendbc.car import gen_empty_fingerprint @@ -43,6 +44,12 @@ def get_all_footnotes() -> dict[Enum, int]: return {fn: idx + 1 for idx, fn in enumerate(all_footnotes)} +def _natural_sort_key(s): + # NFKD normalization ensures accented characters sort with their base letter (e.g., Š sorts with S) + normalized = unicodedata.normalize('NFKD', s) + return [int(t) if t.isdigit() else t.lower() for t in re.split(r'(\d+)', normalized) if t] + + def build_sorted_car_docs_list(platforms, footnotes=None): collected_car_docs: list[CarDocs | ExtraCarDocs] = [] for platform in platforms.values(): @@ -60,7 +67,7 @@ def build_sorted_car_docs_list(platforms, footnotes=None): collected_car_docs.append(_car_docs) # Sort cars by make and model + year - sorted_cars = natsorted(collected_car_docs, key=lambda car: car.name.lower()) + sorted_cars = sorted(collected_car_docs, key=lambda car: _natural_sort_key(car.name)) return sorted_cars diff --git a/pyproject.toml b/pyproject.toml index d0d3cd27065..206772789cd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,7 +44,6 @@ testing = [ ] docs = [ "Jinja2", - "natsort", ] examples = [ "inputs", diff --git a/uv.lock b/uv.lock index 42c7d21d296..b82dab7304e 100644 --- a/uv.lock +++ b/uv.lock @@ -520,15 +520,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/73/e4/6d6f14b2a759c622f191b2d67e9075a3f56aaccb3be4bb9bb6890030d0a0/matplotlib-3.10.8-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:1ae029229a57cd1e8fe542485f27e7ca7b23aa9e8944ddb4985d0bc444f1eca2", size = 8713867, upload-time = "2025-12-10T22:56:48.954Z" }, ] -[[package]] -name = "natsort" -version = "8.4.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/e2/a9/a0c57aee75f77794adaf35322f8b6404cbd0f89ad45c87197a937764b7d0/natsort-8.4.0.tar.gz", hash = "sha256:45312c4a0e5507593da193dedd04abb1469253b601ecaf63445ad80f0a1ea581", size = 76575, upload-time = "2023-06-20T04:17:19.925Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/ef/82/7a9d0550484a62c6da82858ee9419f3dd1ccc9aa1c26a1e43da3ecd20b0d/natsort-8.4.0-py3-none-any.whl", hash = "sha256:4732914fb471f56b5cce04d7bae6f164a592c7712e1c85f9ef585e197299521c", size = 38268, upload-time = "2023-06-20T04:17:17.522Z" }, -] - [[package]] name = "numpy" version = "2.4.2" @@ -582,7 +573,6 @@ dependencies = [ [package.optional-dependencies] docs = [ { name = "jinja2" }, - { name = "natsort" }, ] examples = [ { name = "inputs" }, @@ -621,7 +611,6 @@ requires-dist = [ { name = "jinja2", marker = "extra == 'docs'" }, { name = "lefthook", marker = "extra == 'testing'" }, { name = "matplotlib", marker = "extra == 'examples'" }, - { name = "natsort", marker = "extra == 'docs'" }, { name = "numpy" }, { name = "parameterized", marker = "extra == 'testing'", specifier = ">=0.8,<0.9" }, { name = "pycapnp", specifier = "==2.1.0" }, From 62567a24080b08c3972198df1f3610e9c89303f8 Mon Sep 17 00:00:00 2001 From: firestar5683 <168790843+firestar5683@users.noreply.github.com> Date: Wed, 4 Feb 2026 15:20:37 -0600 Subject: [PATCH 115/229] Operation GAC (Silverado Tuning) (#3106) * silverado * Update interface.py * quant * Update interface.py --- opendbc/car/gm/interface.py | 6 +++--- opendbc/car/torque_data/override.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/opendbc/car/gm/interface.py b/opendbc/car/gm/interface.py index 1cdb04fae9d..ba276502c8c 100755 --- a/opendbc/car/gm/interface.py +++ b/opendbc/car/gm/interface.py @@ -16,7 +16,7 @@ NON_LINEAR_TORQUE_PARAMS = { CAR.CHEVROLET_BOLT_EUV: [2.6531724862969748, 1.0, 0.1919764879840985, 0.009054123646805178], CAR.GMC_ACADIA: [4.78003305, 1.0, 0.3122, 0.05591772], - CAR.CHEVROLET_SILVERADO: [3.29974374, 1.0, 0.25571356, 0.0465122] + CAR.CHEVROLET_SILVERADO: [3.8, 0.81, 0.24, 0.0465122] } @@ -53,10 +53,10 @@ def torque_from_lateral_accel_siglin_func(lateral_acceleration: float) -> float: # This has big effect on the stability about 0 (noise when going straight) non_linear_torque_params = NON_LINEAR_TORQUE_PARAMS.get(self.CP.carFingerprint) assert non_linear_torque_params, "The params are not defined" - a, b, c, _ = non_linear_torque_params + a, b, c, d = non_linear_torque_params sig_input = a * lateral_acceleration sig = np.sign(sig_input) * (1 / (1 + exp(-fabs(sig_input))) - 0.5) - steer_torque = (sig * b) + (lateral_acceleration * c) + steer_torque = (sig * b) + (lateral_acceleration * c) + d return float(steer_torque) lataccel_values = np.arange(-5.0, 5.0, 0.01) diff --git a/opendbc/car/torque_data/override.toml b/opendbc/car/torque_data/override.toml index d2a6ece905e..5d4bc3577b0 100644 --- a/opendbc/car/torque_data/override.toml +++ b/opendbc/car/torque_data/override.toml @@ -48,7 +48,7 @@ legend = ["LAT_ACCEL_FACTOR", "MAX_LAT_ACCEL_MEASURED", "FRICTION"] "CADILLAC_ESCALADE_ESV_2019" = [1.15, 1.3, 0.2] "CADILLAC_XT4" = [1.45, 1.6, 0.2] "CHEVROLET_BOLT_EUV" = [1.0, 2.0, 0.175] -"CHEVROLET_SILVERADO" = [1.9, 1.9, 0.112] +"CHEVROLET_SILVERADO" = [2.014, 1.9, 0.125] "CHEVROLET_TRAILBLAZER" = [1.33, 1.9, 0.16] "CHEVROLET_TRAVERSE" = [1.33, 1.33, 0.18] "CHEVROLET_EQUINOX" = [2.5, 2.5, 0.05] From 39ee861197edca894fc1b2e28d6fd1a38aea9ca1 Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Thu, 5 Feb 2026 15:13:56 -0500 Subject: [PATCH 116/229] Subaru: Add FW for 2020 Subaru Legacy (#3111) --- opendbc/car/subaru/fingerprints.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/opendbc/car/subaru/fingerprints.py b/opendbc/car/subaru/fingerprints.py index db73598005e..cbce95eed88 100644 --- a/opendbc/car/subaru/fingerprints.py +++ b/opendbc/car/subaru/fingerprints.py @@ -57,6 +57,7 @@ b'\xa1 \x02\x02', b'\xa1 \x03\x02', b'\xa1 \x03\x03', + b'\xa1 \x04\x00', b'\xa1 \x04\x01', b'\xa1 \x04\x02', ], @@ -65,10 +66,12 @@ b'\x9b\xc0\x11\x02', ], (Ecu.fwdCamera, 0x787, None): [ + b'\x00\x00eJ\x00\x1f@ \x19\x00', b'\x00\x00e\x80\x00\x1f@ \x19\x00', b'\x00\x00e\x9a\x00\x00\x00\x00\x00\x00', ], (Ecu.engine, 0x7e0, None): [ + b'\xbc"a@\x07', b'\xde"a0\x07', b'\xde,\xa0@\x07', b'\xe2"a0\x07', From 2ddc95a54f09f4676caaa9acd3cf4149645ac84b Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Thu, 5 Feb 2026 14:07:27 -0800 Subject: [PATCH 117/229] Revert "Operation GAC (Silverado Tuning) (#3106)" This reverts commit 62567a24080b08c3972198df1f3610e9c89303f8. --- opendbc/car/gm/interface.py | 6 +++--- opendbc/car/torque_data/override.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/opendbc/car/gm/interface.py b/opendbc/car/gm/interface.py index ba276502c8c..1cdb04fae9d 100755 --- a/opendbc/car/gm/interface.py +++ b/opendbc/car/gm/interface.py @@ -16,7 +16,7 @@ NON_LINEAR_TORQUE_PARAMS = { CAR.CHEVROLET_BOLT_EUV: [2.6531724862969748, 1.0, 0.1919764879840985, 0.009054123646805178], CAR.GMC_ACADIA: [4.78003305, 1.0, 0.3122, 0.05591772], - CAR.CHEVROLET_SILVERADO: [3.8, 0.81, 0.24, 0.0465122] + CAR.CHEVROLET_SILVERADO: [3.29974374, 1.0, 0.25571356, 0.0465122] } @@ -53,10 +53,10 @@ def torque_from_lateral_accel_siglin_func(lateral_acceleration: float) -> float: # This has big effect on the stability about 0 (noise when going straight) non_linear_torque_params = NON_LINEAR_TORQUE_PARAMS.get(self.CP.carFingerprint) assert non_linear_torque_params, "The params are not defined" - a, b, c, d = non_linear_torque_params + a, b, c, _ = non_linear_torque_params sig_input = a * lateral_acceleration sig = np.sign(sig_input) * (1 / (1 + exp(-fabs(sig_input))) - 0.5) - steer_torque = (sig * b) + (lateral_acceleration * c) + d + steer_torque = (sig * b) + (lateral_acceleration * c) return float(steer_torque) lataccel_values = np.arange(-5.0, 5.0, 0.01) diff --git a/opendbc/car/torque_data/override.toml b/opendbc/car/torque_data/override.toml index 5d4bc3577b0..d2a6ece905e 100644 --- a/opendbc/car/torque_data/override.toml +++ b/opendbc/car/torque_data/override.toml @@ -48,7 +48,7 @@ legend = ["LAT_ACCEL_FACTOR", "MAX_LAT_ACCEL_MEASURED", "FRICTION"] "CADILLAC_ESCALADE_ESV_2019" = [1.15, 1.3, 0.2] "CADILLAC_XT4" = [1.45, 1.6, 0.2] "CHEVROLET_BOLT_EUV" = [1.0, 2.0, 0.175] -"CHEVROLET_SILVERADO" = [2.014, 1.9, 0.125] +"CHEVROLET_SILVERADO" = [1.9, 1.9, 0.112] "CHEVROLET_TRAILBLAZER" = [1.33, 1.9, 0.16] "CHEVROLET_TRAVERSE" = [1.33, 1.33, 0.18] "CHEVROLET_EQUINOX" = [2.5, 2.5, 0.05] From b175ddec756d96ebf40a3cdfae7582ada6483df6 Mon Sep 17 00:00:00 2001 From: firestar5683 <168790843+firestar5683@users.noreply.github.com> Date: Thu, 5 Feb 2026 16:08:04 -0600 Subject: [PATCH 118/229] GM: Sigmoidal Offsets (#3110) * silverado * Update interface.py * quant * Update interface.py * Revert "Update interface.py" This reverts commit 5ef95213e6d71f3cfe2a2ef769c0cd0235f16d10. * Revert "quant" This reverts commit 1cc2aebd9f88b29797c00dd37434fce89c1d5f28. * Revert "silverado" This reverts commit 560d9aa6fced675c656e3377dff19cd4023aea48. --- opendbc/car/gm/interface.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opendbc/car/gm/interface.py b/opendbc/car/gm/interface.py index 1cdb04fae9d..1cb807b279b 100755 --- a/opendbc/car/gm/interface.py +++ b/opendbc/car/gm/interface.py @@ -53,10 +53,10 @@ def torque_from_lateral_accel_siglin_func(lateral_acceleration: float) -> float: # This has big effect on the stability about 0 (noise when going straight) non_linear_torque_params = NON_LINEAR_TORQUE_PARAMS.get(self.CP.carFingerprint) assert non_linear_torque_params, "The params are not defined" - a, b, c, _ = non_linear_torque_params + a, b, c, d = non_linear_torque_params sig_input = a * lateral_acceleration sig = np.sign(sig_input) * (1 / (1 + exp(-fabs(sig_input))) - 0.5) - steer_torque = (sig * b) + (lateral_acceleration * c) + steer_torque = (sig * b) + (lateral_acceleration * c) + d return float(steer_torque) lataccel_values = np.arange(-5.0, 5.0, 0.01) From 05348982cb7b6bc6fed73611ac26ecda658194fc Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 6 Feb 2026 19:50:59 -0800 Subject: [PATCH 119/229] GM: add Silverado FP variant (#3116) add missing --- opendbc/car/gm/fingerprints.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/opendbc/car/gm/fingerprints.py b/opendbc/car/gm/fingerprints.py index 2758e7980c0..d14b3898583 100644 --- a/opendbc/car/gm/fingerprints.py +++ b/opendbc/car/gm/fingerprints.py @@ -51,6 +51,9 @@ }], CAR.CHEVROLET_SILVERADO: [{ 190: 6, 193: 8, 197: 8, 201: 8, 208: 8, 209: 7, 211: 2, 241: 6, 249: 8, 257: 8, 288: 5, 289: 8, 298: 8, 304: 3, 309: 8, 311: 8, 313: 8, 320: 4, 322: 7, 328: 1, 352: 5, 381: 8, 384: 4, 386: 8, 388: 8, 413: 8, 451: 8, 452: 8, 453: 6, 455: 7, 460: 5, 463: 3, 479: 3, 481: 7, 485: 8, 489: 8, 497: 8, 500: 6, 501: 8, 528: 5, 532: 6, 534: 2, 560: 8, 562: 8, 563: 5, 565: 5, 587: 8, 608: 8, 609: 6, 610: 6, 611: 6, 612: 8, 613: 8, 707: 8, 715: 8, 717: 5, 761: 7, 789: 5, 800: 6, 801: 8, 810: 8, 840: 5, 842: 5, 844: 8, 848: 4, 869: 4, 880: 6, 977: 8, 1001: 8, 1011: 6, 1017: 8, 1020: 8, 1033: 7, 1034: 7, 1217: 8, 1221: 5, 1233: 8, 1249: 8, 1259: 8, 1261: 7, 1263: 4, 1265: 8, 1267: 1, 1271: 8, 1280: 4, 1296: 4, 1300: 8, 1611: 8, 1930: 7 + }, + { + 190: 6, 193: 8, 197: 8, 201: 8, 208: 8, 209: 7, 211: 2, 241: 6, 249: 8, 257: 3, 288: 5, 289: 8, 298: 8, 304: 3, 309: 8, 311: 8, 313: 8, 320: 4, 322: 7, 328: 1, 352: 5, 381: 8, 384: 4, 386: 8, 388: 8, 413: 8, 451: 8, 452: 8, 453: 6, 455: 7, 460: 5, 463: 3, 479: 3, 481: 7, 485: 8, 489: 8, 497: 8, 500: 6, 501: 8, 528: 5, 532: 6, 534: 2, 560: 8, 562: 8, 563: 5, 565: 5, 587: 8, 608: 8, 609: 6, 610: 6, 611: 6, 612: 8, 613: 8, 707: 8, 715: 8, 717: 5, 761: 7, 789: 5, 800: 6, 801: 8, 810: 8, 840: 5, 842: 5, 844: 8, 848: 4, 869: 4, 880: 6, 977: 8, 1001: 8, 1011: 6, 1017: 8, 1020: 8, 1033: 7, 1034: 7, 1217: 8, 1221: 5, 1233: 8, 1249: 8, 1259: 8, 1261: 7, 1263: 4, 1265: 8, 1267: 1, 1271: 8, 1280: 4, 1296: 4, 1300: 8, 1611: 8, 1930: 7 }], CAR.CHEVROLET_EQUINOX: [{ 190: 6, 193: 8, 197: 8, 201: 8, 209: 7, 211: 2, 241: 6, 249: 8, 257: 8, 288: 5, 289: 8, 298: 8, 304: 1, 309: 8, 311: 8, 313: 8, 320: 3, 328: 1, 352: 5, 381: 8, 384: 4, 386: 8, 388: 8, 413: 8, 451: 8, 452: 8, 453: 6, 455: 7, 463: 3, 479: 3, 481: 7, 485: 8, 489: 8, 497: 8, 500: 6, 501: 8, 510: 8, 528: 5, 532: 6, 560: 8, 562: 8, 563: 5, 565: 5, 587: 8, 608: 8, 609: 6, 610: 6, 611: 6, 612: 8, 613: 8, 707: 8, 715: 8, 717: 5, 753: 5, 761: 7, 789: 5, 800: 6, 810: 8, 840: 5, 842: 5, 844: 8, 869: 4, 880: 6, 977: 8, 1001: 8, 1011: 6, 1017: 8, 1020: 8, 1033: 7, 1034: 7, 1217: 8, 1221: 5, 1233: 8, 1249: 8, 1259: 8, 1261: 7, 1263: 4, 1265: 8, 1267: 1, 1271: 8, 1280: 4, 1296: 4, 1300: 8, 1611: 8, 1930: 7 From 143e87f3e4565abd1d2d70c32adcb3167d9c64ca Mon Sep 17 00:00:00 2001 From: commaci-public <60409688+commaci-public@users.noreply.github.com> Date: Mon, 9 Feb 2026 09:41:53 -0800 Subject: [PATCH 120/229] [bot] Update uv.lock (#3118) Co-authored-by: Vehicle Researcher --- uv.lock | 143 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 73 insertions(+), 70 deletions(-) diff --git a/uv.lock b/uv.lock index b82dab7304e..9a61a3c7b95 100644 --- a/uv.lock +++ b/uv.lock @@ -181,37 +181,41 @@ wheels = [ [[package]] name = "coverage" -version = "7.13.2" +version = "7.13.4" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/ad/49/349848445b0e53660e258acbcc9b0d014895b6739237920886672240f84b/coverage-7.13.2.tar.gz", hash = "sha256:044c6951ec37146b72a50cc81ef02217d27d4c3640efd2640311393cbbf143d3", size = 826523, upload-time = "2026-01-25T13:00:04.889Z" } +sdist = { url = "https://files.pythonhosted.org/packages/24/56/95b7e30fa389756cb56630faa728da46a27b8c6eb46f9d557c68fff12b65/coverage-7.13.4.tar.gz", hash = "sha256:e5c8f6ed1e61a8b2dcdf31eb0b9bbf0130750ca79c1c49eb898e2ad86f5ccc91", size = 827239, upload-time = "2026-02-09T12:59:03.86Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/6c/01/abca50583a8975bb6e1c59eff67ed8e48bb127c07dad5c28d9e96ccc09ec/coverage-7.13.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:060ebf6f2c51aff5ba38e1f43a2095e087389b1c69d559fde6049a4b0001320e", size = 218971, upload-time = "2026-01-25T12:57:36.953Z" }, - { url = "https://files.pythonhosted.org/packages/eb/0e/b6489f344d99cd1e5b4d5e1be52dfd3f8a3dc5112aa6c33948da8cabad4e/coverage-7.13.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:c1ea8ca9db5e7469cd364552985e15911548ea5b69c48a17291f0cac70484b2e", size = 219473, upload-time = "2026-01-25T12:57:38.934Z" }, - { url = "https://files.pythonhosted.org/packages/17/11/db2f414915a8e4ec53f60b17956c27f21fb68fcf20f8a455ce7c2ccec638/coverage-7.13.2-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:b780090d15fd58f07cf2011943e25a5f0c1c894384b13a216b6c86c8a8a7c508", size = 249896, upload-time = "2026-01-25T12:57:40.365Z" }, - { url = "https://files.pythonhosted.org/packages/80/06/0823fe93913663c017e508e8810c998c8ebd3ec2a5a85d2c3754297bdede/coverage-7.13.2-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:88a800258d83acb803c38175b4495d293656d5fac48659c953c18e5f539a274b", size = 251810, upload-time = "2026-01-25T12:57:42.045Z" }, - { url = "https://files.pythonhosted.org/packages/61/dc/b151c3cc41b28cdf7f0166c5fa1271cbc305a8ec0124cce4b04f74791a18/coverage-7.13.2-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6326e18e9a553e674d948536a04a80d850a5eeefe2aae2e6d7cf05d54046c01b", size = 253920, upload-time = "2026-01-25T12:57:44.026Z" }, - { url = "https://files.pythonhosted.org/packages/2d/35/e83de0556e54a4729a2b94ea816f74ce08732e81945024adee46851c2264/coverage-7.13.2-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:59562de3f797979e1ff07c587e2ac36ba60ca59d16c211eceaa579c266c5022f", size = 250025, upload-time = "2026-01-25T12:57:45.624Z" }, - { url = "https://files.pythonhosted.org/packages/39/67/af2eb9c3926ce3ea0d58a0d2516fcbdacf7a9fc9559fe63076beaf3f2596/coverage-7.13.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:27ba1ed6f66b0e2d61bfa78874dffd4f8c3a12f8e2b5410e515ab345ba7bc9c3", size = 251612, upload-time = "2026-01-25T12:57:47.713Z" }, - { url = "https://files.pythonhosted.org/packages/26/62/5be2e25f3d6c711d23b71296f8b44c978d4c8b4e5b26871abfc164297502/coverage-7.13.2-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:8be48da4d47cc68754ce643ea50b3234557cbefe47c2f120495e7bd0a2756f2b", size = 249670, upload-time = "2026-01-25T12:57:49.378Z" }, - { url = "https://files.pythonhosted.org/packages/b3/51/400d1b09a8344199f9b6a6fc1868005d766b7ea95e7882e494fa862ca69c/coverage-7.13.2-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:2a47a4223d3361b91176aedd9d4e05844ca67d7188456227b6bf5e436630c9a1", size = 249395, upload-time = "2026-01-25T12:57:50.86Z" }, - { url = "https://files.pythonhosted.org/packages/e0/36/f02234bc6e5230e2f0a63fd125d0a2093c73ef20fdf681c7af62a140e4e7/coverage-7.13.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:c6f141b468740197d6bd38f2b26ade124363228cc3f9858bd9924ab059e00059", size = 250298, upload-time = "2026-01-25T12:57:52.287Z" }, - { url = "https://files.pythonhosted.org/packages/b0/06/713110d3dd3151b93611c9cbfc65c15b4156b44f927fced49ac0b20b32a4/coverage-7.13.2-cp311-cp311-win32.whl", hash = "sha256:89567798404af067604246e01a49ef907d112edf2b75ef814b1364d5ce267031", size = 221485, upload-time = "2026-01-25T12:57:53.876Z" }, - { url = "https://files.pythonhosted.org/packages/16/0c/3ae6255fa1ebcb7dec19c9a59e85ef5f34566d1265c70af5b2fc981da834/coverage-7.13.2-cp311-cp311-win_amd64.whl", hash = "sha256:21dd57941804ae2ac7e921771a5e21bbf9aabec317a041d164853ad0a96ce31e", size = 222421, upload-time = "2026-01-25T12:57:55.433Z" }, - { url = "https://files.pythonhosted.org/packages/b5/37/fabc3179af4d61d89ea47bd04333fec735cd5e8b59baad44fed9fc4170d7/coverage-7.13.2-cp311-cp311-win_arm64.whl", hash = "sha256:10758e0586c134a0bafa28f2d37dd2cdb5e4a90de25c0fc0c77dabbad46eca28", size = 221088, upload-time = "2026-01-25T12:57:57.41Z" }, - { url = "https://files.pythonhosted.org/packages/46/39/e92a35f7800222d3f7b2cbb7bbc3b65672ae8d501cb31801b2d2bd7acdf1/coverage-7.13.2-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:f106b2af193f965d0d3234f3f83fc35278c7fb935dfbde56ae2da3dd2c03b84d", size = 219142, upload-time = "2026-01-25T12:58:00.448Z" }, - { url = "https://files.pythonhosted.org/packages/45/7a/8bf9e9309c4c996e65c52a7c5a112707ecdd9fbaf49e10b5a705a402bbb4/coverage-7.13.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:78f45d21dc4d5d6bd29323f0320089ef7eae16e4bef712dff79d184fa7330af3", size = 219503, upload-time = "2026-01-25T12:58:02.451Z" }, - { url = "https://files.pythonhosted.org/packages/87/93/17661e06b7b37580923f3f12406ac91d78aeed293fb6da0b69cc7957582f/coverage-7.13.2-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:fae91dfecd816444c74531a9c3d6ded17a504767e97aa674d44f638107265b99", size = 251006, upload-time = "2026-01-25T12:58:04.059Z" }, - { url = "https://files.pythonhosted.org/packages/12/f0/f9e59fb8c310171497f379e25db060abef9fa605e09d63157eebec102676/coverage-7.13.2-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:264657171406c114787b441484de620e03d8f7202f113d62fcd3d9688baa3e6f", size = 253750, upload-time = "2026-01-25T12:58:05.574Z" }, - { url = "https://files.pythonhosted.org/packages/e5/b1/1935e31add2232663cf7edd8269548b122a7d100047ff93475dbaaae673e/coverage-7.13.2-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ae47d8dcd3ded0155afbb59c62bd8ab07ea0fd4902e1c40567439e6db9dcaf2f", size = 254862, upload-time = "2026-01-25T12:58:07.647Z" }, - { url = "https://files.pythonhosted.org/packages/af/59/b5e97071ec13df5f45da2b3391b6cdbec78ba20757bc92580a5b3d5fa53c/coverage-7.13.2-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:8a0b33e9fd838220b007ce8f299114d406c1e8edb21336af4c97a26ecfd185aa", size = 251420, upload-time = "2026-01-25T12:58:09.309Z" }, - { url = "https://files.pythonhosted.org/packages/3f/75/9495932f87469d013dc515fb0ce1aac5fa97766f38f6b1a1deb1ee7b7f3a/coverage-7.13.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:b3becbea7f3ce9a2d4d430f223ec15888e4deb31395840a79e916368d6004cce", size = 252786, upload-time = "2026-01-25T12:58:10.909Z" }, - { url = "https://files.pythonhosted.org/packages/6a/59/af550721f0eb62f46f7b8cb7e6f1860592189267b1c411a4e3a057caacee/coverage-7.13.2-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:f819c727a6e6eeb8711e4ce63d78c620f69630a2e9d53bc95ca5379f57b6ba94", size = 250928, upload-time = "2026-01-25T12:58:12.449Z" }, - { url = "https://files.pythonhosted.org/packages/9b/b1/21b4445709aae500be4ab43bbcfb4e53dc0811c3396dcb11bf9f23fd0226/coverage-7.13.2-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:4f7b71757a3ab19f7ba286e04c181004c1d61be921795ee8ba6970fd0ec91da5", size = 250496, upload-time = "2026-01-25T12:58:14.047Z" }, - { url = "https://files.pythonhosted.org/packages/ba/b1/0f5d89dfe0392990e4f3980adbde3eb34885bc1effb2dc369e0bf385e389/coverage-7.13.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:b7fc50d2afd2e6b4f6f2f403b70103d280a8e0cb35320cbbe6debcda02a1030b", size = 252373, upload-time = "2026-01-25T12:58:15.976Z" }, - { url = "https://files.pythonhosted.org/packages/01/c9/0cf1a6a57a9968cc049a6b896693faa523c638a5314b1fc374eb2b2ac904/coverage-7.13.2-cp312-cp312-win32.whl", hash = "sha256:292250282cf9bcf206b543d7608bda17ca6fc151f4cbae949fc7e115112fbd41", size = 221696, upload-time = "2026-01-25T12:58:17.517Z" }, - { url = "https://files.pythonhosted.org/packages/4d/05/d7540bf983f09d32803911afed135524570f8c47bb394bf6206c1dc3a786/coverage-7.13.2-cp312-cp312-win_amd64.whl", hash = "sha256:eeea10169fac01549a7921d27a3e517194ae254b542102267bef7a93ed38c40e", size = 222504, upload-time = "2026-01-25T12:58:19.115Z" }, - { url = "https://files.pythonhosted.org/packages/15/8b/1a9f037a736ced0a12aacf6330cdaad5008081142a7070bc58b0f7930cbc/coverage-7.13.2-cp312-cp312-win_arm64.whl", hash = "sha256:2a5b567f0b635b592c917f96b9a9cb3dbd4c320d03f4bf94e9084e494f2e8894", size = 221120, upload-time = "2026-01-25T12:58:21.334Z" }, - { url = "https://files.pythonhosted.org/packages/d2/db/d291e30fdf7ea617a335531e72294e0c723356d7fdde8fba00610a76bda9/coverage-7.13.2-py3-none-any.whl", hash = "sha256:40ce1ea1e25125556d8e76bd0b61500839a07944cc287ac21d5626f3e620cad5", size = 210943, upload-time = "2026-01-25T13:00:02.388Z" }, + { url = "https://files.pythonhosted.org/packages/b4/ad/b59e5b451cf7172b8d1043dc0fa718f23aab379bc1521ee13d4bd9bfa960/coverage-7.13.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d490ba50c3f35dd7c17953c68f3270e7ccd1c6642e2d2afe2d8e720b98f5a053", size = 219278, upload-time = "2026-02-09T12:56:31.673Z" }, + { url = "https://files.pythonhosted.org/packages/f1/17/0cb7ca3de72e5f4ef2ec2fa0089beafbcaaaead1844e8b8a63d35173d77d/coverage-7.13.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:19bc3c88078789f8ef36acb014d7241961dbf883fd2533d18cb1e7a5b4e28b11", size = 219783, upload-time = "2026-02-09T12:56:33.104Z" }, + { url = "https://files.pythonhosted.org/packages/ab/63/325d8e5b11e0eaf6d0f6a44fad444ae58820929a9b0de943fa377fe73e85/coverage-7.13.4-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:3998e5a32e62fdf410c0dbd3115df86297995d6e3429af80b8798aad894ca7aa", size = 250200, upload-time = "2026-02-09T12:56:34.474Z" }, + { url = "https://files.pythonhosted.org/packages/76/53/c16972708cbb79f2942922571a687c52bd109a7bd51175aeb7558dff2236/coverage-7.13.4-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:8e264226ec98e01a8e1054314af91ee6cde0eacac4f465cc93b03dbe0bce2fd7", size = 252114, upload-time = "2026-02-09T12:56:35.749Z" }, + { url = "https://files.pythonhosted.org/packages/eb/c2/7ab36d8b8cc412bec9ea2d07c83c48930eb4ba649634ba00cb7e4e0f9017/coverage-7.13.4-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a3aa4e7b9e416774b21797365b358a6e827ffadaaca81b69ee02946852449f00", size = 254220, upload-time = "2026-02-09T12:56:37.796Z" }, + { url = "https://files.pythonhosted.org/packages/d6/4d/cf52c9a3322c89a0e6febdfbc83bb45c0ed3c64ad14081b9503adee702e7/coverage-7.13.4-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:71ca20079dd8f27fcf808817e281e90220475cd75115162218d0e27549f95fef", size = 256164, upload-time = "2026-02-09T12:56:39.016Z" }, + { url = "https://files.pythonhosted.org/packages/78/e9/eb1dd17bd6de8289df3580e967e78294f352a5df8a57ff4671ee5fc3dcd0/coverage-7.13.4-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e2f25215f1a359ab17320b47bcdaca3e6e6356652e8256f2441e4ef972052903", size = 250325, upload-time = "2026-02-09T12:56:40.668Z" }, + { url = "https://files.pythonhosted.org/packages/71/07/8c1542aa873728f72267c07278c5cc0ec91356daf974df21335ccdb46368/coverage-7.13.4-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:d65b2d373032411e86960604dc4edac91fdfb5dca539461cf2cbe78327d1e64f", size = 251913, upload-time = "2026-02-09T12:56:41.97Z" }, + { url = "https://files.pythonhosted.org/packages/74/d7/c62e2c5e4483a748e27868e4c32ad3daa9bdddbba58e1bc7a15e252baa74/coverage-7.13.4-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:94eb63f9b363180aff17de3e7c8760c3ba94664ea2695c52f10111244d16a299", size = 249974, upload-time = "2026-02-09T12:56:43.323Z" }, + { url = "https://files.pythonhosted.org/packages/98/9f/4c5c015a6e98ced54efd0f5cf8d31b88e5504ecb6857585fc0161bb1e600/coverage-7.13.4-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:e856bf6616714c3a9fbc270ab54103f4e685ba236fa98c054e8f87f266c93505", size = 253741, upload-time = "2026-02-09T12:56:45.155Z" }, + { url = "https://files.pythonhosted.org/packages/bd/59/0f4eef89b9f0fcd9633b5d350016f54126ab49426a70ff4c4e87446cabdc/coverage-7.13.4-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:65dfcbe305c3dfe658492df2d85259e0d79ead4177f9ae724b6fb245198f55d6", size = 249695, upload-time = "2026-02-09T12:56:46.636Z" }, + { url = "https://files.pythonhosted.org/packages/b5/2c/b7476f938deb07166f3eb281a385c262675d688ff4659ad56c6c6b8e2e70/coverage-7.13.4-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:b507778ae8a4c915436ed5c2e05b4a6cecfa70f734e19c22a005152a11c7b6a9", size = 250599, upload-time = "2026-02-09T12:56:48.13Z" }, + { url = "https://files.pythonhosted.org/packages/b8/34/c3420709d9846ee3785b9f2831b4d94f276f38884032dca1457fa83f7476/coverage-7.13.4-cp311-cp311-win32.whl", hash = "sha256:784fc3cf8be001197b652d51d3fd259b1e2262888693a4636e18879f613a62a9", size = 221780, upload-time = "2026-02-09T12:56:50.479Z" }, + { url = "https://files.pythonhosted.org/packages/61/08/3d9c8613079d2b11c185b865de9a4c1a68850cfda2b357fae365cf609f29/coverage-7.13.4-cp311-cp311-win_amd64.whl", hash = "sha256:2421d591f8ca05b308cf0092807308b2facbefe54af7c02ac22548b88b95c98f", size = 222715, upload-time = "2026-02-09T12:56:51.815Z" }, + { url = "https://files.pythonhosted.org/packages/18/1a/54c3c80b2f056164cc0a6cdcb040733760c7c4be9d780fe655f356f433e4/coverage-7.13.4-cp311-cp311-win_arm64.whl", hash = "sha256:79e73a76b854d9c6088fe5d8b2ebe745f8681c55f7397c3c0a016192d681045f", size = 221385, upload-time = "2026-02-09T12:56:53.194Z" }, + { url = "https://files.pythonhosted.org/packages/d1/81/4ce2fdd909c5a0ed1f6dedb88aa57ab79b6d1fbd9b588c1ac7ef45659566/coverage-7.13.4-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:02231499b08dabbe2b96612993e5fc34217cdae907a51b906ac7fca8027a4459", size = 219449, upload-time = "2026-02-09T12:56:54.889Z" }, + { url = "https://files.pythonhosted.org/packages/5d/96/5238b1efc5922ddbdc9b0db9243152c09777804fb7c02ad1741eb18a11c0/coverage-7.13.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40aa8808140e55dc022b15d8aa7f651b6b3d68b365ea0398f1441e0b04d859c3", size = 219810, upload-time = "2026-02-09T12:56:56.33Z" }, + { url = "https://files.pythonhosted.org/packages/78/72/2f372b726d433c9c35e56377cf1d513b4c16fe51841060d826b95caacec1/coverage-7.13.4-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:5b856a8ccf749480024ff3bd7310adaef57bf31fd17e1bfc404b7940b6986634", size = 251308, upload-time = "2026-02-09T12:56:57.858Z" }, + { url = "https://files.pythonhosted.org/packages/5d/a0/2ea570925524ef4e00bb6c82649f5682a77fac5ab910a65c9284de422600/coverage-7.13.4-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:2c048ea43875fbf8b45d476ad79f179809c590ec7b79e2035c662e7afa3192e3", size = 254052, upload-time = "2026-02-09T12:56:59.754Z" }, + { url = "https://files.pythonhosted.org/packages/e8/ac/45dc2e19a1939098d783c846e130b8f862fbb50d09e0af663988f2f21973/coverage-7.13.4-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b7b38448866e83176e28086674fe7368ab8590e4610fb662b44e345b86d63ffa", size = 255165, upload-time = "2026-02-09T12:57:01.287Z" }, + { url = "https://files.pythonhosted.org/packages/2d/4d/26d236ff35abc3b5e63540d3386e4c3b192168c1d96da5cb2f43c640970f/coverage-7.13.4-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:de6defc1c9badbf8b9e67ae90fd00519186d6ab64e5cc5f3d21359c2a9b2c1d3", size = 257432, upload-time = "2026-02-09T12:57:02.637Z" }, + { url = "https://files.pythonhosted.org/packages/ec/55/14a966c757d1348b2e19caf699415a2a4c4f7feaa4bbc6326a51f5c7dd1b/coverage-7.13.4-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:7eda778067ad7ffccd23ecffce537dface96212576a07924cbf0d8799d2ded5a", size = 251716, upload-time = "2026-02-09T12:57:04.056Z" }, + { url = "https://files.pythonhosted.org/packages/77/33/50116647905837c66d28b2af1321b845d5f5d19be9655cb84d4a0ea806b4/coverage-7.13.4-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:e87f6c587c3f34356c3759f0420693e35e7eb0e2e41e4c011cb6ec6ecbbf1db7", size = 253089, upload-time = "2026-02-09T12:57:05.503Z" }, + { url = "https://files.pythonhosted.org/packages/c2/b4/8efb11a46e3665d92635a56e4f2d4529de6d33f2cb38afd47d779d15fc99/coverage-7.13.4-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:8248977c2e33aecb2ced42fef99f2d319e9904a36e55a8a68b69207fb7e43edc", size = 251232, upload-time = "2026-02-09T12:57:06.879Z" }, + { url = "https://files.pythonhosted.org/packages/51/24/8cd73dd399b812cc76bb0ac260e671c4163093441847ffe058ac9fda1e32/coverage-7.13.4-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:25381386e80ae727608e662474db537d4df1ecd42379b5ba33c84633a2b36d47", size = 255299, upload-time = "2026-02-09T12:57:08.245Z" }, + { url = "https://files.pythonhosted.org/packages/03/94/0a4b12f1d0e029ce1ccc1c800944a9984cbe7d678e470bb6d3c6bc38a0da/coverage-7.13.4-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:ee756f00726693e5ba94d6df2bdfd64d4852d23b09bb0bc700e3b30e6f333985", size = 250796, upload-time = "2026-02-09T12:57:10.142Z" }, + { url = "https://files.pythonhosted.org/packages/73/44/6002fbf88f6698ca034360ce474c406be6d5a985b3fdb3401128031eef6b/coverage-7.13.4-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:fdfc1e28e7c7cdce44985b3043bc13bbd9c747520f94a4d7164af8260b3d91f0", size = 252673, upload-time = "2026-02-09T12:57:12.197Z" }, + { url = "https://files.pythonhosted.org/packages/de/c6/a0279f7c00e786be75a749a5674e6fa267bcbd8209cd10c9a450c655dfa7/coverage-7.13.4-cp312-cp312-win32.whl", hash = "sha256:01d4cbc3c283a17fc1e42d614a119f7f438eabb593391283adca8dc86eff1246", size = 221990, upload-time = "2026-02-09T12:57:14.085Z" }, + { url = "https://files.pythonhosted.org/packages/77/4e/c0a25a425fcf5557d9abd18419c95b63922e897bc86c1f327f155ef234a9/coverage-7.13.4-cp312-cp312-win_amd64.whl", hash = "sha256:9401ebc7ef522f01d01d45532c68c5ac40fb27113019b6b7d8b208f6e9baa126", size = 222800, upload-time = "2026-02-09T12:57:15.944Z" }, + { url = "https://files.pythonhosted.org/packages/47/ac/92da44ad9a6f4e3a7debd178949d6f3769bedca33830ce9b1dcdab589a37/coverage-7.13.4-cp312-cp312-win_arm64.whl", hash = "sha256:b1ec7b6b6e93255f952e27ab58fbc68dcc468844b16ecbee881aeb29b6ab4d8d", size = 221415, upload-time = "2026-02-09T12:57:17.497Z" }, + { url = "https://files.pythonhosted.org/packages/0d/4a/331fe2caf6799d591109bb9c08083080f6de90a823695d412a935622abb2/coverage-7.13.4-py3-none-any.whl", hash = "sha256:1af1641e57cf7ba1bd67d677c9abdbcd6cc2ab7da3bca7fa1e2b7e50e65f2ad0", size = 211242, upload-time = "2026-02-09T12:59:02.032Z" }, ] [package.optional-dependencies] @@ -900,28 +904,27 @@ wheels = [ [[package]] name = "ruff" -version = "0.14.14" +version = "0.15.0" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/2e/06/f71e3a86b2df0dfa2d2f72195941cd09b44f87711cb7fa5193732cb9a5fc/ruff-0.14.14.tar.gz", hash = "sha256:2d0f819c9a90205f3a867dbbd0be083bee9912e170fd7d9704cc8ae45824896b", size = 4515732, upload-time = "2026-01-22T22:30:17.527Z" } +sdist = { url = "https://files.pythonhosted.org/packages/c8/39/5cee96809fbca590abea6b46c6d1c586b49663d1d2830a751cc8fc42c666/ruff-0.15.0.tar.gz", hash = "sha256:6bdea47cdbea30d40f8f8d7d69c0854ba7c15420ec75a26f463290949d7f7e9a", size = 4524893, upload-time = "2026-02-03T17:53:35.357Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/d2/89/20a12e97bc6b9f9f68343952da08a8099c57237aef953a56b82711d55edd/ruff-0.14.14-py3-none-linux_armv6l.whl", hash = "sha256:7cfe36b56e8489dee8fbc777c61959f60ec0f1f11817e8f2415f429552846aed", size = 10467650, upload-time = "2026-01-22T22:30:08.578Z" }, - { url = "https://files.pythonhosted.org/packages/a3/b1/c5de3fd2d5a831fcae21beda5e3589c0ba67eec8202e992388e4b17a6040/ruff-0.14.14-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:6006a0082336e7920b9573ef8a7f52eec837add1265cc74e04ea8a4368cd704c", size = 10883245, upload-time = "2026-01-22T22:30:04.155Z" }, - { url = "https://files.pythonhosted.org/packages/b8/7c/3c1db59a10e7490f8f6f8559d1db8636cbb13dccebf18686f4e3c9d7c772/ruff-0.14.14-py3-none-macosx_11_0_arm64.whl", hash = "sha256:026c1d25996818f0bf498636686199d9bd0d9d6341c9c2c3b62e2a0198b758de", size = 10231273, upload-time = "2026-01-22T22:30:34.642Z" }, - { url = "https://files.pythonhosted.org/packages/a1/6e/5e0e0d9674be0f8581d1f5e0f0a04761203affce3232c1a1189d0e3b4dad/ruff-0.14.14-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f666445819d31210b71e0a6d1c01e24447a20b85458eea25a25fe8142210ae0e", size = 10585753, upload-time = "2026-01-22T22:30:31.781Z" }, - { url = "https://files.pythonhosted.org/packages/23/09/754ab09f46ff1884d422dc26d59ba18b4e5d355be147721bb2518aa2a014/ruff-0.14.14-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:3c0f18b922c6d2ff9a5e6c3ee16259adc513ca775bcf82c67ebab7cbd9da5bc8", size = 10286052, upload-time = "2026-01-22T22:30:24.827Z" }, - { url = "https://files.pythonhosted.org/packages/c8/cc/e71f88dd2a12afb5f50733851729d6b571a7c3a35bfdb16c3035132675a0/ruff-0.14.14-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1629e67489c2dea43e8658c3dba659edbfd87361624b4040d1df04c9740ae906", size = 11043637, upload-time = "2026-01-22T22:30:13.239Z" }, - { url = "https://files.pythonhosted.org/packages/67/b2/397245026352494497dac935d7f00f1468c03a23a0c5db6ad8fc49ca3fb2/ruff-0.14.14-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:27493a2131ea0f899057d49d303e4292b2cae2bb57253c1ed1f256fbcd1da480", size = 12194761, upload-time = "2026-01-22T22:30:22.542Z" }, - { url = "https://files.pythonhosted.org/packages/5b/06/06ef271459f778323112c51b7587ce85230785cd64e91772034ddb88f200/ruff-0.14.14-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:01ff589aab3f5b539e35db38425da31a57521efd1e4ad1ae08fc34dbe30bd7df", size = 12005701, upload-time = "2026-01-22T22:30:20.499Z" }, - { url = "https://files.pythonhosted.org/packages/41/d6/99364514541cf811ccc5ac44362f88df66373e9fec1b9d1c4cc830593fe7/ruff-0.14.14-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1cc12d74eef0f29f51775f5b755913eb523546b88e2d733e1d701fe65144e89b", size = 11282455, upload-time = "2026-01-22T22:29:59.679Z" }, - { url = "https://files.pythonhosted.org/packages/ca/71/37daa46f89475f8582b7762ecd2722492df26421714a33e72ccc9a84d7a5/ruff-0.14.14-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bb8481604b7a9e75eff53772496201690ce2687067e038b3cc31aaf16aa0b974", size = 11215882, upload-time = "2026-01-22T22:29:57.032Z" }, - { url = "https://files.pythonhosted.org/packages/2c/10/a31f86169ec91c0705e618443ee74ede0bdd94da0a57b28e72db68b2dbac/ruff-0.14.14-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:14649acb1cf7b5d2d283ebd2f58d56b75836ed8c6f329664fa91cdea19e76e66", size = 11180549, upload-time = "2026-01-22T22:30:27.175Z" }, - { url = "https://files.pythonhosted.org/packages/fd/1e/c723f20536b5163adf79bdd10c5f093414293cdf567eed9bdb7b83940f3f/ruff-0.14.14-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:e8058d2145566510790eab4e2fad186002e288dec5e0d343a92fe7b0bc1b3e13", size = 10543416, upload-time = "2026-01-22T22:30:01.964Z" }, - { url = "https://files.pythonhosted.org/packages/3e/34/8a84cea7e42c2d94ba5bde1d7a4fae164d6318f13f933d92da6d7c2041ff/ruff-0.14.14-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:e651e977a79e4c758eb807f0481d673a67ffe53cfa92209781dfa3a996cf8412", size = 10285491, upload-time = "2026-01-22T22:30:29.51Z" }, - { url = "https://files.pythonhosted.org/packages/55/ef/b7c5ea0be82518906c978e365e56a77f8de7678c8bb6651ccfbdc178c29f/ruff-0.14.14-py3-none-musllinux_1_2_i686.whl", hash = "sha256:cc8b22da8d9d6fdd844a68ae937e2a0adf9b16514e9a97cc60355e2d4b219fc3", size = 10733525, upload-time = "2026-01-22T22:30:06.499Z" }, - { url = "https://files.pythonhosted.org/packages/6a/5b/aaf1dfbcc53a2811f6cc0a1759de24e4b03e02ba8762daabd9b6bd8c59e3/ruff-0.14.14-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:16bc890fb4cc9781bb05beb5ab4cd51be9e7cb376bf1dd3580512b24eb3fda2b", size = 11315626, upload-time = "2026-01-22T22:30:36.848Z" }, - { url = "https://files.pythonhosted.org/packages/2c/aa/9f89c719c467dfaf8ad799b9bae0df494513fb21d31a6059cb5870e57e74/ruff-0.14.14-py3-none-win32.whl", hash = "sha256:b530c191970b143375b6a68e6f743800b2b786bbcf03a7965b06c4bf04568167", size = 10502442, upload-time = "2026-01-22T22:30:38.93Z" }, - { url = "https://files.pythonhosted.org/packages/87/44/90fa543014c45560cae1fffc63ea059fb3575ee6e1cb654562197e5d16fb/ruff-0.14.14-py3-none-win_amd64.whl", hash = "sha256:3dde1435e6b6fe5b66506c1dff67a421d0b7f6488d466f651c07f4cab3bf20fd", size = 11630486, upload-time = "2026-01-22T22:30:10.852Z" }, - { url = "https://files.pythonhosted.org/packages/9e/6a/40fee331a52339926a92e17ae748827270b288a35ef4a15c9c8f2ec54715/ruff-0.14.14-py3-none-win_arm64.whl", hash = "sha256:56e6981a98b13a32236a72a8da421d7839221fa308b223b9283312312e5ac76c", size = 10920448, upload-time = "2026-01-22T22:30:15.417Z" }, + { url = "https://files.pythonhosted.org/packages/bc/88/3fd1b0aa4b6330d6aaa63a285bc96c9f71970351579152d231ed90914586/ruff-0.15.0-py3-none-linux_armv6l.whl", hash = "sha256:aac4ebaa612a82b23d45964586f24ae9bc23ca101919f5590bdb368d74ad5455", size = 10354332, upload-time = "2026-02-03T17:52:54.892Z" }, + { url = "https://files.pythonhosted.org/packages/72/f6/62e173fbb7eb75cc29fe2576a1e20f0a46f671a2587b5f604bfb0eaf5f6f/ruff-0.15.0-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:dcd4be7cc75cfbbca24a98d04d0b9b36a270d0833241f776b788d59f4142b14d", size = 10767189, upload-time = "2026-02-03T17:53:19.778Z" }, + { url = "https://files.pythonhosted.org/packages/99/e4/968ae17b676d1d2ff101d56dc69cf333e3a4c985e1ec23803df84fc7bf9e/ruff-0.15.0-py3-none-macosx_11_0_arm64.whl", hash = "sha256:d747e3319b2bce179c7c1eaad3d884dc0a199b5f4d5187620530adf9105268ce", size = 10075384, upload-time = "2026-02-03T17:53:29.241Z" }, + { url = "https://files.pythonhosted.org/packages/a2/bf/9843c6044ab9e20af879c751487e61333ca79a2c8c3058b15722386b8cae/ruff-0.15.0-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:650bd9c56ae03102c51a5e4b554d74d825ff3abe4db22b90fd32d816c2e90621", size = 10481363, upload-time = "2026-02-03T17:52:43.332Z" }, + { url = "https://files.pythonhosted.org/packages/55/d9/4ada5ccf4cd1f532db1c8d44b6f664f2208d3d93acbeec18f82315e15193/ruff-0.15.0-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:a6664b7eac559e3048223a2da77769c2f92b43a6dfd4720cef42654299a599c9", size = 10187736, upload-time = "2026-02-03T17:53:00.522Z" }, + { url = "https://files.pythonhosted.org/packages/86/e2/f25eaecd446af7bb132af0a1d5b135a62971a41f5366ff41d06d25e77a91/ruff-0.15.0-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6f811f97b0f092b35320d1556f3353bf238763420ade5d9e62ebd2b73f2ff179", size = 10968415, upload-time = "2026-02-03T17:53:15.705Z" }, + { url = "https://files.pythonhosted.org/packages/e7/dc/f06a8558d06333bf79b497d29a50c3a673d9251214e0d7ec78f90b30aa79/ruff-0.15.0-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:761ec0a66680fab6454236635a39abaf14198818c8cdf691e036f4bc0f406b2d", size = 11809643, upload-time = "2026-02-03T17:53:23.031Z" }, + { url = "https://files.pythonhosted.org/packages/dd/45/0ece8db2c474ad7df13af3a6d50f76e22a09d078af63078f005057ca59eb/ruff-0.15.0-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:940f11c2604d317e797b289f4f9f3fa5555ffe4fb574b55ed006c3d9b6f0eb78", size = 11234787, upload-time = "2026-02-03T17:52:46.432Z" }, + { url = "https://files.pythonhosted.org/packages/8a/d9/0e3a81467a120fd265658d127db648e4d3acfe3e4f6f5d4ea79fac47e587/ruff-0.15.0-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bcbca3d40558789126da91d7ef9a7c87772ee107033db7191edefa34e2c7f1b4", size = 11112797, upload-time = "2026-02-03T17:52:49.274Z" }, + { url = "https://files.pythonhosted.org/packages/b2/cb/8c0b3b0c692683f8ff31351dfb6241047fa873a4481a76df4335a8bff716/ruff-0.15.0-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:9a121a96db1d75fa3eb39c4539e607f628920dd72ff1f7c5ee4f1b768ac62d6e", size = 11033133, upload-time = "2026-02-03T17:53:33.105Z" }, + { url = "https://files.pythonhosted.org/packages/f8/5e/23b87370cf0f9081a8c89a753e69a4e8778805b8802ccfe175cc410e50b9/ruff-0.15.0-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:5298d518e493061f2eabd4abd067c7e4fb89e2f63291c94332e35631c07c3662", size = 10442646, upload-time = "2026-02-03T17:53:06.278Z" }, + { url = "https://files.pythonhosted.org/packages/e1/9a/3c94de5ce642830167e6d00b5c75aacd73e6347b4c7fc6828699b150a5ee/ruff-0.15.0-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:afb6e603d6375ff0d6b0cee563fa21ab570fd15e65c852cb24922cef25050cf1", size = 10195750, upload-time = "2026-02-03T17:53:26.084Z" }, + { url = "https://files.pythonhosted.org/packages/30/15/e396325080d600b436acc970848d69df9c13977942fb62bb8722d729bee8/ruff-0.15.0-py3-none-musllinux_1_2_i686.whl", hash = "sha256:77e515f6b15f828b94dc17d2b4ace334c9ddb7d9468c54b2f9ed2b9c1593ef16", size = 10676120, upload-time = "2026-02-03T17:53:09.363Z" }, + { url = "https://files.pythonhosted.org/packages/8d/c9/229a23d52a2983de1ad0fb0ee37d36e0257e6f28bfd6b498ee2c76361874/ruff-0.15.0-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:6f6e80850a01eb13b3e42ee0ebdf6e4497151b48c35051aab51c101266d187a3", size = 11201636, upload-time = "2026-02-03T17:52:57.281Z" }, + { url = "https://files.pythonhosted.org/packages/6f/b0/69adf22f4e24f3677208adb715c578266842e6e6a3cc77483f48dd999ede/ruff-0.15.0-py3-none-win32.whl", hash = "sha256:238a717ef803e501b6d51e0bdd0d2c6e8513fe9eec14002445134d3907cd46c3", size = 10465945, upload-time = "2026-02-03T17:53:12.591Z" }, + { url = "https://files.pythonhosted.org/packages/51/ad/f813b6e2c97e9b4598be25e94a9147b9af7e60523b0cb5d94d307c15229d/ruff-0.15.0-py3-none-win_amd64.whl", hash = "sha256:dd5e4d3301dc01de614da3cdffc33d4b1b96fb89e45721f1598e5532ccf78b18", size = 11564657, upload-time = "2026-02-03T17:52:51.893Z" }, + { url = "https://files.pythonhosted.org/packages/f6/b0/2d823f6e77ebe560f4e397d078487e8d52c1516b331e3521bc75db4272ca/ruff-0.15.0-py3-none-win_arm64.whl", hash = "sha256:c480d632cc0ca3f0727acac8b7d053542d9e114a462a145d0b00e7cd658c515a", size = 10865753, upload-time = "2026-02-03T17:53:03.014Z" }, ] [[package]] @@ -980,38 +983,38 @@ wheels = [ [[package]] name = "tqdm" -version = "4.67.2" +version = "4.67.3" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "colorama", marker = "sys_platform == 'win32'" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/27/89/4b0001b2dab8df0a5ee2787dcbe771de75ded01f18f1f8d53dedeea2882b/tqdm-4.67.2.tar.gz", hash = "sha256:649aac53964b2cb8dec76a14b405a4c0d13612cb8933aae547dd144eacc99653", size = 169514, upload-time = "2026-01-30T23:12:06.555Z" } +sdist = { url = "https://files.pythonhosted.org/packages/09/a9/6ba95a270c6f1fbcd8dac228323f2777d886cb206987444e4bce66338dd4/tqdm-4.67.3.tar.gz", hash = "sha256:7d825f03f89244ef73f1d4ce193cb1774a8179fd96f31d7e1dcde62092b960bb", size = 169598, upload-time = "2026-02-03T17:35:53.048Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/f5/e2/31eac96de2915cf20ccaed0225035db149dfb9165a9ed28d4b252ef3f7f7/tqdm-4.67.2-py3-none-any.whl", hash = "sha256:9a12abcbbff58b6036b2167d9d3853042b9d436fe7330f06ae047867f2f8e0a7", size = 78354, upload-time = "2026-01-30T23:12:04.368Z" }, + { url = "https://files.pythonhosted.org/packages/16/e1/3079a9ff9b8e11b846c6ac5c8b5bfb7ff225eee721825310c91b3b50304f/tqdm-4.67.3-py3-none-any.whl", hash = "sha256:ee1e4c0e59148062281c49d80b25b67771a127c85fc9676d3be5f243206826bf", size = 78374, upload-time = "2026-02-03T17:35:50.982Z" }, ] [[package]] name = "ty" -version = "0.0.14" +version = "0.0.15" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/af/57/22c3d6bf95c2229120c49ffc2f0da8d9e8823755a1c3194da56e51f1cc31/ty-0.0.14.tar.gz", hash = "sha256:a691010565f59dd7f15cf324cdcd1d9065e010c77a04f887e1ea070ba34a7de2", size = 5036573, upload-time = "2026-01-27T00:57:31.427Z" } +sdist = { url = "https://files.pythonhosted.org/packages/4e/25/257602d316b9333089b688a7a11b33ebc660b74e8dacf400dc3dfdea1594/ty-0.0.15.tar.gz", hash = "sha256:4f9a5b8df208c62dba56e91b93bed8b5bb714839691b8cff16d12c983bfa1174", size = 5101936, upload-time = "2026-02-05T01:06:34.922Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/99/cb/cc6d1d8de59beb17a41f9a614585f884ec2d95450306c173b3b7cc090d2e/ty-0.0.14-py3-none-linux_armv6l.whl", hash = "sha256:32cf2a7596e693094621d3ae568d7ee16707dce28c34d1762947874060fdddaa", size = 10034228, upload-time = "2026-01-27T00:57:53.133Z" }, - { url = "https://files.pythonhosted.org/packages/f3/96/dd42816a2075a8f31542296ae687483a8d047f86a6538dfba573223eaf9a/ty-0.0.14-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:f971bf9805f49ce8c0968ad53e29624d80b970b9eb597b7cbaba25d8a18ce9a2", size = 9939162, upload-time = "2026-01-27T00:57:43.857Z" }, - { url = "https://files.pythonhosted.org/packages/ff/b4/73c4859004e0f0a9eead9ecb67021438b2e8e5fdd8d03e7f5aca77623992/ty-0.0.14-py3-none-macosx_11_0_arm64.whl", hash = "sha256:45448b9e4806423523268bc15e9208c4f3f2ead7c344f615549d2e2354d6e924", size = 9418661, upload-time = "2026-01-27T00:58:03.411Z" }, - { url = "https://files.pythonhosted.org/packages/58/35/839c4551b94613db4afa20ee555dd4f33bfa7352d5da74c5fa416ffa0fd2/ty-0.0.14-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ee94a9b747ff40114085206bdb3205a631ef19a4d3fb89e302a88754cbbae54c", size = 9837872, upload-time = "2026-01-27T00:57:23.718Z" }, - { url = "https://files.pythonhosted.org/packages/41/2b/bbecf7e2faa20c04bebd35fc478668953ca50ee5847ce23e08acf20ea119/ty-0.0.14-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:6756715a3c33182e9ab8ffca2bb314d3c99b9c410b171736e145773ee0ae41c3", size = 9848819, upload-time = "2026-01-27T00:57:58.501Z" }, - { url = "https://files.pythonhosted.org/packages/be/60/3c0ba0f19c0f647ad9d2b5b5ac68c0f0b4dc899001bd53b3a7537fb247a2/ty-0.0.14-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:89d0038a2f698ba8b6fec5cf216a4e44e2f95e4a5095a8c0f57fe549f87087c2", size = 10324371, upload-time = "2026-01-27T00:57:29.291Z" }, - { url = "https://files.pythonhosted.org/packages/24/32/99d0a0b37d0397b0a989ffc2682493286aa3bc252b24004a6714368c2c3d/ty-0.0.14-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2c64a83a2d669b77f50a4957039ca1450626fb474619f18f6f8a3eb885bf7544", size = 10865898, upload-time = "2026-01-27T00:57:33.542Z" }, - { url = "https://files.pythonhosted.org/packages/1a/88/30b583a9e0311bb474269cfa91db53350557ebec09002bfc3fb3fc364e8c/ty-0.0.14-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:242488bfb547ef080199f6fd81369ab9cb638a778bb161511d091ffd49c12129", size = 10555777, upload-time = "2026-01-27T00:58:05.853Z" }, - { url = "https://files.pythonhosted.org/packages/cd/a2/cb53fb6325dcf3d40f2b1d0457a25d55bfbae633c8e337bde8ec01a190eb/ty-0.0.14-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4790c3866f6c83a4f424fc7d09ebdb225c1f1131647ba8bdc6fcdc28f09ed0ff", size = 10412913, upload-time = "2026-01-27T00:57:38.834Z" }, - { url = "https://files.pythonhosted.org/packages/42/8f/f2f5202d725ed1e6a4e5ffaa32b190a1fe70c0b1a2503d38515da4130b4c/ty-0.0.14-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:950f320437f96d4ea9a2332bbfb5b68f1c1acd269ebfa4c09b6970cc1565bd9d", size = 9837608, upload-time = "2026-01-27T00:57:55.898Z" }, - { url = "https://files.pythonhosted.org/packages/f7/ba/59a2a0521640c489dafa2c546ae1f8465f92956fede18660653cce73b4c5/ty-0.0.14-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:4a0ec3ee70d83887f86925bbc1c56f4628bd58a0f47f6f32ddfe04e1f05466df", size = 9884324, upload-time = "2026-01-27T00:57:46.786Z" }, - { url = "https://files.pythonhosted.org/packages/03/95/8d2a49880f47b638743212f011088552ecc454dd7a665ddcbdabea25772a/ty-0.0.14-py3-none-musllinux_1_2_i686.whl", hash = "sha256:a1a4e6b6da0c58b34415955279eff754d6206b35af56a18bb70eb519d8d139ef", size = 10033537, upload-time = "2026-01-27T00:58:01.149Z" }, - { url = "https://files.pythonhosted.org/packages/e9/40/4523b36f2ce69f92ccf783855a9e0ebbbd0f0bb5cdce6211ee1737159ed3/ty-0.0.14-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:dc04384e874c5de4c5d743369c277c8aa73d1edea3c7fc646b2064b637db4db3", size = 10495910, upload-time = "2026-01-27T00:57:26.691Z" }, - { url = "https://files.pythonhosted.org/packages/08/d5/655beb51224d1bfd4f9ddc0bb209659bfe71ff141bcf05c418ab670698f0/ty-0.0.14-py3-none-win32.whl", hash = "sha256:b20e22cf54c66b3e37e87377635da412d9a552c9bf4ad9fc449fed8b2e19dad2", size = 9507626, upload-time = "2026-01-27T00:57:41.43Z" }, - { url = "https://files.pythonhosted.org/packages/b6/d9/c569c9961760e20e0a4bc008eeb1415754564304fd53997a371b7cf3f864/ty-0.0.14-py3-none-win_amd64.whl", hash = "sha256:e312ff9475522d1a33186657fe74d1ec98e4a13e016d66f5758a452c90ff6409", size = 10437980, upload-time = "2026-01-27T00:57:36.422Z" }, - { url = "https://files.pythonhosted.org/packages/ad/0c/186829654f5bfd9a028f6648e9caeb11271960a61de97484627d24443f91/ty-0.0.14-py3-none-win_arm64.whl", hash = "sha256:b6facdbe9b740cb2c15293a1d178e22ffc600653646452632541d01c36d5e378", size = 9885831, upload-time = "2026-01-27T00:57:49.747Z" }, + { url = "https://files.pythonhosted.org/packages/ce/c5/35626e732b79bf0e6213de9f79aff59b5f247c0a1e3ce0d93e675ab9b728/ty-0.0.15-py3-none-linux_armv6l.whl", hash = "sha256:68e092458516c61512dac541cde0a5e4e5842df00b4e81881ead8f745ddec794", size = 10138374, upload-time = "2026-02-05T01:07:03.804Z" }, + { url = "https://files.pythonhosted.org/packages/d5/8a/48fd81664604848f79d03879b3ca3633762d457a069b07e09fb1b87edd6e/ty-0.0.15-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:79f2e75289eae3cece94c51118b730211af4ba5762906f52a878041b67e54959", size = 9947858, upload-time = "2026-02-05T01:06:47.453Z" }, + { url = "https://files.pythonhosted.org/packages/b6/85/c1ac8e97bcd930946f4c94db85b675561d590b4e72703bf3733419fc3973/ty-0.0.15-py3-none-macosx_11_0_arm64.whl", hash = "sha256:112a7b26e63e48cc72c8c5b03227d1db280cfa57a45f2df0e264c3a016aa8c3c", size = 9443220, upload-time = "2026-02-05T01:06:44.98Z" }, + { url = "https://files.pythonhosted.org/packages/3c/d9/244bc02599d950f7a4298fbc0c1b25cc808646b9577bdf7a83470b2d1cec/ty-0.0.15-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:71f62a2644972975a657d9dc867bf901235cde51e8d24c20311067e7afd44a56", size = 9949976, upload-time = "2026-02-05T01:07:01.515Z" }, + { url = "https://files.pythonhosted.org/packages/7e/ab/3a0daad66798c91a33867a3ececf17d314ac65d4ae2bbbd28cbfde94da63/ty-0.0.15-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:9e48b42be2d257317c85b78559233273b655dd636fc61e7e1d69abd90fd3cba4", size = 9965918, upload-time = "2026-02-05T01:06:54.283Z" }, + { url = "https://files.pythonhosted.org/packages/39/4e/e62b01338f653059a7c0cd09d1a326e9a9eedc351a0f0de9db0601658c3d/ty-0.0.15-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:27dd5b52a421e6871c5bfe9841160331b60866ed2040250cb161886478ab3e4f", size = 10424943, upload-time = "2026-02-05T01:07:08.777Z" }, + { url = "https://files.pythonhosted.org/packages/65/b5/7aa06655ce69c0d4f3e845d2d85e79c12994b6d84c71699cfb437e0bc8cf/ty-0.0.15-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:76b85c9ec2219e11c358a7db8e21b7e5c6674a1fb9b6f633836949de98d12286", size = 10964692, upload-time = "2026-02-05T01:06:37.103Z" }, + { url = "https://files.pythonhosted.org/packages/13/04/36fdfe1f3c908b471e246e37ce3d011175584c26d3853e6c5d9a0364564c/ty-0.0.15-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a9e8204c61d8ede4f21f2975dce74efdb80fafb2fae1915c666cceb33ea3c90b", size = 10692225, upload-time = "2026-02-05T01:06:49.714Z" }, + { url = "https://files.pythonhosted.org/packages/13/41/5bf882649bd8b64ded5fbce7fb8d77fb3b868de1a3b1a6c4796402b47308/ty-0.0.15-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af87c3be7c944bb4d6609d6c63e4594944b0028c7bd490a525a82b88fe010d6d", size = 10516776, upload-time = "2026-02-05T01:06:52.047Z" }, + { url = "https://files.pythonhosted.org/packages/56/75/66852d7e004f859839c17ffe1d16513c1e7cc04bcc810edb80ca022a9124/ty-0.0.15-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:50dccf7398505e5966847d366c9e4c650b8c225411c2a68c32040a63b9521eea", size = 9928828, upload-time = "2026-02-05T01:06:56.647Z" }, + { url = "https://files.pythonhosted.org/packages/65/72/96bc16c7b337a3ef358fd227b3c8ef0c77405f3bfbbfb59ee5915f0d9d71/ty-0.0.15-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:bd797b8f231a4f4715110259ad1ad5340a87b802307f3e06d92bfb37b858a8f3", size = 9978960, upload-time = "2026-02-05T01:06:29.567Z" }, + { url = "https://files.pythonhosted.org/packages/a0/18/d2e316a35b626de2227f832cd36d21205e4f5d96fd036a8af84c72ecec1b/ty-0.0.15-py3-none-musllinux_1_2_i686.whl", hash = "sha256:9deb7f20e18b25440a9aa4884f934ba5628ef456dbde91819d5af1a73da48af3", size = 10135903, upload-time = "2026-02-05T01:06:59.256Z" }, + { url = "https://files.pythonhosted.org/packages/02/d3/b617a79c9dad10c888d7c15cd78859e0160b8772273637b9c4241a049491/ty-0.0.15-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:7b31b3de031255b90a5f4d9cb3d050feae246067c87130e5a6861a8061c71754", size = 10615879, upload-time = "2026-02-05T01:07:06.661Z" }, + { url = "https://files.pythonhosted.org/packages/fb/b0/2652a73c71c77296a6343217063f05745da60c67b7e8a8e25f2064167fce/ty-0.0.15-py3-none-win32.whl", hash = "sha256:9362c528ceb62c89d65c216336d28d500bc9f4c10418413f63ebc16886e16cc1", size = 9578058, upload-time = "2026-02-05T01:06:42.928Z" }, + { url = "https://files.pythonhosted.org/packages/84/6e/08a4aedebd2a6ce2784b5bc3760e43d1861f1a184734a78215c2d397c1df/ty-0.0.15-py3-none-win_amd64.whl", hash = "sha256:4db040695ae67c5524f59cb8179a8fa277112e69042d7dfdac862caa7e3b0d9c", size = 10457112, upload-time = "2026-02-05T01:06:39.885Z" }, + { url = "https://files.pythonhosted.org/packages/b3/be/1991f2bc12847ae2d4f1e3ac5dcff8bb7bc1261390645c0755bb55616355/ty-0.0.15-py3-none-win_arm64.whl", hash = "sha256:e5a98d4119e77d6136461e16ae505f8f8069002874ab073de03fbcb1a5e8bf25", size = 9937490, upload-time = "2026-02-05T01:06:32.388Z" }, ] [[package]] From 3a1d79868c690b6688a400787bb6efd3f2a0da8d Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Tue, 10 Feb 2026 16:18:10 -0500 Subject: [PATCH 121/229] VW MQB: Add FW for 2020 Audi Q3 (#3121) --- opendbc/car/volkswagen/fingerprints.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/opendbc/car/volkswagen/fingerprints.py b/opendbc/car/volkswagen/fingerprints.py index a9b12184d8a..816d0f433f8 100644 --- a/opendbc/car/volkswagen/fingerprints.py +++ b/opendbc/car/volkswagen/fingerprints.py @@ -927,6 +927,7 @@ (Ecu.engine, 0x7e0, None): [ b'\xf1\x8705E906018N \xf1\x899970', b'\xf1\x8705L906022M \xf1\x890901', + b'\xf1\x875NA906259C \xf1\x890003', b'\xf1\x8783A906259 \xf1\x890001', b'\xf1\x8783A906259 \xf1\x890005', b'\xf1\x8783A906259C \xf1\x890002', @@ -942,6 +943,7 @@ b'\xf1\x8709G927158GP\xf1\x893937', b'\xf1\x8709G927158HC\xf1\x894070', b'\xf1\x8709G927158HG\xf1\x894168', + b'\xf1\x870DW300011C \xf1\x892401', b'\xf1\x870GC300045D \xf1\x892802', b'\xf1\x870GC300046F \xf1\x892701', ], @@ -951,6 +953,7 @@ b'\xf1\x875Q0959655BQ\xf1\x890421\xf1\x82\x132121111121120031112124218C219321532111', b'\xf1\x875Q0959655CC\xf1\x890421\xf1\x82\x131111111111120031111224118A119321532111', b'\xf1\x875Q0959655CC\xf1\x890421\xf1\x82\x131111111111120031111237116A119321532111', + b'\xf1\x875QD959655AH\xf1\x890403\xf1\x82\x1311110011311100313131013150319321422100', ], (Ecu.eps, 0x712, None): [ b'\xf1\x875Q0910143C \xf1\x892211\xf1\x82\x0567G6000300', @@ -964,6 +967,7 @@ (Ecu.fwdRadar, 0x757, None): [ b'\xf1\x872Q0907567C \xf1\x890541', b'\xf1\x872Q0907572AA\xf1\x890396', + b'\xf1\x872Q0907572AB\xf1\x890397', b'\xf1\x872Q0907572R \xf1\x890372', b'\xf1\x872Q0907572T \xf1\x890383', ], From 245cb1f2056071a7625e2ad7e4515f57784515bd Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Tue, 10 Feb 2026 16:33:08 -0500 Subject: [PATCH 122/229] VW MQB: Add WMI for FAW-Volkswagen in China (#3122) * VW MQB: Add FAW-Volkswagen China WMI * allow FAW-Volkswagen manufacturer for Audi Q3 * also A3 and Q2 --- opendbc/car/volkswagen/values.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/opendbc/car/volkswagen/values.py b/opendbc/car/volkswagen/values.py index 62bd4ff913e..a73076b2a80 100644 --- a/opendbc/car/volkswagen/values.py +++ b/opendbc/car/volkswagen/values.py @@ -162,6 +162,7 @@ class WMI(StrEnum): VOLKSWAGEN_MEXICO_CAR = "3VW" VOLKSWAGEN_ARGENTINA = "8AW" VOLKSWAGEN_BRASIL = "9BW" + VOLKSWAGEN_CHINA_FAW = "LFV" SAIC_VOLKSWAGEN = "LSV" SKODA = "TMB" SEAT = "VSS" @@ -427,19 +428,19 @@ class CAR(Platforms): ], VolkswagenCarSpecs(mass=1335, wheelbase=2.61), chassis_codes={"8V", "FF"}, - wmis={WMI.AUDI_GERMANY_CAR, WMI.AUDI_SPORT}, + wmis={WMI.AUDI_GERMANY_CAR, WMI.AUDI_SPORT, WMI.VOLKSWAGEN_CHINA_FAW}, ) AUDI_Q2_MK1 = VolkswagenMQBPlatformConfig( [VWCarDocs("Audi Q2 2018")], VolkswagenCarSpecs(mass=1205, wheelbase=2.61), chassis_codes={"GA"}, - wmis={WMI.AUDI_GERMANY_CAR}, + wmis={WMI.AUDI_GERMANY_CAR, WMI.VOLKSWAGEN_CHINA_FAW}, ) AUDI_Q3_MK2 = VolkswagenMQBPlatformConfig( [VWCarDocs("Audi Q3 2019-24")], VolkswagenCarSpecs(mass=1623, wheelbase=2.68), chassis_codes={"8U", "F3", "FS"}, - wmis={WMI.AUDI_EUROPE_MPV, WMI.AUDI_GERMANY_CAR}, + wmis={WMI.AUDI_EUROPE_MPV, WMI.AUDI_GERMANY_CAR, WMI.VOLKSWAGEN_CHINA_FAW}, ) PORSCHE_MACAN_MK1 = VolkswagenMLBPlatformConfig( [VWCarDocs("Porsche Macan 2017-24")], From 4fdadc8805960a220a4cc38a4d51906954070d12 Mon Sep 17 00:00:00 2001 From: T3vl <80123588+tealtwo@users.noreply.github.com> Date: Sun, 15 Feb 2026 13:44:37 -0600 Subject: [PATCH 123/229] VW: Rename aux bus to alt (#3127) * VW: Add mapping for bus 1 to fix card crash when parsed in CANParser The VW carport by default maps internal panda bus 1 to "aux", when this is added to the CANParser in carstate it causes a crash unless it is defined here, another solution would be just renaming the bus inside values.py if we don't want to update init. * VW: update bus 1 variable * revert --- opendbc/car/volkswagen/values.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendbc/car/volkswagen/values.py b/opendbc/car/volkswagen/values.py index a73076b2a80..5aca8aa5b6b 100644 --- a/opendbc/car/volkswagen/values.py +++ b/opendbc/car/volkswagen/values.py @@ -30,7 +30,7 @@ def pt(self) -> int: return self.offset @property - def aux(self) -> int: + def alt(self) -> int: # NetworkLocation.fwdCamera: radar-camera object fusion CAN # NetworkLocation.gateway: powertrain CAN return self.offset + 1 From 647441e42db5735e249344449ad857eeeeff7224 Mon Sep 17 00:00:00 2001 From: MVL Date: Sun, 15 Feb 2026 20:52:15 -0500 Subject: [PATCH 124/229] Honda - Add 2020 Civic Si fingerprints (#3120) Add 2020 Civic Si fingerprints --- opendbc/car/honda/fingerprints.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/opendbc/car/honda/fingerprints.py b/opendbc/car/honda/fingerprints.py index 0080610534f..28b842ffd66 100644 --- a/opendbc/car/honda/fingerprints.py +++ b/opendbc/car/honda/fingerprints.py @@ -216,6 +216,7 @@ b'28101-5DV-E820\x00\x00', ], (Ecu.vsa, 0x18da28f1, None): [ + b'57114-TBF-L130\x00\x00', b'57114-TBG-A330\x00\x00', b'57114-TBG-A340\x00\x00', b'57114-TBG-A350\x00\x00', @@ -234,6 +235,7 @@ (Ecu.eps, 0x18da30f1, None): [ b'39990-TBA-C020\x00\x00', b'39990-TBA-C120\x00\x00', + b'39990-TBF-A610\x00\x00', b'39990-TEA-T330\x00\x00', b'39990-TEA-T820\x00\x00', b'39990-TEZ-T020\x00\x00', @@ -248,6 +250,7 @@ (Ecu.srs, 0x18da53f1, None): [ b'77959-TBA-A060\x00\x00', b'77959-TBG-A050\x00\x00', + b'77959-TBJ-A030\x00\x00', b'77959-TEA-G020\x00\x00', b'77959-TGG-A020\x00\x00', b'77959-TGG-A030\x00\x00', @@ -279,6 +282,7 @@ (Ecu.fwdCamera, 0x18dab5f1, None): [ b'36161-TBA-A130\x00\x00', b'36161-TBA-A140\x00\x00', + b'36161-TBJ-A020\x00\x00', b'36161-TFJ-G070\x00\x00', b'36161-TGG-A060\x00\x00', b'36161-TGG-A080\x00\x00', From 1741c2f99a6697254b1ed717fc418402edf08b49 Mon Sep 17 00:00:00 2001 From: MVL Date: Mon, 16 Feb 2026 10:37:59 -0500 Subject: [PATCH 125/229] Honda - Brazil HRV fingerprint (#2941) Adding HRV_3G fingerprints Co-authored-by: Daniel Koepping Co-authored-by: Jason Young <46612682+jyoung8607@users.noreply.github.com> --- opendbc/car/honda/fingerprints.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/opendbc/car/honda/fingerprints.py b/opendbc/car/honda/fingerprints.py index 28b842ffd66..08662f38d95 100644 --- a/opendbc/car/honda/fingerprints.py +++ b/opendbc/car/honda/fingerprints.py @@ -861,16 +861,19 @@ CAR.HONDA_HRV_3G: { (Ecu.eps, 0x18da30f1, None): [ b'39990-3M0-G110\x00\x00', + b'39990-3M0-G610\x00\x00', b'39990-3M0-J030\x00\x00', b'39990-3W0-A030\x00\x00', ], (Ecu.gateway, 0x18daeff1, None): [ b'38897-3M0-M110\x00\x00', + b'38897-3M0-M210\x00\x00', b'38897-3M0-Z010\x00\x00', b'38897-3W1-A010\x00\x00', ], (Ecu.srs, 0x18da53f1, None): [ b'77959-3M0-K840\x00\x00', + b'77959-3M0-K910\x00\x00', b'77959-3N1-Z840\x00\x00', b'77959-3V0-A820\x00\x00', b'77959-3V0-A910\x00\x00', @@ -893,8 +896,10 @@ b'28101-6EH-A010\x00\x00', b'28101-6EH-A110\x00\x00', b'28101-6JC-M310\x00\x00', + b'28101-6JH-M110\x00\x00', ], (Ecu.electricBrakeBooster, 0x18da2bf1, None): [ + b'39494-3L4-P030\x00\x00', b'46114-3W0-A020\x00\x00', b'46114-3W0-A050\x00\x00', ], From 817dc1a52a063b206166e316c3be42c709b5c62a Mon Sep 17 00:00:00 2001 From: commaci-public <60409688+commaci-public@users.noreply.github.com> Date: Mon, 16 Feb 2026 08:10:42 -0800 Subject: [PATCH 126/229] [bot] Update uv.lock (#3133) Co-authored-by: Vehicle Researcher --- uv.lock | 136 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 68 insertions(+), 68 deletions(-) diff --git a/uv.lock b/uv.lock index 9a61a3c7b95..64f2abc768d 100644 --- a/uv.lock +++ b/uv.lock @@ -653,39 +653,39 @@ wheels = [ [[package]] name = "pillow" -version = "12.1.0" +version = "12.1.1" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/d0/02/d52c733a2452ef1ffcc123b68e6606d07276b0e358db70eabad7e40042b7/pillow-12.1.0.tar.gz", hash = "sha256:5c5ae0a06e9ea030ab786b0251b32c7e4ce10e58d983c0d5c56029455180b5b9", size = 46977283, upload-time = "2026-01-02T09:13:29.892Z" } +sdist = { url = "https://files.pythonhosted.org/packages/1f/42/5c74462b4fd957fcd7b13b04fb3205ff8349236ea74c7c375766d6c82288/pillow-12.1.1.tar.gz", hash = "sha256:9ad8fa5937ab05218e2b6a4cff30295ad35afd2f83ac592e68c0d871bb0fdbc4", size = 46980264, upload-time = "2026-02-11T04:23:07.146Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/43/c4/bf8328039de6cc22182c3ef007a2abfbbdab153661c0a9aa78af8d706391/pillow-12.1.0-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:a83e0850cb8f5ac975291ebfc4170ba481f41a28065277f7f735c202cd8e0af3", size = 5304057, upload-time = "2026-01-02T09:10:46.627Z" }, - { url = "https://files.pythonhosted.org/packages/43/06/7264c0597e676104cc22ca73ee48f752767cd4b1fe084662620b17e10120/pillow-12.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:b6e53e82ec2db0717eabb276aa56cf4e500c9a7cec2c2e189b55c24f65a3e8c0", size = 4657811, upload-time = "2026-01-02T09:10:49.548Z" }, - { url = "https://files.pythonhosted.org/packages/72/64/f9189e44474610daf83da31145fa56710b627b5c4c0b9c235e34058f6b31/pillow-12.1.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:40a8e3b9e8773876d6e30daed22f016509e3987bab61b3b7fe309d7019a87451", size = 6232243, upload-time = "2026-01-02T09:10:51.62Z" }, - { url = "https://files.pythonhosted.org/packages/ef/30/0df458009be6a4caca4ca2c52975e6275c387d4e5c95544e34138b41dc86/pillow-12.1.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:800429ac32c9b72909c671aaf17ecd13110f823ddb7db4dfef412a5587c2c24e", size = 8037872, upload-time = "2026-01-02T09:10:53.446Z" }, - { url = "https://files.pythonhosted.org/packages/e4/86/95845d4eda4f4f9557e25381d70876aa213560243ac1a6d619c46caaedd9/pillow-12.1.0-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0b022eaaf709541b391ee069f0022ee5b36c709df71986e3f7be312e46f42c84", size = 6345398, upload-time = "2026-01-02T09:10:55.426Z" }, - { url = "https://files.pythonhosted.org/packages/5c/1f/8e66ab9be3aaf1435bc03edd1ebdf58ffcd17f7349c1d970cafe87af27d9/pillow-12.1.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1f345e7bc9d7f368887c712aa5054558bad44d2a301ddf9248599f4161abc7c0", size = 7034667, upload-time = "2026-01-02T09:10:57.11Z" }, - { url = "https://files.pythonhosted.org/packages/f9/f6/683b83cb9b1db1fb52b87951b1c0b99bdcfceaa75febf11406c19f82cb5e/pillow-12.1.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:d70347c8a5b7ccd803ec0c85c8709f036e6348f1e6a5bf048ecd9c64d3550b8b", size = 6458743, upload-time = "2026-01-02T09:10:59.331Z" }, - { url = "https://files.pythonhosted.org/packages/9a/7d/de833d63622538c1d58ce5395e7c6cb7e7dce80decdd8bde4a484e095d9f/pillow-12.1.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:1fcc52d86ce7a34fd17cb04e87cfdb164648a3662a6f20565910a99653d66c18", size = 7159342, upload-time = "2026-01-02T09:11:01.82Z" }, - { url = "https://files.pythonhosted.org/packages/8c/40/50d86571c9e5868c42b81fe7da0c76ca26373f3b95a8dd675425f4a92ec1/pillow-12.1.0-cp311-cp311-win32.whl", hash = "sha256:3ffaa2f0659e2f740473bcf03c702c39a8d4b2b7ffc629052028764324842c64", size = 6328655, upload-time = "2026-01-02T09:11:04.556Z" }, - { url = "https://files.pythonhosted.org/packages/6c/af/b1d7e301c4cd26cd45d4af884d9ee9b6fab893b0ad2450d4746d74a6968c/pillow-12.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:806f3987ffe10e867bab0ddad45df1148a2b98221798457fa097ad85d6e8bc75", size = 7031469, upload-time = "2026-01-02T09:11:06.538Z" }, - { url = "https://files.pythonhosted.org/packages/48/36/d5716586d887fb2a810a4a61518a327a1e21c8b7134c89283af272efe84b/pillow-12.1.0-cp311-cp311-win_arm64.whl", hash = "sha256:9f5fefaca968e700ad1a4a9de98bf0869a94e397fe3524c4c9450c1445252304", size = 2452515, upload-time = "2026-01-02T09:11:08.226Z" }, - { url = "https://files.pythonhosted.org/packages/20/31/dc53fe21a2f2996e1b7d92bf671cdb157079385183ef7c1ae08b485db510/pillow-12.1.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:a332ac4ccb84b6dde65dbace8431f3af08874bf9770719d32a635c4ef411b18b", size = 5262642, upload-time = "2026-01-02T09:11:10.138Z" }, - { url = "https://files.pythonhosted.org/packages/ab/c1/10e45ac9cc79419cedf5121b42dcca5a50ad2b601fa080f58c22fb27626e/pillow-12.1.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:907bfa8a9cb790748a9aa4513e37c88c59660da3bcfffbd24a7d9e6abf224551", size = 4657464, upload-time = "2026-01-02T09:11:12.319Z" }, - { url = "https://files.pythonhosted.org/packages/ad/26/7b82c0ab7ef40ebede7a97c72d473bda5950f609f8e0c77b04af574a0ddb/pillow-12.1.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:efdc140e7b63b8f739d09a99033aa430accce485ff78e6d311973a67b6bf3208", size = 6234878, upload-time = "2026-01-02T09:11:14.096Z" }, - { url = "https://files.pythonhosted.org/packages/76/25/27abc9792615b5e886ca9411ba6637b675f1b77af3104710ac7353fe5605/pillow-12.1.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:bef9768cab184e7ae6e559c032e95ba8d07b3023c289f79a2bd36e8bf85605a5", size = 8044868, upload-time = "2026-01-02T09:11:15.903Z" }, - { url = "https://files.pythonhosted.org/packages/0a/ea/f200a4c36d836100e7bc738fc48cd963d3ba6372ebc8298a889e0cfc3359/pillow-12.1.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:742aea052cf5ab5034a53c3846165bc3ce88d7c38e954120db0ab867ca242661", size = 6349468, upload-time = "2026-01-02T09:11:17.631Z" }, - { url = "https://files.pythonhosted.org/packages/11/8f/48d0b77ab2200374c66d344459b8958c86693be99526450e7aee714e03e4/pillow-12.1.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a6dfc2af5b082b635af6e08e0d1f9f1c4e04d17d4e2ca0ef96131e85eda6eb17", size = 7041518, upload-time = "2026-01-02T09:11:19.389Z" }, - { url = "https://files.pythonhosted.org/packages/1d/23/c281182eb986b5d31f0a76d2a2c8cd41722d6fb8ed07521e802f9bba52de/pillow-12.1.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:609e89d9f90b581c8d16358c9087df76024cf058fa693dd3e1e1620823f39670", size = 6462829, upload-time = "2026-01-02T09:11:21.28Z" }, - { url = "https://files.pythonhosted.org/packages/25/ef/7018273e0faac099d7b00982abdcc39142ae6f3bd9ceb06de09779c4a9d6/pillow-12.1.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:43b4899cfd091a9693a1278c4982f3e50f7fb7cff5153b05174b4afc9593b616", size = 7166756, upload-time = "2026-01-02T09:11:23.559Z" }, - { url = "https://files.pythonhosted.org/packages/8f/c8/993d4b7ab2e341fe02ceef9576afcf5830cdec640be2ac5bee1820d693d4/pillow-12.1.0-cp312-cp312-win32.whl", hash = "sha256:aa0c9cc0b82b14766a99fbe6084409972266e82f459821cd26997a488a7261a7", size = 6328770, upload-time = "2026-01-02T09:11:25.661Z" }, - { url = "https://files.pythonhosted.org/packages/a7/87/90b358775a3f02765d87655237229ba64a997b87efa8ccaca7dd3e36e7a7/pillow-12.1.0-cp312-cp312-win_amd64.whl", hash = "sha256:d70534cea9e7966169ad29a903b99fc507e932069a881d0965a1a84bb57f6c6d", size = 7033406, upload-time = "2026-01-02T09:11:27.474Z" }, - { url = "https://files.pythonhosted.org/packages/5d/cf/881b457eccacac9e5b2ddd97d5071fb6d668307c57cbf4e3b5278e06e536/pillow-12.1.0-cp312-cp312-win_arm64.whl", hash = "sha256:65b80c1ee7e14a87d6a068dd3b0aea268ffcabfe0498d38661b00c5b4b22e74c", size = 2452612, upload-time = "2026-01-02T09:11:29.309Z" }, - { url = "https://files.pythonhosted.org/packages/8b/bc/224b1d98cffd7164b14707c91aac83c07b047fbd8f58eba4066a3e53746a/pillow-12.1.0-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:ca94b6aac0d7af2a10ba08c0f888b3d5114439b6b3ef39968378723622fed377", size = 5228605, upload-time = "2026-01-02T09:13:14.084Z" }, - { url = "https://files.pythonhosted.org/packages/0c/ca/49ca7769c4550107de049ed85208240ba0f330b3f2e316f24534795702ce/pillow-12.1.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:351889afef0f485b84078ea40fe33727a0492b9af3904661b0abbafee0355b72", size = 4622245, upload-time = "2026-01-02T09:13:15.964Z" }, - { url = "https://files.pythonhosted.org/packages/73/48/fac807ce82e5955bcc2718642b94b1bd22a82a6d452aea31cbb678cddf12/pillow-12.1.0-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:bb0984b30e973f7e2884362b7d23d0a348c7143ee559f38ef3eaab640144204c", size = 5247593, upload-time = "2026-01-02T09:13:17.913Z" }, - { url = "https://files.pythonhosted.org/packages/d2/95/3e0742fe358c4664aed4fd05d5f5373dcdad0b27af52aa0972568541e3f4/pillow-12.1.0-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:84cabc7095dd535ca934d57e9ce2a72ffd216e435a84acb06b2277b1de2689bd", size = 6989008, upload-time = "2026-01-02T09:13:20.083Z" }, - { url = "https://files.pythonhosted.org/packages/5a/74/fe2ac378e4e202e56d50540d92e1ef4ff34ed687f3c60f6a121bcf99437e/pillow-12.1.0-pp311-pypy311_pp73-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:53d8b764726d3af1a138dd353116f774e3862ec7e3794e0c8781e30db0f35dfc", size = 5313824, upload-time = "2026-01-02T09:13:22.405Z" }, - { url = "https://files.pythonhosted.org/packages/f3/77/2a60dee1adee4e2655ac328dd05c02a955c1cd683b9f1b82ec3feb44727c/pillow-12.1.0-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5da841d81b1a05ef940a8567da92decaa15bc4d7dedb540a8c219ad83d91808a", size = 5963278, upload-time = "2026-01-02T09:13:24.706Z" }, - { url = "https://files.pythonhosted.org/packages/2d/71/64e9b1c7f04ae0027f788a248e6297d7fcc29571371fe7d45495a78172c0/pillow-12.1.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:75af0b4c229ac519b155028fa1be632d812a519abba9b46b20e50c6caa184f19", size = 7029809, upload-time = "2026-01-02T09:13:26.541Z" }, + { url = "https://files.pythonhosted.org/packages/2b/46/5da1ec4a5171ee7bf1a0efa064aba70ba3d6e0788ce3f5acd1375d23c8c0/pillow-12.1.1-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:e879bb6cd5c73848ef3b2b48b8af9ff08c5b71ecda8048b7dd22d8a33f60be32", size = 5304084, upload-time = "2026-02-11T04:20:27.501Z" }, + { url = "https://files.pythonhosted.org/packages/78/93/a29e9bc02d1cf557a834da780ceccd54e02421627200696fcf805ebdc3fb/pillow-12.1.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:365b10bb9417dd4498c0e3b128018c4a624dc11c7b97d8cc54effe3b096f4c38", size = 4657866, upload-time = "2026-02-11T04:20:29.827Z" }, + { url = "https://files.pythonhosted.org/packages/13/84/583a4558d492a179d31e4aae32eadce94b9acf49c0337c4ce0b70e0a01f2/pillow-12.1.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:d4ce8e329c93845720cd2014659ca67eac35f6433fd3050393d85f3ecef0dad5", size = 6232148, upload-time = "2026-02-11T04:20:31.329Z" }, + { url = "https://files.pythonhosted.org/packages/d5/e2/53c43334bbbb2d3b938978532fbda8e62bb6e0b23a26ce8592f36bcc4987/pillow-12.1.1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:fc354a04072b765eccf2204f588a7a532c9511e8b9c7f900e1b64e3e33487090", size = 8038007, upload-time = "2026-02-11T04:20:34.225Z" }, + { url = "https://files.pythonhosted.org/packages/b8/a6/3d0e79c8a9d58150dd98e199d7c1c56861027f3829a3a60b3c2784190180/pillow-12.1.1-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7e7976bf1910a8116b523b9f9f58bf410f3e8aa330cd9a2bb2953f9266ab49af", size = 6345418, upload-time = "2026-02-11T04:20:35.858Z" }, + { url = "https://files.pythonhosted.org/packages/a2/c8/46dfeac5825e600579157eea177be43e2f7ff4a99da9d0d0a49533509ac5/pillow-12.1.1-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:597bd9c8419bc7c6af5604e55847789b69123bbe25d65cc6ad3012b4f3c98d8b", size = 7034590, upload-time = "2026-02-11T04:20:37.91Z" }, + { url = "https://files.pythonhosted.org/packages/af/bf/e6f65d3db8a8bbfeaf9e13cc0417813f6319863a73de934f14b2229ada18/pillow-12.1.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:2c1fc0f2ca5f96a3c8407e41cca26a16e46b21060fe6d5b099d2cb01412222f5", size = 6458655, upload-time = "2026-02-11T04:20:39.496Z" }, + { url = "https://files.pythonhosted.org/packages/f9/c2/66091f3f34a25894ca129362e510b956ef26f8fb67a0e6417bc5744e56f1/pillow-12.1.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:578510d88c6229d735855e1f278aa305270438d36a05031dfaae5067cc8eb04d", size = 7159286, upload-time = "2026-02-11T04:20:41.139Z" }, + { url = "https://files.pythonhosted.org/packages/7b/5a/24bc8eb526a22f957d0cec6243146744966d40857e3d8deb68f7902ca6c1/pillow-12.1.1-cp311-cp311-win32.whl", hash = "sha256:7311c0a0dcadb89b36b7025dfd8326ecfa36964e29913074d47382706e516a7c", size = 6328663, upload-time = "2026-02-11T04:20:43.184Z" }, + { url = "https://files.pythonhosted.org/packages/31/03/bef822e4f2d8f9d7448c133d0a18185d3cce3e70472774fffefe8b0ed562/pillow-12.1.1-cp311-cp311-win_amd64.whl", hash = "sha256:fbfa2a7c10cc2623f412753cddf391c7f971c52ca40a3f65dc5039b2939e8563", size = 7031448, upload-time = "2026-02-11T04:20:44.696Z" }, + { url = "https://files.pythonhosted.org/packages/49/70/f76296f53610bd17b2e7d31728b8b7825e3ac3b5b3688b51f52eab7c0818/pillow-12.1.1-cp311-cp311-win_arm64.whl", hash = "sha256:b81b5e3511211631b3f672a595e3221252c90af017e399056d0faabb9538aa80", size = 2453651, upload-time = "2026-02-11T04:20:46.243Z" }, + { url = "https://files.pythonhosted.org/packages/07/d3/8df65da0d4df36b094351dce696f2989bec731d4f10e743b1c5f4da4d3bf/pillow-12.1.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:ab323b787d6e18b3d91a72fc99b1a2c28651e4358749842b8f8dfacd28ef2052", size = 5262803, upload-time = "2026-02-11T04:20:47.653Z" }, + { url = "https://files.pythonhosted.org/packages/d6/71/5026395b290ff404b836e636f51d7297e6c83beceaa87c592718747e670f/pillow-12.1.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:adebb5bee0f0af4909c30db0d890c773d1a92ffe83da908e2e9e720f8edf3984", size = 4657601, upload-time = "2026-02-11T04:20:49.328Z" }, + { url = "https://files.pythonhosted.org/packages/b1/2e/1001613d941c67442f745aff0f7cc66dd8df9a9c084eb497e6a543ee6f7e/pillow-12.1.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:bb66b7cc26f50977108790e2456b7921e773f23db5630261102233eb355a3b79", size = 6234995, upload-time = "2026-02-11T04:20:51.032Z" }, + { url = "https://files.pythonhosted.org/packages/07/26/246ab11455b2549b9233dbd44d358d033a2f780fa9007b61a913c5b2d24e/pillow-12.1.1-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:aee2810642b2898bb187ced9b349e95d2a7272930796e022efaf12e99dccd293", size = 8045012, upload-time = "2026-02-11T04:20:52.882Z" }, + { url = "https://files.pythonhosted.org/packages/b2/8b/07587069c27be7535ac1fe33874e32de118fbd34e2a73b7f83436a88368c/pillow-12.1.1-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a0b1cd6232e2b618adcc54d9882e4e662a089d5768cd188f7c245b4c8c44a397", size = 6349638, upload-time = "2026-02-11T04:20:54.444Z" }, + { url = "https://files.pythonhosted.org/packages/ff/79/6df7b2ee763d619cda2fb4fea498e5f79d984dae304d45a8999b80d6cf5c/pillow-12.1.1-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7aac39bcf8d4770d089588a2e1dd111cbaa42df5a94be3114222057d68336bd0", size = 7041540, upload-time = "2026-02-11T04:20:55.97Z" }, + { url = "https://files.pythonhosted.org/packages/2c/5e/2ba19e7e7236d7529f4d873bdaf317a318896bac289abebd4bb00ef247f0/pillow-12.1.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:ab174cd7d29a62dd139c44bf74b698039328f45cb03b4596c43473a46656b2f3", size = 6462613, upload-time = "2026-02-11T04:20:57.542Z" }, + { url = "https://files.pythonhosted.org/packages/03/03/31216ec124bb5c3dacd74ce8efff4cc7f52643653bad4825f8f08c697743/pillow-12.1.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:339ffdcb7cbeaa08221cd401d517d4b1fe7a9ed5d400e4a8039719238620ca35", size = 7166745, upload-time = "2026-02-11T04:20:59.196Z" }, + { url = "https://files.pythonhosted.org/packages/1f/e7/7c4552d80052337eb28653b617eafdef39adfb137c49dd7e831b8dc13bc5/pillow-12.1.1-cp312-cp312-win32.whl", hash = "sha256:5d1f9575a12bed9e9eedd9a4972834b08c97a352bd17955ccdebfeca5913fa0a", size = 6328823, upload-time = "2026-02-11T04:21:01.385Z" }, + { url = "https://files.pythonhosted.org/packages/3d/17/688626d192d7261bbbf98846fc98995726bddc2c945344b65bec3a29d731/pillow-12.1.1-cp312-cp312-win_amd64.whl", hash = "sha256:21329ec8c96c6e979cd0dfd29406c40c1d52521a90544463057d2aaa937d66a6", size = 7033367, upload-time = "2026-02-11T04:21:03.536Z" }, + { url = "https://files.pythonhosted.org/packages/ed/fe/a0ef1f73f939b0eca03ee2c108d0043a87468664770612602c63266a43c4/pillow-12.1.1-cp312-cp312-win_arm64.whl", hash = "sha256:af9a332e572978f0218686636610555ae3defd1633597be015ed50289a03c523", size = 2453811, upload-time = "2026-02-11T04:21:05.116Z" }, + { url = "https://files.pythonhosted.org/packages/56/11/5d43209aa4cb58e0cc80127956ff1796a68b928e6324bbf06ef4db34367b/pillow-12.1.1-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:600fd103672b925fe62ed08e0d874ea34d692474df6f4bf7ebe148b30f89f39f", size = 5228606, upload-time = "2026-02-11T04:22:52.106Z" }, + { url = "https://files.pythonhosted.org/packages/5f/d5/3b005b4e4fda6698b371fa6c21b097d4707585d7db99e98d9b0b87ac612a/pillow-12.1.1-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:665e1b916b043cef294bc54d47bf02d87e13f769bc4bc5fa225a24b3a6c5aca9", size = 4622321, upload-time = "2026-02-11T04:22:53.827Z" }, + { url = "https://files.pythonhosted.org/packages/df/36/ed3ea2d594356fd8037e5a01f6156c74bc8d92dbb0fa60746cc96cabb6e8/pillow-12.1.1-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:495c302af3aad1ca67420ddd5c7bd480c8867ad173528767d906428057a11f0e", size = 5247579, upload-time = "2026-02-11T04:22:56.094Z" }, + { url = "https://files.pythonhosted.org/packages/54/9a/9cc3e029683cf6d20ae5085da0dafc63148e3252c2f13328e553aaa13cfb/pillow-12.1.1-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8fd420ef0c52c88b5a035a0886f367748c72147b2b8f384c9d12656678dfdfa9", size = 6989094, upload-time = "2026-02-11T04:22:58.288Z" }, + { url = "https://files.pythonhosted.org/packages/00/98/fc53ab36da80b88df0967896b6c4b4cd948a0dc5aa40a754266aa3ae48b3/pillow-12.1.1-pp311-pypy311_pp73-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f975aa7ef9684ce7e2c18a3aa8f8e2106ce1e46b94ab713d156b2898811651d3", size = 5313850, upload-time = "2026-02-11T04:23:00.554Z" }, + { url = "https://files.pythonhosted.org/packages/30/02/00fa585abfd9fe9d73e5f6e554dc36cc2b842898cbfc46d70353dae227f8/pillow-12.1.1-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8089c852a56c2966cf18835db62d9b34fef7ba74c726ad943928d494fa7f4735", size = 5963343, upload-time = "2026-02-11T04:23:02.934Z" }, + { url = "https://files.pythonhosted.org/packages/f2/26/c56ce33ca856e358d27fda9676c055395abddb82c35ac0f593877ed4562e/pillow-12.1.1-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:cb9bb857b2d057c6dfc72ac5f3b44836924ba15721882ef103cecb40d002d80e", size = 7029880, upload-time = "2026-02-11T04:23:04.783Z" }, ] [[package]] @@ -904,27 +904,27 @@ wheels = [ [[package]] name = "ruff" -version = "0.15.0" +version = "0.15.1" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/c8/39/5cee96809fbca590abea6b46c6d1c586b49663d1d2830a751cc8fc42c666/ruff-0.15.0.tar.gz", hash = "sha256:6bdea47cdbea30d40f8f8d7d69c0854ba7c15420ec75a26f463290949d7f7e9a", size = 4524893, upload-time = "2026-02-03T17:53:35.357Z" } +sdist = { url = "https://files.pythonhosted.org/packages/04/dc/4e6ac71b511b141cf626357a3946679abeba4cf67bc7cc5a17920f31e10d/ruff-0.15.1.tar.gz", hash = "sha256:c590fe13fb57c97141ae975c03a1aedb3d3156030cabd740d6ff0b0d601e203f", size = 4540855, upload-time = "2026-02-12T23:09:09.998Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/bc/88/3fd1b0aa4b6330d6aaa63a285bc96c9f71970351579152d231ed90914586/ruff-0.15.0-py3-none-linux_armv6l.whl", hash = "sha256:aac4ebaa612a82b23d45964586f24ae9bc23ca101919f5590bdb368d74ad5455", size = 10354332, upload-time = "2026-02-03T17:52:54.892Z" }, - { url = "https://files.pythonhosted.org/packages/72/f6/62e173fbb7eb75cc29fe2576a1e20f0a46f671a2587b5f604bfb0eaf5f6f/ruff-0.15.0-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:dcd4be7cc75cfbbca24a98d04d0b9b36a270d0833241f776b788d59f4142b14d", size = 10767189, upload-time = "2026-02-03T17:53:19.778Z" }, - { url = "https://files.pythonhosted.org/packages/99/e4/968ae17b676d1d2ff101d56dc69cf333e3a4c985e1ec23803df84fc7bf9e/ruff-0.15.0-py3-none-macosx_11_0_arm64.whl", hash = "sha256:d747e3319b2bce179c7c1eaad3d884dc0a199b5f4d5187620530adf9105268ce", size = 10075384, upload-time = "2026-02-03T17:53:29.241Z" }, - { url = "https://files.pythonhosted.org/packages/a2/bf/9843c6044ab9e20af879c751487e61333ca79a2c8c3058b15722386b8cae/ruff-0.15.0-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:650bd9c56ae03102c51a5e4b554d74d825ff3abe4db22b90fd32d816c2e90621", size = 10481363, upload-time = "2026-02-03T17:52:43.332Z" }, - { url = "https://files.pythonhosted.org/packages/55/d9/4ada5ccf4cd1f532db1c8d44b6f664f2208d3d93acbeec18f82315e15193/ruff-0.15.0-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:a6664b7eac559e3048223a2da77769c2f92b43a6dfd4720cef42654299a599c9", size = 10187736, upload-time = "2026-02-03T17:53:00.522Z" }, - { url = "https://files.pythonhosted.org/packages/86/e2/f25eaecd446af7bb132af0a1d5b135a62971a41f5366ff41d06d25e77a91/ruff-0.15.0-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6f811f97b0f092b35320d1556f3353bf238763420ade5d9e62ebd2b73f2ff179", size = 10968415, upload-time = "2026-02-03T17:53:15.705Z" }, - { url = "https://files.pythonhosted.org/packages/e7/dc/f06a8558d06333bf79b497d29a50c3a673d9251214e0d7ec78f90b30aa79/ruff-0.15.0-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:761ec0a66680fab6454236635a39abaf14198818c8cdf691e036f4bc0f406b2d", size = 11809643, upload-time = "2026-02-03T17:53:23.031Z" }, - { url = "https://files.pythonhosted.org/packages/dd/45/0ece8db2c474ad7df13af3a6d50f76e22a09d078af63078f005057ca59eb/ruff-0.15.0-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:940f11c2604d317e797b289f4f9f3fa5555ffe4fb574b55ed006c3d9b6f0eb78", size = 11234787, upload-time = "2026-02-03T17:52:46.432Z" }, - { url = "https://files.pythonhosted.org/packages/8a/d9/0e3a81467a120fd265658d127db648e4d3acfe3e4f6f5d4ea79fac47e587/ruff-0.15.0-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bcbca3d40558789126da91d7ef9a7c87772ee107033db7191edefa34e2c7f1b4", size = 11112797, upload-time = "2026-02-03T17:52:49.274Z" }, - { url = "https://files.pythonhosted.org/packages/b2/cb/8c0b3b0c692683f8ff31351dfb6241047fa873a4481a76df4335a8bff716/ruff-0.15.0-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:9a121a96db1d75fa3eb39c4539e607f628920dd72ff1f7c5ee4f1b768ac62d6e", size = 11033133, upload-time = "2026-02-03T17:53:33.105Z" }, - { url = "https://files.pythonhosted.org/packages/f8/5e/23b87370cf0f9081a8c89a753e69a4e8778805b8802ccfe175cc410e50b9/ruff-0.15.0-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:5298d518e493061f2eabd4abd067c7e4fb89e2f63291c94332e35631c07c3662", size = 10442646, upload-time = "2026-02-03T17:53:06.278Z" }, - { url = "https://files.pythonhosted.org/packages/e1/9a/3c94de5ce642830167e6d00b5c75aacd73e6347b4c7fc6828699b150a5ee/ruff-0.15.0-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:afb6e603d6375ff0d6b0cee563fa21ab570fd15e65c852cb24922cef25050cf1", size = 10195750, upload-time = "2026-02-03T17:53:26.084Z" }, - { url = "https://files.pythonhosted.org/packages/30/15/e396325080d600b436acc970848d69df9c13977942fb62bb8722d729bee8/ruff-0.15.0-py3-none-musllinux_1_2_i686.whl", hash = "sha256:77e515f6b15f828b94dc17d2b4ace334c9ddb7d9468c54b2f9ed2b9c1593ef16", size = 10676120, upload-time = "2026-02-03T17:53:09.363Z" }, - { url = "https://files.pythonhosted.org/packages/8d/c9/229a23d52a2983de1ad0fb0ee37d36e0257e6f28bfd6b498ee2c76361874/ruff-0.15.0-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:6f6e80850a01eb13b3e42ee0ebdf6e4497151b48c35051aab51c101266d187a3", size = 11201636, upload-time = "2026-02-03T17:52:57.281Z" }, - { url = "https://files.pythonhosted.org/packages/6f/b0/69adf22f4e24f3677208adb715c578266842e6e6a3cc77483f48dd999ede/ruff-0.15.0-py3-none-win32.whl", hash = "sha256:238a717ef803e501b6d51e0bdd0d2c6e8513fe9eec14002445134d3907cd46c3", size = 10465945, upload-time = "2026-02-03T17:53:12.591Z" }, - { url = "https://files.pythonhosted.org/packages/51/ad/f813b6e2c97e9b4598be25e94a9147b9af7e60523b0cb5d94d307c15229d/ruff-0.15.0-py3-none-win_amd64.whl", hash = "sha256:dd5e4d3301dc01de614da3cdffc33d4b1b96fb89e45721f1598e5532ccf78b18", size = 11564657, upload-time = "2026-02-03T17:52:51.893Z" }, - { url = "https://files.pythonhosted.org/packages/f6/b0/2d823f6e77ebe560f4e397d078487e8d52c1516b331e3521bc75db4272ca/ruff-0.15.0-py3-none-win_arm64.whl", hash = "sha256:c480d632cc0ca3f0727acac8b7d053542d9e114a462a145d0b00e7cd658c515a", size = 10865753, upload-time = "2026-02-03T17:53:03.014Z" }, + { url = "https://files.pythonhosted.org/packages/23/bf/e6e4324238c17f9d9120a9d60aa99a7daaa21204c07fcd84e2ef03bb5fd1/ruff-0.15.1-py3-none-linux_armv6l.whl", hash = "sha256:b101ed7cf4615bda6ffe65bdb59f964e9f4a0d3f85cbf0e54f0ab76d7b90228a", size = 10367819, upload-time = "2026-02-12T23:09:03.598Z" }, + { url = "https://files.pythonhosted.org/packages/b3/ea/c8f89d32e7912269d38c58f3649e453ac32c528f93bb7f4219258be2e7ed/ruff-0.15.1-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:939c995e9277e63ea632cc8d3fae17aa758526f49a9a850d2e7e758bfef46602", size = 10798618, upload-time = "2026-02-12T23:09:22.928Z" }, + { url = "https://files.pythonhosted.org/packages/5e/0f/1d0d88bc862624247d82c20c10d4c0f6bb2f346559d8af281674cf327f15/ruff-0.15.1-py3-none-macosx_11_0_arm64.whl", hash = "sha256:1d83466455fdefe60b8d9c8df81d3c1bbb2115cede53549d3b522ce2bc703899", size = 10148518, upload-time = "2026-02-12T23:08:58.339Z" }, + { url = "https://files.pythonhosted.org/packages/f5/c8/291c49cefaa4a9248e986256df2ade7add79388fe179e0691be06fae6f37/ruff-0.15.1-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a9457e3c3291024866222b96108ab2d8265b477e5b1534c7ddb1810904858d16", size = 10518811, upload-time = "2026-02-12T23:09:31.865Z" }, + { url = "https://files.pythonhosted.org/packages/c3/1a/f5707440e5ae43ffa5365cac8bbb91e9665f4a883f560893829cf16a606b/ruff-0.15.1-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:92c92b003e9d4f7fbd33b1867bb15a1b785b1735069108dfc23821ba045b29bc", size = 10196169, upload-time = "2026-02-12T23:09:17.306Z" }, + { url = "https://files.pythonhosted.org/packages/2a/ff/26ddc8c4da04c8fd3ee65a89c9fb99eaa5c30394269d424461467be2271f/ruff-0.15.1-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1fe5c41ab43e3a06778844c586251eb5a510f67125427625f9eb2b9526535779", size = 10990491, upload-time = "2026-02-12T23:09:25.503Z" }, + { url = "https://files.pythonhosted.org/packages/fc/00/50920cb385b89413f7cdb4bb9bc8fc59c1b0f30028d8bccc294189a54955/ruff-0.15.1-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:66a6dd6df4d80dc382c6484f8ce1bcceb55c32e9f27a8b94c32f6c7331bf14fb", size = 11843280, upload-time = "2026-02-12T23:09:19.88Z" }, + { url = "https://files.pythonhosted.org/packages/5d/6d/2f5cad8380caf5632a15460c323ae326f1e1a2b5b90a6ee7519017a017ca/ruff-0.15.1-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6a4a42cbb8af0bda9bcd7606b064d7c0bc311a88d141d02f78920be6acb5aa83", size = 11274336, upload-time = "2026-02-12T23:09:14.907Z" }, + { url = "https://files.pythonhosted.org/packages/a3/1d/5f56cae1d6c40b8a318513599b35ea4b075d7dc1cd1d04449578c29d1d75/ruff-0.15.1-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4ab064052c31dddada35079901592dfba2e05f5b1e43af3954aafcbc1096a5b2", size = 11137288, upload-time = "2026-02-12T23:09:07.475Z" }, + { url = "https://files.pythonhosted.org/packages/cd/20/6f8d7d8f768c93b0382b33b9306b3b999918816da46537d5a61635514635/ruff-0.15.1-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:5631c940fe9fe91f817a4c2ea4e81f47bee3ca4aa646134a24374f3c19ad9454", size = 11070681, upload-time = "2026-02-12T23:08:55.43Z" }, + { url = "https://files.pythonhosted.org/packages/9a/67/d640ac76069f64cdea59dba02af2e00b1fa30e2103c7f8d049c0cff4cafd/ruff-0.15.1-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:68138a4ba184b4691ccdc39f7795c66b3c68160c586519e7e8444cf5a53e1b4c", size = 10486401, upload-time = "2026-02-12T23:09:27.927Z" }, + { url = "https://files.pythonhosted.org/packages/65/3d/e1429f64a3ff89297497916b88c32a5cc88eeca7e9c787072d0e7f1d3e1e/ruff-0.15.1-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:518f9af03bfc33c03bdb4cb63fabc935341bb7f54af500f92ac309ecfbba6330", size = 10197452, upload-time = "2026-02-12T23:09:12.147Z" }, + { url = "https://files.pythonhosted.org/packages/78/83/e2c3bade17dad63bf1e1c2ffaf11490603b760be149e1419b07049b36ef2/ruff-0.15.1-py3-none-musllinux_1_2_i686.whl", hash = "sha256:da79f4d6a826caaea95de0237a67e33b81e6ec2e25fc7e1993a4015dffca7c61", size = 10693900, upload-time = "2026-02-12T23:09:34.418Z" }, + { url = "https://files.pythonhosted.org/packages/a1/27/fdc0e11a813e6338e0706e8b39bb7a1d61ea5b36873b351acee7e524a72a/ruff-0.15.1-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:3dd86dccb83cd7d4dcfac303ffc277e6048600dfc22e38158afa208e8bf94a1f", size = 11227302, upload-time = "2026-02-12T23:09:36.536Z" }, + { url = "https://files.pythonhosted.org/packages/f6/58/ac864a75067dcbd3b95be5ab4eb2b601d7fbc3d3d736a27e391a4f92a5c1/ruff-0.15.1-py3-none-win32.whl", hash = "sha256:660975d9cb49b5d5278b12b03bb9951d554543a90b74ed5d366b20e2c57c2098", size = 10462555, upload-time = "2026-02-12T23:09:29.899Z" }, + { url = "https://files.pythonhosted.org/packages/e0/5e/d4ccc8a27ecdb78116feac4935dfc39d1304536f4296168f91ed3ec00cd2/ruff-0.15.1-py3-none-win_amd64.whl", hash = "sha256:c820fef9dd5d4172a6570e5721704a96c6679b80cf7be41659ed439653f62336", size = 11599956, upload-time = "2026-02-12T23:09:01.157Z" }, + { url = "https://files.pythonhosted.org/packages/2a/07/5bda6a85b220c64c65686bc85bd0bbb23b29c62b3a9f9433fa55f17cda93/ruff-0.15.1-py3-none-win_arm64.whl", hash = "sha256:5ff7d5f0f88567850f45081fac8f4ec212be8d0b963e385c3f7d0d2eb4899416", size = 10874604, upload-time = "2026-02-12T23:09:05.515Z" }, ] [[package]] @@ -995,26 +995,26 @@ wheels = [ [[package]] name = "ty" -version = "0.0.15" +version = "0.0.17" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/4e/25/257602d316b9333089b688a7a11b33ebc660b74e8dacf400dc3dfdea1594/ty-0.0.15.tar.gz", hash = "sha256:4f9a5b8df208c62dba56e91b93bed8b5bb714839691b8cff16d12c983bfa1174", size = 5101936, upload-time = "2026-02-05T01:06:34.922Z" } +sdist = { url = "https://files.pythonhosted.org/packages/66/c3/41ae6346443eedb65b96761abfab890a48ce2aa5a8a27af69c5c5d99064d/ty-0.0.17.tar.gz", hash = "sha256:847ed6c120913e280bf9b54d8eaa7a1049708acb8824ad234e71498e8ad09f97", size = 5167209, upload-time = "2026-02-13T13:26:36.835Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/ce/c5/35626e732b79bf0e6213de9f79aff59b5f247c0a1e3ce0d93e675ab9b728/ty-0.0.15-py3-none-linux_armv6l.whl", hash = "sha256:68e092458516c61512dac541cde0a5e4e5842df00b4e81881ead8f745ddec794", size = 10138374, upload-time = "2026-02-05T01:07:03.804Z" }, - { url = "https://files.pythonhosted.org/packages/d5/8a/48fd81664604848f79d03879b3ca3633762d457a069b07e09fb1b87edd6e/ty-0.0.15-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:79f2e75289eae3cece94c51118b730211af4ba5762906f52a878041b67e54959", size = 9947858, upload-time = "2026-02-05T01:06:47.453Z" }, - { url = "https://files.pythonhosted.org/packages/b6/85/c1ac8e97bcd930946f4c94db85b675561d590b4e72703bf3733419fc3973/ty-0.0.15-py3-none-macosx_11_0_arm64.whl", hash = "sha256:112a7b26e63e48cc72c8c5b03227d1db280cfa57a45f2df0e264c3a016aa8c3c", size = 9443220, upload-time = "2026-02-05T01:06:44.98Z" }, - { url = "https://files.pythonhosted.org/packages/3c/d9/244bc02599d950f7a4298fbc0c1b25cc808646b9577bdf7a83470b2d1cec/ty-0.0.15-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:71f62a2644972975a657d9dc867bf901235cde51e8d24c20311067e7afd44a56", size = 9949976, upload-time = "2026-02-05T01:07:01.515Z" }, - { url = "https://files.pythonhosted.org/packages/7e/ab/3a0daad66798c91a33867a3ececf17d314ac65d4ae2bbbd28cbfde94da63/ty-0.0.15-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:9e48b42be2d257317c85b78559233273b655dd636fc61e7e1d69abd90fd3cba4", size = 9965918, upload-time = "2026-02-05T01:06:54.283Z" }, - { url = "https://files.pythonhosted.org/packages/39/4e/e62b01338f653059a7c0cd09d1a326e9a9eedc351a0f0de9db0601658c3d/ty-0.0.15-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:27dd5b52a421e6871c5bfe9841160331b60866ed2040250cb161886478ab3e4f", size = 10424943, upload-time = "2026-02-05T01:07:08.777Z" }, - { url = "https://files.pythonhosted.org/packages/65/b5/7aa06655ce69c0d4f3e845d2d85e79c12994b6d84c71699cfb437e0bc8cf/ty-0.0.15-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:76b85c9ec2219e11c358a7db8e21b7e5c6674a1fb9b6f633836949de98d12286", size = 10964692, upload-time = "2026-02-05T01:06:37.103Z" }, - { url = "https://files.pythonhosted.org/packages/13/04/36fdfe1f3c908b471e246e37ce3d011175584c26d3853e6c5d9a0364564c/ty-0.0.15-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a9e8204c61d8ede4f21f2975dce74efdb80fafb2fae1915c666cceb33ea3c90b", size = 10692225, upload-time = "2026-02-05T01:06:49.714Z" }, - { url = "https://files.pythonhosted.org/packages/13/41/5bf882649bd8b64ded5fbce7fb8d77fb3b868de1a3b1a6c4796402b47308/ty-0.0.15-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af87c3be7c944bb4d6609d6c63e4594944b0028c7bd490a525a82b88fe010d6d", size = 10516776, upload-time = "2026-02-05T01:06:52.047Z" }, - { url = "https://files.pythonhosted.org/packages/56/75/66852d7e004f859839c17ffe1d16513c1e7cc04bcc810edb80ca022a9124/ty-0.0.15-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:50dccf7398505e5966847d366c9e4c650b8c225411c2a68c32040a63b9521eea", size = 9928828, upload-time = "2026-02-05T01:06:56.647Z" }, - { url = "https://files.pythonhosted.org/packages/65/72/96bc16c7b337a3ef358fd227b3c8ef0c77405f3bfbbfb59ee5915f0d9d71/ty-0.0.15-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:bd797b8f231a4f4715110259ad1ad5340a87b802307f3e06d92bfb37b858a8f3", size = 9978960, upload-time = "2026-02-05T01:06:29.567Z" }, - { url = "https://files.pythonhosted.org/packages/a0/18/d2e316a35b626de2227f832cd36d21205e4f5d96fd036a8af84c72ecec1b/ty-0.0.15-py3-none-musllinux_1_2_i686.whl", hash = "sha256:9deb7f20e18b25440a9aa4884f934ba5628ef456dbde91819d5af1a73da48af3", size = 10135903, upload-time = "2026-02-05T01:06:59.256Z" }, - { url = "https://files.pythonhosted.org/packages/02/d3/b617a79c9dad10c888d7c15cd78859e0160b8772273637b9c4241a049491/ty-0.0.15-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:7b31b3de031255b90a5f4d9cb3d050feae246067c87130e5a6861a8061c71754", size = 10615879, upload-time = "2026-02-05T01:07:06.661Z" }, - { url = "https://files.pythonhosted.org/packages/fb/b0/2652a73c71c77296a6343217063f05745da60c67b7e8a8e25f2064167fce/ty-0.0.15-py3-none-win32.whl", hash = "sha256:9362c528ceb62c89d65c216336d28d500bc9f4c10418413f63ebc16886e16cc1", size = 9578058, upload-time = "2026-02-05T01:06:42.928Z" }, - { url = "https://files.pythonhosted.org/packages/84/6e/08a4aedebd2a6ce2784b5bc3760e43d1861f1a184734a78215c2d397c1df/ty-0.0.15-py3-none-win_amd64.whl", hash = "sha256:4db040695ae67c5524f59cb8179a8fa277112e69042d7dfdac862caa7e3b0d9c", size = 10457112, upload-time = "2026-02-05T01:06:39.885Z" }, - { url = "https://files.pythonhosted.org/packages/b3/be/1991f2bc12847ae2d4f1e3ac5dcff8bb7bc1261390645c0755bb55616355/ty-0.0.15-py3-none-win_arm64.whl", hash = "sha256:e5a98d4119e77d6136461e16ae505f8f8069002874ab073de03fbcb1a5e8bf25", size = 9937490, upload-time = "2026-02-05T01:06:32.388Z" }, + { url = "https://files.pythonhosted.org/packages/c0/01/0ef15c22a1c54b0f728ceff3f62d478dbf8b0dcf8ff7b80b954f79584f3e/ty-0.0.17-py3-none-linux_armv6l.whl", hash = "sha256:64a9a16555cc8867d35c2647c2f1afbd3cae55f68fd95283a574d1bb04fe93e0", size = 10192793, upload-time = "2026-02-13T13:27:13.943Z" }, + { url = "https://files.pythonhosted.org/packages/0f/2c/f4c322d9cded56edc016b1092c14b95cf58c8a33b4787316ea752bb9418e/ty-0.0.17-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:eb2dbd8acd5c5a55f4af0d479523e7c7265a88542efe73ed3d696eb1ba7b6454", size = 10051977, upload-time = "2026-02-13T13:26:57.741Z" }, + { url = "https://files.pythonhosted.org/packages/4c/a5/43746c1ff81e784f5fc303afc61fe5bcd85d0fcf3ef65cb2cef78c7486c7/ty-0.0.17-py3-none-macosx_11_0_arm64.whl", hash = "sha256:f18f5fd927bc628deb9ea2df40f06b5f79c5ccf355db732025a3e8e7152801f6", size = 9564639, upload-time = "2026-02-13T13:26:42.781Z" }, + { url = "https://files.pythonhosted.org/packages/d6/b8/280b04e14a9c0474af574f929fba2398b5e1c123c1e7735893b4cd73d13c/ty-0.0.17-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5383814d1d7a5cc53b3b07661856bab04bb2aac7a677c8d33c55169acdaa83df", size = 10061204, upload-time = "2026-02-13T13:27:00.152Z" }, + { url = "https://files.pythonhosted.org/packages/2a/d7/493e1607d8dfe48288d8a768a2adc38ee27ef50e57f0af41ff273987cda0/ty-0.0.17-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:9c20423b8744b484f93e7bf2ef8a9724bca2657873593f9f41d08bd9f83444c9", size = 10013116, upload-time = "2026-02-13T13:26:34.543Z" }, + { url = "https://files.pythonhosted.org/packages/80/ef/22f3ed401520afac90dbdf1f9b8b7755d85b0d5c35c1cb35cf5bd11b59c2/ty-0.0.17-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e6f5b1aba97db9af86517b911674b02f5bc310750485dc47603a105bd0e83ddd", size = 10533623, upload-time = "2026-02-13T13:26:31.449Z" }, + { url = "https://files.pythonhosted.org/packages/75/ce/744b15279a11ac7138832e3a55595706b4a8a209c9f878e3ab8e571d9032/ty-0.0.17-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:488bce1a9bea80b851a97cd34c4d2ffcd69593d6c3f54a72ae02e5c6e47f3d0c", size = 11069750, upload-time = "2026-02-13T13:26:48.638Z" }, + { url = "https://files.pythonhosted.org/packages/f2/be/1133c91f15a0e00d466c24f80df486d630d95d1b2af63296941f7473812f/ty-0.0.17-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8df66b91ec84239420985ec215e7f7549bfda2ac036a3b3c065f119d1c06825a", size = 10870862, upload-time = "2026-02-13T13:26:54.715Z" }, + { url = "https://files.pythonhosted.org/packages/3e/4a/a2ed209ef215b62b2d3246e07e833081e07d913adf7e0448fc204be443d6/ty-0.0.17-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:002139e807c53002790dfefe6e2f45ab0e04012e76db3d7c8286f96ec121af8f", size = 10628118, upload-time = "2026-02-13T13:26:45.439Z" }, + { url = "https://files.pythonhosted.org/packages/b3/0c/87476004cb5228e9719b98afffad82c3ef1f84334bde8527bcacba7b18cb/ty-0.0.17-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:6c4e01f05ce82e5d489ab3900ca0899a56c4ccb52659453780c83e5b19e2b64c", size = 10038185, upload-time = "2026-02-13T13:27:02.693Z" }, + { url = "https://files.pythonhosted.org/packages/46/4b/98f0b3ba9aef53c1f0305519536967a4aa793a69ed72677b0a625c5313ac/ty-0.0.17-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:2b226dd1e99c0d2152d218c7e440150d1a47ce3c431871f0efa073bbf899e881", size = 10047644, upload-time = "2026-02-13T13:27:05.474Z" }, + { url = "https://files.pythonhosted.org/packages/93/e0/06737bb80aa1a9103b8651d2eb691a7e53f1ed54111152be25f4a02745db/ty-0.0.17-py3-none-musllinux_1_2_i686.whl", hash = "sha256:8b11f1da7859e0ad69e84b3c5ef9a7b055ceed376a432fad44231bdfc48061c2", size = 10231140, upload-time = "2026-02-13T13:27:10.844Z" }, + { url = "https://files.pythonhosted.org/packages/7c/79/e2a606bd8852383ba9abfdd578f4a227bd18504145381a10a5f886b4e751/ty-0.0.17-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:c04e196809ff570559054d3e011425fd7c04161529eb551b3625654e5f2434cb", size = 10718344, upload-time = "2026-02-13T13:26:51.66Z" }, + { url = "https://files.pythonhosted.org/packages/c5/2d/2663984ac11de6d78f74432b8b14ba64d170b45194312852b7543cf7fd56/ty-0.0.17-py3-none-win32.whl", hash = "sha256:305b6ed150b2740d00a817b193373d21f0767e10f94ac47abfc3b2e5a5aec809", size = 9672932, upload-time = "2026-02-13T13:27:08.522Z" }, + { url = "https://files.pythonhosted.org/packages/de/b5/39be78f30b31ee9f5a585969930c7248354db90494ff5e3d0756560fb731/ty-0.0.17-py3-none-win_amd64.whl", hash = "sha256:531828267527aee7a63e972f54e5eee21d9281b72baf18e5c2850c6b862add83", size = 10542138, upload-time = "2026-02-13T13:27:17.084Z" }, + { url = "https://files.pythonhosted.org/packages/40/b7/f875c729c5d0079640c75bad2c7e5d43edc90f16ba242f28a11966df8f65/ty-0.0.17-py3-none-win_arm64.whl", hash = "sha256:de9810234c0c8d75073457e10a84825b9cd72e6629826b7f01c7a0b266ae25b1", size = 10023068, upload-time = "2026-02-13T13:26:39.637Z" }, ] [[package]] From 6708f08ed794ec30561b4b6dde92c4ad83c59ad5 Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Thu, 19 Feb 2026 11:08:03 -0500 Subject: [PATCH 127/229] restore vehicle model CI test routes (#3143) * restore ACURA_TLX_2G * restore HONDA_NBOX_2G * restore ACURA_MDX_4G_MMR * restore HONDA_CITY_7G * restore PORSCHE_MACAN_MK1 * Revert "restore PORSCHE_MACAN_MK1" This reverts commit 336493d9166621c7b3b541ab5c44e19fc37b1877. * Revert "restore ACURA_TLX_2G" This reverts commit 7e25edbc7f52edb1af4916ced16fe6cddaa34f96. --- opendbc/car/tests/routes.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/opendbc/car/tests/routes.py b/opendbc/car/tests/routes.py index 1120026d006..6f0eaa24aa1 100644 --- a/opendbc/car/tests/routes.py +++ b/opendbc/car/tests/routes.py @@ -27,11 +27,7 @@ VOLKSWAGEN.VOLKSWAGEN_CRAFTER_MK2, # need a route from an ACC-equipped Crafter SUBARU.SUBARU_FORESTER_HYBRID, VOLKSWAGEN.PORSCHE_MACAN_MK1, - # Honda/Acura test routes below expired, replace when CI bucket sync is fixed HONDA.ACURA_TLX_2G, - HONDA.HONDA_NBOX_2G, - HONDA.ACURA_MDX_4G_MMR, - HONDA.HONDA_CITY_7G, # These had their DSUs unplugged, need new routes # TOYOTA.LEXUS_ES # hybrid @@ -125,9 +121,11 @@ class CarTestRoute(NamedTuple): CarTestRoute("b1c832ad56b6bc9d/00000010--debfcf5867", HONDA.HONDA_CIVIC_2022), # 2025 Civic Hatch Hybrid with new eCVT transmission CarTestRoute("f9c43864cf057d05/2024-01-15--23-01-20", HONDA.HONDA_PILOT_4G), # TODO: Replace with a newer route CarTestRoute("f39cf149898833ff/0000002b--54f3fae045", HONDA.HONDA_ACCORD_11G), - # CarTestRoute("56b2cf1dacdcd033/00000017--d24ffdb376", HONDA.HONDA_CITY_7G), # Brazilian model + CarTestRoute("56b2cf1dacdcd033/00000017--d24ffdb376", HONDA.HONDA_CITY_7G), # Brazilian model CarTestRoute("2dc4489d7e1410ca/00000001--bbec3f5117", HONDA.HONDA_CRV_6G), CarTestRoute("a703d058f4e05aeb/00000008--f169423024", HONDA.HONDA_PASSPORT_4G), + CarTestRoute("414af83891dbf72c/00000006--51fa6d99cd", HONDA.HONDA_NBOX_2G), + CarTestRoute("ad9840558640c31d/0000001a--d6cd4871c2", HONDA.ACURA_MDX_4G_MMR), # 2025 MDX CarTestRoute("ad9840558640c31d/000001f2--026c4f6275", HONDA.ACURA_TLX_2G_MMR), CarTestRoute("87d7f06ade479c2e/2023-09-11--23-30-11", HYUNDAI.HYUNDAI_AZERA_6TH_GEN), From 54b7490752d62379a6cd3315daa51d8f3ffe4ceb Mon Sep 17 00:00:00 2001 From: royjr Date: Thu, 19 Feb 2026 12:30:12 -0500 Subject: [PATCH 128/229] HKG: Kia K7 2017 Port (#3123) * KIA_K7_2017 * more * default tireStiffnessFactor * no eps * Update routes.py * Update test_hyundai.py * Update routes.py * adjust initial lat accel factor and steer ratio --------- Co-authored-by: Jason Young --- opendbc/car/hyundai/fingerprints.py | 8 ++++++++ opendbc/car/hyundai/tests/test_hyundai.py | 2 +- opendbc/car/hyundai/values.py | 4 ++++ opendbc/car/tests/routes.py | 1 + opendbc/car/torque_data/override.toml | 1 + 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/opendbc/car/hyundai/fingerprints.py b/opendbc/car/hyundai/fingerprints.py index 98da5215942..02f67e2e6ee 100644 --- a/opendbc/car/hyundai/fingerprints.py +++ b/opendbc/car/hyundai/fingerprints.py @@ -1228,6 +1228,14 @@ b'\xf1\x00KA4c SCC FHCUP 1.00 1.01 99110-I4000 ', ], }, + CAR.KIA_K7_2017: { + (Ecu.fwdCamera, 0x7c4, None): [ + b'\xf1\x00YG MFC AT KOR LHD 1.00 1.01 95740-F6100 161129', + ], + (Ecu.fwdRadar, 0x7d0, None): [ + b'\xf1\x00YG__ SCC FNCUP 1.01 1.01 96400-F6000 ', + ], + }, CAR.KIA_K8_HEV_1ST_GEN: { (Ecu.fwdCamera, 0x7c4, None): [ b'\xf1\x00GL3HMFC AT KOR LHD 1.00 1.03 99211-L8000 210907', diff --git a/opendbc/car/hyundai/tests/test_hyundai.py b/opendbc/car/hyundai/tests/test_hyundai.py index b798acaa1d0..a6b0734a744 100644 --- a/opendbc/car/hyundai/tests/test_hyundai.py +++ b/opendbc/car/hyundai/tests/test_hyundai.py @@ -146,7 +146,7 @@ def test_expected_platform_codes(self, subtests): # fingerprint in the absence of full FW matches: def test_platform_code_ecus_available(self, subtests): # TODO: add queries for these non-CAN FD cars to get EPS - no_eps_platforms = CANFD_CAR | {CAR.KIA_SORENTO, CAR.KIA_OPTIMA_G4, CAR.KIA_OPTIMA_G4_FL, CAR.KIA_OPTIMA_H, + no_eps_platforms = CANFD_CAR | {CAR.KIA_SORENTO, CAR.KIA_OPTIMA_G4, CAR.KIA_OPTIMA_G4_FL, CAR.KIA_OPTIMA_H, CAR.KIA_K7_2017, CAR.KIA_OPTIMA_H_G4_FL, CAR.HYUNDAI_SONATA_LF, CAR.HYUNDAI_TUCSON, CAR.GENESIS_G90, CAR.GENESIS_G80, CAR.HYUNDAI_ELANTRA} # Asserts ECU keys essential for fuzzy fingerprinting are available on all platforms diff --git a/opendbc/car/hyundai/values.py b/opendbc/car/hyundai/values.py index e239298a00b..432779bdd95 100644 --- a/opendbc/car/hyundai/values.py +++ b/opendbc/car/hyundai/values.py @@ -385,6 +385,10 @@ class CAR(Platforms): KIA_K5_2021.specs, flags=HyundaiFlags.MANDO_RADAR | HyundaiFlags.CHECKSUM_CRC8 | HyundaiFlags.HYBRID, ) + KIA_K7_2017 = HyundaiPlatformConfig( + [HyundaiCarDocs("Kia K7 2017", car_parts=CarParts.common([CarHarness.hyundai_c]))], + CarSpecs(mass=1648, wheelbase=2.86, steerRatio=16.8), + ) KIA_K8_HEV_1ST_GEN = HyundaiCanFDPlatformConfig( [HyundaiCarDocs("Kia K8 Hybrid (with HDA II) 2023", "Highway Driving Assist II", car_parts=CarParts.common([CarHarness.hyundai_q]))], # mass: https://carprices.ae/brands/kia/2023/k8/1.6-turbo-hybrid, steerRatio: guesstimate from K5 platform diff --git a/opendbc/car/tests/routes.py b/opendbc/car/tests/routes.py index 6f0eaa24aa1..6ed678d4ee5 100644 --- a/opendbc/car/tests/routes.py +++ b/opendbc/car/tests/routes.py @@ -190,6 +190,7 @@ class CarTestRoute(NamedTuple): CarTestRoute("9b25e8c1484a1b67/2023-04-13--10-41-45", HYUNDAI.KIA_EV6), CarTestRoute("007d5e4ad9f86d13/2021-09-30--15-09-23", HYUNDAI.KIA_K5_2021), CarTestRoute("c58dfc9fc16590e0/2023-01-14--13-51-48", HYUNDAI.KIA_K5_HEV_2020), + CarTestRoute("74fbff45aa20fe9e/00000010--6f173d5799", HYUNDAI.KIA_K7_2017), CarTestRoute("78ad5150de133637/2023-09-13--16-15-57", HYUNDAI.KIA_K8_HEV_1ST_GEN), CarTestRoute("50c6c9b85fd1ff03/2020-10-26--17-56-06", HYUNDAI.KIA_NIRO_EV), CarTestRoute("b153671049a867b3/2023-04-05--10-00-30", HYUNDAI.KIA_NIRO_EV_2ND_GEN), diff --git a/opendbc/car/torque_data/override.toml b/opendbc/car/torque_data/override.toml index d2a6ece905e..01ba58860ef 100644 --- a/opendbc/car/torque_data/override.toml +++ b/opendbc/car/torque_data/override.toml @@ -96,6 +96,7 @@ legend = ["LAT_ACCEL_FACTOR", "MAX_LAT_ACCEL_MEASURED", "FRICTION"] "LEXUS_LS" = [1.35, 1.7, 0.17] "TOYOTA_RAV4_PRIME" = [1.7, 2.0, 0.14] "TOYOTA_RAV4_TSS2_2022" = [1.9, 1.9304407208090029, 0.112174] +"KIA_K7_2017" = [2.2, 2.2, 0.1] # Dashcam or fallback configured as ideal car "MOCK" = [10.0, 10, 0.0] From c12375821369b4211153f72cb3f2962d496b6ce3 Mon Sep 17 00:00:00 2001 From: adeebshihadeh Date: Fri, 20 Feb 2026 08:17:52 +0000 Subject: [PATCH 129/229] docs: Scheduled auto-update CARS.md --- docs/CARS.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/CARS.md b/docs/CARS.md index 88514042286..8d80b957cdb 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -1,6 +1,6 @@ -# Support Information for 390 Known Cars +# Support Information for 391 Known Cars |Make|Model|Package|Support Level| |---|---|---|:---:| @@ -183,6 +183,7 @@ |Kia|Forte 2022-23|Smart Cruise Control (SCC)|[Upstream](#upstream)| |Kia|K5 2021-24|Smart Cruise Control (SCC)|[Upstream](#upstream)| |Kia|K5 Hybrid 2020-22|Smart Cruise Control (SCC)|[Upstream](#upstream)| +|Kia|K7 2017|Smart Cruise Control (SCC)|[Upstream](#upstream)| |Kia|K8 Hybrid (with HDA II) 2023|Highway Driving Assist II|[Upstream](#upstream)| |Kia|Niro EV 2019|All|[Upstream](#upstream)| |Kia|Niro EV 2020|All|[Upstream](#upstream)| From b10b43105bcd891f95920aac29d01177e0be4940 Mon Sep 17 00:00:00 2001 From: Matt Purnell <65473602+mpurnell1@users.noreply.github.com> Date: Sun, 22 Feb 2026 11:32:51 -0600 Subject: [PATCH 130/229] CI: update CI to reflect removal of docker (#3149) CI: replace docker with native setup for test_models openpilot replaced docker-based CI with native `op setup` in commaai/openpilot#37282, breaking the test_models job here. --- .github/workflows/tests.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6b9806b4adf..b437a690d94 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -116,10 +116,7 @@ jobs: matrix: job: [0, 1, 2, 3] env: - BASE_IMAGE: openpilot-base - BUILD: selfdrive/test/docker_build.sh base - RUN: docker run --shm-size 2G -v $PWD:/tmp/openpilot -w /tmp/openpilot -e CI=1 -e PYTHONWARNINGS=default -e FILEREADER_CACHE=1 -e PYTHONPATH=/tmp/openpilot -e NUM_JOBS -e JOB_ID -e GITHUB_ACTION -e GITHUB_REF -e GITHUB_HEAD_REF -e GITHUB_SHA -e GITHUB_REPOSITORY -e GITHUB_RUN_ID -v $GITHUB_WORKSPACE/.ci_cache/scons_cache:/tmp/scons_cache -v $GITHUB_WORKSPACE/.ci_cache/comma_download_cache:/tmp/comma_download_cache -v $GITHUB_WORKSPACE/.ci_cache/openpilot_cache:/tmp/openpilot_cache $BASE_IMAGE /bin/bash -c - PYTEST: pytest --continue-on-collection-errors --durations=0 --durations-min=5 -n logical + CI: 1 steps: - uses: actions/checkout@v4 with: @@ -136,15 +133,13 @@ jobs: id: routes-cache uses: actions/cache@v4 with: - path: .ci_cache/comma_download_cache + path: /tmp/comma_download_cache key: car_models-${{ hashFiles('selfdrive/car/tests/test_models.py', 'opendbc/car/tests/routes.py') }}-${{ matrix.job }} - name: Build openpilot - run: ${{ env.RUN }} "scons -j$(nproc) common/ cereal/ selfdrive/pandad/ msgq_repo/ opendbc_repo" + run: scons -j$(nproc) common/ cereal/ selfdrive/pandad/ msgq_repo/ opendbc_repo - name: Test car models timeout-minutes: ${{ contains(runner.name, 'nsc') && (steps.routes-cache.outputs.cache-hit == 'true') && ((steps.setup-step.outputs.duration < 18) && 1 || 2) || 6 }} - run: | - ${{ env.RUN }} "MAX_EXAMPLES=1 $PYTEST selfdrive/car/tests/test_models.py && \ - chmod -R 777 /tmp/comma_download_cache" + run: MAX_EXAMPLES=1 pytest --continue-on-collection-errors --durations=0 --durations-min=5 -n logical selfdrive/car/tests/test_models.py env: NUM_JOBS: 4 JOB_ID: ${{ matrix.job }} From e6c1d6a189893952731da83bf72c1a549f7b6aaf Mon Sep 17 00:00:00 2001 From: commaci-public <60409688+commaci-public@users.noreply.github.com> Date: Mon, 23 Feb 2026 06:50:52 -0800 Subject: [PATCH 131/229] [bot] Update uv.lock (#3153) Co-authored-by: Vehicle Researcher --- uv.lock | 74 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/uv.lock b/uv.lock index 64f2abc768d..eff8077168f 100644 --- a/uv.lock +++ b/uv.lock @@ -904,27 +904,27 @@ wheels = [ [[package]] name = "ruff" -version = "0.15.1" +version = "0.15.2" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/04/dc/4e6ac71b511b141cf626357a3946679abeba4cf67bc7cc5a17920f31e10d/ruff-0.15.1.tar.gz", hash = "sha256:c590fe13fb57c97141ae975c03a1aedb3d3156030cabd740d6ff0b0d601e203f", size = 4540855, upload-time = "2026-02-12T23:09:09.998Z" } +sdist = { url = "https://files.pythonhosted.org/packages/06/04/eab13a954e763b0606f460443fcbf6bb5a0faf06890ea3754ff16523dce5/ruff-0.15.2.tar.gz", hash = "sha256:14b965afee0969e68bb871eba625343b8673375f457af4abe98553e8bbb98342", size = 4558148, upload-time = "2026-02-19T22:32:20.271Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/23/bf/e6e4324238c17f9d9120a9d60aa99a7daaa21204c07fcd84e2ef03bb5fd1/ruff-0.15.1-py3-none-linux_armv6l.whl", hash = "sha256:b101ed7cf4615bda6ffe65bdb59f964e9f4a0d3f85cbf0e54f0ab76d7b90228a", size = 10367819, upload-time = "2026-02-12T23:09:03.598Z" }, - { url = "https://files.pythonhosted.org/packages/b3/ea/c8f89d32e7912269d38c58f3649e453ac32c528f93bb7f4219258be2e7ed/ruff-0.15.1-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:939c995e9277e63ea632cc8d3fae17aa758526f49a9a850d2e7e758bfef46602", size = 10798618, upload-time = "2026-02-12T23:09:22.928Z" }, - { url = "https://files.pythonhosted.org/packages/5e/0f/1d0d88bc862624247d82c20c10d4c0f6bb2f346559d8af281674cf327f15/ruff-0.15.1-py3-none-macosx_11_0_arm64.whl", hash = "sha256:1d83466455fdefe60b8d9c8df81d3c1bbb2115cede53549d3b522ce2bc703899", size = 10148518, upload-time = "2026-02-12T23:08:58.339Z" }, - { url = "https://files.pythonhosted.org/packages/f5/c8/291c49cefaa4a9248e986256df2ade7add79388fe179e0691be06fae6f37/ruff-0.15.1-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a9457e3c3291024866222b96108ab2d8265b477e5b1534c7ddb1810904858d16", size = 10518811, upload-time = "2026-02-12T23:09:31.865Z" }, - { url = "https://files.pythonhosted.org/packages/c3/1a/f5707440e5ae43ffa5365cac8bbb91e9665f4a883f560893829cf16a606b/ruff-0.15.1-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:92c92b003e9d4f7fbd33b1867bb15a1b785b1735069108dfc23821ba045b29bc", size = 10196169, upload-time = "2026-02-12T23:09:17.306Z" }, - { url = "https://files.pythonhosted.org/packages/2a/ff/26ddc8c4da04c8fd3ee65a89c9fb99eaa5c30394269d424461467be2271f/ruff-0.15.1-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1fe5c41ab43e3a06778844c586251eb5a510f67125427625f9eb2b9526535779", size = 10990491, upload-time = "2026-02-12T23:09:25.503Z" }, - { url = "https://files.pythonhosted.org/packages/fc/00/50920cb385b89413f7cdb4bb9bc8fc59c1b0f30028d8bccc294189a54955/ruff-0.15.1-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:66a6dd6df4d80dc382c6484f8ce1bcceb55c32e9f27a8b94c32f6c7331bf14fb", size = 11843280, upload-time = "2026-02-12T23:09:19.88Z" }, - { url = "https://files.pythonhosted.org/packages/5d/6d/2f5cad8380caf5632a15460c323ae326f1e1a2b5b90a6ee7519017a017ca/ruff-0.15.1-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6a4a42cbb8af0bda9bcd7606b064d7c0bc311a88d141d02f78920be6acb5aa83", size = 11274336, upload-time = "2026-02-12T23:09:14.907Z" }, - { url = "https://files.pythonhosted.org/packages/a3/1d/5f56cae1d6c40b8a318513599b35ea4b075d7dc1cd1d04449578c29d1d75/ruff-0.15.1-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4ab064052c31dddada35079901592dfba2e05f5b1e43af3954aafcbc1096a5b2", size = 11137288, upload-time = "2026-02-12T23:09:07.475Z" }, - { url = "https://files.pythonhosted.org/packages/cd/20/6f8d7d8f768c93b0382b33b9306b3b999918816da46537d5a61635514635/ruff-0.15.1-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:5631c940fe9fe91f817a4c2ea4e81f47bee3ca4aa646134a24374f3c19ad9454", size = 11070681, upload-time = "2026-02-12T23:08:55.43Z" }, - { url = "https://files.pythonhosted.org/packages/9a/67/d640ac76069f64cdea59dba02af2e00b1fa30e2103c7f8d049c0cff4cafd/ruff-0.15.1-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:68138a4ba184b4691ccdc39f7795c66b3c68160c586519e7e8444cf5a53e1b4c", size = 10486401, upload-time = "2026-02-12T23:09:27.927Z" }, - { url = "https://files.pythonhosted.org/packages/65/3d/e1429f64a3ff89297497916b88c32a5cc88eeca7e9c787072d0e7f1d3e1e/ruff-0.15.1-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:518f9af03bfc33c03bdb4cb63fabc935341bb7f54af500f92ac309ecfbba6330", size = 10197452, upload-time = "2026-02-12T23:09:12.147Z" }, - { url = "https://files.pythonhosted.org/packages/78/83/e2c3bade17dad63bf1e1c2ffaf11490603b760be149e1419b07049b36ef2/ruff-0.15.1-py3-none-musllinux_1_2_i686.whl", hash = "sha256:da79f4d6a826caaea95de0237a67e33b81e6ec2e25fc7e1993a4015dffca7c61", size = 10693900, upload-time = "2026-02-12T23:09:34.418Z" }, - { url = "https://files.pythonhosted.org/packages/a1/27/fdc0e11a813e6338e0706e8b39bb7a1d61ea5b36873b351acee7e524a72a/ruff-0.15.1-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:3dd86dccb83cd7d4dcfac303ffc277e6048600dfc22e38158afa208e8bf94a1f", size = 11227302, upload-time = "2026-02-12T23:09:36.536Z" }, - { url = "https://files.pythonhosted.org/packages/f6/58/ac864a75067dcbd3b95be5ab4eb2b601d7fbc3d3d736a27e391a4f92a5c1/ruff-0.15.1-py3-none-win32.whl", hash = "sha256:660975d9cb49b5d5278b12b03bb9951d554543a90b74ed5d366b20e2c57c2098", size = 10462555, upload-time = "2026-02-12T23:09:29.899Z" }, - { url = "https://files.pythonhosted.org/packages/e0/5e/d4ccc8a27ecdb78116feac4935dfc39d1304536f4296168f91ed3ec00cd2/ruff-0.15.1-py3-none-win_amd64.whl", hash = "sha256:c820fef9dd5d4172a6570e5721704a96c6679b80cf7be41659ed439653f62336", size = 11599956, upload-time = "2026-02-12T23:09:01.157Z" }, - { url = "https://files.pythonhosted.org/packages/2a/07/5bda6a85b220c64c65686bc85bd0bbb23b29c62b3a9f9433fa55f17cda93/ruff-0.15.1-py3-none-win_arm64.whl", hash = "sha256:5ff7d5f0f88567850f45081fac8f4ec212be8d0b963e385c3f7d0d2eb4899416", size = 10874604, upload-time = "2026-02-12T23:09:05.515Z" }, + { url = "https://files.pythonhosted.org/packages/2f/70/3a4dc6d09b13cb3e695f28307e5d889b2e1a66b7af9c5e257e796695b0e6/ruff-0.15.2-py3-none-linux_armv6l.whl", hash = "sha256:120691a6fdae2f16d65435648160f5b81a9625288f75544dc40637436b5d3c0d", size = 10430565, upload-time = "2026-02-19T22:32:41.824Z" }, + { url = "https://files.pythonhosted.org/packages/71/0b/bb8457b56185ece1305c666dc895832946d24055be90692381c31d57466d/ruff-0.15.2-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:a89056d831256099658b6bba4037ac6dd06f49d194199215befe2bb10457ea5e", size = 10820354, upload-time = "2026-02-19T22:32:07.366Z" }, + { url = "https://files.pythonhosted.org/packages/2d/c1/e0532d7f9c9e0b14c46f61b14afd563298b8b83f337b6789ddd987e46121/ruff-0.15.2-py3-none-macosx_11_0_arm64.whl", hash = "sha256:e36dee3a64be0ebd23c86ffa3aa3fd3ac9a712ff295e192243f814a830b6bd87", size = 10170767, upload-time = "2026-02-19T22:32:13.188Z" }, + { url = "https://files.pythonhosted.org/packages/47/e8/da1aa341d3af017a21c7a62fb5ec31d4e7ad0a93ab80e3a508316efbcb23/ruff-0.15.2-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a9fb47b6d9764677f8c0a193c0943ce9a05d6763523f132325af8a858eadc2b9", size = 10529591, upload-time = "2026-02-19T22:32:02.547Z" }, + { url = "https://files.pythonhosted.org/packages/93/74/184fbf38e9f3510231fbc5e437e808f0b48c42d1df9434b208821efcd8d6/ruff-0.15.2-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:f376990f9d0d6442ea9014b19621d8f2aaf2b8e39fdbfc79220b7f0c596c9b80", size = 10260771, upload-time = "2026-02-19T22:32:36.938Z" }, + { url = "https://files.pythonhosted.org/packages/05/ac/605c20b8e059a0bc4b42360414baa4892ff278cec1c91fff4be0dceedefd/ruff-0.15.2-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2dcc987551952d73cbf5c88d9fdee815618d497e4df86cd4c4824cc59d5dd75f", size = 11045791, upload-time = "2026-02-19T22:32:31.642Z" }, + { url = "https://files.pythonhosted.org/packages/fd/52/db6e419908f45a894924d410ac77d64bdd98ff86901d833364251bd08e22/ruff-0.15.2-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:42a47fd785cbe8c01b9ff45031af875d101b040ad8f4de7bbb716487c74c9a77", size = 11879271, upload-time = "2026-02-19T22:32:29.305Z" }, + { url = "https://files.pythonhosted.org/packages/3e/d8/7992b18f2008bdc9231d0f10b16df7dda964dbf639e2b8b4c1b4e91b83af/ruff-0.15.2-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cbe9f49354866e575b4c6943856989f966421870e85cd2ac94dccb0a9dcb2fea", size = 11303707, upload-time = "2026-02-19T22:32:22.492Z" }, + { url = "https://files.pythonhosted.org/packages/d7/02/849b46184bcfdd4b64cde61752cc9a146c54759ed036edd11857e9b8443b/ruff-0.15.2-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b7a672c82b5f9887576087d97be5ce439f04bbaf548ee987b92d3a7dede41d3a", size = 11149151, upload-time = "2026-02-19T22:32:44.234Z" }, + { url = "https://files.pythonhosted.org/packages/70/04/f5284e388bab60d1d3b99614a5a9aeb03e0f333847e2429bebd2aaa1feec/ruff-0.15.2-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:72ecc64f46f7019e2bcc3cdc05d4a7da958b629a5ab7033195e11a438403d956", size = 11091132, upload-time = "2026-02-19T22:32:24.691Z" }, + { url = "https://files.pythonhosted.org/packages/fa/ae/88d844a21110e14d92cf73d57363fab59b727ebeabe78009b9ccb23500af/ruff-0.15.2-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:8dcf243b15b561c655c1ef2f2b0050e5d50db37fe90115507f6ff37d865dc8b4", size = 10504717, upload-time = "2026-02-19T22:32:26.75Z" }, + { url = "https://files.pythonhosted.org/packages/64/27/867076a6ada7f2b9c8292884ab44d08fd2ba71bd2b5364d4136f3cd537e1/ruff-0.15.2-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:dab6941c862c05739774677c6273166d2510d254dac0695c0e3f5efa1b5585de", size = 10263122, upload-time = "2026-02-19T22:32:10.036Z" }, + { url = "https://files.pythonhosted.org/packages/e7/ef/faf9321d550f8ebf0c6373696e70d1758e20ccdc3951ad7af00c0956be7c/ruff-0.15.2-py3-none-musllinux_1_2_i686.whl", hash = "sha256:1b9164f57fc36058e9a6806eb92af185b0697c9fe4c7c52caa431c6554521e5c", size = 10735295, upload-time = "2026-02-19T22:32:39.227Z" }, + { url = "https://files.pythonhosted.org/packages/2f/55/e8089fec62e050ba84d71b70e7834b97709ca9b7aba10c1a0b196e493f97/ruff-0.15.2-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:80d24fcae24d42659db7e335b9e1531697a7102c19185b8dc4a028b952865fd8", size = 11241641, upload-time = "2026-02-19T22:32:34.617Z" }, + { url = "https://files.pythonhosted.org/packages/23/01/1c30526460f4d23222d0fabd5888868262fd0e2b71a00570ca26483cd993/ruff-0.15.2-py3-none-win32.whl", hash = "sha256:fd5ff9e5f519a7e1bd99cbe8daa324010a74f5e2ebc97c6242c08f26f3714f6f", size = 10507885, upload-time = "2026-02-19T22:32:15.635Z" }, + { url = "https://files.pythonhosted.org/packages/5c/10/3d18e3bbdf8fc50bbb4ac3cc45970aa5a9753c5cb51bf9ed9a3cd8b79fa3/ruff-0.15.2-py3-none-win_amd64.whl", hash = "sha256:d20014e3dfa400f3ff84830dfb5755ece2de45ab62ecea4af6b7262d0fb4f7c5", size = 11623725, upload-time = "2026-02-19T22:32:04.947Z" }, + { url = "https://files.pythonhosted.org/packages/6d/78/097c0798b1dab9f8affe73da9642bb4500e098cb27fd8dc9724816ac747b/ruff-0.15.2-py3-none-win_arm64.whl", hash = "sha256:cabddc5822acdc8f7b5527b36ceac55cc51eec7b1946e60181de8fe83ca8876e", size = 10941649, upload-time = "2026-02-19T22:32:18.108Z" }, ] [[package]] @@ -995,26 +995,26 @@ wheels = [ [[package]] name = "ty" -version = "0.0.17" +version = "0.0.18" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/66/c3/41ae6346443eedb65b96761abfab890a48ce2aa5a8a27af69c5c5d99064d/ty-0.0.17.tar.gz", hash = "sha256:847ed6c120913e280bf9b54d8eaa7a1049708acb8824ad234e71498e8ad09f97", size = 5167209, upload-time = "2026-02-13T13:26:36.835Z" } +sdist = { url = "https://files.pythonhosted.org/packages/74/15/9682700d8d60fdca7afa4febc83a2354b29cdcd56e66e19c92b521db3b39/ty-0.0.18.tar.gz", hash = "sha256:04ab7c3db5dcbcdac6ce62e48940d3a0124f377c05499d3f3e004e264ae94b83", size = 5214774, upload-time = "2026-02-20T21:51:31.173Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/c0/01/0ef15c22a1c54b0f728ceff3f62d478dbf8b0dcf8ff7b80b954f79584f3e/ty-0.0.17-py3-none-linux_armv6l.whl", hash = "sha256:64a9a16555cc8867d35c2647c2f1afbd3cae55f68fd95283a574d1bb04fe93e0", size = 10192793, upload-time = "2026-02-13T13:27:13.943Z" }, - { url = "https://files.pythonhosted.org/packages/0f/2c/f4c322d9cded56edc016b1092c14b95cf58c8a33b4787316ea752bb9418e/ty-0.0.17-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:eb2dbd8acd5c5a55f4af0d479523e7c7265a88542efe73ed3d696eb1ba7b6454", size = 10051977, upload-time = "2026-02-13T13:26:57.741Z" }, - { url = "https://files.pythonhosted.org/packages/4c/a5/43746c1ff81e784f5fc303afc61fe5bcd85d0fcf3ef65cb2cef78c7486c7/ty-0.0.17-py3-none-macosx_11_0_arm64.whl", hash = "sha256:f18f5fd927bc628deb9ea2df40f06b5f79c5ccf355db732025a3e8e7152801f6", size = 9564639, upload-time = "2026-02-13T13:26:42.781Z" }, - { url = "https://files.pythonhosted.org/packages/d6/b8/280b04e14a9c0474af574f929fba2398b5e1c123c1e7735893b4cd73d13c/ty-0.0.17-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5383814d1d7a5cc53b3b07661856bab04bb2aac7a677c8d33c55169acdaa83df", size = 10061204, upload-time = "2026-02-13T13:27:00.152Z" }, - { url = "https://files.pythonhosted.org/packages/2a/d7/493e1607d8dfe48288d8a768a2adc38ee27ef50e57f0af41ff273987cda0/ty-0.0.17-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:9c20423b8744b484f93e7bf2ef8a9724bca2657873593f9f41d08bd9f83444c9", size = 10013116, upload-time = "2026-02-13T13:26:34.543Z" }, - { url = "https://files.pythonhosted.org/packages/80/ef/22f3ed401520afac90dbdf1f9b8b7755d85b0d5c35c1cb35cf5bd11b59c2/ty-0.0.17-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e6f5b1aba97db9af86517b911674b02f5bc310750485dc47603a105bd0e83ddd", size = 10533623, upload-time = "2026-02-13T13:26:31.449Z" }, - { url = "https://files.pythonhosted.org/packages/75/ce/744b15279a11ac7138832e3a55595706b4a8a209c9f878e3ab8e571d9032/ty-0.0.17-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:488bce1a9bea80b851a97cd34c4d2ffcd69593d6c3f54a72ae02e5c6e47f3d0c", size = 11069750, upload-time = "2026-02-13T13:26:48.638Z" }, - { url = "https://files.pythonhosted.org/packages/f2/be/1133c91f15a0e00d466c24f80df486d630d95d1b2af63296941f7473812f/ty-0.0.17-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8df66b91ec84239420985ec215e7f7549bfda2ac036a3b3c065f119d1c06825a", size = 10870862, upload-time = "2026-02-13T13:26:54.715Z" }, - { url = "https://files.pythonhosted.org/packages/3e/4a/a2ed209ef215b62b2d3246e07e833081e07d913adf7e0448fc204be443d6/ty-0.0.17-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:002139e807c53002790dfefe6e2f45ab0e04012e76db3d7c8286f96ec121af8f", size = 10628118, upload-time = "2026-02-13T13:26:45.439Z" }, - { url = "https://files.pythonhosted.org/packages/b3/0c/87476004cb5228e9719b98afffad82c3ef1f84334bde8527bcacba7b18cb/ty-0.0.17-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:6c4e01f05ce82e5d489ab3900ca0899a56c4ccb52659453780c83e5b19e2b64c", size = 10038185, upload-time = "2026-02-13T13:27:02.693Z" }, - { url = "https://files.pythonhosted.org/packages/46/4b/98f0b3ba9aef53c1f0305519536967a4aa793a69ed72677b0a625c5313ac/ty-0.0.17-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:2b226dd1e99c0d2152d218c7e440150d1a47ce3c431871f0efa073bbf899e881", size = 10047644, upload-time = "2026-02-13T13:27:05.474Z" }, - { url = "https://files.pythonhosted.org/packages/93/e0/06737bb80aa1a9103b8651d2eb691a7e53f1ed54111152be25f4a02745db/ty-0.0.17-py3-none-musllinux_1_2_i686.whl", hash = "sha256:8b11f1da7859e0ad69e84b3c5ef9a7b055ceed376a432fad44231bdfc48061c2", size = 10231140, upload-time = "2026-02-13T13:27:10.844Z" }, - { url = "https://files.pythonhosted.org/packages/7c/79/e2a606bd8852383ba9abfdd578f4a227bd18504145381a10a5f886b4e751/ty-0.0.17-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:c04e196809ff570559054d3e011425fd7c04161529eb551b3625654e5f2434cb", size = 10718344, upload-time = "2026-02-13T13:26:51.66Z" }, - { url = "https://files.pythonhosted.org/packages/c5/2d/2663984ac11de6d78f74432b8b14ba64d170b45194312852b7543cf7fd56/ty-0.0.17-py3-none-win32.whl", hash = "sha256:305b6ed150b2740d00a817b193373d21f0767e10f94ac47abfc3b2e5a5aec809", size = 9672932, upload-time = "2026-02-13T13:27:08.522Z" }, - { url = "https://files.pythonhosted.org/packages/de/b5/39be78f30b31ee9f5a585969930c7248354db90494ff5e3d0756560fb731/ty-0.0.17-py3-none-win_amd64.whl", hash = "sha256:531828267527aee7a63e972f54e5eee21d9281b72baf18e5c2850c6b862add83", size = 10542138, upload-time = "2026-02-13T13:27:17.084Z" }, - { url = "https://files.pythonhosted.org/packages/40/b7/f875c729c5d0079640c75bad2c7e5d43edc90f16ba242f28a11966df8f65/ty-0.0.17-py3-none-win_arm64.whl", hash = "sha256:de9810234c0c8d75073457e10a84825b9cd72e6629826b7f01c7a0b266ae25b1", size = 10023068, upload-time = "2026-02-13T13:26:39.637Z" }, + { url = "https://files.pythonhosted.org/packages/ae/d8/920460d4c22ea68fcdeb0b2fb53ea2aeb9c6d7875bde9278d84f2ac767b6/ty-0.0.18-py3-none-linux_armv6l.whl", hash = "sha256:4e5e91b0a79857316ef893c5068afc4b9872f9d257627d9bc8ac4d2715750d88", size = 10280825, upload-time = "2026-02-20T21:51:25.03Z" }, + { url = "https://files.pythonhosted.org/packages/83/56/62587de582d3d20d78fcdddd0594a73822ac5a399a12ef512085eb7a4de6/ty-0.0.18-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:ee0e578b3f8416e2d5416da9553b78fd33857868aa1384cb7fefeceee5ff102d", size = 10118324, upload-time = "2026-02-20T21:51:22.27Z" }, + { url = "https://files.pythonhosted.org/packages/2f/2d/dbdace8d432a0755a7417f659bfd5b8a4261938ecbdfd7b42f4c454f5aa9/ty-0.0.18-py3-none-macosx_11_0_arm64.whl", hash = "sha256:3f7a0487d36b939546a91d141f7fc3dbea32fab4982f618d5b04dc9d5b6da21e", size = 9605861, upload-time = "2026-02-20T21:51:16.066Z" }, + { url = "https://files.pythonhosted.org/packages/6b/d9/de11c0280f778d5fc571393aada7fe9b8bc1dd6a738f2e2c45702b8b3150/ty-0.0.18-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d5e2fa8d45f57ca487a470e4bf66319c09b561150e98ae2a6b1a97ef04c1a4eb", size = 10092701, upload-time = "2026-02-20T21:51:26.862Z" }, + { url = "https://files.pythonhosted.org/packages/0f/94/068d4d591d791041732171e7b63c37a54494b2e7d28e88d2167eaa9ad875/ty-0.0.18-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:d75652e9e937f7044b1aca16091193e7ef11dac1c7ec952b7fb8292b7ba1f5f2", size = 10109203, upload-time = "2026-02-20T21:51:11.59Z" }, + { url = "https://files.pythonhosted.org/packages/34/e4/526a4aa56dc0ca2569aaa16880a1ab105c3b416dd70e87e25a05688999f3/ty-0.0.18-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:563c868edceb8f6ddd5e91113c17d3676b028f0ed380bdb3829b06d9beb90e58", size = 10614200, upload-time = "2026-02-20T21:51:20.298Z" }, + { url = "https://files.pythonhosted.org/packages/fd/3d/b68ab20a34122a395880922587fbfc3adf090d22e0fb546d4d20fe8c2621/ty-0.0.18-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:502e2a1f948bec563a0454fc25b074bf5cf041744adba8794d024277e151d3b0", size = 11153232, upload-time = "2026-02-20T21:51:14.121Z" }, + { url = "https://files.pythonhosted.org/packages/68/ea/678243c042343fcda7e6af36036c18676c355878dcdcd517639586d2cf9e/ty-0.0.18-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cc881dea97021a3aa29134a476937fd8054775c4177d01b94db27fcfb7aab65b", size = 10832934, upload-time = "2026-02-20T21:51:32.92Z" }, + { url = "https://files.pythonhosted.org/packages/d8/bd/7f8d647cef8b7b346c0163230a37e903c7461c7248574840b977045c77df/ty-0.0.18-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:421fcc3bc64cab56f48edb863c7c1c43649ec4d78ff71a1acb5366ad723b6021", size = 10700888, upload-time = "2026-02-20T21:51:09.673Z" }, + { url = "https://files.pythonhosted.org/packages/6e/06/cb3620dc48c5d335ba7876edfef636b2f4498eff4a262ff90033b9e88408/ty-0.0.18-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:0fe5038a7136a0e638a2fb1ad06e3d3c4045314c6ba165c9c303b9aeb4623d6c", size = 10078965, upload-time = "2026-02-20T21:51:07.678Z" }, + { url = "https://files.pythonhosted.org/packages/60/27/c77a5a84533fa3b685d592de7b4b108eb1f38851c40fac4e79cc56ec7350/ty-0.0.18-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:d123600a52372677613a719bbb780adeb9b68f47fb5f25acb09171de390e0035", size = 10134659, upload-time = "2026-02-20T21:51:18.311Z" }, + { url = "https://files.pythonhosted.org/packages/43/6e/60af6b88c73469e628ba5253a296da6984e0aa746206f3034c31f1a04ed1/ty-0.0.18-py3-none-musllinux_1_2_i686.whl", hash = "sha256:bb4bc11d32a1bf96a829bf6b9696545a30a196ac77bbc07cc8d3dfee35e03723", size = 10297494, upload-time = "2026-02-20T21:51:39.631Z" }, + { url = "https://files.pythonhosted.org/packages/33/90/612dc0b68224c723faed6adac2bd3f930a750685db76dfe17e6b9e534a83/ty-0.0.18-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:dda2efbf374ba4cd704053d04e32f2f784e85c2ddc2400006b0f96f5f7e4b667", size = 10791944, upload-time = "2026-02-20T21:51:37.13Z" }, + { url = "https://files.pythonhosted.org/packages/0d/da/f4ada0fd08a9e4138fe3fd2bcd3797753593f423f19b1634a814b9b2a401/ty-0.0.18-py3-none-win32.whl", hash = "sha256:c5768607c94977dacddc2f459ace6a11a408a0f57888dd59abb62d28d4fee4f7", size = 9677964, upload-time = "2026-02-20T21:51:42.039Z" }, + { url = "https://files.pythonhosted.org/packages/5e/fa/090ed9746e5c59fc26d8f5f96dc8441825171f1f47752f1778dad690b08b/ty-0.0.18-py3-none-win_amd64.whl", hash = "sha256:b78d0fa1103d36fc2fce92f2092adace52a74654ab7884d54cdaec8eb5016a4d", size = 10636576, upload-time = "2026-02-20T21:51:29.159Z" }, + { url = "https://files.pythonhosted.org/packages/92/4f/5dd60904c8105cda4d0be34d3a446c180933c76b84ae0742e58f02133713/ty-0.0.18-py3-none-win_arm64.whl", hash = "sha256:01770c3c82137c6b216aa3251478f0b197e181054ee92243772de553d3586398", size = 10095449, upload-time = "2026-02-20T21:51:34.914Z" }, ] [[package]] From a2c3ad09bd655bc2c5da036bfa1205883a73ceb2 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Mon, 23 Feb 2026 12:46:34 -0800 Subject: [PATCH 132/229] use vendored cppcheck from dependencies repo (#3154) --- .github/workflows/cache/action.yaml | 13 ------- .github/workflows/tests.yml | 7 +--- .github/workflows/update-cppcheck.yml | 41 --------------------- lefthook.yml | 2 +- opendbc/safety/tests/misra/coverage_table | 2 +- opendbc/safety/tests/misra/install.sh | 25 ------------- opendbc/safety/tests/misra/test_misra.sh | 2 +- opendbc/safety/tests/misra/test_mutation.py | 2 +- pyproject.toml | 1 + setup.sh | 2 - uv.lock | 7 ++++ 11 files changed, 13 insertions(+), 91 deletions(-) delete mode 100644 .github/workflows/cache/action.yaml delete mode 100644 .github/workflows/update-cppcheck.yml delete mode 100755 opendbc/safety/tests/misra/install.sh diff --git a/.github/workflows/cache/action.yaml b/.github/workflows/cache/action.yaml deleted file mode 100644 index 2fef54140c1..00000000000 --- a/.github/workflows/cache/action.yaml +++ /dev/null @@ -1,13 +0,0 @@ -name: 'Restore cache' -runs: - using: "composite" - steps: - - name: Restore cached cppcheck - id: cppcache - uses: actions/cache@v4 - with: - path: opendbc/safety/tests/misra/cppcheck/ - key: cppcheck-cache-${{ runner.os }}-${{ hashFiles('opendbc/safety/tests/misra/install.sh') }} - - name: Set cache-hit output - run: echo "cache-hit=${{ steps.cppcache.outputs.cache-hit }}" >> $GITHUB_OUTPUT - shell: bash diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b437a690d94..835e01c44ba 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,11 +18,9 @@ jobs: - os: ${{ github.repository == 'commaai/opendbc' && 'namespace-profile-macos-8x14' || 'macos-latest' }} steps: - uses: actions/checkout@v4 - - uses: ./.github/workflows/cache - id: cache - uses: commaai/timeout@v1 with: - timeout: ${{ github.repository == 'commaai/opendbc' && (steps.cache.outputs.cache-hit == 'true' && '60' || '90') || '999' }} + timeout: ${{ github.repository == 'commaai/opendbc' && '90' || '999' }} - run: ./test.sh safety_tests: @@ -33,7 +31,6 @@ jobs: with: timeout: ${{ github.repository == 'commaai/opendbc' && '60' || '999' }} - uses: actions/checkout@v4 - - uses: ./.github/workflows/cache - name: Run safety tests run: ./opendbc/safety/tests/test.sh @@ -53,7 +50,6 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 # need master to get diff - - uses: ./.github/workflows/cache - name: Run mutation tests run: | source setup.sh @@ -69,7 +65,6 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: ./.github/workflows/cache - name: Build opendbc run: | source setup.sh diff --git a/.github/workflows/update-cppcheck.yml b/.github/workflows/update-cppcheck.yml deleted file mode 100644 index ee2bb1a15f6..00000000000 --- a/.github/workflows/update-cppcheck.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: Update cppcheck - -on: - #push: - schedule: - - cron: "0 14 * * 1" # every Monday at 2am UTC (6am PST) - workflow_dispatch: - -jobs: - update-cppcheck: - runs-on: ubuntu-latest - permissions: - contents: write - pull-requests: write - steps: - - uses: actions/checkout@v4 - - name: Get latest cppcheck version - id: version - run: | - # Tags are sorted by time (newest first), so get the first version-like tag - LATEST=$(curl -fsSL "https://api.github.com/repos/danmar/cppcheck/tags?per_page=20" | \ - jq -r '.[].name' | \ - grep -E '^[0-9]+\.[0-9]+(\.[0-9]+)?$' | \ - head -n 1) - echo "vers=$LATEST" >> "$GITHUB_OUTPUT" - - name: Update VERS in install.sh - run: | - sed -i "s/^VERS=\".*\"/VERS=\"${{ steps.version.outputs.vers }}\"/" opendbc/safety/tests/misra/install.sh - grep VERS opendbc/safety/tests/misra/install.sh - - name: Create Pull Request - uses: peter-evans/create-pull-request@9153d834b60caba6d51c9b9510b087acf9f33f83 - with: - author: Vehicle Researcher - token: ${{ secrets.ACTIONS_CREATE_PR_PAT }} - commit-message: "[bot] Update cppcheck to ${{ steps.version.outputs.vers }}" - title: "[bot] Update cppcheck to ${{ steps.version.outputs.vers }}" - body: "See all cppcheck releases: https://github.com/danmar/cppcheck/releases" - branch: "update-cppcheck" - base: "master" - delete-branch: true - labels: bot diff --git a/lefthook.yml b/lefthook.yml index 0c70870f9f8..082b7eef6bf 100644 --- a/lefthook.yml +++ b/lefthook.yml @@ -21,7 +21,7 @@ test: run: codespell {files} -L tge,stdio -S *.dbc files: git ls-tree -r HEAD --name-only cpplint: - run: cpplint --exclude=opendbc/safety/tests/misra/cppcheck/ --exclude=opendbc/can/*_pyx.cpp --recursive --quiet --counting=detailed --linelength=240 --filter=-build,-legal,-readability,-runtime,-whitespace,+build/include_subdir,+build/forward_decl,+build/include_what_you_use,+build/deprecated,+whitespace/comma,+whitespace/line_length,+whitespace/empty_if_body,+whitespace/empty_loop_body,+whitespace/empty_conditional_body,+whitespace/forcolon,+whitespace/parens,+whitespace/semicolon,+whitespace/tab,+readability/braces opendbc/ + run: cpplint --exclude=opendbc/can/*_pyx.cpp --recursive --quiet --counting=detailed --linelength=240 --filter=-build,-legal,-readability,-runtime,-whitespace,+build/include_subdir,+build/forward_decl,+build/include_what_you_use,+build/deprecated,+whitespace/comma,+whitespace/line_length,+whitespace/empty_if_body,+whitespace/empty_loop_body,+whitespace/empty_conditional_body,+whitespace/forcolon,+whitespace/parens,+whitespace/semicolon,+whitespace/tab,+readability/braces opendbc/ misra: run: opendbc/safety/tests/misra/test_misra.sh diff --git a/opendbc/safety/tests/misra/coverage_table b/opendbc/safety/tests/misra/coverage_table index 8753003fe9f..0395aba0d67 100644 --- a/opendbc/safety/tests/misra/coverage_table +++ b/opendbc/safety/tests/misra/coverage_table @@ -9,7 +9,7 @@ 2.6 X (Cppcheck) 2.7 X (Addon) 3.1 X (Addon) -3.2 +3.2 X (Addon) 4.1 X (Addon) 4.2 X (Addon) 5.1 X (Addon) diff --git a/opendbc/safety/tests/misra/install.sh b/opendbc/safety/tests/misra/install.sh deleted file mode 100755 index f586fc32d53..00000000000 --- a/opendbc/safety/tests/misra/install.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash -set -e - -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -: "${CPPCHECK_DIR:=$DIR/cppcheck/}" - -# skip if we're running in parallel with test_mutation.py -if [ ! -z "$OPENDBC_ROOT" ]; then - exit 0 -fi - -if [ ! -d "$CPPCHECK_DIR" ]; then - git clone https://github.com/danmar/cppcheck.git $CPPCHECK_DIR -fi - -cd $CPPCHECK_DIR - -VERS="2.19.1" -if [ "$(git describe --tags --always)" != "$VERS" ]; then - git fetch --all --tags --force - git checkout $VERS -fi - -#make clean -make MATCHCOMPILTER=yes CXXFLAGS="-O2" -j8 diff --git a/opendbc/safety/tests/misra/test_misra.sh b/opendbc/safety/tests/misra/test_misra.sh index 6707842880f..0b2ffeba09e 100755 --- a/opendbc/safety/tests/misra/test_misra.sh +++ b/opendbc/safety/tests/misra/test_misra.sh @@ -11,7 +11,7 @@ YELLOW="\e[1;33m" RED="\e[1;31m" NC='\033[0m' -: "${CPPCHECK_DIR:=$DIR/cppcheck/}" +: "${CPPCHECK_DIR:=$(python3 -c "import cppcheck; print(cppcheck.DIR)")}" # ensure checked in coverage table is up to date python3 $CPPCHECK_DIR/addons/misra.py -generate-table > coverage_table diff --git a/opendbc/safety/tests/misra/test_mutation.py b/opendbc/safety/tests/misra/test_mutation.py index c4bdc93cb44..cabff3fef82 100644 --- a/opendbc/safety/tests/misra/test_mutation.py +++ b/opendbc/safety/tests/misra/test_mutation.py @@ -47,7 +47,7 @@ def test_misra_mutation(fn, rule, transform, should_fail): with tempfile.TemporaryDirectory() as tmp: shutil.copytree(ROOT, tmp, dirs_exist_ok=True, - ignore=shutil.ignore_patterns('.venv', 'cppcheck', '.git', '*.ctu-info', '.hypothesis')) + ignore=shutil.ignore_patterns('.venv', '.git', '*.ctu-info', '.hypothesis')) # apply patch if fn is not None: diff --git a/pyproject.toml b/pyproject.toml index 206772789cd..ab3d3bb6107 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,6 +41,7 @@ testing = [ "lefthook", "cpplint", "codespell", + "cppcheck @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=cppcheck", ] docs = [ "Jinja2", diff --git a/setup.sh b/setup.sh index 8e243493c2e..b318bba7655 100755 --- a/setup.sh +++ b/setup.sh @@ -41,5 +41,3 @@ fi export UV_PROJECT_ENVIRONMENT="$BASEDIR/.venv" uv sync --all-extras --inexact source "$PYTHONPATH/.venv/bin/activate" - -$BASEDIR/opendbc/safety/tests/misra/install.sh diff --git a/uv.lock b/uv.lock index eff8077168f..445222a9476 100644 --- a/uv.lock +++ b/uv.lock @@ -223,6 +223,11 @@ toml = [ { name = "tomli", marker = "python_full_version <= '3.11'" }, ] +[[package]] +name = "cppcheck" +version = "2.16.0" +source = { git = "https://github.com/commaai/dependencies.git?subdirectory=cppcheck&rev=releases#2f738421b9b6af97bf242319a1bea68e161d9b82" } + [[package]] name = "cpplint" version = "2.0.2" @@ -586,6 +591,7 @@ testing = [ { name = "cffi" }, { name = "codespell" }, { name = "comma-car-segments" }, + { name = "cppcheck" }, { name = "cpplint" }, { name = "gcovr" }, { name = "hypothesis" }, @@ -607,6 +613,7 @@ requires-dist = [ { name = "cffi", marker = "extra == 'testing'" }, { name = "codespell", marker = "extra == 'testing'" }, { name = "comma-car-segments", marker = "extra == 'testing'", url = "https://huggingface.co/datasets/commaai/commaCarSegments/resolve/main/dist/comma_car_segments-0.1.0-py3-none-any.whl" }, + { name = "cppcheck", marker = "extra == 'testing'", git = "https://github.com/commaai/dependencies.git?subdirectory=cppcheck&rev=releases" }, { name = "cpplint", marker = "extra == 'testing'" }, { name = "crcmod-plus" }, { name = "gcovr", marker = "extra == 'testing'" }, From ffe10c0c809cc48726292c832b109a14fee603be Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Mon, 23 Feb 2026 14:42:29 -0800 Subject: [PATCH 133/229] switch to system compiler (GCC) for libsafety tests (#3155) --- opendbc/safety/tests/libsafety/SConscript | 2 -- 1 file changed, 2 deletions(-) diff --git a/opendbc/safety/tests/libsafety/SConscript b/opendbc/safety/tests/libsafety/SConscript index 78c2ad65df6..10adf3f886e 100644 --- a/opendbc/safety/tests/libsafety/SConscript +++ b/opendbc/safety/tests/libsafety/SConscript @@ -4,7 +4,6 @@ import platform system = platform.system() env = Environment( - CC='clang', CFLAGS=[ '-Wall', "-Wextra", @@ -17,7 +16,6 @@ env = Environment( '-g', '-O0', '-fno-omit-frame-pointer', - '-grecord-command-line', '-DALLOW_DEBUG', ], LINKFLAGS=[ From 8b4b2f5d9d2aa49d53682e25044145d1c40ed70a Mon Sep 17 00:00:00 2001 From: droggs <101385047+droggs@users.noreply.github.com> Date: Tue, 24 Feb 2026 12:57:14 +1300 Subject: [PATCH 134/229] HKG: add 2019 Ioniq Electric RHD fingerprints (#3152) * HKG: add 2019 Ioniq Electric RHD fingerprints * mechanical sorting by auto_fingerprint --------- Co-authored-by: droggs Co-authored-by: Jason Young --- opendbc/car/hyundai/fingerprints.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opendbc/car/hyundai/fingerprints.py b/opendbc/car/hyundai/fingerprints.py index 02f67e2e6ee..2241dc353e5 100644 --- a/opendbc/car/hyundai/fingerprints.py +++ b/opendbc/car/hyundai/fingerprints.py @@ -131,6 +131,7 @@ (Ecu.fwdRadar, 0x7d0, None): [ b'\xf1\x00AEev SCC F-CUP 1.00 1.00 96400-G7000 ', b'\xf1\x00AEev SCC F-CUP 1.00 1.00 96400-G7100 ', + b'\xf1\x00AEev SCC F-CUP 1.00 1.01 96400-G7000 ', ], (Ecu.eps, 0x7d4, None): [ b'\xf1\x00AE MDPS C 1.00 1.02 56310G7300\x00 4AEEC102', @@ -138,11 +139,13 @@ b'\xf1\x00AE MDPS C 1.00 1.03 56310G7300\x00 4AEEC103', b'\xf1\x00AE MDPS C 1.00 1.04 56310/G7301 4AEEC104', b'\xf1\x00AE MDPS C 1.00 1.04 56310/G7501 4AEEC104', + b'\xf1\x00AE MDPS C 1.00 1.04 56310/G7551 4AEEC104', ], (Ecu.fwdCamera, 0x7c4, None): [ b'\xf1\x00AEE MFC AT EUR LHD 1.00 1.00 95740-G2300 170703', b'\xf1\x00AEE MFC AT EUR LHD 1.00 1.00 95740-G2400 180222', b'\xf1\x00AEE MFC AT EUR LHD 1.00 1.00 95740-G7200 160418', + b'\xf1\x00AEE MFC AT EUR RHD 1.00 1.00 95740-G2400 180222', b'\xf1\x00AEE MFC AT USA LHD 1.00 1.00 95740-G2400 180222', ], }, @@ -1077,6 +1080,7 @@ b'\xf1\x00NX4 FR_CMR AT CAN LHD 1.00 1.00 99211-N9260 14Y', b'\xf1\x00NX4 FR_CMR AT CAN LHD 1.00 1.01 99211-N9100 14A', b'\xf1\x00NX4 FR_CMR AT EUR LHD 1.00 1.00 99211-N9220 14K', + b'\xf1\x00NX4 FR_CMR AT EUR LHD 1.00 1.00 99211-N9240 14Q', b'\xf1\x00NX4 FR_CMR AT EUR LHD 1.00 2.02 99211-N9000 14E', b'\xf1\x00NX4 FR_CMR AT USA LHD 1.00 1.00 99211-N9210 14G', b'\xf1\x00NX4 FR_CMR AT USA LHD 1.00 1.00 99211-N9220 14K', @@ -1085,7 +1089,6 @@ b'\xf1\x00NX4 FR_CMR AT USA LHD 1.00 1.00 99211-N9260 14Y', b'\xf1\x00NX4 FR_CMR AT USA LHD 1.00 1.01 99211-N9100 14A', b'\xf1\x00NX4 FR_CMR AT USA LHD 1.00 1.01 99211-N9240 14T', - b'\xf1\x00NX4 FR_CMR AT EUR LHD 1.00 1.00 99211-N9240 14Q', ], (Ecu.fwdRadar, 0x7d0, None): [ b'\xf1\x00NX4__ 1.00 1.00 99110-N9100 ', From 01c9a78d2ae1f014da874ee1219c802a8b849039 Mon Sep 17 00:00:00 2001 From: MVL Date: Tue, 24 Feb 2026 23:42:22 -0500 Subject: [PATCH 135/229] car docs - removing devel branch from footnote (#3157) removing devel branch from footnote --- opendbc/car/docs_definitions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendbc/car/docs_definitions.py b/opendbc/car/docs_definitions.py index c77573930a8..565814aef16 100644 --- a/opendbc/car/docs_definitions.py +++ b/opendbc/car/docs_definitions.py @@ -186,7 +186,7 @@ def all_parts(self): class CommonFootnote(Enum): EXP_LONG_AVAIL = CarFootnote( "openpilot Longitudinal Control (Alpha) is available behind a toggle; " + - "the toggle is only available in non-release branches such as `devel` or `nightly-dev`.", + "the toggle is only available in non-release branches such as `nightly-dev`.", Column.LONGITUDINAL, docs_only=True) From 2133a5a02fd929a15f7886bf5be46037aa5fc50d Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Thu, 26 Feb 2026 00:17:12 -0500 Subject: [PATCH 136/229] VW: Refactor HCA mitigation into standalone class (#3160) * VW: Refactor HCA mitigation into standalone HCAMitigation class Move the inline HCA timer/stuck-torque logic out of CarController.update() into a new HCAMitigation class. No behavior change; process replay unaffected. Adds CI tests for the mitigation logic in TestVWHCAMitigation. Co-Authored-By: Claude Sonnet 4.6 * Remove eps_timer_soft_disable_alert, consolidate tests into two No consumers yet; the alert method and its constants (STEER_TIME_MAX, STEER_TIME_ALERT) will return in a later PR when wired up. Restructure tests into two focused tests: one for the steer duration timer and one for the same-torque nudge mitigation. Co-Authored-By: Claude Opus 4.6 * gc whitespace * more cleanup of old steer duration limit code * clarity * HCAMitigation: accept steer_step as constructor parameter Removes the hardcoded DT_CTRL * 2 from the class in favor of taking steer_step as an init parameter, precomputing the threshold once. Co-Authored-By: Claude Opus 4.6 * test improvements * get actuator max from CCP * more cleanup * correctness * simpler * better * cleanup * go back to passing CCP, soon params will vary by car * more cleanup * make internal * consistency with other tests * refactor to include hca_enabled bit * forgot that * move hca_enabled back out, won't work for next phase * update comment * diff reduction --------- Co-authored-by: Claude Sonnet 4.6 --- opendbc/car/volkswagen/carcontroller.py | 56 +++++++++---------- .../car/volkswagen/tests/test_volkswagen.py | 18 +++++- opendbc/car/volkswagen/values.py | 2 - 3 files changed, 44 insertions(+), 32 deletions(-) diff --git a/opendbc/car/volkswagen/carcontroller.py b/opendbc/car/volkswagen/carcontroller.py index 387a10fa35f..1c58faee790 100644 --- a/opendbc/car/volkswagen/carcontroller.py +++ b/opendbc/car/volkswagen/carcontroller.py @@ -11,6 +11,28 @@ LongCtrlState = structs.CarControl.Actuators.LongControlState +class HCAMitigation: + """ + Manages HCA fault mitigations for VW/Audi EPS racks: + * Reduces torque by 1 for a single frame after commanding the same torque value for too long + """ + + def __init__(self, CCP): + self._max_same_torque_frames = CCP.STEER_TIME_STUCK_TORQUE / (DT_CTRL * CCP.STEER_STEP) + self._same_torque_frames = 0 + + def update(self, apply_torque, apply_torque_last): + if apply_torque != 0 and apply_torque_last == apply_torque: + self._same_torque_frames += 1 + if self._same_torque_frames > self._max_same_torque_frames: + apply_torque -= (1, -1)[apply_torque < 0] + self._same_torque_frames = 0 + else: + self._same_torque_frames = 0 + + return apply_torque + + class CarController(CarControllerBase): def __init__(self, dbc_names, CP): super().__init__(dbc_names, CP) @@ -28,9 +50,7 @@ def __init__(self, dbc_names, CP): self.apply_torque_last = 0 self.gra_acc_counter_last = None - self.eps_timer_soft_disable_alert = False - self.hca_frame_timer_running = 0 - self.hca_frame_same_torque = 0 + self.hca_mitigation = HCAMitigation(self.CCP) def update(self, CC, CS, now_nanos): actuators = CC.actuators @@ -40,35 +60,13 @@ def update(self, CC, CS, now_nanos): # **** Steering Controls ************************************************ # if self.frame % self.CCP.STEER_STEP == 0: - # Logic to avoid HCA state 4 "refused": - # * Don't steer unless HCA is in state 3 "ready" or 5 "active" - # * Don't steer at standstill - # * Don't send > 3.00 Newton-meters torque - # * Don't send the same torque for > 6 seconds - # * Don't send uninterrupted steering for > 360 seconds - # MQB racks reset the uninterrupted steering timer after a single frame - # of HCA disabled; this is done whenever output happens to be zero. - + apply_torque = 0 if CC.latActive: new_torque = int(round(actuators.torque * self.CCP.STEER_MAX)) apply_torque = apply_driver_steer_torque_limits(new_torque, self.apply_torque_last, CS.out.steeringTorque, self.CCP) - self.hca_frame_timer_running += self.CCP.STEER_STEP - if self.apply_torque_last == apply_torque: - self.hca_frame_same_torque += self.CCP.STEER_STEP - if self.hca_frame_same_torque > self.CCP.STEER_TIME_STUCK_TORQUE / DT_CTRL: - apply_torque -= (1, -1)[apply_torque < 0] - self.hca_frame_same_torque = 0 - else: - self.hca_frame_same_torque = 0 - hca_enabled = abs(apply_torque) > 0 - else: - hca_enabled = False - apply_torque = 0 - - if not hca_enabled: - self.hca_frame_timer_running = 0 - - self.eps_timer_soft_disable_alert = self.hca_frame_timer_running > self.CCP.STEER_TIME_ALERT / DT_CTRL + + apply_torque = self.hca_mitigation.update(apply_torque, self.apply_torque_last) + hca_enabled = apply_torque != 0 self.apply_torque_last = apply_torque can_sends.append(self.CCS.create_steering_control(self.packer_pt, self.CAN.pt, apply_torque, hca_enabled)) diff --git a/opendbc/car/volkswagen/tests/test_volkswagen.py b/opendbc/car/volkswagen/tests/test_volkswagen.py index c0a7a6b65e6..050212b9322 100644 --- a/opendbc/car/volkswagen/tests/test_volkswagen.py +++ b/opendbc/car/volkswagen/tests/test_volkswagen.py @@ -1,8 +1,10 @@ import random import re +from opendbc.car import DT_CTRL from opendbc.car.structs import CarParams -from opendbc.car.volkswagen.values import CAR, FW_QUERY_CONFIG, WMI +from opendbc.car.volkswagen.carcontroller import HCAMitigation +from opendbc.car.volkswagen.values import CAR, CarControllerParams as CCP, FW_QUERY_CONFIG, WMI from opendbc.car.volkswagen.fingerprints import FW_VERSIONS Ecu = CarParams.Ecu @@ -12,6 +14,20 @@ SPARE_PART_FW_PATTERN = re.compile(b'\xf1\x87(?P[0-9][0-9A-Z]{2})(?P[0-9][0-9A-Z][0-9])(?P[0-9A-Z]{2}[0-9])([A-Z0-9]| )') +class TestVolkswagenHCAMitigation: + STUCK_TORQUE_FRAMES = round(CCP.STEER_TIME_STUCK_TORQUE / (DT_CTRL * CCP.STEER_STEP)) + + def test_same_torque_mitigation(self): + """Same-torque nudge fires at the threshold, in the correct direction, and resets cleanly.""" + hca_mitigation = HCAMitigation(CCP) + + for actuator_value in (-CCP.STEER_MAX, -1, 0, 1, CCP.STEER_MAX): + hca_mitigation.update(0, 0) # Reset mitigation state + for frame in range(self.STUCK_TORQUE_FRAMES + 2): + should_nudge = actuator_value != 0 and frame == self.STUCK_TORQUE_FRAMES + expected_torque = actuator_value - (1, -1)[actuator_value < 0] if should_nudge else actuator_value + assert hca_mitigation.update(actuator_value, actuator_value) == expected_torque, f"{frame=}" + class TestVolkswagenPlatformConfigs: def test_spare_part_fw_pattern(self, subtests): # Relied on for determining if a FW is likely VW diff --git a/opendbc/car/volkswagen/values.py b/opendbc/car/volkswagen/values.py index 5aca8aa5b6b..9089b85e3c1 100644 --- a/opendbc/car/volkswagen/values.py +++ b/opendbc/car/volkswagen/values.py @@ -60,8 +60,6 @@ class CarControllerParams: STEER_DRIVER_MULTIPLIER = 3 # weight driver torque heavily STEER_DRIVER_FACTOR = 1 # from dbc - STEER_TIME_MAX = 360 # Max time that EPS allows uninterrupted HCA steering control - STEER_TIME_ALERT = STEER_TIME_MAX - 10 # If mitigation fails, time to soft disengage before EPS timer expires STEER_TIME_STUCK_TORQUE = 1.9 # EPS limits same torque to 6 seconds, reset timer 3x within that period DEFAULT_MIN_STEER_SPEED = 0.4 # m/s, newer EPS racks fault below this speed, don't show a low speed alert From cbcc9c5c65ce0552e77aedce836a4e3c56d78966 Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Sat, 28 Feb 2026 22:46:47 -0500 Subject: [PATCH 137/229] CI for the people, but in opendbc (#3163) --- .github/workflows/tests.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 835e01c44ba..dc90c32b3f9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -122,8 +122,7 @@ jobs: - uses: actions/checkout@v4 with: path: opendbc_repo - - uses: ./.github/workflows/setup-with-retry - id: setup-step + - run: ./tools/op.sh setup - name: Cache test routes id: routes-cache uses: actions/cache@v4 @@ -133,7 +132,7 @@ jobs: - name: Build openpilot run: scons -j$(nproc) common/ cereal/ selfdrive/pandad/ msgq_repo/ opendbc_repo - name: Test car models - timeout-minutes: ${{ contains(runner.name, 'nsc') && (steps.routes-cache.outputs.cache-hit == 'true') && ((steps.setup-step.outputs.duration < 18) && 1 || 2) || 6 }} + timeout-minutes: ${{ contains(runner.name, 'nsc') && (steps.routes-cache.outputs.cache-hit == 'true') && 2 || 6 }} run: MAX_EXAMPLES=1 pytest --continue-on-collection-errors --durations=0 --durations-min=5 -n logical selfdrive/car/tests/test_models.py env: NUM_JOBS: 4 From 37207f61e9bb5ee4acf9bd2c4a2ecce16035274d Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 10 Mar 2026 21:23:32 -0700 Subject: [PATCH 138/229] Replace `mull` with custom mutation test runner (#3130) simple mutation! --- .github/workflows/tests.yml | 6 +- .gitignore | 2 +- opendbc/safety/tests/libsafety/SConscript | 21 +- .../safety/tests/libsafety/libsafety_py.py | 10 +- opendbc/safety/tests/mutation.py | 633 ++++++++++++++++++ opendbc/safety/tests/mutation.sh | 20 - opendbc/safety/tests/test.sh | 7 +- pyproject.toml | 5 + setup.sh | 21 - uv.lock | 41 ++ 10 files changed, 704 insertions(+), 62 deletions(-) create mode 100755 opendbc/safety/tests/mutation.py delete mode 100755 opendbc/safety/tests/mutation.sh diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index dc90c32b3f9..0e68bf79622 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -44,17 +44,13 @@ jobs: include: - os: ${{ github.repository == 'commaai/opendbc' && 'namespace-profile-amd64-8x16' || 'ubuntu-latest' }} - os: ${{ github.repository == 'commaai/opendbc' && 'namespace-profile-macos-8x14' || 'macos-latest' }} - env: - GIT_REF: ${{ github.event_name == 'push' && github.ref == format('refs/heads/{0}', github.event.repository.default_branch) && github.event.before || format('origin/{0}', github.event.repository.default_branch) }} steps: - uses: actions/checkout@v4 - with: - fetch-depth: 0 # need master to get diff - name: Run mutation tests run: | source setup.sh scons -j8 - cd opendbc/safety/tests && ./mutation.sh + python opendbc/safety/tests/mutation.py car_diff: name: car diff diff --git a/.gitignore b/.gitignore index 269017bf17c..7aebff785fa 100644 --- a/.gitignore +++ b/.gitignore @@ -20,8 +20,8 @@ /dist/ .vscode/ __pycache__/ -mull.yml *.profraw +.sconf_temp/ opendbc/can/build/ opendbc/can/obj/ diff --git a/opendbc/safety/tests/libsafety/SConscript b/opendbc/safety/tests/libsafety/SConscript index 10adf3f886e..3117d985fe1 100644 --- a/opendbc/safety/tests/libsafety/SConscript +++ b/opendbc/safety/tests/libsafety/SConscript @@ -26,18 +26,17 @@ env = Environment( tools=["default", "compilation_db"], ) -# The Mull plugin injects mutations that are dormant unless run with mull-runner -if system == "Darwin": - mull_plugin = Dir('#').abspath + '/.mull/lib/mull-ir-frontend-18' -else: - mull_plugin = '/usr/lib/mull-ir-frontend-18' -if os.path.exists(mull_plugin): - # Only use mull plugin if it exists - env['CC'] = 'clang-18' - env.Append(CFLAGS=['-fprofile-arcs', '-ftest-coverage', f'-fpass-plugin={mull_plugin}']) +# add coverage if available +# Use TryCompile (not TryLink) because -nostdlib in CFLAGS breaks the link probe. +conf = Configure(env, log_file=os.devnull) +prev = env['CFLAGS'][:] +env.Append(CFLAGS=['-fprofile-arcs', '-ftest-coverage']) +has_coverage = conf.TryCompile('int x;\n', '.c') +env['CFLAGS'] = prev +if has_coverage: + env.Append(CFLAGS=['-fprofile-arcs', '-ftest-coverage']) env.Append(LINKFLAGS=['-fprofile-arcs', '-ftest-coverage']) - if system == "Darwin": - env.PrependENVPath('PATH', '/opt/homebrew/opt/llvm@18/bin') +env = conf.Finish() safety = env.SharedObject("safety.os", "safety.c") libsafety = env.SharedLibrary("libsafety.so", [safety]) diff --git a/opendbc/safety/tests/libsafety/libsafety_py.py b/opendbc/safety/tests/libsafety/libsafety_py.py index e93b782ea4a..be98fdab258 100644 --- a/opendbc/safety/tests/libsafety/libsafety_py.py +++ b/opendbc/safety/tests/libsafety/libsafety_py.py @@ -4,7 +4,6 @@ from opendbc.safety import LEN_TO_DLC libsafety_dir = os.path.dirname(os.path.abspath(__file__)) -libsafety_fn = os.path.join(libsafety_dir, "libsafety.so") ffi = FFI() @@ -77,11 +76,18 @@ class CANPacket: void set_honda_alt_brake_msg(bool c); void set_honda_bosch_long(bool c); int get_honda_hw(void); + +void mutation_set_active_mutant(int id); +int mutation_get_active_mutant(void); """) class LibSafety: pass -libsafety: LibSafety = ffi.dlopen(libsafety_fn) +libsafety: LibSafety = ffi.dlopen(os.path.join(libsafety_dir, "libsafety.so")) + +def load(path): + global libsafety + libsafety = ffi.dlopen(str(path)) def make_CANPacket(addr: int, bus: int, dat): ret = ffi.new('CANPacket_t *') diff --git a/opendbc/safety/tests/mutation.py b/opendbc/safety/tests/mutation.py new file mode 100755 index 00000000000..a137ef68484 --- /dev/null +++ b/opendbc/safety/tests/mutation.py @@ -0,0 +1,633 @@ +#!/usr/bin/env python3 +import argparse +import io +import os +import re +import subprocess +import sys +import tempfile +import time +import unittest +from concurrent.futures import ProcessPoolExecutor, as_completed +from collections import Counter, namedtuple +from dataclasses import dataclass +from pathlib import Path + +import tree_sitter_c as ts_c +import tree_sitter as ts + + +ROOT = Path(__file__).resolve().parents[3] +SAFETY_DIR = ROOT / "opendbc" / "safety" +SAFETY_TESTS_DIR = ROOT / "opendbc" / "safety" / "tests" +SAFETY_C_REL = Path("opendbc/safety/tests/libsafety/safety.c") + +ANSI_RESET = "\033[0m" +ANSI_BOLD = "\033[1m" +ANSI_RED = "\033[31m" +ANSI_GREEN = "\033[32m" +ANSI_YELLOW = "\033[33m" + +COMPARISON_OPERATOR_MAP = { + "==": "!=", + "!=": "==", + ">": "<=", + ">=": "<", + "<": ">=", + "<=": ">", +} + +MUTATOR_FAMILIES = { + "increment": ("update_expression", {"++": "--"}), + "decrement": ("update_expression", {"--": "++"}), + "comparison": ("binary_expression", COMPARISON_OPERATOR_MAP), + "boundary": ("number_literal", {}), + "bitwise_assignment": ("assignment_expression", {"&=": "|=", "|=": "&=", "^=": "&="}), + "bitwise": ("binary_expression", {"&": "|", "|": "&", "^": "&"}), + "arithmetic_assignment": ("assignment_expression", {"+=": "-=", "-=": "+=", "*=": "/=", "/=": "*=", "%=": "*="}), + "arithmetic": ("binary_expression", {"+": "-", "-": "+", "*": "/", "/": "*", "%": "*"}), + "remove_negation": ("unary_expression", {"!": ""}), +} + + +_RawSite = namedtuple('_RawSite', 'expr_start expr_end op_start op_end line original_op mutated_op mutator') + + +@dataclass(frozen=True) +class MutationSite: + site_id: int + expr_start: int + expr_end: int + op_start: int + op_end: int + line: int + original_op: str + mutated_op: str + mutator: str + origin_file: Path + origin_line: int + + +@dataclass(frozen=True) +class MutantResult: + site: MutationSite + outcome: str # killed | survived | infra_error + test_sec: float + details: str + + +def colorize(text, color): + term = os.environ.get("TERM", "") + if not sys.stdout.isatty() or term in ("", "dumb") or "NO_COLOR" in os.environ: + return text + return f"{color}{text}{ANSI_RESET}" + + +def format_mutation(original_op, mutated_op): + return colorize(f"{original_op}->{mutated_op}", ANSI_RED) + + +def _parse_int_literal(token): + m = re.fullmatch(r"([0-9][0-9a-fA-FxX]*)([uUlL]*)", token) + if m is None: + return None + body, suffix = m.groups() + try: + value = int(body, 0) + except ValueError: + return None + base = "hex" if body.lower().startswith("0x") else "dec" + return value, base, suffix + + +def _site_key(site): + return (site.op_start, site.op_end, site.mutator) + + +def _is_in_constexpr_context(node): + """Check if a node is inside a static or file-scope variable initializer.""" + current = node.parent + while current is not None: + if current.type == "init_declarator": + decl = current.parent + if decl and decl.type == "declaration": + for child in decl.children: + if child.type == "storage_class_specifier" and child.text == b"static": + return True + if decl.parent and decl.parent.type == "translation_unit": + return True + current = current.parent + return False + + +def _prepare_for_parsing(txt): + """Blank line markers and replace __typeof__() for tree-sitter. Preserves byte offsets.""" + result = re.sub( + r'^[ \t]*#[ \t]+\d+[ \t]+"[^\n]*', + lambda m: " " * len(m.group()), + txt, + flags=re.MULTILINE, + ) + # Replace __typeof__(...) with padded int (handle nested parens) + parts = [] + i = 0 + for m in re.finditer(r"(?:__typeof__|typeof)\s*\(", result): + if m.start() < i: + continue # skip nested typeof inside already-replaced region + parts.append(result[i:m.start()]) + depth = 1 + j = m.end() + while j < len(result) and depth > 0: + if result[j] == "(": + depth += 1 + elif result[j] == ")": + depth -= 1 + j += 1 + parts.append("int" + " " * (j - m.start() - 3)) + i = j + parts.append(result[i:]) + return "".join(parts) + + +def enumerate_sites(input_source, preprocessed_file): + subprocess.run([ + "cc", "-E", "-std=gnu11", "-nostdlib", "-fno-builtin", "-DALLOW_DEBUG", + f"-I{ROOT}", f"-I{ROOT / 'opendbc/safety/board'}", + str(input_source), "-o", str(preprocessed_file), + ], cwd=ROOT, capture_output=True, check=True) + + txt = preprocessed_file.read_text() + + # Build line map from preprocessor directives + line_map = {} + current_map_file = None + current_map_line = None + directive_re = re.compile(r'^\s*#\s*(\d+)\s+"([^"]+)"') + for pp_line_num, pp_line in enumerate(txt.splitlines(keepends=True), start=1): + m = directive_re.match(pp_line) + if m: + current_map_line = int(m.group(1)) + current_map_file = Path(m.group(2)).resolve() + continue + if current_map_file is not None and current_map_line is not None: + line_map[pp_line_num] = (current_map_file, current_map_line) + current_map_line += 1 + + # Parse with tree-sitter + parser = ts.Parser(ts.Language(ts_c.language())) + tree = parser.parse(_prepare_for_parsing(txt).encode()) + + # Build rule map + rule_map = {} + counts = {} + for mutator, (node_kind, op_map) in MUTATOR_FAMILIES.items(): + counts[mutator] = 0 + if mutator == "boundary": + continue + for original_op, mutated_op in op_map.items(): + rule_map.setdefault((node_kind, original_op), []).append((mutator, original_op, mutated_op)) + + # Walk tree to find mutation sites + deduped = {} + build_incompatible_keys = set() + stack = [tree.root_node] + while stack: + node = stack.pop() + kind = node.type + + # Boundary mutations: find number_literals inside comparison operands + if kind == "binary_expression": + cmp_op = node.child_by_field_name("operator") + if cmp_op and cmp_op.type in COMPARISON_OPERATOR_MAP: + lit_stack = [] + for field in ("left", "right"): + operand = node.child_by_field_name(field) + if operand: + lit_stack.append(operand) + while lit_stack: + n = lit_stack.pop() + if n.type == "number_literal": + token = txt[n.start_byte:n.end_byte] + parsed = _parse_int_literal(token) + if parsed: + value, base, suffix = parsed + mutated = f"0x{value + 1:X}{suffix}" if base == "hex" else f"{value + 1}{suffix}" + line = n.start_point[0] + 1 + bsite = _RawSite(n.start_byte, n.end_byte, n.start_byte, n.end_byte, line, token, mutated, "boundary") + key = _site_key(bsite) + deduped[key] = bsite + if _is_in_constexpr_context(n): + build_incompatible_keys.add(key) + lit_stack.extend(n.children) + + # Operator mutations: any node with an operator child + op_child = node.child_by_field_name("operator") + if op_child: + for mutator, original_op, mutated_op in rule_map.get((kind, op_child.type), []): + line = node.start_point[0] + 1 + site = _RawSite(node.start_byte, node.end_byte, op_child.start_byte, op_child.end_byte, line, original_op, mutated_op, mutator) + key = _site_key(site) + deduped[key] = site + if _is_in_constexpr_context(node): + build_incompatible_keys.add(key) + + stack.extend(node.children) + + sites = sorted(deduped.values(), key=lambda s: (s.op_start, s.mutator)) + out = [] + build_incompatible_site_ids = set() + for s in sites: + mapped = line_map.get(s.line) + if mapped is None: + continue + origin_file, origin_line = mapped + if SAFETY_DIR not in origin_file.parents and origin_file != SAFETY_DIR: + continue + site_id = len(out) + site = MutationSite( + site_id=site_id, expr_start=s.expr_start, expr_end=s.expr_end, + op_start=s.op_start, op_end=s.op_end, line=s.line, + original_op=s.original_op, mutated_op=s.mutated_op, mutator=s.mutator, + origin_file=origin_file, origin_line=origin_line, + ) + if _site_key(s) in build_incompatible_keys: + build_incompatible_site_ids.add(site_id) + out.append(site) + counts[s.mutator] += 1 + return out, counts, build_incompatible_site_ids, txt + + +def _build_core_tests(catalog): + """Build test ordering for core (non-mode) files. + + One test per unique method name from evenly-spaced modules, + ordered by how widely each method is shared. Methods inherited by many + classes exercise the most fundamental safety logic and run first. + """ + MAX_PER_METHOD = 5 + method_freq = {} + method_by_module = {} + for name in sorted(catalog.keys()): + for test_id in catalog[name]: + method = test_id.rsplit(".", 1)[-1] + method_freq[method] = method_freq.get(method, 0) + 1 + if method not in method_by_module: + method_by_module[method] = {} + if name not in method_by_module[method]: + method_by_module[method][name] = test_id + # Pick evenly-spaced modules for each method to maximize configuration diversity + method_ids = {} + for method, module_map in method_by_module.items(): + modules = sorted(module_map.keys()) + n = len(modules) + if n <= MAX_PER_METHOD: + method_ids[method] = [module_map[m] for m in modules] + else: + step = n / MAX_PER_METHOD + method_ids[method] = [module_map[modules[int(i * step)]] for i in range(MAX_PER_METHOD)] + # Round-robin: first instance of each method (by freq), then second, etc. + # This ensures diverse early coverage with failfast. + sorted_methods = sorted(method_freq, key=lambda m: -method_freq[m]) + ordered = [] + for round_idx in range(MAX_PER_METHOD): + for m in sorted_methods: + ids = method_ids.get(m, []) + if round_idx < len(ids): + ordered.append(ids[round_idx]) + return ordered + + +def build_priority_tests(site, catalog, core_tests): + """Build an ordered list of test IDs for a mutation site. + + For mode files: all tests from the matching test_.py module. + For core files: uses the pre-computed core_tests ordering. + """ + src = site.origin_file + rel_parts = src.relative_to(ROOT).parts + is_mode = len(rel_parts) >= 4 and rel_parts[:3] == ("opendbc", "safety", "modes") + + if is_mode: + mode_file = f"test_{src.stem}.py" + return list(catalog.get(mode_file, [])) + return core_tests + + +def format_site_snippet(site, context_lines=2): + source = site.origin_file + text = source.read_text() + lines = text.splitlines() + display_ln = site.origin_line + line_idx = display_ln - 1 + start = max(0, line_idx - context_lines) + end = min(len(lines), line_idx + context_lines + 1) + + line_text = lines[line_idx] + rel_start = line_text.find(site.original_op) + if rel_start < 0: + rel_start = 0 + rel_end = rel_start + len(site.original_op) + + snippet_lines = [] + width = len(str(end)) + for idx in range(start, end): + num = idx + 1 + prefix = ">" if idx == line_idx else " " + line = lines[idx] + if idx == line_idx: + marker = colorize(f"[[{site.original_op}->{site.mutated_op}]]", ANSI_RED) + line = f"{line[:rel_start]}{marker}{line[rel_end:]}" + snippet_lines.append(f"{prefix} {num:>{width}} | {line}") + return "\n".join(snippet_lines) + + +def render_progress(completed, total, killed, survived, infra, elapsed_sec): + bar_width = 30 + filled = int((completed / total) * bar_width) + bar = "#" * filled + "-" * (bar_width - filled) + + rate = completed / elapsed_sec if elapsed_sec > 0 else 0.0 + remaining = total - completed + eta = (remaining / rate) if rate > 0 else 0.0 + + killed_text = colorize(f"k:{killed}", ANSI_GREEN) + survived_text = colorize(f"s:{survived}", ANSI_RED) + infra_text = colorize(f"i:{infra}", ANSI_YELLOW) + + return f"[{bar}] {completed}/{total} {killed_text} {survived_text} {infra_text} mps:{rate:.2f} elapsed:{elapsed_sec:.1f}s eta:{eta:.1f}s" + + +def print_live_status(text, *, final=False): + if sys.stdout.isatty(): + print("\r" + text, end="\n" if final else "", flush=True) + else: + print(text, flush=True) + + +def _discover_test_catalog(): + loader = unittest.TestLoader() + catalog = {} + for test_file in sorted(SAFETY_TESTS_DIR.glob("test_*.py")): + module_name = ".".join(test_file.relative_to(ROOT).with_suffix("").parts) + suite = loader.loadTestsFromName(module_name) + catalog[test_file.name] = [t.id() for group in suite for t in group] + return catalog + + +def run_unittest(targets, lib_path, mutant_id, verbose): + from opendbc.safety.tests.libsafety import libsafety_py + libsafety_py.load(lib_path) + libsafety_py.libsafety.mutation_set_active_mutant(mutant_id) + + if verbose: + print("Running unittest targets:", ", ".join(targets), flush=True) + + loader = unittest.TestLoader() + stream = io.StringIO() + runner = unittest.TextTestRunner(stream=stream, verbosity=0, failfast=True) + + suite = unittest.TestSuite() + for target in targets: + suite.addTests(loader.loadTestsFromName(target)) + result = runner.run(suite) + if result.failures: + return result.failures[0][0].id() + if result.errors: + return result.errors[0][0].id() + return None + + +def _instrument_source(source, sites): + # Sort by start ascending, end descending (outermost first when same start) + sorted_sites = sorted(sites, key=lambda s: (s.expr_start, -s.expr_end)) + + # Build containment forest using a stack + roots = [] + stack = [] + for site in sorted_sites: + while stack and stack[-1][0].expr_end <= site.expr_start: + stack.pop() + node = [site, []] + if stack: + stack[-1][1].append(node) + else: + roots.append(node) + stack.append(node) + + def build_replacement(site, children): + parts = [] + pos = site.expr_start + op_rel = None + running_len = 0 + + for child_site, child_children in children: + seg = source[pos : child_site.expr_start] + if op_rel is None and site.op_start >= pos and site.op_start < child_site.expr_start: + op_rel = running_len + (site.op_start - pos) + parts.append(seg) + running_len += len(seg) + + child_repl = build_replacement(child_site, child_children) + parts.append(child_repl) + running_len += len(child_repl) + pos = child_site.expr_end + + seg = source[pos : site.expr_end] + if op_rel is None and site.op_start >= pos: + op_rel = running_len + (site.op_start - pos) + parts.append(seg) + + expr_text = "".join(parts) + op_len = site.op_end - site.op_start + assert op_rel is not None and expr_text[op_rel : op_rel + op_len] == site.original_op, ( + f"Operator mismatch (site_id={site.site_id}): expected {site.original_op!r} at offset {op_rel}" + ) + mutated_expr = f"{expr_text[:op_rel]}{site.mutated_op}{expr_text[op_rel + op_len :]}" + return f"((__mutation_active_id == {site.site_id}) ? ({mutated_expr}) : ({expr_text}))" + + result_parts = [] + pos = 0 + for site, children in roots: + result_parts.append(source[pos : site.expr_start]) + result_parts.append(build_replacement(site, children)) + pos = site.expr_end + result_parts.append(source[pos:]) + return "".join(result_parts) + + +def compile_mutated_library(preprocessed_source, sites, output_so): + instrumented = _instrument_source(preprocessed_source, sites) + + prelude = """ + static int __mutation_active_id = -1; + void mutation_set_active_mutant(int id) { __mutation_active_id = id; } + int mutation_get_active_mutant(void) { return __mutation_active_id; } + """ + marker_re = re.compile(r'^\s*#\s+\d+\s+"[^\n]*\n?', re.MULTILINE) + instrumented = prelude + marker_re.sub("", instrumented) + + mutation_source = output_so.with_suffix(".c") + mutation_source.write_text(instrumented) + + subprocess.run([ + "cc", "-shared", "-fPIC", "-w", "-fno-builtin", "-std=gnu11", + "-g0", "-O0", "-DALLOW_DEBUG", + str(mutation_source), "-o", str(output_so), + ], cwd=ROOT, check=True) + + +def eval_mutant(site, targets, lib_path, verbose): + try: + t0 = time.perf_counter() + failed_test = run_unittest(targets, lib_path, mutant_id=site.site_id, verbose=verbose) + duration = time.perf_counter() - t0 + if failed_test is not None: + return MutantResult(site, "killed", duration, "") + return MutantResult(site, "survived", duration, "") + except Exception as exc: + return MutantResult(site, "infra_error", 0.0, str(exc)) + + +def main(): + parser = argparse.ArgumentParser(description="Run strict safety mutation") + parser.add_argument("-j", type=int, default=max((os.cpu_count() or 1) - 1, 1), help="parallel mutants to run") + parser.add_argument("--max-mutants", type=int, default=0, help="optional limit for debugging (0 means all)") + parser.add_argument("--list-only", action="store_true", help="list discovered candidates and exit") + parser.add_argument("--verbose", action="store_true", help="print extra debug output") + args = parser.parse_args() + + start = time.perf_counter() + + with tempfile.TemporaryDirectory(prefix="mutation-op-run-") as run_tmp_dir: + preprocessed_file = Path(run_tmp_dir) / "safety_preprocessed.c" + sites, mutator_counts, build_incompatible_ids, preprocessed_source = enumerate_sites(ROOT / SAFETY_C_REL, preprocessed_file) + assert len(sites) > 0 + + if args.max_mutants > 0: + sites = sites[: args.max_mutants] + + mutator_summary = ", ".join(f"{name} ({c})" for name in MUTATOR_FAMILIES if (c := mutator_counts.get(name, 0)) > 0) + print(f"Found {len(sites)} unique candidates: {mutator_summary}", flush=True) + if args.list_only: + for site in sites: + mutation = format_mutation(site.original_op, site.mutated_op) + print(f" #{site.site_id:03d} {site.origin_file.relative_to(ROOT)}:{site.origin_line} [{site.mutator}] {mutation}") + return 0 + + print(f"Running {len(sites)} mutants with {args.j} workers", flush=True) + + discovered_count = len(sites) + selected_site_ids = {s.site_id for s in sites} + build_incompatible_ids &= selected_site_ids + pruned_compile_sites = len(build_incompatible_ids) + if pruned_compile_sites > 0: + sites = [s for s in sites if s.site_id not in build_incompatible_ids] + print(f"Pruned {pruned_compile_sites} build-incompatible mutants from constant-expression initializers", flush=True) + if not sites: + print("Failed to build mutation library: all sites were pruned as build-incompatible", flush=True) + return 2 + + mutation_lib = Path(run_tmp_dir) / "libsafety_mutation.so" + compile_mutated_library(preprocessed_source, sites, mutation_lib) + + # Discover all tests by importing modules in the main process. + # Forked workers inherit these imports, eliminating per-worker import cost. + catalog = _discover_test_catalog() + + # Baseline smoke check + baseline_ids = catalog.get("test_defaults.py", [])[:5] + baseline_failed = run_unittest(baseline_ids, mutation_lib, mutant_id=-1, verbose=args.verbose) + if baseline_failed is not None: + print("Baseline smoke failed with mutant_id=-1; aborting to avoid false kill signals.", flush=True) + print(f" failed_test: {baseline_failed}", flush=True) + return 2 + + # Pre-compute test targets per mutation site + core_tests = _build_core_tests(catalog) + site_targets = {site.site_id: build_priority_tests(site, catalog, core_tests) for site in sites} + + results = [] + counts = Counter() + + with ProcessPoolExecutor(max_workers=args.j) as pool: + future_map = { + pool.submit(eval_mutant, site, site_targets[site.site_id], mutation_lib, args.verbose): site for site in sites + } + print_live_status(render_progress(0, len(sites), 0, 0, 0, 0.0)) + try: + for fut in as_completed(future_map): + try: + res = fut.result() + except Exception: + site = future_map[fut] + res = MutantResult(site, "killed", 0.0, "worker process crashed") + results.append(res) + counts[res.outcome] += 1 + elapsed_now = time.perf_counter() - start + done = len(results) == len(sites) + print_live_status(render_progress(len(results), len(sites), counts["killed"], counts["survived"], + counts["infra_error"], elapsed_now), final=done) + except Exception: + # Pool broken — mark all unfinished mutants as killed (crash = behavioral change detected) + completed_ids = {r.site.site_id for r in results} + for site in sites: + if site.site_id not in completed_ids: + results.append(MutantResult(site, "killed", 0.0, "pool broken")) + counts["killed"] += 1 + elapsed_now = time.perf_counter() - start + print_live_status(render_progress(len(results), len(sites), counts["killed"], counts["survived"], counts["infra_error"], elapsed_now), final=True) + + survivors = sorted((r for r in results if r.outcome == "survived"), key=lambda r: r.site.site_id) + if survivors: + print("", flush=True) + print(colorize("Surviving mutants", ANSI_RED), flush=True) + for res in survivors: + loc = f"{res.site.origin_file.relative_to(ROOT)}:{res.site.origin_line}" + mutation = format_mutation(res.site.original_op, res.site.mutated_op) + print(f"- #{res.site.site_id} {loc} [{res.site.mutator}] {mutation}", flush=True) + print(format_site_snippet(res.site), flush=True) + + infra_results = sorted((r for r in results if r.outcome == "infra_error"), key=lambda r: r.site.site_id) + if infra_results: + print("", flush=True) + print(colorize("Infra errors", ANSI_YELLOW), flush=True) + for res in infra_results: + loc = f"{res.site.origin_file.relative_to(ROOT)}:{res.site.origin_line}" + detail = res.details.splitlines()[0] if res.details else "unknown error" + print(f"- #{res.site.site_id} {loc}: {detail}", flush=True) + + elapsed = time.perf_counter() - start + total_test_sec = sum(r.test_sec for r in results) + print("", flush=True) + print(colorize("Mutation summary", ANSI_BOLD), flush=True) + print(f" discovered: {discovered_count}", flush=True) + print(f" pruned_build_incompatible: {pruned_compile_sites}", flush=True) + print(f" total: {len(sites)}", flush=True) + print(f" killed: {colorize(str(counts['killed']), ANSI_GREEN)}", flush=True) + print(f" survived: {colorize(str(counts['survived']), ANSI_RED)}", flush=True) + print(f" infra_error: {colorize(str(counts['infra_error']), ANSI_YELLOW)}", flush=True) + print(f" test_time_sum: {total_test_sec:.2f}s", flush=True) + print(f" avg_test_per_mutant: {total_test_sec / len(results):.3f}s", flush=True) + print(f" mutants_per_second: {len(sites) / elapsed:.2f}", flush=True) + print(f" elapsed: {elapsed:.2f}s", flush=True) + + if counts["infra_error"] > 0: + return 2 + + # TODO: fix these surviving mutants and delete this block + known_survivors = { + ("opendbc/safety/helpers.h", 40, "arithmetic"), + ("opendbc/safety/lateral.h", 105, "boundary"), + ("opendbc/safety/lateral.h", 195, "boundary"), + ("opendbc/safety/lateral.h", 239, "boundary"), + ("opendbc/safety/lateral.h", 337, "arithmetic"), + } + survivors = [r for r in survivors if (str(r.site.origin_file.relative_to(ROOT)), r.site.origin_line, r.site.mutator) not in known_survivors] + + if survivors: + return 1 + return 0 + + +if __name__ == "__main__": + raise SystemExit(main()) diff --git a/opendbc/safety/tests/mutation.sh b/opendbc/safety/tests/mutation.sh deleted file mode 100755 index 3a46b0056d7..00000000000 --- a/opendbc/safety/tests/mutation.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash -set -e - -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)" -cd $DIR - -source $DIR/../../../setup.sh - -GIT_REF="${GIT_REF:-origin/master}" -GIT_ROOT=$(git rev-parse --show-toplevel) -cat > $GIT_ROOT/mull.yml </dev/null && pwd)" export PYTHONPATH=$BASEDIR # *** dependencies install *** -if [ "$(uname -s)" = "Linux" ]; then - if ! command -v "mull-runner-18" > /dev/null 2>&1; then - curl -1sLf 'https://dl.cloudsmith.io/public/mull-project/mull-stable/setup.deb.sh' | sudo -E bash - sudo apt-get update && sudo apt-get install -y clang-18 mull-18 - fi -elif [ "$(uname -s)" = "Darwin" ]; then - if ! brew list llvm@18 &>/dev/null; then - brew install llvm@18 - fi - if [ ! -f "$BASEDIR/.mull/bin/mull-runner-18" ]; then - MULL_VERSION="0.26.1" - MULL_ZIP="Mull-18-${MULL_VERSION}-LLVM-18.1-macOS-arm64-14.7.4.zip" - MULL_DIR="Mull-18-${MULL_VERSION}-LLVM-18.1-macOS-arm64-14.7.4" - curl -LO "https://github.com/mull-project/mull/releases/download/${MULL_VERSION}/${MULL_ZIP}" - unzip -o "$MULL_ZIP" - mv "$MULL_DIR" "$BASEDIR/.mull" - rm "$MULL_ZIP" - fi - export PATH="$BASEDIR/.mull/bin:$PATH" -fi - if ! command -v uv &>/dev/null; then echo "'uv' is not installed. Installing 'uv'..." curl -LsSf https://astral.sh/uv/install.sh | sh diff --git a/uv.lock b/uv.lock index 445222a9476..222907d9005 100644 --- a/uv.lock +++ b/uv.lock @@ -604,6 +604,8 @@ testing = [ { name = "pytest-subtests" }, { name = "pytest-xdist" }, { name = "ruff" }, + { name = "tree-sitter" }, + { name = "tree-sitter-c" }, { name = "ty" }, { name = "zstandard" }, ] @@ -635,6 +637,8 @@ requires-dist = [ { name = "ruff", marker = "extra == 'testing'" }, { name = "scons" }, { name = "tqdm" }, + { name = "tree-sitter", marker = "extra == 'testing'" }, + { name = "tree-sitter-c", marker = "extra == 'testing'" }, { name = "ty", marker = "extra == 'testing'" }, { name = "zstandard", marker = "extra == 'testing'" }, ] @@ -1000,6 +1004,43 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/16/e1/3079a9ff9b8e11b846c6ac5c8b5bfb7ff225eee721825310c91b3b50304f/tqdm-4.67.3-py3-none-any.whl", hash = "sha256:ee1e4c0e59148062281c49d80b25b67771a127c85fc9676d3be5f243206826bf", size = 78374, upload-time = "2026-02-03T17:35:50.982Z" }, ] +[[package]] +name = "tree-sitter" +version = "0.25.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/66/7c/0350cfc47faadc0d3cf7d8237a4e34032b3014ddf4a12ded9933e1648b55/tree-sitter-0.25.2.tar.gz", hash = "sha256:fe43c158555da46723b28b52e058ad444195afd1db3ca7720c59a254544e9c20", size = 177961, upload-time = "2025-09-25T17:37:59.751Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7c/22/88a1e00b906d26fa8a075dd19c6c3116997cb884bf1b3c023deb065a344d/tree_sitter-0.25.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b8ca72d841215b6573ed0655b3a5cd1133f9b69a6fa561aecad40dca9029d75b", size = 146752, upload-time = "2025-09-25T17:37:24.775Z" }, + { url = "https://files.pythonhosted.org/packages/57/1c/22cc14f3910017b7a76d7358df5cd315a84fe0c7f6f7b443b49db2e2790d/tree_sitter-0.25.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:cc0351cfe5022cec5a77645f647f92a936b38850346ed3f6d6babfbeeeca4d26", size = 137765, upload-time = "2025-09-25T17:37:26.103Z" }, + { url = "https://files.pythonhosted.org/packages/1c/0c/d0de46ded7d5b34631e0f630d9866dab22d3183195bf0f3b81de406d6622/tree_sitter-0.25.2-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1799609636c0193e16c38f366bda5af15b1ce476df79ddaae7dd274df9e44266", size = 604643, upload-time = "2025-09-25T17:37:27.398Z" }, + { url = "https://files.pythonhosted.org/packages/34/38/b735a58c1c2f60a168a678ca27b4c1a9df725d0bf2d1a8a1c571c033111e/tree_sitter-0.25.2-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:3e65ae456ad0d210ee71a89ee112ac7e72e6c2e5aac1b95846ecc7afa68a194c", size = 632229, upload-time = "2025-09-25T17:37:28.463Z" }, + { url = "https://files.pythonhosted.org/packages/32/f6/cda1e1e6cbff5e28d8433578e2556d7ba0b0209d95a796128155b97e7693/tree_sitter-0.25.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:49ee3c348caa459244ec437ccc7ff3831f35977d143f65311572b8ba0a5f265f", size = 629861, upload-time = "2025-09-25T17:37:29.593Z" }, + { url = "https://files.pythonhosted.org/packages/f9/19/427e5943b276a0dd74c2a1f1d7a7393443f13d1ee47dedb3f8127903c080/tree_sitter-0.25.2-cp311-cp311-win_amd64.whl", hash = "sha256:56ac6602c7d09c2c507c55e58dc7026b8988e0475bd0002f8a386cce5e8e8adc", size = 127304, upload-time = "2025-09-25T17:37:30.549Z" }, + { url = "https://files.pythonhosted.org/packages/eb/d9/eef856dc15f784d85d1397a17f3ee0f82df7778efce9e1961203abfe376a/tree_sitter-0.25.2-cp311-cp311-win_arm64.whl", hash = "sha256:b3d11a3a3ac89bb8a2543d75597f905a9926f9c806f40fcca8242922d1cc6ad5", size = 113990, upload-time = "2025-09-25T17:37:31.852Z" }, + { url = "https://files.pythonhosted.org/packages/3c/9e/20c2a00a862f1c2897a436b17edb774e831b22218083b459d0d081c9db33/tree_sitter-0.25.2-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:ddabfff809ffc983fc9963455ba1cecc90295803e06e140a4c83e94c1fa3d960", size = 146941, upload-time = "2025-09-25T17:37:34.813Z" }, + { url = "https://files.pythonhosted.org/packages/ef/04/8512e2062e652a1016e840ce36ba1cc33258b0dcc4e500d8089b4054afec/tree_sitter-0.25.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:c0c0ab5f94938a23fe81928a21cc0fac44143133ccc4eb7eeb1b92f84748331c", size = 137699, upload-time = "2025-09-25T17:37:36.349Z" }, + { url = "https://files.pythonhosted.org/packages/47/8a/d48c0414db19307b0fb3bb10d76a3a0cbe275bb293f145ee7fba2abd668e/tree_sitter-0.25.2-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:dd12d80d91d4114ca097626eb82714618dcdfacd6a5e0955216c6485c350ef99", size = 607125, upload-time = "2025-09-25T17:37:37.725Z" }, + { url = "https://files.pythonhosted.org/packages/39/d1/b95f545e9fc5001b8a78636ef942a4e4e536580caa6a99e73dd0a02e87aa/tree_sitter-0.25.2-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b43a9e4c89d4d0839de27cd4d6902d33396de700e9ff4c5ab7631f277a85ead9", size = 635418, upload-time = "2025-09-25T17:37:38.922Z" }, + { url = "https://files.pythonhosted.org/packages/de/4d/b734bde3fb6f3513a010fa91f1f2875442cdc0382d6a949005cd84563d8f/tree_sitter-0.25.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:fbb1706407c0e451c4f8cc016fec27d72d4b211fdd3173320b1ada7a6c74c3ac", size = 631250, upload-time = "2025-09-25T17:37:40.039Z" }, + { url = "https://files.pythonhosted.org/packages/46/f2/5f654994f36d10c64d50a192239599fcae46677491c8dd53e7579c35a3e3/tree_sitter-0.25.2-cp312-cp312-win_amd64.whl", hash = "sha256:6d0302550bbe4620a5dc7649517c4409d74ef18558276ce758419cf09e578897", size = 127156, upload-time = "2025-09-25T17:37:41.132Z" }, + { url = "https://files.pythonhosted.org/packages/67/23/148c468d410efcf0a9535272d81c258d840c27b34781d625f1f627e2e27d/tree_sitter-0.25.2-cp312-cp312-win_arm64.whl", hash = "sha256:0c8b6682cac77e37cfe5cf7ec388844957f48b7bd8d6321d0ca2d852994e10d5", size = 113984, upload-time = "2025-09-25T17:37:42.074Z" }, +] + +[[package]] +name = "tree-sitter-c" +version = "0.24.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f1/f5/ba8cd08d717277551ade8537d3aa2a94b907c6c6e0fbcf4e4d8b1c747fa3/tree_sitter_c-0.24.1.tar.gz", hash = "sha256:7d2d0cda0b8dda428c81440c1e94367f9f13548eedca3f49768bde66b1422ad6", size = 228014, upload-time = "2025-05-24T17:32:58.384Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/15/c7/c817be36306e457c2d36cc324789046390d9d8c555c38772429ffdb7d361/tree_sitter_c-0.24.1-cp310-abi3-macosx_10_9_x86_64.whl", hash = "sha256:9c06ac26a1efdcc8b26a8a6970fbc6997c4071857359e5837d4c42892d45fe1e", size = 80940, upload-time = "2025-05-24T17:32:49.967Z" }, + { url = "https://files.pythonhosted.org/packages/7a/42/283909467290b24fdbc29bb32ee20e409a19a55002b43175d66d091ca1a4/tree_sitter_c-0.24.1-cp310-abi3-macosx_11_0_arm64.whl", hash = "sha256:942bcd7cbecd810dcf7ca6f8f834391ebf0771a89479646d891ba4ca2fdfdc88", size = 86304, upload-time = "2025-05-24T17:32:51.271Z" }, + { url = "https://files.pythonhosted.org/packages/94/53/fb4f61d4e5f15ec3da85774a4df8e58d3b5b73036cf167f0203b4dd9d158/tree_sitter_c-0.24.1-cp310-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9a74cfd7a11ca5a961fafd4d751892ee65acae667d2818968a6f079397d8d28c", size = 109996, upload-time = "2025-05-24T17:32:52.119Z" }, + { url = "https://files.pythonhosted.org/packages/5e/e8/fc541d34ee81c386c5453c2596c1763e8e9cd7cb0725f39d7dfa2276afa4/tree_sitter_c-0.24.1-cp310-abi3-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a6a807705a3978911dc7ee26a7ad36dcfacb6adfc13c190d496660ec9bd66707", size = 98137, upload-time = "2025-05-24T17:32:53.361Z" }, + { url = "https://files.pythonhosted.org/packages/32/c6/d0563319cae0d5b5780a92e2806074b24afea2a07aa4c10599b899bda3ec/tree_sitter_c-0.24.1-cp310-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:789781afcb710df34144f7e2a20cd80e325114b9119e3956c6bd1dd2d365df98", size = 94148, upload-time = "2025-05-24T17:32:54.855Z" }, + { url = "https://files.pythonhosted.org/packages/50/5a/6361df7f3fa2310c53a0d26b4702a261c332da16fa9d801e381e3a86e25f/tree_sitter_c-0.24.1-cp310-abi3-win_amd64.whl", hash = "sha256:290bff0f9c79c966496ebae45042f77543e6e4aea725f40587a8611d566231a8", size = 84703, upload-time = "2025-05-24T17:32:56.084Z" }, + { url = "https://files.pythonhosted.org/packages/22/6a/210a302e8025ac492cbaea58d3720d66b7d8034c5d747ac5e4d2d235aa25/tree_sitter_c-0.24.1-cp310-abi3-win_arm64.whl", hash = "sha256:d46bbda06f838c2dcb91daf767813671fd366b49ad84ff37db702129267b46e1", size = 82715, upload-time = "2025-05-24T17:32:57.248Z" }, +] + [[package]] name = "ty" version = "0.0.18" From 6d7342b69dbddf6dd721ac0f099c920c3ce69fa4 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 10 Mar 2026 21:50:01 -0700 Subject: [PATCH 139/229] matplotlib is unused --- pyproject.toml | 1 - uv.lock | 216 ------------------------------------------------- 2 files changed, 217 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 01298c15900..072554c79a2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -50,7 +50,6 @@ docs = [ ] examples = [ "inputs", - "matplotlib", ] [build-system] diff --git a/uv.lock b/uv.lock index 222907d9005..d08a23dd54c 100644 --- a/uv.lock +++ b/uv.lock @@ -141,44 +141,6 @@ wheels = [ [package.metadata] requires-dist = [{ name = "requests" }] -[[package]] -name = "contourpy" -version = "1.3.3" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "numpy" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/58/01/1253e6698a07380cd31a736d248a3f2a50a7c88779a1813da27503cadc2a/contourpy-1.3.3.tar.gz", hash = "sha256:083e12155b210502d0bca491432bb04d56dc3432f95a979b429f2848c3dbe880", size = 13466174, upload-time = "2025-07-26T12:03:12.549Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/91/2e/c4390a31919d8a78b90e8ecf87cd4b4c4f05a5b48d05ec17db8e5404c6f4/contourpy-1.3.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:709a48ef9a690e1343202916450bc48b9e51c049b089c7f79a267b46cffcdaa1", size = 288773, upload-time = "2025-07-26T12:01:02.277Z" }, - { url = "https://files.pythonhosted.org/packages/0d/44/c4b0b6095fef4dc9c420e041799591e3b63e9619e3044f7f4f6c21c0ab24/contourpy-1.3.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:23416f38bfd74d5d28ab8429cc4d63fa67d5068bd711a85edb1c3fb0c3e2f381", size = 270149, upload-time = "2025-07-26T12:01:04.072Z" }, - { url = "https://files.pythonhosted.org/packages/30/2e/dd4ced42fefac8470661d7cb7e264808425e6c5d56d175291e93890cce09/contourpy-1.3.3-cp311-cp311-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:929ddf8c4c7f348e4c0a5a3a714b5c8542ffaa8c22954862a46ca1813b667ee7", size = 329222, upload-time = "2025-07-26T12:01:05.688Z" }, - { url = "https://files.pythonhosted.org/packages/f2/74/cc6ec2548e3d276c71389ea4802a774b7aa3558223b7bade3f25787fafc2/contourpy-1.3.3-cp311-cp311-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:9e999574eddae35f1312c2b4b717b7885d4edd6cb46700e04f7f02db454e67c1", size = 377234, upload-time = "2025-07-26T12:01:07.054Z" }, - { url = "https://files.pythonhosted.org/packages/03/b3/64ef723029f917410f75c09da54254c5f9ea90ef89b143ccadb09df14c15/contourpy-1.3.3-cp311-cp311-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:0bf67e0e3f482cb69779dd3061b534eb35ac9b17f163d851e2a547d56dba0a3a", size = 380555, upload-time = "2025-07-26T12:01:08.801Z" }, - { url = "https://files.pythonhosted.org/packages/5f/4b/6157f24ca425b89fe2eb7e7be642375711ab671135be21e6faa100f7448c/contourpy-1.3.3-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:51e79c1f7470158e838808d4a996fa9bac72c498e93d8ebe5119bc1e6becb0db", size = 355238, upload-time = "2025-07-26T12:01:10.319Z" }, - { url = "https://files.pythonhosted.org/packages/98/56/f914f0dd678480708a04cfd2206e7c382533249bc5001eb9f58aa693e200/contourpy-1.3.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:598c3aaece21c503615fd59c92a3598b428b2f01bfb4b8ca9c4edeecc2438620", size = 1326218, upload-time = "2025-07-26T12:01:12.659Z" }, - { url = "https://files.pythonhosted.org/packages/fb/d7/4a972334a0c971acd5172389671113ae82aa7527073980c38d5868ff1161/contourpy-1.3.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:322ab1c99b008dad206d406bb61d014cf0174df491ae9d9d0fac6a6fda4f977f", size = 1392867, upload-time = "2025-07-26T12:01:15.533Z" }, - { url = "https://files.pythonhosted.org/packages/75/3e/f2cc6cd56dc8cff46b1a56232eabc6feea52720083ea71ab15523daab796/contourpy-1.3.3-cp311-cp311-win32.whl", hash = "sha256:fd907ae12cd483cd83e414b12941c632a969171bf90fc937d0c9f268a31cafff", size = 183677, upload-time = "2025-07-26T12:01:17.088Z" }, - { url = "https://files.pythonhosted.org/packages/98/4b/9bd370b004b5c9d8045c6c33cf65bae018b27aca550a3f657cdc99acdbd8/contourpy-1.3.3-cp311-cp311-win_amd64.whl", hash = "sha256:3519428f6be58431c56581f1694ba8e50626f2dd550af225f82fb5f5814d2a42", size = 225234, upload-time = "2025-07-26T12:01:18.256Z" }, - { url = "https://files.pythonhosted.org/packages/d9/b6/71771e02c2e004450c12b1120a5f488cad2e4d5b590b1af8bad060360fe4/contourpy-1.3.3-cp311-cp311-win_arm64.whl", hash = "sha256:15ff10bfada4bf92ec8b31c62bf7c1834c244019b4a33095a68000d7075df470", size = 193123, upload-time = "2025-07-26T12:01:19.848Z" }, - { url = "https://files.pythonhosted.org/packages/be/45/adfee365d9ea3d853550b2e735f9d66366701c65db7855cd07621732ccfc/contourpy-1.3.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:b08a32ea2f8e42cf1d4be3169a98dd4be32bafe4f22b6c4cb4ba810fa9e5d2cb", size = 293419, upload-time = "2025-07-26T12:01:21.16Z" }, - { url = "https://files.pythonhosted.org/packages/53/3e/405b59cfa13021a56bba395a6b3aca8cec012b45bf177b0eaf7a202cde2c/contourpy-1.3.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:556dba8fb6f5d8742f2923fe9457dbdd51e1049c4a43fd3986a0b14a1d815fc6", size = 273979, upload-time = "2025-07-26T12:01:22.448Z" }, - { url = "https://files.pythonhosted.org/packages/d4/1c/a12359b9b2ca3a845e8f7f9ac08bdf776114eb931392fcad91743e2ea17b/contourpy-1.3.3-cp312-cp312-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:92d9abc807cf7d0e047b95ca5d957cf4792fcd04e920ca70d48add15c1a90ea7", size = 332653, upload-time = "2025-07-26T12:01:24.155Z" }, - { url = "https://files.pythonhosted.org/packages/63/12/897aeebfb475b7748ea67b61e045accdfcf0d971f8a588b67108ed7f5512/contourpy-1.3.3-cp312-cp312-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:b2e8faa0ed68cb29af51edd8e24798bb661eac3bd9f65420c1887b6ca89987c8", size = 379536, upload-time = "2025-07-26T12:01:25.91Z" }, - { url = "https://files.pythonhosted.org/packages/43/8a/a8c584b82deb248930ce069e71576fc09bd7174bbd35183b7943fb1064fd/contourpy-1.3.3-cp312-cp312-manylinux_2_26_s390x.manylinux_2_28_s390x.whl", hash = "sha256:626d60935cf668e70a5ce6ff184fd713e9683fb458898e4249b63be9e28286ea", size = 384397, upload-time = "2025-07-26T12:01:27.152Z" }, - { url = "https://files.pythonhosted.org/packages/cc/8f/ec6289987824b29529d0dfda0d74a07cec60e54b9c92f3c9da4c0ac732de/contourpy-1.3.3-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4d00e655fcef08aba35ec9610536bfe90267d7ab5ba944f7032549c55a146da1", size = 362601, upload-time = "2025-07-26T12:01:28.808Z" }, - { url = "https://files.pythonhosted.org/packages/05/0a/a3fe3be3ee2dceb3e615ebb4df97ae6f3828aa915d3e10549ce016302bd1/contourpy-1.3.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:451e71b5a7d597379ef572de31eeb909a87246974d960049a9848c3bc6c41bf7", size = 1331288, upload-time = "2025-07-26T12:01:31.198Z" }, - { url = "https://files.pythonhosted.org/packages/33/1d/acad9bd4e97f13f3e2b18a3977fe1b4a37ecf3d38d815333980c6c72e963/contourpy-1.3.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:459c1f020cd59fcfe6650180678a9993932d80d44ccde1fa1868977438f0b411", size = 1403386, upload-time = "2025-07-26T12:01:33.947Z" }, - { url = "https://files.pythonhosted.org/packages/cf/8f/5847f44a7fddf859704217a99a23a4f6417b10e5ab1256a179264561540e/contourpy-1.3.3-cp312-cp312-win32.whl", hash = "sha256:023b44101dfe49d7d53932be418477dba359649246075c996866106da069af69", size = 185018, upload-time = "2025-07-26T12:01:35.64Z" }, - { url = "https://files.pythonhosted.org/packages/19/e8/6026ed58a64563186a9ee3f29f41261fd1828f527dd93d33b60feca63352/contourpy-1.3.3-cp312-cp312-win_amd64.whl", hash = "sha256:8153b8bfc11e1e4d75bcb0bff1db232f9e10b274e0929de9d608027e0d34ff8b", size = 226567, upload-time = "2025-07-26T12:01:36.804Z" }, - { url = "https://files.pythonhosted.org/packages/d1/e2/f05240d2c39a1ed228d8328a78b6f44cd695f7ef47beb3e684cf93604f86/contourpy-1.3.3-cp312-cp312-win_arm64.whl", hash = "sha256:07ce5ed73ecdc4a03ffe3e1b3e3c1166db35ae7584be76f65dbbe28a7791b0cc", size = 193655, upload-time = "2025-07-26T12:01:37.999Z" }, - { url = "https://files.pythonhosted.org/packages/a5/29/8dcfe16f0107943fa92388c23f6e05cff0ba58058c4c95b00280d4c75a14/contourpy-1.3.3-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:cd5dfcaeb10f7b7f9dc8941717c6c2ade08f587be2226222c12b25f0483ed497", size = 278809, upload-time = "2025-07-26T12:02:52.74Z" }, - { url = "https://files.pythonhosted.org/packages/85/a9/8b37ef4f7dafeb335daee3c8254645ef5725be4d9c6aa70b50ec46ef2f7e/contourpy-1.3.3-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:0c1fc238306b35f246d61a1d416a627348b5cf0648648a031e14bb8705fcdfe8", size = 261593, upload-time = "2025-07-26T12:02:54.037Z" }, - { url = "https://files.pythonhosted.org/packages/0a/59/ebfb8c677c75605cc27f7122c90313fd2f375ff3c8d19a1694bda74aaa63/contourpy-1.3.3-pp311-pypy311_pp73-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:70f9aad7de812d6541d29d2bbf8feb22ff7e1c299523db288004e3157ff4674e", size = 302202, upload-time = "2025-07-26T12:02:55.947Z" }, - { url = "https://files.pythonhosted.org/packages/3c/37/21972a15834d90bfbfb009b9d004779bd5a07a0ec0234e5ba8f64d5736f4/contourpy-1.3.3-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5ed3657edf08512fc3fe81b510e35c2012fbd3081d2e26160f27ca28affec989", size = 329207, upload-time = "2025-07-26T12:02:57.468Z" }, - { url = "https://files.pythonhosted.org/packages/0c/58/bd257695f39d05594ca4ad60df5bcb7e32247f9951fd09a9b8edb82d1daa/contourpy-1.3.3-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:3d1a3799d62d45c18bafd41c5fa05120b96a28079f2393af559b843d1a966a77", size = 225315, upload-time = "2025-07-26T12:02:58.801Z" }, -] - [[package]] name = "coverage" version = "7.13.4" @@ -257,15 +219,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/41/1b/4ab1681ecbfc48d7e4641fb178c97374eb475ae4109255bdd832110cbbe2/crcmod_plus-2.3.1-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:5e80a9860f66f339956f540d86a768f4fe8c8bfcb139811f14be864425c48d64", size = 23289, upload-time = "2025-10-10T22:14:20.875Z" }, ] -[[package]] -name = "cycler" -version = "0.12.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/a9/95/a3dbbb5028f35eafb79008e7522a75244477d2838f38cbb722248dabc2a8/cycler-0.12.1.tar.gz", hash = "sha256:88bb128f02ba341da8ef447245a9e138fae777f6a23943da4540077d3601eb1c", size = 7615, upload-time = "2023-10-07T05:32:18.335Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/e7/05/c19819d5e3d95294a6f5947fb9b9629efb316b96de511b418c53d245aae6/cycler-0.12.1-py3-none-any.whl", hash = "sha256:85cef7cff222d8644161529808465972e51340599459b8ac3ccbac5a854e0d30", size = 8321, upload-time = "2023-10-07T05:32:16.783Z" }, -] - [[package]] name = "execnet" version = "2.1.2" @@ -275,31 +228,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/ab/84/02fc1827e8cdded4aa65baef11296a9bbe595c474f0d6d758af082d849fd/execnet-2.1.2-py3-none-any.whl", hash = "sha256:67fba928dd5a544b783f6056f449e5e3931a5c378b128bc18501f7ea79e296ec", size = 40708, upload-time = "2025-11-12T09:56:36.333Z" }, ] -[[package]] -name = "fonttools" -version = "4.61.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/ec/ca/cf17b88a8df95691275a3d77dc0a5ad9907f328ae53acbe6795da1b2f5ed/fonttools-4.61.1.tar.gz", hash = "sha256:6675329885c44657f826ef01d9e4fb33b9158e9d93c537d84ad8399539bc6f69", size = 3565756, upload-time = "2025-12-12T17:31:24.246Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/69/12/bf9f4eaa2fad039356cc627587e30ed008c03f1cebd3034376b5ee8d1d44/fonttools-4.61.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:c6604b735bb12fef8e0efd5578c9fb5d3d8532d5001ea13a19cddf295673ee09", size = 2852213, upload-time = "2025-12-12T17:29:46.675Z" }, - { url = "https://files.pythonhosted.org/packages/ac/49/4138d1acb6261499bedde1c07f8c2605d1d8f9d77a151e5507fd3ef084b6/fonttools-4.61.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:5ce02f38a754f207f2f06557523cd39a06438ba3aafc0639c477ac409fc64e37", size = 2401689, upload-time = "2025-12-12T17:29:48.769Z" }, - { url = "https://files.pythonhosted.org/packages/e5/fe/e6ce0fe20a40e03aef906af60aa87668696f9e4802fa283627d0b5ed777f/fonttools-4.61.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:77efb033d8d7ff233385f30c62c7c79271c8885d5c9657d967ede124671bbdfb", size = 5058809, upload-time = "2025-12-12T17:29:51.701Z" }, - { url = "https://files.pythonhosted.org/packages/79/61/1ca198af22f7dd22c17ab86e9024ed3c06299cfdb08170640e9996d501a0/fonttools-4.61.1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:75c1a6dfac6abd407634420c93864a1e274ebc1c7531346d9254c0d8f6ca00f9", size = 5036039, upload-time = "2025-12-12T17:29:53.659Z" }, - { url = "https://files.pythonhosted.org/packages/99/cc/fa1801e408586b5fce4da9f5455af8d770f4fc57391cd5da7256bb364d38/fonttools-4.61.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:0de30bfe7745c0d1ffa2b0b7048fb7123ad0d71107e10ee090fa0b16b9452e87", size = 5034714, upload-time = "2025-12-12T17:29:55.592Z" }, - { url = "https://files.pythonhosted.org/packages/bf/aa/b7aeafe65adb1b0a925f8f25725e09f078c635bc22754f3fecb7456955b0/fonttools-4.61.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:58b0ee0ab5b1fc9921eccfe11d1435added19d6494dde14e323f25ad2bc30c56", size = 5158648, upload-time = "2025-12-12T17:29:57.861Z" }, - { url = "https://files.pythonhosted.org/packages/99/f9/08ea7a38663328881384c6e7777bbefc46fd7d282adfd87a7d2b84ec9d50/fonttools-4.61.1-cp311-cp311-win32.whl", hash = "sha256:f79b168428351d11e10c5aeb61a74e1851ec221081299f4cf56036a95431c43a", size = 2280681, upload-time = "2025-12-12T17:29:59.943Z" }, - { url = "https://files.pythonhosted.org/packages/07/ad/37dd1ae5fa6e01612a1fbb954f0927681f282925a86e86198ccd7b15d515/fonttools-4.61.1-cp311-cp311-win_amd64.whl", hash = "sha256:fe2efccb324948a11dd09d22136fe2ac8a97d6c1347cf0b58a911dcd529f66b7", size = 2331951, upload-time = "2025-12-12T17:30:02.254Z" }, - { url = "https://files.pythonhosted.org/packages/6f/16/7decaa24a1bd3a70c607b2e29f0adc6159f36a7e40eaba59846414765fd4/fonttools-4.61.1-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:f3cb4a569029b9f291f88aafc927dd53683757e640081ca8c412781ea144565e", size = 2851593, upload-time = "2025-12-12T17:30:04.225Z" }, - { url = "https://files.pythonhosted.org/packages/94/98/3c4cb97c64713a8cf499b3245c3bf9a2b8fd16a3e375feff2aed78f96259/fonttools-4.61.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:41a7170d042e8c0024703ed13b71893519a1a6d6e18e933e3ec7507a2c26a4b2", size = 2400231, upload-time = "2025-12-12T17:30:06.47Z" }, - { url = "https://files.pythonhosted.org/packages/b7/37/82dbef0f6342eb01f54bca073ac1498433d6ce71e50c3c3282b655733b31/fonttools-4.61.1-cp312-cp312-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:10d88e55330e092940584774ee5e8a6971b01fc2f4d3466a1d6c158230880796", size = 4954103, upload-time = "2025-12-12T17:30:08.432Z" }, - { url = "https://files.pythonhosted.org/packages/6c/44/f3aeac0fa98e7ad527f479e161aca6c3a1e47bb6996b053d45226fe37bf2/fonttools-4.61.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:15acc09befd16a0fb8a8f62bc147e1a82817542d72184acca9ce6e0aeda9fa6d", size = 5004295, upload-time = "2025-12-12T17:30:10.56Z" }, - { url = "https://files.pythonhosted.org/packages/14/e8/7424ced75473983b964d09f6747fa09f054a6d656f60e9ac9324cf40c743/fonttools-4.61.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:e6bcdf33aec38d16508ce61fd81838f24c83c90a1d1b8c68982857038673d6b8", size = 4944109, upload-time = "2025-12-12T17:30:12.874Z" }, - { url = "https://files.pythonhosted.org/packages/c8/8b/6391b257fa3d0b553d73e778f953a2f0154292a7a7a085e2374b111e5410/fonttools-4.61.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:5fade934607a523614726119164ff621e8c30e8fa1ffffbbd358662056ba69f0", size = 5093598, upload-time = "2025-12-12T17:30:15.79Z" }, - { url = "https://files.pythonhosted.org/packages/d9/71/fd2ea96cdc512d92da5678a1c98c267ddd4d8c5130b76d0f7a80f9a9fde8/fonttools-4.61.1-cp312-cp312-win32.whl", hash = "sha256:75da8f28eff26defba42c52986de97b22106cb8f26515b7c22443ebc9c2d3261", size = 2269060, upload-time = "2025-12-12T17:30:18.058Z" }, - { url = "https://files.pythonhosted.org/packages/80/3b/a3e81b71aed5a688e89dfe0e2694b26b78c7d7f39a5ffd8a7d75f54a12a8/fonttools-4.61.1-cp312-cp312-win_amd64.whl", hash = "sha256:497c31ce314219888c0e2fce5ad9178ca83fe5230b01a5006726cdf3ac9f24d9", size = 2319078, upload-time = "2025-12-12T17:30:22.862Z" }, - { url = "https://files.pythonhosted.org/packages/c7/4e/ce75a57ff3aebf6fc1f4e9d508b8e5810618a33d900ad6c19eb30b290b97/fonttools-4.61.1-py3-none-any.whl", hash = "sha256:17d2bf5d541add43822bcf0c43d7d847b160c9bb01d15d5007d84e2217aaa371", size = 1148996, upload-time = "2025-12-12T17:31:21.03Z" }, -] - [[package]] name = "gcovr" version = "8.6" @@ -367,45 +295,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/62/a1/3d680cbfd5f4b8f15abc1d571870c5fc3e594bb582bc3b64ea099db13e56/jinja2-3.1.6-py3-none-any.whl", hash = "sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67", size = 134899, upload-time = "2025-03-05T20:05:00.369Z" }, ] -[[package]] -name = "kiwisolver" -version = "1.4.9" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/5c/3c/85844f1b0feb11ee581ac23fe5fce65cd049a200c1446708cc1b7f922875/kiwisolver-1.4.9.tar.gz", hash = "sha256:c3b22c26c6fd6811b0ae8363b95ca8ce4ea3c202d3d0975b2914310ceb1bcc4d", size = 97564, upload-time = "2025-08-10T21:27:49.279Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/6f/ab/c80b0d5a9d8a1a65f4f815f2afff9798b12c3b9f31f1d304dd233dd920e2/kiwisolver-1.4.9-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:eb14a5da6dc7642b0f3a18f13654847cd8b7a2550e2645a5bda677862b03ba16", size = 124167, upload-time = "2025-08-10T21:25:53.403Z" }, - { url = "https://files.pythonhosted.org/packages/a0/c0/27fe1a68a39cf62472a300e2879ffc13c0538546c359b86f149cc19f6ac3/kiwisolver-1.4.9-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:39a219e1c81ae3b103643d2aedb90f1ef22650deb266ff12a19e7773f3e5f089", size = 66579, upload-time = "2025-08-10T21:25:54.79Z" }, - { url = "https://files.pythonhosted.org/packages/31/a2/a12a503ac1fd4943c50f9822678e8015a790a13b5490354c68afb8489814/kiwisolver-1.4.9-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:2405a7d98604b87f3fc28b1716783534b1b4b8510d8142adca34ee0bc3c87543", size = 65309, upload-time = "2025-08-10T21:25:55.76Z" }, - { url = "https://files.pythonhosted.org/packages/66/e1/e533435c0be77c3f64040d68d7a657771194a63c279f55573188161e81ca/kiwisolver-1.4.9-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:dc1ae486f9abcef254b5618dfb4113dd49f94c68e3e027d03cf0143f3f772b61", size = 1435596, upload-time = "2025-08-10T21:25:56.861Z" }, - { url = "https://files.pythonhosted.org/packages/67/1e/51b73c7347f9aabdc7215aa79e8b15299097dc2f8e67dee2b095faca9cb0/kiwisolver-1.4.9-cp311-cp311-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8a1f570ce4d62d718dce3f179ee78dac3b545ac16c0c04bb363b7607a949c0d1", size = 1246548, upload-time = "2025-08-10T21:25:58.246Z" }, - { url = "https://files.pythonhosted.org/packages/21/aa/72a1c5d1e430294f2d32adb9542719cfb441b5da368d09d268c7757af46c/kiwisolver-1.4.9-cp311-cp311-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:cb27e7b78d716c591e88e0a09a2139c6577865d7f2e152488c2cc6257f460872", size = 1263618, upload-time = "2025-08-10T21:25:59.857Z" }, - { url = "https://files.pythonhosted.org/packages/a3/af/db1509a9e79dbf4c260ce0cfa3903ea8945f6240e9e59d1e4deb731b1a40/kiwisolver-1.4.9-cp311-cp311-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:15163165efc2f627eb9687ea5f3a28137217d217ac4024893d753f46bce9de26", size = 1317437, upload-time = "2025-08-10T21:26:01.105Z" }, - { url = "https://files.pythonhosted.org/packages/e0/f2/3ea5ee5d52abacdd12013a94130436e19969fa183faa1e7c7fbc89e9a42f/kiwisolver-1.4.9-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:bdee92c56a71d2b24c33a7d4c2856bd6419d017e08caa7802d2963870e315028", size = 2195742, upload-time = "2025-08-10T21:26:02.675Z" }, - { url = "https://files.pythonhosted.org/packages/6f/9b/1efdd3013c2d9a2566aa6a337e9923a00590c516add9a1e89a768a3eb2fc/kiwisolver-1.4.9-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:412f287c55a6f54b0650bd9b6dce5aceddb95864a1a90c87af16979d37c89771", size = 2290810, upload-time = "2025-08-10T21:26:04.009Z" }, - { url = "https://files.pythonhosted.org/packages/fb/e5/cfdc36109ae4e67361f9bc5b41323648cb24a01b9ade18784657e022e65f/kiwisolver-1.4.9-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:2c93f00dcba2eea70af2be5f11a830a742fe6b579a1d4e00f47760ef13be247a", size = 2461579, upload-time = "2025-08-10T21:26:05.317Z" }, - { url = "https://files.pythonhosted.org/packages/62/86/b589e5e86c7610842213994cdea5add00960076bef4ae290c5fa68589cac/kiwisolver-1.4.9-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:f117e1a089d9411663a3207ba874f31be9ac8eaa5b533787024dc07aeb74f464", size = 2268071, upload-time = "2025-08-10T21:26:06.686Z" }, - { url = "https://files.pythonhosted.org/packages/3b/c6/f8df8509fd1eee6c622febe54384a96cfaf4d43bf2ccec7a0cc17e4715c9/kiwisolver-1.4.9-cp311-cp311-win_amd64.whl", hash = "sha256:be6a04e6c79819c9a8c2373317d19a96048e5a3f90bec587787e86a1153883c2", size = 73840, upload-time = "2025-08-10T21:26:07.94Z" }, - { url = "https://files.pythonhosted.org/packages/e2/2d/16e0581daafd147bc11ac53f032a2b45eabac897f42a338d0a13c1e5c436/kiwisolver-1.4.9-cp311-cp311-win_arm64.whl", hash = "sha256:0ae37737256ba2de764ddc12aed4956460277f00c4996d51a197e72f62f5eec7", size = 65159, upload-time = "2025-08-10T21:26:09.048Z" }, - { url = "https://files.pythonhosted.org/packages/86/c9/13573a747838aeb1c76e3267620daa054f4152444d1f3d1a2324b78255b5/kiwisolver-1.4.9-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:ac5a486ac389dddcc5bef4f365b6ae3ffff2c433324fb38dd35e3fab7c957999", size = 123686, upload-time = "2025-08-10T21:26:10.034Z" }, - { url = "https://files.pythonhosted.org/packages/51/ea/2ecf727927f103ffd1739271ca19c424d0e65ea473fbaeea1c014aea93f6/kiwisolver-1.4.9-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:f2ba92255faa7309d06fe44c3a4a97efe1c8d640c2a79a5ef728b685762a6fd2", size = 66460, upload-time = "2025-08-10T21:26:11.083Z" }, - { url = "https://files.pythonhosted.org/packages/5b/5a/51f5464373ce2aeb5194508298a508b6f21d3867f499556263c64c621914/kiwisolver-1.4.9-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:4a2899935e724dd1074cb568ce7ac0dce28b2cd6ab539c8e001a8578eb106d14", size = 64952, upload-time = "2025-08-10T21:26:12.058Z" }, - { url = "https://files.pythonhosted.org/packages/70/90/6d240beb0f24b74371762873e9b7f499f1e02166a2d9c5801f4dbf8fa12e/kiwisolver-1.4.9-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:f6008a4919fdbc0b0097089f67a1eb55d950ed7e90ce2cc3e640abadd2757a04", size = 1474756, upload-time = "2025-08-10T21:26:13.096Z" }, - { url = "https://files.pythonhosted.org/packages/12/42/f36816eaf465220f683fb711efdd1bbf7a7005a2473d0e4ed421389bd26c/kiwisolver-1.4.9-cp312-cp312-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:67bb8b474b4181770f926f7b7d2f8c0248cbcb78b660fdd41a47054b28d2a752", size = 1276404, upload-time = "2025-08-10T21:26:14.457Z" }, - { url = "https://files.pythonhosted.org/packages/2e/64/bc2de94800adc830c476dce44e9b40fd0809cddeef1fde9fcf0f73da301f/kiwisolver-1.4.9-cp312-cp312-manylinux_2_24_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:2327a4a30d3ee07d2fbe2e7933e8a37c591663b96ce42a00bc67461a87d7df77", size = 1294410, upload-time = "2025-08-10T21:26:15.73Z" }, - { url = "https://files.pythonhosted.org/packages/5f/42/2dc82330a70aa8e55b6d395b11018045e58d0bb00834502bf11509f79091/kiwisolver-1.4.9-cp312-cp312-manylinux_2_24_s390x.manylinux_2_28_s390x.whl", hash = "sha256:7a08b491ec91b1d5053ac177afe5290adacf1f0f6307d771ccac5de30592d198", size = 1343631, upload-time = "2025-08-10T21:26:17.045Z" }, - { url = "https://files.pythonhosted.org/packages/22/fd/f4c67a6ed1aab149ec5a8a401c323cee7a1cbe364381bb6c9c0d564e0e20/kiwisolver-1.4.9-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:d8fc5c867c22b828001b6a38d2eaeb88160bf5783c6cb4a5e440efc981ce286d", size = 2224963, upload-time = "2025-08-10T21:26:18.737Z" }, - { url = "https://files.pythonhosted.org/packages/45/aa/76720bd4cb3713314677d9ec94dcc21ced3f1baf4830adde5bb9b2430a5f/kiwisolver-1.4.9-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:3b3115b2581ea35bb6d1f24a4c90af37e5d9b49dcff267eeed14c3893c5b86ab", size = 2321295, upload-time = "2025-08-10T21:26:20.11Z" }, - { url = "https://files.pythonhosted.org/packages/80/19/d3ec0d9ab711242f56ae0dc2fc5d70e298bb4a1f9dfab44c027668c673a1/kiwisolver-1.4.9-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:858e4c22fb075920b96a291928cb7dea5644e94c0ee4fcd5af7e865655e4ccf2", size = 2487987, upload-time = "2025-08-10T21:26:21.49Z" }, - { url = "https://files.pythonhosted.org/packages/39/e9/61e4813b2c97e86b6fdbd4dd824bf72d28bcd8d4849b8084a357bc0dd64d/kiwisolver-1.4.9-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:ed0fecd28cc62c54b262e3736f8bb2512d8dcfdc2bcf08be5f47f96bf405b145", size = 2291817, upload-time = "2025-08-10T21:26:22.812Z" }, - { url = "https://files.pythonhosted.org/packages/a0/41/85d82b0291db7504da3c2defe35c9a8a5c9803a730f297bd823d11d5fb77/kiwisolver-1.4.9-cp312-cp312-win_amd64.whl", hash = "sha256:f68208a520c3d86ea51acf688a3e3002615a7f0238002cccc17affecc86a8a54", size = 73895, upload-time = "2025-08-10T21:26:24.37Z" }, - { url = "https://files.pythonhosted.org/packages/e2/92/5f3068cf15ee5cb624a0c7596e67e2a0bb2adee33f71c379054a491d07da/kiwisolver-1.4.9-cp312-cp312-win_arm64.whl", hash = "sha256:2c1a4f57df73965f3f14df20b80ee29e6a7930a57d2d9e8491a25f676e197c60", size = 64992, upload-time = "2025-08-10T21:26:25.732Z" }, - { url = "https://files.pythonhosted.org/packages/a3/0f/36d89194b5a32c054ce93e586d4049b6c2c22887b0eb229c61c68afd3078/kiwisolver-1.4.9-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:720e05574713db64c356e86732c0f3c5252818d05f9df320f0ad8380641acea5", size = 60104, upload-time = "2025-08-10T21:27:43.287Z" }, - { url = "https://files.pythonhosted.org/packages/52/ba/4ed75f59e4658fd21fe7dde1fee0ac397c678ec3befba3fe6482d987af87/kiwisolver-1.4.9-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:17680d737d5335b552994a2008fab4c851bcd7de33094a82067ef3a576ff02fa", size = 58592, upload-time = "2025-08-10T21:27:44.314Z" }, - { url = "https://files.pythonhosted.org/packages/33/01/a8ea7c5ea32a9b45ceeaee051a04c8ed4320f5add3c51bfa20879b765b70/kiwisolver-1.4.9-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:85b5352f94e490c028926ea567fc569c52ec79ce131dadb968d3853e809518c2", size = 80281, upload-time = "2025-08-10T21:27:45.369Z" }, - { url = "https://files.pythonhosted.org/packages/da/e3/dbd2ecdce306f1d07a1aaf324817ee993aab7aee9db47ceac757deabafbe/kiwisolver-1.4.9-pp311-pypy311_pp73-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:464415881e4801295659462c49461a24fb107c140de781d55518c4b80cb6790f", size = 78009, upload-time = "2025-08-10T21:27:46.376Z" }, - { url = "https://files.pythonhosted.org/packages/da/e9/0d4add7873a73e462aeb45c036a2dead2562b825aa46ba326727b3f31016/kiwisolver-1.4.9-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:fb940820c63a9590d31d88b815e7a3aa5915cad3ce735ab45f0c730b39547de1", size = 73929, upload-time = "2025-08-10T21:27:48.236Z" }, -] - [[package]] name = "lefthook" version = "2.0.15" @@ -493,42 +382,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/e5/f1/216fc1bbfd74011693a4fd837e7026152e89c4bcf3e77b6692fba9923123/markupsafe-3.0.3-cp312-cp312-win_arm64.whl", hash = "sha256:35add3b638a5d900e807944a078b51922212fb3dedb01633a8defc4b01a3c85f", size = 13906, upload-time = "2025-09-27T18:36:40.689Z" }, ] -[[package]] -name = "matplotlib" -version = "3.10.8" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "contourpy" }, - { name = "cycler" }, - { name = "fonttools" }, - { name = "kiwisolver" }, - { name = "numpy" }, - { name = "packaging" }, - { name = "pillow" }, - { name = "pyparsing" }, - { name = "python-dateutil" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/8a/76/d3c6e3a13fe484ebe7718d14e269c9569c4eb0020a968a327acb3b9a8fe6/matplotlib-3.10.8.tar.gz", hash = "sha256:2299372c19d56bcd35cf05a2738308758d32b9eaed2371898d8f5bd33f084aa3", size = 34806269, upload-time = "2025-12-10T22:56:51.155Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/f8/86/de7e3a1cdcfc941483af70609edc06b83e7c8a0e0dc9ac325200a3f4d220/matplotlib-3.10.8-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:6be43b667360fef5c754dda5d25a32e6307a03c204f3c0fc5468b78fa87b4160", size = 8251215, upload-time = "2025-12-10T22:55:16.175Z" }, - { url = "https://files.pythonhosted.org/packages/fd/14/baad3222f424b19ce6ad243c71de1ad9ec6b2e4eb1e458a48fdc6d120401/matplotlib-3.10.8-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a2b336e2d91a3d7006864e0990c83b216fcdca64b5a6484912902cef87313d78", size = 8139625, upload-time = "2025-12-10T22:55:17.712Z" }, - { url = "https://files.pythonhosted.org/packages/8f/a0/7024215e95d456de5883e6732e708d8187d9753a21d32f8ddb3befc0c445/matplotlib-3.10.8-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:efb30e3baaea72ce5928e32bab719ab4770099079d66726a62b11b1ef7273be4", size = 8712614, upload-time = "2025-12-10T22:55:20.8Z" }, - { url = "https://files.pythonhosted.org/packages/5a/f4/b8347351da9a5b3f41e26cf547252d861f685c6867d179a7c9d60ad50189/matplotlib-3.10.8-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d56a1efd5bfd61486c8bc968fa18734464556f0fb8e51690f4ac25d85cbbbbc2", size = 9540997, upload-time = "2025-12-10T22:55:23.258Z" }, - { url = "https://files.pythonhosted.org/packages/9e/c0/c7b914e297efe0bc36917bf216b2acb91044b91e930e878ae12981e461e5/matplotlib-3.10.8-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:238b7ce5717600615c895050239ec955d91f321c209dd110db988500558e70d6", size = 9596825, upload-time = "2025-12-10T22:55:25.217Z" }, - { url = "https://files.pythonhosted.org/packages/6f/d3/a4bbc01c237ab710a1f22b4da72f4ff6d77eb4c7735ea9811a94ae239067/matplotlib-3.10.8-cp311-cp311-win_amd64.whl", hash = "sha256:18821ace09c763ec93aef5eeff087ee493a24051936d7b9ebcad9662f66501f9", size = 8135090, upload-time = "2025-12-10T22:55:27.162Z" }, - { url = "https://files.pythonhosted.org/packages/89/dd/a0b6588f102beab33ca6f5218b31725216577b2a24172f327eaf6417d5c9/matplotlib-3.10.8-cp311-cp311-win_arm64.whl", hash = "sha256:bab485bcf8b1c7d2060b4fcb6fc368a9e6f4cd754c9c2fea281f4be21df394a2", size = 8012377, upload-time = "2025-12-10T22:55:29.185Z" }, - { url = "https://files.pythonhosted.org/packages/9e/67/f997cdcbb514012eb0d10cd2b4b332667997fb5ebe26b8d41d04962fa0e6/matplotlib-3.10.8-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:64fcc24778ca0404ce0cb7b6b77ae1f4c7231cdd60e6778f999ee05cbd581b9a", size = 8260453, upload-time = "2025-12-10T22:55:30.709Z" }, - { url = "https://files.pythonhosted.org/packages/7e/65/07d5f5c7f7c994f12c768708bd2e17a4f01a2b0f44a1c9eccad872433e2e/matplotlib-3.10.8-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:b9a5ca4ac220a0cdd1ba6bcba3608547117d30468fefce49bb26f55c1a3d5c58", size = 8148321, upload-time = "2025-12-10T22:55:33.265Z" }, - { url = "https://files.pythonhosted.org/packages/3e/f3/c5195b1ae57ef85339fd7285dfb603b22c8b4e79114bae5f4f0fcf688677/matplotlib-3.10.8-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:3ab4aabc72de4ff77b3ec33a6d78a68227bf1123465887f9905ba79184a1cc04", size = 8716944, upload-time = "2025-12-10T22:55:34.922Z" }, - { url = "https://files.pythonhosted.org/packages/00/f9/7638f5cc82ec8a7aa005de48622eecc3ed7c9854b96ba15bd76b7fd27574/matplotlib-3.10.8-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:24d50994d8c5816ddc35411e50a86ab05f575e2530c02752e02538122613371f", size = 9550099, upload-time = "2025-12-10T22:55:36.789Z" }, - { url = "https://files.pythonhosted.org/packages/57/61/78cd5920d35b29fd2a0fe894de8adf672ff52939d2e9b43cb83cd5ce1bc7/matplotlib-3.10.8-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:99eefd13c0dc3b3c1b4d561c1169e65fe47aab7b8158754d7c084088e2329466", size = 9613040, upload-time = "2025-12-10T22:55:38.715Z" }, - { url = "https://files.pythonhosted.org/packages/30/4e/c10f171b6e2f44d9e3a2b96efa38b1677439d79c99357600a62cc1e9594e/matplotlib-3.10.8-cp312-cp312-win_amd64.whl", hash = "sha256:dd80ecb295460a5d9d260df63c43f4afbdd832d725a531f008dad1664f458adf", size = 8142717, upload-time = "2025-12-10T22:55:41.103Z" }, - { url = "https://files.pythonhosted.org/packages/f1/76/934db220026b5fef85f45d51a738b91dea7d70207581063cd9bd8fafcf74/matplotlib-3.10.8-cp312-cp312-win_arm64.whl", hash = "sha256:3c624e43ed56313651bc18a47f838b60d7b8032ed348911c54906b130b20071b", size = 8012751, upload-time = "2025-12-10T22:55:42.684Z" }, - { url = "https://files.pythonhosted.org/packages/04/30/3afaa31c757f34b7725ab9d2ba8b48b5e89c2019c003e7d0ead143aabc5a/matplotlib-3.10.8-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:6da7c2ce169267d0d066adcf63758f0604aa6c3eebf67458930f9d9b79ad1db1", size = 8249198, upload-time = "2025-12-10T22:56:45.584Z" }, - { url = "https://files.pythonhosted.org/packages/48/2f/6334aec331f57485a642a7c8be03cb286f29111ae71c46c38b363230063c/matplotlib-3.10.8-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:9153c3292705be9f9c64498a8872118540c3f4123d1a1c840172edf262c8be4a", size = 8136817, upload-time = "2025-12-10T22:56:47.339Z" }, - { url = "https://files.pythonhosted.org/packages/73/e4/6d6f14b2a759c622f191b2d67e9075a3f56aaccb3be4bb9bb6890030d0a0/matplotlib-3.10.8-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:1ae029229a57cd1e8fe542485f27e7ca7b23aa9e8944ddb4985d0bc444f1eca2", size = 8713867, upload-time = "2025-12-10T22:56:48.954Z" }, -] - [[package]] name = "numpy" version = "2.4.2" @@ -585,7 +438,6 @@ docs = [ ] examples = [ { name = "inputs" }, - { name = "matplotlib" }, ] testing = [ { name = "cffi" }, @@ -623,7 +475,6 @@ requires-dist = [ { name = "inputs", marker = "extra == 'examples'" }, { name = "jinja2", marker = "extra == 'docs'" }, { name = "lefthook", marker = "extra == 'testing'" }, - { name = "matplotlib", marker = "extra == 'examples'" }, { name = "numpy" }, { name = "parameterized", marker = "extra == 'testing'", specifier = ">=0.8,<0.9" }, { name = "pycapnp", specifier = "==2.1.0" }, @@ -662,43 +513,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/31/13/fe468c8c7400a8eca204e6e160a29bf7dcd45a76e20f1c030f3eaa690d93/parameterized-0.8.1-py2.py3-none-any.whl", hash = "sha256:9cbb0b69a03e8695d68b3399a8a5825200976536fe1cb79db60ed6a4c8c9efe9", size = 26354, upload-time = "2021-01-09T20:35:16.307Z" }, ] -[[package]] -name = "pillow" -version = "12.1.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/1f/42/5c74462b4fd957fcd7b13b04fb3205ff8349236ea74c7c375766d6c82288/pillow-12.1.1.tar.gz", hash = "sha256:9ad8fa5937ab05218e2b6a4cff30295ad35afd2f83ac592e68c0d871bb0fdbc4", size = 46980264, upload-time = "2026-02-11T04:23:07.146Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/2b/46/5da1ec4a5171ee7bf1a0efa064aba70ba3d6e0788ce3f5acd1375d23c8c0/pillow-12.1.1-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:e879bb6cd5c73848ef3b2b48b8af9ff08c5b71ecda8048b7dd22d8a33f60be32", size = 5304084, upload-time = "2026-02-11T04:20:27.501Z" }, - { url = "https://files.pythonhosted.org/packages/78/93/a29e9bc02d1cf557a834da780ceccd54e02421627200696fcf805ebdc3fb/pillow-12.1.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:365b10bb9417dd4498c0e3b128018c4a624dc11c7b97d8cc54effe3b096f4c38", size = 4657866, upload-time = "2026-02-11T04:20:29.827Z" }, - { url = "https://files.pythonhosted.org/packages/13/84/583a4558d492a179d31e4aae32eadce94b9acf49c0337c4ce0b70e0a01f2/pillow-12.1.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:d4ce8e329c93845720cd2014659ca67eac35f6433fd3050393d85f3ecef0dad5", size = 6232148, upload-time = "2026-02-11T04:20:31.329Z" }, - { url = "https://files.pythonhosted.org/packages/d5/e2/53c43334bbbb2d3b938978532fbda8e62bb6e0b23a26ce8592f36bcc4987/pillow-12.1.1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:fc354a04072b765eccf2204f588a7a532c9511e8b9c7f900e1b64e3e33487090", size = 8038007, upload-time = "2026-02-11T04:20:34.225Z" }, - { url = "https://files.pythonhosted.org/packages/b8/a6/3d0e79c8a9d58150dd98e199d7c1c56861027f3829a3a60b3c2784190180/pillow-12.1.1-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7e7976bf1910a8116b523b9f9f58bf410f3e8aa330cd9a2bb2953f9266ab49af", size = 6345418, upload-time = "2026-02-11T04:20:35.858Z" }, - { url = "https://files.pythonhosted.org/packages/a2/c8/46dfeac5825e600579157eea177be43e2f7ff4a99da9d0d0a49533509ac5/pillow-12.1.1-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:597bd9c8419bc7c6af5604e55847789b69123bbe25d65cc6ad3012b4f3c98d8b", size = 7034590, upload-time = "2026-02-11T04:20:37.91Z" }, - { url = "https://files.pythonhosted.org/packages/af/bf/e6f65d3db8a8bbfeaf9e13cc0417813f6319863a73de934f14b2229ada18/pillow-12.1.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:2c1fc0f2ca5f96a3c8407e41cca26a16e46b21060fe6d5b099d2cb01412222f5", size = 6458655, upload-time = "2026-02-11T04:20:39.496Z" }, - { url = "https://files.pythonhosted.org/packages/f9/c2/66091f3f34a25894ca129362e510b956ef26f8fb67a0e6417bc5744e56f1/pillow-12.1.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:578510d88c6229d735855e1f278aa305270438d36a05031dfaae5067cc8eb04d", size = 7159286, upload-time = "2026-02-11T04:20:41.139Z" }, - { url = "https://files.pythonhosted.org/packages/7b/5a/24bc8eb526a22f957d0cec6243146744966d40857e3d8deb68f7902ca6c1/pillow-12.1.1-cp311-cp311-win32.whl", hash = "sha256:7311c0a0dcadb89b36b7025dfd8326ecfa36964e29913074d47382706e516a7c", size = 6328663, upload-time = "2026-02-11T04:20:43.184Z" }, - { url = "https://files.pythonhosted.org/packages/31/03/bef822e4f2d8f9d7448c133d0a18185d3cce3e70472774fffefe8b0ed562/pillow-12.1.1-cp311-cp311-win_amd64.whl", hash = "sha256:fbfa2a7c10cc2623f412753cddf391c7f971c52ca40a3f65dc5039b2939e8563", size = 7031448, upload-time = "2026-02-11T04:20:44.696Z" }, - { url = "https://files.pythonhosted.org/packages/49/70/f76296f53610bd17b2e7d31728b8b7825e3ac3b5b3688b51f52eab7c0818/pillow-12.1.1-cp311-cp311-win_arm64.whl", hash = "sha256:b81b5e3511211631b3f672a595e3221252c90af017e399056d0faabb9538aa80", size = 2453651, upload-time = "2026-02-11T04:20:46.243Z" }, - { url = "https://files.pythonhosted.org/packages/07/d3/8df65da0d4df36b094351dce696f2989bec731d4f10e743b1c5f4da4d3bf/pillow-12.1.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:ab323b787d6e18b3d91a72fc99b1a2c28651e4358749842b8f8dfacd28ef2052", size = 5262803, upload-time = "2026-02-11T04:20:47.653Z" }, - { url = "https://files.pythonhosted.org/packages/d6/71/5026395b290ff404b836e636f51d7297e6c83beceaa87c592718747e670f/pillow-12.1.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:adebb5bee0f0af4909c30db0d890c773d1a92ffe83da908e2e9e720f8edf3984", size = 4657601, upload-time = "2026-02-11T04:20:49.328Z" }, - { url = "https://files.pythonhosted.org/packages/b1/2e/1001613d941c67442f745aff0f7cc66dd8df9a9c084eb497e6a543ee6f7e/pillow-12.1.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:bb66b7cc26f50977108790e2456b7921e773f23db5630261102233eb355a3b79", size = 6234995, upload-time = "2026-02-11T04:20:51.032Z" }, - { url = "https://files.pythonhosted.org/packages/07/26/246ab11455b2549b9233dbd44d358d033a2f780fa9007b61a913c5b2d24e/pillow-12.1.1-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:aee2810642b2898bb187ced9b349e95d2a7272930796e022efaf12e99dccd293", size = 8045012, upload-time = "2026-02-11T04:20:52.882Z" }, - { url = "https://files.pythonhosted.org/packages/b2/8b/07587069c27be7535ac1fe33874e32de118fbd34e2a73b7f83436a88368c/pillow-12.1.1-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a0b1cd6232e2b618adcc54d9882e4e662a089d5768cd188f7c245b4c8c44a397", size = 6349638, upload-time = "2026-02-11T04:20:54.444Z" }, - { url = "https://files.pythonhosted.org/packages/ff/79/6df7b2ee763d619cda2fb4fea498e5f79d984dae304d45a8999b80d6cf5c/pillow-12.1.1-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7aac39bcf8d4770d089588a2e1dd111cbaa42df5a94be3114222057d68336bd0", size = 7041540, upload-time = "2026-02-11T04:20:55.97Z" }, - { url = "https://files.pythonhosted.org/packages/2c/5e/2ba19e7e7236d7529f4d873bdaf317a318896bac289abebd4bb00ef247f0/pillow-12.1.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:ab174cd7d29a62dd139c44bf74b698039328f45cb03b4596c43473a46656b2f3", size = 6462613, upload-time = "2026-02-11T04:20:57.542Z" }, - { url = "https://files.pythonhosted.org/packages/03/03/31216ec124bb5c3dacd74ce8efff4cc7f52643653bad4825f8f08c697743/pillow-12.1.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:339ffdcb7cbeaa08221cd401d517d4b1fe7a9ed5d400e4a8039719238620ca35", size = 7166745, upload-time = "2026-02-11T04:20:59.196Z" }, - { url = "https://files.pythonhosted.org/packages/1f/e7/7c4552d80052337eb28653b617eafdef39adfb137c49dd7e831b8dc13bc5/pillow-12.1.1-cp312-cp312-win32.whl", hash = "sha256:5d1f9575a12bed9e9eedd9a4972834b08c97a352bd17955ccdebfeca5913fa0a", size = 6328823, upload-time = "2026-02-11T04:21:01.385Z" }, - { url = "https://files.pythonhosted.org/packages/3d/17/688626d192d7261bbbf98846fc98995726bddc2c945344b65bec3a29d731/pillow-12.1.1-cp312-cp312-win_amd64.whl", hash = "sha256:21329ec8c96c6e979cd0dfd29406c40c1d52521a90544463057d2aaa937d66a6", size = 7033367, upload-time = "2026-02-11T04:21:03.536Z" }, - { url = "https://files.pythonhosted.org/packages/ed/fe/a0ef1f73f939b0eca03ee2c108d0043a87468664770612602c63266a43c4/pillow-12.1.1-cp312-cp312-win_arm64.whl", hash = "sha256:af9a332e572978f0218686636610555ae3defd1633597be015ed50289a03c523", size = 2453811, upload-time = "2026-02-11T04:21:05.116Z" }, - { url = "https://files.pythonhosted.org/packages/56/11/5d43209aa4cb58e0cc80127956ff1796a68b928e6324bbf06ef4db34367b/pillow-12.1.1-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:600fd103672b925fe62ed08e0d874ea34d692474df6f4bf7ebe148b30f89f39f", size = 5228606, upload-time = "2026-02-11T04:22:52.106Z" }, - { url = "https://files.pythonhosted.org/packages/5f/d5/3b005b4e4fda6698b371fa6c21b097d4707585d7db99e98d9b0b87ac612a/pillow-12.1.1-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:665e1b916b043cef294bc54d47bf02d87e13f769bc4bc5fa225a24b3a6c5aca9", size = 4622321, upload-time = "2026-02-11T04:22:53.827Z" }, - { url = "https://files.pythonhosted.org/packages/df/36/ed3ea2d594356fd8037e5a01f6156c74bc8d92dbb0fa60746cc96cabb6e8/pillow-12.1.1-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:495c302af3aad1ca67420ddd5c7bd480c8867ad173528767d906428057a11f0e", size = 5247579, upload-time = "2026-02-11T04:22:56.094Z" }, - { url = "https://files.pythonhosted.org/packages/54/9a/9cc3e029683cf6d20ae5085da0dafc63148e3252c2f13328e553aaa13cfb/pillow-12.1.1-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8fd420ef0c52c88b5a035a0886f367748c72147b2b8f384c9d12656678dfdfa9", size = 6989094, upload-time = "2026-02-11T04:22:58.288Z" }, - { url = "https://files.pythonhosted.org/packages/00/98/fc53ab36da80b88df0967896b6c4b4cd948a0dc5aa40a754266aa3ae48b3/pillow-12.1.1-pp311-pypy311_pp73-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f975aa7ef9684ce7e2c18a3aa8f8e2106ce1e46b94ab713d156b2898811651d3", size = 5313850, upload-time = "2026-02-11T04:23:00.554Z" }, - { url = "https://files.pythonhosted.org/packages/30/02/00fa585abfd9fe9d73e5f6e554dc36cc2b842898cbfc46d70353dae227f8/pillow-12.1.1-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8089c852a56c2966cf18835db62d9b34fef7ba74c726ad943928d494fa7f4735", size = 5963343, upload-time = "2026-02-11T04:23:02.934Z" }, - { url = "https://files.pythonhosted.org/packages/f2/26/c56ce33ca856e358d27fda9676c055395abddb82c35ac0f593877ed4562e/pillow-12.1.1-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:cb9bb857b2d057c6dfc72ac5f3b44836924ba15721882ef103cecb40d002d80e", size = 7029880, upload-time = "2026-02-11T04:23:04.783Z" }, -] - [[package]] name = "pluggy" version = "1.6.0" @@ -777,15 +591,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/c7/21/705964c7812476f378728bdf590ca4b771ec72385c533964653c68e86bdc/pygments-2.19.2-py3-none-any.whl", hash = "sha256:86540386c03d588bb81d44bc3928634ff26449851e99741617ecb9037ee5ec0b", size = 1225217, upload-time = "2025-06-21T13:39:07.939Z" }, ] -[[package]] -name = "pyparsing" -version = "3.3.2" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/f3/91/9c6ee907786a473bf81c5f53cf703ba0957b23ab84c264080fb5a450416f/pyparsing-3.3.2.tar.gz", hash = "sha256:c777f4d763f140633dcb6d8a3eda953bf7a214dc4eff598413c070bcdc117cbc", size = 6851574, upload-time = "2026-01-21T03:57:59.36Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/10/bd/c038d7cc38edc1aa5bf91ab8068b63d4308c66c4c8bb3cbba7dfbc049f9c/pyparsing-3.3.2-py3-none-any.whl", hash = "sha256:850ba148bd908d7e2411587e247a1e4f0327839c40e2e5e6d05a007ecc69911d", size = 122781, upload-time = "2026-01-21T03:57:55.912Z" }, -] - [[package]] name = "pytest" version = "8.4.2" @@ -886,18 +691,6 @@ dependencies = [ { name = "pytest" }, ] -[[package]] -name = "python-dateutil" -version = "2.9.0.post0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "six" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/66/c0/0c8b6ad9f17a802ee498c46e004a0eb49bc148f2fd230864601a86dcf6db/python-dateutil-2.9.0.post0.tar.gz", hash = "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3", size = 342432, upload-time = "2024-03-01T18:36:20.211Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/ec/57/56b9bcc3c9c6a792fcbaf139543cee77261f3651ca9da0c93f5c1221264b/python_dateutil-2.9.0.post0-py2.py3-none-any.whl", hash = "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427", size = 229892, upload-time = "2024-03-01T18:36:18.57Z" }, -] - [[package]] name = "requests" version = "2.32.5" @@ -947,15 +740,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/ce/bf/931fb9fbb87234c32b8b1b1c15fba23472a10777c12043336675633809a7/scons-4.10.1-py3-none-any.whl", hash = "sha256:bd9d1c52f908d874eba92a8c0c0a8dcf2ed9f3b88ab956d0fce1da479c4e7126", size = 4136069, upload-time = "2025-11-16T22:43:35.933Z" }, ] -[[package]] -name = "six" -version = "1.17.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/94/e7/b2c673351809dca68a0e064b6af791aa332cf192da575fd474ed7d6f16a2/six-1.17.0.tar.gz", hash = "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81", size = 34031, upload-time = "2024-12-04T17:35:28.174Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/b7/ce/149a00dd41f10bc29e5921b496af8b574d8413afcd5e30dfa0ed46c2cc5e/six-1.17.0-py2.py3-none-any.whl", hash = "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274", size = 11050, upload-time = "2024-12-04T17:35:26.475Z" }, -] - [[package]] name = "sortedcontainers" version = "2.4.0" From 517b3f99d47b1731bb7181c255e9bd18748ecc56 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 10 Mar 2026 21:54:52 -0700 Subject: [PATCH 140/229] rm pytest-coverage (#3186) --- pyproject.toml | 1 - uv.lock | 111 ------------------------------------------------- 2 files changed, 112 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 072554c79a2..c9bb72d2f60 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,6 @@ testing = [ "gcovr", # FIXME: pytest 9.0.0 doesn't support unittest.SkipTest "pytest==8.4.2", - "pytest-coverage", "pytest-mock", "pytest-randomly", # https://github.com/pytest-dev/pytest-xdist/pull/1229 diff --git a/uv.lock b/uv.lock index d08a23dd54c..58dd108cd34 100644 --- a/uv.lock +++ b/uv.lock @@ -141,50 +141,6 @@ wheels = [ [package.metadata] requires-dist = [{ name = "requests" }] -[[package]] -name = "coverage" -version = "7.13.4" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/24/56/95b7e30fa389756cb56630faa728da46a27b8c6eb46f9d557c68fff12b65/coverage-7.13.4.tar.gz", hash = "sha256:e5c8f6ed1e61a8b2dcdf31eb0b9bbf0130750ca79c1c49eb898e2ad86f5ccc91", size = 827239, upload-time = "2026-02-09T12:59:03.86Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/b4/ad/b59e5b451cf7172b8d1043dc0fa718f23aab379bc1521ee13d4bd9bfa960/coverage-7.13.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d490ba50c3f35dd7c17953c68f3270e7ccd1c6642e2d2afe2d8e720b98f5a053", size = 219278, upload-time = "2026-02-09T12:56:31.673Z" }, - { url = "https://files.pythonhosted.org/packages/f1/17/0cb7ca3de72e5f4ef2ec2fa0089beafbcaaaead1844e8b8a63d35173d77d/coverage-7.13.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:19bc3c88078789f8ef36acb014d7241961dbf883fd2533d18cb1e7a5b4e28b11", size = 219783, upload-time = "2026-02-09T12:56:33.104Z" }, - { url = "https://files.pythonhosted.org/packages/ab/63/325d8e5b11e0eaf6d0f6a44fad444ae58820929a9b0de943fa377fe73e85/coverage-7.13.4-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:3998e5a32e62fdf410c0dbd3115df86297995d6e3429af80b8798aad894ca7aa", size = 250200, upload-time = "2026-02-09T12:56:34.474Z" }, - { url = "https://files.pythonhosted.org/packages/76/53/c16972708cbb79f2942922571a687c52bd109a7bd51175aeb7558dff2236/coverage-7.13.4-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:8e264226ec98e01a8e1054314af91ee6cde0eacac4f465cc93b03dbe0bce2fd7", size = 252114, upload-time = "2026-02-09T12:56:35.749Z" }, - { url = "https://files.pythonhosted.org/packages/eb/c2/7ab36d8b8cc412bec9ea2d07c83c48930eb4ba649634ba00cb7e4e0f9017/coverage-7.13.4-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a3aa4e7b9e416774b21797365b358a6e827ffadaaca81b69ee02946852449f00", size = 254220, upload-time = "2026-02-09T12:56:37.796Z" }, - { url = "https://files.pythonhosted.org/packages/d6/4d/cf52c9a3322c89a0e6febdfbc83bb45c0ed3c64ad14081b9503adee702e7/coverage-7.13.4-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:71ca20079dd8f27fcf808817e281e90220475cd75115162218d0e27549f95fef", size = 256164, upload-time = "2026-02-09T12:56:39.016Z" }, - { url = "https://files.pythonhosted.org/packages/78/e9/eb1dd17bd6de8289df3580e967e78294f352a5df8a57ff4671ee5fc3dcd0/coverage-7.13.4-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e2f25215f1a359ab17320b47bcdaca3e6e6356652e8256f2441e4ef972052903", size = 250325, upload-time = "2026-02-09T12:56:40.668Z" }, - { url = "https://files.pythonhosted.org/packages/71/07/8c1542aa873728f72267c07278c5cc0ec91356daf974df21335ccdb46368/coverage-7.13.4-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:d65b2d373032411e86960604dc4edac91fdfb5dca539461cf2cbe78327d1e64f", size = 251913, upload-time = "2026-02-09T12:56:41.97Z" }, - { url = "https://files.pythonhosted.org/packages/74/d7/c62e2c5e4483a748e27868e4c32ad3daa9bdddbba58e1bc7a15e252baa74/coverage-7.13.4-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:94eb63f9b363180aff17de3e7c8760c3ba94664ea2695c52f10111244d16a299", size = 249974, upload-time = "2026-02-09T12:56:43.323Z" }, - { url = "https://files.pythonhosted.org/packages/98/9f/4c5c015a6e98ced54efd0f5cf8d31b88e5504ecb6857585fc0161bb1e600/coverage-7.13.4-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:e856bf6616714c3a9fbc270ab54103f4e685ba236fa98c054e8f87f266c93505", size = 253741, upload-time = "2026-02-09T12:56:45.155Z" }, - { url = "https://files.pythonhosted.org/packages/bd/59/0f4eef89b9f0fcd9633b5d350016f54126ab49426a70ff4c4e87446cabdc/coverage-7.13.4-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:65dfcbe305c3dfe658492df2d85259e0d79ead4177f9ae724b6fb245198f55d6", size = 249695, upload-time = "2026-02-09T12:56:46.636Z" }, - { url = "https://files.pythonhosted.org/packages/b5/2c/b7476f938deb07166f3eb281a385c262675d688ff4659ad56c6c6b8e2e70/coverage-7.13.4-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:b507778ae8a4c915436ed5c2e05b4a6cecfa70f734e19c22a005152a11c7b6a9", size = 250599, upload-time = "2026-02-09T12:56:48.13Z" }, - { url = "https://files.pythonhosted.org/packages/b8/34/c3420709d9846ee3785b9f2831b4d94f276f38884032dca1457fa83f7476/coverage-7.13.4-cp311-cp311-win32.whl", hash = "sha256:784fc3cf8be001197b652d51d3fd259b1e2262888693a4636e18879f613a62a9", size = 221780, upload-time = "2026-02-09T12:56:50.479Z" }, - { url = "https://files.pythonhosted.org/packages/61/08/3d9c8613079d2b11c185b865de9a4c1a68850cfda2b357fae365cf609f29/coverage-7.13.4-cp311-cp311-win_amd64.whl", hash = "sha256:2421d591f8ca05b308cf0092807308b2facbefe54af7c02ac22548b88b95c98f", size = 222715, upload-time = "2026-02-09T12:56:51.815Z" }, - { url = "https://files.pythonhosted.org/packages/18/1a/54c3c80b2f056164cc0a6cdcb040733760c7c4be9d780fe655f356f433e4/coverage-7.13.4-cp311-cp311-win_arm64.whl", hash = "sha256:79e73a76b854d9c6088fe5d8b2ebe745f8681c55f7397c3c0a016192d681045f", size = 221385, upload-time = "2026-02-09T12:56:53.194Z" }, - { url = "https://files.pythonhosted.org/packages/d1/81/4ce2fdd909c5a0ed1f6dedb88aa57ab79b6d1fbd9b588c1ac7ef45659566/coverage-7.13.4-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:02231499b08dabbe2b96612993e5fc34217cdae907a51b906ac7fca8027a4459", size = 219449, upload-time = "2026-02-09T12:56:54.889Z" }, - { url = "https://files.pythonhosted.org/packages/5d/96/5238b1efc5922ddbdc9b0db9243152c09777804fb7c02ad1741eb18a11c0/coverage-7.13.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40aa8808140e55dc022b15d8aa7f651b6b3d68b365ea0398f1441e0b04d859c3", size = 219810, upload-time = "2026-02-09T12:56:56.33Z" }, - { url = "https://files.pythonhosted.org/packages/78/72/2f372b726d433c9c35e56377cf1d513b4c16fe51841060d826b95caacec1/coverage-7.13.4-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:5b856a8ccf749480024ff3bd7310adaef57bf31fd17e1bfc404b7940b6986634", size = 251308, upload-time = "2026-02-09T12:56:57.858Z" }, - { url = "https://files.pythonhosted.org/packages/5d/a0/2ea570925524ef4e00bb6c82649f5682a77fac5ab910a65c9284de422600/coverage-7.13.4-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:2c048ea43875fbf8b45d476ad79f179809c590ec7b79e2035c662e7afa3192e3", size = 254052, upload-time = "2026-02-09T12:56:59.754Z" }, - { url = "https://files.pythonhosted.org/packages/e8/ac/45dc2e19a1939098d783c846e130b8f862fbb50d09e0af663988f2f21973/coverage-7.13.4-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b7b38448866e83176e28086674fe7368ab8590e4610fb662b44e345b86d63ffa", size = 255165, upload-time = "2026-02-09T12:57:01.287Z" }, - { url = "https://files.pythonhosted.org/packages/2d/4d/26d236ff35abc3b5e63540d3386e4c3b192168c1d96da5cb2f43c640970f/coverage-7.13.4-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:de6defc1c9badbf8b9e67ae90fd00519186d6ab64e5cc5f3d21359c2a9b2c1d3", size = 257432, upload-time = "2026-02-09T12:57:02.637Z" }, - { url = "https://files.pythonhosted.org/packages/ec/55/14a966c757d1348b2e19caf699415a2a4c4f7feaa4bbc6326a51f5c7dd1b/coverage-7.13.4-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:7eda778067ad7ffccd23ecffce537dface96212576a07924cbf0d8799d2ded5a", size = 251716, upload-time = "2026-02-09T12:57:04.056Z" }, - { url = "https://files.pythonhosted.org/packages/77/33/50116647905837c66d28b2af1321b845d5f5d19be9655cb84d4a0ea806b4/coverage-7.13.4-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:e87f6c587c3f34356c3759f0420693e35e7eb0e2e41e4c011cb6ec6ecbbf1db7", size = 253089, upload-time = "2026-02-09T12:57:05.503Z" }, - { url = "https://files.pythonhosted.org/packages/c2/b4/8efb11a46e3665d92635a56e4f2d4529de6d33f2cb38afd47d779d15fc99/coverage-7.13.4-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:8248977c2e33aecb2ced42fef99f2d319e9904a36e55a8a68b69207fb7e43edc", size = 251232, upload-time = "2026-02-09T12:57:06.879Z" }, - { url = "https://files.pythonhosted.org/packages/51/24/8cd73dd399b812cc76bb0ac260e671c4163093441847ffe058ac9fda1e32/coverage-7.13.4-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:25381386e80ae727608e662474db537d4df1ecd42379b5ba33c84633a2b36d47", size = 255299, upload-time = "2026-02-09T12:57:08.245Z" }, - { url = "https://files.pythonhosted.org/packages/03/94/0a4b12f1d0e029ce1ccc1c800944a9984cbe7d678e470bb6d3c6bc38a0da/coverage-7.13.4-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:ee756f00726693e5ba94d6df2bdfd64d4852d23b09bb0bc700e3b30e6f333985", size = 250796, upload-time = "2026-02-09T12:57:10.142Z" }, - { url = "https://files.pythonhosted.org/packages/73/44/6002fbf88f6698ca034360ce474c406be6d5a985b3fdb3401128031eef6b/coverage-7.13.4-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:fdfc1e28e7c7cdce44985b3043bc13bbd9c747520f94a4d7164af8260b3d91f0", size = 252673, upload-time = "2026-02-09T12:57:12.197Z" }, - { url = "https://files.pythonhosted.org/packages/de/c6/a0279f7c00e786be75a749a5674e6fa267bcbd8209cd10c9a450c655dfa7/coverage-7.13.4-cp312-cp312-win32.whl", hash = "sha256:01d4cbc3c283a17fc1e42d614a119f7f438eabb593391283adca8dc86eff1246", size = 221990, upload-time = "2026-02-09T12:57:14.085Z" }, - { url = "https://files.pythonhosted.org/packages/77/4e/c0a25a425fcf5557d9abd18419c95b63922e897bc86c1f327f155ef234a9/coverage-7.13.4-cp312-cp312-win_amd64.whl", hash = "sha256:9401ebc7ef522f01d01d45532c68c5ac40fb27113019b6b7d8b208f6e9baa126", size = 222800, upload-time = "2026-02-09T12:57:15.944Z" }, - { url = "https://files.pythonhosted.org/packages/47/ac/92da44ad9a6f4e3a7debd178949d6f3769bedca33830ce9b1dcdab589a37/coverage-7.13.4-cp312-cp312-win_arm64.whl", hash = "sha256:b1ec7b6b6e93255f952e27ab58fbc68dcc468844b16ecbee881aeb29b6ab4d8d", size = 221415, upload-time = "2026-02-09T12:57:17.497Z" }, - { url = "https://files.pythonhosted.org/packages/0d/4a/331fe2caf6799d591109bb9c08083080f6de90a823695d412a935622abb2/coverage-7.13.4-py3-none-any.whl", hash = "sha256:1af1641e57cf7ba1bd67d677c9abdbcd6cc2ab7da3bca7fa1e2b7e50e65f2ad0", size = 211242, upload-time = "2026-02-09T12:59:02.032Z" }, -] - -[package.optional-dependencies] -toml = [ - { name = "tomli", marker = "python_full_version <= '3.11'" }, -] - [[package]] name = "cppcheck" version = "2.16.0" @@ -450,7 +406,6 @@ testing = [ { name = "lefthook" }, { name = "parameterized" }, { name = "pytest" }, - { name = "pytest-coverage" }, { name = "pytest-mock" }, { name = "pytest-randomly" }, { name = "pytest-subtests" }, @@ -480,7 +435,6 @@ requires-dist = [ { name = "pycapnp", specifier = "==2.1.0" }, { name = "pycryptodome" }, { name = "pytest", marker = "extra == 'testing'", specifier = "==8.4.2" }, - { name = "pytest-coverage", marker = "extra == 'testing'" }, { name = "pytest-mock", marker = "extra == 'testing'" }, { name = "pytest-randomly", marker = "extra == 'testing'" }, { name = "pytest-subtests", marker = "extra == 'testing'" }, @@ -607,44 +561,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/a8/a4/20da314d277121d6534b3a980b29035dcd51e6744bd79075a6ce8fa4eb8d/pytest-8.4.2-py3-none-any.whl", hash = "sha256:872f880de3fc3a5bdc88a11b39c9710c3497a547cfa9320bc3c5e62fbf272e79", size = 365750, upload-time = "2025-09-04T14:34:20.226Z" }, ] -[[package]] -name = "pytest-cov" -version = "7.0.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "coverage", extra = ["toml"] }, - { name = "pluggy" }, - { name = "pytest" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/5e/f7/c933acc76f5208b3b00089573cf6a2bc26dc80a8aece8f52bb7d6b1855ca/pytest_cov-7.0.0.tar.gz", hash = "sha256:33c97eda2e049a0c5298e91f519302a1334c26ac65c1a483d6206fd458361af1", size = 54328, upload-time = "2025-09-09T10:57:02.113Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/ee/49/1377b49de7d0c1ce41292161ea0f721913fa8722c19fb9c1e3aa0367eecb/pytest_cov-7.0.0-py3-none-any.whl", hash = "sha256:3b8e9558b16cc1479da72058bdecf8073661c7f57f7d3c5f22a1c23507f2d861", size = 22424, upload-time = "2025-09-09T10:57:00.695Z" }, -] - -[[package]] -name = "pytest-cover" -version = "3.0.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "pytest-cov" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/30/27/20964101a7cdb260f8d6c4e854659026968321d10c90552b1fe7f6c5f913/pytest-cover-3.0.0.tar.gz", hash = "sha256:5bdb6c1cc3dd75583bb7bc2c57f5e1034a1bfcb79d27c71aceb0b16af981dbf4", size = 3211, upload-time = "2015-08-01T19:20:22.562Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/71/9b/7b4700c462628e169bd859c6368d596a6aedc87936bde733bead9f875fce/pytest_cover-3.0.0-py2.py3-none-any.whl", hash = "sha256:578249955eb3b5f3991209df6e532bb770b647743b7392d3d97698dc02f39ebb", size = 3769, upload-time = "2015-08-01T19:20:18.534Z" }, -] - -[[package]] -name = "pytest-coverage" -version = "0.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "pytest-cover" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/01/81/1d954849aed17b254d1c397eb4447a05eedce612a56b627c071df2ce00c1/pytest-coverage-0.0.tar.gz", hash = "sha256:db6af2cbd7e458c7c9fd2b4207cee75258243c8a81cad31a7ee8cfad5be93c05", size = 873, upload-time = "2015-06-17T21:50:38.956Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/5b/4b/d95b052f87db89a2383233c0754c45f6d3b427b7a4bcb771ac9316a6fae1/pytest_coverage-0.0-py2.py3-none-any.whl", hash = "sha256:dedd084c5e74d8e669355325916dc011539b190355021b037242514dee546368", size = 2013, upload-time = "2015-06-17T22:08:36.771Z" }, -] - [[package]] name = "pytest-mock" version = "3.15.1" @@ -749,33 +665,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/32/46/9cb0e58b2deb7f82b84065f37f3bffeb12413f947f9388e4cac22c4621ce/sortedcontainers-2.4.0-py2.py3-none-any.whl", hash = "sha256:a163dcaede0f1c021485e957a39245190e74249897e2ae4b2aa38595db237ee0", size = 29575, upload-time = "2021-05-16T22:03:41.177Z" }, ] -[[package]] -name = "tomli" -version = "2.4.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/82/30/31573e9457673ab10aa432461bee537ce6cef177667deca369efb79df071/tomli-2.4.0.tar.gz", hash = "sha256:aa89c3f6c277dd275d8e243ad24f3b5e701491a860d5121f2cdd399fbb31fc9c", size = 17477, upload-time = "2026-01-11T11:22:38.165Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/3c/d9/3dc2289e1f3b32eb19b9785b6a006b28ee99acb37d1d47f78d4c10e28bf8/tomli-2.4.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b5ef256a3fd497d4973c11bf142e9ed78b150d36f5773f1ca6088c230ffc5867", size = 153663, upload-time = "2026-01-11T11:21:45.27Z" }, - { url = "https://files.pythonhosted.org/packages/51/32/ef9f6845e6b9ca392cd3f64f9ec185cc6f09f0a2df3db08cbe8809d1d435/tomli-2.4.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5572e41282d5268eb09a697c89a7bee84fae66511f87533a6f88bd2f7b652da9", size = 148469, upload-time = "2026-01-11T11:21:46.873Z" }, - { url = "https://files.pythonhosted.org/packages/d6/c2/506e44cce89a8b1b1e047d64bd495c22c9f71f21e05f380f1a950dd9c217/tomli-2.4.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:551e321c6ba03b55676970b47cb1b73f14a0a4dce6a3e1a9458fd6d921d72e95", size = 236039, upload-time = "2026-01-11T11:21:48.503Z" }, - { url = "https://files.pythonhosted.org/packages/b3/40/e1b65986dbc861b7e986e8ec394598187fa8aee85b1650b01dd925ca0be8/tomli-2.4.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5e3f639a7a8f10069d0e15408c0b96a2a828cfdec6fca05296ebcdcc28ca7c76", size = 243007, upload-time = "2026-01-11T11:21:49.456Z" }, - { url = "https://files.pythonhosted.org/packages/9c/6f/6e39ce66b58a5b7ae572a0f4352ff40c71e8573633deda43f6a379d56b3e/tomli-2.4.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:1b168f2731796b045128c45982d3a4874057626da0e2ef1fdd722848b741361d", size = 240875, upload-time = "2026-01-11T11:21:50.755Z" }, - { url = "https://files.pythonhosted.org/packages/aa/ad/cb089cb190487caa80204d503c7fd0f4d443f90b95cf4ef5cf5aa0f439b0/tomli-2.4.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:133e93646ec4300d651839d382d63edff11d8978be23da4cc106f5a18b7d0576", size = 246271, upload-time = "2026-01-11T11:21:51.81Z" }, - { url = "https://files.pythonhosted.org/packages/0b/63/69125220e47fd7a3a27fd0de0c6398c89432fec41bc739823bcc66506af6/tomli-2.4.0-cp311-cp311-win32.whl", hash = "sha256:b6c78bdf37764092d369722d9946cb65b8767bfa4110f902a1b2542d8d173c8a", size = 96770, upload-time = "2026-01-11T11:21:52.647Z" }, - { url = "https://files.pythonhosted.org/packages/1e/0d/a22bb6c83f83386b0008425a6cd1fa1c14b5f3dd4bad05e98cf3dbbf4a64/tomli-2.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:d3d1654e11d724760cdb37a3d7691f0be9db5fbdaef59c9f532aabf87006dbaa", size = 107626, upload-time = "2026-01-11T11:21:53.459Z" }, - { url = "https://files.pythonhosted.org/packages/2f/6d/77be674a3485e75cacbf2ddba2b146911477bd887dda9d8c9dfb2f15e871/tomli-2.4.0-cp311-cp311-win_arm64.whl", hash = "sha256:cae9c19ed12d4e8f3ebf46d1a75090e4c0dc16271c5bce1c833ac168f08fb614", size = 94842, upload-time = "2026-01-11T11:21:54.831Z" }, - { url = "https://files.pythonhosted.org/packages/3c/43/7389a1869f2f26dba52404e1ef13b4784b6b37dac93bac53457e3ff24ca3/tomli-2.4.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:920b1de295e72887bafa3ad9f7a792f811847d57ea6b1215154030cf131f16b1", size = 154894, upload-time = "2026-01-11T11:21:56.07Z" }, - { url = "https://files.pythonhosted.org/packages/e9/05/2f9bf110b5294132b2edf13fe6ca6ae456204f3d749f623307cbb7a946f2/tomli-2.4.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:7d6d9a4aee98fac3eab4952ad1d73aee87359452d1c086b5ceb43ed02ddb16b8", size = 149053, upload-time = "2026-01-11T11:21:57.467Z" }, - { url = "https://files.pythonhosted.org/packages/e8/41/1eda3ca1abc6f6154a8db4d714a4d35c4ad90adc0bcf700657291593fbf3/tomli-2.4.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:36b9d05b51e65b254ea6c2585b59d2c4cb91c8a3d91d0ed0f17591a29aaea54a", size = 243481, upload-time = "2026-01-11T11:21:58.661Z" }, - { url = "https://files.pythonhosted.org/packages/d2/6d/02ff5ab6c8868b41e7d4b987ce2b5f6a51d3335a70aa144edd999e055a01/tomli-2.4.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1c8a885b370751837c029ef9bc014f27d80840e48bac415f3412e6593bbc18c1", size = 251720, upload-time = "2026-01-11T11:22:00.178Z" }, - { url = "https://files.pythonhosted.org/packages/7b/57/0405c59a909c45d5b6f146107c6d997825aa87568b042042f7a9c0afed34/tomli-2.4.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:8768715ffc41f0008abe25d808c20c3d990f42b6e2e58305d5da280ae7d1fa3b", size = 247014, upload-time = "2026-01-11T11:22:01.238Z" }, - { url = "https://files.pythonhosted.org/packages/2c/0e/2e37568edd944b4165735687cbaf2fe3648129e440c26d02223672ee0630/tomli-2.4.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:7b438885858efd5be02a9a133caf5812b8776ee0c969fea02c45e8e3f296ba51", size = 251820, upload-time = "2026-01-11T11:22:02.727Z" }, - { url = "https://files.pythonhosted.org/packages/5a/1c/ee3b707fdac82aeeb92d1a113f803cf6d0f37bdca0849cb489553e1f417a/tomli-2.4.0-cp312-cp312-win32.whl", hash = "sha256:0408e3de5ec77cc7f81960c362543cbbd91ef883e3138e81b729fc3eea5b9729", size = 97712, upload-time = "2026-01-11T11:22:03.777Z" }, - { url = "https://files.pythonhosted.org/packages/69/13/c07a9177d0b3bab7913299b9278845fc6eaaca14a02667c6be0b0a2270c8/tomli-2.4.0-cp312-cp312-win_amd64.whl", hash = "sha256:685306e2cc7da35be4ee914fd34ab801a6acacb061b6a7abca922aaf9ad368da", size = 108296, upload-time = "2026-01-11T11:22:04.86Z" }, - { url = "https://files.pythonhosted.org/packages/18/27/e267a60bbeeee343bcc279bb9e8fbed0cbe224bc7b2a3dc2975f22809a09/tomli-2.4.0-cp312-cp312-win_arm64.whl", hash = "sha256:5aa48d7c2356055feef06a43611fc401a07337d5b006be13a30f6c58f869e3c3", size = 94553, upload-time = "2026-01-11T11:22:05.854Z" }, - { url = "https://files.pythonhosted.org/packages/23/d1/136eb2cb77520a31e1f64cbae9d33ec6df0d78bdf4160398e86eec8a8754/tomli-2.4.0-py3-none-any.whl", hash = "sha256:1f776e7d669ebceb01dee46484485f43a4048746235e683bcdffacdf1fb4785a", size = 14477, upload-time = "2026-01-11T11:22:37.446Z" }, -] - [[package]] name = "tqdm" version = "4.67.3" From 358ff9e08f7c77b7b9cc949c6a89a858594bfc2e Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 10 Mar 2026 22:07:06 -0700 Subject: [PATCH 141/229] rm pytest-randomly (#3188) * rm pytest-randomly * rm pytest-randomly --- opendbc/safety/tests/misra/test_mutation.py | 9 ++++++--- pyproject.toml | 1 - uv.lock | 14 -------------- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/opendbc/safety/tests/misra/test_mutation.py b/opendbc/safety/tests/misra/test_mutation.py index cabff3fef82..1158992ecdf 100644 --- a/opendbc/safety/tests/misra/test_mutation.py +++ b/opendbc/safety/tests/misra/test_mutation.py @@ -34,13 +34,16 @@ ] all_files = glob.glob('opendbc/safety/**', root_dir=ROOT, recursive=True) -files = [f for f in all_files if f.endswith(('.c', '.h')) and not f.startswith(IGNORED_PATHS)] +files = sorted(f for f in all_files if f.endswith(('.c', '.h')) and not f.startswith(IGNORED_PATHS)) assert len(files) > 20, files +# fixed seed so every xdist worker collects the same test params +rng = random.Random(len(files)) for p in patterns: - mutations.append((random.choice(files), *p, True)) + mutations.append((rng.choice(files), *p, True)) -mutations = random.sample(mutations, 2) # can remove this once cppcheck is faster +# sample to keep CI fast, but always include the no-mutation case +mutations = [mutations[0]] + rng.sample(mutations[1:], min(2, len(mutations) - 1)) @pytest.mark.parametrize("fn, rule, transform, should_fail", mutations) diff --git a/pyproject.toml b/pyproject.toml index c9bb72d2f60..28583c841f2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,6 @@ testing = [ # FIXME: pytest 9.0.0 doesn't support unittest.SkipTest "pytest==8.4.2", "pytest-mock", - "pytest-randomly", # https://github.com/pytest-dev/pytest-xdist/pull/1229 "pytest-xdist @ git+https://github.com/sshane/pytest-xdist@2b4372bd62699fb412c4fe2f95bf9f01bd2018da", "pytest-subtests", diff --git a/uv.lock b/uv.lock index 58dd108cd34..28332c522a0 100644 --- a/uv.lock +++ b/uv.lock @@ -407,7 +407,6 @@ testing = [ { name = "parameterized" }, { name = "pytest" }, { name = "pytest-mock" }, - { name = "pytest-randomly" }, { name = "pytest-subtests" }, { name = "pytest-xdist" }, { name = "ruff" }, @@ -436,7 +435,6 @@ requires-dist = [ { name = "pycryptodome" }, { name = "pytest", marker = "extra == 'testing'", specifier = "==8.4.2" }, { name = "pytest-mock", marker = "extra == 'testing'" }, - { name = "pytest-randomly", marker = "extra == 'testing'" }, { name = "pytest-subtests", marker = "extra == 'testing'" }, { name = "pytest-xdist", marker = "extra == 'testing'", git = "https://github.com/sshane/pytest-xdist?rev=2b4372bd62699fb412c4fe2f95bf9f01bd2018da" }, { name = "ruff", marker = "extra == 'testing'" }, @@ -573,18 +571,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/5a/cc/06253936f4a7fa2e0f48dfe6d851d9c56df896a9ab09ac019d70b760619c/pytest_mock-3.15.1-py3-none-any.whl", hash = "sha256:0a25e2eb88fe5168d535041d09a4529a188176ae608a6d249ee65abc0949630d", size = 10095, upload-time = "2025-09-16T16:37:25.734Z" }, ] -[[package]] -name = "pytest-randomly" -version = "4.0.1" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "pytest" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/c4/1d/258a4bf1109258c00c35043f40433be5c16647387b6e7cd5582d638c116b/pytest_randomly-4.0.1.tar.gz", hash = "sha256:174e57bb12ac2c26f3578188490bd333f0e80620c3f47340158a86eca0593cd8", size = 14130, upload-time = "2025-09-12T15:23:00.085Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/33/3e/a4a9227807b56869790aad3e24472a554b585974fe7e551ea350f50897ae/pytest_randomly-4.0.1-py3-none-any.whl", hash = "sha256:e0dfad2fd4f35e07beff1e47c17fbafcf98f9bf4531fd369d9260e2f858bfcb7", size = 8304, upload-time = "2025-09-12T15:22:58.946Z" }, -] - [[package]] name = "pytest-subtests" version = "0.15.0" From 3f7c6c4124b039bfa959a18794db741b2db03864 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 10 Mar 2026 22:08:45 -0700 Subject: [PATCH 142/229] rm crcmod package (#3187) * rm crcmod * lil more * make ruff happy * lock --- opendbc/car/crc.py | 11 +++++++++++ opendbc/car/hyundai/hyundaican.py | 4 ++-- opendbc/car/nissan/nissancan.py | 4 ++-- pyproject.toml | 1 - uv.lock | 22 ---------------------- 5 files changed, 15 insertions(+), 27 deletions(-) diff --git a/opendbc/car/crc.py b/opendbc/car/crc.py index 4aa721aaf5a..1fb49c84608 100644 --- a/opendbc/car/crc.py +++ b/opendbc/car/crc.py @@ -29,3 +29,14 @@ def _gen_crc16_table(poly: int) -> list[int]: CRC8J1850 = _gen_crc8_table(0x1D) CRC8BODY = _gen_crc8_table(0xD5) CRC16_XMODEM = _gen_crc16_table(0x1021) + + +def mk_crc8_fun(table: list[int], init_crc: int = 0x00, xor_out: int = 0x00): + init_reg = init_crc ^ xor_out + + def crc(data: bytes) -> int: + crc = init_reg + for b in data: + crc = table[crc ^ b] + return crc ^ xor_out + return crc diff --git a/opendbc/car/hyundai/hyundaican.py b/opendbc/car/hyundai/hyundaican.py index 8f3a049cd2d..51f6627eb8d 100644 --- a/opendbc/car/hyundai/hyundaican.py +++ b/opendbc/car/hyundai/hyundaican.py @@ -1,7 +1,7 @@ -import crcmod +from opendbc.car.crc import CRC8J1850, mk_crc8_fun from opendbc.car.hyundai.values import CAR, HyundaiFlags -hyundai_checksum = crcmod.mkCrcFun(0x11D, initCrc=0xFD, rev=False, xorOut=0xdf) +hyundai_checksum = mk_crc8_fun(CRC8J1850, init_crc=0xFD, xor_out=0xDF) def create_lkas11(packer, frame, CP, apply_torque, steer_req, diff --git a/opendbc/car/nissan/nissancan.py b/opendbc/car/nissan/nissancan.py index 0c95ad1854f..24a49e02714 100644 --- a/opendbc/car/nissan/nissancan.py +++ b/opendbc/car/nissan/nissancan.py @@ -1,8 +1,8 @@ -import crcmod +from opendbc.car.crc import CRC8J1850, mk_crc8_fun from opendbc.car.nissan.values import CAR # TODO: add this checksum to the CANPacker -nissan_checksum = crcmod.mkCrcFun(0x11d, initCrc=0x00, rev=False, xorOut=0xff) +nissan_checksum = mk_crc8_fun(CRC8J1850, init_crc=0x00, xor_out=0xFF) def create_steering_control(packer, apply_torque, frame, steer_on, lkas_max_torque): diff --git a/pyproject.toml b/pyproject.toml index 28583c841f2..5decde397c9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,6 @@ urls = { "homepage" = "https://github.com/commaai/opendbc" } dependencies = [ "scons", "numpy", - "crcmod-plus", "tqdm", "pycapnp==2.1.0", "pycryptodome", diff --git a/uv.lock b/uv.lock index 28332c522a0..78ed44f2299 100644 --- a/uv.lock +++ b/uv.lock @@ -155,26 +155,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/66/65/08d3a5039b565231c501b31d1a973d4222e9803c03b2c31a9c08bdec3e30/cpplint-2.0.2-py3-none-any.whl", hash = "sha256:7ec188b5a08e604294ae7e7f88ec3ece2699de857f0533b305620c8cf237cad5", size = 81987, upload-time = "2025-04-08T01:22:24.101Z" }, ] -[[package]] -name = "crcmod-plus" -version = "2.3.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/0b/0c/71733bbaf38e9f1eaecfdf7f8e350993f3dcac208a5297c41503ae66e513/crcmod_plus-2.3.1.tar.gz", hash = "sha256:732ffe3c3ce3ef9b272e1827d8fb894590c4d6ff553f2a2b41ae30f4f94b0f5d", size = 22319, upload-time = "2025-10-10T22:14:21.691Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/47/e0/2dad2e6f0cd4914b4144496d9785780ec820e200816c080df785cfa34da6/crcmod_plus-2.3.1-cp311-abi3-macosx_10_9_universal2.whl", hash = "sha256:b7e35e0f7d93d7571c2c9c3d6760e456999ea4c1eae5ead6acac247b5a79e469", size = 23279, upload-time = "2025-10-10T22:13:47.281Z" }, - { url = "https://files.pythonhosted.org/packages/66/76/53c0b65b9679b903f98fc54efa32b0e5a19634712a45200c7a80674aa6f5/crcmod_plus-2.3.1-cp311-abi3-macosx_10_9_x86_64.whl", hash = "sha256:6853243120db84677b94b625112116f0ef69cd581741d20de58dce4c34242654", size = 20185, upload-time = "2025-10-10T22:13:48.06Z" }, - { url = "https://files.pythonhosted.org/packages/98/79/2b4dc9bb26394873d7699737124408b5106264ae33053fdec600e9a9fa65/crcmod_plus-2.3.1-cp311-abi3-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:17735bc4e944d552ea18c8609fc6d08a5e64ee9b29cc216ba4d623754029cc3a", size = 26999, upload-time = "2025-10-10T22:13:48.854Z" }, - { url = "https://files.pythonhosted.org/packages/bb/e8/f5d66778b5a1bff915807016561a02b5cebf6b3840fb8a2be40bbb0c8575/crcmod_plus-2.3.1-cp311-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8ac755040a2a35f43ab331978c48a9acb4ff64b425f282a296be467a410f00c3", size = 27536, upload-time = "2025-10-10T22:13:49.956Z" }, - { url = "https://files.pythonhosted.org/packages/f3/2c/0113ad30cadad40c22eef08c0f2618f2446dd282f02268fecbcfc9fda3c1/crcmod_plus-2.3.1-cp311-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:7bdcfb838ca093ca673a3bbb37f62d1e5ec7182e00cc5ee2d00759f9f9f8ab11", size = 27385, upload-time = "2025-10-10T22:13:50.765Z" }, - { url = "https://files.pythonhosted.org/packages/8e/ba/501ef1b02119402cf1a31c01eb2cb8399660bca863c2f4dd3dc060220284/crcmod_plus-2.3.1-cp311-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:9166bc3c9b5e7b07b4e6854cac392b4a451b31d58d3950e48c140ab7b5d05394", size = 27135, upload-time = "2025-10-10T22:13:51.889Z" }, - { url = "https://files.pythonhosted.org/packages/49/90/d4556c9db69c83e726c5b88da3d656fdaac7d60c4d27b43cb939bed80069/crcmod_plus-2.3.1-cp311-abi3-win32.whl", hash = "sha256:cb99b694cce5c862560cf332a8b5e793620e28f0de3726995608bbd6f9b6e09a", size = 22384, upload-time = "2025-10-10T22:13:53.016Z" }, - { url = "https://files.pythonhosted.org/packages/4d/7e/57bb97a8c7b4e19900744f58b67dc83bc9c83aaac670deeede9fb3bfab6a/crcmod_plus-2.3.1-cp311-abi3-win_amd64.whl", hash = "sha256:82b0f7e968c430c5a80fe0fc59e75cb54f2e84df2ed0cee5a3ff9cadfbf8a220", size = 22912, upload-time = "2025-10-10T22:13:53.849Z" }, - { url = "https://files.pythonhosted.org/packages/76/66/419ae3991bb68943cb752e2f4d317c555e3f02a298dd498f26113874ee59/crcmod_plus-2.3.1-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:9397324da1be2729f894744d9031a21ed97584c17fb0289e69e0c3c60916fc5f", size = 19880, upload-time = "2025-10-10T22:14:17.269Z" }, - { url = "https://files.pythonhosted.org/packages/18/f0/d10c9b859927b2cdc38eafc33c8b66e4ede02eaa174df4575681dab5a0f1/crcmod_plus-2.3.1-pp311-pypy311_pp73-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:073c7a3b832652e66c41c8b8705eaecda704d1cbe850b9fa05fdee36cd50745a", size = 21120, upload-time = "2025-10-10T22:14:18.117Z" }, - { url = "https://files.pythonhosted.org/packages/6c/68/cbd8f1707b37b80f9a0bf643e04747b0196f69cf065b52ed56639afbecef/crcmod_plus-2.3.1-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2e5f4c62553f772ea7ae12d9484801b752622c9c288e49ee7ea34a20b94e4920", size = 21698, upload-time = "2025-10-10T22:14:20.044Z" }, - { url = "https://files.pythonhosted.org/packages/41/1b/4ab1681ecbfc48d7e4641fb178c97374eb475ae4109255bdd832110cbbe2/crcmod_plus-2.3.1-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:5e80a9860f66f339956f540d86a768f4fe8c8bfcb139811f14be864425c48d64", size = 23289, upload-time = "2025-10-10T22:14:20.875Z" }, -] - [[package]] name = "execnet" version = "2.1.2" @@ -380,7 +360,6 @@ name = "opendbc" version = "0.2.1" source = { editable = "." } dependencies = [ - { name = "crcmod-plus" }, { name = "numpy" }, { name = "pycapnp" }, { name = "pycryptodome" }, @@ -423,7 +402,6 @@ requires-dist = [ { name = "comma-car-segments", marker = "extra == 'testing'", url = "https://huggingface.co/datasets/commaai/commaCarSegments/resolve/main/dist/comma_car_segments-0.1.0-py3-none-any.whl" }, { name = "cppcheck", marker = "extra == 'testing'", git = "https://github.com/commaai/dependencies.git?subdirectory=cppcheck&rev=releases" }, { name = "cpplint", marker = "extra == 'testing'" }, - { name = "crcmod-plus" }, { name = "gcovr", marker = "extra == 'testing'" }, { name = "hypothesis", marker = "extra == 'testing'", specifier = "==6.47.*" }, { name = "inputs", marker = "extra == 'examples'" }, From 30108404bfe7baf388a895f5e37cb452f907f9d5 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 10 Mar 2026 22:14:16 -0700 Subject: [PATCH 143/229] rm conftest.py (#3189) --- conftest.py | 5 ----- pyproject.toml | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 conftest.py diff --git a/conftest.py b/conftest.py deleted file mode 100644 index 952972531b9..00000000000 --- a/conftest.py +++ /dev/null @@ -1,5 +0,0 @@ -# pytest attempts to execute shell scripts while collecting -collect_ignore_glob = [ - "opendbc/safety/tests/misra/*.sh", - "opendbc/safety/tests/misra/cppcheck/", -] diff --git a/pyproject.toml b/pyproject.toml index 5decde397c9..16d2113d02e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,7 +54,7 @@ requires = ["setuptools"] build-backend = "setuptools.build_meta" [tool.pytest.ini_options] -addopts = "-Werror --strict-config --strict-markers --durations=10 -n auto" +addopts = "-Werror --strict-config --strict-markers --durations=10 -n auto --ignore-glob=opendbc/safety/tests/misra/*.sh" python_files = "test_*.py" testpaths = [ "opendbc" From 0b44202e7ef520a48aa77971c2b961f14f7cf3db Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 10 Mar 2026 22:15:34 -0700 Subject: [PATCH 144/229] a python api for your car --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 16d2113d02e..c523370bd6b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "opendbc" version = "0.2.1" -description = "CAN bus databases and tools" +description = "a Python API for your car" license = "MIT" authors = [{ name = "Vehicle Researcher", email = "user@comma.ai" }] readme = "README.md" From 00588c939cb2bbb357400578197a0913b7827f6c Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 10 Mar 2026 22:26:28 -0700 Subject: [PATCH 145/229] remove parameterized (#3190) --- opendbc/car/ford/tests/test_ford.py | 4 +-- opendbc/car/gm/tests/test_gm.py | 4 +-- opendbc/car/tests/test_lateral_limits.py | 2 +- opendbc/safety/tests/test_hyundai_canfd.py | 2 +- opendbc/testing.py | 29 ++++++++++++++++++++++ 5 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 opendbc/testing.py diff --git a/opendbc/car/ford/tests/test_ford.py b/opendbc/car/ford/tests/test_ford.py index 5e3cc420b4f..3204e73e1bd 100644 --- a/opendbc/car/ford/tests/test_ford.py +++ b/opendbc/car/ford/tests/test_ford.py @@ -2,7 +2,7 @@ from collections.abc import Iterable from hypothesis import settings, given, strategies as st -from parameterized import parameterized +import pytest from opendbc.car.structs import CarParams from opendbc.car.fw_versions import build_fw_dict @@ -47,7 +47,7 @@ def test_fw_query_config(self): assert addr == ECU_ADDRESSES[ecu], "ECU address mismatch" assert subaddr is None, "Unexpected ECU subaddress" - @parameterized.expand(FW_VERSIONS.items()) + @pytest.mark.parametrize("car_model,fw_versions", FW_VERSIONS.items()) def test_fw_versions(self, car_model: str, fw_versions: dict[tuple[int, int, int | None], Iterable[bytes]]): for (ecu, addr, subaddr), fws in fw_versions.items(): assert ecu in ECU_PART_NUMBER, "Unexpected ECU" diff --git a/opendbc/car/gm/tests/test_gm.py b/opendbc/car/gm/tests/test_gm.py index c14b9bd243f..b0bf2f3ffca 100644 --- a/opendbc/car/gm/tests/test_gm.py +++ b/opendbc/car/gm/tests/test_gm.py @@ -1,4 +1,4 @@ -from parameterized import parameterized +import pytest from opendbc.car.gm.fingerprints import FINGERPRINTS from opendbc.car.gm.values import CAMERA_ACC_CAR, GM_RX_OFFSET @@ -7,7 +7,7 @@ class TestGMFingerprint: - @parameterized.expand(FINGERPRINTS.items()) + @pytest.mark.parametrize("car_model,fingerprints", FINGERPRINTS.items()) def test_can_fingerprints(self, car_model, fingerprints): assert len(fingerprints) > 0 diff --git a/opendbc/car/tests/test_lateral_limits.py b/opendbc/car/tests/test_lateral_limits.py index 070da5d7420..1cafa7d4375 100755 --- a/opendbc/car/tests/test_lateral_limits.py +++ b/opendbc/car/tests/test_lateral_limits.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 from collections import defaultdict import importlib -from parameterized import parameterized_class +from opendbc.testing import parameterized_class import pytest import sys diff --git a/opendbc/safety/tests/test_hyundai_canfd.py b/opendbc/safety/tests/test_hyundai_canfd.py index dd992f33799..d993525a0c5 100755 --- a/opendbc/safety/tests/test_hyundai_canfd.py +++ b/opendbc/safety/tests/test_hyundai_canfd.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from parameterized import parameterized_class +from opendbc.testing import parameterized_class import unittest from opendbc.car.hyundai.values import HyundaiSafetyFlags diff --git a/opendbc/testing.py b/opendbc/testing.py new file mode 100644 index 00000000000..484a3881bd7 --- /dev/null +++ b/opendbc/testing.py @@ -0,0 +1,29 @@ +import sys + + +def parameterized_class(attrs, values=None): + """Class decorator that generates subclasses with different class attributes. + + Usage: + @parameterized_class([{"x": 1}, {"x": 2}]) + @parameterized_class('x', [(1,), (2,)]) + """ + if isinstance(attrs, str): + attrs = [attrs] + params = [dict(zip(attrs, v, strict=True)) for v in values] + else: + params = attrs + + def decorator(cls): + module = sys.modules[cls.__module__] + for param_set in params: + name = f"{cls.__name__}_{'_'.join(str(v) for v in param_set.values())}" + new_cls = type(name, (cls,), param_set) + new_cls.__qualname__ = name + new_cls.__module__ = cls.__module__ + new_cls.__test__ = True + setattr(module, name, new_cls) + cls.__test__ = False + return cls + + return decorator From 2d52887beec7ec9a9faa7678e67e545dc6445fb5 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 10 Mar 2026 23:10:12 -0700 Subject: [PATCH 146/229] Replace pytest with unittest + unittest-parallel (#3191) --- lefthook.yml | 4 +- opendbc/can/tests/test_checksums.py | 123 +++++++------- opendbc/can/tests/test_dbc_exceptions.py | 14 +- opendbc/can/tests/test_dbc_parser.py | 7 +- opendbc/can/tests/test_packer_parser.py | 22 +-- opendbc/car/ford/tests/test_ford.py | 10 +- opendbc/car/gm/tests/test_gm.py | 7 +- opendbc/car/hyundai/tests/test_hyundai.py | 28 ++-- opendbc/car/tests/test_can_fingerprint.py | 11 +- opendbc/car/tests/test_car_interfaces.py | 15 +- opendbc/car/tests/test_docs.py | 36 ++-- opendbc/car/tests/test_fw_fingerprint.py | 102 +++++------ opendbc/car/tests/test_lateral_limits.py | 45 +---- opendbc/car/tests/test_platform_configs.py | 7 +- opendbc/car/tests/test_routes.py | 14 +- opendbc/car/tests/test_vehicle_model.py | 10 +- .../car/volkswagen/tests/test_volkswagen.py | 17 +- opendbc/safety/tests/misra/test_mutation.py | 42 ++--- opendbc/safety/tests/test.sh | 2 +- opendbc/testing.py | 30 ++++ pyproject.toml | 18 +- uv.lock | 158 ++++++------------ 22 files changed, 338 insertions(+), 384 deletions(-) diff --git a/lefthook.yml b/lefthook.yml index 082b7eef6bf..07025ff3a7e 100644 --- a/lefthook.yml +++ b/lefthook.yml @@ -26,5 +26,5 @@ test: run: opendbc/safety/tests/misra/test_misra.sh # *** tests *** - pytest: - run: pytest -n8 + unittest: + run: unittest-parallel -j8 -s opendbc -p 'test_*.py' -t . diff --git a/opendbc/can/tests/test_checksums.py b/opendbc/can/tests/test_checksums.py index a357819a048..54231fa21cc 100644 --- a/opendbc/can/tests/test_checksums.py +++ b/opendbc/can/tests/test_checksums.py @@ -1,10 +1,11 @@ import copy +import unittest from opendbc.can import CANPacker, CANParser -class TestCanChecksums: +class TestCanChecksums(unittest.TestCase): - def verify_checksum(self, subtests, dbc_file: str, msg_name: str, msg_addr: int, test_messages: list[bytes], + def verify_checksum(self, dbc_file: str, msg_name: str, msg_addr: int, test_messages: list[bytes], checksum_field: str = 'CHECKSUM', counter_field = 'COUNTER'): """ Verify that opendbc calculates payload CRCs/checksums matching those received in known-good sample messages @@ -24,37 +25,37 @@ def verify_checksum(self, subtests, dbc_file: str, msg_name: str, msg_addr: int, parser.update([0, [modified_msg]]) tested = parser.vl[msg_name] - with subtests.test(counter=expected[counter_field]): + with self.subTest(counter=expected[counter_field]): assert tested[checksum_field] == expected[checksum_field] - def verify_fca_giorgio_crc(self, subtests, msg_name: str, msg_addr: int, test_messages: list[bytes]): + def verify_fca_giorgio_crc(self, msg_name: str, msg_addr: int, test_messages: list[bytes]): """Test modified SAE J1850 CRCs, with special final XOR cases for EPS messages""" assert len(test_messages) == 3 - self.verify_checksum(subtests, "fca_giorgio", msg_name, msg_addr, test_messages) + self.verify_checksum("fca_giorgio", msg_name, msg_addr, test_messages) - def test_fca_giorgio_eps_1(self, subtests): - self.verify_fca_giorgio_crc(subtests, "EPS_1", 0xDE, [ + def test_fca_giorgio_eps_1(self): + self.verify_fca_giorgio_crc("EPS_1", 0xDE, [ b'\x17\x51\x97\xcc\x00\xdf', b'\x17\x51\x97\xc9\x01\xa3', b'\x17\x51\x97\xcc\x02\xe5', ]) - def test_fca_giorgio_eps_2(self, subtests): - self.verify_fca_giorgio_crc(subtests, "EPS_2", 0x106, [ + def test_fca_giorgio_eps_2(self): + self.verify_fca_giorgio_crc("EPS_2", 0x106, [ b'\x7c\x43\x57\x60\x00\x00\xa1', b'\x7c\x63\x58\xe0\x00\x01\xd5', b'\x7c\x63\x58\xe0\x00\x02\xf2', ]) - def test_fca_giorgio_eps_3(self, subtests): - self.verify_fca_giorgio_crc(subtests, "EPS_3", 0x122, [ + def test_fca_giorgio_eps_3(self): + self.verify_fca_giorgio_crc("EPS_3", 0x122, [ b'\x7b\x30\x00\xf8', b'\x7b\x10\x01\x90', b'\x7b\xf0\x02\x6e', ]) - def test_fca_giorgio_abs_2(self, subtests): - self.verify_fca_giorgio_crc(subtests, "ABS_2", 0xFE, [ + def test_fca_giorgio_abs_2(self): + self.verify_fca_giorgio_crc("ABS_2", 0xFE, [ b'\x7e\x38\x00\x7d\x10\x31\x80\x32', b'\x7e\x38\x00\x7d\x10\x31\x81\x2f', b'\x7e\x38\x00\x7d\x20\x31\x82\x20', @@ -90,13 +91,13 @@ def test_honda_checksum(self): assert parser.vl['LKAS_HUD']['CHECKSUM'] == std assert parser.vl['LKAS_HUD_A']['CHECKSUM'] == ext - def verify_volkswagen_mqb_crc(self, subtests, msg_name: str, msg_addr: int, test_messages: list[bytes], counter_field: str = 'COUNTER'): + def verify_volkswagen_mqb_crc(self, msg_name: str, msg_addr: int, test_messages: list[bytes], counter_field: str = 'COUNTER'): """Test AUTOSAR E2E Profile 2 CRCs""" assert len(test_messages) == 16 # All counter values must be tested - self.verify_checksum(subtests, "vw_mqb", msg_name, msg_addr, test_messages, counter_field=counter_field) + self.verify_checksum("vw_mqb", msg_name, msg_addr, test_messages, counter_field=counter_field) - def test_volkswagen_mqb_crc_lwi_01(self, subtests): - self.verify_volkswagen_mqb_crc(subtests, "LWI_01", 0x86, [ + def test_volkswagen_mqb_crc_lwi_01(self): + self.verify_volkswagen_mqb_crc("LWI_01", 0x86, [ b'\x6b\x00\xbd\x00\x00\x00\x00\x00', b'\xee\x01\x0a\x00\x00\x00\x00\x00', b'\xd8\x02\xa9\x00\x00\x00\x00\x00', @@ -115,8 +116,8 @@ def test_volkswagen_mqb_crc_lwi_01(self, subtests): b'\x60\x0f\x62\xc0\x00\x00\x00\x00', ]) - def test_volkswagen_mqb_crc_airbag_01(self, subtests): - self.verify_volkswagen_mqb_crc(subtests, "Airbag_01", 0x40, [ + def test_volkswagen_mqb_crc_airbag_01(self): + self.verify_volkswagen_mqb_crc("Airbag_01", 0x40, [ b'\xaf\x00\x00\x80\xc0\x00\x20\x3e', b'\x54\x01\x00\x80\xc0\x00\x20\x1a', b'\x54\x02\x00\x80\xc0\x00\x60\x00', @@ -135,8 +136,8 @@ def test_volkswagen_mqb_crc_airbag_01(self, subtests): b'\xe5\x0f\x00\x80\xc0\x00\x40\xf6', ]) - def test_volkswagen_mqb_crc_lh_eps_03(self, subtests): - self.verify_volkswagen_mqb_crc(subtests, "LH_EPS_03", 0x9F, [ + def test_volkswagen_mqb_crc_lh_eps_03(self): + self.verify_volkswagen_mqb_crc("LH_EPS_03", 0x9F, [ b'\x11\x30\x2e\x00\x05\x1c\x80\x30', b'\x5b\x31\x8e\x03\x05\x53\x00\x30', b'\xcb\x32\xd3\x06\x05\x73\x00\x30', @@ -155,8 +156,8 @@ def test_volkswagen_mqb_crc_lh_eps_03(self, subtests): b'\xe2\x3f\x05\x00\x05\x0a\x00\x30', ]) - def test_volkswagen_mqb_crc_getriebe_11(self, subtests): - self.verify_volkswagen_mqb_crc(subtests, "Getriebe_11", 0xAD, [ + def test_volkswagen_mqb_crc_getriebe_11(self): + self.verify_volkswagen_mqb_crc("Getriebe_11", 0xAD, [ b'\xf8\xe0\xbf\xff\x5f\x20\x20\x20', b'\xb0\xe1\xbf\xff\xc6\x98\x21\x80', b'\xd2\xe2\xbf\xff\x5f\x20\x20\x20', @@ -175,8 +176,8 @@ def test_volkswagen_mqb_crc_getriebe_11(self, subtests): b'\x36\xef\xbf\xff\xaa\x20\x20\x10', ], counter_field="COUNTER_DISABLED") # see opendbc#1235 - def test_volkswagen_mqb_crc_esp_21(self, subtests): - self.verify_volkswagen_mqb_crc(subtests, "ESP_21", 0xFD, [ + def test_volkswagen_mqb_crc_esp_21(self): + self.verify_volkswagen_mqb_crc("ESP_21", 0xFD, [ b'\x66\xd0\x1f\x80\x45\x05\x00\x00', b'\x87\xd1\x1f\x80\x52\x05\x00\x00', b'\xcd\xd2\x1f\x80\x50\x06\x00\x00', @@ -195,8 +196,8 @@ def test_volkswagen_mqb_crc_esp_21(self, subtests): b'\xfb\xdf\x1f\x80\x46\x00\x00\x00', ]) - def test_volkswagen_mqb_crc_esp_02(self, subtests): - self.verify_volkswagen_mqb_crc(subtests, "ESP_02", 0x101, [ + def test_volkswagen_mqb_crc_esp_02(self): + self.verify_volkswagen_mqb_crc("ESP_02", 0x101, [ b'\xf2\x00\x7e\xff\xa1\x2a\x40\x00', b'\xd3\x01\x7d\x00\xa2\x0c\x02\x00', b'\x03\x02\x7a\x06\xa2\x49\x42\x00', @@ -215,8 +216,8 @@ def test_volkswagen_mqb_crc_esp_02(self, subtests): b'\x49\x0f\x85\x12\xa2\xf6\x01\x00', ]) - def test_volkswagen_mqb_crc_esp_05(self, subtests): - self.verify_volkswagen_mqb_crc(subtests, "ESP_05", 0x106, [ + def test_volkswagen_mqb_crc_esp_05(self): + self.verify_volkswagen_mqb_crc("ESP_05", 0x106, [ b'\x90\x80\x64\x00\x00\x00\xe7\x10', b'\xf4\x81\x64\x00\x00\x00\xe7\x10', b'\x90\x82\x63\x00\x00\x00\xe8\x10', @@ -235,8 +236,8 @@ def test_volkswagen_mqb_crc_esp_05(self, subtests): b'\x3f\x8f\x82\x04\x00\x00\xe6\x30', ]) - def test_volkswagen_mqb_crc_esp_10(self, subtests): - self.verify_volkswagen_mqb_crc(subtests, "ESP_10", 0x116, [ + def test_volkswagen_mqb_crc_esp_10(self): + self.verify_volkswagen_mqb_crc("ESP_10", 0x116, [ b'\x2d\x00\xd5\x98\x9f\x26\x25\x0f', b'\x24\x01\x60\x63\x2c\x5e\x3b\x0f', b'\x08\x02\xb2\x2f\xee\x9a\x29\x0f', @@ -255,8 +256,8 @@ def test_volkswagen_mqb_crc_esp_10(self, subtests): b'\x15\x0f\x51\x59\x56\x35\xb1\x0f', ]) - def test_volkswagen_mqb_crc_acc_10(self, subtests): - self.verify_volkswagen_mqb_crc(subtests, "ACC_10", 0x117, [ + def test_volkswagen_mqb_crc_acc_10(self): + self.verify_volkswagen_mqb_crc("ACC_10", 0x117, [ b'\x9b\x00\x00\x40\x68\x00\x00\xff', b'\xff\x01\x00\x40\x68\x00\x00\xff', b'\x53\x02\x00\x40\x68\x00\x00\xff', @@ -275,8 +276,8 @@ def test_volkswagen_mqb_crc_acc_10(self, subtests): b'\xd9\x0f\x00\x40\x68\x00\x00\xff', ]) - def test_volkswagen_mqb_crc_tsk_06(self, subtests): - self.verify_volkswagen_mqb_crc(subtests, "TSK_06", 0x120, [ + def test_volkswagen_mqb_crc_tsk_06(self): + self.verify_volkswagen_mqb_crc("TSK_06", 0x120, [ b'\xc1\x00\x00\x02\x00\x08\xff\x21', b'\x34\x01\x00\x02\x00\x08\xff\x21', b'\xcc\x02\x00\x02\x00\x08\xff\x21', @@ -295,8 +296,8 @@ def test_volkswagen_mqb_crc_tsk_06(self, subtests): b'\x0b\x0f\x00\x02\x00\x08\xff\x21', ]) - def test_volkswagen_mqb_crc_motor_20(self, subtests): - self.verify_volkswagen_mqb_crc(subtests, "Motor_20", 0x121, [ + def test_volkswagen_mqb_crc_motor_20(self): + self.verify_volkswagen_mqb_crc("Motor_20", 0x121, [ b'\xb9\x00\x00\xc0\x39\x46\x7e\xfe', b'\x85\x31\x20\x00\x1a\x46\x7e\xfe', b'\xc7\x12\x00\x40\x1a\x46\x7e\xfe', @@ -315,8 +316,8 @@ def test_volkswagen_mqb_crc_motor_20(self, subtests): b'\xaf\x0f\x20\x80\x39\x4c\x7e\xfe', ]) - def test_volkswagen_mqb_crc_acc_06(self, subtests): - self.verify_volkswagen_mqb_crc(subtests, "ACC_06", 0x122, [ + def test_volkswagen_mqb_crc_acc_06(self): + self.verify_volkswagen_mqb_crc("ACC_06", 0x122, [ b'\x14\x80\x00\xfe\x07\x00\x00\x18', b'\x9f\x81\x00\xfe\x07\x00\x00\x18', b'\x0a\x82\x00\xfe\x07\x00\x00\x28', @@ -335,8 +336,8 @@ def test_volkswagen_mqb_crc_acc_06(self, subtests): b'\x6f\x8f\x00\xfe\x07\x00\x00\x28', ]) - def test_volkswagen_mqb_crc_hca_01(self, subtests): - self.verify_volkswagen_mqb_crc(subtests, "HCA_01", 0x126, [ + def test_volkswagen_mqb_crc_hca_01(self): + self.verify_volkswagen_mqb_crc("HCA_01", 0x126, [ b'\x00\x30\x0d\xc0\x05\xfe\x07\x00', b'\x3e\x31\x54\xc0\x05\xfe\x07\x00', b'\xa7\x32\xbb\x40\x05\xfe\x07\x00', @@ -355,8 +356,8 @@ def test_volkswagen_mqb_crc_hca_01(self, subtests): b'\x9b\x3f\x20\x40\x05\xfe\x07\x00', ]) - def test_volkswagen_mqb_crc_gra_acc_01(self, subtests): - self.verify_volkswagen_mqb_crc(subtests, "GRA_ACC_01", 0x12B, [ + def test_volkswagen_mqb_crc_gra_acc_01(self): + self.verify_volkswagen_mqb_crc("GRA_ACC_01", 0x12B, [ b'\x86\x40\x80\x2a\x00\x00\x00\x00', b'\xf4\x41\x80\x2a\x00\x00\x00\x00', b'\x50\x42\x80\x2a\x00\x00\x00\x00', @@ -375,8 +376,8 @@ def test_volkswagen_mqb_crc_gra_acc_01(self, subtests): b'\x0d\x4f\x80\x2a\x00\x00\x00\x00', ]) - def test_volkswagen_mqb_crc_acc_07(self, subtests): - self.verify_volkswagen_mqb_crc(subtests, "ACC_07", 0x12E, [ + def test_volkswagen_mqb_crc_acc_07(self): + self.verify_volkswagen_mqb_crc("ACC_07", 0x12E, [ b'\xac\xe0\x7f\x00\xfe\x00\xc0\xff', b'\xa2\xe1\x7f\x00\xfe\x00\xc0\xff', b'\x6b\xe2\x7f\x00\xfe\x00\xc0\xff', @@ -395,8 +396,8 @@ def test_volkswagen_mqb_crc_acc_07(self, subtests): b'\x85\xef\x7f\x00\xfe\x00\xc0\xff', ]) - def test_volkswagen_mqb_crc_motor_ev_01(self, subtests): - self.verify_volkswagen_mqb_crc(subtests, "Motor_EV_01", 0x187, [ + def test_volkswagen_mqb_crc_motor_ev_01(self): + self.verify_volkswagen_mqb_crc("Motor_EV_01", 0x187, [ b'\x70\x80\x15\x00\x00\x00\x00\xF0', b'\x07\x81\x15\x00\x00\x00\x00\xF0', b'\x7A\x82\x15\x00\x00\x00\x00\xF0', @@ -415,8 +416,8 @@ def test_volkswagen_mqb_crc_motor_ev_01(self, subtests): b'\x00\x8F\x15\x00\x00\x00\x00\xF0', ]) - def test_volkswagen_mqb_crc_esp_33(self, subtests): - self.verify_volkswagen_mqb_crc(subtests, "ESP_33", 0x1AB, [ + def test_volkswagen_mqb_crc_esp_33(self): + self.verify_volkswagen_mqb_crc("ESP_33", 0x1AB, [ b'\x64\x00\x80\x02\x00\x00\x00\x00', b'\x19\x01\x00\x00\x00\x00\x00\x00', b'\xfc\x02\x00\x10\x01\x00\x00\x00', @@ -435,8 +436,8 @@ def test_volkswagen_mqb_crc_esp_33(self, subtests): b'\x68\x0f\x80\x02\x00\x00\x00\x00', ]) - def test_volkswagen_mqb_crc_acc_02(self, subtests): - self.verify_volkswagen_mqb_crc(subtests, "ACC_02", 0x30C, [ + def test_volkswagen_mqb_crc_acc_02(self): + self.verify_volkswagen_mqb_crc("ACC_02", 0x30C, [ b'\x82\xf0\x3f\x00\x40\x30\x00\x40', b'\xe6\xf1\x3f\x00\x40\x30\x00\x40', b'\x4a\xf2\x3f\x00\x40\x30\x00\x40', @@ -455,8 +456,8 @@ def test_volkswagen_mqb_crc_acc_02(self, subtests): b'\xc0\xff\x3f\x00\x40\x30\x00\x40', ]) - def test_volkswagen_mqb_crc_swa_01(self, subtests): - self.verify_volkswagen_mqb_crc(subtests, "SWA_01", 0x30F, [ + def test_volkswagen_mqb_crc_swa_01(self): + self.verify_volkswagen_mqb_crc("SWA_01", 0x30F, [ b'\x10\x00\x10\x00\x00\x00\x00\x00', b'\x74\x01\x10\x00\x00\x00\x00\x00', b'\xD8\x02\x10\x00\x00\x00\x00\x00', @@ -475,8 +476,8 @@ def test_volkswagen_mqb_crc_swa_01(self, subtests): b'\x52\x0F\x10\x00\x00\x00\x00\x00', ]) - def test_volkswagen_mqb_crc_acc_04(self, subtests): - self.verify_volkswagen_mqb_crc(subtests, "ACC_04", 0x324, [ + def test_volkswagen_mqb_crc_acc_04(self): + self.verify_volkswagen_mqb_crc("ACC_04", 0x324, [ b'\xba\x00\x00\x00\x00\x00\x00\x10', b'\xde\x01\x00\x00\x00\x00\x00\x10', b'\x72\x02\x00\x00\x00\x00\x00\x10', @@ -495,8 +496,8 @@ def test_volkswagen_mqb_crc_acc_04(self, subtests): b'\xdd\x0f\x00\x00\x00\x00\x00\x00', ]) - def test_volkswagen_mqb_crc_klemmen_status_01(self, subtests): - self.verify_volkswagen_mqb_crc(subtests, "Klemmen_Status_01", 0x3C0, [ + def test_volkswagen_mqb_crc_klemmen_status_01(self): + self.verify_volkswagen_mqb_crc("Klemmen_Status_01", 0x3C0, [ b'\x74\x00\x03\x00', b'\xc1\x01\x03\x00', b'\x31\x02\x03\x00', @@ -515,8 +516,8 @@ def test_volkswagen_mqb_crc_klemmen_status_01(self, subtests): b'\x35\x0f\x03\x00', ]) - def test_volkswagen_mqb_crc_licht_anf_01(self, subtests): - self.verify_volkswagen_mqb_crc(subtests, "Licht_Anf_01", 0x3D5, [ + def test_volkswagen_mqb_crc_licht_anf_01(self): + self.verify_volkswagen_mqb_crc("Licht_Anf_01", 0x3D5, [ b'\xc8\x00\x00\x04\x00\x00\x00\x00', b'\x9f\x01\x00\x04\x00\x00\x00\x00', b'\x5e\x02\x00\x04\x00\x00\x00\x00', @@ -535,8 +536,8 @@ def test_volkswagen_mqb_crc_licht_anf_01(self, subtests): b'\x98\x0f\x00\x04\x00\x00\x00\x00', ]) - def test_volkswagen_mqb_crc_esp_20(self, subtests): - self.verify_volkswagen_mqb_crc(subtests, "ESP_20", 0x65D, [ + def test_volkswagen_mqb_crc_esp_20(self): + self.verify_volkswagen_mqb_crc("ESP_20", 0x65D, [ b'\x98\x30\x2b\x10\x00\x00\x22\x81', b'\xc8\x31\x2b\x10\x00\x00\x22\x81', b'\x9d\x32\x2b\x10\x00\x00\x22\x81', diff --git a/opendbc/can/tests/test_dbc_exceptions.py b/opendbc/can/tests/test_dbc_exceptions.py index 858a6437206..80a8a991e87 100644 --- a/opendbc/can/tests/test_dbc_exceptions.py +++ b/opendbc/can/tests/test_dbc_exceptions.py @@ -1,25 +1,25 @@ -import pytest +import unittest from opendbc.can import CANDefine, CANPacker, CANParser from opendbc.can.tests import TEST_DBC -class TestCanParserPackerExceptions: +class TestCanParserPackerExceptions(unittest.TestCase): def test_civic_exceptions(self): dbc_file = "honda_civic_touring_2016_can_generated" dbc_invalid = dbc_file + "abcdef" msgs = [("STEERING_CONTROL", 50)] - with pytest.raises(FileNotFoundError): + with self.assertRaises(FileNotFoundError): CANParser(dbc_invalid, msgs, 0) - with pytest.raises(FileNotFoundError): + with self.assertRaises(FileNotFoundError): CANPacker(dbc_invalid) - with pytest.raises(FileNotFoundError): + with self.assertRaises(FileNotFoundError): CANDefine(dbc_invalid) - with pytest.raises(KeyError): + with self.assertRaises(KeyError): CANDefine(TEST_DBC) parser = CANParser(dbc_file, msgs, 0) - with pytest.raises(IndexError): + with self.assertRaises(IndexError): parser.update([b'']) # Everything is supposed to work below diff --git a/opendbc/can/tests/test_dbc_parser.py b/opendbc/can/tests/test_dbc_parser.py index 508b80b95e5..25e807a5f56 100644 --- a/opendbc/can/tests/test_dbc_parser.py +++ b/opendbc/can/tests/test_dbc_parser.py @@ -1,13 +1,14 @@ +import unittest from opendbc.can import CANParser from opendbc.can.tests import ALL_DBCS -class TestDBCParser: +class TestDBCParser(unittest.TestCase): def test_enough_dbcs(self): # sanity check that we're running on the real DBCs assert len(ALL_DBCS) > 20 - def test_parse_all_dbcs(self, subtests): + def test_parse_all_dbcs(self): """ Dynamic DBC parser checks: - Checksum and counter length, start bit, endianness @@ -17,5 +18,5 @@ def test_parse_all_dbcs(self, subtests): """ for dbc in ALL_DBCS: - with subtests.test(dbc=dbc): + with self.subTest(dbc=dbc): CANParser(dbc, [], 0) diff --git a/opendbc/can/tests/test_packer_parser.py b/opendbc/can/tests/test_packer_parser.py index 51aa527f55c..4411081e9c3 100644 --- a/opendbc/can/tests/test_packer_parser.py +++ b/opendbc/can/tests/test_packer_parser.py @@ -1,4 +1,4 @@ -import pytest +import unittest import random from opendbc.can import CANPacker, CANParser @@ -7,7 +7,7 @@ MAX_BAD_COUNTER = 5 -class TestCanParserPacker: +class TestCanParserPacker(unittest.TestCase): def test_packer(self): packer = CANPacker(TEST_DBC) @@ -169,7 +169,7 @@ def test_packer_parser(self): for k, v in values.items(): for key, val in v.items(): - assert parser.vl[k][key] == pytest.approx(val) + self.assertAlmostEqual(parser.vl[k][key], val) # also check address for sig in ("STEER_TORQUE", "STEER_TORQUE_REQUEST", "COUNTER", "CHECKSUM"): @@ -187,7 +187,7 @@ def test_scale_offset(self): msgs = packer.make_can_msg("VSA_STATUS", 0, values) parser.update([0, [msgs]]) - assert parser.vl["VSA_STATUS"]["USER_BRAKE"] == pytest.approx(brake) + self.assertAlmostEqual(parser.vl["VSA_STATUS"]["USER_BRAKE"], brake) def test_subaru(self): # Subaru is little endian @@ -211,10 +211,10 @@ def test_subaru(self): msgs = packer.make_can_msg("ES_LKAS", 0, values) parser.update([0, [msgs]]) - assert parser.vl["ES_LKAS"]["LKAS_Output"] == pytest.approx(steer) - assert parser.vl["ES_LKAS"]["LKAS_Request"] == pytest.approx(active) - assert parser.vl["ES_LKAS"]["SET_1"] == pytest.approx(1) - assert parser.vl["ES_LKAS"]["COUNTER"] == pytest.approx(idx % 16) + self.assertAlmostEqual(parser.vl["ES_LKAS"]["LKAS_Output"], steer) + self.assertAlmostEqual(parser.vl["ES_LKAS"]["LKAS_Request"], active) + self.assertAlmostEqual(parser.vl["ES_LKAS"]["SET_1"], 1) + self.assertAlmostEqual(parser.vl["ES_LKAS"]["COUNTER"], idx % 16) idx += 1 def test_bus_timeout(self): @@ -325,7 +325,7 @@ def test_nonexistent_messages(self): for msg in existing_messages: CANParser(TEST_DBC, [(msg, 0)], 0) - with pytest.raises(RuntimeError): + with self.assertRaises(RuntimeError): new_msg = msg + "1" if isinstance(msg, str) else msg + 1 CANParser(TEST_DBC, [(new_msg, 0)], 0) @@ -352,10 +352,10 @@ def test_track_all_signals(self): def test_disallow_duplicate_messages(self): CANParser("toyota_nodsu_pt_generated", [("ACC_CONTROL", 5)], 0) - with pytest.raises(RuntimeError): + with self.assertRaises(RuntimeError): CANParser("toyota_nodsu_pt_generated", [("ACC_CONTROL", 5), ("ACC_CONTROL", 10)], 0) - with pytest.raises(RuntimeError): + with self.assertRaises(RuntimeError): CANParser("toyota_nodsu_pt_generated", [("ACC_CONTROL", 10), ("ACC_CONTROL", 10)], 0) def test_allow_undefined_msgs(self): diff --git a/opendbc/car/ford/tests/test_ford.py b/opendbc/car/ford/tests/test_ford.py index 3204e73e1bd..a7b68828c57 100644 --- a/opendbc/car/ford/tests/test_ford.py +++ b/opendbc/car/ford/tests/test_ford.py @@ -1,13 +1,13 @@ import random -from collections.abc import Iterable +import unittest from hypothesis import settings, given, strategies as st -import pytest from opendbc.car.structs import CarParams from opendbc.car.fw_versions import build_fw_dict from opendbc.car.ford.values import CAR, FW_QUERY_CONFIG, FW_PATTERN, get_platform_codes from opendbc.car.ford.fingerprints import FW_VERSIONS +from opendbc.testing import parameterized Ecu = CarParams.Ecu @@ -40,15 +40,15 @@ } -class TestFordFW: +class TestFordFW(unittest.TestCase): def test_fw_query_config(self): for (ecu, addr, subaddr) in FW_QUERY_CONFIG.extra_ecus: assert ecu in ECU_ADDRESSES, "Unknown ECU" assert addr == ECU_ADDRESSES[ecu], "ECU address mismatch" assert subaddr is None, "Unexpected ECU subaddress" - @pytest.mark.parametrize("car_model,fw_versions", FW_VERSIONS.items()) - def test_fw_versions(self, car_model: str, fw_versions: dict[tuple[int, int, int | None], Iterable[bytes]]): + @parameterized("car_model, fw_versions", FW_VERSIONS.items()) + def test_fw_versions(self, car_model, fw_versions): for (ecu, addr, subaddr), fws in fw_versions.items(): assert ecu in ECU_PART_NUMBER, "Unexpected ECU" assert addr == ECU_ADDRESSES[ecu], "ECU address mismatch" diff --git a/opendbc/car/gm/tests/test_gm.py b/opendbc/car/gm/tests/test_gm.py index b0bf2f3ffca..63b5c2da466 100644 --- a/opendbc/car/gm/tests/test_gm.py +++ b/opendbc/car/gm/tests/test_gm.py @@ -1,13 +1,14 @@ -import pytest +import unittest from opendbc.car.gm.fingerprints import FINGERPRINTS from opendbc.car.gm.values import CAMERA_ACC_CAR, GM_RX_OFFSET +from opendbc.testing import parameterized CAMERA_DIAGNOSTIC_ADDRESS = 0x24b -class TestGMFingerprint: - @pytest.mark.parametrize("car_model,fingerprints", FINGERPRINTS.items()) +class TestGMFingerprint(unittest.TestCase): + @parameterized("car_model, fingerprints", FINGERPRINTS.items()) def test_can_fingerprints(self, car_model, fingerprints): assert len(fingerprints) > 0 diff --git a/opendbc/car/hyundai/tests/test_hyundai.py b/opendbc/car/hyundai/tests/test_hyundai.py index a6b0734a744..25c88d47fc4 100644 --- a/opendbc/car/hyundai/tests/test_hyundai.py +++ b/opendbc/car/hyundai/tests/test_hyundai.py @@ -1,6 +1,6 @@ from hypothesis import settings, given, strategies as st -import pytest +import unittest from opendbc.car import gen_empty_fingerprint from opendbc.car.structs import CarParams @@ -43,7 +43,7 @@ CANFD_EXPECTED_ECUS = {Ecu.fwdCamera, Ecu.fwdRadar} -class TestHyundaiFingerprint: +class TestHyundaiFingerprint(unittest.TestCase): def test_feature_detection(self): # LKA steering for lka_steering in (True, False): @@ -91,13 +91,13 @@ def test_canfd_ecu_whitelist(self): assert len(ecus_not_in_whitelist) == 0, \ f"{car_model}: Car model has unexpected ECUs: {ecu_strings}" - def test_blacklisted_parts(self, subtests): + def test_blacklisted_parts(self): # Asserts no ECUs known to be shared across platforms exist in the database. # Tucson having Santa Cruz camera and EPS for example for car_model, ecus in FW_VERSIONS.items(): - with subtests.test(car_model=car_model.value): + with self.subTest(car_model=car_model.value): if car_model == CAR.HYUNDAI_SANTA_CRUZ_1ST_GEN: - pytest.skip("Skip checking Santa Cruz for its parts") + raise unittest.SkipTest("Skip checking Santa Cruz for its parts") for code, _ in get_platform_codes(ecus[(Ecu.fwdCamera, 0x7c4, None)]): if b"-" not in code: @@ -105,14 +105,14 @@ def test_blacklisted_parts(self, subtests): part = code.split(b"-")[1] assert not part.startswith(b'CW'), "Car has bad part number" - def test_correct_ecu_response_database(self, subtests): + def test_correct_ecu_response_database(self): """ Assert standard responses for certain ECUs, since they can respond to multiple queries with different data """ expected_fw_prefix = HYUNDAI_VERSION_REQUEST_LONG[1:] for car_model, ecus in FW_VERSIONS.items(): - with subtests.test(car_model=car_model.value): + with self.subTest(car_model=car_model.value): for ecu, fws in ecus.items(): assert all(fw.startswith(expected_fw_prefix) for fw in fws), \ f"FW from unexpected request in database: {(ecu, fws)}" @@ -125,10 +125,10 @@ def test_platform_codes_fuzzy_fw(self, data): fws = data.draw(fw_strategy) get_platform_codes(fws) - def test_expected_platform_codes(self, subtests): + def test_expected_platform_codes(self): # Ensures we don't accidentally add multiple platform codes for a car unless it is intentional for car_model, ecus in FW_VERSIONS.items(): - with subtests.test(car_model=car_model.value): + with self.subTest(car_model=car_model.value): for ecu, fws in ecus.items(): if ecu[0] not in PLATFORM_CODE_ECUS: continue @@ -144,14 +144,14 @@ def test_expected_platform_codes(self, subtests): # Tests for platform codes, part numbers, and FW dates which Hyundai will use to fuzzy # fingerprint in the absence of full FW matches: - def test_platform_code_ecus_available(self, subtests): + def test_platform_code_ecus_available(self): # TODO: add queries for these non-CAN FD cars to get EPS no_eps_platforms = CANFD_CAR | {CAR.KIA_SORENTO, CAR.KIA_OPTIMA_G4, CAR.KIA_OPTIMA_G4_FL, CAR.KIA_OPTIMA_H, CAR.KIA_K7_2017, CAR.KIA_OPTIMA_H_G4_FL, CAR.HYUNDAI_SONATA_LF, CAR.HYUNDAI_TUCSON, CAR.GENESIS_G90, CAR.GENESIS_G80, CAR.HYUNDAI_ELANTRA} # Asserts ECU keys essential for fuzzy fingerprinting are available on all platforms for car_model, ecus in FW_VERSIONS.items(): - with subtests.test(car_model=car_model.value): + with self.subTest(car_model=car_model.value): for platform_code_ecu in PLATFORM_CODE_ECUS: if platform_code_ecu in (Ecu.fwdRadar, Ecu.eps) and car_model == CAR.HYUNDAI_GENESIS: continue @@ -159,14 +159,14 @@ def test_platform_code_ecus_available(self, subtests): continue assert platform_code_ecu in [e[0] for e in ecus] - def test_fw_format(self, subtests): + def test_fw_format(self): # Asserts: # - every supported ECU FW version returns one platform code # - every supported ECU FW version has a part number # - expected parsing of ECU FW dates for car_model, ecus in FW_VERSIONS.items(): - with subtests.test(car_model=car_model.value): + with self.subTest(car_model=car_model.value): for ecu, fws in ecus.items(): if ecu[0] not in PLATFORM_CODE_ECUS: continue @@ -183,7 +183,7 @@ def test_fw_format(self, subtests): assert all(date is not None for _, date in codes) if car_model == CAR.HYUNDAI_GENESIS: - pytest.skip("No part numbers for car model") + raise unittest.SkipTest("No part numbers for car model") # Hyundai places the ECU part number in their FW versions, assert all parsable # Some examples of valid formats: b"56310-L0010", b"56310L0010", b"56310/M6300" diff --git a/opendbc/car/tests/test_can_fingerprint.py b/opendbc/car/tests/test_can_fingerprint.py index 30dba600081..3e71317d2ce 100644 --- a/opendbc/car/tests/test_can_fingerprint.py +++ b/opendbc/car/tests/test_can_fingerprint.py @@ -1,11 +1,12 @@ -import pytest +import unittest from opendbc.car.can_definitions import CanData from opendbc.car.car_helpers import FRAME_FINGERPRINT, can_fingerprint from opendbc.car.fingerprints import _FINGERPRINTS as FINGERPRINTS +from opendbc.testing import parameterized -class TestCanFingerprint: - @pytest.mark.parametrize("car_model, fingerprints", FINGERPRINTS.items()) +class TestCanFingerprint(unittest.TestCase): + @parameterized("car_model, fingerprints", FINGERPRINTS.items()) def test_can_fingerprint(self, car_model, fingerprints): """Tests online fingerprinting function on offline fingerprints""" @@ -21,7 +22,7 @@ def test_can_fingerprint(self, car_model, fingerprints): assert finger[1] == fingerprint assert finger[2] == {} - def test_timing(self, subtests): + def test_timing(self): # just pick any CAN fingerprinting car car_model = "CHEVROLET_BOLT_EUV" fingerprint = FINGERPRINTS[car_model][0] @@ -42,7 +43,7 @@ def test_timing(self, subtests): cases.append((FRAME_FINGERPRINT * 2, None, can)) for expected_frames, car_model, can in cases: - with subtests.test(expected_frames=expected_frames, car_model=car_model): + with self.subTest(expected_frames=expected_frames, car_model=car_model): frames = 0 def can_recv(**kwargs): diff --git a/opendbc/car/tests/test_car_interfaces.py b/opendbc/car/tests/test_car_interfaces.py index 1945bb5a291..bf5e1d4472e 100644 --- a/opendbc/car/tests/test_car_interfaces.py +++ b/opendbc/car/tests/test_car_interfaces.py @@ -1,7 +1,7 @@ import os import math +import unittest import hypothesis.strategies as st -import pytest from functools import cache from hypothesis import Phase, given, settings from collections.abc import Callable @@ -61,14 +61,13 @@ def get_fuzzy_car_interface(car_name: str, draw: DrawType) -> CarInterfaceBase: return CarInterface(car_params) -class TestCarInterfaces: +def _make_car_test(car_name): # FIXME: Due to the lists used in carParams, Phase.target is very slow and will cause # many generated examples to overrun when max_examples > ~20, don't use it - @pytest.mark.parametrize("car_name", sorted(PLATFORMS)) @settings(max_examples=MAX_EXAMPLES, deadline=None, phases=(Phase.reuse, Phase.generate, Phase.shrink)) @given(data=st.data()) - def test_car_interfaces(self, car_name, data): + def test(self, data): car_interface = get_fuzzy_car_interface(car_name, data.draw) car_params = car_interface.CP.as_reader() @@ -130,6 +129,10 @@ def test_car_interfaces(self, car_name, data): rr = radar_interface.update(cans) assert rr is None or len(rr.errors) > 0 + return test + + +class TestCarInterfaces(unittest.TestCase): def test_interface_attrs(self): """Asserts basic behavior of interface attribute getter""" num_brands = len(get_interface_attr('CAR')) @@ -154,3 +157,7 @@ def test_interface_attrs(self): ret = get_interface_attr('FINGERPRINTS', ignore_none=True) none_brands_in_ret = none_brands.intersection(ret) assert len(none_brands_in_ret) == 0, f'Brands with None values in ignore_none=True result: {none_brands_in_ret}' + + +for car_name in sorted(PLATFORMS): + setattr(TestCarInterfaces, f'test_car_interfaces_{car_name}', _make_car_test(car_name)) diff --git a/opendbc/car/tests/test_docs.py b/opendbc/car/tests/test_docs.py index 940f117fda4..7b23d6f0fd0 100644 --- a/opendbc/car/tests/test_docs.py +++ b/opendbc/car/tests/test_docs.py @@ -1,5 +1,5 @@ from collections import defaultdict -import pytest +import unittest from opendbc.car.car_helpers import interfaces from opendbc.car.docs import get_all_car_docs @@ -8,33 +8,33 @@ from opendbc.car.values import PLATFORMS -class TestCarDocs: +class TestCarDocs(unittest.TestCase): @classmethod - def setup_class(cls): + def setUpClass(cls): cls.all_cars = get_all_car_docs() - def test_duplicate_years(self, subtests): + def test_duplicate_years(self): make_model_years = defaultdict(list) for car in self.all_cars: - with subtests.test(car_docs_name=car.name): + with self.subTest(car_docs_name=car.name): if car.support_type != SupportType.UPSTREAM: - pytest.skip() + raise unittest.SkipTest make_model = (car.make, car.model) for year in car.year_list: assert year not in make_model_years[make_model], f"{car.name}: Duplicate model year" make_model_years[make_model].append(year) - def test_missing_car_docs(self, subtests): + def test_missing_car_docs(self): all_car_docs_platforms = [name for name, config in PLATFORMS.items()] for platform in sorted(interfaces.keys()): - with subtests.test(platform=platform): + with self.subTest(platform=platform): assert platform in all_car_docs_platforms, f"Platform: {platform} doesn't have a CarDocs entry" - def test_naming_conventions(self, subtests): + def test_naming_conventions(self): # Asserts market-standard car naming conventions by brand for car in self.all_cars: - with subtests.test(car=car.name): + with self.subTest(car=car.name): tokens = car.model.lower().split(" ") if car.brand == "hyundai": assert "phev" not in tokens, "Use `Plug-in Hybrid`" @@ -47,29 +47,29 @@ def test_naming_conventions(self, subtests): if "rav4" in tokens: assert "RAV4" in car.model, "Use correct capitalization" - def test_torque_star(self, subtests): + def test_torque_star(self): # Asserts brand-specific assumptions around steering torque star for car in self.all_cars: - with subtests.test(car=car.name): + with self.subTest(car=car.name): # honda sanity check, it's the definition of a no torque star if car.car_fingerprint in (HONDA.HONDA_ACCORD, HONDA.HONDA_CIVIC, HONDA.HONDA_CRV, HONDA.HONDA_ODYSSEY, HONDA.HONDA_ODYSSEY_TWN, HONDA.HONDA_PILOT): assert car.row[Column.STEERING_TORQUE] == Star.EMPTY, f"{car.name} has full torque star" elif car.brand in ("toyota", "hyundai"): assert car.row[Column.STEERING_TORQUE] != Star.EMPTY, f"{car.name} has no torque star" - def test_year_format(self, subtests): + def test_year_format(self): for car in self.all_cars: - with subtests.test(car=car.name): + with self.subTest(car=car.name): if car.name == "comma body": - pytest.skip() + raise unittest.SkipTest assert car.years and car.year_list, f"Format years correctly: {car.name}" - def test_harnesses(self, subtests): + def test_harnesses(self): for car in self.all_cars: - with subtests.test(car=car.name): + with self.subTest(car=car.name): if car.name == "comma body" or car.support_type != SupportType.UPSTREAM: - pytest.skip() + raise unittest.SkipTest car_part_type = [p.part_type for p in car.car_parts.all_parts()] car_parts = list(car.car_parts.all_parts()) diff --git a/opendbc/car/tests/test_fw_fingerprint.py b/opendbc/car/tests/test_fw_fingerprint.py index 08e8cf85440..2d2b9f2f07e 100644 --- a/opendbc/car/tests/test_fw_fingerprint.py +++ b/opendbc/car/tests/test_fw_fingerprint.py @@ -1,4 +1,5 @@ -import pytest +import unittest +from unittest.mock import patch import random import time from collections import defaultdict @@ -10,6 +11,7 @@ from opendbc.car.fw_versions import FW_QUERY_CONFIGS, FUZZY_EXCLUDE_ECUS, VERSIONS, build_fw_dict, \ match_fw_to_car, get_brand_ecu_matches, get_fw_versions, get_present_ecus from opendbc.car.vin import get_vin +from opendbc.testing import parameterized CarFw = CarParams.CarFw Ecu = CarParams.Ecu @@ -17,14 +19,14 @@ ECU_NAME = {v: k for k, v in Ecu.schema.enumerants.items()} -class TestFwFingerprint: +class TestFwFingerprint(unittest.TestCase): def assertFingerprints(self, candidates, expected): candidates = list(candidates) assert len(candidates) == 1, f"got more than one candidate: {candidates}" assert candidates[0] == expected - @pytest.mark.parametrize("brand, car_model, ecus, test_non_essential", - [(b, c, e[c], n) for b, e in VERSIONS.items() for c in e for n in (True, False)]) + @parameterized("brand, car_model, ecus, test_non_essential", + [(b, c, e[c], n) for b, e in VERSIONS.items() for c in e for n in (True, False)]) def test_exact_match(self, brand, car_model, ecus, test_non_essential): config = FW_QUERY_CONFIGS[brand] CP = CarParams() @@ -48,12 +50,12 @@ def test_exact_match(self, brand, car_model, ecus, test_non_essential): if len(matches) != 0: self.assertFingerprints(matches, car_model) - @pytest.mark.parametrize("brand, car_model, ecus", [(b, c, e[c]) for b, e in VERSIONS.items() for c in e]) + @parameterized("brand, car_model, ecus", [(b, c, e[c]) for b, e in VERSIONS.items() for c in e]) def test_custom_fuzzy_match(self, brand, car_model, ecus): # Assert brand-specific fuzzy fingerprinting function doesn't disagree with standard fuzzy function config = FW_QUERY_CONFIGS[brand] if config.match_fw_to_car_fuzzy is None: - pytest.skip("Brand does not implement custom fuzzy fingerprinting function") + raise unittest.SkipTest("Brand does not implement custom fuzzy fingerprinting function") CP = CarParams() for _ in range(5): @@ -70,12 +72,12 @@ def test_custom_fuzzy_match(self, brand, car_model, ecus): if len(matches) == 1 and len(brand_matches) == 1: assert matches == brand_matches - @pytest.mark.parametrize("brand, car_model, ecus", [(b, c, e[c]) for b, e in VERSIONS.items() for c in e]) + @parameterized("brand, car_model, ecus", [(b, c, e[c]) for b, e in VERSIONS.items() for c in e]) def test_fuzzy_match_ecu_count(self, brand, car_model, ecus): # Asserts that fuzzy matching does not count matching FW, but ECU address keys valid_ecus = [e for e in ecus if e[0] not in FUZZY_EXCLUDE_ECUS] if not len(valid_ecus): - pytest.skip("Car model has no compatible ECUs for fuzzy matching") + raise unittest.SkipTest("Car model has no compatible ECUs for fuzzy matching") fw = [] for ecu in valid_ecus: @@ -95,11 +97,11 @@ def test_fuzzy_match_ecu_count(self, brand, car_model, ecus): elif len(matches): self.assertFingerprints(matches, car_model) - def test_fw_version_lists(self, subtests): + def test_fw_version_lists(self): for car_model, ecus in FW_VERSIONS.items(): - with subtests.test(car_model=car_model.value): + with self.subTest(car_model=car_model.value): for ecu, ecu_fw in ecus.items(): - with subtests.test(ecu): + with self.subTest(ecu): duplicates = {fw for fw in ecu_fw if ecu_fw.count(fw) > 1} assert not len(duplicates), f'{car_model}: Duplicate FW versions: Ecu.{ecu[0]}, {duplicates}' assert len(ecu_fw) > 0, f'{car_model}: No FW versions: Ecu.{ecu[0]}' @@ -114,18 +116,18 @@ def test_all_addrs_map_to_one_ecu(self): ecu_strings = ", ".join([f'Ecu.{ecu}' for ecu in ecus_for_addr]) assert len(ecus_for_addr) <= 1, f"{brand} has multiple ECUs that map to one address: {ecu_strings} -> ({hex(addr)}, {sub_addr})" - def test_data_collection_ecus(self, subtests): + def test_data_collection_ecus(self): # Asserts no extra ECUs are in the fingerprinting database for brand, config in FW_QUERY_CONFIGS.items(): for car_model, ecus in VERSIONS[brand].items(): bad_ecus = set(ecus).intersection(config.extra_ecus) - with subtests.test(car_model=car_model.value): + with self.subTest(car_model=car_model.value): assert not len(bad_ecus), f'{car_model}: Fingerprints contain ECUs added for data collection: {bad_ecus}' - def test_blacklisted_ecus(self, subtests): + def test_blacklisted_ecus(self): blacklisted_addrs = (0x7c4, 0x7d0) # includes A/C ecu and an unknown ecu for car_model, ecus in FW_VERSIONS.items(): - with subtests.test(car_model=car_model.value): + with self.subTest(car_model=car_model.value): CP = interfaces[car_model].get_non_essential_params(car_model) if CP.brand == 'subaru': for ecu in ecus.keys(): @@ -137,16 +139,16 @@ def test_blacklisted_ecus(self, subtests): for ecu in ecus.keys(): assert ecu[0] != Ecu.transmission, f"{car_model}: Blacklisted ecu: (Ecu.{ecu[0]}, {hex(ecu[1])})" - def test_missing_versions_and_configs(self, subtests): + def test_missing_versions_and_configs(self): brand_versions = set(VERSIONS.keys()) brand_configs = set(FW_QUERY_CONFIGS.keys()) if len(brand_configs - brand_versions): - with subtests.test(): - pytest.fail(f"Brands do not implement FW_VERSIONS: {brand_configs - brand_versions}") + with self.subTest(): + self.fail(f"Brands do not implement FW_VERSIONS: {brand_configs - brand_versions}") if len(brand_versions - brand_configs): - with subtests.test(): - pytest.fail(f"Brands do not implement FW_QUERY_CONFIG: {brand_versions - brand_configs}") + with self.subTest(): + self.fail(f"Brands do not implement FW_QUERY_CONFIG: {brand_versions - brand_configs}") # Ensure each brand has at least 1 ECU to query, and extra ECU retrieval for brand, config in FW_QUERY_CONFIGS.items(): @@ -155,9 +157,9 @@ def test_missing_versions_and_configs(self, subtests): if len(VERSIONS[brand]) > 0: assert len(config.get_all_ecus(VERSIONS[brand])) > 0 - def test_fw_request_ecu_whitelist(self, subtests): + def test_fw_request_ecu_whitelist(self): for brand, config in FW_QUERY_CONFIGS.items(): - with subtests.test(brand=brand): + with self.subTest(brand=brand): whitelisted_ecus = {ecu for r in config.requests for ecu in r.whitelist_ecus} brand_ecus = {fw[0] for car_fw in VERSIONS[brand].values() for fw in car_fw} brand_ecus |= {ecu[0] for ecu in config.extra_ecus} @@ -189,7 +191,7 @@ def test_brand_ecu_matches(self): assert not any(any(e) for b, e in brand_matches.items() if b != 'toyota') -class TestFwFingerprintTiming: +class TestFwFingerprintTiming(unittest.TestCase): N: int = 5 TOL: float = 0.05 @@ -216,16 +218,16 @@ def fake_get_data(self, timeout): self.total_time += timeout return {} - def _benchmark_brand(self, brand, num_pandas, mocker): + def _benchmark_brand(self, brand, num_pandas): self.total_time = 0 - mocker.patch("opendbc.car.isotp_parallel_query.IsoTpParallelQuery.get_data", self.fake_get_data) - for _ in range(self.N): - # Treat each brand as the most likely (aka, the first) brand with OBD multiplexing initially on - self.current_obd_multiplexing = True + with patch("opendbc.car.isotp_parallel_query.IsoTpParallelQuery.get_data", self.fake_get_data): + for _ in range(self.N): + # Treat each brand as the most likely (aka, the first) brand with OBD multiplexing initially on + self.current_obd_multiplexing = True - t = time.perf_counter() - get_fw_versions(self.fake_can_recv, self.fake_can_send, self.fake_set_obd_multiplexing, brand, num_pandas=num_pandas) - self.total_time += time.perf_counter() - t + t = time.perf_counter() + get_fw_versions(self.fake_can_recv, self.fake_can_send, self.fake_set_obd_multiplexing, brand, num_pandas=num_pandas) + self.total_time += time.perf_counter() - t return self.total_time / self.N @@ -233,7 +235,7 @@ def _assert_timing(self, avg_time, ref_time): assert avg_time < ref_time + self.TOL assert avg_time > ref_time - self.TOL, "Performance seems to have improved, update test refs." - def test_startup_timing(self, subtests, mocker): + def test_startup_timing(self): # Tests worse-case VIN query time and typical present ECU query time vin_ref_times = {'worst': 1.6, 'best': 0.8} # best assumes we go through all queries to get a match present_ecu_ref_time = 0.45 @@ -243,23 +245,23 @@ def fake_get_ecu_addrs(*_, timeout): return set() self.total_time = 0.0 - mocker.patch("opendbc.car.fw_versions.get_ecu_addrs", fake_get_ecu_addrs) - for _ in range(self.N): - self.current_obd_multiplexing = True - get_present_ecus(self.fake_can_recv, self.fake_can_send, self.fake_set_obd_multiplexing, num_pandas=2) + with patch("opendbc.car.fw_versions.get_ecu_addrs", fake_get_ecu_addrs): + for _ in range(self.N): + self.current_obd_multiplexing = True + get_present_ecus(self.fake_can_recv, self.fake_can_send, self.fake_set_obd_multiplexing, num_pandas=2) self._assert_timing(self.total_time / self.N, present_ecu_ref_time) print(f'get_present_ecus, query time={self.total_time / self.N} seconds') for name, args in (('worst', {}), ('best', {'retry': 1})): - with subtests.test(name=name): + with self.subTest(name=name): self.total_time = 0.0 - mocker.patch("opendbc.car.isotp_parallel_query.IsoTpParallelQuery.get_data", self.fake_get_data) - for _ in range(self.N): - get_vin(self.fake_can_recv, self.fake_can_send, (0, 1), **args) + with patch("opendbc.car.isotp_parallel_query.IsoTpParallelQuery.get_data", self.fake_get_data): + for _ in range(self.N): + get_vin(self.fake_can_recv, self.fake_can_send, (0, 1), **args) self._assert_timing(self.total_time / self.N, vin_ref_times[name]) print(f'get_vin {name} case, query time={self.total_time / self.N} seconds') - def test_fw_query_timing(self, subtests, mocker): + def test_fw_query_timing(self): total_ref_time = {1: 7.4, 2: 8.0} brand_ref_times = { 1: { @@ -287,8 +289,8 @@ def test_fw_query_timing(self, subtests, mocker): total_times = {1: 0.0, 2: 0.0} for num_pandas in (1, 2): for brand, config in FW_QUERY_CONFIGS.items(): - with subtests.test(brand=brand, num_pandas=num_pandas): - avg_time = self._benchmark_brand(brand, num_pandas, mocker) + with self.subTest(brand=brand, num_pandas=num_pandas): + avg_time = self._benchmark_brand(brand, num_pandas) total_times[num_pandas] += avg_time avg_time = round(avg_time, 2) @@ -301,12 +303,12 @@ def test_fw_query_timing(self, subtests, mocker): print(f'{brand=}, {num_pandas=}, {len(config.requests)=}, avg FW query time={avg_time} seconds') for num_pandas in (1, 2): - with subtests.test(brand='all_brands', num_pandas=num_pandas): + with self.subTest(brand='all_brands', num_pandas=num_pandas): total_time = round(total_times[num_pandas], 2) self._assert_timing(total_time, total_ref_time[num_pandas]) print(f'all brands, total FW query time={total_time} seconds') - def test_get_fw_versions(self, subtests, mocker): + def test_get_fw_versions(self): # some coverage on IsoTpParallelQuery and panda UDS library # TODO: replace this with full fingerprint simulation testing # https://github.com/commaai/panda/pull/1329 @@ -321,8 +323,8 @@ def fake_monotonic(): t += 0.0001 return t - mocker.patch("opendbc.car.carlog.carlog.exception", fake_carlog_exception) - mocker.patch("time.monotonic", fake_monotonic) - for brand in FW_QUERY_CONFIGS.keys(): - with subtests.test(brand=brand): - get_fw_versions(self.fake_can_recv, self.fake_can_send, lambda obd: None, brand) + with patch("opendbc.car.carlog.carlog.exception", fake_carlog_exception), \ + patch("time.monotonic", fake_monotonic): + for brand in FW_QUERY_CONFIGS.keys(): + with self.subTest(brand=brand): + get_fw_versions(self.fake_can_recv, self.fake_can_send, lambda obd: None, brand) diff --git a/opendbc/car/tests/test_lateral_limits.py b/opendbc/car/tests/test_lateral_limits.py index 1cafa7d4375..45116e69117 100755 --- a/opendbc/car/tests/test_lateral_limits.py +++ b/opendbc/car/tests/test_lateral_limits.py @@ -1,9 +1,7 @@ #!/usr/bin/env python3 -from collections import defaultdict +import unittest import importlib from opendbc.testing import parameterized_class -import pytest -import sys from opendbc.car import DT_CTRL from opendbc.car.car_helpers import interfaces @@ -21,23 +19,26 @@ @parameterized_class('car_model', [(c,) for c in sorted(PLATFORMS)]) -class TestLateralLimits: +class TestLateralLimits(unittest.TestCase): car_model: str @classmethod - def setup_class(cls): + def setUpClass(cls): + if 'car_model' not in cls.__dict__: + raise unittest.SkipTest('Base class') + CarInterface = interfaces[cls.car_model] CP = CarInterface.get_non_essential_params(cls.car_model) if cls.car_model == 'MOCK': - pytest.skip('Mock car') + raise unittest.SkipTest('Mock car') # TODO: test all platforms if CP.steerControlType != 'torque': - pytest.skip() + raise unittest.SkipTest if CP.notCar: - pytest.skip() + raise unittest.SkipTest CarControllerParams = importlib.import_module(f'opendbc.car.{CP.brand}.values').CarControllerParams cls.control_params = CarControllerParams(CP) @@ -66,31 +67,3 @@ def test_jerk_limits(self): def test_max_lateral_accel(self): assert self.torque_params["MAX_LAT_ACCEL_MEASURED"] <= ISO_LATERAL_ACCEL - - -class LatAccelReport: - car_model_jerks: defaultdict[str, dict[str, float]] = defaultdict(dict) - - def pytest_sessionfinish(self): - print(f"\n\n---- Lateral limit report ({len(PLATFORMS)} cars) ----\n") - - max_car_model_len = max([len(car_model) for car_model in self.car_model_jerks]) - for car_model, _jerks in sorted(self.car_model_jerks.items(), key=lambda i: i[1]['up_jerk'], reverse=True): - violation = _jerks["up_jerk"] > MAX_LAT_JERK_UP + MAX_LAT_JERK_UP_TOLERANCE or \ - _jerks["down_jerk"] > MAX_LAT_JERK_DOWN - violation_str = " - VIOLATION" if violation else "" - - print(f"{car_model:{max_car_model_len}} - up jerk: {round(_jerks['up_jerk'], 2):5} " + - f"m/s^3, down jerk: {round(_jerks['down_jerk'], 2):5} m/s^3{violation_str}") - - @pytest.fixture(scope="class", autouse=True) - def class_setup(self, request): - yield - cls = request.cls - if hasattr(cls, "control_params"): - up_jerk, down_jerk = TestLateralLimits.calculate_0_5s_jerk(cls.control_params, cls.torque_params) - self.car_model_jerks[cls.car_model] = {"up_jerk": up_jerk, "down_jerk": down_jerk} - - -if __name__ == '__main__': - sys.exit(pytest.main([__file__, '-n0', '--no-summary'], plugins=[LatAccelReport()])) # noqa: TID251 diff --git a/opendbc/car/tests/test_platform_configs.py b/opendbc/car/tests/test_platform_configs.py index 1704621ddda..3104b60a974 100644 --- a/opendbc/car/tests/test_platform_configs.py +++ b/opendbc/car/tests/test_platform_configs.py @@ -1,11 +1,12 @@ +import unittest from opendbc.car.values import PLATFORMS -class TestPlatformConfigs: - def test_configs(self, subtests): +class TestPlatformConfigs(unittest.TestCase): + def test_configs(self): for name, platform in PLATFORMS.items(): - with subtests.test(platform=str(platform)): + with self.subTest(platform=str(platform)): assert platform.config._frozen if platform != "MOCK": diff --git a/opendbc/car/tests/test_routes.py b/opendbc/car/tests/test_routes.py index 92176909db5..331675dc368 100644 --- a/opendbc/car/tests/test_routes.py +++ b/opendbc/car/tests/test_routes.py @@ -1,11 +1,13 @@ -import pytest +import unittest from opendbc.car.values import PLATFORMS from opendbc.car.tests.routes import non_tested_cars, routes -@pytest.mark.parametrize("platform", PLATFORMS.keys()) -def test_test_route_present(platform): - tested_platforms = [r.car_model for r in routes] - assert platform in set(tested_platforms) | set(non_tested_cars), \ - f"Missing test route for {platform}. Add a route to opendbc/car/tests/routes.py" +class TestRoutes(unittest.TestCase): + def test_test_route_present(self): + tested_platforms = [r.car_model for r in routes] + for platform in PLATFORMS.keys(): + with self.subTest(platform=platform): + assert platform in set(tested_platforms) | set(non_tested_cars), \ + f"Missing test route for {platform}. Add a route to opendbc/car/tests/routes.py" diff --git a/opendbc/car/tests/test_vehicle_model.py b/opendbc/car/tests/test_vehicle_model.py index b88a8dab4e0..a3e4afd9fae 100644 --- a/opendbc/car/tests/test_vehicle_model.py +++ b/opendbc/car/tests/test_vehicle_model.py @@ -1,4 +1,4 @@ -import pytest +import unittest import math import numpy as np @@ -8,8 +8,8 @@ from opendbc.car.vehicle_model import VehicleModel, dyn_ss_sol, create_dyn_state_matrices -class TestVehicleModel: - def setup_method(self): +class TestVehicleModel(unittest.TestCase): + def setUp(self): CP = CarInterface.get_non_essential_params(CAR.HONDA_CIVIC) self.VM = VehicleModel(CP) @@ -21,7 +21,7 @@ def test_round_trip_yaw_rate(self): yr = self.VM.yaw_rate(sa, u, roll) new_sa = self.VM.get_steer_from_yaw_rate(yr, u, roll) - assert sa == pytest.approx(new_sa) + self.assertAlmostEqual(sa, new_sa, places=10) def test_dyn_ss_sol_against_yaw_rate(self): """Verify that the yaw_rate helper function matches the results @@ -36,7 +36,7 @@ def test_dyn_ss_sol_against_yaw_rate(self): # Compute yaw rate using direct computations yr2 = self.VM.yaw_rate(sa, u, roll) - assert float(yr1[0]) == pytest.approx(yr2) + self.assertAlmostEqual(float(yr1[0]), yr2, places=10) def test_syn_ss_sol_simulate(self): """Verifies that dyn_ss_sol matches a simulation""" diff --git a/opendbc/car/volkswagen/tests/test_volkswagen.py b/opendbc/car/volkswagen/tests/test_volkswagen.py index 050212b9322..45293ad395c 100644 --- a/opendbc/car/volkswagen/tests/test_volkswagen.py +++ b/opendbc/car/volkswagen/tests/test_volkswagen.py @@ -1,5 +1,6 @@ import random import re +import unittest from opendbc.car import DT_CTRL from opendbc.car.structs import CarParams @@ -14,7 +15,7 @@ SPARE_PART_FW_PATTERN = re.compile(b'\xf1\x87(?P[0-9][0-9A-Z]{2})(?P[0-9][0-9A-Z][0-9])(?P[0-9A-Z]{2}[0-9])([A-Z0-9]| )') -class TestVolkswagenHCAMitigation: +class TestVolkswagenHCAMitigation(unittest.TestCase): STUCK_TORQUE_FRAMES = round(CCP.STEER_TIME_STUCK_TORQUE / (DT_CTRL * CCP.STEER_STEP)) def test_same_torque_mitigation(self): @@ -28,18 +29,18 @@ def test_same_torque_mitigation(self): expected_torque = actuator_value - (1, -1)[actuator_value < 0] if should_nudge else actuator_value assert hca_mitigation.update(actuator_value, actuator_value) == expected_torque, f"{frame=}" -class TestVolkswagenPlatformConfigs: - def test_spare_part_fw_pattern(self, subtests): +class TestVolkswagenPlatformConfigs(unittest.TestCase): + def test_spare_part_fw_pattern(self): # Relied on for determining if a FW is likely VW for platform, ecus in FW_VERSIONS.items(): - with subtests.test(platform=platform.value): + with self.subTest(platform=platform.value): for fws in ecus.values(): for fw in fws: assert SPARE_PART_FW_PATTERN.match(fw) is not None, f"Bad FW: {fw}" - def test_chassis_codes(self, subtests): + def test_chassis_codes(self): for platform in CAR: - with subtests.test(platform=platform.value): + with self.subTest(platform=platform.value): assert len(platform.config.wmis) > 0, "WMIs not set" assert len(platform.config.chassis_codes) > 0, "Chassis codes not set" assert all(CHASSIS_CODE_PATTERN.match(cc) for cc in @@ -52,11 +53,11 @@ def test_chassis_codes(self, subtests): assert set() == platform.config.chassis_codes & comp.config.chassis_codes, \ f"Shared chassis codes: {comp}" - def test_custom_fuzzy_fingerprinting(self, subtests): + def test_custom_fuzzy_fingerprinting(self): all_radar_fw = list({fw for ecus in FW_VERSIONS.values() for fw in ecus[Ecu.fwdRadar, 0x757, None]}) for platform in CAR: - with subtests.test(platform=platform.name): + with self.subTest(platform=platform.name): for wmi in WMI: for chassis_code in platform.config.chassis_codes | {"00"}: vin = ["0"] * 17 diff --git a/opendbc/safety/tests/misra/test_mutation.py b/opendbc/safety/tests/misra/test_mutation.py index 1158992ecdf..41d2dd2567a 100644 --- a/opendbc/safety/tests/misra/test_mutation.py +++ b/opendbc/safety/tests/misra/test_mutation.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 import os import glob -import pytest +import unittest import shutil import subprocess import tempfile @@ -46,24 +46,26 @@ mutations = [mutations[0]] + rng.sample(mutations[1:], min(2, len(mutations) - 1)) -@pytest.mark.parametrize("fn, rule, transform, should_fail", mutations) -def test_misra_mutation(fn, rule, transform, should_fail): - with tempfile.TemporaryDirectory() as tmp: - shutil.copytree(ROOT, tmp, dirs_exist_ok=True, - ignore=shutil.ignore_patterns('.venv', '.git', '*.ctu-info', '.hypothesis')) +class TestMisraMutation(unittest.TestCase): + def test_misra_mutation(self): + for fn, rule, transform, should_fail in mutations: + with self.subTest(fn=fn, rule=rule, should_fail=should_fail): + with tempfile.TemporaryDirectory() as tmp: + shutil.copytree(ROOT, tmp, dirs_exist_ok=True, + ignore=shutil.ignore_patterns('.venv', '.git', '*.ctu-info', '.hypothesis')) - # apply patch - if fn is not None: - with open(os.path.join(tmp, fn), 'r+') as f: - content = f.read() - f.seek(0) - f.write(transform(content)) + # apply patch + if fn is not None: + with open(os.path.join(tmp, fn), 'r+') as f: + content = f.read() + f.seek(0) + f.write(transform(content)) - # run test - r = subprocess.run(f"OPENDBC_ROOT={tmp} opendbc/safety/tests/misra/test_misra.sh", - stdout=subprocess.PIPE, cwd=ROOT, shell=True, encoding='utf8') - print(r.stdout) # helpful for debugging failures - failed = r.returncode != 0 - assert failed == should_fail - if should_fail: - assert rule in r.stdout, "MISRA test failed but not for the correct violation" \ No newline at end of file + # run test + r = subprocess.run(f"OPENDBC_ROOT={tmp} opendbc/safety/tests/misra/test_misra.sh", + stdout=subprocess.PIPE, cwd=ROOT, shell=True, encoding='utf8') + print(r.stdout) # helpful for debugging failures + failed = r.returncode != 0 + assert failed == should_fail + if should_fail: + assert rule in r.stdout, "MISRA test failed but not for the correct violation" diff --git a/opendbc/safety/tests/test.sh b/opendbc/safety/tests/test.sh index b56e2891370..83a8fb97fef 100755 --- a/opendbc/safety/tests/test.sh +++ b/opendbc/safety/tests/test.sh @@ -11,7 +11,7 @@ rm -f ./libsafety/*.gcda scons -j$(nproc) -D # run safety tests and generate coverage data -pytest -n8 --ignore-glob=misra/* +python -m unittest discover -s . -p 'test_*.py' -t ../../../ # NOTE: we accept that these tools will have slight differences, # and in return, we get to use the stock toolchain instead of diff --git a/opendbc/testing.py b/opendbc/testing.py index 484a3881bd7..2b59d9021ad 100644 --- a/opendbc/testing.py +++ b/opendbc/testing.py @@ -1,6 +1,36 @@ +import functools import sys +def parameterized(argnames, argvalues): + """Method decorator that runs a test once per parameter set using subTest. + + Usage: + @parameterized("x, y", [(1, 2), (3, 4)]) + def test_add(self, x, y): ... + + @parameterized("car_model, fingerprints", FINGERPRINTS.items()) + def test_fw(self, car_model, fingerprints): ... + """ + if isinstance(argnames, str): + argnames = [a.strip() for a in argnames.split(',')] + + def decorator(func): + + @functools.wraps(func) + def wrapper(self): + for values in argvalues: + if not isinstance(values, (tuple, list)): + values = (values,) + kwargs = dict(zip(argnames, values, strict=True)) + with self.subTest(**kwargs): + func(self, **kwargs) + + return wrapper + + return decorator + + def parameterized_class(attrs, values=None): """Class decorator that generates subclasses with different class attributes. diff --git a/pyproject.toml b/pyproject.toml index c523370bd6b..36d5f12c33d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,14 +24,8 @@ testing = [ "tree-sitter", "tree-sitter-c", "gcovr", - # FIXME: pytest 9.0.0 doesn't support unittest.SkipTest - "pytest==8.4.2", - "pytest-mock", - # https://github.com/pytest-dev/pytest-xdist/pull/1229 - "pytest-xdist @ git+https://github.com/sshane/pytest-xdist@2b4372bd62699fb412c4fe2f95bf9f01bd2018da", - "pytest-subtests", + "unittest-parallel", "hypothesis==6.47.*", - "parameterized>=0.8,<0.9", "zstandard", # static analysis @@ -53,13 +47,6 @@ examples = [ requires = ["setuptools"] build-backend = "setuptools.build_meta" -[tool.pytest.ini_options] -addopts = "-Werror --strict-config --strict-markers --durations=10 -n auto --ignore-glob=opendbc/safety/tests/misra/*.sh" -python_files = "test_*.py" -testpaths = [ - "opendbc" -] - [tool.codespell] quiet-level = 3 ignore-words-list = "alo,ba,bu,deque,hda,grey,arange" @@ -107,10 +94,7 @@ flake8-implicit-str-concat.allow-multiline=false "site_scons/*" = ["ALL"] [tool.ruff.lint.flake8-tidy-imports.banned-api] -"pytest.main".msg = "pytest.main requires special handling that is easy to mess up!" "numpy.mean".msg = "Sum and divide. np.mean is slow" -# TODO: re-enable when all tests are converted to pytest -#"unittest".msg = "Use pytest" [tool.ty.rules] # Ignore rules that produce false positives due to: diff --git a/uv.lock b/uv.lock index 78ed44f2299..d92da4bf918 100644 --- a/uv.lock +++ b/uv.lock @@ -141,6 +141,45 @@ wheels = [ [package.metadata] requires-dist = [{ name = "requests" }] +[[package]] +name = "coverage" +version = "7.13.4" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/24/56/95b7e30fa389756cb56630faa728da46a27b8c6eb46f9d557c68fff12b65/coverage-7.13.4.tar.gz", hash = "sha256:e5c8f6ed1e61a8b2dcdf31eb0b9bbf0130750ca79c1c49eb898e2ad86f5ccc91", size = 827239, upload-time = "2026-02-09T12:59:03.86Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/b4/ad/b59e5b451cf7172b8d1043dc0fa718f23aab379bc1521ee13d4bd9bfa960/coverage-7.13.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d490ba50c3f35dd7c17953c68f3270e7ccd1c6642e2d2afe2d8e720b98f5a053", size = 219278, upload-time = "2026-02-09T12:56:31.673Z" }, + { url = "https://files.pythonhosted.org/packages/f1/17/0cb7ca3de72e5f4ef2ec2fa0089beafbcaaaead1844e8b8a63d35173d77d/coverage-7.13.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:19bc3c88078789f8ef36acb014d7241961dbf883fd2533d18cb1e7a5b4e28b11", size = 219783, upload-time = "2026-02-09T12:56:33.104Z" }, + { url = "https://files.pythonhosted.org/packages/ab/63/325d8e5b11e0eaf6d0f6a44fad444ae58820929a9b0de943fa377fe73e85/coverage-7.13.4-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:3998e5a32e62fdf410c0dbd3115df86297995d6e3429af80b8798aad894ca7aa", size = 250200, upload-time = "2026-02-09T12:56:34.474Z" }, + { url = "https://files.pythonhosted.org/packages/76/53/c16972708cbb79f2942922571a687c52bd109a7bd51175aeb7558dff2236/coverage-7.13.4-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:8e264226ec98e01a8e1054314af91ee6cde0eacac4f465cc93b03dbe0bce2fd7", size = 252114, upload-time = "2026-02-09T12:56:35.749Z" }, + { url = "https://files.pythonhosted.org/packages/eb/c2/7ab36d8b8cc412bec9ea2d07c83c48930eb4ba649634ba00cb7e4e0f9017/coverage-7.13.4-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a3aa4e7b9e416774b21797365b358a6e827ffadaaca81b69ee02946852449f00", size = 254220, upload-time = "2026-02-09T12:56:37.796Z" }, + { url = "https://files.pythonhosted.org/packages/d6/4d/cf52c9a3322c89a0e6febdfbc83bb45c0ed3c64ad14081b9503adee702e7/coverage-7.13.4-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:71ca20079dd8f27fcf808817e281e90220475cd75115162218d0e27549f95fef", size = 256164, upload-time = "2026-02-09T12:56:39.016Z" }, + { url = "https://files.pythonhosted.org/packages/78/e9/eb1dd17bd6de8289df3580e967e78294f352a5df8a57ff4671ee5fc3dcd0/coverage-7.13.4-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e2f25215f1a359ab17320b47bcdaca3e6e6356652e8256f2441e4ef972052903", size = 250325, upload-time = "2026-02-09T12:56:40.668Z" }, + { url = "https://files.pythonhosted.org/packages/71/07/8c1542aa873728f72267c07278c5cc0ec91356daf974df21335ccdb46368/coverage-7.13.4-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:d65b2d373032411e86960604dc4edac91fdfb5dca539461cf2cbe78327d1e64f", size = 251913, upload-time = "2026-02-09T12:56:41.97Z" }, + { url = "https://files.pythonhosted.org/packages/74/d7/c62e2c5e4483a748e27868e4c32ad3daa9bdddbba58e1bc7a15e252baa74/coverage-7.13.4-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:94eb63f9b363180aff17de3e7c8760c3ba94664ea2695c52f10111244d16a299", size = 249974, upload-time = "2026-02-09T12:56:43.323Z" }, + { url = "https://files.pythonhosted.org/packages/98/9f/4c5c015a6e98ced54efd0f5cf8d31b88e5504ecb6857585fc0161bb1e600/coverage-7.13.4-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:e856bf6616714c3a9fbc270ab54103f4e685ba236fa98c054e8f87f266c93505", size = 253741, upload-time = "2026-02-09T12:56:45.155Z" }, + { url = "https://files.pythonhosted.org/packages/bd/59/0f4eef89b9f0fcd9633b5d350016f54126ab49426a70ff4c4e87446cabdc/coverage-7.13.4-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:65dfcbe305c3dfe658492df2d85259e0d79ead4177f9ae724b6fb245198f55d6", size = 249695, upload-time = "2026-02-09T12:56:46.636Z" }, + { url = "https://files.pythonhosted.org/packages/b5/2c/b7476f938deb07166f3eb281a385c262675d688ff4659ad56c6c6b8e2e70/coverage-7.13.4-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:b507778ae8a4c915436ed5c2e05b4a6cecfa70f734e19c22a005152a11c7b6a9", size = 250599, upload-time = "2026-02-09T12:56:48.13Z" }, + { url = "https://files.pythonhosted.org/packages/b8/34/c3420709d9846ee3785b9f2831b4d94f276f38884032dca1457fa83f7476/coverage-7.13.4-cp311-cp311-win32.whl", hash = "sha256:784fc3cf8be001197b652d51d3fd259b1e2262888693a4636e18879f613a62a9", size = 221780, upload-time = "2026-02-09T12:56:50.479Z" }, + { url = "https://files.pythonhosted.org/packages/61/08/3d9c8613079d2b11c185b865de9a4c1a68850cfda2b357fae365cf609f29/coverage-7.13.4-cp311-cp311-win_amd64.whl", hash = "sha256:2421d591f8ca05b308cf0092807308b2facbefe54af7c02ac22548b88b95c98f", size = 222715, upload-time = "2026-02-09T12:56:51.815Z" }, + { url = "https://files.pythonhosted.org/packages/18/1a/54c3c80b2f056164cc0a6cdcb040733760c7c4be9d780fe655f356f433e4/coverage-7.13.4-cp311-cp311-win_arm64.whl", hash = "sha256:79e73a76b854d9c6088fe5d8b2ebe745f8681c55f7397c3c0a016192d681045f", size = 221385, upload-time = "2026-02-09T12:56:53.194Z" }, + { url = "https://files.pythonhosted.org/packages/d1/81/4ce2fdd909c5a0ed1f6dedb88aa57ab79b6d1fbd9b588c1ac7ef45659566/coverage-7.13.4-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:02231499b08dabbe2b96612993e5fc34217cdae907a51b906ac7fca8027a4459", size = 219449, upload-time = "2026-02-09T12:56:54.889Z" }, + { url = "https://files.pythonhosted.org/packages/5d/96/5238b1efc5922ddbdc9b0db9243152c09777804fb7c02ad1741eb18a11c0/coverage-7.13.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40aa8808140e55dc022b15d8aa7f651b6b3d68b365ea0398f1441e0b04d859c3", size = 219810, upload-time = "2026-02-09T12:56:56.33Z" }, + { url = "https://files.pythonhosted.org/packages/78/72/2f372b726d433c9c35e56377cf1d513b4c16fe51841060d826b95caacec1/coverage-7.13.4-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:5b856a8ccf749480024ff3bd7310adaef57bf31fd17e1bfc404b7940b6986634", size = 251308, upload-time = "2026-02-09T12:56:57.858Z" }, + { url = "https://files.pythonhosted.org/packages/5d/a0/2ea570925524ef4e00bb6c82649f5682a77fac5ab910a65c9284de422600/coverage-7.13.4-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:2c048ea43875fbf8b45d476ad79f179809c590ec7b79e2035c662e7afa3192e3", size = 254052, upload-time = "2026-02-09T12:56:59.754Z" }, + { url = "https://files.pythonhosted.org/packages/e8/ac/45dc2e19a1939098d783c846e130b8f862fbb50d09e0af663988f2f21973/coverage-7.13.4-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b7b38448866e83176e28086674fe7368ab8590e4610fb662b44e345b86d63ffa", size = 255165, upload-time = "2026-02-09T12:57:01.287Z" }, + { url = "https://files.pythonhosted.org/packages/2d/4d/26d236ff35abc3b5e63540d3386e4c3b192168c1d96da5cb2f43c640970f/coverage-7.13.4-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:de6defc1c9badbf8b9e67ae90fd00519186d6ab64e5cc5f3d21359c2a9b2c1d3", size = 257432, upload-time = "2026-02-09T12:57:02.637Z" }, + { url = "https://files.pythonhosted.org/packages/ec/55/14a966c757d1348b2e19caf699415a2a4c4f7feaa4bbc6326a51f5c7dd1b/coverage-7.13.4-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:7eda778067ad7ffccd23ecffce537dface96212576a07924cbf0d8799d2ded5a", size = 251716, upload-time = "2026-02-09T12:57:04.056Z" }, + { url = "https://files.pythonhosted.org/packages/77/33/50116647905837c66d28b2af1321b845d5f5d19be9655cb84d4a0ea806b4/coverage-7.13.4-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:e87f6c587c3f34356c3759f0420693e35e7eb0e2e41e4c011cb6ec6ecbbf1db7", size = 253089, upload-time = "2026-02-09T12:57:05.503Z" }, + { url = "https://files.pythonhosted.org/packages/c2/b4/8efb11a46e3665d92635a56e4f2d4529de6d33f2cb38afd47d779d15fc99/coverage-7.13.4-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:8248977c2e33aecb2ced42fef99f2d319e9904a36e55a8a68b69207fb7e43edc", size = 251232, upload-time = "2026-02-09T12:57:06.879Z" }, + { url = "https://files.pythonhosted.org/packages/51/24/8cd73dd399b812cc76bb0ac260e671c4163093441847ffe058ac9fda1e32/coverage-7.13.4-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:25381386e80ae727608e662474db537d4df1ecd42379b5ba33c84633a2b36d47", size = 255299, upload-time = "2026-02-09T12:57:08.245Z" }, + { url = "https://files.pythonhosted.org/packages/03/94/0a4b12f1d0e029ce1ccc1c800944a9984cbe7d678e470bb6d3c6bc38a0da/coverage-7.13.4-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:ee756f00726693e5ba94d6df2bdfd64d4852d23b09bb0bc700e3b30e6f333985", size = 250796, upload-time = "2026-02-09T12:57:10.142Z" }, + { url = "https://files.pythonhosted.org/packages/73/44/6002fbf88f6698ca034360ce474c406be6d5a985b3fdb3401128031eef6b/coverage-7.13.4-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:fdfc1e28e7c7cdce44985b3043bc13bbd9c747520f94a4d7164af8260b3d91f0", size = 252673, upload-time = "2026-02-09T12:57:12.197Z" }, + { url = "https://files.pythonhosted.org/packages/de/c6/a0279f7c00e786be75a749a5674e6fa267bcbd8209cd10c9a450c655dfa7/coverage-7.13.4-cp312-cp312-win32.whl", hash = "sha256:01d4cbc3c283a17fc1e42d614a119f7f438eabb593391283adca8dc86eff1246", size = 221990, upload-time = "2026-02-09T12:57:14.085Z" }, + { url = "https://files.pythonhosted.org/packages/77/4e/c0a25a425fcf5557d9abd18419c95b63922e897bc86c1f327f155ef234a9/coverage-7.13.4-cp312-cp312-win_amd64.whl", hash = "sha256:9401ebc7ef522f01d01d45532c68c5ac40fb27113019b6b7d8b208f6e9baa126", size = 222800, upload-time = "2026-02-09T12:57:15.944Z" }, + { url = "https://files.pythonhosted.org/packages/47/ac/92da44ad9a6f4e3a7debd178949d6f3769bedca33830ce9b1dcdab589a37/coverage-7.13.4-cp312-cp312-win_arm64.whl", hash = "sha256:b1ec7b6b6e93255f952e27ab58fbc68dcc468844b16ecbee881aeb29b6ab4d8d", size = 221415, upload-time = "2026-02-09T12:57:17.497Z" }, + { url = "https://files.pythonhosted.org/packages/0d/4a/331fe2caf6799d591109bb9c08083080f6de90a823695d412a935622abb2/coverage-7.13.4-py3-none-any.whl", hash = "sha256:1af1641e57cf7ba1bd67d677c9abdbcd6cc2ab7da3bca7fa1e2b7e50e65f2ad0", size = 211242, upload-time = "2026-02-09T12:59:02.032Z" }, +] + [[package]] name = "cppcheck" version = "2.16.0" @@ -155,15 +194,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/66/65/08d3a5039b565231c501b31d1a973d4222e9803c03b2c31a9c08bdec3e30/cpplint-2.0.2-py3-none-any.whl", hash = "sha256:7ec188b5a08e604294ae7e7f88ec3ece2699de857f0533b305620c8cf237cad5", size = 81987, upload-time = "2025-04-08T01:22:24.101Z" }, ] -[[package]] -name = "execnet" -version = "2.1.2" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/bf/89/780e11f9588d9e7128a3f87788354c7946a9cbb1401ad38a48c4db9a4f07/execnet-2.1.2.tar.gz", hash = "sha256:63d83bfdd9a23e35b9c6a3261412324f964c2ec8dcd8d3c6916ee9373e0befcd", size = 166622, upload-time = "2025-11-12T09:56:37.75Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/ab/84/02fc1827e8cdded4aa65baef11296a9bbe595c474f0d6d758af082d849fd/execnet-2.1.2-py3-none-any.whl", hash = "sha256:67fba928dd5a544b783f6056f449e5e3931a5c378b128bc18501f7ea79e296ec", size = 40708, upload-time = "2025-11-12T09:56:36.333Z" }, -] - [[package]] name = "gcovr" version = "8.6" @@ -201,15 +231,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/0e/61/66938bbb5fc52dbdf84594873d5b51fb1f7c7794e9c0f5bd885f30bc507b/idna-3.11-py3-none-any.whl", hash = "sha256:771a87f49d9defaf64091e6e6fe9c18d4833f140bd19464795bc32d966ca37ea", size = 71008, upload-time = "2025-10-12T14:55:18.883Z" }, ] -[[package]] -name = "iniconfig" -version = "2.3.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/72/34/14ca021ce8e5dfedc35312d08ba8bf51fdd999c576889fc2c24cb97f4f10/iniconfig-2.3.0.tar.gz", hash = "sha256:c76315c77db068650d49c5b56314774a7804df16fee4402c1f19d6d15d8c4730", size = 20503, upload-time = "2025-10-18T21:55:43.219Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/cb/b1/3846dd7f199d53cb17f49cba7e651e9ce294d8497c8c150530ed11865bb8/iniconfig-2.3.0-py3-none-any.whl", hash = "sha256:f631c04d2c48c52b84d0d0549c99ff3859c98df65b3101406327ecc7d53fbf12", size = 7484, upload-time = "2025-10-18T21:55:41.639Z" }, -] - [[package]] name = "inputs" version = "0.5" @@ -383,15 +404,11 @@ testing = [ { name = "gcovr" }, { name = "hypothesis" }, { name = "lefthook" }, - { name = "parameterized" }, - { name = "pytest" }, - { name = "pytest-mock" }, - { name = "pytest-subtests" }, - { name = "pytest-xdist" }, { name = "ruff" }, { name = "tree-sitter" }, { name = "tree-sitter-c" }, { name = "ty" }, + { name = "unittest-parallel" }, { name = "zstandard" }, ] @@ -408,50 +425,19 @@ requires-dist = [ { name = "jinja2", marker = "extra == 'docs'" }, { name = "lefthook", marker = "extra == 'testing'" }, { name = "numpy" }, - { name = "parameterized", marker = "extra == 'testing'", specifier = ">=0.8,<0.9" }, { name = "pycapnp", specifier = "==2.1.0" }, { name = "pycryptodome" }, - { name = "pytest", marker = "extra == 'testing'", specifier = "==8.4.2" }, - { name = "pytest-mock", marker = "extra == 'testing'" }, - { name = "pytest-subtests", marker = "extra == 'testing'" }, - { name = "pytest-xdist", marker = "extra == 'testing'", git = "https://github.com/sshane/pytest-xdist?rev=2b4372bd62699fb412c4fe2f95bf9f01bd2018da" }, { name = "ruff", marker = "extra == 'testing'" }, { name = "scons" }, { name = "tqdm" }, { name = "tree-sitter", marker = "extra == 'testing'" }, { name = "tree-sitter-c", marker = "extra == 'testing'" }, { name = "ty", marker = "extra == 'testing'" }, + { name = "unittest-parallel", marker = "extra == 'testing'" }, { name = "zstandard", marker = "extra == 'testing'" }, ] provides-extras = ["testing", "docs", "examples"] -[[package]] -name = "packaging" -version = "26.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/65/ee/299d360cdc32edc7d2cf530f3accf79c4fca01e96ffc950d8a52213bd8e4/packaging-26.0.tar.gz", hash = "sha256:00243ae351a257117b6a241061796684b084ed1c516a08c48a3f7e147a9d80b4", size = 143416, upload-time = "2026-01-21T20:50:39.064Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/b7/b9/c538f279a4e237a006a2c98387d081e9eb060d203d8ed34467cc0f0b9b53/packaging-26.0-py3-none-any.whl", hash = "sha256:b36f1fef9334a5588b4166f8bcd26a14e521f2b55e6b9de3aaa80d3ff7a37529", size = 74366, upload-time = "2026-01-21T20:50:37.788Z" }, -] - -[[package]] -name = "parameterized" -version = "0.8.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/c6/23/2288f308d238b4f261c039cafcd650435d624de97c6ffc903f06ea8af50f/parameterized-0.8.1.tar.gz", hash = "sha256:41bbff37d6186430f77f900d777e5bb6a24928a1c46fb1de692f8b52b8833b5c", size = 23936, upload-time = "2021-01-09T20:35:18.235Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/31/13/fe468c8c7400a8eca204e6e160a29bf7dcd45a76e20f1c030f3eaa690d93/parameterized-0.8.1-py2.py3-none-any.whl", hash = "sha256:9cbb0b69a03e8695d68b3399a8a5825200976536fe1cb79db60ed6a4c8c9efe9", size = 26354, upload-time = "2021-01-09T20:35:16.307Z" }, -] - -[[package]] -name = "pluggy" -version = "1.6.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/f9/e2/3e91f31a7d2b083fe6ef3fa267035b518369d9511ffab804f839851d2779/pluggy-1.6.0.tar.gz", hash = "sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3", size = 69412, upload-time = "2025-05-15T12:30:07.975Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/54/20/4d324d65cc6d9205fabedc306948156824eb9f0ee1633355a8f7ec5c66bf/pluggy-1.6.0-py3-none-any.whl", hash = "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746", size = 20538, upload-time = "2025-05-15T12:30:06.134Z" }, -] - [[package]] name = "pycapnp" version = "2.1.0" @@ -521,56 +507,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/c7/21/705964c7812476f378728bdf590ca4b771ec72385c533964653c68e86bdc/pygments-2.19.2-py3-none-any.whl", hash = "sha256:86540386c03d588bb81d44bc3928634ff26449851e99741617ecb9037ee5ec0b", size = 1225217, upload-time = "2025-06-21T13:39:07.939Z" }, ] -[[package]] -name = "pytest" -version = "8.4.2" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "colorama", marker = "sys_platform == 'win32'" }, - { name = "iniconfig" }, - { name = "packaging" }, - { name = "pluggy" }, - { name = "pygments" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/a3/5c/00a0e072241553e1a7496d638deababa67c5058571567b92a7eaa258397c/pytest-8.4.2.tar.gz", hash = "sha256:86c0d0b93306b961d58d62a4db4879f27fe25513d4b969df351abdddb3c30e01", size = 1519618, upload-time = "2025-09-04T14:34:22.711Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/a8/a4/20da314d277121d6534b3a980b29035dcd51e6744bd79075a6ce8fa4eb8d/pytest-8.4.2-py3-none-any.whl", hash = "sha256:872f880de3fc3a5bdc88a11b39c9710c3497a547cfa9320bc3c5e62fbf272e79", size = 365750, upload-time = "2025-09-04T14:34:20.226Z" }, -] - -[[package]] -name = "pytest-mock" -version = "3.15.1" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "pytest" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/68/14/eb014d26be205d38ad5ad20d9a80f7d201472e08167f0bb4361e251084a9/pytest_mock-3.15.1.tar.gz", hash = "sha256:1849a238f6f396da19762269de72cb1814ab44416fa73a8686deac10b0d87a0f", size = 34036, upload-time = "2025-09-16T16:37:27.081Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/5a/cc/06253936f4a7fa2e0f48dfe6d851d9c56df896a9ab09ac019d70b760619c/pytest_mock-3.15.1-py3-none-any.whl", hash = "sha256:0a25e2eb88fe5168d535041d09a4529a188176ae608a6d249ee65abc0949630d", size = 10095, upload-time = "2025-09-16T16:37:25.734Z" }, -] - -[[package]] -name = "pytest-subtests" -version = "0.15.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "attrs" }, - { name = "pytest" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/bb/d9/20097971a8d315e011e055d512fa120fd6be3bdb8f4b3aa3e3c6bf77bebc/pytest_subtests-0.15.0.tar.gz", hash = "sha256:cb495bde05551b784b8f0b8adfaa27edb4131469a27c339b80fd8d6ba33f887c", size = 18525, upload-time = "2025-10-20T16:26:18.358Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/23/64/bba465299b37448b4c1b84c7a04178399ac22d47b3dc5db1874fe55a2bd3/pytest_subtests-0.15.0-py3-none-any.whl", hash = "sha256:da2d0ce348e1f8d831d5a40d81e3aeac439fec50bd5251cbb7791402696a9493", size = 9185, upload-time = "2025-10-20T16:26:17.239Z" }, -] - -[[package]] -name = "pytest-xdist" -version = "3.7.1.dev24+g2b4372bd6" -source = { git = "https://github.com/sshane/pytest-xdist?rev=2b4372bd62699fb412c4fe2f95bf9f01bd2018da#2b4372bd62699fb412c4fe2f95bf9f01bd2018da" } -dependencies = [ - { name = "execnet" }, - { name = "pytest" }, -] - [[package]] name = "requests" version = "2.32.5" @@ -702,6 +638,18 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/92/4f/5dd60904c8105cda4d0be34d3a446c180933c76b84ae0742e58f02133713/ty-0.0.18-py3-none-win_arm64.whl", hash = "sha256:01770c3c82137c6b216aa3251478f0b197e181054ee92243772de553d3586398", size = 10095449, upload-time = "2026-02-20T21:51:34.914Z" }, ] +[[package]] +name = "unittest-parallel" +version = "1.7.6" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "coverage" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/08/26/b15a0337182988748210c2bcee60a780fe10057ceb23da2547ec29a1d443/unittest_parallel-1.7.6.tar.gz", hash = "sha256:b16bf52bec7b900b8fc7945de97c45f87d50025ac06c1a64e35e91c278756dfc", size = 9834, upload-time = "2025-12-01T19:17:36.599Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e3/9f/3a7d6077488e977a6da79bf51d182dd0ea441d0bb542f443d13d1806dc95/unittest_parallel-1.7.6-py3-none-any.whl", hash = "sha256:c55eff2d1f5806ec272a0f7c7ed5309197ae4550ee37cd28d3d0864a32981bfe", size = 9260, upload-time = "2025-12-01T19:17:34.849Z" }, +] + [[package]] name = "urllib3" version = "2.6.3" From ddeba888a3d03b32269f0c780490ad8578917527 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Wed, 11 Mar 2026 11:23:38 -0700 Subject: [PATCH 147/229] try no scons (#3194) * try no scons * lil more * lil more * lazy * fix ty --- .github/workflows/tests.yml | 5 - .github/workflows/update-cars-docs.yml | 1 - .gitignore | 5 - SConscript | 5 - SConstruct | 7 -- opendbc/__init__.py | 11 ++ opendbc/can/dbc.py | 30 +++-- opendbc/can/tests/__init__.py | 7 +- opendbc/dbc/SConscript | 31 ----- .../chrysler/_stellantis_common_ram.py | 15 ++- opendbc/dbc/generator/generator.py | 93 +++++++++----- .../hyundai/hyundai_kia_mando_corner_radar.py | 114 +++++++++--------- .../hyundai/hyundai_kia_mando_front_radar.py | 18 +-- .../rivian/rivian_mando_front_radar.py | 20 +-- .../dbc/generator/tesla/tesla_radar_bosch.py | 30 ++--- .../tesla/tesla_radar_continental.py | 24 ++-- opendbc/safety/tests/libsafety/SConscript | 45 ------- .../safety/tests/libsafety/libsafety_py.py | 38 +++++- opendbc/safety/tests/test.sh | 3 +- pyproject.toml | 4 - test.sh | 5 +- uv.lock | 11 -- 22 files changed, 250 insertions(+), 272 deletions(-) delete mode 100644 SConscript delete mode 100644 SConstruct delete mode 100644 opendbc/dbc/SConscript delete mode 100644 opendbc/safety/tests/libsafety/SConscript diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0e68bf79622..6846991aa71 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -49,7 +49,6 @@ jobs: - name: Run mutation tests run: | source setup.sh - scons -j8 python opendbc/safety/tests/mutation.py car_diff: @@ -61,10 +60,6 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Build opendbc - run: | - source setup.sh - scons -j8 - name: Test car diff if: github.event_name == 'pull_request' run: source setup.sh && python opendbc/car/tests/car_diff.py | tee diff.txt diff --git a/.github/workflows/update-cars-docs.yml b/.github/workflows/update-cars-docs.yml index 1d2adefc66f..57466137e8c 100644 --- a/.github/workflows/update-cars-docs.yml +++ b/.github/workflows/update-cars-docs.yml @@ -15,7 +15,6 @@ jobs: - name: Generate Car Docs run: | pip install -e . - scons -c && scons -j$(nproc) python -m pip install jinja2==3.1.4 python opendbc/car/docs.py - uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 diff --git a/.gitignore b/.gitignore index 7aebff785fa..e76e922198c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,6 @@ *.dylib .*.swp .DS_Store -.sconsign.dblite .hypothesis *.egg-info/ *.html @@ -21,14 +20,10 @@ .vscode/ __pycache__/ *.profraw -.sconf_temp/ - opendbc/can/build/ opendbc/can/obj/ -opendbc/dbc/*_generated.dbc cppcheck-addon-ctu-file-list opendbc/safety/tests/coverage-out -compile_commands.json .mull/ diff --git a/SConscript b/SConscript deleted file mode 100644 index 6e191d710cc..00000000000 --- a/SConscript +++ /dev/null @@ -1,5 +0,0 @@ -SConscript(['opendbc/dbc/SConscript']) - -# test files -if GetOption('extras'): - SConscript('opendbc/safety/tests/libsafety/SConscript') diff --git a/SConstruct b/SConstruct deleted file mode 100644 index 15289e75284..00000000000 --- a/SConstruct +++ /dev/null @@ -1,7 +0,0 @@ -AddOption('--minimal', - action='store_false', - dest='extras', - default=True, - help='the minimum build. no tests, tools, etc.') - -SConscript(['SConscript']) diff --git a/opendbc/__init__.py b/opendbc/__init__.py index 9f4ee6588bf..16b2824bb47 100644 --- a/opendbc/__init__.py +++ b/opendbc/__init__.py @@ -4,3 +4,14 @@ # -I include path for e.g. "#include " INCLUDE_PATH = os.path.abspath(os.path.join(os.path.dirname(os.path.realpath(__file__)), "../")) + +_generated_dbc_cache: dict[str, str] | None = None + +def get_generated_dbcs() -> dict[str, str]: + """Lazily generate all *_generated DBC content in memory. + Returns {name: content} where name has no .dbc extension.""" + global _generated_dbc_cache + if _generated_dbc_cache is None: + from opendbc.dbc.generator.generator import generate_all + _generated_dbc_cache = generate_all() + return _generated_dbc_cache diff --git a/opendbc/can/dbc.py b/opendbc/can/dbc.py index 4642232a356..cb8b59bbe81 100644 --- a/opendbc/can/dbc.py +++ b/opendbc/can/dbc.py @@ -4,7 +4,7 @@ from dataclasses import dataclass from functools import cache -from opendbc import DBC_PATH +from opendbc import DBC_PATH, get_generated_dbcs # TODO: these should just be passed in along with the DBC file from opendbc.car.honda.hondacan import honda_checksum @@ -77,16 +77,32 @@ class Val: @cache class DBC: def __init__(self, name: str): - dbc_path = name - if not os.path.exists(dbc_path): + if os.path.exists(name): + self._parse_file(name) + else: dbc_path = os.path.join(DBC_PATH, name + ".dbc") - - self._parse(dbc_path) - - def _parse(self, path: str): + if os.path.exists(dbc_path): + self._parse_file(dbc_path) + else: + # try in-memory generated DBC + generated = get_generated_dbcs() + content = generated.get(name) + if content is None: + raise FileNotFoundError(f"DBC not found: {name}") + self._parse_content(name, content) + + def _parse_file(self, path: str): self.name = os.path.basename(path).replace(".dbc", "") with open(path) as f: lines = f.readlines() + self._parse_lines(lines) + + def _parse_content(self, name: str, content: str): + self.name = name + lines = content.splitlines(keepends=True) + self._parse_lines(lines) + + def _parse_lines(self, lines: list[str]): checksum_state = get_checksum_state(self.name) be_bits = [j + i * 8 for i in range(64) for j in range(7, -1, -1)] diff --git a/opendbc/can/tests/__init__.py b/opendbc/can/tests/__init__.py index 3bf02fdae0e..1dd6258637b 100644 --- a/opendbc/can/tests/__init__.py +++ b/opendbc/can/tests/__init__.py @@ -1,8 +1,9 @@ import glob import os -from opendbc import DBC_PATH +from opendbc import DBC_PATH, get_generated_dbcs -ALL_DBCS = [os.path.basename(dbc).split('.')[0] for dbc in - glob.glob(f"{DBC_PATH}/*.dbc")] +static_dbcs = [os.path.basename(dbc).split('.')[0] for dbc in + glob.glob(f"{DBC_PATH}/*.dbc")] +ALL_DBCS = sorted(set(static_dbcs + list(get_generated_dbcs().keys()))) TEST_DBC = os.path.abspath(os.path.join(os.path.dirname(__file__), "test.dbc")) diff --git a/opendbc/dbc/SConscript b/opendbc/dbc/SConscript deleted file mode 100644 index 481e024bacb..00000000000 --- a/opendbc/dbc/SConscript +++ /dev/null @@ -1,31 +0,0 @@ -import os -from pathlib import Path - -env = Environment(ENV=os.environ) - -generator = File("generator/generator.py") - -source_files = [ - File(str(f)) - for f in Path("generator").rglob("*") - if f.is_file() and f.suffix in {".py", ".dbc"} -] - -output_files = [ - f.name.replace(".dbc", "_generated.dbc") - for f in Path("generator").rglob("*.dbc") - if not f.name.startswith("_") -] - -# include DBCs generated by python scripts -output_files += [ - f.name.replace(".py", "_generated.dbc") - for f in Path("generator").rglob("*.py") - if not f.name.startswith(("_", "test_")) and f.name != "generator.py" -] - -generated = env.Command( - target=list(set(output_files)), - source=[generator] + source_files, - action="python3 ${SOURCES[0]}", -) diff --git a/opendbc/dbc/generator/chrysler/_stellantis_common_ram.py b/opendbc/dbc/generator/chrysler/_stellantis_common_ram.py index fa408f1315f..2744e7feef7 100755 --- a/opendbc/dbc/generator/chrysler/_stellantis_common_ram.py +++ b/opendbc/dbc/generator/chrysler/_stellantis_common_ram.py @@ -31,13 +31,15 @@ }, } -if __name__ == "__main__": + +def generate(): src = '_stellantis_common.dbc' chrysler_path = os.path.dirname(os.path.realpath(__file__)) + result = {} for out, addr_lookup in chrysler_to_ram.items(): - with open(os.path.join(chrysler_path, src), encoding='utf-8') as in_f, open(os.path.join(chrysler_path, out), 'w', encoding='utf-8') as out_f: - out_f.write(f'CM_ "Generated from {src}"\n\n') + with open(os.path.join(chrysler_path, src), encoding='utf-8') as in_f: + parts = [f'CM_ "Generated from {src}"\n\n'] wrote_addrs = set() for line in in_f.readlines(): @@ -45,10 +47,13 @@ sl = line.split(' ') addr = int(sl[1]) wrote_addrs.add(addr) - sl[1] = str(addr_lookup.get(addr, addr)) line = ' '.join(sl) - out_f.write(line) + parts.append(line) missing_addrs = set(addr_lookup.keys()) - wrote_addrs assert len(missing_addrs) == 0, f"Missing addrs from {src}: {missing_addrs}" + + result[out] = ''.join(parts) + + return result diff --git a/opendbc/dbc/generator/generator.py b/opendbc/dbc/generator/generator.py index 187eabf018c..f8286eac1f0 100755 --- a/opendbc/dbc/generator/generator.py +++ b/opendbc/dbc/generator/generator.py @@ -1,65 +1,92 @@ #!/usr/bin/env python3 +import importlib import os import re -import glob -import subprocess +from pathlib import Path generator_path = os.path.dirname(os.path.realpath(__file__)) -opendbc_root = os.path.join(generator_path, '../') include_pattern = re.compile(r'CM_ "IMPORT (.*?)";\n') -generated_suffix = '_generated.dbc' -def read_dbc(src_dir: str, filename: str) -> str: +def _read_dbc(src_dir: str, filename: str, extra_files: dict[str, str] | None = None) -> str: + if extra_files and filename in extra_files: + return extra_files[filename] with open(os.path.join(src_dir, filename), encoding='utf-8') as file_in: return file_in.read() -def create_dbc(src_dir: str, filename: str, output_path: str): - dbc_file_in = read_dbc(src_dir, filename) - +def _create_dbc_content(src_dir: str, filename: str, extra_files: dict[str, str] | None = None) -> str: + dbc_file_in = _read_dbc(src_dir, filename, extra_files) includes = include_pattern.findall(dbc_file_in) - output_filename = filename.replace('.dbc', generated_suffix) - output_file_location = os.path.join(output_path, output_filename) + parts = ['CM_ "AUTOGENERATED FILE, DO NOT EDIT";\n'] + for include_filename in includes: + parts.append(f'\n\nCM_ "Imported file {include_filename} starts here";\n') + parts.append(_read_dbc(src_dir, include_filename, extra_files)) - with open(output_file_location, 'w', encoding='utf-8') as dbc_file_out: - dbc_file_out.write('CM_ "AUTOGENERATED FILE, DO NOT EDIT";\n') + parts.append(f'\nCM_ "{filename} starts here";\n') + core_dbc = include_pattern.sub('', dbc_file_in) + parts.append(core_dbc) - for include_filename in includes: - include_file_header = f'\n\nCM_ "Imported file {include_filename} starts here";\n' - dbc_file_out.write(include_file_header) + return ''.join(parts) - include_file = read_dbc(src_dir, include_filename) - dbc_file_out.write(include_file) - dbc_file_out.write(f'\nCM_ "{filename} starts here";\n') +def _collect_script_outputs() -> dict[str, dict[str, str]]: + """Import and call generate() from each sub-generator script. + Returns {dir_name: {filename: content}}.""" + outputs: dict[str, dict[str, str]] = {} - core_dbc = include_pattern.sub('', dbc_file_in) - dbc_file_out.write(core_dbc) + for py_file in sorted(Path(generator_path).rglob("*.py")): + if py_file.name.startswith("test_") or py_file.name == "generator.py": + continue + dir_name = py_file.parent.name + module_name = f"opendbc.dbc.generator.{dir_name}.{py_file.stem}" + mod = importlib.import_module(module_name) + if hasattr(mod, 'generate'): + outputs.setdefault(dir_name, {}).update(mod.generate()) -def create_all(output_path: str): - # clear out old DBCs - for f in glob.glob(f"{output_path}/*{generated_suffix}"): - os.remove(f) + return outputs - # run python generator scripts first - for f in glob.glob(f"{generator_path}/*/*.py"): - subprocess.check_call(f) +def generate_all() -> dict[str, str]: + """Generate all DBC content in memory. Returns {name: content} where name has no .dbc extension.""" + script_outputs = _collect_script_outputs() + + result = {} for src_dir, _, filenames in os.walk(generator_path): if src_dir == generator_path: continue - #print(src_dir) - for filename in filenames: - if filename.startswith('_') or not filename.endswith('.dbc'): - continue + dir_name = os.path.basename(src_dir) + extra = script_outputs.get(dir_name, {}) + + # all non-_ .dbc files: on-disk templates + script-generated + all_dbc_files = {f for f in filenames if f.endswith('.dbc') and not f.startswith('_')} + all_dbc_files |= {f for f in extra if not f.startswith('_')} + + for filename in sorted(all_dbc_files): + output_name = filename.replace('.dbc', '_generated') + content = _create_dbc_content(src_dir, filename, extra) + result[output_name] = content + + return result + + +def create_all(output_path: str): + """Generate all DBC files and write them to output_path (for backward compatibility).""" + import glob + generated_suffix = '_generated.dbc' + + # clear out old generated DBCs + for f in glob.glob(os.path.join(output_path, f"*{generated_suffix}")): + os.remove(f) - #print(filename) - create_dbc(src_dir, filename, output_path) + for name, content in generate_all().items(): + with open(os.path.join(output_path, name + '.dbc'), 'w', encoding='utf-8') as f: + f.write(content) if __name__ == "__main__": + opendbc_root = os.path.join(generator_path, '../') create_all(opendbc_root) diff --git a/opendbc/dbc/generator/hyundai/hyundai_kia_mando_corner_radar.py b/opendbc/dbc/generator/hyundai/hyundai_kia_mando_corner_radar.py index aad417e32ac..e8d72319394 100755 --- a/opendbc/dbc/generator/hyundai/hyundai_kia_mando_corner_radar.py +++ b/opendbc/dbc/generator/hyundai/hyundai_kia_mando_corner_radar.py @@ -1,12 +1,10 @@ #!/usr/bin/env python3 from collections import namedtuple -import os -if __name__ == "__main__": - dbc_name = os.path.basename(__file__).replace(".py", ".dbc") - hyundai_path = os.path.dirname(os.path.realpath(__file__)) - with open(os.path.join(hyundai_path, dbc_name), "w", encoding='utf-8') as f: - f.write(""" + +def generate(): + parts = [] + parts.append(""" VERSION "" @@ -45,8 +43,8 @@ BU_: XXX """) - for a in [0x100, 0x200]: - f.write(f""" + for a in [0x100, 0x200]: + parts.append(f""" BO_ {a} RADAR_POINTS_METADATA_0x{a:x}: 64 RADAR SG_ SIGNAL_1 : 0|32@1+ (1,0) [0|255] "" XXX SG_ SIGNAL_2 : 32|32@1+ (1,0) [0|65535] "" XXX @@ -108,63 +106,65 @@ SG_ SIGNAL_58 : 418|1@1+ (1,0) [0|3] "" XXX """) - # radar points are sent at 20 Hz in groups of 1 to 13 messages - # each message has 5 radar points for a total of 65 points max - # each radar point is 101 bits so the alignment is not consistent - RadarPointSignal = namedtuple("RadarPointSignal", ["name", "start", "length", "scale", "offset"]) - radar_point_signals = ( - RadarPointSignal("DISTANCE", 7, 14, 1/64, 0), - RadarPointSignal("", 21, 2, 1, 0), - RadarPointSignal("", 23, 8, 1/512, -127/512), - RadarPointSignal("REL_VELOCITY", 31, 13, 1/32, -66), - RadarPointSignal("", 44, 2, 1, 0), - RadarPointSignal("", 46, 2, 1, 0), - RadarPointSignal("AZIMUTH", 48, 12, 1/512, -2047/512), - RadarPointSignal("", 60, 2, 1, 0), - RadarPointSignal("", 62, 1, 1, 0), - RadarPointSignal("", 63, 7, 1, 0), - RadarPointSignal("", 70, 1, 1, 0), - RadarPointSignal("", 71, 6, 1, 0), - RadarPointSignal("", 77, 2, 1, 0), - RadarPointSignal("", 79, 8, 1/512, -127/512), - RadarPointSignal("", 87, 1, 1, 0), - RadarPointSignal("", 88, 2, 1, 0), - RadarPointSignal("", 90, 3, 1, 0), - # last 15 bits are controlled by LAYOUT_ID (seems to always zero, so below is layout 0) - RadarPointSignal("", 93, 6, 1, 0), - RadarPointSignal("", 99, 8, 1, 0), - RadarPointSignal("", 107, 1, 1, 0), - ) - radar_point_bit_count = sum([s.length for s in radar_point_signals]) + # radar points are sent at 20 Hz in groups of 1 to 13 messages + # each message has 5 radar points for a total of 65 points max + # each radar point is 101 bits so the alignment is not consistent + RadarPointSignal = namedtuple("RadarPointSignal", ["name", "start", "length", "scale", "offset"]) + radar_point_signals = ( + RadarPointSignal("DISTANCE", 7, 14, 1/64, 0), + RadarPointSignal("", 21, 2, 1, 0), + RadarPointSignal("", 23, 8, 1/512, -127/512), + RadarPointSignal("REL_VELOCITY", 31, 13, 1/32, -66), + RadarPointSignal("", 44, 2, 1, 0), + RadarPointSignal("", 46, 2, 1, 0), + RadarPointSignal("AZIMUTH", 48, 12, 1/512, -2047/512), + RadarPointSignal("", 60, 2, 1, 0), + RadarPointSignal("", 62, 1, 1, 0), + RadarPointSignal("", 63, 7, 1, 0), + RadarPointSignal("", 70, 1, 1, 0), + RadarPointSignal("", 71, 6, 1, 0), + RadarPointSignal("", 77, 2, 1, 0), + RadarPointSignal("", 79, 8, 1/512, -127/512), + RadarPointSignal("", 87, 1, 1, 0), + RadarPointSignal("", 88, 2, 1, 0), + RadarPointSignal("", 90, 3, 1, 0), + # last 15 bits are controlled by LAYOUT_ID (seems to always zero, so below is layout 0) + RadarPointSignal("", 93, 6, 1, 0), + RadarPointSignal("", 99, 8, 1, 0), + RadarPointSignal("", 107, 1, 1, 0), + ) + radar_point_bit_count = sum([s.length for s in radar_point_signals]) - for a in [0x101, 0x201]: - f.write(f""" + for a in [0x101, 0x201]: + parts.append(f""" BO_ {a} RADAR_POINTS_0x{a:x}: 64 RADAR SG_ MESSAGE_ID : 0|5@1+ (1,0) [0|31] "" XXX SG_ LAYOUT_ID : 5|2@1+ (1,0) [0|3] "" XXX """) - bit_idx = radar_point_signals[0].start - for i in range(5): - signal_idx = 1 - for sig in radar_point_signals: - if sig.name: - sig_name = f"POINT_{i+1}_{sig.name}" - else: - sig_name = f"POINT_{i+1}_SIGNAL_{signal_idx}" - signal_idx += 1 + bit_idx = radar_point_signals[0].start + for i in range(5): + signal_idx = 1 + for sig in radar_point_signals: + if sig.name: + sig_name = f"POINT_{i+1}_{sig.name}" + else: + sig_name = f"POINT_{i+1}_SIGNAL_{signal_idx}" + signal_idx += 1 - sig_start_idx = i * radar_point_bit_count + sig.start - assert bit_idx == sig_start_idx, f"signal overlap or gap!!! {bit_idx} != {sig_start_idx}" - min_val = round(sig.offset, 10) - max_val = round((2**sig.length - 1) * sig.scale + sig.offset, 10) + sig_start_idx = i * radar_point_bit_count + sig.start + assert bit_idx == sig_start_idx, f"signal overlap or gap!!! {bit_idx} != {sig_start_idx}" + min_val = round(sig.offset, 10) + max_val = round((2**sig.length - 1) * sig.scale + sig.offset, 10) - f.write(f" SG_ {sig_name} : {sig_start_idx}|{sig.length}@1+ ({sig.scale},{sig.offset}) [{min_val}|{max_val}] \"\" XXX\n") - bit_idx += sig.length + parts.append(f" SG_ {sig_name} : {sig_start_idx}|{sig.length}@1+ ({sig.scale},{sig.offset}) [{min_val}|{max_val}] \"\" XXX\n") + bit_idx += sig.length - # checksum is across a group of 0x100/200 and 0x101/201 messages (no checksums inside the other messages) - # ccitt_crc16 = mkCrcFun(0x11021, initCrc=0xffff, xorOut=0x0000, rev=False) - for a in [0x104, 0x204]: - f.write(f""" + # checksum is across a group of 0x100/200 and 0x101/201 messages (no checksums inside the other messages) + # ccitt_crc16 = mkCrcFun(0x11021, initCrc=0xffff, xorOut=0x0000, rev=False) + for a in [0x104, 0x204]: + parts.append(f""" BO_ {a} RADAR_POINTS_CHECKSUM_0x{a:x}: 3 RADAR SG_ CRC16 : 0|16@1+ (1,0) [0|65535] "" XXX """) + + return {"hyundai_kia_mando_corner_radar.dbc": "".join(parts)} diff --git a/opendbc/dbc/generator/hyundai/hyundai_kia_mando_front_radar.py b/opendbc/dbc/generator/hyundai/hyundai_kia_mando_front_radar.py index ee8dde64d47..78c5410cafb 100755 --- a/opendbc/dbc/generator/hyundai/hyundai_kia_mando_front_radar.py +++ b/opendbc/dbc/generator/hyundai/hyundai_kia_mando_front_radar.py @@ -1,11 +1,9 @@ #!/usr/bin/env python3 -import os -if __name__ == "__main__": - dbc_name = os.path.basename(__file__).replace(".py", ".dbc") - hyundai_path = os.path.dirname(os.path.realpath(__file__)) - with open(os.path.join(hyundai_path, dbc_name), "w", encoding='utf-8') as f: - f.write(""" + +def generate(): + parts = [] + parts.append(""" VERSION "" @@ -44,9 +42,9 @@ BU_: XXX """) - # note: 0x501/0x502 seem to be special in 0x5XX range - for a in range(0x500, 0x500 + 32): - f.write(f""" + # note: 0x501/0x502 seem to be special in 0x5XX range + for a in range(0x500, 0x500 + 32): + parts.append(f""" BO_ {a} RADAR_TRACK_{a:x}: 8 RADAR SG_ UNKNOWN_1 : 7|8@0- (1,0) [-128|127] "" XXX SG_ AZIMUTH : 12|10@0- (0.2,0) [-102.4|102.2] "" XXX @@ -59,3 +57,5 @@ SG_ REL_SPEED : 53|14@0- (0.01,0) [-81.92|81.92] "" XXX SG_ STATE_2 : 55|2@0+ (1,0) [0|3] "" XXX """) + + return {"hyundai_kia_mando_front_radar.dbc": "".join(parts)} diff --git a/opendbc/dbc/generator/rivian/rivian_mando_front_radar.py b/opendbc/dbc/generator/rivian/rivian_mando_front_radar.py index d9a89752fb2..5848d26fe72 100755 --- a/opendbc/dbc/generator/rivian/rivian_mando_front_radar.py +++ b/opendbc/dbc/generator/rivian/rivian_mando_front_radar.py @@ -1,11 +1,9 @@ #!/usr/bin/env python3 -import os -if __name__ == "__main__": - dbc_name = os.path.basename(__file__).replace(".py", ".dbc") - rivian_path = os.path.dirname(os.path.realpath(__file__)) - with open(os.path.join(rivian_path, dbc_name), "w", encoding='utf-8') as f: - f.write(""" + +def generate(): + parts = [] + parts.append(""" VERSION "" @@ -44,8 +42,8 @@ BU_: XXX """) - for a in range(0x500, 0x500 + 32): - f.write(f""" + for a in range(0x500, 0x500 + 32): + parts.append(f""" BO_ {a} RADAR_TRACK_{a:x}: 8 RADAR SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX SG_ COUNTER : 11|4@0+ (1,0) [0|15] "" XXX @@ -57,8 +55,10 @@ SG_ REL_SPEED : 53|14@0- (0.01,0) [-81.92|81.92] "m/s" XXX """) - for a in range(0x500, 0x500 + 32): - f.write(f""" + for a in range(0x500, 0x500 + 32): + parts.append(f""" VAL_ {a} STATE 0 "Empty" 1 "New" 2 "New_updated" 3 "Updated" 4 "Coasting" 7 "New_coasting" ; VAL_ {a} MODE 0 "None" 1 "SRR" 2 "LRR" 3 "SRR_and_LRR" ; """) + + return {"rivian_mando_front_radar.dbc": "".join(parts)} diff --git a/opendbc/dbc/generator/tesla/tesla_radar_bosch.py b/opendbc/dbc/generator/tesla/tesla_radar_bosch.py index 6586655ec0b..b84458325a9 100755 --- a/opendbc/dbc/generator/tesla/tesla_radar_bosch.py +++ b/opendbc/dbc/generator/tesla/tesla_radar_bosch.py @@ -1,13 +1,11 @@ #!/usr/bin/env python3 -import os from opendbc.dbc.generator.tesla._radar_common import get_radar_point_definition, get_val_definition -if __name__ == "__main__": - dbc_name = os.path.basename(__file__).replace(".py", ".dbc") - tesla_path = os.path.dirname(os.path.realpath(__file__)) - with open(os.path.join(tesla_path, dbc_name), "w", encoding='utf-8') as f: - f.write(""" + +def generate(): + parts = [] + parts.append(""" VERSION "" NS_ : @@ -133,15 +131,15 @@ SG_ unused62 : 62|2@1+ (1,0) [0|3] "" Autopilot """) - M_RANGE = range(0x310, 0x36D + 1, 3) - for i, base_id in enumerate(M_RANGE): - f.write(get_radar_point_definition(base_id, f"RadarPoint{i}")) + M_RANGE = range(0x310, 0x36D + 1, 3) + for i, base_id in enumerate(M_RANGE): + parts.append(get_radar_point_definition(base_id, f"RadarPoint{i}")) - L_RANGE = range(0x371, 0x37D + 1, 3) - for i, base_id in enumerate(L_RANGE): - f.write(get_radar_point_definition(base_id, f"ProcessedRadarPoint{i+1}")) + L_RANGE = range(0x371, 0x37D + 1, 3) + for i, base_id in enumerate(L_RANGE): + parts.append(get_radar_point_definition(base_id, f"ProcessedRadarPoint{i+1}")) - f.write(""" + parts.append(""" BO_ 697 VIN_VIP_405HS: 8 Autopilot SG_ VIN_MuxID M : 0|8@1+ (1,0) [0|0] "" Radar SG_ VIN_Part1 m16 : 47|24@0+ (1,0) [0|16777215] "" Radar @@ -278,5 +276,7 @@ VAL_ 681 Msg2A9_FourWheelDrive 3 "SNA" 2 "UNUSED" 1 "4WD" 0 "2WD" ;""") - for base_id in list(M_RANGE) + list(L_RANGE): - f.write(get_val_definition(base_id)) + for base_id in list(M_RANGE) + list(L_RANGE): + parts.append(get_val_definition(base_id)) + + return {"tesla_radar_bosch.dbc": "".join(parts)} diff --git a/opendbc/dbc/generator/tesla/tesla_radar_continental.py b/opendbc/dbc/generator/tesla/tesla_radar_continental.py index 36355d4a03b..e4468b61b7b 100755 --- a/opendbc/dbc/generator/tesla/tesla_radar_continental.py +++ b/opendbc/dbc/generator/tesla/tesla_radar_continental.py @@ -1,13 +1,11 @@ #!/usr/bin/env python3 -import os from opendbc.dbc.generator.tesla._radar_common import get_radar_point_definition, get_val_definition -if __name__ == "__main__": - dbc_name = os.path.basename(__file__).replace(".py", ".dbc") - tesla_path = os.path.dirname(os.path.realpath(__file__)) - with open(os.path.join(tesla_path, dbc_name), "w", encoding='utf-8') as f: - f.write(""" + +def generate(): + parts = [] + parts.append(""" VERSION "" NS_ : @@ -66,12 +64,14 @@ SG_ UDS_radcRequestData : 7|64@0+ (1,0) [0|1.84467e+19] "" Radar """) - POINT_RANGE = range(0x410, 0x45E + 1, 2) - for i, base_id in enumerate(POINT_RANGE): - f.write(get_radar_point_definition(base_id, f"RadarPoint{i}")) + POINT_RANGE = range(0x410, 0x45E + 1, 2) + for i, base_id in enumerate(POINT_RANGE): + parts.append(get_radar_point_definition(base_id, f"RadarPoint{i}")) - f.write(""" + parts.append(""" VAL_ 1025 lowPowerMode 1 "COMMANDED_LOW_POWER" 0 "DEFAULT_LOW_POWER" 2 "NORMAL_POWER" 3 "SNA";""") - for base_id in list(POINT_RANGE): - f.write(get_val_definition(base_id)) + for base_id in list(POINT_RANGE): + parts.append(get_val_definition(base_id)) + + return {"tesla_radar_continental.dbc": "".join(parts)} diff --git a/opendbc/safety/tests/libsafety/SConscript b/opendbc/safety/tests/libsafety/SConscript deleted file mode 100644 index 3117d985fe1..00000000000 --- a/opendbc/safety/tests/libsafety/SConscript +++ /dev/null @@ -1,45 +0,0 @@ -import os -import platform - -system = platform.system() - -env = Environment( - CFLAGS=[ - '-Wall', - "-Wextra", - '-Werror', - '-nostdlib', - '-fno-builtin', - '-std=gnu11', - '-Wfatal-errors', - '-Wno-pointer-to-int-cast', - '-g', - '-O0', - '-fno-omit-frame-pointer', - '-DALLOW_DEBUG', - ], - LINKFLAGS=[ - '-fsanitize=undefined', - '-fno-sanitize-recover=undefined', - ], - CPPPATH=["#"], - tools=["default", "compilation_db"], -) - -# add coverage if available -# Use TryCompile (not TryLink) because -nostdlib in CFLAGS breaks the link probe. -conf = Configure(env, log_file=os.devnull) -prev = env['CFLAGS'][:] -env.Append(CFLAGS=['-fprofile-arcs', '-ftest-coverage']) -has_coverage = conf.TryCompile('int x;\n', '.c') -env['CFLAGS'] = prev -if has_coverage: - env.Append(CFLAGS=['-fprofile-arcs', '-ftest-coverage']) - env.Append(LINKFLAGS=['-fprofile-arcs', '-ftest-coverage']) -env = conf.Finish() - -safety = env.SharedObject("safety.os", "safety.c") -libsafety = env.SharedLibrary("libsafety.so", [safety]) - -# GCC-style note file is generated by compiler, allow scons to clean it up -env.SideEffect("safety.gcno", safety) diff --git a/opendbc/safety/tests/libsafety/libsafety_py.py b/opendbc/safety/tests/libsafety/libsafety_py.py index be98fdab258..244c0ae6679 100644 --- a/opendbc/safety/tests/libsafety/libsafety_py.py +++ b/opendbc/safety/tests/libsafety/libsafety_py.py @@ -1,10 +1,40 @@ import os +import subprocess +import tempfile +from pathlib import Path + from cffi import FFI from opendbc.safety import LEN_TO_DLC libsafety_dir = os.path.dirname(os.path.abspath(__file__)) + +def _build_libsafety() -> str: + """Compile libsafety.so to a temp file and return its path.""" + root = str(Path(libsafety_dir).parents[3]) + safety_c = os.path.join(libsafety_dir, "safety.c") + safety_os = os.path.join(libsafety_dir, "safety.os") + + cflags = [ + '-Wall', '-Wextra', '-Werror', '-nostdlib', '-fno-builtin', + '-std=gnu11', '-Wfatal-errors', '-Wno-pointer-to-int-cast', + '-g', '-O0', '-fno-omit-frame-pointer', '-DALLOW_DEBUG', + '-fprofile-arcs', '-ftest-coverage', + ] + ldflags = [ + '-fsanitize=undefined', '-fno-sanitize-recover=undefined', + '-fprofile-arcs', '-ftest-coverage', + ] + + fd, libsafety_so = tempfile.mkstemp(suffix='.so') + os.close(fd) + + subprocess.check_call(['cc', '-fPIC', *cflags, '-I', root, '-c', safety_c, '-o', safety_os]) + subprocess.check_call(['cc', '-shared', safety_os, '-o', libsafety_so, *ldflags]) + return libsafety_so + + ffi = FFI() ffi.cdef(""" @@ -83,12 +113,18 @@ class CANPacket: class LibSafety: pass -libsafety: LibSafety = ffi.dlopen(os.path.join(libsafety_dir, "libsafety.so")) +libsafety: LibSafety def load(path): global libsafety libsafety = ffi.dlopen(str(path)) +def __getattr__(name): + if name == "libsafety": + load(_build_libsafety()) + return libsafety + raise AttributeError(name) + def make_CANPacket(addr: int, bus: int, dat): ret = ffi.new('CANPacket_t *') ret[0].extended = 1 if addr >= 0x800 else 0 diff --git a/opendbc/safety/tests/test.sh b/opendbc/safety/tests/test.sh index 83a8fb97fef..3df7eee9ace 100755 --- a/opendbc/safety/tests/test.sh +++ b/opendbc/safety/tests/test.sh @@ -6,9 +6,8 @@ cd $DIR source ../../../setup.sh -# reset coverage data and generate gcc note file +# reset coverage data rm -f ./libsafety/*.gcda -scons -j$(nproc) -D # run safety tests and generate coverage data python -m unittest discover -s . -p 'test_*.py' -t ../../../ diff --git a/pyproject.toml b/pyproject.toml index 36d5f12c33d..02e73379063 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,6 @@ requires-python = ">=3.11,<3.13" # pycapnp doesn't work with 3.13 urls = { "homepage" = "https://github.com/commaai/opendbc" } dependencies = [ - "scons", "numpy", "tqdm", "pycapnp==2.1.0", @@ -90,9 +89,6 @@ ignore = [ ] flake8-implicit-str-concat.allow-multiline=false -[tool.ruff.lint.per-file-ignores] -"site_scons/*" = ["ALL"] - [tool.ruff.lint.flake8-tidy-imports.banned-api] "numpy.mean".msg = "Sum and divide. np.mean is slow" diff --git a/test.sh b/test.sh index e81841b65d4..d7fd72b2ac5 100755 --- a/test.sh +++ b/test.sh @@ -9,13 +9,10 @@ source ./setup.sh # *** uv lockfile check *** uv lock --check -# *** build *** -scons -j8 - # *** lint + test *** lefthook run test # *** all done *** GREEN='\033[0;32m' NC='\033[0m' -printf "\n${GREEN}All good!${NC} Finished build, lint, and test in ${SECONDS}s\n" +printf "\n${GREEN}All good!${NC} Finished lint and test in ${SECONDS}s\n" diff --git a/uv.lock b/uv.lock index d92da4bf918..5b013cdd4c6 100644 --- a/uv.lock +++ b/uv.lock @@ -384,7 +384,6 @@ dependencies = [ { name = "numpy" }, { name = "pycapnp" }, { name = "pycryptodome" }, - { name = "scons" }, { name = "tqdm" }, ] @@ -428,7 +427,6 @@ requires-dist = [ { name = "pycapnp", specifier = "==2.1.0" }, { name = "pycryptodome" }, { name = "ruff", marker = "extra == 'testing'" }, - { name = "scons" }, { name = "tqdm" }, { name = "tree-sitter", marker = "extra == 'testing'" }, { name = "tree-sitter-c", marker = "extra == 'testing'" }, @@ -547,15 +545,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/6d/78/097c0798b1dab9f8affe73da9642bb4500e098cb27fd8dc9724816ac747b/ruff-0.15.2-py3-none-win_arm64.whl", hash = "sha256:cabddc5822acdc8f7b5527b36ceac55cc51eec7b1946e60181de8fe83ca8876e", size = 10941649, upload-time = "2026-02-19T22:32:18.108Z" }, ] -[[package]] -name = "scons" -version = "4.10.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/7d/c9/2f430bb39e4eccba32ce8008df4a3206df651276422204e177a09e12b30b/scons-4.10.1.tar.gz", hash = "sha256:99c0e94a42a2c1182fa6859b0be697953db07ba936ecc9817ae0d218ced20b15", size = 3258403, upload-time = "2025-11-16T22:43:39.258Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/ce/bf/931fb9fbb87234c32b8b1b1c15fba23472a10777c12043336675633809a7/scons-4.10.1-py3-none-any.whl", hash = "sha256:bd9d1c52f908d874eba92a8c0c0a8dcf2ed9f3b88ab956d0fce1da479c4e7126", size = 4136069, upload-time = "2025-11-16T22:43:35.933Z" }, -] - [[package]] name = "sortedcontainers" version = "2.4.0" From 31e816bff7a1b3531c8ff90a1f54819bebdc7098 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Wed, 11 Mar 2026 15:25:49 -0700 Subject: [PATCH 148/229] add two nice big videos to the README --- README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/README.md b/README.md index a28dbddd330..b41fb5e8f0e 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,19 @@ [![X Follow](https://img.shields.io/twitter/follow/comma_ai)](https://x.com/comma_ai) [![Discord](https://img.shields.io/discord/469524606043160576)](https://discord.comma.ai) +
+

How to Port a Car — Jason Young, COMMA_CON 2023

+ + ▶ How to Port a Car - Jason Young, COMMA_CON 2023 + +
+ +

How Do We Control The Car? — Robbe Derks, COMMA_CON 2021

+ + ▶ How Do We Control The Car? - Robbe Derks, COMMA_CON 2021 + +
+ --- From 3a852b049fb423cf57563e38b72ddd7592def221 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Wed, 11 Mar 2026 19:01:54 -0700 Subject: [PATCH 149/229] speed up safety tests with boundary-focused testing (#3200) --- lefthook.yml | 2 +- opendbc/safety/tests/common.py | 24 +++++++++++++++---- opendbc/safety/tests/test.sh | 2 +- opendbc/safety/tests/test_ford.py | 19 ++++++++++----- opendbc/safety/tests/test_toyota.py | 37 ++++++++++++++++------------- 5 files changed, 55 insertions(+), 29 deletions(-) diff --git a/lefthook.yml b/lefthook.yml index 07025ff3a7e..549c52462b4 100644 --- a/lefthook.yml +++ b/lefthook.yml @@ -27,4 +27,4 @@ test: # *** tests *** unittest: - run: unittest-parallel -j8 -s opendbc -p 'test_*.py' -t . + run: unittest-parallel -j4 diff --git a/opendbc/safety/tests/common.py b/opendbc/safety/tests/common.py index 0bfb653242d..267736cfac6 100644 --- a/opendbc/safety/tests/common.py +++ b/opendbc/safety/tests/common.py @@ -90,12 +90,25 @@ def _rx(self, msg): def _tx(self, msg): return self.safety.safety_tx_hook(msg) + @staticmethod + def _boundary_values(boundaries, min_val, max_val, step=1, width=5, sparse_count=100): + """Generate test values dense around boundaries and sparse across the full range.""" + values = set() + for b in boundaries: + for offset in range(-width, width + 1): + v = round(b + offset * step, 2) + if min_val <= v < max_val: + values.add(v) + sparse_step = max(step, (max_val - min_val) / sparse_count) + for v in np.arange(min_val, max_val, sparse_step): + values.add(round(v, 2)) + return sorted(values) + def _generic_limit_safety_check(self, msg_function: MessageFunction, min_allowed_value: float, max_allowed_value: float, min_possible_value: float, max_possible_value: float, test_delta: float = 1, inactive_value: float = 0, msg_allowed = True, additional_setup: Callable[[float], None] | None = None): """ Enforces that a signal within a message is only allowed to be sent within a specific range, min_allowed_value -> max_allowed_value. - Tests the range of min_possible_value -> max_possible_value with a delta of test_delta. Message is also only allowed to be sent when controls_allowed is true, unless the value is equal to inactive_value. Message is never allowed if msg_allowed is false, for example when stock longitudinal is enabled and you are sending acceleration requests. additional_setup is used for extra setup before each _tx, ex: for setting the previous torque for rate limits @@ -105,10 +118,11 @@ def _generic_limit_safety_check(self, msg_function: MessageFunction, min_allowed self.assertGreater(max_possible_value, max_allowed_value) self.assertLessEqual(min_possible_value, min_allowed_value) + test_values = self._boundary_values([min_allowed_value, max_allowed_value, 0, inactive_value], + min_possible_value, max_possible_value, test_delta) + for controls_allowed in [False, True]: - # enforce we don't skip over 0 or inactive - for v in np.concatenate((np.arange(min_possible_value, max_possible_value, test_delta), np.array([0, inactive_value]))): - v = round(v, 2) # floats might not hit exact boundary conditions without rounding + for v in test_values: self.safety.set_controls_allowed(controls_allowed) if additional_setup is not None: additional_setup(v) @@ -448,7 +462,7 @@ def test_against_torque_driver(self): # Cannot stay at MAX_TORQUE if above DRIVER_TORQUE_ALLOWANCE for sign in [-1, 1]: - for driver_torque in np.arange(0, self.DRIVER_TORQUE_ALLOWANCE * 2, 1): + for driver_torque in self._boundary_values([self.DRIVER_TORQUE_ALLOWANCE], 0, self.DRIVER_TORQUE_ALLOWANCE * 2): self._reset_torque_driver_measurement(-driver_torque * sign) self._set_prev_torque(max_torque * sign) should_tx = abs(driver_torque) <= self.DRIVER_TORQUE_ALLOWANCE diff --git a/opendbc/safety/tests/test.sh b/opendbc/safety/tests/test.sh index 3df7eee9ace..491b9e3f383 100755 --- a/opendbc/safety/tests/test.sh +++ b/opendbc/safety/tests/test.sh @@ -10,7 +10,7 @@ source ../../../setup.sh rm -f ./libsafety/*.gcda # run safety tests and generate coverage data -python -m unittest discover -s . -p 'test_*.py' -t ../../../ +python -m unittest discover -s . # NOTE: we accept that these tools will have slight differences, # and in return, we get to use the stock toolchain instead of diff --git a/opendbc/safety/tests/test_ford.py b/opendbc/safety/tests/test_ford.py index f8cc80e0cc8..6838d165368 100755 --- a/opendbc/safety/tests/test_ford.py +++ b/opendbc/safety/tests/test_ford.py @@ -241,16 +241,22 @@ def test_angle_measurements(self): def test_max_lateral_acceleration(self): # Ford CAN FD can achieve a higher max lateral acceleration than CAN so we limit curvature based on speed + step = 1 / self.DEG_TO_CAN for speed in np.arange(0, 40, 0.5): # Clip so we test curvature limiting at low speed due to low max curvature _, curvature_accel_limit_upper = self.get_canfd_curvature_limits(speed) curvature_accel_limit_upper = np.clip(curvature_accel_limit_upper, -self.MAX_CURVATURE, self.MAX_CURVATURE) + # Test boundary curvature values around the limit, rounded to CAN precision + lower = curvature_accel_limit_upper * 0.8 + upper = min(curvature_accel_limit_upper * 1.2, self.MAX_CURVATURE) + test_curvatures = {round(c * self.DEG_TO_CAN) / self.DEG_TO_CAN + for c in self._boundary_values([curvature_accel_limit_upper], lower, upper, step) + if 0 <= c <= self.MAX_CURVATURE} + for sign in (-1, 1): - # Test above and below the lateral by 20%, max is clipped since - # max curvature at low speed is higher than the signal max - for curvature in np.arange(curvature_accel_limit_upper * 0.8, min(curvature_accel_limit_upper * 1.2, self.MAX_CURVATURE), 1 / self.DEG_TO_CAN): - curvature = sign * round(curvature * self.DEG_TO_CAN) / self.DEG_TO_CAN # fix np rounding errors + for curvature in sorted(test_curvatures): + curvature = sign * curvature self.safety.set_controls_allowed(True) self._set_prev_desired_angle(curvature) self._reset_curvature_measurement(curvature, speed) @@ -439,11 +445,12 @@ def test_gas_safety_check(self): self.assertEqual(should_tx, self._tx(self._acc_command_msg(gas, self.INACTIVE_ACCEL, controls_allowed))) def test_brake_safety_check(self): + brake_values = self._boundary_values([self.MIN_ACCEL, self.MAX_ACCEL, self.INACTIVE_ACCEL], + self.MIN_ACCEL - 2, self.MAX_ACCEL + 2, 0.05) for controls_allowed in (True, False): self.safety.set_controls_allowed(controls_allowed) for brake_actuation in (True, False): - for brake in np.arange(self.MIN_ACCEL - 2, self.MAX_ACCEL + 2, 0.05): - brake = round(brake, 2) # floats might not hit exact boundary conditions without rounding + for brake in brake_values: should_tx = (controls_allowed and self.MIN_ACCEL <= brake <= self.MAX_ACCEL) or brake == self.INACTIVE_ACCEL should_tx = should_tx and (controls_allowed or not brake_actuation) self.assertEqual(should_tx, self._tx(self._acc_command_msg(self.INACTIVE_GAS, brake, brake_actuation))) diff --git a/opendbc/safety/tests/test_toyota.py b/opendbc/safety/tests/test_toyota.py index 35f1c2b1fe1..834a023953c 100755 --- a/opendbc/safety/tests/test_toyota.py +++ b/opendbc/safety/tests/test_toyota.py @@ -202,28 +202,33 @@ def test_lta_steer_cmd(self): should_tx = req == req2 and (torque_wind_down in (0, 100)) and not mismatch self.assertEqual(should_tx, self._tx(self._lta_msg(req, req2, angle, torque_wind_down))) - # Test max EPS torque and driver override thresholds - cases = itertools.product( - (0, self.MAX_MEAS_TORQUE - 1, self.MAX_MEAS_TORQUE, self.MAX_MEAS_TORQUE + 1, self.MAX_MEAS_TORQUE * 2), - (0, self.MAX_LTA_DRIVER_TORQUE - 1, self.MAX_LTA_DRIVER_TORQUE, self.MAX_LTA_DRIVER_TORQUE + 1, self.MAX_LTA_DRIVER_TORQUE * 2) - ) - - for eps_torque, driver_torque in cases: - for sign in (-1, 1): - for _ in range(6): - self._rx(self._torque_meas_msg(sign * eps_torque, sign * driver_torque)) - - # Toyota adds 1 to EPS torque since it is rounded after EPS factor - should_tx = (eps_torque - 1) <= self.MAX_MEAS_TORQUE and driver_torque <= self.MAX_LTA_DRIVER_TORQUE - self.assertEqual(should_tx, self._tx(self._lta_msg(1, 1, angle, 100))) - self.assertTrue(self._tx(self._lta_msg(1, 1, angle, 0))) # should tx if we wind down torque - else: # Controls not allowed for req, req2, torque_wind_down in itertools.product([0, 1], [0, 1], [0, 50, 100]): should_tx = not (req or req2) and torque_wind_down == 0 self.assertEqual(should_tx, self._tx(self._lta_msg(req, req2, angle, torque_wind_down))) + # Test max EPS torque and driver override thresholds (independent of angle, test a few representative angles) + for angle in (-89, 0, 89): + self.safety.set_controls_allowed(True) + self._reset_angle_measurement(angle) + self._set_prev_desired_angle(angle) + + cases = itertools.product( + (0, self.MAX_MEAS_TORQUE - 1, self.MAX_MEAS_TORQUE, self.MAX_MEAS_TORQUE + 1, self.MAX_MEAS_TORQUE * 2), + (0, self.MAX_LTA_DRIVER_TORQUE - 1, self.MAX_LTA_DRIVER_TORQUE, self.MAX_LTA_DRIVER_TORQUE + 1, self.MAX_LTA_DRIVER_TORQUE * 2) + ) + + for eps_torque, driver_torque in cases: + for sign in (-1, 1): + for _ in range(6): + self._rx(self._torque_meas_msg(sign * eps_torque, sign * driver_torque)) + + # Toyota adds 1 to EPS torque since it is rounded after EPS factor + should_tx = (eps_torque - 1) <= self.MAX_MEAS_TORQUE and driver_torque <= self.MAX_LTA_DRIVER_TORQUE + self.assertEqual(should_tx, self._tx(self._lta_msg(1, 1, angle, 100))) + self.assertTrue(self._tx(self._lta_msg(1, 1, angle, 0))) # should tx if we wind down torque + def test_angle_measurements(self): """ * Tests angle meas quality flag dictates whether angle measurement is parsed, and if rx is valid From e994cf5017be41e34bc81a1d959909c7bb69322e Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sat, 14 Mar 2026 13:43:12 -0700 Subject: [PATCH 150/229] remove CAN_PACKET_VERSION (#3209) --- opendbc/safety/can.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/opendbc/safety/can.h b/opendbc/safety/can.h index 205ee3a2abc..85aaf45972f 100644 --- a/opendbc/safety/can.h +++ b/opendbc/safety/can.h @@ -5,8 +5,6 @@ static const unsigned char dlc_to_len[] = {0U, 1U, 2U, 3U, 4U, 5U, 6U, 7U, 8U, 1 #define CANPACKET_HEAD_SIZE 6U // non-data portion of CANPacket_t #define CANPACKET_DATA_SIZE_MAX 64U -// bump this when changing the CAN packet -#define CAN_PACKET_VERSION 4 typedef struct { unsigned char fd : 1; unsigned char bus : 3; From 930eeb1470838796e65d423b984c954f849968c8 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sat, 14 Mar 2026 16:21:46 -0700 Subject: [PATCH 151/229] deps: switch cppcheck to a per-package release branch (#3211) --- pyproject.toml | 2 +- uv.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 02e73379063..fe70034c7d2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,7 +33,7 @@ testing = [ "lefthook", "cpplint", "codespell", - "cppcheck @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=cppcheck", + "cppcheck @ git+https://github.com/commaai/dependencies.git@release-cppcheck#subdirectory=cppcheck", ] docs = [ "Jinja2", diff --git a/uv.lock b/uv.lock index 5b013cdd4c6..75060696578 100644 --- a/uv.lock +++ b/uv.lock @@ -183,7 +183,7 @@ wheels = [ [[package]] name = "cppcheck" version = "2.16.0" -source = { git = "https://github.com/commaai/dependencies.git?subdirectory=cppcheck&rev=releases#2f738421b9b6af97bf242319a1bea68e161d9b82" } +source = { git = "https://github.com/commaai/dependencies.git?subdirectory=cppcheck&rev=release-cppcheck#0959690309f35f803ed161f774b1ce1ae1070f60" } [[package]] name = "cpplint" @@ -416,7 +416,7 @@ requires-dist = [ { name = "cffi", marker = "extra == 'testing'" }, { name = "codespell", marker = "extra == 'testing'" }, { name = "comma-car-segments", marker = "extra == 'testing'", url = "https://huggingface.co/datasets/commaai/commaCarSegments/resolve/main/dist/comma_car_segments-0.1.0-py3-none-any.whl" }, - { name = "cppcheck", marker = "extra == 'testing'", git = "https://github.com/commaai/dependencies.git?subdirectory=cppcheck&rev=releases" }, + { name = "cppcheck", marker = "extra == 'testing'", git = "https://github.com/commaai/dependencies.git?subdirectory=cppcheck&rev=release-cppcheck" }, { name = "cpplint", marker = "extra == 'testing'" }, { name = "gcovr", marker = "extra == 'testing'" }, { name = "hypothesis", marker = "extra == 'testing'", specifier = "==6.47.*" }, From 55a8f4cd864fb97925bf4b6e388684a6a217519b Mon Sep 17 00:00:00 2001 From: commaci-public <60409688+commaci-public@users.noreply.github.com> Date: Mon, 16 Mar 2026 09:32:30 -0700 Subject: [PATCH 152/229] [bot] Update uv.lock (#3164) * [bot] Update uv.lock * Fix XCP enum values for ty 0.0.23 --------- Co-authored-by: Vehicle Researcher Co-authored-by: Adeeb Shihadeh --- opendbc/car/xcp.py | 14 +-- uv.lock | 244 +++++++++++++++++++++++---------------------- 2 files changed, 131 insertions(+), 127 deletions(-) diff --git a/opendbc/car/xcp.py b/opendbc/car/xcp.py index 046df7403c3..758af553bed 100644 --- a/opendbc/car/xcp.py +++ b/opendbc/car/xcp.py @@ -86,16 +86,16 @@ class COMMAND_CODE(IntEnum): class CONNECT_MODE(IntEnum): - NORMAL = 0x00, - USER_DEFINED = 0x01, + NORMAL = 0x00 + USER_DEFINED = 0x01 class GET_ID_REQUEST_TYPE(IntEnum): - ASCII = 0x00, - ASAM_MC2_FILE = 0x01, - ASAM_MC2_PATH = 0x02, - ASAM_MC2_URL = 0x03, - ASAM_MC2_UPLOAD = 0x04, + ASCII = 0x00 + ASAM_MC2_FILE = 0x01 + ASAM_MC2_PATH = 0x02 + ASAM_MC2_URL = 0x03 + ASAM_MC2_UPLOAD = 0x04 # 128-255 user defined diff --git a/uv.lock b/uv.lock index 75060696578..fbd44302b18 100644 --- a/uv.lock +++ b/uv.lock @@ -13,11 +13,11 @@ wheels = [ [[package]] name = "certifi" -version = "2026.1.4" +version = "2026.2.25" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/e0/2d/a891ca51311197f6ad14a7ef42e2399f36cf2f9bd44752b3dc4eab60fdc5/certifi-2026.1.4.tar.gz", hash = "sha256:ac726dd470482006e014ad384921ed6438c457018f4b3d204aea4281258b2120", size = 154268, upload-time = "2026-01-04T02:42:41.825Z" } +sdist = { url = "https://files.pythonhosted.org/packages/af/2d/7bf41579a8986e348fa033a31cdd0e4121114f6bce2457e8876010b092dd/certifi-2026.2.25.tar.gz", hash = "sha256:e887ab5cee78ea814d3472169153c2d12cd43b14bd03329a39a9c6e2e80bfba7", size = 155029, upload-time = "2026-02-25T02:54:17.342Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/e6/ad/3cc14f097111b4de0040c83a525973216457bbeeb63739ef1ed275c1c021/certifi-2026.1.4-py3-none-any.whl", hash = "sha256:9943707519e4add1115f44c2bc244f782c0249876bf51b6599fee1ffbedd685c", size = 152900, upload-time = "2026-01-04T02:42:40.15Z" }, + { url = "https://files.pythonhosted.org/packages/9a/3c/c17fb3ca2d9c3acff52e30b309f538586f9f5b9c9cf454f3845fc9af4881/certifi-2026.2.25-py3-none-any.whl", hash = "sha256:027692e4402ad994f1c42e52a4997a9763c646b73e4096e4d5d6db8af1d6f0fa", size = 153684, upload-time = "2026-02-25T02:54:15.766Z" }, ] [[package]] @@ -58,52 +58,52 @@ wheels = [ [[package]] name = "charset-normalizer" -version = "3.4.4" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/13/69/33ddede1939fdd074bce5434295f38fae7136463422fe4fd3e0e89b98062/charset_normalizer-3.4.4.tar.gz", hash = "sha256:94537985111c35f28720e43603b8e7b43a6ecfb2ce1d3058bbe955b73404e21a", size = 129418, upload-time = "2025-10-14T04:42:32.879Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/ed/27/c6491ff4954e58a10f69ad90aca8a1b6fe9c5d3c6f380907af3c37435b59/charset_normalizer-3.4.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:6e1fcf0720908f200cd21aa4e6750a48ff6ce4afe7ff5a79a90d5ed8a08296f8", size = 206988, upload-time = "2025-10-14T04:40:33.79Z" }, - { url = "https://files.pythonhosted.org/packages/94/59/2e87300fe67ab820b5428580a53cad894272dbb97f38a7a814a2a1ac1011/charset_normalizer-3.4.4-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5f819d5fe9234f9f82d75bdfa9aef3a3d72c4d24a6e57aeaebba32a704553aa0", size = 147324, upload-time = "2025-10-14T04:40:34.961Z" }, - { url = "https://files.pythonhosted.org/packages/07/fb/0cf61dc84b2b088391830f6274cb57c82e4da8bbc2efeac8c025edb88772/charset_normalizer-3.4.4-cp311-cp311-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:a59cb51917aa591b1c4e6a43c132f0cdc3c76dbad6155df4e28ee626cc77a0a3", size = 142742, upload-time = "2025-10-14T04:40:36.105Z" }, - { url = "https://files.pythonhosted.org/packages/62/8b/171935adf2312cd745d290ed93cf16cf0dfe320863ab7cbeeae1dcd6535f/charset_normalizer-3.4.4-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:8ef3c867360f88ac904fd3f5e1f902f13307af9052646963ee08ff4f131adafc", size = 160863, upload-time = "2025-10-14T04:40:37.188Z" }, - { url = "https://files.pythonhosted.org/packages/09/73/ad875b192bda14f2173bfc1bc9a55e009808484a4b256748d931b6948442/charset_normalizer-3.4.4-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:d9e45d7faa48ee908174d8fe84854479ef838fc6a705c9315372eacbc2f02897", size = 157837, upload-time = "2025-10-14T04:40:38.435Z" }, - { url = "https://files.pythonhosted.org/packages/6d/fc/de9cce525b2c5b94b47c70a4b4fb19f871b24995c728e957ee68ab1671ea/charset_normalizer-3.4.4-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:840c25fb618a231545cbab0564a799f101b63b9901f2569faecd6b222ac72381", size = 151550, upload-time = "2025-10-14T04:40:40.053Z" }, - { url = "https://files.pythonhosted.org/packages/55/c2/43edd615fdfba8c6f2dfbd459b25a6b3b551f24ea21981e23fb768503ce1/charset_normalizer-3.4.4-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:ca5862d5b3928c4940729dacc329aa9102900382fea192fc5e52eb69d6093815", size = 149162, upload-time = "2025-10-14T04:40:41.163Z" }, - { url = "https://files.pythonhosted.org/packages/03/86/bde4ad8b4d0e9429a4e82c1e8f5c659993a9a863ad62c7df05cf7b678d75/charset_normalizer-3.4.4-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:d9c7f57c3d666a53421049053eaacdd14bbd0a528e2186fcb2e672effd053bb0", size = 150019, upload-time = "2025-10-14T04:40:42.276Z" }, - { url = "https://files.pythonhosted.org/packages/1f/86/a151eb2af293a7e7bac3a739b81072585ce36ccfb4493039f49f1d3cae8c/charset_normalizer-3.4.4-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:277e970e750505ed74c832b4bf75dac7476262ee2a013f5574dd49075879e161", size = 143310, upload-time = "2025-10-14T04:40:43.439Z" }, - { url = "https://files.pythonhosted.org/packages/b5/fe/43dae6144a7e07b87478fdfc4dbe9efd5defb0e7ec29f5f58a55aeef7bf7/charset_normalizer-3.4.4-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:31fd66405eaf47bb62e8cd575dc621c56c668f27d46a61d975a249930dd5e2a4", size = 162022, upload-time = "2025-10-14T04:40:44.547Z" }, - { url = "https://files.pythonhosted.org/packages/80/e6/7aab83774f5d2bca81f42ac58d04caf44f0cc2b65fc6db2b3b2e8a05f3b3/charset_normalizer-3.4.4-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:0d3d8f15c07f86e9ff82319b3d9ef6f4bf907608f53fe9d92b28ea9ae3d1fd89", size = 149383, upload-time = "2025-10-14T04:40:46.018Z" }, - { url = "https://files.pythonhosted.org/packages/4f/e8/b289173b4edae05c0dde07f69f8db476a0b511eac556dfe0d6bda3c43384/charset_normalizer-3.4.4-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:9f7fcd74d410a36883701fafa2482a6af2ff5ba96b9a620e9e0721e28ead5569", size = 159098, upload-time = "2025-10-14T04:40:47.081Z" }, - { url = "https://files.pythonhosted.org/packages/d8/df/fe699727754cae3f8478493c7f45f777b17c3ef0600e28abfec8619eb49c/charset_normalizer-3.4.4-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:ebf3e58c7ec8a8bed6d66a75d7fb37b55e5015b03ceae72a8e7c74495551e224", size = 152991, upload-time = "2025-10-14T04:40:48.246Z" }, - { url = "https://files.pythonhosted.org/packages/1a/86/584869fe4ddb6ffa3bd9f491b87a01568797fb9bd8933f557dba9771beaf/charset_normalizer-3.4.4-cp311-cp311-win32.whl", hash = "sha256:eecbc200c7fd5ddb9a7f16c7decb07b566c29fa2161a16cf67b8d068bd21690a", size = 99456, upload-time = "2025-10-14T04:40:49.376Z" }, - { url = "https://files.pythonhosted.org/packages/65/f6/62fdd5feb60530f50f7e38b4f6a1d5203f4d16ff4f9f0952962c044e919a/charset_normalizer-3.4.4-cp311-cp311-win_amd64.whl", hash = "sha256:5ae497466c7901d54b639cf42d5b8c1b6a4fead55215500d2f486d34db48d016", size = 106978, upload-time = "2025-10-14T04:40:50.844Z" }, - { url = "https://files.pythonhosted.org/packages/7a/9d/0710916e6c82948b3be62d9d398cb4fcf4e97b56d6a6aeccd66c4b2f2bd5/charset_normalizer-3.4.4-cp311-cp311-win_arm64.whl", hash = "sha256:65e2befcd84bc6f37095f5961e68a6f077bf44946771354a28ad434c2cce0ae1", size = 99969, upload-time = "2025-10-14T04:40:52.272Z" }, - { url = "https://files.pythonhosted.org/packages/f3/85/1637cd4af66fa687396e757dec650f28025f2a2f5a5531a3208dc0ec43f2/charset_normalizer-3.4.4-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:0a98e6759f854bd25a58a73fa88833fba3b7c491169f86ce1180c948ab3fd394", size = 208425, upload-time = "2025-10-14T04:40:53.353Z" }, - { url = "https://files.pythonhosted.org/packages/9d/6a/04130023fef2a0d9c62d0bae2649b69f7b7d8d24ea5536feef50551029df/charset_normalizer-3.4.4-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b5b290ccc2a263e8d185130284f8501e3e36c5e02750fc6b6bdeb2e9e96f1e25", size = 148162, upload-time = "2025-10-14T04:40:54.558Z" }, - { url = "https://files.pythonhosted.org/packages/78/29/62328d79aa60da22c9e0b9a66539feae06ca0f5a4171ac4f7dc285b83688/charset_normalizer-3.4.4-cp312-cp312-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:74bb723680f9f7a6234dcf67aea57e708ec1fbdf5699fb91dfd6f511b0a320ef", size = 144558, upload-time = "2025-10-14T04:40:55.677Z" }, - { url = "https://files.pythonhosted.org/packages/86/bb/b32194a4bf15b88403537c2e120b817c61cd4ecffa9b6876e941c3ee38fe/charset_normalizer-3.4.4-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:f1e34719c6ed0b92f418c7c780480b26b5d9c50349e9a9af7d76bf757530350d", size = 161497, upload-time = "2025-10-14T04:40:57.217Z" }, - { url = "https://files.pythonhosted.org/packages/19/89/a54c82b253d5b9b111dc74aca196ba5ccfcca8242d0fb64146d4d3183ff1/charset_normalizer-3.4.4-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:2437418e20515acec67d86e12bf70056a33abdacb5cb1655042f6538d6b085a8", size = 159240, upload-time = "2025-10-14T04:40:58.358Z" }, - { url = "https://files.pythonhosted.org/packages/c0/10/d20b513afe03acc89ec33948320a5544d31f21b05368436d580dec4e234d/charset_normalizer-3.4.4-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:11d694519d7f29d6cd09f6ac70028dba10f92f6cdd059096db198c283794ac86", size = 153471, upload-time = "2025-10-14T04:40:59.468Z" }, - { url = "https://files.pythonhosted.org/packages/61/fa/fbf177b55bdd727010f9c0a3c49eefa1d10f960e5f09d1d887bf93c2e698/charset_normalizer-3.4.4-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:ac1c4a689edcc530fc9d9aa11f5774b9e2f33f9a0c6a57864e90908f5208d30a", size = 150864, upload-time = "2025-10-14T04:41:00.623Z" }, - { url = "https://files.pythonhosted.org/packages/05/12/9fbc6a4d39c0198adeebbde20b619790e9236557ca59fc40e0e3cebe6f40/charset_normalizer-3.4.4-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:21d142cc6c0ec30d2efee5068ca36c128a30b0f2c53c1c07bd78cb6bc1d3be5f", size = 150647, upload-time = "2025-10-14T04:41:01.754Z" }, - { url = "https://files.pythonhosted.org/packages/ad/1f/6a9a593d52e3e8c5d2b167daf8c6b968808efb57ef4c210acb907c365bc4/charset_normalizer-3.4.4-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:5dbe56a36425d26d6cfb40ce79c314a2e4dd6211d51d6d2191c00bed34f354cc", size = 145110, upload-time = "2025-10-14T04:41:03.231Z" }, - { url = "https://files.pythonhosted.org/packages/30/42/9a52c609e72471b0fc54386dc63c3781a387bb4fe61c20231a4ebcd58bdd/charset_normalizer-3.4.4-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:5bfbb1b9acf3334612667b61bd3002196fe2a1eb4dd74d247e0f2a4d50ec9bbf", size = 162839, upload-time = "2025-10-14T04:41:04.715Z" }, - { url = "https://files.pythonhosted.org/packages/c4/5b/c0682bbf9f11597073052628ddd38344a3d673fda35a36773f7d19344b23/charset_normalizer-3.4.4-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:d055ec1e26e441f6187acf818b73564e6e6282709e9bcb5b63f5b23068356a15", size = 150667, upload-time = "2025-10-14T04:41:05.827Z" }, - { url = "https://files.pythonhosted.org/packages/e4/24/a41afeab6f990cf2daf6cb8c67419b63b48cf518e4f56022230840c9bfb2/charset_normalizer-3.4.4-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:af2d8c67d8e573d6de5bc30cdb27e9b95e49115cd9baad5ddbd1a6207aaa82a9", size = 160535, upload-time = "2025-10-14T04:41:06.938Z" }, - { url = "https://files.pythonhosted.org/packages/2a/e5/6a4ce77ed243c4a50a1fecca6aaaab419628c818a49434be428fe24c9957/charset_normalizer-3.4.4-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:780236ac706e66881f3b7f2f32dfe90507a09e67d1d454c762cf642e6e1586e0", size = 154816, upload-time = "2025-10-14T04:41:08.101Z" }, - { url = "https://files.pythonhosted.org/packages/a8/ef/89297262b8092b312d29cdb2517cb1237e51db8ecef2e9af5edbe7b683b1/charset_normalizer-3.4.4-cp312-cp312-win32.whl", hash = "sha256:5833d2c39d8896e4e19b689ffc198f08ea58116bee26dea51e362ecc7cd3ed26", size = 99694, upload-time = "2025-10-14T04:41:09.23Z" }, - { url = "https://files.pythonhosted.org/packages/3d/2d/1e5ed9dd3b3803994c155cd9aacb60c82c331bad84daf75bcb9c91b3295e/charset_normalizer-3.4.4-cp312-cp312-win_amd64.whl", hash = "sha256:a79cfe37875f822425b89a82333404539ae63dbdddf97f84dcbc3d339aae9525", size = 107131, upload-time = "2025-10-14T04:41:10.467Z" }, - { url = "https://files.pythonhosted.org/packages/d0/d9/0ed4c7098a861482a7b6a95603edce4c0d9db2311af23da1fb2b75ec26fc/charset_normalizer-3.4.4-cp312-cp312-win_arm64.whl", hash = "sha256:376bec83a63b8021bb5c8ea75e21c4ccb86e7e45ca4eb81146091b56599b80c3", size = 100390, upload-time = "2025-10-14T04:41:11.915Z" }, - { url = "https://files.pythonhosted.org/packages/0a/4c/925909008ed5a988ccbb72dcc897407e5d6d3bd72410d69e051fc0c14647/charset_normalizer-3.4.4-py3-none-any.whl", hash = "sha256:7a32c560861a02ff789ad905a2fe94e3f840803362c84fecf1851cb4cf3dc37f", size = 53402, upload-time = "2025-10-14T04:42:31.76Z" }, +version = "3.4.6" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/7b/60/e3bec1881450851b087e301bedc3daa9377a4d45f1c26aa90b0b235e38aa/charset_normalizer-3.4.6.tar.gz", hash = "sha256:1ae6b62897110aa7c79ea2f5dd38d1abca6db663687c0b1ad9aed6f6bae3d9d6", size = 143363, upload-time = "2026-03-15T18:53:25.478Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/62/28/ff6f234e628a2de61c458be2779cb182bc03f6eec12200d4a525bbfc9741/charset_normalizer-3.4.6-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:82060f995ab5003a2d6e0f4ad29065b7672b6593c8c63559beefe5b443242c3e", size = 293582, upload-time = "2026-03-15T18:50:25.454Z" }, + { url = "https://files.pythonhosted.org/packages/1c/b7/b1a117e5385cbdb3205f6055403c2a2a220c5ea80b8716c324eaf75c5c95/charset_normalizer-3.4.6-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:60c74963d8350241a79cb8feea80e54d518f72c26db618862a8f53e5023deaf9", size = 197240, upload-time = "2026-03-15T18:50:27.196Z" }, + { url = "https://files.pythonhosted.org/packages/a1/5f/2574f0f09f3c3bc1b2f992e20bce6546cb1f17e111c5be07308dc5427956/charset_normalizer-3.4.6-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:f6e4333fb15c83f7d1482a76d45a0818897b3d33f00efd215528ff7c51b8e35d", size = 217363, upload-time = "2026-03-15T18:50:28.601Z" }, + { url = "https://files.pythonhosted.org/packages/4a/d1/0ae20ad77bc949ddd39b51bf383b6ca932f2916074c95cad34ae465ab71f/charset_normalizer-3.4.6-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:bc72863f4d9aba2e8fd9085e63548a324ba706d2ea2c83b260da08a59b9482de", size = 212994, upload-time = "2026-03-15T18:50:30.102Z" }, + { url = "https://files.pythonhosted.org/packages/60/ac/3233d262a310c1b12633536a07cde5ddd16985e6e7e238e9f3f9423d8eb9/charset_normalizer-3.4.6-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9cc4fc6c196d6a8b76629a70ddfcd4635a6898756e2d9cac5565cf0654605d73", size = 204697, upload-time = "2026-03-15T18:50:31.654Z" }, + { url = "https://files.pythonhosted.org/packages/25/3c/8a18fc411f085b82303cfb7154eed5bd49c77035eb7608d049468b53f87c/charset_normalizer-3.4.6-cp311-cp311-manylinux_2_31_armv7l.whl", hash = "sha256:0c173ce3a681f309f31b87125fecec7a5d1347261ea11ebbb856fa6006b23c8c", size = 191673, upload-time = "2026-03-15T18:50:33.433Z" }, + { url = "https://files.pythonhosted.org/packages/ff/a7/11cfe61d6c5c5c7438d6ba40919d0306ed83c9ab957f3d4da2277ff67836/charset_normalizer-3.4.6-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:c907cdc8109f6c619e6254212e794d6548373cc40e1ec75e6e3823d9135d29cc", size = 201120, upload-time = "2026-03-15T18:50:35.105Z" }, + { url = "https://files.pythonhosted.org/packages/b5/10/cf491fa1abd47c02f69687046b896c950b92b6cd7337a27e6548adbec8e4/charset_normalizer-3.4.6-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:404a1e552cf5b675a87f0651f8b79f5f1e6fd100ee88dc612f89aa16abd4486f", size = 200911, upload-time = "2026-03-15T18:50:36.819Z" }, + { url = "https://files.pythonhosted.org/packages/28/70/039796160b48b18ed466fde0af84c1b090c4e288fae26cd674ad04a2d703/charset_normalizer-3.4.6-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:e3c701e954abf6fc03a49f7c579cc80c2c6cc52525340ca3186c41d3f33482ef", size = 192516, upload-time = "2026-03-15T18:50:38.228Z" }, + { url = "https://files.pythonhosted.org/packages/ff/34/c56f3223393d6ff3124b9e78f7de738047c2d6bc40a4f16ac0c9d7a1cb3c/charset_normalizer-3.4.6-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:7a6967aaf043bceabab5412ed6bd6bd26603dae84d5cb75bf8d9a74a4959d398", size = 218795, upload-time = "2026-03-15T18:50:39.664Z" }, + { url = "https://files.pythonhosted.org/packages/e8/3b/ce2d4f86c5282191a041fdc5a4ce18f1c6bd40a5bd1f74cf8625f08d51c1/charset_normalizer-3.4.6-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:5feb91325bbceade6afab43eb3b508c63ee53579fe896c77137ded51c6b6958e", size = 201833, upload-time = "2026-03-15T18:50:41.552Z" }, + { url = "https://files.pythonhosted.org/packages/3b/9b/b6a9f76b0fd7c5b5ec58b228ff7e85095370282150f0bd50b3126f5506d6/charset_normalizer-3.4.6-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:f820f24b09e3e779fe84c3c456cb4108a7aa639b0d1f02c28046e11bfcd088ed", size = 213920, upload-time = "2026-03-15T18:50:43.33Z" }, + { url = "https://files.pythonhosted.org/packages/ae/98/7bc23513a33d8172365ed30ee3a3b3fe1ece14a395e5fc94129541fc6003/charset_normalizer-3.4.6-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:b35b200d6a71b9839a46b9b7fff66b6638bb52fc9658aa58796b0326595d3021", size = 206951, upload-time = "2026-03-15T18:50:44.789Z" }, + { url = "https://files.pythonhosted.org/packages/32/73/c0b86f3d1458468e11aec870e6b3feac931facbe105a894b552b0e518e79/charset_normalizer-3.4.6-cp311-cp311-win32.whl", hash = "sha256:9ca4c0b502ab399ef89248a2c84c54954f77a070f28e546a85e91da627d1301e", size = 143703, upload-time = "2026-03-15T18:50:46.103Z" }, + { url = "https://files.pythonhosted.org/packages/c6/e3/76f2facfe8eddee0bbd38d2594e709033338eae44ebf1738bcefe0a06185/charset_normalizer-3.4.6-cp311-cp311-win_amd64.whl", hash = "sha256:a9e68c9d88823b274cf1e72f28cb5dc89c990edf430b0bfd3e2fb0785bfeabf4", size = 153857, upload-time = "2026-03-15T18:50:47.563Z" }, + { url = "https://files.pythonhosted.org/packages/e2/dc/9abe19c9b27e6cd3636036b9d1b387b78c40dedbf0b47f9366737684b4b0/charset_normalizer-3.4.6-cp311-cp311-win_arm64.whl", hash = "sha256:97d0235baafca5f2b09cf332cc275f021e694e8362c6bb9c96fc9a0eb74fc316", size = 142751, upload-time = "2026-03-15T18:50:49.234Z" }, + { url = "https://files.pythonhosted.org/packages/e5/62/c0815c992c9545347aeea7859b50dc9044d147e2e7278329c6e02ac9a616/charset_normalizer-3.4.6-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:2ef7fedc7a6ecbe99969cd09632516738a97eeb8bd7258bf8a0f23114c057dab", size = 295154, upload-time = "2026-03-15T18:50:50.88Z" }, + { url = "https://files.pythonhosted.org/packages/a8/37/bdca6613c2e3c58c7421891d80cc3efa1d32e882f7c4a7ee6039c3fc951a/charset_normalizer-3.4.6-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a4ea868bc28109052790eb2b52a9ab33f3aa7adc02f96673526ff47419490e21", size = 199191, upload-time = "2026-03-15T18:50:52.658Z" }, + { url = "https://files.pythonhosted.org/packages/6c/92/9934d1bbd69f7f398b38c5dae1cbf9cc672e7c34a4adf7b17c0a9c17d15d/charset_normalizer-3.4.6-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:836ab36280f21fc1a03c99cd05c6b7af70d2697e374c7af0b61ed271401a72a2", size = 218674, upload-time = "2026-03-15T18:50:54.102Z" }, + { url = "https://files.pythonhosted.org/packages/af/90/25f6ab406659286be929fd89ab0e78e38aa183fc374e03aa3c12d730af8a/charset_normalizer-3.4.6-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:f1ce721c8a7dfec21fcbdfe04e8f68174183cf4e8188e0645e92aa23985c57ff", size = 215259, upload-time = "2026-03-15T18:50:55.616Z" }, + { url = "https://files.pythonhosted.org/packages/4e/ef/79a463eb0fff7f96afa04c1d4c51f8fc85426f918db467854bfb6a569ce3/charset_normalizer-3.4.6-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0e28d62a8fc7a1fa411c43bd65e346f3bce9716dc51b897fbe930c5987b402d5", size = 207276, upload-time = "2026-03-15T18:50:57.054Z" }, + { url = "https://files.pythonhosted.org/packages/f7/72/d0426afec4b71dc159fa6b4e68f868cd5a3ecd918fec5813a15d292a7d10/charset_normalizer-3.4.6-cp312-cp312-manylinux_2_31_armv7l.whl", hash = "sha256:530d548084c4a9f7a16ed4a294d459b4f229db50df689bfe92027452452943a0", size = 195161, upload-time = "2026-03-15T18:50:58.686Z" }, + { url = "https://files.pythonhosted.org/packages/bf/18/c82b06a68bfcb6ce55e508225d210c7e6a4ea122bfc0748892f3dc4e8e11/charset_normalizer-3.4.6-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:30f445ae60aad5e1f8bdbb3108e39f6fbc09f4ea16c815c66578878325f8f15a", size = 203452, upload-time = "2026-03-15T18:51:00.196Z" }, + { url = "https://files.pythonhosted.org/packages/44/d6/0c25979b92f8adafdbb946160348d8d44aa60ce99afdc27df524379875cb/charset_normalizer-3.4.6-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:ac2393c73378fea4e52aa56285a3d64be50f1a12395afef9cce47772f60334c2", size = 202272, upload-time = "2026-03-15T18:51:01.703Z" }, + { url = "https://files.pythonhosted.org/packages/2e/3d/7fea3e8fe84136bebbac715dd1221cc25c173c57a699c030ab9b8900cbb7/charset_normalizer-3.4.6-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:90ca27cd8da8118b18a52d5f547859cc1f8354a00cd1e8e5120df3e30d6279e5", size = 195622, upload-time = "2026-03-15T18:51:03.526Z" }, + { url = "https://files.pythonhosted.org/packages/57/8a/d6f7fd5cb96c58ef2f681424fbca01264461336d2a7fc875e4446b1f1346/charset_normalizer-3.4.6-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:8e5a94886bedca0f9b78fecd6afb6629142fd2605aa70a125d49f4edc6037ee6", size = 220056, upload-time = "2026-03-15T18:51:05.269Z" }, + { url = "https://files.pythonhosted.org/packages/16/50/478cdda782c8c9c3fb5da3cc72dd7f331f031e7f1363a893cdd6ca0f8de0/charset_normalizer-3.4.6-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:695f5c2823691a25f17bc5d5ffe79fa90972cc34b002ac6c843bb8a1720e950d", size = 203751, upload-time = "2026-03-15T18:51:06.858Z" }, + { url = "https://files.pythonhosted.org/packages/75/fc/cc2fcac943939c8e4d8791abfa139f685e5150cae9f94b60f12520feaa9b/charset_normalizer-3.4.6-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:231d4da14bcd9301310faf492051bee27df11f2bc7549bc0bb41fef11b82daa2", size = 216563, upload-time = "2026-03-15T18:51:08.564Z" }, + { url = "https://files.pythonhosted.org/packages/a8/b7/a4add1d9a5f68f3d037261aecca83abdb0ab15960a3591d340e829b37298/charset_normalizer-3.4.6-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:a056d1ad2633548ca18ffa2f85c202cfb48b68615129143915b8dc72a806a923", size = 209265, upload-time = "2026-03-15T18:51:10.312Z" }, + { url = "https://files.pythonhosted.org/packages/6c/18/c094561b5d64a24277707698e54b7f67bd17a4f857bbfbb1072bba07c8bf/charset_normalizer-3.4.6-cp312-cp312-win32.whl", hash = "sha256:c2274ca724536f173122f36c98ce188fd24ce3dad886ec2b7af859518ce008a4", size = 144229, upload-time = "2026-03-15T18:51:11.694Z" }, + { url = "https://files.pythonhosted.org/packages/ab/20/0567efb3a8fd481b8f34f739ebddc098ed062a59fed41a8d193a61939e8f/charset_normalizer-3.4.6-cp312-cp312-win_amd64.whl", hash = "sha256:c8ae56368f8cc97c7e40a7ee18e1cedaf8e780cd8bc5ed5ac8b81f238614facb", size = 154277, upload-time = "2026-03-15T18:51:13.004Z" }, + { url = "https://files.pythonhosted.org/packages/15/57/28d79b44b51933119e21f65479d0864a8d5893e494cf5daab15df0247c17/charset_normalizer-3.4.6-cp312-cp312-win_arm64.whl", hash = "sha256:899d28f422116b08be5118ef350c292b36fc15ec2daeb9ea987c89281c7bb5c4", size = 142817, upload-time = "2026-03-15T18:51:14.408Z" }, + { url = "https://files.pythonhosted.org/packages/2a/68/687187c7e26cb24ccbd88e5069f5ef00eba804d36dde11d99aad0838ab45/charset_normalizer-3.4.6-py3-none-any.whl", hash = "sha256:947cf925bc916d90adba35a64c82aace04fa39b46b52d4630ece166655905a69", size = 61455, upload-time = "2026-03-15T18:53:23.833Z" }, ] [[package]] name = "codespell" -version = "2.4.1" +version = "2.4.2" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/15/e0/709453393c0ea77d007d907dd436b3ee262e28b30995ea1aa36c6ffbccaf/codespell-2.4.1.tar.gz", hash = "sha256:299fcdcb09d23e81e35a671bbe746d5ad7e8385972e65dbb833a2eaac33c01e5", size = 344740, upload-time = "2025-01-28T18:52:39.411Z" } +sdist = { url = "https://files.pythonhosted.org/packages/2d/9d/1d0903dff693160f893ca6abcabad545088e7a2ee0a6deae7c24e958be69/codespell-2.4.2.tar.gz", hash = "sha256:3c33be9ae34543807f088aeb4832dfad8cb2dae38da61cac0a7045dd376cfdf3", size = 352058, upload-time = "2026-03-05T18:10:42.936Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/20/01/b394922252051e97aab231d416c86da3d8a6d781eeadcdca1082867de64e/codespell-2.4.1-py3-none-any.whl", hash = "sha256:3dadafa67df7e4a3dbf51e0d7315061b80d265f9552ebd699b3dd6834b47e425", size = 344501, upload-time = "2025-01-28T18:52:37.057Z" }, + { url = "https://files.pythonhosted.org/packages/42/a1/52fa05533e95fe45bcc09bcf8a503874b1c08f221a4e35608017e0938f55/codespell-2.4.2-py3-none-any.whl", hash = "sha256:97e0c1060cf46bd1d5db89a936c98db8c2b804e1fdd4b5c645e82a1ec6b1f886", size = 353715, upload-time = "2026-03-05T18:10:41.398Z" }, ] [[package]] @@ -254,11 +254,15 @@ wheels = [ [[package]] name = "lefthook" -version = "2.0.15" +version = "2.1.4" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/7c/8f/e90724128f481c637b7e9343b6535622cfa136541959a49f8a3de0d0e7a5/lefthook-2.0.15.tar.gz", hash = "sha256:8a32c9f2d44f0ff0f3e3ab48f9802ca10f1222b491f3f14e03f577ec175b6649", size = 50175274, upload-time = "2026-01-13T10:02:58.76Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/7c/d5/243d967f541d422a7252f92dbcc201cfd588bd404a66935baacc83be49c5/lefthook-2.0.15-py3-none-any.whl", hash = "sha256:54b174520f18a4fa2545ff1e5eae4c4d2515539fb25b8c4fe04b9224a2ff07ee", size = 50416709, upload-time = "2026-01-13T10:02:55.761Z" }, + { url = "https://files.pythonhosted.org/packages/3c/c1/0e76e13ff1cc52e6dcf295d6b1d9ea18eb7b48bda54075cbdcc0aa6df20c/lefthook-2.1.4-py3-none-macosx_10_15_x86_64.whl", hash = "sha256:f1dc03042222ee7f1ee7dbbae7ee3046beb9a12ebdfae09bca1107c19c1be988", size = 5432992, upload-time = "2026-03-12T07:25:17.326Z" }, + { url = "https://files.pythonhosted.org/packages/53/73/93f1a67afac0fa97c38004c43eb14df97414b6d3b4b0069b6d2b96b9de10/lefthook-2.1.4-py3-none-macosx_11_0_arm64.whl", hash = "sha256:a8db48e35307394cf0277d199b3b5a541324308642a16c3b3a9de688d64e165d", size = 4957289, upload-time = "2026-03-12T07:25:26.561Z" }, + { url = "https://files.pythonhosted.org/packages/03/70/2b5641a32f4ae7f31f38d67e987c4943d1f0ec401395e779c03dbca2484b/lefthook-2.1.4-py3-none-manylinux_2_17_aarch64.whl", hash = "sha256:31300ac6bde3512a62252da4c6e0685b5c5d0adefb5dfa1f7f5e1f0aea63ba8b", size = 4785792, upload-time = "2026-03-12T07:25:21.731Z" }, + { url = "https://files.pythonhosted.org/packages/8d/58/b6253c7ba669ecb21300c03ba0342e30392d2a22d3d54a7dfa398beb5bcd/lefthook-2.1.4-py3-none-manylinux_2_17_x86_64.whl", hash = "sha256:9b4e34d5771bb4484e10df644ad0bb3e348ac026d8c2305b9a151e932fc3e2b8", size = 5359026, upload-time = "2026-03-12T07:25:23.372Z" }, + { url = "https://files.pythonhosted.org/packages/a0/d2/a9ae9afe0b728b4eae171c5f95b1f57d213154533fbfb0cbb9281c3c60e9/lefthook-2.1.4-py3-none-win_amd64.whl", hash = "sha256:d8ae5640d4393e460d00f9b53cc60c9f8112b6194c1d85efd9cad9682e1e91ac", size = 5509363, upload-time = "2026-03-12T07:25:24.961Z" }, + { url = "https://files.pythonhosted.org/packages/2a/44/ab9d096f758f8de7e45a80eb5b49a60dbb5b12de20df308489cc4738ed50/lefthook-2.1.4-py3-none-win_arm64.whl", hash = "sha256:8c7ae0094d8d946cab0fd7977a9cd935a4c2d302401a561ab64bb175c6b5eb9d", size = 4862370, upload-time = "2026-03-12T07:25:19.554Z" }, ] [[package]] @@ -341,39 +345,39 @@ wheels = [ [[package]] name = "numpy" -version = "2.4.2" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/57/fd/0005efbd0af48e55eb3c7208af93f2862d4b1a56cd78e84309a2d959208d/numpy-2.4.2.tar.gz", hash = "sha256:659a6107e31a83c4e33f763942275fd278b21d095094044eb35569e86a21ddae", size = 20723651, upload-time = "2026-01-31T23:13:10.135Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/d3/44/71852273146957899753e69986246d6a176061ea183407e95418c2aa4d9a/numpy-2.4.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:e7e88598032542bd49af7c4747541422884219056c268823ef6e5e89851c8825", size = 16955478, upload-time = "2026-01-31T23:10:25.623Z" }, - { url = "https://files.pythonhosted.org/packages/74/41/5d17d4058bd0cd96bcbd4d9ff0fb2e21f52702aab9a72e4a594efa18692f/numpy-2.4.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:7edc794af8b36ca37ef5fcb5e0d128c7e0595c7b96a2318d1badb6fcd8ee86b1", size = 14965467, upload-time = "2026-01-31T23:10:28.186Z" }, - { url = "https://files.pythonhosted.org/packages/49/48/fb1ce8136c19452ed15f033f8aee91d5defe515094e330ce368a0647846f/numpy-2.4.2-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:6e9f61981ace1360e42737e2bae58b27bf28a1b27e781721047d84bd754d32e7", size = 5475172, upload-time = "2026-01-31T23:10:30.848Z" }, - { url = "https://files.pythonhosted.org/packages/40/a9/3feb49f17bbd1300dd2570432961f5c8a4ffeff1db6f02c7273bd020a4c9/numpy-2.4.2-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:cb7bbb88aa74908950d979eeaa24dbdf1a865e3c7e45ff0121d8f70387b55f73", size = 6805145, upload-time = "2026-01-31T23:10:32.352Z" }, - { url = "https://files.pythonhosted.org/packages/3f/39/fdf35cbd6d6e2fcad42fcf85ac04a85a0d0fbfbf34b30721c98d602fd70a/numpy-2.4.2-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4f069069931240b3fc703f1e23df63443dbd6390614c8c44a87d96cd0ec81eb1", size = 15966084, upload-time = "2026-01-31T23:10:34.502Z" }, - { url = "https://files.pythonhosted.org/packages/1b/46/6fa4ea94f1ddf969b2ee941290cca6f1bfac92b53c76ae5f44afe17ceb69/numpy-2.4.2-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c02ef4401a506fb60b411467ad501e1429a3487abca4664871d9ae0b46c8ba32", size = 16899477, upload-time = "2026-01-31T23:10:37.075Z" }, - { url = "https://files.pythonhosted.org/packages/09/a1/2a424e162b1a14a5bd860a464ab4e07513916a64ab1683fae262f735ccd2/numpy-2.4.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:2653de5c24910e49c2b106499803124dde62a5a1fe0eedeaecf4309a5f639390", size = 17323429, upload-time = "2026-01-31T23:10:39.704Z" }, - { url = "https://files.pythonhosted.org/packages/ce/a2/73014149ff250628df72c58204822ac01d768697913881aacf839ff78680/numpy-2.4.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:1ae241bbfc6ae276f94a170b14785e561cb5e7f626b6688cf076af4110887413", size = 18635109, upload-time = "2026-01-31T23:10:41.924Z" }, - { url = "https://files.pythonhosted.org/packages/6c/0c/73e8be2f1accd56df74abc1c5e18527822067dced5ec0861b5bb882c2ce0/numpy-2.4.2-cp311-cp311-win32.whl", hash = "sha256:df1b10187212b198dd45fa943d8985a3c8cf854aed4923796e0e019e113a1bda", size = 6237915, upload-time = "2026-01-31T23:10:45.26Z" }, - { url = "https://files.pythonhosted.org/packages/76/ae/e0265e0163cf127c24c3969d29f1c4c64551a1e375d95a13d32eab25d364/numpy-2.4.2-cp311-cp311-win_amd64.whl", hash = "sha256:b9c618d56a29c9cb1c4da979e9899be7578d2e0b3c24d52079c166324c9e8695", size = 12607972, upload-time = "2026-01-31T23:10:47.021Z" }, - { url = "https://files.pythonhosted.org/packages/29/a5/c43029af9b8014d6ea157f192652c50042e8911f4300f8f6ed3336bf437f/numpy-2.4.2-cp311-cp311-win_arm64.whl", hash = "sha256:47c5a6ed21d9452b10227e5e8a0e1c22979811cad7dcc19d8e3e2fb8fa03f1a3", size = 10485763, upload-time = "2026-01-31T23:10:50.087Z" }, - { url = "https://files.pythonhosted.org/packages/51/6e/6f394c9c77668153e14d4da83bcc247beb5952f6ead7699a1a2992613bea/numpy-2.4.2-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:21982668592194c609de53ba4933a7471880ccbaadcc52352694a59ecc860b3a", size = 16667963, upload-time = "2026-01-31T23:10:52.147Z" }, - { url = "https://files.pythonhosted.org/packages/1f/f8/55483431f2b2fd015ae6ed4fe62288823ce908437ed49db5a03d15151678/numpy-2.4.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40397bda92382fcec844066efb11f13e1c9a3e2a8e8f318fb72ed8b6db9f60f1", size = 14693571, upload-time = "2026-01-31T23:10:54.789Z" }, - { url = "https://files.pythonhosted.org/packages/2f/20/18026832b1845cdc82248208dd929ca14c9d8f2bac391f67440707fff27c/numpy-2.4.2-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:b3a24467af63c67829bfaa61eecf18d5432d4f11992688537be59ecd6ad32f5e", size = 5203469, upload-time = "2026-01-31T23:10:57.343Z" }, - { url = "https://files.pythonhosted.org/packages/7d/33/2eb97c8a77daaba34eaa3fa7241a14ac5f51c46a6bd5911361b644c4a1e2/numpy-2.4.2-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:805cc8de9fd6e7a22da5aed858e0ab16be5a4db6c873dde1d7451c541553aa27", size = 6550820, upload-time = "2026-01-31T23:10:59.429Z" }, - { url = "https://files.pythonhosted.org/packages/b1/91/b97fdfd12dc75b02c44e26c6638241cc004d4079a0321a69c62f51470c4c/numpy-2.4.2-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6d82351358ffbcdcd7b686b90742a9b86632d6c1c051016484fa0b326a0a1548", size = 15663067, upload-time = "2026-01-31T23:11:01.291Z" }, - { url = "https://files.pythonhosted.org/packages/f5/c6/a18e59f3f0b8071cc85cbc8d80cd02d68aa9710170b2553a117203d46936/numpy-2.4.2-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9e35d3e0144137d9fdae62912e869136164534d64a169f86438bc9561b6ad49f", size = 16619782, upload-time = "2026-01-31T23:11:03.669Z" }, - { url = "https://files.pythonhosted.org/packages/b7/83/9751502164601a79e18847309f5ceec0b1446d7b6aa12305759b72cf98b2/numpy-2.4.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:adb6ed2ad29b9e15321d167d152ee909ec73395901b70936f029c3bc6d7f4460", size = 17013128, upload-time = "2026-01-31T23:11:05.913Z" }, - { url = "https://files.pythonhosted.org/packages/61/c4/c4066322256ec740acc1c8923a10047818691d2f8aec254798f3dd90f5f2/numpy-2.4.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:8906e71fd8afcb76580404e2a950caef2685df3d2a57fe82a86ac8d33cc007ba", size = 18345324, upload-time = "2026-01-31T23:11:08.248Z" }, - { url = "https://files.pythonhosted.org/packages/ab/af/6157aa6da728fa4525a755bfad486ae7e3f76d4c1864138003eb84328497/numpy-2.4.2-cp312-cp312-win32.whl", hash = "sha256:ec055f6dae239a6299cace477b479cca2fc125c5675482daf1dd886933a1076f", size = 5960282, upload-time = "2026-01-31T23:11:10.497Z" }, - { url = "https://files.pythonhosted.org/packages/92/0f/7ceaaeaacb40567071e94dbf2c9480c0ae453d5bb4f52bea3892c39dc83c/numpy-2.4.2-cp312-cp312-win_amd64.whl", hash = "sha256:209fae046e62d0ce6435fcfe3b1a10537e858249b3d9b05829e2a05218296a85", size = 12314210, upload-time = "2026-01-31T23:11:12.176Z" }, - { url = "https://files.pythonhosted.org/packages/2f/a3/56c5c604fae6dd40fa2ed3040d005fca97e91bd320d232ac9931d77ba13c/numpy-2.4.2-cp312-cp312-win_arm64.whl", hash = "sha256:fbde1b0c6e81d56f5dccd95dd4a711d9b95df1ae4009a60887e56b27e8d903fa", size = 10220171, upload-time = "2026-01-31T23:11:14.684Z" }, - { url = "https://files.pythonhosted.org/packages/f4/f8/50e14d36d915ef64d8f8bc4a087fc8264d82c785eda6711f80ab7e620335/numpy-2.4.2-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:89f7268c009bc492f506abd6f5265defa7cb3f7487dc21d357c3d290add45082", size = 16833179, upload-time = "2026-01-31T23:12:53.5Z" }, - { url = "https://files.pythonhosted.org/packages/17/17/809b5cad63812058a8189e91a1e2d55a5a18fd04611dbad244e8aeae465c/numpy-2.4.2-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:e6dee3bb76aa4009d5a912180bf5b2de012532998d094acee25d9cb8dee3e44a", size = 14889755, upload-time = "2026-01-31T23:12:55.933Z" }, - { url = "https://files.pythonhosted.org/packages/3e/ea/181b9bcf7627fc8371720316c24db888dcb9829b1c0270abf3d288b2e29b/numpy-2.4.2-pp311-pypy311_pp73-macosx_14_0_arm64.whl", hash = "sha256:cd2bd2bbed13e213d6b55dc1d035a4f91748a7d3edc9480c13898b0353708920", size = 5399500, upload-time = "2026-01-31T23:12:58.671Z" }, - { url = "https://files.pythonhosted.org/packages/33/9f/413adf3fc955541ff5536b78fcf0754680b3c6d95103230252a2c9408d23/numpy-2.4.2-pp311-pypy311_pp73-macosx_14_0_x86_64.whl", hash = "sha256:cf28c0c1d4c4bf00f509fa7eb02c58d7caf221b50b467bcb0d9bbf1584d5c821", size = 6714252, upload-time = "2026-01-31T23:13:00.518Z" }, - { url = "https://files.pythonhosted.org/packages/91/da/643aad274e29ccbdf42ecd94dafe524b81c87bcb56b83872d54827f10543/numpy-2.4.2-pp311-pypy311_pp73-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e04ae107ac591763a47398bb45b568fc38f02dbc4aa44c063f67a131f99346cb", size = 15797142, upload-time = "2026-01-31T23:13:02.219Z" }, - { url = "https://files.pythonhosted.org/packages/66/27/965b8525e9cb5dc16481b30a1b3c21e50c7ebf6e9dbd48d0c4d0d5089c7e/numpy-2.4.2-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:602f65afdef699cda27ec0b9224ae5dc43e328f4c24c689deaf77133dbee74d0", size = 16727979, upload-time = "2026-01-31T23:13:04.62Z" }, - { url = "https://files.pythonhosted.org/packages/de/e5/b7d20451657664b07986c2f6e3be564433f5dcaf3482d68eaecd79afaf03/numpy-2.4.2-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:be71bf1edb48ebbbf7f6337b5bfd2f895d1902f6335a5830b20141fc126ffba0", size = 12502577, upload-time = "2026-01-31T23:13:07.08Z" }, +version = "2.4.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/10/8b/c265f4823726ab832de836cdd184d0986dcf94480f81e8739692a7ac7af2/numpy-2.4.3.tar.gz", hash = "sha256:483a201202b73495f00dbc83796c6ae63137a9bdade074f7648b3e32613412dd", size = 20727743, upload-time = "2026-03-09T07:58:53.426Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f9/51/5093a2df15c4dc19da3f79d1021e891f5dcf1d9d1db6ba38891d5590f3fe/numpy-2.4.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:33b3bf58ee84b172c067f56aeadc7ee9ab6de69c5e800ab5b10295d54c581adb", size = 16957183, upload-time = "2026-03-09T07:55:57.774Z" }, + { url = "https://files.pythonhosted.org/packages/b5/7c/c061f3de0630941073d2598dc271ac2f6cbcf5c83c74a5870fea07488333/numpy-2.4.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:8ba7b51e71c05aa1f9bc3641463cd82308eab40ce0d5c7e1fd4038cbf9938147", size = 14968734, upload-time = "2026-03-09T07:56:00.494Z" }, + { url = "https://files.pythonhosted.org/packages/ef/27/d26c85cbcd86b26e4f125b0668e7a7c0542d19dd7d23ee12e87b550e95b5/numpy-2.4.3-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:a1988292870c7cb9d0ebb4cc96b4d447513a9644801de54606dc7aabf2b7d920", size = 5475288, upload-time = "2026-03-09T07:56:02.857Z" }, + { url = "https://files.pythonhosted.org/packages/2b/09/3c4abbc1dcd8010bf1a611d174c7aa689fc505585ec806111b4406f6f1b1/numpy-2.4.3-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:23b46bb6d8ecb68b58c09944483c135ae5f0e9b8d8858ece5e4ead783771d2a9", size = 6805253, upload-time = "2026-03-09T07:56:04.53Z" }, + { url = "https://files.pythonhosted.org/packages/21/bc/e7aa3f6817e40c3f517d407742337cbb8e6fc4b83ce0b55ab780c829243b/numpy-2.4.3-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a016db5c5dba78fa8fe9f5d80d6708f9c42ab087a739803c0ac83a43d686a470", size = 15969479, upload-time = "2026-03-09T07:56:06.638Z" }, + { url = "https://files.pythonhosted.org/packages/78/51/9f5d7a41f0b51649ddf2f2320595e15e122a40610b233d51928dd6c92353/numpy-2.4.3-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:715de7f82e192e8cae5a507a347d97ad17598f8e026152ca97233e3666daaa71", size = 16901035, upload-time = "2026-03-09T07:56:09.405Z" }, + { url = "https://files.pythonhosted.org/packages/64/6e/b221dd847d7181bc5ee4857bfb026182ef69499f9305eb1371cbb1aea626/numpy-2.4.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:2ddb7919366ee468342b91dea2352824c25b55814a987847b6c52003a7c97f15", size = 17325657, upload-time = "2026-03-09T07:56:12.067Z" }, + { url = "https://files.pythonhosted.org/packages/eb/b8/8f3fd2da596e1063964b758b5e3c970aed1949a05200d7e3d46a9d46d643/numpy-2.4.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:a315e5234d88067f2d97e1f2ef670a7569df445d55400f1e33d117418d008d52", size = 18635512, upload-time = "2026-03-09T07:56:14.629Z" }, + { url = "https://files.pythonhosted.org/packages/5c/24/2993b775c37e39d2f8ab4125b44337ab0b2ba106c100980b7c274a22bee7/numpy-2.4.3-cp311-cp311-win32.whl", hash = "sha256:2b3f8d2c4589b1a2028d2a770b0fc4d1f332fb5e01521f4de3199a896d158ddd", size = 6238100, upload-time = "2026-03-09T07:56:17.243Z" }, + { url = "https://files.pythonhosted.org/packages/76/1d/edccf27adedb754db7c4511d5eac8b83f004ae948fe2d3509e8b78097d4c/numpy-2.4.3-cp311-cp311-win_amd64.whl", hash = "sha256:77e76d932c49a75617c6d13464e41203cd410956614d0a0e999b25e9e8d27eec", size = 12609816, upload-time = "2026-03-09T07:56:19.089Z" }, + { url = "https://files.pythonhosted.org/packages/92/82/190b99153480076c8dce85f4cfe7d53ea84444145ffa54cb58dcd460d66b/numpy-2.4.3-cp311-cp311-win_arm64.whl", hash = "sha256:eb610595dd91560905c132c709412b512135a60f1851ccbd2c959e136431ff67", size = 10485757, upload-time = "2026-03-09T07:56:21.753Z" }, + { url = "https://files.pythonhosted.org/packages/a9/ed/6388632536f9788cea23a3a1b629f25b43eaacd7d7377e5d6bc7b9deb69b/numpy-2.4.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:61b0cbabbb6126c8df63b9a3a0c4b1f44ebca5e12ff6997b80fcf267fb3150ef", size = 16669628, upload-time = "2026-03-09T07:56:24.252Z" }, + { url = "https://files.pythonhosted.org/packages/74/1b/ee2abfc68e1ce728b2958b6ba831d65c62e1b13ce3017c13943f8f9b5b2e/numpy-2.4.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:7395e69ff32526710748f92cd8c9849b361830968ea3e24a676f272653e8983e", size = 14696872, upload-time = "2026-03-09T07:56:26.991Z" }, + { url = "https://files.pythonhosted.org/packages/ba/d1/780400e915ff5638166f11ca9dc2c5815189f3d7cf6f8759a1685e586413/numpy-2.4.3-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:abdce0f71dcb4a00e4e77f3faf05e4616ceccfe72ccaa07f47ee79cda3b7b0f4", size = 5203489, upload-time = "2026-03-09T07:56:29.414Z" }, + { url = "https://files.pythonhosted.org/packages/0b/bb/baffa907e9da4cc34a6e556d6d90e032f6d7a75ea47968ea92b4858826c4/numpy-2.4.3-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:48da3a4ee1336454b07497ff7ec83903efa5505792c4e6d9bf83d99dc07a1e18", size = 6550814, upload-time = "2026-03-09T07:56:32.225Z" }, + { url = "https://files.pythonhosted.org/packages/7b/12/8c9f0c6c95f76aeb20fc4a699c33e9f827fa0d0f857747c73bb7b17af945/numpy-2.4.3-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:32e3bef222ad6b052280311d1d60db8e259e4947052c3ae7dd6817451fc8a4c5", size = 15666601, upload-time = "2026-03-09T07:56:34.461Z" }, + { url = "https://files.pythonhosted.org/packages/bd/79/cc665495e4d57d0aa6fbcc0aa57aa82671dfc78fbf95fe733ed86d98f52a/numpy-2.4.3-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e7dd01a46700b1967487141a66ac1a3cf0dd8ebf1f08db37d46389401512ca97", size = 16621358, upload-time = "2026-03-09T07:56:36.852Z" }, + { url = "https://files.pythonhosted.org/packages/a8/40/b4ecb7224af1065c3539f5ecfff879d090de09608ad1008f02c05c770cb3/numpy-2.4.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:76f0f283506c28b12bba319c0fab98217e9f9b54e6160e9c79e9f7348ba32e9c", size = 17016135, upload-time = "2026-03-09T07:56:39.337Z" }, + { url = "https://files.pythonhosted.org/packages/f7/b1/6a88e888052eed951afed7a142dcdf3b149a030ca59b4c71eef085858e43/numpy-2.4.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:737f630a337364665aba3b5a77e56a68cc42d350edd010c345d65a3efa3addcc", size = 18345816, upload-time = "2026-03-09T07:56:42.31Z" }, + { url = "https://files.pythonhosted.org/packages/f3/8f/103a60c5f8c3d7fc678c19cd7b2476110da689ccb80bc18050efbaeae183/numpy-2.4.3-cp312-cp312-win32.whl", hash = "sha256:26952e18d82a1dbbc2f008d402021baa8d6fc8e84347a2072a25e08b46d698b9", size = 5960132, upload-time = "2026-03-09T07:56:44.851Z" }, + { url = "https://files.pythonhosted.org/packages/d7/7c/f5ee1bf6ed888494978046a809df2882aad35d414b622893322df7286879/numpy-2.4.3-cp312-cp312-win_amd64.whl", hash = "sha256:65f3c2455188f09678355f5cae1f959a06b778bc66d535da07bf2ef20cd319d5", size = 12316144, upload-time = "2026-03-09T07:56:47.057Z" }, + { url = "https://files.pythonhosted.org/packages/71/46/8d1cb3f7a00f2fb6394140e7e6623696e54c6318a9d9691bb4904672cf42/numpy-2.4.3-cp312-cp312-win_arm64.whl", hash = "sha256:2abad5c7fef172b3377502bde47892439bae394a71bc329f31df0fd829b41a9e", size = 10220364, upload-time = "2026-03-09T07:56:49.849Z" }, + { url = "https://files.pythonhosted.org/packages/64/e4/4dab9fb43c83719c29241c535d9e07be73bea4bc0c6686c5816d8e1b6689/numpy-2.4.3-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:c6b124bfcafb9e8d3ed09130dbee44848c20b3e758b6bbf006e641778927c028", size = 16834892, upload-time = "2026-03-09T07:58:35.334Z" }, + { url = "https://files.pythonhosted.org/packages/c9/29/f8b6d4af90fed3dfda84ebc0df06c9833d38880c79ce954e5b661758aa31/numpy-2.4.3-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:76dbb9d4e43c16cf9aa711fcd8de1e2eeb27539dcefb60a1d5e9f12fae1d1ed8", size = 14893070, upload-time = "2026-03-09T07:58:37.7Z" }, + { url = "https://files.pythonhosted.org/packages/9a/04/a19b3c91dbec0a49269407f15d5753673a09832daed40c45e8150e6fa558/numpy-2.4.3-pp311-pypy311_pp73-macosx_14_0_arm64.whl", hash = "sha256:29363fbfa6f8ee855d7569c96ce524845e3d726d6c19b29eceec7dd555dab152", size = 5399609, upload-time = "2026-03-09T07:58:39.853Z" }, + { url = "https://files.pythonhosted.org/packages/79/34/4d73603f5420eab89ea8a67097b31364bf7c30f811d4dd84b1659c7476d9/numpy-2.4.3-pp311-pypy311_pp73-macosx_14_0_x86_64.whl", hash = "sha256:bc71942c789ef415a37f0d4eab90341425a00d538cd0642445d30b41023d3395", size = 6714355, upload-time = "2026-03-09T07:58:42.365Z" }, + { url = "https://files.pythonhosted.org/packages/58/ad/1100d7229bb248394939a12a8074d485b655e8ed44207d328fdd7fcebc7b/numpy-2.4.3-pp311-pypy311_pp73-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7e58765ad74dcebd3ef0208a5078fba32dc8ec3578fe84a604432950cd043d79", size = 15800434, upload-time = "2026-03-09T07:58:44.837Z" }, + { url = "https://files.pythonhosted.org/packages/0c/fd/16d710c085d28ba4feaf29ac60c936c9d662e390344f94a6beaa2ac9899b/numpy-2.4.3-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8e236dbda4e1d319d681afcbb136c0c4a8e0f1a5c58ceec2adebb547357fe857", size = 16729409, upload-time = "2026-03-09T07:58:47.972Z" }, + { url = "https://files.pythonhosted.org/packages/57/a7/b35835e278c18b85206834b3aa3abe68e77a98769c59233d1f6300284781/numpy-2.4.3-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:4b42639cdde6d24e732ff823a3fa5b701d8acad89c4142bc1d0bd6dc85200ba5", size = 12504685, upload-time = "2026-03-09T07:58:50.525Z" }, ] [[package]] @@ -522,27 +526,27 @@ wheels = [ [[package]] name = "ruff" -version = "0.15.2" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/06/04/eab13a954e763b0606f460443fcbf6bb5a0faf06890ea3754ff16523dce5/ruff-0.15.2.tar.gz", hash = "sha256:14b965afee0969e68bb871eba625343b8673375f457af4abe98553e8bbb98342", size = 4558148, upload-time = "2026-02-19T22:32:20.271Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/2f/70/3a4dc6d09b13cb3e695f28307e5d889b2e1a66b7af9c5e257e796695b0e6/ruff-0.15.2-py3-none-linux_armv6l.whl", hash = "sha256:120691a6fdae2f16d65435648160f5b81a9625288f75544dc40637436b5d3c0d", size = 10430565, upload-time = "2026-02-19T22:32:41.824Z" }, - { url = "https://files.pythonhosted.org/packages/71/0b/bb8457b56185ece1305c666dc895832946d24055be90692381c31d57466d/ruff-0.15.2-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:a89056d831256099658b6bba4037ac6dd06f49d194199215befe2bb10457ea5e", size = 10820354, upload-time = "2026-02-19T22:32:07.366Z" }, - { url = "https://files.pythonhosted.org/packages/2d/c1/e0532d7f9c9e0b14c46f61b14afd563298b8b83f337b6789ddd987e46121/ruff-0.15.2-py3-none-macosx_11_0_arm64.whl", hash = "sha256:e36dee3a64be0ebd23c86ffa3aa3fd3ac9a712ff295e192243f814a830b6bd87", size = 10170767, upload-time = "2026-02-19T22:32:13.188Z" }, - { url = "https://files.pythonhosted.org/packages/47/e8/da1aa341d3af017a21c7a62fb5ec31d4e7ad0a93ab80e3a508316efbcb23/ruff-0.15.2-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a9fb47b6d9764677f8c0a193c0943ce9a05d6763523f132325af8a858eadc2b9", size = 10529591, upload-time = "2026-02-19T22:32:02.547Z" }, - { url = "https://files.pythonhosted.org/packages/93/74/184fbf38e9f3510231fbc5e437e808f0b48c42d1df9434b208821efcd8d6/ruff-0.15.2-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:f376990f9d0d6442ea9014b19621d8f2aaf2b8e39fdbfc79220b7f0c596c9b80", size = 10260771, upload-time = "2026-02-19T22:32:36.938Z" }, - { url = "https://files.pythonhosted.org/packages/05/ac/605c20b8e059a0bc4b42360414baa4892ff278cec1c91fff4be0dceedefd/ruff-0.15.2-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2dcc987551952d73cbf5c88d9fdee815618d497e4df86cd4c4824cc59d5dd75f", size = 11045791, upload-time = "2026-02-19T22:32:31.642Z" }, - { url = "https://files.pythonhosted.org/packages/fd/52/db6e419908f45a894924d410ac77d64bdd98ff86901d833364251bd08e22/ruff-0.15.2-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:42a47fd785cbe8c01b9ff45031af875d101b040ad8f4de7bbb716487c74c9a77", size = 11879271, upload-time = "2026-02-19T22:32:29.305Z" }, - { url = "https://files.pythonhosted.org/packages/3e/d8/7992b18f2008bdc9231d0f10b16df7dda964dbf639e2b8b4c1b4e91b83af/ruff-0.15.2-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cbe9f49354866e575b4c6943856989f966421870e85cd2ac94dccb0a9dcb2fea", size = 11303707, upload-time = "2026-02-19T22:32:22.492Z" }, - { url = "https://files.pythonhosted.org/packages/d7/02/849b46184bcfdd4b64cde61752cc9a146c54759ed036edd11857e9b8443b/ruff-0.15.2-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b7a672c82b5f9887576087d97be5ce439f04bbaf548ee987b92d3a7dede41d3a", size = 11149151, upload-time = "2026-02-19T22:32:44.234Z" }, - { url = "https://files.pythonhosted.org/packages/70/04/f5284e388bab60d1d3b99614a5a9aeb03e0f333847e2429bebd2aaa1feec/ruff-0.15.2-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:72ecc64f46f7019e2bcc3cdc05d4a7da958b629a5ab7033195e11a438403d956", size = 11091132, upload-time = "2026-02-19T22:32:24.691Z" }, - { url = "https://files.pythonhosted.org/packages/fa/ae/88d844a21110e14d92cf73d57363fab59b727ebeabe78009b9ccb23500af/ruff-0.15.2-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:8dcf243b15b561c655c1ef2f2b0050e5d50db37fe90115507f6ff37d865dc8b4", size = 10504717, upload-time = "2026-02-19T22:32:26.75Z" }, - { url = "https://files.pythonhosted.org/packages/64/27/867076a6ada7f2b9c8292884ab44d08fd2ba71bd2b5364d4136f3cd537e1/ruff-0.15.2-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:dab6941c862c05739774677c6273166d2510d254dac0695c0e3f5efa1b5585de", size = 10263122, upload-time = "2026-02-19T22:32:10.036Z" }, - { url = "https://files.pythonhosted.org/packages/e7/ef/faf9321d550f8ebf0c6373696e70d1758e20ccdc3951ad7af00c0956be7c/ruff-0.15.2-py3-none-musllinux_1_2_i686.whl", hash = "sha256:1b9164f57fc36058e9a6806eb92af185b0697c9fe4c7c52caa431c6554521e5c", size = 10735295, upload-time = "2026-02-19T22:32:39.227Z" }, - { url = "https://files.pythonhosted.org/packages/2f/55/e8089fec62e050ba84d71b70e7834b97709ca9b7aba10c1a0b196e493f97/ruff-0.15.2-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:80d24fcae24d42659db7e335b9e1531697a7102c19185b8dc4a028b952865fd8", size = 11241641, upload-time = "2026-02-19T22:32:34.617Z" }, - { url = "https://files.pythonhosted.org/packages/23/01/1c30526460f4d23222d0fabd5888868262fd0e2b71a00570ca26483cd993/ruff-0.15.2-py3-none-win32.whl", hash = "sha256:fd5ff9e5f519a7e1bd99cbe8daa324010a74f5e2ebc97c6242c08f26f3714f6f", size = 10507885, upload-time = "2026-02-19T22:32:15.635Z" }, - { url = "https://files.pythonhosted.org/packages/5c/10/3d18e3bbdf8fc50bbb4ac3cc45970aa5a9753c5cb51bf9ed9a3cd8b79fa3/ruff-0.15.2-py3-none-win_amd64.whl", hash = "sha256:d20014e3dfa400f3ff84830dfb5755ece2de45ab62ecea4af6b7262d0fb4f7c5", size = 11623725, upload-time = "2026-02-19T22:32:04.947Z" }, - { url = "https://files.pythonhosted.org/packages/6d/78/097c0798b1dab9f8affe73da9642bb4500e098cb27fd8dc9724816ac747b/ruff-0.15.2-py3-none-win_arm64.whl", hash = "sha256:cabddc5822acdc8f7b5527b36ceac55cc51eec7b1946e60181de8fe83ca8876e", size = 10941649, upload-time = "2026-02-19T22:32:18.108Z" }, +version = "0.15.6" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/51/df/f8629c19c5318601d3121e230f74cbee7a3732339c52b21daa2b82ef9c7d/ruff-0.15.6.tar.gz", hash = "sha256:8394c7bb153a4e3811a4ecdacd4a8e6a4fa8097028119160dffecdcdf9b56ae4", size = 4597916, upload-time = "2026-03-12T23:05:47.51Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/9e/2f/4e03a7e5ce99b517e98d3b4951f411de2b0fa8348d39cf446671adcce9a2/ruff-0.15.6-py3-none-linux_armv6l.whl", hash = "sha256:7c98c3b16407b2cf3d0f2b80c80187384bc92c6774d85fefa913ecd941256fff", size = 10508953, upload-time = "2026-03-12T23:05:17.246Z" }, + { url = "https://files.pythonhosted.org/packages/70/60/55bcdc3e9f80bcf39edf0cd272da6fa511a3d94d5a0dd9e0adf76ceebdb4/ruff-0.15.6-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:ee7dcfaad8b282a284df4aa6ddc2741b3f4a18b0555d626805555a820ea181c3", size = 10942257, upload-time = "2026-03-12T23:05:23.076Z" }, + { url = "https://files.pythonhosted.org/packages/e7/f9/005c29bd1726c0f492bfa215e95154cf480574140cb5f867c797c18c790b/ruff-0.15.6-py3-none-macosx_11_0_arm64.whl", hash = "sha256:3bd9967851a25f038fc8b9ae88a7fbd1b609f30349231dffaa37b6804923c4bb", size = 10322683, upload-time = "2026-03-12T23:05:33.738Z" }, + { url = "https://files.pythonhosted.org/packages/5f/74/2f861f5fd7cbb2146bddb5501450300ce41562da36d21868c69b7a828169/ruff-0.15.6-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:13f4594b04e42cd24a41da653886b04d2ff87adbf57497ed4f728b0e8a4866f8", size = 10660986, upload-time = "2026-03-12T23:05:53.245Z" }, + { url = "https://files.pythonhosted.org/packages/c1/a1/309f2364a424eccb763cdafc49df843c282609f47fe53aa83f38272389e0/ruff-0.15.6-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e2ed8aea2f3fe57886d3f00ea5b8aae5bf68d5e195f487f037a955ff9fbaac9e", size = 10332177, upload-time = "2026-03-12T23:05:56.145Z" }, + { url = "https://files.pythonhosted.org/packages/30/41/7ebf1d32658b4bab20f8ac80972fb19cd4e2c6b78552be263a680edc55ac/ruff-0.15.6-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:70789d3e7830b848b548aae96766431c0dc01a6c78c13381f423bf7076c66d15", size = 11170783, upload-time = "2026-03-12T23:06:01.742Z" }, + { url = "https://files.pythonhosted.org/packages/76/be/6d488f6adca047df82cd62c304638bcb00821c36bd4881cfca221561fdfc/ruff-0.15.6-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:542aaf1de3154cea088ced5a819ce872611256ffe2498e750bbae5247a8114e9", size = 12044201, upload-time = "2026-03-12T23:05:28.697Z" }, + { url = "https://files.pythonhosted.org/packages/71/68/e6f125df4af7e6d0b498f8d373274794bc5156b324e8ab4bf5c1b4fc0ec7/ruff-0.15.6-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1c22e6f02c16cfac3888aa636e9eba857254d15bbacc9906c9689fdecb1953ab", size = 11421561, upload-time = "2026-03-12T23:05:31.236Z" }, + { url = "https://files.pythonhosted.org/packages/f1/9f/f85ef5fd01a52e0b472b26dc1b4bd228b8f6f0435975442ffa4741278703/ruff-0.15.6-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:98893c4c0aadc8e448cfa315bd0cc343a5323d740fe5f28ef8a3f9e21b381f7e", size = 11310928, upload-time = "2026-03-12T23:05:45.288Z" }, + { url = "https://files.pythonhosted.org/packages/8c/26/b75f8c421f5654304b89471ed384ae8c7f42b4dff58fa6ce1626d7f2b59a/ruff-0.15.6-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:70d263770d234912374493e8cc1e7385c5d49376e41dfa51c5c3453169dc581c", size = 11235186, upload-time = "2026-03-12T23:05:50.677Z" }, + { url = "https://files.pythonhosted.org/packages/fc/d4/d5a6d065962ff7a68a86c9b4f5500f7d101a0792078de636526c0edd40da/ruff-0.15.6-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:55a1ad63c5a6e54b1f21b7514dfadc0c7fb40093fa22e95143cf3f64ebdcd512", size = 10635231, upload-time = "2026-03-12T23:05:37.044Z" }, + { url = "https://files.pythonhosted.org/packages/d6/56/7c3acf3d50910375349016cf33de24be021532042afbed87942858992491/ruff-0.15.6-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:8dc473ba093c5ec238bb1e7429ee676dca24643c471e11fbaa8a857925b061c0", size = 10340357, upload-time = "2026-03-12T23:06:04.748Z" }, + { url = "https://files.pythonhosted.org/packages/06/54/6faa39e9c1033ff6a3b6e76b5df536931cd30caf64988e112bbf91ef5ce5/ruff-0.15.6-py3-none-musllinux_1_2_i686.whl", hash = "sha256:85b042377c2a5561131767974617006f99f7e13c63c111b998f29fc1e58a4cfb", size = 10860583, upload-time = "2026-03-12T23:05:58.978Z" }, + { url = "https://files.pythonhosted.org/packages/cb/1e/509a201b843b4dfb0b32acdedf68d951d3377988cae43949ba4c4133a96a/ruff-0.15.6-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:cef49e30bc5a86a6a92098a7fbf6e467a234d90b63305d6f3ec01225a9d092e0", size = 11410976, upload-time = "2026-03-12T23:05:39.955Z" }, + { url = "https://files.pythonhosted.org/packages/6c/25/3fc9114abf979a41673ce877c08016f8e660ad6cf508c3957f537d2e9fa9/ruff-0.15.6-py3-none-win32.whl", hash = "sha256:bbf67d39832404812a2d23020dda68fee7f18ce15654e96fb1d3ad21a5fe436c", size = 10616872, upload-time = "2026-03-12T23:05:42.451Z" }, + { url = "https://files.pythonhosted.org/packages/89/7a/09ece68445ceac348df06e08bf75db72d0e8427765b96c9c0ffabc1be1d9/ruff-0.15.6-py3-none-win_amd64.whl", hash = "sha256:aee25bc84c2f1007ecb5037dff75cef00414fdf17c23f07dc13e577883dca406", size = 11787271, upload-time = "2026-03-12T23:05:20.168Z" }, + { url = "https://files.pythonhosted.org/packages/7f/d0/578c47dd68152ddddddf31cd7fc67dc30b7cdf639a86275fda821b0d9d98/ruff-0.15.6-py3-none-win_arm64.whl", hash = "sha256:c34de3dd0b0ba203be50ae70f5910b17188556630e2178fd7d79fc030eb0d837", size = 11060497, upload-time = "2026-03-12T23:05:25.968Z" }, ] [[package]] @@ -605,26 +609,26 @@ wheels = [ [[package]] name = "ty" -version = "0.0.18" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/74/15/9682700d8d60fdca7afa4febc83a2354b29cdcd56e66e19c92b521db3b39/ty-0.0.18.tar.gz", hash = "sha256:04ab7c3db5dcbcdac6ce62e48940d3a0124f377c05499d3f3e004e264ae94b83", size = 5214774, upload-time = "2026-02-20T21:51:31.173Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/ae/d8/920460d4c22ea68fcdeb0b2fb53ea2aeb9c6d7875bde9278d84f2ac767b6/ty-0.0.18-py3-none-linux_armv6l.whl", hash = "sha256:4e5e91b0a79857316ef893c5068afc4b9872f9d257627d9bc8ac4d2715750d88", size = 10280825, upload-time = "2026-02-20T21:51:25.03Z" }, - { url = "https://files.pythonhosted.org/packages/83/56/62587de582d3d20d78fcdddd0594a73822ac5a399a12ef512085eb7a4de6/ty-0.0.18-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:ee0e578b3f8416e2d5416da9553b78fd33857868aa1384cb7fefeceee5ff102d", size = 10118324, upload-time = "2026-02-20T21:51:22.27Z" }, - { url = "https://files.pythonhosted.org/packages/2f/2d/dbdace8d432a0755a7417f659bfd5b8a4261938ecbdfd7b42f4c454f5aa9/ty-0.0.18-py3-none-macosx_11_0_arm64.whl", hash = "sha256:3f7a0487d36b939546a91d141f7fc3dbea32fab4982f618d5b04dc9d5b6da21e", size = 9605861, upload-time = "2026-02-20T21:51:16.066Z" }, - { url = "https://files.pythonhosted.org/packages/6b/d9/de11c0280f778d5fc571393aada7fe9b8bc1dd6a738f2e2c45702b8b3150/ty-0.0.18-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d5e2fa8d45f57ca487a470e4bf66319c09b561150e98ae2a6b1a97ef04c1a4eb", size = 10092701, upload-time = "2026-02-20T21:51:26.862Z" }, - { url = "https://files.pythonhosted.org/packages/0f/94/068d4d591d791041732171e7b63c37a54494b2e7d28e88d2167eaa9ad875/ty-0.0.18-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:d75652e9e937f7044b1aca16091193e7ef11dac1c7ec952b7fb8292b7ba1f5f2", size = 10109203, upload-time = "2026-02-20T21:51:11.59Z" }, - { url = "https://files.pythonhosted.org/packages/34/e4/526a4aa56dc0ca2569aaa16880a1ab105c3b416dd70e87e25a05688999f3/ty-0.0.18-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:563c868edceb8f6ddd5e91113c17d3676b028f0ed380bdb3829b06d9beb90e58", size = 10614200, upload-time = "2026-02-20T21:51:20.298Z" }, - { url = "https://files.pythonhosted.org/packages/fd/3d/b68ab20a34122a395880922587fbfc3adf090d22e0fb546d4d20fe8c2621/ty-0.0.18-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:502e2a1f948bec563a0454fc25b074bf5cf041744adba8794d024277e151d3b0", size = 11153232, upload-time = "2026-02-20T21:51:14.121Z" }, - { url = "https://files.pythonhosted.org/packages/68/ea/678243c042343fcda7e6af36036c18676c355878dcdcd517639586d2cf9e/ty-0.0.18-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cc881dea97021a3aa29134a476937fd8054775c4177d01b94db27fcfb7aab65b", size = 10832934, upload-time = "2026-02-20T21:51:32.92Z" }, - { url = "https://files.pythonhosted.org/packages/d8/bd/7f8d647cef8b7b346c0163230a37e903c7461c7248574840b977045c77df/ty-0.0.18-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:421fcc3bc64cab56f48edb863c7c1c43649ec4d78ff71a1acb5366ad723b6021", size = 10700888, upload-time = "2026-02-20T21:51:09.673Z" }, - { url = "https://files.pythonhosted.org/packages/6e/06/cb3620dc48c5d335ba7876edfef636b2f4498eff4a262ff90033b9e88408/ty-0.0.18-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:0fe5038a7136a0e638a2fb1ad06e3d3c4045314c6ba165c9c303b9aeb4623d6c", size = 10078965, upload-time = "2026-02-20T21:51:07.678Z" }, - { url = "https://files.pythonhosted.org/packages/60/27/c77a5a84533fa3b685d592de7b4b108eb1f38851c40fac4e79cc56ec7350/ty-0.0.18-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:d123600a52372677613a719bbb780adeb9b68f47fb5f25acb09171de390e0035", size = 10134659, upload-time = "2026-02-20T21:51:18.311Z" }, - { url = "https://files.pythonhosted.org/packages/43/6e/60af6b88c73469e628ba5253a296da6984e0aa746206f3034c31f1a04ed1/ty-0.0.18-py3-none-musllinux_1_2_i686.whl", hash = "sha256:bb4bc11d32a1bf96a829bf6b9696545a30a196ac77bbc07cc8d3dfee35e03723", size = 10297494, upload-time = "2026-02-20T21:51:39.631Z" }, - { url = "https://files.pythonhosted.org/packages/33/90/612dc0b68224c723faed6adac2bd3f930a750685db76dfe17e6b9e534a83/ty-0.0.18-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:dda2efbf374ba4cd704053d04e32f2f784e85c2ddc2400006b0f96f5f7e4b667", size = 10791944, upload-time = "2026-02-20T21:51:37.13Z" }, - { url = "https://files.pythonhosted.org/packages/0d/da/f4ada0fd08a9e4138fe3fd2bcd3797753593f423f19b1634a814b9b2a401/ty-0.0.18-py3-none-win32.whl", hash = "sha256:c5768607c94977dacddc2f459ace6a11a408a0f57888dd59abb62d28d4fee4f7", size = 9677964, upload-time = "2026-02-20T21:51:42.039Z" }, - { url = "https://files.pythonhosted.org/packages/5e/fa/090ed9746e5c59fc26d8f5f96dc8441825171f1f47752f1778dad690b08b/ty-0.0.18-py3-none-win_amd64.whl", hash = "sha256:b78d0fa1103d36fc2fce92f2092adace52a74654ab7884d54cdaec8eb5016a4d", size = 10636576, upload-time = "2026-02-20T21:51:29.159Z" }, - { url = "https://files.pythonhosted.org/packages/92/4f/5dd60904c8105cda4d0be34d3a446c180933c76b84ae0742e58f02133713/ty-0.0.18-py3-none-win_arm64.whl", hash = "sha256:01770c3c82137c6b216aa3251478f0b197e181054ee92243772de553d3586398", size = 10095449, upload-time = "2026-02-20T21:51:34.914Z" }, +version = "0.0.23" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/75/ba/d3c998ff4cf6b5d75b39356db55fe1b7caceecc522b9586174e6a5dee6f7/ty-0.0.23.tar.gz", hash = "sha256:5fb05db58f202af366f80ef70f806e48f5237807fe424ec787c9f289e3f3a4ef", size = 5341461, upload-time = "2026-03-13T12:34:23.125Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f4/21/aab32603dfdfacd4819e52fa8c6074e7bd578218a5142729452fc6a62db6/ty-0.0.23-py3-none-linux_armv6l.whl", hash = "sha256:e810eef1a5f1cfc0731a58af8d2f334906a96835829767aed00026f1334a8dd7", size = 10329096, upload-time = "2026-03-13T12:34:09.432Z" }, + { url = "https://files.pythonhosted.org/packages/9f/a9/dd3287a82dce3df546ec560296208d4905dcf06346b6e18c2f3c63523bd1/ty-0.0.23-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:e43d36bd89a151ddcad01acaeff7dcc507cb73ff164c1878d2d11549d39a061c", size = 10156631, upload-time = "2026-03-13T12:34:53.122Z" }, + { url = "https://files.pythonhosted.org/packages/0f/01/3f25909b02fac29bb0a62b2251f8d62e65d697781ffa4cf6b47a4c075c85/ty-0.0.23-py3-none-macosx_11_0_arm64.whl", hash = "sha256:bd6a340969577b4645f231572c4e46012acba2d10d4c0c6570fe1ab74e76ae00", size = 9653211, upload-time = "2026-03-13T12:34:15.049Z" }, + { url = "https://files.pythonhosted.org/packages/d5/60/bfc0479572a6f4b90501c869635faf8d84c8c68ffc5dd87d04f049affabc/ty-0.0.23-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:341441783e626eeb7b1ec2160432956aed5734932ab2d1c26f94d0c98b229937", size = 10156143, upload-time = "2026-03-13T12:34:34.468Z" }, + { url = "https://files.pythonhosted.org/packages/3a/81/8a93e923535a340f54bea20ff196f6b2787782b2f2f399bd191c4bc132d6/ty-0.0.23-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:8ce1dc66c26d4167e2c78d12fa870ef5a7ec9cc344d2baaa6243297cfa88bd52", size = 10136632, upload-time = "2026-03-13T12:34:28.832Z" }, + { url = "https://files.pythonhosted.org/packages/da/cb/2ac81c850c58acc9f976814404d28389c9c1c939676e32287b9cff61381e/ty-0.0.23-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bae1e7a294bf8528836f7617dc5c360ea2dddb63789fc9471ae6753534adca05", size = 10655025, upload-time = "2026-03-13T12:34:37.105Z" }, + { url = "https://files.pythonhosted.org/packages/b5/9b/bac771774c198c318ae699fc013d8cd99ed9caf993f661fba11238759244/ty-0.0.23-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d2b162768764d9dc177c83fb497a51532bb67cbebe57b8fa0f2668436bf53f3c", size = 11230107, upload-time = "2026-03-13T12:34:20.751Z" }, + { url = "https://files.pythonhosted.org/packages/14/09/7644fb0e297265e18243f878aca343593323b9bb19ed5278dcbc63781be0/ty-0.0.23-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d28384e48ca03b34e4e2beee0e230c39bbfb68994bb44927fec61ef3642900da", size = 10934177, upload-time = "2026-03-13T12:34:17.904Z" }, + { url = "https://files.pythonhosted.org/packages/18/14/69a25a0cad493fb6a947302471b579a03516a3b00e7bece77fdc6b4afb9b/ty-0.0.23-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:559d9a299df793cb7a7902caed5eda8a720ff69164c31c979673e928f02251ee", size = 10752487, upload-time = "2026-03-13T12:34:31.785Z" }, + { url = "https://files.pythonhosted.org/packages/9d/2a/42fc3cbccf95af0a62308ebed67e084798ab7a85ef073c9986ef18032743/ty-0.0.23-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:32a7b8a14a98e1d20a9d8d2af23637ed7efdb297ac1fa2450b8e465d05b94482", size = 10133007, upload-time = "2026-03-13T12:34:42.838Z" }, + { url = "https://files.pythonhosted.org/packages/e1/69/307833f1b52fa3670e0a1d496e43ef7df556ecde838192d3fcb9b35e360d/ty-0.0.23-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:6f803b9b9cca87af793467973b9abdd4b83e6b96d9b5e749d662cff7ead70b6d", size = 10169698, upload-time = "2026-03-13T12:34:12.351Z" }, + { url = "https://files.pythonhosted.org/packages/89/ae/5dd379ec22d0b1cba410d7af31c366fcedff191d5b867145913a64889f66/ty-0.0.23-py3-none-musllinux_1_2_i686.whl", hash = "sha256:4a0bf086ec8e2197b7ea7ebfcf4be36cb6a52b235f8be61647ef1b2d99d6ffd3", size = 10346080, upload-time = "2026-03-13T12:34:40.012Z" }, + { url = "https://files.pythonhosted.org/packages/98/c7/dfc83203d37998620bba9c4873a080c8850a784a8a46f56f8163c5b4e320/ty-0.0.23-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:252539c3fcd7aeb9b8d5c14e2040682c3e1d7ff640906d63fd2c4ce35865a4ba", size = 10848162, upload-time = "2026-03-13T12:34:45.421Z" }, + { url = "https://files.pythonhosted.org/packages/89/08/05481511cfbcc1fd834b6c67aaae090cb609a079189ddf2032139ccfc490/ty-0.0.23-py3-none-win32.whl", hash = "sha256:51b591d19eef23bbc3807aef77d38fa1f003c354e1da908aa80ea2dca0993f77", size = 9748283, upload-time = "2026-03-13T12:34:50.607Z" }, + { url = "https://files.pythonhosted.org/packages/31/2e/eaed4ff5c85e857a02415084c394e02c30476b65e158eec1938fdaa9a205/ty-0.0.23-py3-none-win_amd64.whl", hash = "sha256:1e137e955f05c501cfbb81dd2190c8fb7d01ec037c7e287024129c722a83c9ad", size = 10698355, upload-time = "2026-03-13T12:34:26.134Z" }, + { url = "https://files.pythonhosted.org/packages/91/29/b32cb7b4c7d56b9ed50117f8ad6e45834aec293e4cb14749daab4e9236d5/ty-0.0.23-py3-none-win_arm64.whl", hash = "sha256:a0399bd13fd2cd6683fd0a2d59b9355155d46546d8203e152c556ddbdeb20842", size = 10155890, upload-time = "2026-03-13T12:34:48.082Z" }, ] [[package]] From 1b529d4dd821ca8ce00546aa6ba429acabf5d40d Mon Sep 17 00:00:00 2001 From: Nelson Chen Date: Mon, 23 Mar 2026 01:28:58 -0700 Subject: [PATCH 153/229] Toyota: Add FW for 2025 Lexus ES 350 TSS2 (#3222) Source: https://discord.com/channels/469524606043160576/1485248975337554020/1485414288687628491 Route: d75102b67957593c/00000000--42c25a767e --- opendbc/car/toyota/fingerprints.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/opendbc/car/toyota/fingerprints.py b/opendbc/car/toyota/fingerprints.py index 67bd6665298..9a8ec596589 100644 --- a/opendbc/car/toyota/fingerprints.py +++ b/opendbc/car/toyota/fingerprints.py @@ -1351,6 +1351,7 @@ b'\x018966333T5100\x00\x00\x00\x00', b'\x018966333X6000\x00\x00\x00\x00', b'\x01896633T07000\x00\x00\x00\x00', + b'\x01896633T24000\x00\x00\x00\x00', b'\x01896633T38000\x00\x00\x00\x00', b'\x01896633T58000\x00\x00\x00\x00', b'\x01896633T63000\x00\x00\x00\x00', @@ -1368,6 +1369,7 @@ b'\x01F152606461\x00\x00\x00\x00\x00\x00', b'\x01F15260646200\x00\x00\x00\x00', b'\x01F152633A71\x00\x00\x00\x00\x00\x00', + b'\x01F152633E2100\x00\x00\x00\x00', b'F152633423\x00\x00\x00\x00\x00\x00', b'F152633680\x00\x00\x00\x00\x00\x00', b'F152633681\x00\x00\x00\x00\x00\x00', @@ -1402,6 +1404,7 @@ b'\x028646F3309100\x00\x00\x00\x008646G3304000\x00\x00\x00\x00', b'\x028646F3309100\x00\x00\x00\x008646G5301200\x00\x00\x00\x00', b'\x028646F3309400\x00\x00\x00\x008646G3304000\x00\x00\x00\x00', + b'\x028646F3313000\x00\x00\x00\x008646G3304000\x00\x00\x00\x00', ], }, CAR.LEXUS_ES: { From e27af8c188cec1ad7ef6c39ad57f6338f8b02281 Mon Sep 17 00:00:00 2001 From: Alex West Date: Mon, 23 Mar 2026 08:36:50 +0000 Subject: [PATCH 154/229] Kia - 2024 Niro EV (with HDA II) works with 2025 model harness (#3218) * Updated Kia Niro info * Update Kia Niro EV HDA II model year range * Apply suggestions from code review --------- Co-authored-by: Shane Smiskol --- opendbc/car/hyundai/values.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendbc/car/hyundai/values.py b/opendbc/car/hyundai/values.py index 432779bdd95..e00734782bf 100644 --- a/opendbc/car/hyundai/values.py +++ b/opendbc/car/hyundai/values.py @@ -407,7 +407,7 @@ class CAR(Platforms): KIA_NIRO_EV_2ND_GEN = HyundaiCanFDPlatformConfig( [ HyundaiCarDocs("Kia Niro EV (without HDA II) 2023-25", "All", car_parts=CarParts.common([CarHarness.hyundai_a])), - HyundaiCarDocs("Kia Niro EV (with HDA II) 2025", "Highway Driving Assist II", car_parts=CarParts.common([CarHarness.hyundai_r])), + HyundaiCarDocs("Kia Niro EV (with HDA II) 2024-25", "Highway Driving Assist II", car_parts=CarParts.common([CarHarness.hyundai_r])), ], KIA_NIRO_EV.specs, flags=HyundaiFlags.EV, From 1a6377c0ae367d73dcdc9719a96964f8ade3a25d Mon Sep 17 00:00:00 2001 From: commaci-public <60409688+commaci-public@users.noreply.github.com> Date: Mon, 23 Mar 2026 08:34:26 -0700 Subject: [PATCH 155/229] [bot] Update uv.lock (#3223) Co-authored-by: Vehicle Researcher --- uv.lock | 160 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/uv.lock b/uv.lock index fbd44302b18..686341414b3 100644 --- a/uv.lock +++ b/uv.lock @@ -4,11 +4,11 @@ requires-python = ">=3.11, <3.13" [[package]] name = "attrs" -version = "25.4.0" +version = "26.1.0" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/6b/5c/685e6633917e101e5dcb62b9dd76946cbb57c26e133bae9e0cd36033c0a9/attrs-25.4.0.tar.gz", hash = "sha256:16d5969b87f0859ef33a48b35d55ac1be6e42ae49d5e853b597db70c35c57e11", size = 934251, upload-time = "2025-10-06T13:54:44.725Z" } +sdist = { url = "https://files.pythonhosted.org/packages/9a/8e/82a0fe20a541c03148528be8cac2408564a6c9a0cc7e9171802bc1d26985/attrs-26.1.0.tar.gz", hash = "sha256:d03ceb89cb322a8fd706d4fb91940737b6642aa36998fe130a9bc96c985eff32", size = 952055, upload-time = "2026-03-19T14:22:25.026Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/3a/2a/7cc015f5b9f5db42b7d48157e23356022889fc354a2813c15934b7cb5c0e/attrs-25.4.0-py3-none-any.whl", hash = "sha256:adcf7e2a1fb3b36ac48d97835bb6d8ade15b8dcce26aba8bf1d14847b57a3373", size = 67615, upload-time = "2025-10-06T13:54:43.17Z" }, + { url = "https://files.pythonhosted.org/packages/64/b4/17d4b0b2a2dc85a6df63d1157e028ed19f90d4cd97c36717afef2bc2f395/attrs-26.1.0-py3-none-any.whl", hash = "sha256:c647aa4a12dfbad9333ca4e71fe62ddc36f4e63b2d260a37a8b83d2f043ac309", size = 67548, upload-time = "2026-03-19T14:22:23.645Z" }, ] [[package]] @@ -143,47 +143,47 @@ requires-dist = [{ name = "requests" }] [[package]] name = "coverage" -version = "7.13.4" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/24/56/95b7e30fa389756cb56630faa728da46a27b8c6eb46f9d557c68fff12b65/coverage-7.13.4.tar.gz", hash = "sha256:e5c8f6ed1e61a8b2dcdf31eb0b9bbf0130750ca79c1c49eb898e2ad86f5ccc91", size = 827239, upload-time = "2026-02-09T12:59:03.86Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/b4/ad/b59e5b451cf7172b8d1043dc0fa718f23aab379bc1521ee13d4bd9bfa960/coverage-7.13.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d490ba50c3f35dd7c17953c68f3270e7ccd1c6642e2d2afe2d8e720b98f5a053", size = 219278, upload-time = "2026-02-09T12:56:31.673Z" }, - { url = "https://files.pythonhosted.org/packages/f1/17/0cb7ca3de72e5f4ef2ec2fa0089beafbcaaaead1844e8b8a63d35173d77d/coverage-7.13.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:19bc3c88078789f8ef36acb014d7241961dbf883fd2533d18cb1e7a5b4e28b11", size = 219783, upload-time = "2026-02-09T12:56:33.104Z" }, - { url = "https://files.pythonhosted.org/packages/ab/63/325d8e5b11e0eaf6d0f6a44fad444ae58820929a9b0de943fa377fe73e85/coverage-7.13.4-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:3998e5a32e62fdf410c0dbd3115df86297995d6e3429af80b8798aad894ca7aa", size = 250200, upload-time = "2026-02-09T12:56:34.474Z" }, - { url = "https://files.pythonhosted.org/packages/76/53/c16972708cbb79f2942922571a687c52bd109a7bd51175aeb7558dff2236/coverage-7.13.4-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:8e264226ec98e01a8e1054314af91ee6cde0eacac4f465cc93b03dbe0bce2fd7", size = 252114, upload-time = "2026-02-09T12:56:35.749Z" }, - { url = "https://files.pythonhosted.org/packages/eb/c2/7ab36d8b8cc412bec9ea2d07c83c48930eb4ba649634ba00cb7e4e0f9017/coverage-7.13.4-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a3aa4e7b9e416774b21797365b358a6e827ffadaaca81b69ee02946852449f00", size = 254220, upload-time = "2026-02-09T12:56:37.796Z" }, - { url = "https://files.pythonhosted.org/packages/d6/4d/cf52c9a3322c89a0e6febdfbc83bb45c0ed3c64ad14081b9503adee702e7/coverage-7.13.4-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:71ca20079dd8f27fcf808817e281e90220475cd75115162218d0e27549f95fef", size = 256164, upload-time = "2026-02-09T12:56:39.016Z" }, - { url = "https://files.pythonhosted.org/packages/78/e9/eb1dd17bd6de8289df3580e967e78294f352a5df8a57ff4671ee5fc3dcd0/coverage-7.13.4-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e2f25215f1a359ab17320b47bcdaca3e6e6356652e8256f2441e4ef972052903", size = 250325, upload-time = "2026-02-09T12:56:40.668Z" }, - { url = "https://files.pythonhosted.org/packages/71/07/8c1542aa873728f72267c07278c5cc0ec91356daf974df21335ccdb46368/coverage-7.13.4-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:d65b2d373032411e86960604dc4edac91fdfb5dca539461cf2cbe78327d1e64f", size = 251913, upload-time = "2026-02-09T12:56:41.97Z" }, - { url = "https://files.pythonhosted.org/packages/74/d7/c62e2c5e4483a748e27868e4c32ad3daa9bdddbba58e1bc7a15e252baa74/coverage-7.13.4-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:94eb63f9b363180aff17de3e7c8760c3ba94664ea2695c52f10111244d16a299", size = 249974, upload-time = "2026-02-09T12:56:43.323Z" }, - { url = "https://files.pythonhosted.org/packages/98/9f/4c5c015a6e98ced54efd0f5cf8d31b88e5504ecb6857585fc0161bb1e600/coverage-7.13.4-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:e856bf6616714c3a9fbc270ab54103f4e685ba236fa98c054e8f87f266c93505", size = 253741, upload-time = "2026-02-09T12:56:45.155Z" }, - { url = "https://files.pythonhosted.org/packages/bd/59/0f4eef89b9f0fcd9633b5d350016f54126ab49426a70ff4c4e87446cabdc/coverage-7.13.4-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:65dfcbe305c3dfe658492df2d85259e0d79ead4177f9ae724b6fb245198f55d6", size = 249695, upload-time = "2026-02-09T12:56:46.636Z" }, - { url = "https://files.pythonhosted.org/packages/b5/2c/b7476f938deb07166f3eb281a385c262675d688ff4659ad56c6c6b8e2e70/coverage-7.13.4-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:b507778ae8a4c915436ed5c2e05b4a6cecfa70f734e19c22a005152a11c7b6a9", size = 250599, upload-time = "2026-02-09T12:56:48.13Z" }, - { url = "https://files.pythonhosted.org/packages/b8/34/c3420709d9846ee3785b9f2831b4d94f276f38884032dca1457fa83f7476/coverage-7.13.4-cp311-cp311-win32.whl", hash = "sha256:784fc3cf8be001197b652d51d3fd259b1e2262888693a4636e18879f613a62a9", size = 221780, upload-time = "2026-02-09T12:56:50.479Z" }, - { url = "https://files.pythonhosted.org/packages/61/08/3d9c8613079d2b11c185b865de9a4c1a68850cfda2b357fae365cf609f29/coverage-7.13.4-cp311-cp311-win_amd64.whl", hash = "sha256:2421d591f8ca05b308cf0092807308b2facbefe54af7c02ac22548b88b95c98f", size = 222715, upload-time = "2026-02-09T12:56:51.815Z" }, - { url = "https://files.pythonhosted.org/packages/18/1a/54c3c80b2f056164cc0a6cdcb040733760c7c4be9d780fe655f356f433e4/coverage-7.13.4-cp311-cp311-win_arm64.whl", hash = "sha256:79e73a76b854d9c6088fe5d8b2ebe745f8681c55f7397c3c0a016192d681045f", size = 221385, upload-time = "2026-02-09T12:56:53.194Z" }, - { url = "https://files.pythonhosted.org/packages/d1/81/4ce2fdd909c5a0ed1f6dedb88aa57ab79b6d1fbd9b588c1ac7ef45659566/coverage-7.13.4-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:02231499b08dabbe2b96612993e5fc34217cdae907a51b906ac7fca8027a4459", size = 219449, upload-time = "2026-02-09T12:56:54.889Z" }, - { url = "https://files.pythonhosted.org/packages/5d/96/5238b1efc5922ddbdc9b0db9243152c09777804fb7c02ad1741eb18a11c0/coverage-7.13.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40aa8808140e55dc022b15d8aa7f651b6b3d68b365ea0398f1441e0b04d859c3", size = 219810, upload-time = "2026-02-09T12:56:56.33Z" }, - { url = "https://files.pythonhosted.org/packages/78/72/2f372b726d433c9c35e56377cf1d513b4c16fe51841060d826b95caacec1/coverage-7.13.4-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:5b856a8ccf749480024ff3bd7310adaef57bf31fd17e1bfc404b7940b6986634", size = 251308, upload-time = "2026-02-09T12:56:57.858Z" }, - { url = "https://files.pythonhosted.org/packages/5d/a0/2ea570925524ef4e00bb6c82649f5682a77fac5ab910a65c9284de422600/coverage-7.13.4-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:2c048ea43875fbf8b45d476ad79f179809c590ec7b79e2035c662e7afa3192e3", size = 254052, upload-time = "2026-02-09T12:56:59.754Z" }, - { url = "https://files.pythonhosted.org/packages/e8/ac/45dc2e19a1939098d783c846e130b8f862fbb50d09e0af663988f2f21973/coverage-7.13.4-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b7b38448866e83176e28086674fe7368ab8590e4610fb662b44e345b86d63ffa", size = 255165, upload-time = "2026-02-09T12:57:01.287Z" }, - { url = "https://files.pythonhosted.org/packages/2d/4d/26d236ff35abc3b5e63540d3386e4c3b192168c1d96da5cb2f43c640970f/coverage-7.13.4-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:de6defc1c9badbf8b9e67ae90fd00519186d6ab64e5cc5f3d21359c2a9b2c1d3", size = 257432, upload-time = "2026-02-09T12:57:02.637Z" }, - { url = "https://files.pythonhosted.org/packages/ec/55/14a966c757d1348b2e19caf699415a2a4c4f7feaa4bbc6326a51f5c7dd1b/coverage-7.13.4-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:7eda778067ad7ffccd23ecffce537dface96212576a07924cbf0d8799d2ded5a", size = 251716, upload-time = "2026-02-09T12:57:04.056Z" }, - { url = "https://files.pythonhosted.org/packages/77/33/50116647905837c66d28b2af1321b845d5f5d19be9655cb84d4a0ea806b4/coverage-7.13.4-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:e87f6c587c3f34356c3759f0420693e35e7eb0e2e41e4c011cb6ec6ecbbf1db7", size = 253089, upload-time = "2026-02-09T12:57:05.503Z" }, - { url = "https://files.pythonhosted.org/packages/c2/b4/8efb11a46e3665d92635a56e4f2d4529de6d33f2cb38afd47d779d15fc99/coverage-7.13.4-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:8248977c2e33aecb2ced42fef99f2d319e9904a36e55a8a68b69207fb7e43edc", size = 251232, upload-time = "2026-02-09T12:57:06.879Z" }, - { url = "https://files.pythonhosted.org/packages/51/24/8cd73dd399b812cc76bb0ac260e671c4163093441847ffe058ac9fda1e32/coverage-7.13.4-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:25381386e80ae727608e662474db537d4df1ecd42379b5ba33c84633a2b36d47", size = 255299, upload-time = "2026-02-09T12:57:08.245Z" }, - { url = "https://files.pythonhosted.org/packages/03/94/0a4b12f1d0e029ce1ccc1c800944a9984cbe7d678e470bb6d3c6bc38a0da/coverage-7.13.4-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:ee756f00726693e5ba94d6df2bdfd64d4852d23b09bb0bc700e3b30e6f333985", size = 250796, upload-time = "2026-02-09T12:57:10.142Z" }, - { url = "https://files.pythonhosted.org/packages/73/44/6002fbf88f6698ca034360ce474c406be6d5a985b3fdb3401128031eef6b/coverage-7.13.4-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:fdfc1e28e7c7cdce44985b3043bc13bbd9c747520f94a4d7164af8260b3d91f0", size = 252673, upload-time = "2026-02-09T12:57:12.197Z" }, - { url = "https://files.pythonhosted.org/packages/de/c6/a0279f7c00e786be75a749a5674e6fa267bcbd8209cd10c9a450c655dfa7/coverage-7.13.4-cp312-cp312-win32.whl", hash = "sha256:01d4cbc3c283a17fc1e42d614a119f7f438eabb593391283adca8dc86eff1246", size = 221990, upload-time = "2026-02-09T12:57:14.085Z" }, - { url = "https://files.pythonhosted.org/packages/77/4e/c0a25a425fcf5557d9abd18419c95b63922e897bc86c1f327f155ef234a9/coverage-7.13.4-cp312-cp312-win_amd64.whl", hash = "sha256:9401ebc7ef522f01d01d45532c68c5ac40fb27113019b6b7d8b208f6e9baa126", size = 222800, upload-time = "2026-02-09T12:57:15.944Z" }, - { url = "https://files.pythonhosted.org/packages/47/ac/92da44ad9a6f4e3a7debd178949d6f3769bedca33830ce9b1dcdab589a37/coverage-7.13.4-cp312-cp312-win_arm64.whl", hash = "sha256:b1ec7b6b6e93255f952e27ab58fbc68dcc468844b16ecbee881aeb29b6ab4d8d", size = 221415, upload-time = "2026-02-09T12:57:17.497Z" }, - { url = "https://files.pythonhosted.org/packages/0d/4a/331fe2caf6799d591109bb9c08083080f6de90a823695d412a935622abb2/coverage-7.13.4-py3-none-any.whl", hash = "sha256:1af1641e57cf7ba1bd67d677c9abdbcd6cc2ab7da3bca7fa1e2b7e50e65f2ad0", size = 211242, upload-time = "2026-02-09T12:59:02.032Z" }, +version = "7.13.5" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/9d/e0/70553e3000e345daff267cec284ce4cbf3fc141b6da229ac52775b5428f1/coverage-7.13.5.tar.gz", hash = "sha256:c81f6515c4c40141f83f502b07bbfa5c240ba25bbe73da7b33f1e5b6120ff179", size = 915967, upload-time = "2026-03-17T10:33:18.341Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/4b/37/d24c8f8220ff07b839b2c043ea4903a33b0f455abe673ae3c03bbdb7f212/coverage-7.13.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:66a80c616f80181f4d643b0f9e709d97bcea413ecd9631e1dedc7401c8e6695d", size = 219381, upload-time = "2026-03-17T10:30:14.68Z" }, + { url = "https://files.pythonhosted.org/packages/35/8b/cd129b0ca4afe886a6ce9d183c44d8301acbd4ef248622e7c49a23145605/coverage-7.13.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:145ede53ccbafb297c1c9287f788d1bc3efd6c900da23bf6931b09eafc931587", size = 219880, upload-time = "2026-03-17T10:30:16.231Z" }, + { url = "https://files.pythonhosted.org/packages/55/2f/e0e5b237bffdb5d6c530ce87cc1d413a5b7d7dfd60fb067ad6d254c35c76/coverage-7.13.5-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:0672854dc733c342fa3e957e0605256d2bf5934feeac328da9e0b5449634a642", size = 250303, upload-time = "2026-03-17T10:30:17.748Z" }, + { url = "https://files.pythonhosted.org/packages/92/be/b1afb692be85b947f3401375851484496134c5554e67e822c35f28bf2fbc/coverage-7.13.5-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:ec10e2a42b41c923c2209b846126c6582db5e43a33157e9870ba9fb70dc7854b", size = 252218, upload-time = "2026-03-17T10:30:19.804Z" }, + { url = "https://files.pythonhosted.org/packages/da/69/2f47bb6fa1b8d1e3e5d0c4be8ccb4313c63d742476a619418f85740d597b/coverage-7.13.5-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:be3d4bbad9d4b037791794ddeedd7d64a56f5933a2c1373e18e9e568b9141686", size = 254326, upload-time = "2026-03-17T10:30:21.321Z" }, + { url = "https://files.pythonhosted.org/packages/d5/d0/79db81da58965bd29dabc8f4ad2a2af70611a57cba9d1ec006f072f30a54/coverage-7.13.5-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:4d2afbc5cc54d286bfb54541aa50b64cdb07a718227168c87b9e2fb8f25e1743", size = 256267, upload-time = "2026-03-17T10:30:23.094Z" }, + { url = "https://files.pythonhosted.org/packages/e5/32/d0d7cc8168f91ddab44c0ce4806b969df5f5fdfdbb568eaca2dbc2a04936/coverage-7.13.5-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:3ad050321264c49c2fa67bb599100456fc51d004b82534f379d16445da40fb75", size = 250430, upload-time = "2026-03-17T10:30:25.311Z" }, + { url = "https://files.pythonhosted.org/packages/4d/06/a055311d891ddbe231cd69fdd20ea4be6e3603ffebddf8704b8ca8e10a3c/coverage-7.13.5-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:7300c8a6d13335b29bb76d7651c66af6bd8658517c43499f110ddc6717bfc209", size = 252017, upload-time = "2026-03-17T10:30:27.284Z" }, + { url = "https://files.pythonhosted.org/packages/d6/f6/d0fd2d21e29a657b5f77a2fe7082e1568158340dceb941954f776dce1b7b/coverage-7.13.5-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:eb07647a5738b89baab047f14edd18ded523de60f3b30e75c2acc826f79c839a", size = 250080, upload-time = "2026-03-17T10:30:29.481Z" }, + { url = "https://files.pythonhosted.org/packages/4e/ab/0d7fb2efc2e9a5eb7ddcc6e722f834a69b454b7e6e5888c3a8567ecffb31/coverage-7.13.5-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:9adb6688e3b53adffefd4a52d72cbd8b02602bfb8f74dcd862337182fd4d1a4e", size = 253843, upload-time = "2026-03-17T10:30:31.301Z" }, + { url = "https://files.pythonhosted.org/packages/ba/6f/7467b917bbf5408610178f62a49c0ed4377bb16c1657f689cc61470da8ce/coverage-7.13.5-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:7c8d4bc913dd70b93488d6c496c77f3aff5ea99a07e36a18f865bca55adef8bd", size = 249802, upload-time = "2026-03-17T10:30:33.358Z" }, + { url = "https://files.pythonhosted.org/packages/75/2c/1172fb689df92135f5bfbbd69fc83017a76d24ea2e2f3a1154007e2fb9f8/coverage-7.13.5-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:0e3c426ffc4cd952f54ee9ffbdd10345709ecc78a3ecfd796a57236bfad0b9b8", size = 250707, upload-time = "2026-03-17T10:30:35.2Z" }, + { url = "https://files.pythonhosted.org/packages/67/21/9ac389377380a07884e3b48ba7a620fcd9dbfaf1d40565facdc6b36ec9ef/coverage-7.13.5-cp311-cp311-win32.whl", hash = "sha256:259b69bb83ad9894c4b25be2528139eecba9a82646ebdda2d9db1ba28424a6bf", size = 221880, upload-time = "2026-03-17T10:30:36.775Z" }, + { url = "https://files.pythonhosted.org/packages/af/7f/4cd8a92531253f9d7c1bbecd9fa1b472907fb54446ca768c59b531248dc5/coverage-7.13.5-cp311-cp311-win_amd64.whl", hash = "sha256:258354455f4e86e3e9d0d17571d522e13b4e1e19bf0f8596bcf9476d61e7d8a9", size = 222816, upload-time = "2026-03-17T10:30:38.891Z" }, + { url = "https://files.pythonhosted.org/packages/12/a6/1d3f6155fb0010ca68eba7fe48ca6c9da7385058b77a95848710ecf189b1/coverage-7.13.5-cp311-cp311-win_arm64.whl", hash = "sha256:bff95879c33ec8da99fc9b6fe345ddb5be6414b41d6d1ad1c8f188d26f36e028", size = 221483, upload-time = "2026-03-17T10:30:40.463Z" }, + { url = "https://files.pythonhosted.org/packages/a0/c3/a396306ba7db865bf96fc1fb3b7fd29bcbf3d829df642e77b13555163cd6/coverage-7.13.5-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:460cf0114c5016fa841214ff5564aa4864f11948da9440bc97e21ad1f4ba1e01", size = 219554, upload-time = "2026-03-17T10:30:42.208Z" }, + { url = "https://files.pythonhosted.org/packages/a6/16/a68a19e5384e93f811dccc51034b1fd0b865841c390e3c931dcc4699e035/coverage-7.13.5-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:0e223ce4b4ed47f065bfb123687686512e37629be25cc63728557ae7db261422", size = 219908, upload-time = "2026-03-17T10:30:43.906Z" }, + { url = "https://files.pythonhosted.org/packages/29/72/20b917c6793af3a5ceb7fb9c50033f3ec7865f2911a1416b34a7cfa0813b/coverage-7.13.5-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:6e3370441f4513c6252bf042b9c36d22491142385049243253c7e48398a15a9f", size = 251419, upload-time = "2026-03-17T10:30:45.545Z" }, + { url = "https://files.pythonhosted.org/packages/8c/49/cd14b789536ac6a4778c453c6a2338bc0a2fb60c5a5a41b4008328b9acc1/coverage-7.13.5-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:03ccc709a17a1de074fb1d11f217342fb0d2b1582ed544f554fc9fc3f07e95f5", size = 254159, upload-time = "2026-03-17T10:30:47.204Z" }, + { url = "https://files.pythonhosted.org/packages/9d/00/7b0edcfe64e2ed4c0340dac14a52ad0f4c9bd0b8b5e531af7d55b703db7c/coverage-7.13.5-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3f4818d065964db3c1c66dc0fbdac5ac692ecbc875555e13374fdbe7eedb4376", size = 255270, upload-time = "2026-03-17T10:30:48.812Z" }, + { url = "https://files.pythonhosted.org/packages/93/89/7ffc4ba0f5d0a55c1e84ea7cee39c9fc06af7b170513d83fbf3bbefce280/coverage-7.13.5-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:012d5319e66e9d5a218834642d6c35d265515a62f01157a45bcc036ecf947256", size = 257538, upload-time = "2026-03-17T10:30:50.77Z" }, + { url = "https://files.pythonhosted.org/packages/81/bd/73ddf85f93f7e6fa83e77ccecb6162d9415c79007b4bc124008a4995e4a7/coverage-7.13.5-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:8dd02af98971bdb956363e4827d34425cb3df19ee550ef92855b0acb9c7ce51c", size = 251821, upload-time = "2026-03-17T10:30:52.5Z" }, + { url = "https://files.pythonhosted.org/packages/a0/81/278aff4e8dec4926a0bcb9486320752811f543a3ce5b602cc7a29978d073/coverage-7.13.5-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:f08fd75c50a760c7eb068ae823777268daaf16a80b918fa58eea888f8e3919f5", size = 253191, upload-time = "2026-03-17T10:30:54.543Z" }, + { url = "https://files.pythonhosted.org/packages/70/ee/fe1621488e2e0a58d7e94c4800f0d96f79671553488d401a612bebae324b/coverage-7.13.5-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:843ea8643cf967d1ac7e8ecd4bb00c99135adf4816c0c0593fdcc47b597fcf09", size = 251337, upload-time = "2026-03-17T10:30:56.663Z" }, + { url = "https://files.pythonhosted.org/packages/37/a6/f79fb37aa104b562207cc23cb5711ab6793608e246cae1e93f26b2236ed9/coverage-7.13.5-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:9d44d7aa963820b1b971dbecd90bfe5fe8f81cff79787eb6cca15750bd2f79b9", size = 255404, upload-time = "2026-03-17T10:30:58.427Z" }, + { url = "https://files.pythonhosted.org/packages/75/f0/ed15262a58ec81ce457ceb717b7f78752a1713556b19081b76e90896e8d4/coverage-7.13.5-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:7132bed4bd7b836200c591410ae7d97bf7ae8be6fc87d160b2bd881df929e7bf", size = 250903, upload-time = "2026-03-17T10:31:00.093Z" }, + { url = "https://files.pythonhosted.org/packages/0f/e9/9129958f20e7e9d4d56d51d42ccf708d15cac355ff4ac6e736e97a9393d2/coverage-7.13.5-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:a698e363641b98843c517817db75373c83254781426e94ada3197cabbc2c919c", size = 252780, upload-time = "2026-03-17T10:31:01.916Z" }, + { url = "https://files.pythonhosted.org/packages/a4/d7/0ad9b15812d81272db94379fe4c6df8fd17781cc7671fdfa30c76ba5ff7b/coverage-7.13.5-cp312-cp312-win32.whl", hash = "sha256:bdba0a6b8812e8c7df002d908a9a2ea3c36e92611b5708633c50869e6d922fdf", size = 222093, upload-time = "2026-03-17T10:31:03.642Z" }, + { url = "https://files.pythonhosted.org/packages/29/3d/821a9a5799fac2556bcf0bd37a70d1d11fa9e49784b6d22e92e8b2f85f18/coverage-7.13.5-cp312-cp312-win_amd64.whl", hash = "sha256:d2c87e0c473a10bffe991502eac389220533024c8082ec1ce849f4218dded810", size = 222900, upload-time = "2026-03-17T10:31:05.651Z" }, + { url = "https://files.pythonhosted.org/packages/d4/fa/2238c2ad08e35cf4f020ea721f717e09ec3152aea75d191a7faf3ef009a8/coverage-7.13.5-cp312-cp312-win_arm64.whl", hash = "sha256:bf69236a9a81bdca3bff53796237aab096cdbf8d78a66ad61e992d9dac7eb2de", size = 221515, upload-time = "2026-03-17T10:31:07.293Z" }, + { url = "https://files.pythonhosted.org/packages/9e/ee/a4cf96b8ce1e566ed238f0659ac2d3f007ed1d14b181bcb684e19561a69a/coverage-7.13.5-py3-none-any.whl", hash = "sha256:34b02417cf070e173989b3db962f7ed56d2f644307b2cf9d5a0f258e13084a61", size = 211346, upload-time = "2026-03-17T10:33:15.691Z" }, ] [[package]] name = "cppcheck" version = "2.16.0" -source = { git = "https://github.com/commaai/dependencies.git?subdirectory=cppcheck&rev=release-cppcheck#0959690309f35f803ed161f774b1ce1ae1070f60" } +source = { git = "https://github.com/commaai/dependencies.git?subdirectory=cppcheck&rev=release-cppcheck#72fa6116c0e5be735e9a5974544f83868e3402d6" } [[package]] name = "cpplint" @@ -526,27 +526,27 @@ wheels = [ [[package]] name = "ruff" -version = "0.15.6" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/51/df/f8629c19c5318601d3121e230f74cbee7a3732339c52b21daa2b82ef9c7d/ruff-0.15.6.tar.gz", hash = "sha256:8394c7bb153a4e3811a4ecdacd4a8e6a4fa8097028119160dffecdcdf9b56ae4", size = 4597916, upload-time = "2026-03-12T23:05:47.51Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/9e/2f/4e03a7e5ce99b517e98d3b4951f411de2b0fa8348d39cf446671adcce9a2/ruff-0.15.6-py3-none-linux_armv6l.whl", hash = "sha256:7c98c3b16407b2cf3d0f2b80c80187384bc92c6774d85fefa913ecd941256fff", size = 10508953, upload-time = "2026-03-12T23:05:17.246Z" }, - { url = "https://files.pythonhosted.org/packages/70/60/55bcdc3e9f80bcf39edf0cd272da6fa511a3d94d5a0dd9e0adf76ceebdb4/ruff-0.15.6-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:ee7dcfaad8b282a284df4aa6ddc2741b3f4a18b0555d626805555a820ea181c3", size = 10942257, upload-time = "2026-03-12T23:05:23.076Z" }, - { url = "https://files.pythonhosted.org/packages/e7/f9/005c29bd1726c0f492bfa215e95154cf480574140cb5f867c797c18c790b/ruff-0.15.6-py3-none-macosx_11_0_arm64.whl", hash = "sha256:3bd9967851a25f038fc8b9ae88a7fbd1b609f30349231dffaa37b6804923c4bb", size = 10322683, upload-time = "2026-03-12T23:05:33.738Z" }, - { url = "https://files.pythonhosted.org/packages/5f/74/2f861f5fd7cbb2146bddb5501450300ce41562da36d21868c69b7a828169/ruff-0.15.6-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:13f4594b04e42cd24a41da653886b04d2ff87adbf57497ed4f728b0e8a4866f8", size = 10660986, upload-time = "2026-03-12T23:05:53.245Z" }, - { url = "https://files.pythonhosted.org/packages/c1/a1/309f2364a424eccb763cdafc49df843c282609f47fe53aa83f38272389e0/ruff-0.15.6-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e2ed8aea2f3fe57886d3f00ea5b8aae5bf68d5e195f487f037a955ff9fbaac9e", size = 10332177, upload-time = "2026-03-12T23:05:56.145Z" }, - { url = "https://files.pythonhosted.org/packages/30/41/7ebf1d32658b4bab20f8ac80972fb19cd4e2c6b78552be263a680edc55ac/ruff-0.15.6-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:70789d3e7830b848b548aae96766431c0dc01a6c78c13381f423bf7076c66d15", size = 11170783, upload-time = "2026-03-12T23:06:01.742Z" }, - { url = "https://files.pythonhosted.org/packages/76/be/6d488f6adca047df82cd62c304638bcb00821c36bd4881cfca221561fdfc/ruff-0.15.6-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:542aaf1de3154cea088ced5a819ce872611256ffe2498e750bbae5247a8114e9", size = 12044201, upload-time = "2026-03-12T23:05:28.697Z" }, - { url = "https://files.pythonhosted.org/packages/71/68/e6f125df4af7e6d0b498f8d373274794bc5156b324e8ab4bf5c1b4fc0ec7/ruff-0.15.6-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1c22e6f02c16cfac3888aa636e9eba857254d15bbacc9906c9689fdecb1953ab", size = 11421561, upload-time = "2026-03-12T23:05:31.236Z" }, - { url = "https://files.pythonhosted.org/packages/f1/9f/f85ef5fd01a52e0b472b26dc1b4bd228b8f6f0435975442ffa4741278703/ruff-0.15.6-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:98893c4c0aadc8e448cfa315bd0cc343a5323d740fe5f28ef8a3f9e21b381f7e", size = 11310928, upload-time = "2026-03-12T23:05:45.288Z" }, - { url = "https://files.pythonhosted.org/packages/8c/26/b75f8c421f5654304b89471ed384ae8c7f42b4dff58fa6ce1626d7f2b59a/ruff-0.15.6-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:70d263770d234912374493e8cc1e7385c5d49376e41dfa51c5c3453169dc581c", size = 11235186, upload-time = "2026-03-12T23:05:50.677Z" }, - { url = "https://files.pythonhosted.org/packages/fc/d4/d5a6d065962ff7a68a86c9b4f5500f7d101a0792078de636526c0edd40da/ruff-0.15.6-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:55a1ad63c5a6e54b1f21b7514dfadc0c7fb40093fa22e95143cf3f64ebdcd512", size = 10635231, upload-time = "2026-03-12T23:05:37.044Z" }, - { url = "https://files.pythonhosted.org/packages/d6/56/7c3acf3d50910375349016cf33de24be021532042afbed87942858992491/ruff-0.15.6-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:8dc473ba093c5ec238bb1e7429ee676dca24643c471e11fbaa8a857925b061c0", size = 10340357, upload-time = "2026-03-12T23:06:04.748Z" }, - { url = "https://files.pythonhosted.org/packages/06/54/6faa39e9c1033ff6a3b6e76b5df536931cd30caf64988e112bbf91ef5ce5/ruff-0.15.6-py3-none-musllinux_1_2_i686.whl", hash = "sha256:85b042377c2a5561131767974617006f99f7e13c63c111b998f29fc1e58a4cfb", size = 10860583, upload-time = "2026-03-12T23:05:58.978Z" }, - { url = "https://files.pythonhosted.org/packages/cb/1e/509a201b843b4dfb0b32acdedf68d951d3377988cae43949ba4c4133a96a/ruff-0.15.6-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:cef49e30bc5a86a6a92098a7fbf6e467a234d90b63305d6f3ec01225a9d092e0", size = 11410976, upload-time = "2026-03-12T23:05:39.955Z" }, - { url = "https://files.pythonhosted.org/packages/6c/25/3fc9114abf979a41673ce877c08016f8e660ad6cf508c3957f537d2e9fa9/ruff-0.15.6-py3-none-win32.whl", hash = "sha256:bbf67d39832404812a2d23020dda68fee7f18ce15654e96fb1d3ad21a5fe436c", size = 10616872, upload-time = "2026-03-12T23:05:42.451Z" }, - { url = "https://files.pythonhosted.org/packages/89/7a/09ece68445ceac348df06e08bf75db72d0e8427765b96c9c0ffabc1be1d9/ruff-0.15.6-py3-none-win_amd64.whl", hash = "sha256:aee25bc84c2f1007ecb5037dff75cef00414fdf17c23f07dc13e577883dca406", size = 11787271, upload-time = "2026-03-12T23:05:20.168Z" }, - { url = "https://files.pythonhosted.org/packages/7f/d0/578c47dd68152ddddddf31cd7fc67dc30b7cdf639a86275fda821b0d9d98/ruff-0.15.6-py3-none-win_arm64.whl", hash = "sha256:c34de3dd0b0ba203be50ae70f5910b17188556630e2178fd7d79fc030eb0d837", size = 11060497, upload-time = "2026-03-12T23:05:25.968Z" }, +version = "0.15.7" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/a1/22/9e4f66ee588588dc6c9af6a994e12d26e19efbe874d1a909d09a6dac7a59/ruff-0.15.7.tar.gz", hash = "sha256:04f1ae61fc20fe0b148617c324d9d009b5f63412c0b16474f3d5f1a1a665f7ac", size = 4601277, upload-time = "2026-03-19T16:26:22.605Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/41/2f/0b08ced94412af091807b6119ca03755d651d3d93a242682bf020189db94/ruff-0.15.7-py3-none-linux_armv6l.whl", hash = "sha256:a81cc5b6910fb7dfc7c32d20652e50fa05963f6e13ead3c5915c41ac5d16668e", size = 10489037, upload-time = "2026-03-19T16:26:32.47Z" }, + { url = "https://files.pythonhosted.org/packages/91/4a/82e0fa632e5c8b1eba5ee86ecd929e8ff327bbdbfb3c6ac5d81631bef605/ruff-0.15.7-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:722d165bd52403f3bdabc0ce9e41fc47070ac56d7a91b4e0d097b516a53a3477", size = 10955433, upload-time = "2026-03-19T16:27:00.205Z" }, + { url = "https://files.pythonhosted.org/packages/ab/10/12586735d0ff42526ad78c049bf51d7428618c8b5c467e72508c694119df/ruff-0.15.7-py3-none-macosx_11_0_arm64.whl", hash = "sha256:7fbc2448094262552146cbe1b9643a92f66559d3761f1ad0656d4991491af49e", size = 10269302, upload-time = "2026-03-19T16:26:26.183Z" }, + { url = "https://files.pythonhosted.org/packages/eb/5d/32b5c44ccf149a26623671df49cbfbd0a0ae511ff3df9d9d2426966a8d57/ruff-0.15.7-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6b39329b60eba44156d138275323cc726bbfbddcec3063da57caa8a8b1d50adf", size = 10607625, upload-time = "2026-03-19T16:27:03.263Z" }, + { url = "https://files.pythonhosted.org/packages/5d/f1/f0001cabe86173aaacb6eb9bb734aa0605f9a6aa6fa7d43cb49cbc4af9c9/ruff-0.15.7-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:87768c151808505f2bfc93ae44e5f9e7c8518943e5074f76ac21558ef5627c85", size = 10324743, upload-time = "2026-03-19T16:27:09.791Z" }, + { url = "https://files.pythonhosted.org/packages/7a/87/b8a8f3d56b8d848008559e7c9d8bf367934d5367f6d932ba779456e2f73b/ruff-0.15.7-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fb0511670002c6c529ec66c0e30641c976c8963de26a113f3a30456b702468b0", size = 11138536, upload-time = "2026-03-19T16:27:06.101Z" }, + { url = "https://files.pythonhosted.org/packages/e4/f2/4fd0d05aab0c5934b2e1464784f85ba2eab9d54bffc53fb5430d1ed8b829/ruff-0.15.7-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e0d19644f801849229db8345180a71bee5407b429dd217f853ec515e968a6912", size = 11994292, upload-time = "2026-03-19T16:26:48.718Z" }, + { url = "https://files.pythonhosted.org/packages/64/22/fc4483871e767e5e95d1622ad83dad5ebb830f762ed0420fde7dfa9d9b08/ruff-0.15.7-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4806d8e09ef5e84eb19ba833d0442f7e300b23fe3f0981cae159a248a10f0036", size = 11398981, upload-time = "2026-03-19T16:26:54.513Z" }, + { url = "https://files.pythonhosted.org/packages/b0/99/66f0343176d5eab02c3f7fcd2de7a8e0dd7a41f0d982bee56cd1c24db62b/ruff-0.15.7-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dce0896488562f09a27b9c91b1f58a097457143931f3c4d519690dea54e624c5", size = 11242422, upload-time = "2026-03-19T16:26:29.277Z" }, + { url = "https://files.pythonhosted.org/packages/5d/3a/a7060f145bfdcce4c987ea27788b30c60e2c81d6e9a65157ca8afe646328/ruff-0.15.7-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:1852ce241d2bc89e5dc823e03cff4ce73d816b5c6cdadd27dbfe7b03217d2a12", size = 11232158, upload-time = "2026-03-19T16:26:42.321Z" }, + { url = "https://files.pythonhosted.org/packages/a7/53/90fbb9e08b29c048c403558d3cdd0adf2668b02ce9d50602452e187cd4af/ruff-0.15.7-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:5f3e4b221fb4bd293f79912fc5e93a9063ebd6d0dcbd528f91b89172a9b8436c", size = 10577861, upload-time = "2026-03-19T16:26:57.459Z" }, + { url = "https://files.pythonhosted.org/packages/2f/aa/5f486226538fe4d0f0439e2da1716e1acf895e2a232b26f2459c55f8ddad/ruff-0.15.7-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:b15e48602c9c1d9bdc504b472e90b90c97dc7d46c7028011ae67f3861ceba7b4", size = 10327310, upload-time = "2026-03-19T16:26:35.909Z" }, + { url = "https://files.pythonhosted.org/packages/99/9e/271afdffb81fe7bfc8c43ba079e9d96238f674380099457a74ccb3863857/ruff-0.15.7-py3-none-musllinux_1_2_i686.whl", hash = "sha256:1b4705e0e85cedc74b0a23cf6a179dbb3df184cb227761979cc76c0440b5ab0d", size = 10840752, upload-time = "2026-03-19T16:26:45.723Z" }, + { url = "https://files.pythonhosted.org/packages/bf/29/a4ae78394f76c7759953c47884eb44de271b03a66634148d9f7d11e721bd/ruff-0.15.7-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:112c1fa316a558bb34319282c1200a8bf0495f1b735aeb78bfcb2991e6087580", size = 11336961, upload-time = "2026-03-19T16:26:39.076Z" }, + { url = "https://files.pythonhosted.org/packages/26/6b/8786ba5736562220d588a2f6653e6c17e90c59ced34a2d7b512ef8956103/ruff-0.15.7-py3-none-win32.whl", hash = "sha256:6d39e2d3505b082323352f733599f28169d12e891f7dd407f2d4f54b4c2886de", size = 10582538, upload-time = "2026-03-19T16:26:15.992Z" }, + { url = "https://files.pythonhosted.org/packages/2b/e9/346d4d3fffc6871125e877dae8d9a1966b254fbd92a50f8561078b88b099/ruff-0.15.7-py3-none-win_amd64.whl", hash = "sha256:4d53d712ddebcd7dace1bc395367aec12c057aacfe9adbb6d832302575f4d3a1", size = 11755839, upload-time = "2026-03-19T16:26:19.897Z" }, + { url = "https://files.pythonhosted.org/packages/8f/e8/726643a3ea68c727da31570bde48c7a10f1aa60eddd628d94078fec586ff/ruff-0.15.7-py3-none-win_arm64.whl", hash = "sha256:18e8d73f1c3fdf27931497972250340f92e8c861722161a9caeb89a58ead6ed2", size = 11023304, upload-time = "2026-03-19T16:26:51.669Z" }, ] [[package]] @@ -609,26 +609,26 @@ wheels = [ [[package]] name = "ty" -version = "0.0.23" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/75/ba/d3c998ff4cf6b5d75b39356db55fe1b7caceecc522b9586174e6a5dee6f7/ty-0.0.23.tar.gz", hash = "sha256:5fb05db58f202af366f80ef70f806e48f5237807fe424ec787c9f289e3f3a4ef", size = 5341461, upload-time = "2026-03-13T12:34:23.125Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/f4/21/aab32603dfdfacd4819e52fa8c6074e7bd578218a5142729452fc6a62db6/ty-0.0.23-py3-none-linux_armv6l.whl", hash = "sha256:e810eef1a5f1cfc0731a58af8d2f334906a96835829767aed00026f1334a8dd7", size = 10329096, upload-time = "2026-03-13T12:34:09.432Z" }, - { url = "https://files.pythonhosted.org/packages/9f/a9/dd3287a82dce3df546ec560296208d4905dcf06346b6e18c2f3c63523bd1/ty-0.0.23-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:e43d36bd89a151ddcad01acaeff7dcc507cb73ff164c1878d2d11549d39a061c", size = 10156631, upload-time = "2026-03-13T12:34:53.122Z" }, - { url = "https://files.pythonhosted.org/packages/0f/01/3f25909b02fac29bb0a62b2251f8d62e65d697781ffa4cf6b47a4c075c85/ty-0.0.23-py3-none-macosx_11_0_arm64.whl", hash = "sha256:bd6a340969577b4645f231572c4e46012acba2d10d4c0c6570fe1ab74e76ae00", size = 9653211, upload-time = "2026-03-13T12:34:15.049Z" }, - { url = "https://files.pythonhosted.org/packages/d5/60/bfc0479572a6f4b90501c869635faf8d84c8c68ffc5dd87d04f049affabc/ty-0.0.23-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:341441783e626eeb7b1ec2160432956aed5734932ab2d1c26f94d0c98b229937", size = 10156143, upload-time = "2026-03-13T12:34:34.468Z" }, - { url = "https://files.pythonhosted.org/packages/3a/81/8a93e923535a340f54bea20ff196f6b2787782b2f2f399bd191c4bc132d6/ty-0.0.23-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:8ce1dc66c26d4167e2c78d12fa870ef5a7ec9cc344d2baaa6243297cfa88bd52", size = 10136632, upload-time = "2026-03-13T12:34:28.832Z" }, - { url = "https://files.pythonhosted.org/packages/da/cb/2ac81c850c58acc9f976814404d28389c9c1c939676e32287b9cff61381e/ty-0.0.23-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bae1e7a294bf8528836f7617dc5c360ea2dddb63789fc9471ae6753534adca05", size = 10655025, upload-time = "2026-03-13T12:34:37.105Z" }, - { url = "https://files.pythonhosted.org/packages/b5/9b/bac771774c198c318ae699fc013d8cd99ed9caf993f661fba11238759244/ty-0.0.23-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d2b162768764d9dc177c83fb497a51532bb67cbebe57b8fa0f2668436bf53f3c", size = 11230107, upload-time = "2026-03-13T12:34:20.751Z" }, - { url = "https://files.pythonhosted.org/packages/14/09/7644fb0e297265e18243f878aca343593323b9bb19ed5278dcbc63781be0/ty-0.0.23-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d28384e48ca03b34e4e2beee0e230c39bbfb68994bb44927fec61ef3642900da", size = 10934177, upload-time = "2026-03-13T12:34:17.904Z" }, - { url = "https://files.pythonhosted.org/packages/18/14/69a25a0cad493fb6a947302471b579a03516a3b00e7bece77fdc6b4afb9b/ty-0.0.23-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:559d9a299df793cb7a7902caed5eda8a720ff69164c31c979673e928f02251ee", size = 10752487, upload-time = "2026-03-13T12:34:31.785Z" }, - { url = "https://files.pythonhosted.org/packages/9d/2a/42fc3cbccf95af0a62308ebed67e084798ab7a85ef073c9986ef18032743/ty-0.0.23-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:32a7b8a14a98e1d20a9d8d2af23637ed7efdb297ac1fa2450b8e465d05b94482", size = 10133007, upload-time = "2026-03-13T12:34:42.838Z" }, - { url = "https://files.pythonhosted.org/packages/e1/69/307833f1b52fa3670e0a1d496e43ef7df556ecde838192d3fcb9b35e360d/ty-0.0.23-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:6f803b9b9cca87af793467973b9abdd4b83e6b96d9b5e749d662cff7ead70b6d", size = 10169698, upload-time = "2026-03-13T12:34:12.351Z" }, - { url = "https://files.pythonhosted.org/packages/89/ae/5dd379ec22d0b1cba410d7af31c366fcedff191d5b867145913a64889f66/ty-0.0.23-py3-none-musllinux_1_2_i686.whl", hash = "sha256:4a0bf086ec8e2197b7ea7ebfcf4be36cb6a52b235f8be61647ef1b2d99d6ffd3", size = 10346080, upload-time = "2026-03-13T12:34:40.012Z" }, - { url = "https://files.pythonhosted.org/packages/98/c7/dfc83203d37998620bba9c4873a080c8850a784a8a46f56f8163c5b4e320/ty-0.0.23-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:252539c3fcd7aeb9b8d5c14e2040682c3e1d7ff640906d63fd2c4ce35865a4ba", size = 10848162, upload-time = "2026-03-13T12:34:45.421Z" }, - { url = "https://files.pythonhosted.org/packages/89/08/05481511cfbcc1fd834b6c67aaae090cb609a079189ddf2032139ccfc490/ty-0.0.23-py3-none-win32.whl", hash = "sha256:51b591d19eef23bbc3807aef77d38fa1f003c354e1da908aa80ea2dca0993f77", size = 9748283, upload-time = "2026-03-13T12:34:50.607Z" }, - { url = "https://files.pythonhosted.org/packages/31/2e/eaed4ff5c85e857a02415084c394e02c30476b65e158eec1938fdaa9a205/ty-0.0.23-py3-none-win_amd64.whl", hash = "sha256:1e137e955f05c501cfbb81dd2190c8fb7d01ec037c7e287024129c722a83c9ad", size = 10698355, upload-time = "2026-03-13T12:34:26.134Z" }, - { url = "https://files.pythonhosted.org/packages/91/29/b32cb7b4c7d56b9ed50117f8ad6e45834aec293e4cb14749daab4e9236d5/ty-0.0.23-py3-none-win_arm64.whl", hash = "sha256:a0399bd13fd2cd6683fd0a2d59b9355155d46546d8203e152c556ddbdeb20842", size = 10155890, upload-time = "2026-03-13T12:34:48.082Z" }, +version = "0.0.24" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/7a/96/652a425030f95dc2c9548d9019e52502e17079e1daeefbc4036f1c0905b4/ty-0.0.24.tar.gz", hash = "sha256:9fe42f6b98207bdaef51f71487d6d087f2cb02555ee3939884d779b2b3cc8bfc", size = 5354286, upload-time = "2026-03-19T16:55:57.035Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/da/e5/34457ee11708e734ba81ad65723af83030e484f961e281d57d1eecf08951/ty-0.0.24-py3-none-linux_armv6l.whl", hash = "sha256:1ab4f1f61334d533a3fdf5d9772b51b1300ac5da4f3cdb0be9657a3ccb2ce3e7", size = 10394877, upload-time = "2026-03-19T16:55:54.246Z" }, + { url = "https://files.pythonhosted.org/packages/44/81/bc9a1b1a87f43db15ab64ad781a4f999734ec3b470ad042624fa875b20e6/ty-0.0.24-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:facbf2c4aaa6985229e08f8f9bf152215eb078212f22b5c2411f35386688ab42", size = 10211109, upload-time = "2026-03-19T16:55:28.554Z" }, + { url = "https://files.pythonhosted.org/packages/e4/63/cfc805adeaa61d63ba3ea71127efa7d97c40ba36d97ee7bd957341d05107/ty-0.0.24-py3-none-macosx_11_0_arm64.whl", hash = "sha256:b6d2a3b6d4470c483552a31e9b368c86f154dcc964bccb5406159dc9cd362246", size = 9694769, upload-time = "2026-03-19T16:55:34.309Z" }, + { url = "https://files.pythonhosted.org/packages/33/09/edc220726b6ec44a58900401f6b27140997ef15026b791e26b69a6e69eb5/ty-0.0.24-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0c94c25d0500939fd5f8f16ce41cbed5b20528702c1d649bf80300253813f0a2", size = 10176287, upload-time = "2026-03-19T16:55:37.17Z" }, + { url = "https://files.pythonhosted.org/packages/f8/bf/cbe2227be711e65017655d8ee4d050f4c92b113fb4dc4c3bd6a19d3a86d8/ty-0.0.24-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:89cbe7bc7df0fab02dbd8cda79b737df83f1ef7fb573b08c0ee043dc68cffb08", size = 10214832, upload-time = "2026-03-19T16:56:08.518Z" }, + { url = "https://files.pythonhosted.org/packages/af/1d/d15803ee47e9143d10e10bd81ccc14761d08758082bda402950685f0ddfe/ty-0.0.24-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:db2c5d269bcc9b764850c99f457b5018a79b3ef40ecfbc03344e65effd6cf743", size = 10709892, upload-time = "2026-03-19T16:56:05.727Z" }, + { url = "https://files.pythonhosted.org/packages/36/12/6db0d86c477147f67b9052de209421d76c3e855197b000c25fcbbe86b3a2/ty-0.0.24-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ba44512db5b97c3bbd59d93e11296e8548d0c9a3bdd1280de36d7ff22d351896", size = 11280872, upload-time = "2026-03-19T16:56:02.899Z" }, + { url = "https://files.pythonhosted.org/packages/1b/fc/155fe83a97c06d33ccc9e0f428258b32df2e08a428300c715d34757f0111/ty-0.0.24-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a52b7f589c3205512a9c50ba5b2b1e8c0698b72e51b8b9285c90420c06f1cae8", size = 11060520, upload-time = "2026-03-19T16:55:59.956Z" }, + { url = "https://files.pythonhosted.org/packages/ac/f1/32c05a1c4c3c2a95c5b7361dee03a9bf1231d4ad096b161c838b45bce5a0/ty-0.0.24-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7981df5c709c054da4ac5d7c93f8feb8f45e69e829e4461df4d5f0988fe67d04", size = 10791455, upload-time = "2026-03-19T16:55:25.728Z" }, + { url = "https://files.pythonhosted.org/packages/17/2c/53c1ea6bedfa4d4ab64d4de262d8f5e405ecbffefd364459c628c0310d33/ty-0.0.24-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:b2860151ad95a00d0f0280b8fef79900d08dcd63276b57e6e5774f2c055979c5", size = 10156708, upload-time = "2026-03-19T16:55:45.563Z" }, + { url = "https://files.pythonhosted.org/packages/45/39/7d2919cf194707169474d80720a5f3d793e983416f25e7ffcf80504c9df2/ty-0.0.24-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:5674a1146d927ab77ff198a88e0c4505134ced342a0e7d1beb4a076a728b7496", size = 10236263, upload-time = "2026-03-19T16:55:31.474Z" }, + { url = "https://files.pythonhosted.org/packages/cf/7f/48eac722f2fd12a5b7aae0effdcb75c46053f94b783d989e3ef0d7380082/ty-0.0.24-py3-none-musllinux_1_2_i686.whl", hash = "sha256:438ecbf1608a9b16dd84502f3f1b23ef2ef32bbd0ab3e0ca5a82f0e0d1cd41ea", size = 10402559, upload-time = "2026-03-19T16:55:39.602Z" }, + { url = "https://files.pythonhosted.org/packages/75/e0/8cf868b9749ce1e5166462759545964e95b02353243594062b927d8bff2a/ty-0.0.24-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:ddeed3098dd92a83964e7aa7b41e509ba3530eb539fc4cd8322ff64a09daf1f5", size = 10893684, upload-time = "2026-03-19T16:55:51.439Z" }, + { url = "https://files.pythonhosted.org/packages/17/9f/f54bf3be01d2c2ed731d10a5afa3324dc66f987a6ae0a4a6cbfa2323d080/ty-0.0.24-py3-none-win32.whl", hash = "sha256:83013fb3a4764a8f8bcc6ca11ff8bdfd8c5f719fc249241cb2b8916e80778eb1", size = 9781542, upload-time = "2026-03-19T16:56:11.588Z" }, + { url = "https://files.pythonhosted.org/packages/fb/49/c004c5cc258b10b3a145666e9a9c28ae7678bc958c8926e8078d5d769081/ty-0.0.24-py3-none-win_amd64.whl", hash = "sha256:748a60eb6912d1cf27aaab105ffadb6f4d2e458a3fcadfbd3cf26db0d8062eeb", size = 10764801, upload-time = "2026-03-19T16:55:42.752Z" }, + { url = "https://files.pythonhosted.org/packages/e2/59/006a074e185bfccf5e4c026015245ab4fcd2362b13a8d24cf37a277909a9/ty-0.0.24-py3-none-win_arm64.whl", hash = "sha256:280a3d31e86d0721947238f17030c33f0911cae851d108ea9f4e3ab12a5ed01f", size = 10194093, upload-time = "2026-03-19T16:55:48.303Z" }, ] [[package]] From e72e18e113b8649fdda3e78b85110586751f1a81 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Mon, 23 Mar 2026 22:02:42 -0700 Subject: [PATCH 156/229] fw query: remove aux panda support (#3225) * start * rm more * fix test * rm num_pandas * more * ruff --- opendbc/car/car_helpers.py | 10 +-- opendbc/car/ford/values.py | 1 - opendbc/car/fw_query_definitions.py | 14 ----- opendbc/car/fw_versions.py | 16 ++--- opendbc/car/hyundai/values.py | 5 -- opendbc/car/tests/test_fw_fingerprint.py | 78 ++++++++++-------------- 6 files changed, 42 insertions(+), 82 deletions(-) diff --git a/opendbc/car/car_helpers.py b/opendbc/car/car_helpers.py index dfda0155257..21e67adf7dc 100644 --- a/opendbc/car/car_helpers.py +++ b/opendbc/car/car_helpers.py @@ -81,7 +81,7 @@ def can_fingerprint(can_recv: CanRecvCallable) -> tuple[str | None, dict[int, di # **** for use live only **** -def fingerprint(can_recv: CanRecvCallable, can_send: CanSendCallable, set_obd_multiplexing: ObdCallback, num_pandas: int, +def fingerprint(can_recv: CanRecvCallable, can_send: CanSendCallable, set_obd_multiplexing: ObdCallback, cached_params: CarParamsT | None) -> tuple[str | None, dict, str, list[CarParams.CarFw], CarParams.FingerprintSource, bool]: fixed_fingerprint = os.environ.get('FINGERPRINT', "") skip_fw_query = os.environ.get('SKIP_FW_QUERY', False) @@ -103,8 +103,8 @@ def fingerprint(can_recv: CanRecvCallable, can_send: CanSendCallable, set_obd_mu set_obd_multiplexing(True) # VIN query only reliably works through OBDII vin_rx_addr, vin_rx_bus, vin = get_vin(can_recv, can_send, (0, 1)) - ecu_rx_addrs = get_present_ecus(can_recv, can_send, set_obd_multiplexing, num_pandas=num_pandas) - car_fw = get_fw_versions_ordered(can_recv, can_send, set_obd_multiplexing, vin, ecu_rx_addrs, num_pandas=num_pandas) + ecu_rx_addrs = get_present_ecus(can_recv, can_send, set_obd_multiplexing) + car_fw = get_fw_versions_ordered(can_recv, can_send, set_obd_multiplexing, vin, ecu_rx_addrs) cached = False exact_fw_match, fw_candidates = match_fw_to_car(car_fw, vin) @@ -149,8 +149,8 @@ def fingerprint(can_recv: CanRecvCallable, can_send: CanSendCallable, set_obd_mu def get_car(can_recv: CanRecvCallable, can_send: CanSendCallable, set_obd_multiplexing: ObdCallback, alpha_long_allowed: bool, - is_release: bool, num_pandas: int = 1, cached_params: CarParamsT | None = None): - candidate, fingerprints, vin, car_fw, source, exact_match = fingerprint(can_recv, can_send, set_obd_multiplexing, num_pandas, cached_params) + is_release: bool, cached_params: CarParamsT | None = None): + candidate, fingerprints, vin, car_fw, source, exact_match = fingerprint(can_recv, can_send, set_obd_multiplexing, cached_params) if candidate is None: carlog.error({"event": "car doesn't match any fingerprints", "fingerprints": repr(fingerprints)}) diff --git a/opendbc/car/ford/values.py b/opendbc/car/ford/values.py index 6b8c1b3cac3..beb4fb08ce4 100644 --- a/opendbc/car/ford/values.py +++ b/opendbc/car/ford/values.py @@ -292,7 +292,6 @@ def ford_asbuilt_block_response(block_id: int): [StdQueries.TESTER_PRESENT_RESPONSE, StdQueries.MANUFACTURER_SOFTWARE_VERSION_RESPONSE], whitelist_ecus=[Ecu.abs, Ecu.debug, Ecu.engine, Ecu.eps, Ecu.fwdCamera, Ecu.fwdRadar, Ecu.shiftByWire], bus=0, - auxiliary=True, ), *[Request( [StdQueries.TESTER_PRESENT_REQUEST, ford_asbuilt_block_request(block_id)], diff --git a/opendbc/car/fw_query_definitions.py b/opendbc/car/fw_query_definitions.py index 5c48fed6a1e..2d0656fcbd3 100644 --- a/opendbc/car/fw_query_definitions.py +++ b/opendbc/car/fw_query_definitions.py @@ -1,4 +1,3 @@ -import copy from dataclasses import dataclass, field import struct from collections.abc import Callable @@ -90,8 +89,6 @@ class Request: whitelist_ecus: list[Ecu] = field(default_factory=list) rx_offset: int = 0x8 bus: int = 1 - # Whether this query should be run on the first auxiliary panda (CAN FD cars for example) - auxiliary: bool = False # FW responses from these queries will not be used for fingerprinting logging: bool = False # pandad toggles OBD multiplexing on/off as needed @@ -130,17 +127,6 @@ def __post_init__(self): assert len(request_obj.request) == len(request_obj.response), ("Request and response lengths do not match: " + f"{request_obj.request} vs. {request_obj.response}") - # No request on the OBD port (bus 1, multiplexed) should be run on an aux panda - assert not (request_obj.auxiliary and request_obj.bus == 1 and request_obj.obd_multiplexing), ("OBD multiplexed request should not " + - f"be marked auxiliary: {request_obj}") - - # Add aux requests (second panda) for all requests that are marked as auxiliary - for i in range(len(self.requests)): - if self.requests[i].auxiliary: - new_request = copy.deepcopy(self.requests[i]) - new_request.bus += 4 - self.requests.append(new_request) - def get_all_ecus(self, offline_fw_versions: OfflineFwVersions, include_extra_ecus: bool = True) -> set[EcuAddrSubAddr]: # Add ecus in database + extra ecus diff --git a/opendbc/car/fw_versions.py b/opendbc/car/fw_versions.py index 8b349b2b6e4..d672b039984 100644 --- a/opendbc/car/fw_versions.py +++ b/opendbc/car/fw_versions.py @@ -170,17 +170,13 @@ def match_fw_to_car(fw_versions: list[CarParams.CarFw], vin: str, allow_exact: b return True, set() -def get_present_ecus(can_recv: CanRecvCallable, can_send: CanSendCallable, set_obd_multiplexing: ObdCallback, num_pandas: int = 1) -> set[EcuAddrBusType]: +def get_present_ecus(can_recv: CanRecvCallable, can_send: CanSendCallable, set_obd_multiplexing: ObdCallback) -> set[EcuAddrBusType]: # queries are split by OBD multiplexing mode queries: dict[bool, list[list[EcuAddrBusType]]] = {True: [], False: []} parallel_queries: dict[bool, list[EcuAddrBusType]] = {True: [], False: []} responses: set[EcuAddrBusType] = set() for brand, config, r in REQUESTS: - # Skip query if no panda available - if r.bus > num_pandas * 4 - 1: - continue - for ecu_type, addr, sub_addr in config.get_all_ecus(VERSIONS[brand]): # Only query ecus in whitelist if whitelist is not empty if len(r.whitelist_ecus) == 0 or ecu_type in r.whitelist_ecus: @@ -229,7 +225,7 @@ def get_brand_ecu_matches(ecu_rx_addrs: set[EcuAddrBusType]) -> dict[str, list[b def get_fw_versions_ordered(can_recv: CanRecvCallable, can_send: CanSendCallable, set_obd_multiplexing: ObdCallback, vin: str, - ecu_rx_addrs: set[EcuAddrBusType], timeout: float = 0.1, num_pandas: int = 1, progress: bool = False) -> list[CarParams.CarFw]: + ecu_rx_addrs: set[EcuAddrBusType], timeout: float = 0.1, progress: bool = False) -> list[CarParams.CarFw]: """Queries for FW versions ordering brands by likelihood, breaks when exact match is found""" all_car_fw = [] @@ -242,7 +238,7 @@ def get_fw_versions_ordered(can_recv: CanRecvCallable, can_send: CanSendCallable if True not in brand_matches[brand]: continue - car_fw = get_fw_versions(can_recv, can_send, set_obd_multiplexing, query_brand=brand, timeout=timeout, num_pandas=num_pandas, progress=progress) + car_fw = get_fw_versions(can_recv, can_send, set_obd_multiplexing, query_brand=brand, timeout=timeout, progress=progress) all_car_fw.extend(car_fw) # If there is a match using this brand's FW alone, finish querying early @@ -254,7 +250,7 @@ def get_fw_versions_ordered(can_recv: CanRecvCallable, can_send: CanSendCallable def get_fw_versions(can_recv: CanRecvCallable, can_send: CanSendCallable, set_obd_multiplexing: ObdCallback, query_brand: str | None = None, - extra: OfflineFwVersions | None = None, timeout: float = 0.1, num_pandas: int = 1, progress: bool = False) -> list[CarParams.CarFw]: + extra: OfflineFwVersions | None = None, timeout: float = 0.1, progress: bool = False) -> list[CarParams.CarFw]: versions = VERSIONS.copy() if query_brand is not None: @@ -291,10 +287,6 @@ def get_fw_versions(can_recv: CanRecvCallable, can_send: CanSendCallable, set_ob for addr_group in tqdm(addrs, disable=not progress): # split by subaddr, if any for addr_chunk in chunks(addr_group): for brand, config, r in requests: - # Skip query if no panda available - if r.bus > num_pandas * 4 - 1: - continue - # Toggle OBD multiplexing for each request if r.bus % 4 == 1: set_obd_multiplexing(r.obd_multiplexing) diff --git a/opendbc/car/hyundai/values.py b/opendbc/car/hyundai/values.py index e00734782bf..b0e806b2905 100644 --- a/opendbc/car/hyundai/values.py +++ b/opendbc/car/hyundai/values.py @@ -713,13 +713,11 @@ def match_fw_to_car_fuzzy(live_fw_versions, vin, offline_fw_versions) -> set[str [HYUNDAI_VERSION_REQUEST_LONG], [HYUNDAI_VERSION_RESPONSE], bus=0, - auxiliary=True, ), Request( [HYUNDAI_VERSION_REQUEST_LONG], [HYUNDAI_VERSION_RESPONSE], bus=1, - auxiliary=True, obd_multiplexing=False, ), @@ -729,7 +727,6 @@ def match_fw_to_car_fuzzy(live_fw_versions, vin, offline_fw_versions) -> set[str [HYUNDAI_ECU_MANUFACTURING_DATE], [HYUNDAI_VERSION_RESPONSE], bus=0, - auxiliary=True, logging=True, ), @@ -738,14 +735,12 @@ def match_fw_to_car_fuzzy(live_fw_versions, vin, offline_fw_versions) -> set[str [HYUNDAI_VERSION_REQUEST_ALT], [HYUNDAI_VERSION_RESPONSE], bus=0, - auxiliary=True, logging=True, ), Request( [HYUNDAI_VERSION_REQUEST_ALT], [HYUNDAI_VERSION_RESPONSE], bus=1, - auxiliary=True, logging=True, obd_multiplexing=False, ), diff --git a/opendbc/car/tests/test_fw_fingerprint.py b/opendbc/car/tests/test_fw_fingerprint.py index 2d2b9f2f07e..811347bb365 100644 --- a/opendbc/car/tests/test_fw_fingerprint.py +++ b/opendbc/car/tests/test_fw_fingerprint.py @@ -218,7 +218,7 @@ def fake_get_data(self, timeout): self.total_time += timeout return {} - def _benchmark_brand(self, brand, num_pandas): + def _benchmark_brand(self, brand): self.total_time = 0 with patch("opendbc.car.isotp_parallel_query.IsoTpParallelQuery.get_data", self.fake_get_data): for _ in range(self.N): @@ -226,7 +226,7 @@ def _benchmark_brand(self, brand, num_pandas): self.current_obd_multiplexing = True t = time.perf_counter() - get_fw_versions(self.fake_can_recv, self.fake_can_send, self.fake_set_obd_multiplexing, brand, num_pandas=num_pandas) + get_fw_versions(self.fake_can_recv, self.fake_can_send, self.fake_set_obd_multiplexing, brand) self.total_time += time.perf_counter() - t return self.total_time / self.N @@ -248,7 +248,7 @@ def fake_get_ecu_addrs(*_, timeout): with patch("opendbc.car.fw_versions.get_ecu_addrs", fake_get_ecu_addrs): for _ in range(self.N): self.current_obd_multiplexing = True - get_present_ecus(self.fake_can_recv, self.fake_can_send, self.fake_set_obd_multiplexing, num_pandas=2) + get_present_ecus(self.fake_can_recv, self.fake_can_send, self.fake_set_obd_multiplexing) self._assert_timing(self.total_time / self.N, present_ecu_ref_time) print(f'get_present_ecus, query time={self.total_time / self.N} seconds') @@ -262,51 +262,39 @@ def fake_get_ecu_addrs(*_, timeout): print(f'get_vin {name} case, query time={self.total_time / self.N} seconds') def test_fw_query_timing(self): - total_ref_time = {1: 7.4, 2: 8.0} + total_ref_time = 7.4 brand_ref_times = { - 1: { - 'gm': 1.0, - 'body': 0.1, - 'chrysler': 0.3, - 'ford': 1.5, - 'honda': 0.45, - 'hyundai': 0.65, - 'mazda': 0.1, - 'nissan': 0.8, - 'subaru': 0.65, - 'tesla': 0.1, - 'toyota': 0.7, - 'volkswagen': 0.65, - 'rivian': 0.3, - 'psa': 0.1, - }, - 2: { - 'ford': 1.6, - 'hyundai': 1.15, - } + 'gm': 1.0, + 'body': 0.1, + 'chrysler': 0.3, + 'ford': 1.5, + 'honda': 0.45, + 'hyundai': 0.65, + 'mazda': 0.1, + 'nissan': 0.8, + 'subaru': 0.65, + 'tesla': 0.1, + 'toyota': 0.7, + 'volkswagen': 0.65, + 'rivian': 0.3, + 'psa': 0.1, } - total_times = {1: 0.0, 2: 0.0} - for num_pandas in (1, 2): - for brand, config in FW_QUERY_CONFIGS.items(): - with self.subTest(brand=brand, num_pandas=num_pandas): - avg_time = self._benchmark_brand(brand, num_pandas) - total_times[num_pandas] += avg_time - avg_time = round(avg_time, 2) - - ref_time = brand_ref_times[num_pandas].get(brand) - if ref_time is None: - # ref time should be same as 1 panda if no aux queries - ref_time = brand_ref_times[num_pandas - 1][brand] - - self._assert_timing(avg_time, ref_time) - print(f'{brand=}, {num_pandas=}, {len(config.requests)=}, avg FW query time={avg_time} seconds') - - for num_pandas in (1, 2): - with self.subTest(brand='all_brands', num_pandas=num_pandas): - total_time = round(total_times[num_pandas], 2) - self._assert_timing(total_time, total_ref_time[num_pandas]) - print(f'all brands, total FW query time={total_time} seconds') + total_times = 0.0 + for brand, config in FW_QUERY_CONFIGS.items(): + with self.subTest(brand=brand): + avg_time = self._benchmark_brand(brand) + total_times += avg_time + avg_time = round(avg_time, 2) + + ref_time = brand_ref_times[brand] + self._assert_timing(avg_time, ref_time) + print(f'{brand=}, {len(config.requests)=}, avg FW query time={avg_time} seconds') + + with self.subTest(brand='all_brands'): + total_time = round(total_times, 2) + self._assert_timing(total_time, total_ref_time) + print(f'all brands, total FW query time={total_time} seconds') def test_get_fw_versions(self): # some coverage on IsoTpParallelQuery and panda UDS library From bb979d6b31ad1e2dd333e3e9ce7bd065dc127a68 Mon Sep 17 00:00:00 2001 From: adeebshihadeh Date: Tue, 24 Mar 2026 08:20:30 +0000 Subject: [PATCH 157/229] docs: Scheduled auto-update CARS.md --- docs/CARS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/CARS.md b/docs/CARS.md index 8d80b957cdb..3bfc8cdb199 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -189,7 +189,7 @@ |Kia|Niro EV 2020|All|[Upstream](#upstream)| |Kia|Niro EV 2021|All|[Upstream](#upstream)| |Kia|Niro EV 2022|All|[Upstream](#upstream)| -|Kia|Niro EV (with HDA II) 2025|Highway Driving Assist II|[Upstream](#upstream)| +|Kia|Niro EV (with HDA II) 2024-25|Highway Driving Assist II|[Upstream](#upstream)| |Kia|Niro EV (without HDA II) 2023-25|All|[Upstream](#upstream)| |Kia|Niro Hybrid 2018|Smart Cruise Control (SCC)|[Upstream](#upstream)| |Kia|Niro Hybrid 2021|Smart Cruise Control (SCC)|[Upstream](#upstream)| From e4da7d30d4c93240efe98e3351a39bd44e2e884b Mon Sep 17 00:00:00 2001 From: royjr Date: Wed, 25 Mar 2026 18:23:01 -0400 Subject: [PATCH 158/229] HKG: Hyundai Santa Fe Plug-in Hybrid 2023 Fingerprint (#3215) * Update fingerprints.py * Revert "remove CAN_PACKET_VERSION (#3209)" This reverts commit e994cf5017be41e34bc81a1d959909c7bb69322e. * Reapply "remove CAN_PACKET_VERSION (#3209)" This reverts commit 9f54479eff7f1ee6980f2877633558759117739c. --- opendbc/car/hyundai/fingerprints.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/opendbc/car/hyundai/fingerprints.py b/opendbc/car/hyundai/fingerprints.py index 2241dc353e5..b1cb1867f58 100644 --- a/opendbc/car/hyundai/fingerprints.py +++ b/opendbc/car/hyundai/fingerprints.py @@ -342,8 +342,10 @@ b'\xf1\x00TM MDPS C 1.00 1.02 56310-CLAC0 4TSHC102', b'\xf1\x00TM MDPS C 1.00 1.02 56310-CLEC0 4TSHC102', b'\xf1\x00TM MDPS C 1.00 1.02 56310CLEC0\x00 4TSHC102', + b'\xf1\x00TM MDPS R 1.00 1.06 57700-CL090 4TSHP106', ], (Ecu.fwdCamera, 0x7c4, None): [ + b'\xf1\x00TMP MFC AT EUR RHD 1.00 1.06 99211-S1500 220727', b'\xf1\x00TMP MFC AT USA LHD 1.00 1.03 99211-S1500 210224', b'\xf1\x00TMP MFC AT USA LHD 1.00 1.05 99211-S1500 220126', b'\xf1\x00TMP MFC AT USA LHD 1.00 1.06 99211-S1500 220727', From bfdbdc726a1e62a2ee454b3de4c0f1853ecdafd0 Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Wed, 25 Mar 2026 17:30:51 -0500 Subject: [PATCH 159/229] Honda: Add potential stock ACC/LKA fault signals to generated DBCs (#3141) * Honda: Add signals for Bosch stock ACC fault * one bit wider * possible driver inactivity detection * update comment * whitespace cleanup * diff reduction * more diff reduction --- .../dbc/generator/honda/_bosch_radar_acc.dbc | 17 +++++++++++------ opendbc/dbc/generator/honda/_honda_common.dbc | 2 ++ .../generator/honda/honda_bosch_radarless.dbc | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/opendbc/dbc/generator/honda/_bosch_radar_acc.dbc b/opendbc/dbc/generator/honda/_bosch_radar_acc.dbc index 0a7f75f7979..cbf3fc8fd93 100644 --- a/opendbc/dbc/generator/honda/_bosch_radar_acc.dbc +++ b/opendbc/dbc/generator/honda/_bosch_radar_acc.dbc @@ -1,17 +1,20 @@ BO_ 479 ACC_CONTROL: 8 EON - SG_ SET_TO_0 : 20|5@0+ (1,0) [0|1] "" XXX - SG_ CONTROL_ON : 23|3@0+ (1,0) [0|5] "" XXX SG_ GAS_COMMAND : 7|16@0- (1,0) [0|0] "" XXX + SG_ ACC_ENABLED : 16|1@0+ (1,0) [0|1] "" XXX + SG_ ACC_FAULTED : 20|1@0+ (1,0) [0|1] "" XXX + SG_ CONTROL_ON : 23|3@0+ (1,0) [0|5] "" XXX SG_ ACCEL_COMMAND : 31|11@0- (0.01,0) [0|0] "m/s2" XXX - SG_ BRAKE_LIGHTS : 62|1@0+ (1,0) [0|1] "" XXX + SG_ AEB_STATUS : 33|1@0+ (1,0) [0|1] "" XXX SG_ BRAKE_REQUEST : 34|1@0+ (1,0) [0|1] "" XXX SG_ STANDSTILL : 35|1@0+ (1,0) [0|1] "" XXX SG_ STANDSTILL_RELEASE : 36|1@0+ (1,0) [0|1] "" XXX - SG_ AEB_STATUS : 33|1@0+ (1,0) [0|1] "" XXX - SG_ AEB_BRAKING : 47|1@0+ (1,0) [0|1] "" XXX + SG_ MAYBE_DISENGAGE_COMMAND : 41|2@0+ (1,0) [0|3] "" XXX SG_ AEB_PREPARE : 43|1@0+ (1,0) [0|1] "" XXX - SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX + SG_ AEB_BRAKING : 47|1@0+ (1,0) [0|1] "" XXX + SG_ MAYBE_DISENGAGE_ALERT : 54|1@0+ (1,0) [0|1] "" XXX SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" XXX + SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX + SG_ BRAKE_LIGHTS : 62|1@0+ (1,0) [0|1] "" XXX BO_ 495 ACC_CONTROL_ON: 8 XXX SG_ SET_TO_75 : 31|8@0+ (1,0) [0|255] "" XXX @@ -28,3 +31,5 @@ CM_ SG_ 479 CONTROL_ON "Set to 5 when car is being controlled"; CM_ SG_ 479 AEB_STATUS "set for the duration of AEB event"; CM_ SG_ 479 AEB_BRAKING "set when braking is commanded during AEB event"; CM_ SG_ 479 AEB_PREPARE "set 1s before AEB"; +CM_ SG_ 479 MAYBE_DISENGAGE_COMMAND "Might signal the powertrain to disengage or prevent engagement on radar-side ACC faults"; +CM_ SG_ 479 MAYBE_DISENGAGE_ALERT "Signals the instrument cluster to display an ACC fault"; diff --git a/opendbc/dbc/generator/honda/_honda_common.dbc b/opendbc/dbc/generator/honda/_honda_common.dbc index fdf86ec7d56..0ca28f02a89 100644 --- a/opendbc/dbc/generator/honda/_honda_common.dbc +++ b/opendbc/dbc/generator/honda/_honda_common.dbc @@ -59,6 +59,7 @@ BO_ 420 VSA_STATUS: 8 VSA SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EON BO_ 427 STEER_MOTOR_TORQUE: 3 EPS + SG_ UNKNOWN_TORQUE_STATE_BIT : 3|1@0+ (1,0) [0|1] "" XXX SG_ CONFIG_VALID : 7|1@0+ (1,0) [0|1] "" EON SG_ MOTOR_TORQUE : 1|10@0+ (1,0) [0|256] "" EON SG_ OUTPUT_DISABLED : 22|1@0+ (1,0) [0|1] "" EON @@ -206,6 +207,7 @@ BO_ 1302 ODOMETER: 8 XXX CM_ SG_ 304 "Seems to be platform-agnostic"; CM_ SG_ 316 "Should exist on Nidec"; CM_ SG_ 420 BRAKE_HOLD_RELATED "On when Brake Hold engaged"; +CM_ SG_ 427 UNKNOWN_TORQUE_STATE_BIT "Might signal driver input above threshold, for driver inactivity detection"; CM_ SG_ 490 LONG_ACCEL "wheel speed derivative, noisy and zero snapping"; CM_ SG_ 773 PASS_AIRBAG_ON "Might just be indicator light"; CM_ SG_ 773 PASS_AIRBAG_OFF "Might just be indicator light"; diff --git a/opendbc/dbc/generator/honda/honda_bosch_radarless.dbc b/opendbc/dbc/generator/honda/honda_bosch_radarless.dbc index 2b86a33136d..dc3510f1470 100644 --- a/opendbc/dbc/generator/honda/honda_bosch_radarless.dbc +++ b/opendbc/dbc/generator/honda/honda_bosch_radarless.dbc @@ -40,7 +40,7 @@ BO_ 254913108 LKAS_HUD_2: 8 ADAS SG_ LKAS_BOH_1 : 15|6@0+ (1,0) [0|63] "" XXX SG_ LEFT_LANE : 23|2@0+ (1,0) [0|3] "" XXX SG_ RIGHT_LANE : 21|2@0+ (1,0) [0|3] "" XXX - SG_ LKAS_BOH_2 : 30|5@0+ (1,0) [0|31] "" XXX + SG_ LKAS_BOH_2 : 31|6@0+ (1,0) [0|63] "" XXX SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" XXX From b5af4153c2c8d28e721ed9a34fa824fa4479ad27 Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Wed, 25 Mar 2026 19:59:21 -0500 Subject: [PATCH 160/229] gitignore generated DBCs (#3229) --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e76e922198c..e0aad5d205e 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,7 @@ __pycache__/ *.profraw opendbc/can/build/ opendbc/can/obj/ +opendbc/dbc/*_generated.dbc cppcheck-addon-ctu-file-list opendbc/safety/tests/coverage-out From 0d20fcc81528cc6ddb79ed6fe5bbad7298ee5f0f Mon Sep 17 00:00:00 2001 From: MVL Date: Wed, 25 Mar 2026 21:14:02 -0400 Subject: [PATCH 161/229] Honda - additional 2026 Civic Hybrid fingerprint (#3216) Add additional 2026 Civic Hybrid fingerprint --- opendbc/car/honda/fingerprints.py | 1 + 1 file changed, 1 insertion(+) diff --git a/opendbc/car/honda/fingerprints.py b/opendbc/car/honda/fingerprints.py index 08662f38d95..859492ca696 100644 --- a/opendbc/car/honda/fingerprints.py +++ b/opendbc/car/honda/fingerprints.py @@ -1000,6 +1000,7 @@ b'8S102-T56-A070\x00\x00', b'8S102-T60-AA10\x00\x00', b'8S102-T64-A040\x00\x00', + b'8S102-T64-A050\x00\x00', ], (Ecu.vsa, 0x18da28f1, None): [ b'57114-T20-AB40\x00\x00', From 9debc1258af8730e08a2310cbc73956aa4db8ace Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Wed, 25 Mar 2026 22:39:51 -0700 Subject: [PATCH 162/229] garbage-collect old misra gitignore (#3232) --- opendbc/safety/tests/misra/.gitignore | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 opendbc/safety/tests/misra/.gitignore diff --git a/opendbc/safety/tests/misra/.gitignore b/opendbc/safety/tests/misra/.gitignore deleted file mode 100644 index fc9ac228cb0..00000000000 --- a/opendbc/safety/tests/misra/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -*.pdf -*.txt -.output.log -new_table -cppcheck/ From 470c1787fec6d76e7f794fd9bf49f202b111236b Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Thu, 26 Mar 2026 09:53:41 -0700 Subject: [PATCH 163/229] Chrysler: Common safety checksum (#3231) * Chrysler: Common safety checksum * sanity check all counters are length 4 --- opendbc/can/dbc.py | 2 +- opendbc/safety/modes/chrysler.h | 38 +------------------------ opendbc/safety/modes/chrysler_common.h | 39 ++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 38 deletions(-) create mode 100644 opendbc/safety/modes/chrysler_common.h diff --git a/opendbc/can/dbc.py b/opendbc/can/dbc.py index cb8b59bbe81..595590356fc 100644 --- a/opendbc/can/dbc.py +++ b/opendbc/can/dbc.py @@ -206,7 +206,7 @@ def get_checksum_state(dbc_name: str) -> ChecksumState | None: elif dbc_name.startswith("subaru_global_"): return ChecksumState(8, -1, 0, -1, True, SignalType.SUBARU_CHECKSUM, subaru_checksum) elif dbc_name.startswith("chrysler_"): - return ChecksumState(8, -1, 7, -1, False, SignalType.CHRYSLER_CHECKSUM, chrysler_checksum) + return ChecksumState(8, 4, 7, -1, False, SignalType.CHRYSLER_CHECKSUM, chrysler_checksum) elif dbc_name.startswith("fca_giorgio"): return ChecksumState(8, -1, 7, -1, False, SignalType.FCA_GIORGIO_CHECKSUM, fca_giorgio_checksum) elif dbc_name.startswith("comma_body"): diff --git a/opendbc/safety/modes/chrysler.h b/opendbc/safety/modes/chrysler.h index 334cf60d72f..8c2aa0742fb 100644 --- a/opendbc/safety/modes/chrysler.h +++ b/opendbc/safety/modes/chrysler.h @@ -1,6 +1,7 @@ #pragma once #include "opendbc/safety/declarations.h" +#include "opendbc/safety/modes/chrysler_common.h" // Chrysler Pacifica/Jeep addresses #define CHRYSLER_EPS_2 0x220 // EPS driver input torque @@ -42,43 +43,6 @@ static ChryslerPlatform chrysler_platform; #define CHRYSLER_ADDR(name) ((uint32_t)((chrysler_platform == CHRYSLER_RAM_DT) ? CHRYSLER_RAM_DT_##name : \ ((chrysler_platform == CHRYSLER_RAM_HD) ? CHRYSLER_RAM_HD_##name : CHRYSLER_##name))) -static uint32_t chrysler_get_checksum(const CANPacket_t *msg) { - int checksum_byte = GET_LEN(msg) - 1U; - return (uint8_t)(msg->data[checksum_byte]); -} - -static uint32_t chrysler_compute_checksum(const CANPacket_t *msg) { - // TODO: clean this up - // http://illmatics.com/Remote%20Car%20Hacking.pdf - uint8_t checksum = 0xFFU; - int len = GET_LEN(msg); - for (int j = 0; j < (len - 1); j++) { - uint8_t shift = 0x80U; - uint8_t curr = (uint8_t)msg->data[j]; - for (int i=0; i<8; i++) { - uint8_t bit_sum = curr & shift; - uint8_t temp_chk = checksum & 0x80U; - if (bit_sum != 0U) { - bit_sum = 0x1C; - if (temp_chk != 0U) { - bit_sum = 1; - } - checksum = checksum << 1; - temp_chk = checksum | 1U; - bit_sum ^= temp_chk; - } else { - if (temp_chk != 0U) { - bit_sum = 0x1D; - } - checksum = checksum << 1; - bit_sum ^= checksum; - } - checksum = bit_sum; - shift = shift >> 1; - } - } - return (uint8_t)(~checksum); -} static uint8_t chrysler_get_counter(const CANPacket_t *msg) { return (uint8_t)(msg->data[6] >> 4); diff --git a/opendbc/safety/modes/chrysler_common.h b/opendbc/safety/modes/chrysler_common.h new file mode 100644 index 00000000000..29999b00e84 --- /dev/null +++ b/opendbc/safety/modes/chrysler_common.h @@ -0,0 +1,39 @@ +#pragma once + +static uint32_t chrysler_get_checksum(const CANPacket_t *msg) { + int checksum_byte = GET_LEN(msg) - 1U; + return (uint8_t)(msg->data[checksum_byte]); +} + +static uint32_t chrysler_compute_checksum(const CANPacket_t *msg) { + // TODO: clean this up + // http://illmatics.com/Remote%20Car%20Hacking.pdf + uint8_t checksum = 0xFFU; + int len = GET_LEN(msg); + for (int j = 0; j < (len - 1); j++) { + uint8_t shift = 0x80U; + uint8_t curr = (uint8_t)msg->data[j]; + for (int i=0; i<8; i++) { + uint8_t bit_sum = curr & shift; + uint8_t temp_chk = checksum & 0x80U; + if (bit_sum != 0U) { + bit_sum = 0x1C; + if (temp_chk != 0U) { + bit_sum = 1; + } + checksum = checksum << 1; + temp_chk = checksum | 1U; + bit_sum ^= temp_chk; + } else { + if (temp_chk != 0U) { + bit_sum = 0x1D; + } + checksum = checksum << 1; + bit_sum ^= checksum; + } + checksum = bit_sum; + shift = shift >> 1; + } + } + return (uint8_t)(~checksum); +} From 4561661a096b3e7e35717e0b8750fbf84af30803 Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Thu, 26 Mar 2026 10:47:05 -0700 Subject: [PATCH 164/229] Chrysler: Jeep Cherokee 2019-2023 (#2910) * Chrysler: Jeep Cherokee 2019-23 * remove test-only change * remove another test-only change * remove FIXME since I fixed it * tweak STEER_MAX * disable BSM detection until signals are found * hotwire this temporarily * re-enable BSM detection and handling * tweaked auto_fingerprint 7118579cad81fb4e/0000036b--d6802b9afa * Chrysler: Common safety checksum * sanity check all counters are length 4 * don't need this * harmonize CUSW DAS_6 signals with other Chrysler * now this can be the same for CUSW * cleanup * whole conditional not necessary, remove CUSW to start * diff reduction / consistency * further diff reduction * pass tests until I figure out the disengage fault * cleanup * comment cleanup/consolidation * try lat accel controller again * touchup * clarity --- opendbc/car/chrysler/carcontroller.py | 5 +- opendbc/car/chrysler/carstate.py | 53 +++++++++- opendbc/car/chrysler/fingerprints.py | 20 ++++ opendbc/car/chrysler/interface.py | 13 ++- opendbc/car/chrysler/values.py | 11 +++ opendbc/car/tests/routes.py | 1 + opendbc/car/torque_data/override.toml | 1 + opendbc/dbc/chrysler_cusw.dbc | 9 +- opendbc/safety/declarations.h | 2 + opendbc/safety/modes/chrysler_cusw.h | 107 +++++++++++++++++++++ opendbc/safety/safety.h | 2 + opendbc/safety/tests/test_chrysler_cusw.py | 75 +++++++++++++++ 12 files changed, 293 insertions(+), 6 deletions(-) create mode 100644 opendbc/safety/modes/chrysler_cusw.h create mode 100644 opendbc/safety/tests/test_chrysler_cusw.py diff --git a/opendbc/car/chrysler/carcontroller.py b/opendbc/car/chrysler/carcontroller.py index 8a2e9582ca0..23209489a15 100644 --- a/opendbc/car/chrysler/carcontroller.py +++ b/opendbc/car/chrysler/carcontroller.py @@ -2,7 +2,7 @@ from opendbc.car import Bus, DT_CTRL from opendbc.car.lateral import apply_meas_steer_torque_limits from opendbc.car.chrysler import chryslercan -from opendbc.car.chrysler.values import RAM_CARS, CarControllerParams, ChryslerFlags +from opendbc.car.chrysler.values import CUSW_CARS, RAM_CARS, CarControllerParams, ChryslerFlags from opendbc.car.interfaces import CarControllerBase @@ -58,6 +58,9 @@ def update(self, CC, CS, now_nanos): elif self.CP.carFingerprint in RAM_CARS: if CS.out.vEgo < (self.CP.minSteerSpeed - 0.5): lkas_control_bit = False + elif self.CP.carFingerprint in CUSW_CARS: + if CS.out.vEgo < (self.CP.minSteerSpeed - 2.0): + lkas_control_bit = False # EPS faults if LKAS re-enables too quickly lkas_control_bit = lkas_control_bit and (self.frame - self.last_lkas_falling_edge > 200) diff --git a/opendbc/car/chrysler/carstate.py b/opendbc/car/chrysler/carstate.py index 2eed3db9ee7..8c569f7f9b0 100644 --- a/opendbc/car/chrysler/carstate.py +++ b/opendbc/car/chrysler/carstate.py @@ -1,6 +1,6 @@ from opendbc.can import CANDefine, CANParser from opendbc.car import Bus, create_button_events, structs -from opendbc.car.chrysler.values import DBC, STEER_THRESHOLD, RAM_CARS +from opendbc.car.chrysler.values import CUSW_CARS, DBC, STEER_THRESHOLD, RAM_CARS from opendbc.car.common.conversions import Conversions as CV from opendbc.car.interfaces import CarStateBase @@ -28,6 +28,9 @@ def update(self, can_parsers) -> structs.CarState: cp = can_parsers[Bus.pt] cp_cam = can_parsers[Bus.cam] + if self.CP.carFingerprint in CUSW_CARS: + return self.update_cusw(cp, cp_cam) + ret = structs.CarState() prev_distance_button = self.distance_button @@ -99,6 +102,54 @@ def update(self, can_parsers) -> structs.CarState: return ret + def update_cusw(self, cp, cp_cam): + ret = structs.CarState() + + ret.doorOpen = any([cp.vl["DOORS"]["DOOR_OPEN_FL"], + cp.vl["DOORS"]["DOOR_OPEN_FR"], + cp.vl["DOORS"]["DOOR_OPEN_RL"], + cp.vl["DOORS"]["DOOR_OPEN_RR"]]) + ret.seatbeltUnlatched = bool(cp.vl["SEATBELT_STATUS"]["SEATBELT_DRIVER_UNLATCHED"]) + + ret.brakePressed = bool(cp.vl["BRAKE_2"]["BRAKE_HUMAN"]) + ret.brake = cp.vl["BRAKE_1"]["BRAKE_PSI"] + ret.gasPressed = cp.vl["ACCEL_GAS"]["GAS_HUMAN"] > 0 + + ret.espDisabled = bool(cp.vl["TRACTION_BUTTON"]["TRACTION_OFF"]) + + ret.vEgoRaw = cp.vl["BRAKE_1"]["VEHICLE_SPEED"] + ret.vEgo, ret.aEgo = self.update_speed_kf(ret.vEgoRaw) + ret.standstill = not ret.vEgoRaw > 0.001 + self.parse_wheel_speeds(ret, + cp.vl["WHEEL_SPEEDS_FRONT"]["WHEEL_SPEED_FL"], + cp.vl["WHEEL_SPEEDS_REAR"]["WHEEL_SPEED_RR"], + cp.vl["WHEEL_SPEEDS_REAR"]["WHEEL_SPEED_RL"], + cp.vl["WHEEL_SPEEDS_FRONT"]["WHEEL_SPEED_FR"], + unit=1, + ) + + ret.leftBlinker = cp.vl["STEERING_LEVERS"]["TURN_SIGNALS"] == 1 + ret.rightBlinker = cp.vl["STEERING_LEVERS"]["TURN_SIGNALS"] == 2 + ret.steeringAngleDeg = cp.vl["STEERING"]["STEER_ANGLE"] + ret.gearShifter = self.parse_gear_shifter(self.shifter_values.get(cp.vl["GEAR"]["PRNDL"], None)) + + ret.cruiseState.speed = cp.vl["ACC_HUD"]["ACC_SET_SPEED_KMH"] * CV.KPH_TO_MS + ret.cruiseState.available = bool(cp.vl["ACC_CONTROL"]["ACC_MAIN_ON"]) + ret.cruiseState.enabled = bool(cp.vl["ACC_CONTROL"]["ACC_ACTIVE"]) + + ret.steeringTorque = cp.vl["EPS_STATUS"]["TORQUE_DRIVER"] + ret.steeringTorqueEps = cp.vl["EPS_STATUS"]["TORQUE_MOTOR"] + ret.steeringPressed = abs(ret.steeringTorque) > STEER_THRESHOLD + ret.steerFaultPermanent = bool(cp.vl["EPS_STATUS"]["LKAS_FAULT"]) + + if self.CP.enableBsm: + ret.leftBlindspot = bool(cp.vl["BSM_LEFT"]["LEFT_DETECTED"]) + ret.rightBlindspot = bool(cp.vl["BSM_RIGHT"]["RIGHT_DETECTED"]) + + self.lkas_car_model = cp_cam.vl["DAS_6"]["CAR_MODEL"] + + return ret + @staticmethod def get_can_parsers(CP): return { diff --git a/opendbc/car/chrysler/fingerprints.py b/opendbc/car/chrysler/fingerprints.py index 97557a141ae..bb861f64a89 100644 --- a/opendbc/car/chrysler/fingerprints.py +++ b/opendbc/car/chrysler/fingerprints.py @@ -278,6 +278,26 @@ b'68676877AB', ], }, + CAR.JEEP_CHEROKEE_5TH_GEN: { + (Ecu.combinationMeter, 0x18da60f1, None): [ + b'68492643AC', + ], + (Ecu.srs, 0x18dac0f1, None): [ + b'68469498AA', + ], + (Ecu.abs, 0x18da28f1, None): [ + b'68477674AB', + ], + (Ecu.eps, 0x18da30f1, None): [ + b'68319152AJ', + ], + (Ecu.engine, 0x18da10f1, None): [ + b'68493558AD ', + ], + (Ecu.transmission, 0x18da18f1, None): [ + b'68492011AD', + ], + }, CAR.JEEP_GRAND_CHEROKEE: { (Ecu.combinationMeter, 0x742, None): [ b'68243549AG', diff --git a/opendbc/car/chrysler/interface.py b/opendbc/car/chrysler/interface.py index d28efe3419c..78d768daa8d 100755 --- a/opendbc/car/chrysler/interface.py +++ b/opendbc/car/chrysler/interface.py @@ -3,7 +3,7 @@ from opendbc.car.chrysler.carcontroller import CarController from opendbc.car.chrysler.carstate import CarState from opendbc.car.chrysler.radar_interface import RadarInterface -from opendbc.car.chrysler.values import CAR, RAM_HD, RAM_DT, RAM_CARS, ChryslerFlags, ChryslerSafetyFlags +from opendbc.car.chrysler.values import CAR, CUSW_CARS, RAM_HD, RAM_DT, RAM_CARS, ChryslerFlags, ChryslerSafetyFlags from opendbc.car.interfaces import CarInterfaceBase @@ -17,7 +17,9 @@ class CarInterface(CarInterfaceBase): @staticmethod def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_long, is_release, docs) -> structs.CarParams: ret.brand = "chrysler" - ret.dashcamOnly = candidate in RAM_HD + + # TODO: Chrysler CUSW in dashcam pending comma safety validation and a fix for LKAS fault on disengage + ret.dashcamOnly = candidate in (RAM_HD, CUSW_CARS) # radar parsing needs some work, see https://github.com/commaai/openpilot/issues/26842 ret.radarUnavailable = True # Bus.radar not in DBC[candidate][Bus.radar] @@ -30,6 +32,8 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo ret.safetyConfigs[0].safetyParam |= ChryslerSafetyFlags.RAM_HD.value elif candidate in RAM_DT: ret.safetyConfigs[0].safetyParam |= ChryslerSafetyFlags.RAM_DT.value + elif candidate in CUSW_CARS: + ret.safetyConfigs = [get_safety_config(structs.CarParams.SafetyModel.chryslerCusw)] CarInterfaceBase.configure_torque_tune(candidate, ret.lateralTuning) if candidate not in RAM_CARS: @@ -48,6 +52,9 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo ret.lateralTuning.pid.kf = 0.00006 # Jeep + elif candidate == CAR.JEEP_CHEROKEE_5TH_GEN: + ret.steerActuatorDelay = 0.15 + elif candidate in (CAR.JEEP_GRAND_CHEROKEE, CAR.JEEP_GRAND_CHEROKEE_2019): ret.steerActuatorDelay = 0.2 @@ -76,6 +83,6 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo ret.minSteerSpeed = 17.5 # m/s 17 on the way up, 13 on the way down once engaged. ret.centerToFront = ret.wheelbase * 0.44 - ret.enableBsm = 720 in fingerprint[0] + ret.enableBsm = (0x62cc033 if candidate in CUSW_CARS else 0x2d0) in fingerprint[0] return ret diff --git a/opendbc/car/chrysler/values.py b/opendbc/car/chrysler/values.py index 232e5712e34..aad715d670c 100644 --- a/opendbc/car/chrysler/values.py +++ b/opendbc/car/chrysler/values.py @@ -67,6 +67,11 @@ class CAR(Platforms): ) # Jeep + JEEP_CHEROKEE_5TH_GEN = ChryslerPlatformConfig( + [ChryslerCarDocs("Jeep Cherokee 2019-23")], + ChryslerCarSpecs(mass=1747., wheelbase=2.70, steerRatio=17.0, minSteerSpeed=18.5), + {Bus.pt: 'chrysler_cusw'}, + ) JEEP_GRAND_CHEROKEE = ChryslerPlatformConfig( # includes 2017 Trailhawk [ChryslerCarDocs("Jeep Grand Cherokee 2016-18", video="https://www.youtube.com/watch?v=eLR9o2JkuRk")], ChryslerCarSpecs(mass=1778., wheelbase=2.71, steerRatio=16.7), @@ -105,6 +110,11 @@ def __init__(self, CP): self.STEER_DELTA_UP = 6 self.STEER_DELTA_DOWN = 6 self.STEER_MAX = 261 # EPS allows more, up to 350? + elif CP.carFingerprint in CUSW_CARS: + self.STEER_STEP = 1 # 100 Hz + self.STEER_DELTA_UP = 4 + self.STEER_DELTA_DOWN = 4 + self.STEER_MAX = 250 # TODO: Some CUSW will go to 261, some not quite, exact boundaries not yet determined else: self.STEER_DELTA_UP = 3 self.STEER_DELTA_DOWN = 3 @@ -116,6 +126,7 @@ def __init__(self, CP): RAM_DT = {CAR.RAM_1500_5TH_GEN, } RAM_HD = {CAR.RAM_HD_5TH_GEN, } RAM_CARS = RAM_DT | RAM_HD +CUSW_CARS = {CAR.JEEP_CHEROKEE_5TH_GEN, } CHRYSLER_VERSION_REQUEST = bytes([uds.SERVICE_TYPE.READ_DATA_BY_IDENTIFIER]) + \ diff --git a/opendbc/car/tests/routes.py b/opendbc/car/tests/routes.py index 6ed678d4ee5..87b0e66005d 100644 --- a/opendbc/car/tests/routes.py +++ b/opendbc/car/tests/routes.py @@ -46,6 +46,7 @@ class CarTestRoute(NamedTuple): routes = [ CarTestRoute("efdf9af95e71cd84/2022-05-13--19-03-31", COMMA.COMMA_BODY), + CarTestRoute("c5e3aa51055c8f47|2023-12-06--20-01-44", CHRYSLER.JEEP_CHEROKEE_5TH_GEN), CarTestRoute("0c94aa1e1296d7c6/2021-05-05--19-48-37", CHRYSLER.JEEP_GRAND_CHEROKEE), CarTestRoute("91dfedae61d7bd75/2021-05-22--20-07-52", CHRYSLER.JEEP_GRAND_CHEROKEE_2019), CarTestRoute("420a8e183f1aed48/2020-03-05--07-15-29", CHRYSLER.CHRYSLER_PACIFICA_2018_HYBRID), # 2017 diff --git a/opendbc/car/torque_data/override.toml b/opendbc/car/torque_data/override.toml index 01ba58860ef..a7e4c124222 100644 --- a/opendbc/car/torque_data/override.toml +++ b/opendbc/car/torque_data/override.toml @@ -97,6 +97,7 @@ legend = ["LAT_ACCEL_FACTOR", "MAX_LAT_ACCEL_MEASURED", "FRICTION"] "TOYOTA_RAV4_PRIME" = [1.7, 2.0, 0.14] "TOYOTA_RAV4_TSS2_2022" = [1.9, 1.9304407208090029, 0.112174] "KIA_K7_2017" = [2.2, 2.2, 0.1] +"JEEP_CHEROKEE_5TH_GEN" = [1.5, 1.5, 0.15] # Dashcam or fallback configured as ideal car "MOCK" = [10.0, 10, 0.0] diff --git a/opendbc/dbc/chrysler_cusw.dbc b/opendbc/dbc/chrysler_cusw.dbc index 880f6e7255c..d1aaf0d5033 100644 --- a/opendbc/dbc/chrysler_cusw.dbc +++ b/opendbc/dbc/chrysler_cusw.dbc @@ -108,8 +108,9 @@ BO_ 1498 LKAS_1: 2 XXX BO_ 1500 DAS_6: 4 XXX SG_ LKAS_ICON_COLOR : 1|2@0+ (1,0) [0|1] "" XXX - SG_ SET_ME_0XAC : 15|8@0+ (1,0) [0|255] "" XXX + SG_ CAR_MODEL : 15|8@0+ (1,0) [0|255] "" XXX SG_ LKAS_LANE_LINES : 19|4@0+ (1,0) [0|15] "" XXX + SG_ LKAS_ALERTS : 27|4@0+ (1,0) [0|1] "" XXX BO_ 1508 LKAS_HEARTBIT: 8 XXX SG_ LKAS_STATUS_OK : 28|1@0+ (1,0) [0|1] "" XXX @@ -172,6 +173,12 @@ BO_ 496 CLUSTER_1: 8 XXX SG_ COUNTER : 51|4@0+ (1,0) [0|1] "" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|1] "" XXX +BO_ 103596083 BSM_LEFT: 8 XXX + SG_ LEFT_DETECTED : 21|1@0+ (1,0) [0|1] "" XXX + +BO_ 103596084 BSM_RIGHT: 7 XXX + SG_ RIGHT_DETECTED : 21|1@0+ (1,0) [0|1] "" XXX + CM_ SG_ 1250 TRUNK "1 = open, 0 = closed"; CM_ SG_ 1250 DOOR_OPEN_FL "1 = open, 0 = closed"; diff --git a/opendbc/safety/declarations.h b/opendbc/safety/declarations.h index c74417c18f0..1a68549445b 100644 --- a/opendbc/safety/declarations.h +++ b/opendbc/safety/declarations.h @@ -30,6 +30,7 @@ #define SAFETY_FAW 26U #define SAFETY_BODY 27U #define SAFETY_HYUNDAI_CANFD 28U +#define SAFETY_CHRYSLER_CUSW 30U #define SAFETY_PSA 31U #define SAFETY_RIVIAN 33U #define SAFETY_VOLKSWAGEN_MEB 34U @@ -320,6 +321,7 @@ int set_safety_hooks(uint16_t mode, uint16_t param); extern const safety_hooks body_hooks; extern const safety_hooks chrysler_hooks; +extern const safety_hooks chrysler_cusw_hooks; extern const safety_hooks elm327_hooks; extern const safety_hooks nooutput_hooks; extern const safety_hooks alloutput_hooks; diff --git a/opendbc/safety/modes/chrysler_cusw.h b/opendbc/safety/modes/chrysler_cusw.h new file mode 100644 index 00000000000..b173b0df2a4 --- /dev/null +++ b/opendbc/safety/modes/chrysler_cusw.h @@ -0,0 +1,107 @@ +#include "opendbc/safety/modes/chrysler_common.h" + + +static safety_config chrysler_cusw_init(uint16_t param) { + SAFETY_UNUSED(param); + + static const CanMsg CHRYSLER_CUSW_TX_MSGS[] = { + {0x1F6U, 0, 4, .check_relay = true}, + {0x5DCU, 0, 4, .check_relay = true}, + {0x2FAU, 0, 3, .check_relay = false}, + }; + + static RxCheck chrysler_cusw_rx_checks[] = { + {.msg = {{0x1E4U, 0, 8, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{0x2E2U, 0, 8, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{0x1ECU, 0, 8, 100U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{0x1FEU, 0, 5, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{0x2ECU, 0, 8, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + }; + + return BUILD_SAFETY_CFG(chrysler_cusw_rx_checks, CHRYSLER_CUSW_TX_MSGS); +} + +static void chrysler_cusw_rx_hook(const CANPacket_t *msg) { + if (msg->bus == 0U) { + if (msg->addr == 0x1ECU) { + // Signal: EPS_STATUS.TORQUE_MOTOR + int torque_meas_new = ((msg->data[3] & 0xFU) << 8) + msg->data[4] - 2048U; + update_sample(&torque_meas, torque_meas_new); + } + + if (msg->addr == 0x2ECU) { + // Signal: ACC_CONTROL.ACC_ACTIVE + bool cruise_engaged = GET_BIT(msg, 7U); + pcm_cruise_check(cruise_engaged); + } + + if (msg->addr == 0x1E4U) { + // Signal: BRAKE_1.VEHICLE_SPEED + vehicle_moving = (((msg->data[4] & 0x7U) << 8) + msg->data[5]) != 0U; + } + + if (msg->addr == 0x1FEU) { + // Signal: ACCEL_GAS.GAS_HUMAN + gas_pressed = msg->data[1] != 0U; + } + + if (msg->addr == 0x2E2U) { + // Signal: BRAKE_2.BRAKE_HUMAN + brake_pressed = GET_BIT(msg, 9U); + } + } +} + +static bool chrysler_cusw_tx_hook(const CANPacket_t *msg) { + const TorqueSteeringLimits CHRYSLER_CUSW_STEERING_LIMITS = { + .max_torque = 250, // TODO: Find the actual cap, think we're faulting before 261 + .max_rt_delta = 150, + .max_rate_up = 4, + .max_rate_down = 4, + .max_torque_error = 80, + .type = TorqueMotorLimited, + }; + + bool tx = true; + + if (msg->addr == 0x1F6U) { + // Signal: LKAS_COMMAND.STEERING_TORQUE + int desired_torque = ((msg->data[0]) << 3) | ((msg->data[1] & 0xE0U) >> 5); + desired_torque -= 1024; + + // Signal: LKAS_COMMAND.LKAS_CONTROL_BIT + const bool steer_req = GET_BIT(msg, 12U); + if (steer_torque_cmd_checks(desired_torque, steer_req, CHRYSLER_CUSW_STEERING_LIMITS)) { + tx = false; + // FIXME: too many problems here right now, hotwire things while investigating + // tx = true; + } + } + + if (msg->addr == 0x2FAU) { + // Signal: CRUISE_BUTTONS.ACC_Cancel + // Signal: CRUISE_BUTTONS.ACC_Resume + const bool is_cancel = GET_BIT(msg, 0U); + const bool is_resume = GET_BIT(msg, 4U); + const bool allowed = is_cancel || (is_resume && controls_allowed); + if (!allowed) { + tx = false; + } + } + + return tx; +} + +static uint8_t chrysler_cusw_get_counter(const CANPacket_t *msg) { + int counter_byte = GET_LEN(msg) - 2U; + return (uint8_t)(msg->data[counter_byte] & 0xFU); +} + +const safety_hooks chrysler_cusw_hooks = { + .init = chrysler_cusw_init, + .rx = chrysler_cusw_rx_hook, + .tx = chrysler_cusw_tx_hook, + .get_counter = chrysler_cusw_get_counter, + .get_checksum = chrysler_get_checksum, + .compute_checksum = chrysler_compute_checksum, +}; diff --git a/opendbc/safety/safety.h b/opendbc/safety/safety.h index 87c41cbabac..6417881df12 100644 --- a/opendbc/safety/safety.h +++ b/opendbc/safety/safety.h @@ -15,6 +15,7 @@ #include "opendbc/safety/modes/ford.h" #include "opendbc/safety/modes/hyundai.h" #include "opendbc/safety/modes/chrysler.h" +#include "opendbc/safety/modes/chrysler_cusw.h" #include "opendbc/safety/modes/rivian.h" #include "opendbc/safety/modes/subaru.h" #include "opendbc/safety/modes/subaru_preglobal.h" @@ -404,6 +405,7 @@ int set_safety_hooks(uint16_t mode, uint16_t param) { {SAFETY_TESLA, &tesla_hooks}, {SAFETY_HYUNDAI_CANFD, &hyundai_canfd_hooks}, #ifdef ALLOW_DEBUG + {SAFETY_CHRYSLER_CUSW, &chrysler_cusw_hooks}, {SAFETY_PSA, &psa_hooks}, {SAFETY_SUBARU_PREGLOBAL, &subaru_preglobal_hooks}, {SAFETY_VOLKSWAGEN_MLB, &volkswagen_mlb_hooks}, diff --git a/opendbc/safety/tests/test_chrysler_cusw.py b/opendbc/safety/tests/test_chrysler_cusw.py new file mode 100644 index 00000000000..3477853f66f --- /dev/null +++ b/opendbc/safety/tests/test_chrysler_cusw.py @@ -0,0 +1,75 @@ +#!/usr/bin/env python3 +import unittest +from opendbc.car.structs import CarParams +from opendbc.safety.tests.libsafety import libsafety_py +import opendbc.safety.tests.common as common +from opendbc.safety.tests.common import CANPackerSafety + + +class TestChryslerCuswSafety(common.CarSafetyTest, common.MotorTorqueSteeringSafetyTest): + TX_MSGS = [[0x1F6, 0], [0x2FA, 0], [0x5DC, 0]] + STANDSTILL_THRESHOLD = 0 + RELAY_MALFUNCTION_ADDRS = {0: (0x1F6, 0x5DC)} + FWD_BLACKLISTED_ADDRS = {2: [0x1F6, 0x5DC]} + + MAX_RATE_UP = 4 + MAX_RATE_DOWN = 4 + MAX_TORQUE_LOOKUP = [0], [250] + MAX_RT_DELTA = 150 + MAX_TORQUE_ERROR = 80 + + def setUp(self): + self.packer = CANPackerSafety("chrysler_cusw") + self.safety = libsafety_py.libsafety + self.safety.set_safety_hooks(CarParams.SafetyModel.chryslerCusw, 0) + self.safety.init_tests() + + def _button_msg(self, cancel=False, resume=False): + values = {"ACC_Cancel": cancel, "ACC_Resume": resume} + return self.packer.make_can_msg_safety("CRUISE_BUTTONS", 0, values) + + def _pcm_status_msg(self, enable): + values = {"ACC_ACTIVE": 1 if enable else 0} + return self.packer.make_can_msg_safety("ACC_CONTROL", 0, values) + + def _speed_msg(self, speed): + values = {"VEHICLE_SPEED": speed} + return self.packer.make_can_msg_safety("BRAKE_1", 0, values) + + def _user_gas_msg(self, gas): + values = {"GAS_HUMAN": gas} + return self.packer.make_can_msg_safety("ACCEL_GAS", 0, values) + + def _user_brake_msg(self, brake): + values = {"BRAKE_HUMAN": 1 if brake else 0} + return self.packer.make_can_msg_safety("BRAKE_2", 0, values) + + def _torque_meas_msg(self, torque): + values = {"TORQUE_MOTOR": torque} + return self.packer.make_can_msg_safety("EPS_STATUS", 0, values) + + def _torque_cmd_msg(self, torque, steer_req=1): + values = {"STEERING_TORQUE": torque, "LKAS_CONTROL_BIT": steer_req} + return self.packer.make_can_msg_safety("LKAS_COMMAND", 0, values) + + def test_buttons(self): + for controls_allowed in (True, False): + self.safety.set_controls_allowed(controls_allowed) + + # resume only while controls allowed + self.assertEqual(controls_allowed, self._tx(self._button_msg(resume=True))) + + # can always cancel + self.assertTrue(self._tx(self._button_msg(cancel=True))) + + def test_rx_hook(self): + for count in range(20): + self.assertTrue(self._rx(self._speed_msg(0)), f"{count=}") + self.assertTrue(self._rx(self._user_brake_msg(False)), f"{count=}") + self.assertTrue(self._rx(self._torque_meas_msg(0)), f"{count=}") + self.assertTrue(self._rx(self._user_gas_msg(0)), f"{count=}") + self.assertTrue(self._rx(self._pcm_status_msg(False)), f"{count=}") + + +if __name__ == "__main__": + unittest.main() From af399db5bc9635fb8f784bd7c2f2a84ead41dcab Mon Sep 17 00:00:00 2001 From: Lukas Heintz <61192133+lukasloetkolben@users.noreply.github.com> Date: Thu, 26 Mar 2026 11:12:40 -0700 Subject: [PATCH 165/229] Vehicle Model: correct unit for roll compensation curvature (#3174) proper unit --- opendbc/car/vehicle_model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendbc/car/vehicle_model.py b/opendbc/car/vehicle_model.py index c7d0494be6d..fa20a6e7d52 100755 --- a/opendbc/car/vehicle_model.py +++ b/opendbc/car/vehicle_model.py @@ -111,7 +111,7 @@ def roll_compensation(self, roll: float, u: float) -> float: u: Speed [m/s] Returns: - Roll compensation curvature [rad] + Roll compensation curvature [1/m] """ sf = calc_slip_factor(self) From ff37c0f06095808dda1b284f9c40dd967ef1905d Mon Sep 17 00:00:00 2001 From: dkiiv Date: Thu, 26 Mar 2026 11:50:44 -0700 Subject: [PATCH 166/229] Tesla: Add Model 3 Performance HW4 FP (#3184) * add Model 3 Performance HW4 FP * FSD v14 too * Tesla 2026.2.9.1 update * changed my EPS FW string * 4b6b0748e0d044e2/00000116--2cc20e51ac * mechanical sort with auto_fingerprint --------- Co-authored-by: Jason Young --- opendbc/car/tesla/fingerprints.py | 6 ++++-- opendbc/car/tesla/values.py | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/opendbc/car/tesla/fingerprints.py b/opendbc/car/tesla/fingerprints.py index 8d4b185e17a..1a96263c048 100644 --- a/opendbc/car/tesla/fingerprints.py +++ b/opendbc/car/tesla/fingerprints.py @@ -19,6 +19,8 @@ b'TeMYG4_Main_0.0.0 (65),E4H015.01.0', b'TeMYG4_Main_0.0.0 (67),E4H015.02.1', b'TeMYG4_Main_0.0.0 (77),E4H015.04.5', + b'TeMYG4_Main_0.0.0 (77),E4HP015.04.5', + b'TeMYG4_Main_0.0.0 (78),E4HP015.05.0', b'TeMYG4_SingleECU_0.0.0 (33),E4S014.27', ], }, @@ -35,10 +37,10 @@ b'TeMYG4_Legacy3Y_0.0.0 (2),Y4P003.02.0', b'TeMYG4_Legacy3Y_0.0.0 (5),Y4003.03.2', b'TeMYG4_Legacy3Y_0.0.0 (5),Y4P003.03.2', - b'TeMYG4_SingleECU_0.0.0 (28),Y4S002.23.0', - b'TeMYG4_SingleECU_0.0.0 (33),Y4S002.26', b'TeMYG4_Legacy3Y_0.0.0 (6),Y4003.04.0', b'TeMYG4_Main_0.0.0 (77),Y4003.05.4', + b'TeMYG4_SingleECU_0.0.0 (28),Y4S002.23.0', + b'TeMYG4_SingleECU_0.0.0 (33),Y4S002.26', ], }, CAR.TESLA_MODEL_X: { diff --git a/opendbc/car/tesla/values.py b/opendbc/car/tesla/values.py index 8f5e1ec9ee2..5f25e990ec7 100644 --- a/opendbc/car/tesla/values.py +++ b/opendbc/car/tesla/values.py @@ -76,6 +76,10 @@ class CAR(Platforms): # Cars with this EPS FW have FSD 14 and use TeslaFlags.FSD_14 FSD_14_FW = { + CAR.TESLA_MODEL_3: [ + b'TeMYG4_Main_0.0.0 (77),E4HP015.04.5', + b'TeMYG4_Main_0.0.0 (78),E4HP015.05.0', + ], CAR.TESLA_MODEL_Y: [ b'TeMYG4_Legacy3Y_0.0.0 (6),Y4003.04.0', b'TeMYG4_Main_0.0.0 (77),Y4003.05.4', From 9cff7222fc0fe3be2fe2794c07630010b1f33bf6 Mon Sep 17 00:00:00 2001 From: MVL Date: Thu, 26 Mar 2026 16:15:56 -0400 Subject: [PATCH 167/229] Honda - Add additional 2024 Civic fingerprint (#3230) Add additional 2024 Civic fingerprint --- opendbc/car/honda/fingerprints.py | 1 + 1 file changed, 1 insertion(+) diff --git a/opendbc/car/honda/fingerprints.py b/opendbc/car/honda/fingerprints.py index 859492ca696..7294e46197b 100644 --- a/opendbc/car/honda/fingerprints.py +++ b/opendbc/car/honda/fingerprints.py @@ -992,6 +992,7 @@ b'36161-T47-A060\x00\x00', b'36161-T47-A070\x00\x00', b'8S102-T20-AA10\x00\x00', + b'8S102-T20-AA20\x00\x00', b'8S102-T43-J540\x00\x00', b'8S102-T47-AA10\x00\x00', b'8S102-T47-AA20\x00\x00', From a15a7053c44038dcd62569e3e79a40fb4da4dbb5 Mon Sep 17 00:00:00 2001 From: royjr Date: Thu, 26 Mar 2026 15:29:19 -0700 Subject: [PATCH 168/229] HKG: Hyundai Kona EV 2022 Fingerprint (#3204) Update fingerprints.py --- opendbc/car/hyundai/fingerprints.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/opendbc/car/hyundai/fingerprints.py b/opendbc/car/hyundai/fingerprints.py index b1cb1867f58..00354ea7d13 100644 --- a/opendbc/car/hyundai/fingerprints.py +++ b/opendbc/car/hyundai/fingerprints.py @@ -686,6 +686,7 @@ }, CAR.HYUNDAI_KONA_EV_2022: { (Ecu.abs, 0x7d1, None): [ + b'\xf1\x00OS IEB \x02 101 \x11\x13 58520-K4010', b'\xf1\x00OS IEB \x02 102"\x05\x16 58520-K4010', b'\xf1\x00OS IEB \x03 101 \x11\x13 58520-K4010', b'\xf1\x00OS IEB \x03 102"\x05\x16 58520-K4010', @@ -701,6 +702,7 @@ ], (Ecu.eps, 0x7d4, None): [ b'\xf1\x00OSP MDPS C 1.00 1.02 56310-K4271 4OEPC102', + b'\xf1\x00OSP MDPS C 1.00 1.02 56310/K4261 4OEPC102', b'\xf1\x00OSP MDPS C 1.00 1.02 56310/K4271 4OEPC102', b'\xf1\x00OSP MDPS C 1.00 1.02 56310/K4970 4OEPC102', b'\xf1\x00OSP MDPS C 1.00 1.02 56310/K4971 4OEPC102', From 8356b75521ad346425aa96e918b3675804690f39 Mon Sep 17 00:00:00 2001 From: Vrabetz Date: Fri, 27 Mar 2026 00:05:47 +0100 Subject: [PATCH 169/229] VW: Add setup footnote for J533 harness install instructions (#3208) * Add setup footnote for j533 harness installation Add a reference to a j533 guide to avoid people trying to install j533 at the LKAS camera. * line break, wordsmithing --------- Co-authored-by: Jason Young --- opendbc/car/volkswagen/values.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/opendbc/car/volkswagen/values.py b/opendbc/car/volkswagen/values.py index 9089b85e3c1..ec29df5afdf 100644 --- a/opendbc/car/volkswagen/values.py +++ b/opendbc/car/volkswagen/values.py @@ -225,6 +225,10 @@ class VolkswagenCarSpecs(CarSpecs): class Footnote(Enum): + SETUP = CarFootnote( + "The J533 harness plugs in at the CAN gateway under the dashboard, just above the steering column. " + + "More information can be found at this guide.", + Column.MAKE, setup_note=True) KAMIQ = CarFootnote( "Not including the China market Kamiq, which is based on the (currently) unsupported PQ34 platform.", Column.MODEL) @@ -249,6 +253,7 @@ class Footnote(Enum): class VWCarDocs(CarDocs): package: str = "Adaptive Cruise Control (ACC) & Lane Assist" car_parts: CarParts = field(default_factory=CarParts.common([CarHarness.vw_j533])) + footnotes: list[Enum] = field(default_factory=lambda: [Footnote.SETUP]) def init_make(self, CP: structs.CarParams): self.footnotes.append(Footnote.VW_EXP_LONG) From b095a7de5d36d78978a8c5fce3429ffef5c605ac Mon Sep 17 00:00:00 2001 From: Jacob Hansen Date: Thu, 26 Mar 2026 19:15:15 -0500 Subject: [PATCH 170/229] Ford: Add FW for 2021 Ford F-150 (#3183) * Added fingerprints for 2021 F-150 * mechanical sorting by auto_fingerprint * retry CI --------- Co-authored-by: Jason Young --- opendbc/car/ford/fingerprints.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/opendbc/car/ford/fingerprints.py b/opendbc/car/ford/fingerprints.py index 6b3e33701fb..1c918d63799 100644 --- a/opendbc/car/ford/fingerprints.py +++ b/opendbc/car/ford/fingerprints.py @@ -106,10 +106,12 @@ }, CAR.FORD_F_150_MK14: { (Ecu.eps, 0x730, None): [ + b'ML3V-14D003-BA\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', b'ML3V-14D003-BC\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', b'ML3V-14D003-BD\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', ], (Ecu.abs, 0x760, None): [ + b'ML34-2D053-AJ\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', b'NL34-2D053-CA\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', b'PL34-2D053-CA\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', b'PL34-2D053-CC\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', @@ -117,6 +119,7 @@ b'PL3V-2D053-BB\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', ], (Ecu.fwdRadar, 0x764, None): [ + b'ML3T-14D049-AH\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', b'ML3T-14D049-AK\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', b'ML3T-14D049-AL\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', ], @@ -124,6 +127,7 @@ b'ML3T-14H102-ABR\x00\x00\x00\x00\x00\x00\x00\x00\x00', b'ML3T-14H102-ABS\x00\x00\x00\x00\x00\x00\x00\x00\x00', b'ML3T-14H102-ABT\x00\x00\x00\x00\x00\x00\x00\x00\x00', + b'ML3T-14H102-ACA\x00\x00\x00\x00\x00\x00\x00\x00\x00', b'PJ6T-14H102-ABJ\x00\x00\x00\x00\x00\x00\x00\x00\x00', b'PJ6T-14H102-ABS\x00\x00\x00\x00\x00\x00\x00\x00\x00', b'RJ6T-14H102-ACJ\x00\x00\x00\x00\x00\x00\x00\x00\x00', From 0e4690aebdb413d87633ff9daaedd21d35e4974f Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Thu, 26 Mar 2026 19:18:11 -0700 Subject: [PATCH 171/229] Rivian: fix duplicate counters on forwarded VDM_AdasSts (#3236) * fix * strict Co-authored-by: lukasloetkolben <61192133+lukasloetkolben@users.noreply.github.com> Co-authored-by: Daniel Koepping --- opendbc/car/rivian/carcontroller.py | 3 ++- opendbc/car/rivian/carstate.py | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/opendbc/car/rivian/carcontroller.py b/opendbc/car/rivian/carcontroller.py index 6e7c3a12ff7..13e7f5cb019 100644 --- a/opendbc/car/rivian/carcontroller.py +++ b/opendbc/car/rivian/carcontroller.py @@ -48,7 +48,8 @@ def update(self, CC, CS, now_nanos): else: self.cancel_frames = 0 - can_sends.append(create_adas_status(self.packer, CS.vdm_adas_status, interface_status)) + for msg in CS.vdm_adas_status: + can_sends.append(create_adas_status(self.packer, msg, interface_status)) new_actuators = actuators.as_builder() new_actuators.torque = apply_torque / steer_max diff --git a/opendbc/car/rivian/carstate.py b/opendbc/car/rivian/carstate.py index 001d705ef00..fe644305893 100644 --- a/opendbc/car/rivian/carstate.py +++ b/opendbc/car/rivian/carstate.py @@ -13,9 +13,9 @@ def __init__(self, CP): super().__init__(CP) self.last_speed = 30 - self.acm_lka_hba_cmd = None - self.sccm_wheel_touch = None - self.vdm_adas_status = None + self.acm_lka_hba_cmd: dict | None = None + self.sccm_wheel_touch: dict | None = None + self.vdm_adas_status: list[dict] | None = None def update(self, can_parsers) -> structs.CarState: cp = can_parsers[Bus.pt] @@ -90,7 +90,10 @@ def update(self, can_parsers) -> structs.CarState: # Messages needed by carcontroller self.acm_lka_hba_cmd = copy.copy(cp_cam.vl["ACM_lkaHbaCmd"]) self.sccm_wheel_touch = copy.copy(cp.vl["SCCM_WheelTouch"]) - self.vdm_adas_status = copy.copy(cp.vl["VDM_AdasSts"]) + + # This message can lag and send two messages at once, make sure we forward all of them + adas_status_msgs = cp.vl_all["VDM_AdasSts"] + self.vdm_adas_status = [dict(zip(adas_status_msgs, vals, strict=True)) for vals in zip(*adas_status_msgs.values(), strict=True)] return ret From 3fbb1315fa12d6f82c39d7c9a1086aa9e6889a3d Mon Sep 17 00:00:00 2001 From: royjr Date: Thu, 26 Mar 2026 21:00:52 -0700 Subject: [PATCH 172/229] HKG: Kia Niro Hybrid 2024 Fingerprint (#3162) * Update fingerprints.py * Update values.py * retry CI --------- Co-authored-by: Jason Young --- opendbc/car/hyundai/fingerprints.py | 1 + opendbc/car/hyundai/values.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/opendbc/car/hyundai/fingerprints.py b/opendbc/car/hyundai/fingerprints.py index 00354ea7d13..f907813b8d0 100644 --- a/opendbc/car/hyundai/fingerprints.py +++ b/opendbc/car/hyundai/fingerprints.py @@ -1203,6 +1203,7 @@ (Ecu.fwdCamera, 0x7c4, None): [ b'\xf1\x00SG2HMFC AT USA LHD 1.01 1.08 99211-AT000 220531', b'\xf1\x00SG2HMFC AT USA LHD 1.01 1.09 99211-AT000 220801', + b'\xf1\x00SG2HMFC AT USA LHD 1.00 1.00 99211-AT100 230216', ], (Ecu.fwdRadar, 0x7d0, None): [ b'\xf1\x00SG2_ RDR ----- 1.00 1.01 99110-AT000 ', diff --git a/opendbc/car/hyundai/values.py b/opendbc/car/hyundai/values.py index b0e806b2905..56eced6384e 100644 --- a/opendbc/car/hyundai/values.py +++ b/opendbc/car/hyundai/values.py @@ -438,7 +438,7 @@ class CAR(Platforms): flags=HyundaiFlags.HYBRID, ) KIA_NIRO_HEV_2ND_GEN = HyundaiCanFDPlatformConfig( - [HyundaiCarDocs("Kia Niro Hybrid 2023", car_parts=CarParts.common([CarHarness.hyundai_a]))], + [HyundaiCarDocs("Kia Niro Hybrid 2023-24", car_parts=CarParts.common([CarHarness.hyundai_a]))], KIA_NIRO_EV.specs, ) KIA_OPTIMA_G4 = HyundaiPlatformConfig( From 498f05fcb420e5ecc4b9f9452846b470d442b20c Mon Sep 17 00:00:00 2001 From: MVL Date: Fri, 27 Mar 2026 00:13:36 -0400 Subject: [PATCH 173/229] Honda - Bump 2022 Acura TLX and restore testroute (#3170) * Add 2022 Acura TLX fingerprint * whitespace fix * Bump to 2022 TLX * whitespace fix * remove 22 TLX from community list * Add TLX_2G testroute from 2022 * retry CI --------- Co-authored-by: Jason Young --- opendbc/car/extra_cars.py | 2 +- opendbc/car/honda/fingerprints.py | 1 + opendbc/car/honda/values.py | 2 +- opendbc/car/tests/routes.py | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/opendbc/car/extra_cars.py b/opendbc/car/extra_cars.py index cbc2b33d777..a4924675523 100644 --- a/opendbc/car/extra_cars.py +++ b/opendbc/car/extra_cars.py @@ -47,7 +47,7 @@ class CAR(Platforms): CommunityCarDocs("Acura RLX 2017", "Advance Package or Technology Package"), CommunityCarDocs("Acura TLX 2015-17", "Advance Package"), CommunityCarDocs("Acura TLX 2018-20"), - CommunityCarDocs("Acura TLX 2022-23"), + CommunityCarDocs("Acura TLX 2023"), GMSecurityCarDocs("Acura ZDX 2024"), CommunityCarDocs("Honda Accord 2016-17", "Honda Sensing"), CommunityCarDocs("Honda Accord Hybrid 2017"), diff --git a/opendbc/car/honda/fingerprints.py b/opendbc/car/honda/fingerprints.py index 7294e46197b..1e77f110fc2 100644 --- a/opendbc/car/honda/fingerprints.py +++ b/opendbc/car/honda/fingerprints.py @@ -1094,6 +1094,7 @@ ], (Ecu.fwdCamera, 0x18dab5f1, None): [ b'36161-TGV-A030\x00\x00', + b'36161-TGV-A040\x00\x00', ], }, CAR.ACURA_TLX_2G_MMR: { diff --git a/opendbc/car/honda/values.py b/opendbc/car/honda/values.py index 48214f58ad9..a5b2f510b14 100644 --- a/opendbc/car/honda/values.py +++ b/opendbc/car/honda/values.py @@ -273,7 +273,7 @@ class CAR(Platforms): flags=HondaFlags.BOSCH_ALT_BRAKE | HondaFlags.BOSCH_ALT_RADAR, ) ACURA_TLX_2G = HondaBoschPlatformConfig( - [HondaCarDocs("Acura TLX 2021", "All")], + [HondaCarDocs("Acura TLX 2021-22", "All")], CarSpecs(mass=3982 * CV.LB_TO_KG, wheelbase=2.87, steerRatio=14.0, centerToFrontRatio=0.43), {Bus.pt: 'honda_civic_hatchback_ex_2017_can_generated'}, flags=HondaFlags.BOSCH_ALT_RADAR, diff --git a/opendbc/car/tests/routes.py b/opendbc/car/tests/routes.py index 87b0e66005d..b4b59a5384a 100644 --- a/opendbc/car/tests/routes.py +++ b/opendbc/car/tests/routes.py @@ -27,7 +27,6 @@ VOLKSWAGEN.VOLKSWAGEN_CRAFTER_MK2, # need a route from an ACC-equipped Crafter SUBARU.SUBARU_FORESTER_HYBRID, VOLKSWAGEN.PORSCHE_MACAN_MK1, - HONDA.ACURA_TLX_2G, # These had their DSUs unplugged, need new routes # TOYOTA.LEXUS_ES # hybrid @@ -128,6 +127,7 @@ class CarTestRoute(NamedTuple): CarTestRoute("414af83891dbf72c/00000006--51fa6d99cd", HONDA.HONDA_NBOX_2G), CarTestRoute("ad9840558640c31d/0000001a--d6cd4871c2", HONDA.ACURA_MDX_4G_MMR), # 2025 MDX CarTestRoute("ad9840558640c31d/000001f2--026c4f6275", HONDA.ACURA_TLX_2G_MMR), + CarTestRoute("6b22f2fcd61fa86a/00000000--b3adfc8746", HONDA.ACURA_TLX_2G), CarTestRoute("87d7f06ade479c2e/2023-09-11--23-30-11", HYUNDAI.HYUNDAI_AZERA_6TH_GEN), CarTestRoute("66189dd8ec7b50e6/2023-09-20--07-02-12", HYUNDAI.HYUNDAI_AZERA_HEV_6TH_GEN), From 4350167eec0942ce50dacacd8bbad29da403fb2d Mon Sep 17 00:00:00 2001 From: "Thor J. Kooda" <792089+tkooda@users.noreply.github.com> Date: Thu, 26 Mar 2026 23:33:35 -0500 Subject: [PATCH 174/229] ford: add 2025 Ranger Raptor fingerprint (#3177) * ford: add 2025 ranger raptor fingerprint Signed-off-by: Thor J. Kooda <792089+tkooda@users.noreply.github.com> * Rivian: fix duplicate counters on forwarded VDM_AdasSts (#3236) * fix * strict * HKG: Kia Niro Hybrid 2024 Fingerprint (#3162) * Update fingerprints.py * Update values.py * retry CI --------- Co-authored-by: Jason Young * Revert "Rivian: fix duplicate counters on forwarded VDM_AdasSts (#3236)" This reverts commit d941ca9f75e7f5ed261076516cea855718307408. * Reapply "Rivian: fix duplicate counters on forwarded VDM_AdasSts (#3236)" Co-authored-by: lukasloetkolben <61192133+lukasloetkolben@users.noreply.github.com> Co-authored-by: Daniel Koepping This reverts commit 438693be20adc0a0063c19f2e525b2ed5de01c74. * Honda - Bump 2022 Acura TLX and restore testroute (#3170) * Add 2022 Acura TLX fingerprint * whitespace fix * Bump to 2022 TLX * whitespace fix * remove 22 TLX from community list * Add TLX_2G testroute from 2022 * retry CI --------- Co-authored-by: Jason Young --------- Signed-off-by: Thor J. Kooda <792089+tkooda@users.noreply.github.com> Co-authored-by: Shane Smiskol Co-authored-by: royjr Co-authored-by: Jason Young Co-authored-by: MVL --- opendbc/car/ford/fingerprints.py | 1 + 1 file changed, 1 insertion(+) diff --git a/opendbc/car/ford/fingerprints.py b/opendbc/car/ford/fingerprints.py index 1c918d63799..b91d533d6e5 100644 --- a/opendbc/car/ford/fingerprints.py +++ b/opendbc/car/ford/fingerprints.py @@ -215,6 +215,7 @@ b'PB3C-2D053-ZD\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', b'PB3C-2D053-ZG\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', b'PB3C-2D053-ZJ\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', + b'RB3C-2D053-AK\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', ], (Ecu.fwdRadar, 0x764, None): [ b'ML3T-14D049-AL\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', From a691ffb97715b477890e8bff4b130e87d9713400 Mon Sep 17 00:00:00 2001 From: adeebshihadeh Date: Fri, 27 Mar 2026 08:20:34 +0000 Subject: [PATCH 175/229] docs: Scheduled auto-update CARS.md --- docs/CARS.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/CARS.md b/docs/CARS.md index 3bfc8cdb199..ae657cee346 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -1,6 +1,6 @@ -# Support Information for 391 Known Cars +# Support Information for 392 Known Cars |Make|Model|Package|Support Level| |---|---|---|:---:| @@ -19,8 +19,8 @@ |Acura|RLX 2017|Advance Package or Technology Package|[Community](#community)| |Acura|TLX 2015-17|Advance Package|[Community](#community)| |Acura|TLX 2018-20|All|[Community](#community)| -|Acura|TLX 2021|All|[Upstream](#upstream)| -|Acura|TLX 2022-23|All|[Community](#community)| +|Acura|TLX 2021-22|All|[Upstream](#upstream)| +|Acura|TLX 2023|All|[Community](#community)| |Acura|TLX 2025|All|[Upstream](#upstream)| |Acura|ZDX 2024|All|[Not compatible](#can-bus-security)| |Audi|A3 2014-19|Adaptive Cruise Control (ACC) & Lane Assist|[Upstream](#upstream)| @@ -171,6 +171,7 @@ |Hyundai|Tucson Hybrid 2022-24|All|[Upstream](#upstream)| |Hyundai|Tucson Plug-in Hybrid 2024|All|[Upstream](#upstream)| |Hyundai|Veloster 2019-20|Smart Cruise Control (SCC)|[Upstream](#upstream)| +|Jeep|Cherokee 2019-23|Adaptive Cruise Control (ACC)|[Upstream](#upstream)| |Jeep|Grand Cherokee 2016-18|Adaptive Cruise Control (ACC)|[Upstream](#upstream)| |Jeep|Grand Cherokee 2019-21|Adaptive Cruise Control (ACC)|[Upstream](#upstream)| |Kia|Carnival 2022-24|Smart Cruise Control (SCC)|[Upstream](#upstream)| @@ -194,7 +195,7 @@ |Kia|Niro Hybrid 2018|Smart Cruise Control (SCC)|[Upstream](#upstream)| |Kia|Niro Hybrid 2021|Smart Cruise Control (SCC)|[Upstream](#upstream)| |Kia|Niro Hybrid 2022|Smart Cruise Control (SCC)|[Upstream](#upstream)| -|Kia|Niro Hybrid 2023|Smart Cruise Control (SCC)|[Upstream](#upstream)| +|Kia|Niro Hybrid 2023-24|Smart Cruise Control (SCC)|[Upstream](#upstream)| |Kia|Niro Plug-in Hybrid 2018-19|All|[Upstream](#upstream)| |Kia|Niro Plug-in Hybrid 2020|Smart Cruise Control (SCC)|[Upstream](#upstream)| |Kia|Niro Plug-in Hybrid 2021|Smart Cruise Control (SCC)|[Upstream](#upstream)| @@ -256,8 +257,8 @@ |Peugeot|208 2019-25|Adaptive Cruise Control (ACC) & Lane Assist|[Dashcam mode](#dashcam)| |Porsche|Macan 2017-24|Adaptive Cruise Control (ACC) & Lane Assist|[Dashcam mode](#dashcam)| |Ram|1500 2019-24|Adaptive Cruise Control (ACC)|[Upstream](#upstream)| -|Ram|2500 2020-24|Adaptive Cruise Control (ACC)|[Dashcam mode](#dashcam)| -|Ram|3500 2019-22|Adaptive Cruise Control (ACC)|[Dashcam mode](#dashcam)| +|Ram|2500 2020-24|Adaptive Cruise Control (ACC)|[Upstream](#upstream)| +|Ram|3500 2019-22|Adaptive Cruise Control (ACC)|[Upstream](#upstream)| |Rivian|R1S 2022-24|All|[Upstream](#upstream)| |Rivian|R1T 2022-24|All|[Upstream](#upstream)| |SEAT|Alhambra 2018-20|Adaptive Cruise Control (ACC) & Lane Assist|[Dashcam mode](#dashcam)| From 9fa2c24bf58e6dcf1a17482a63bc6bee417f3abb Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Fri, 27 Mar 2026 13:20:31 -0400 Subject: [PATCH 176/229] Hyundai: cleanup unsupported longitudinal cars list (#2648) * Hyundai: cleanup unsupported longitudinal cars list * use int flag directly * lint * remove altogether --------- Co-authored-by: Jason Young <46612682+jyoung8607@users.noreply.github.com> --- opendbc/car/hyundai/interface.py | 8 +++----- opendbc/car/hyundai/tests/test_hyundai.py | 3 ++- opendbc/car/hyundai/values.py | 10 ++++------ 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/opendbc/car/hyundai/interface.py b/opendbc/car/hyundai/interface.py index 5bf4ebb70eb..9dc18c93c79 100644 --- a/opendbc/car/hyundai/interface.py +++ b/opendbc/car/hyundai/interface.py @@ -1,8 +1,6 @@ from opendbc.car import Bus, get_safety_config, structs, uds from opendbc.car.hyundai.hyundaicanfd import CanBus -from opendbc.car.hyundai.values import HyundaiFlags, CAR, DBC, \ - CANFD_UNSUPPORTED_LONGITUDINAL_CAR, \ - UNSUPPORTED_LONGITUDINAL_CAR, HyundaiSafetyFlags +from opendbc.car.hyundai.values import HyundaiFlags, CAR, DBC, HyundaiSafetyFlags from opendbc.car.hyundai.radar_interface import RADAR_START_ADDR from opendbc.car.interfaces import CarInterfaceBase from opendbc.car.disable_ecu import disable_ecu @@ -38,7 +36,7 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo if ret.flags & HyundaiFlags.CANFD: # Shared configuration for CAN-FD cars - ret.alphaLongitudinalAvailable = candidate not in CANFD_UNSUPPORTED_LONGITUDINAL_CAR + ret.alphaLongitudinalAvailable = not (ret.flags & HyundaiFlags.CANFD_NO_RADAR_DISABLE) if lka_steering and Ecu.adas not in [fw.ecu for fw in car_fw]: # this needs to be figured out for cars without an ADAS ECU ret.alphaLongitudinalAvailable = False @@ -85,7 +83,7 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo else: # Shared configuration for non CAN-FD cars - ret.alphaLongitudinalAvailable = candidate not in UNSUPPORTED_LONGITUDINAL_CAR + ret.alphaLongitudinalAvailable = not (ret.flags & (HyundaiFlags.LEGACY | HyundaiFlags.UNSUPPORTED_LONGITUDINAL)) ret.enableBsm = 0x58b in fingerprint[0] # Send LFA message on cars with HDA diff --git a/opendbc/car/hyundai/tests/test_hyundai.py b/opendbc/car/hyundai/tests/test_hyundai.py index 25c88d47fc4..4481c621516 100644 --- a/opendbc/car/hyundai/tests/test_hyundai.py +++ b/opendbc/car/hyundai/tests/test_hyundai.py @@ -74,7 +74,8 @@ def test_can_features(self): assert set.union(*CAN_GEARS.values()) & (HYBRID_CAR | EV_CAR) == set() # Test CAN FD car not in CAN feature lists - can_specific_feature_list = set.union(*CAN_GEARS.values(), *CHECKSUM.values(), LEGACY_SAFETY_MODE_CAR, UNSUPPORTED_LONGITUDINAL_CAR, CAMERA_SCC_CAR) + can_specific_feature_list = set.union(*CAN_GEARS.values(), *CHECKSUM.values(), LEGACY_SAFETY_MODE_CAR, + *UNSUPPORTED_LONGITUDINAL_CAR.values(), CAMERA_SCC_CAR) for car_model in CANFD_CAR: assert car_model not in can_specific_feature_list, "CAN FD car unexpectedly found in a CAN feature list" diff --git a/opendbc/car/hyundai/values.py b/opendbc/car/hyundai/values.py index 56eced6384e..0042982de30 100644 --- a/opendbc/car/hyundai/values.py +++ b/opendbc/car/hyundai/values.py @@ -775,9 +775,6 @@ def match_fw_to_car_fuzzy(live_fw_versions, vin, offline_fw_versions) -> set[str } CANFD_CAR = CAR.with_flags(HyundaiFlags.CANFD) -CANFD_RADAR_SCC_CAR = CAR.with_flags(HyundaiFlags.RADAR_SCC) # TODO: merge with UNSUPPORTED_LONGITUDINAL_CAR - -CANFD_UNSUPPORTED_LONGITUDINAL_CAR = CAR.with_flags(HyundaiFlags.CANFD_NO_RADAR_DISABLE) # TODO: merge with UNSUPPORTED_LONGITUDINAL_CAR CAMERA_SCC_CAR = CAR.with_flags(HyundaiFlags.CAMERA_SCC) @@ -787,8 +784,9 @@ def match_fw_to_car_fuzzy(live_fw_versions, vin, offline_fw_versions) -> set[str LEGACY_SAFETY_MODE_CAR = CAR.with_flags(HyundaiFlags.LEGACY) -# TODO: another PR with (HyundaiFlags.LEGACY | HyundaiFlags.UNSUPPORTED_LONGITUDINAL | HyundaiFlags.CAMERA_SCC | -# HyundaiFlags.CANFD_RADAR_SCC | HyundaiFlags.CANFD_NO_RADAR_DISABLE | ) -UNSUPPORTED_LONGITUDINAL_CAR = CAR.with_flags(HyundaiFlags.LEGACY) | CAR.with_flags(HyundaiFlags.UNSUPPORTED_LONGITUDINAL) +UNSUPPORTED_LONGITUDINAL_CAR = { + "legacy": CAR.with_flags(HyundaiFlags.LEGACY), + "can": CAR.with_flags(HyundaiFlags.UNSUPPORTED_LONGITUDINAL), +} DBC = CAR.create_dbc_map() From 00431e091fdbd2301a0104a44a40e5bffe37b917 Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Fri, 27 Mar 2026 13:33:45 -0700 Subject: [PATCH 177/229] Chrysler: Fix dashcam-only car config (#3240) --- opendbc/car/chrysler/interface.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendbc/car/chrysler/interface.py b/opendbc/car/chrysler/interface.py index 78d768daa8d..62de8178883 100755 --- a/opendbc/car/chrysler/interface.py +++ b/opendbc/car/chrysler/interface.py @@ -19,7 +19,7 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo ret.brand = "chrysler" # TODO: Chrysler CUSW in dashcam pending comma safety validation and a fix for LKAS fault on disengage - ret.dashcamOnly = candidate in (RAM_HD, CUSW_CARS) + ret.dashcamOnly = candidate in (RAM_HD | CUSW_CARS) # radar parsing needs some work, see https://github.com/commaai/openpilot/issues/26842 ret.radarUnavailable = True # Bus.radar not in DBC[candidate][Bus.radar] From dc0e7d061bbd80f22a6f44470b941cd2f3b28f92 Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Fri, 27 Mar 2026 18:10:29 -0700 Subject: [PATCH 178/229] fix test_models CI workflow (#3244) fix test_models flow --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6846991aa71..55f11226941 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -109,11 +109,11 @@ jobs: repository: 'commaai/openpilot' ref: 'master' submodules: true + - run: ./tools/op.sh setup - run: rm -rf opendbc_repo/ - uses: actions/checkout@v4 with: path: opendbc_repo - - run: ./tools/op.sh setup - name: Cache test routes id: routes-cache uses: actions/cache@v4 From a311ccb089f1ac6757ab28f04883f0447d5a5a88 Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Fri, 27 Mar 2026 18:13:34 -0700 Subject: [PATCH 179/229] Honda: Disable Acura TLX 2G test route (#3242) hello darkness my old friend --- opendbc/car/tests/routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendbc/car/tests/routes.py b/opendbc/car/tests/routes.py index b4b59a5384a..87b0e66005d 100644 --- a/opendbc/car/tests/routes.py +++ b/opendbc/car/tests/routes.py @@ -27,6 +27,7 @@ VOLKSWAGEN.VOLKSWAGEN_CRAFTER_MK2, # need a route from an ACC-equipped Crafter SUBARU.SUBARU_FORESTER_HYBRID, VOLKSWAGEN.PORSCHE_MACAN_MK1, + HONDA.ACURA_TLX_2G, # These had their DSUs unplugged, need new routes # TOYOTA.LEXUS_ES # hybrid @@ -127,7 +128,6 @@ class CarTestRoute(NamedTuple): CarTestRoute("414af83891dbf72c/00000006--51fa6d99cd", HONDA.HONDA_NBOX_2G), CarTestRoute("ad9840558640c31d/0000001a--d6cd4871c2", HONDA.ACURA_MDX_4G_MMR), # 2025 MDX CarTestRoute("ad9840558640c31d/000001f2--026c4f6275", HONDA.ACURA_TLX_2G_MMR), - CarTestRoute("6b22f2fcd61fa86a/00000000--b3adfc8746", HONDA.ACURA_TLX_2G), CarTestRoute("87d7f06ade479c2e/2023-09-11--23-30-11", HYUNDAI.HYUNDAI_AZERA_6TH_GEN), CarTestRoute("66189dd8ec7b50e6/2023-09-20--07-02-12", HYUNDAI.HYUNDAI_AZERA_HEV_6TH_GEN), From 18f906f7ee8c8c3b3f47e47be49d361adc7b63f1 Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Fri, 27 Mar 2026 18:42:52 -0700 Subject: [PATCH 180/229] Hyundai CAN FD: Update DBC signals (#3241) * Rivian: fix duplicate counters on forwarded VDM_AdasSts (#3236) * fix * strict * Hyundai CAN FD: Update DBC signals * revert * more --------- Co-authored-by: Shane Smiskol Co-authored-by: royjr --- opendbc/car/hyundai/carstate.py | 6 +- opendbc/car/hyundai/hyundaicanfd.py | 32 +- .../hyundai/_hyundai_canfd_common.dbc | 48 ++- .../dbc/generator/hyundai/hyundai_canfd.dbc | 355 +++++++++++++++--- opendbc/safety/tests/test_hyundai_canfd.py | 4 +- 5 files changed, 355 insertions(+), 90 deletions(-) diff --git a/opendbc/car/hyundai/carstate.py b/opendbc/car/hyundai/carstate.py index 60978970ab2..5532d67eebf 100644 --- a/opendbc/car/hyundai/carstate.py +++ b/opendbc/car/hyundai/carstate.py @@ -238,10 +238,10 @@ def update_canfd(self, can_parsers) -> structs.CarState: ret.steeringRateDeg = cp.vl["STEERING_SENSORS"]["STEERING_RATE"] ret.steeringAngleDeg = cp.vl["STEERING_SENSORS"]["STEERING_ANGLE"] - ret.steeringTorque = cp.vl["MDPS"]["STEERING_COL_TORQUE"] - ret.steeringTorqueEps = cp.vl["MDPS"]["STEERING_OUT_TORQUE"] + ret.steeringTorque = cp.vl["MDPS"]["MDPS_StrTqSnsrVal"] + ret.steeringTorqueEps = cp.vl["MDPS"]["MDPS_OutTqVal"] ret.steeringPressed = self.update_steering_pressed(abs(ret.steeringTorque) > self.params.STEER_THRESHOLD, 5) - ret.steerFaultTemporary = cp.vl["MDPS"]["LKA_FAULT"] != 0 + ret.steerFaultTemporary = cp.vl["MDPS"]["MDPS_LkaFailSta"] != 0 # TODO: alt signal usage may be described by cp.vl['BLINKERS']['USE_ALT_LAMP'] left_blinker_sig, right_blinker_sig = "LEFT_LAMP", "RIGHT_LAMP" diff --git a/opendbc/car/hyundai/hyundaicanfd.py b/opendbc/car/hyundai/hyundaicanfd.py index 30eb1376e23..7059bf169c1 100644 --- a/opendbc/car/hyundai/hyundaicanfd.py +++ b/opendbc/car/hyundai/hyundaicanfd.py @@ -1,4 +1,3 @@ -import copy import numpy as np from opendbc.car import CanBusBase from opendbc.car.crc import CRC16_XMODEM @@ -37,32 +36,25 @@ def CAM(self): def create_steering_messages(packer, CP, CAN, enabled, lat_active, apply_torque): - common_values = { - "LKA_MODE": 2, - "LKA_ICON": 2 if enabled else 1, - "TORQUE_REQUEST": apply_torque, - "LKA_ASSIST": 0, - "STEER_REQ": 1 if lat_active else 0, - "STEER_MODE": 0, - "HAS_LANE_SAFETY": 0, # hide LKAS settings - "NEW_SIGNAL_2": 0, - "DAMP_FACTOR": 100, # can potentially tuned for better perf [3, 200] + values = { + "LKA_OptUsmSta": 2, + "LKA_SysIndReq": 2 if enabled else 1, + "StrTqReqVal": apply_torque, + "LKA_SysWrn": 0, + "ActToiSta": 1 if lat_active else 0, + "LKA_UsmMod": 0, # hide LKAS settings + "LKA_RcgSta": 0, + "Damping_Gain": 100, # can potentially tuned for better perf [3, 200] } - lkas_values = copy.copy(common_values) - lkas_values["LKA_AVAILABLE"] = 0 - - lfa_values = copy.copy(common_values) - lfa_values["NEW_SIGNAL_1"] = 0 - ret = [] if CP.flags & HyundaiFlags.CANFD_LKA_STEERING: lkas_msg = "LKAS_ALT" if CP.flags & HyundaiFlags.CANFD_LKA_STEERING_ALT else "LKAS" if CP.openpilotLongitudinalControl: - ret.append(packer.make_can_msg("LFA", CAN.ECAN, lfa_values)) - ret.append(packer.make_can_msg(lkas_msg, CAN.ACAN, lkas_values)) + ret.append(packer.make_can_msg("LFA", CAN.ECAN, values)) + ret.append(packer.make_can_msg(lkas_msg, CAN.ACAN, values)) else: - ret.append(packer.make_can_msg("LFA", CAN.ECAN, lfa_values)) + ret.append(packer.make_can_msg("LFA", CAN.ECAN, values)) return ret diff --git a/opendbc/dbc/generator/hyundai/_hyundai_canfd_common.dbc b/opendbc/dbc/generator/hyundai/_hyundai_canfd_common.dbc index 19751557b8a..bd1eacbd25d 100644 --- a/opendbc/dbc/generator/hyundai/_hyundai_canfd_common.dbc +++ b/opendbc/dbc/generator/hyundai/_hyundai_canfd_common.dbc @@ -39,19 +39,21 @@ BU_: XXX CAMERA FRONT_RADAR ADRV APRK BO_ 80 LKAS: 16 XXX SG_ CHECKSUM : 0|16@1+ (1,0) [0|65535] "" XXX SG_ COUNTER : 16|8@1+ (1,0) [0|255] "" XXX - SG_ LKA_MODE : 24|3@1+ (1,0) [0|7] "" XXX - SG_ LKA_AVAILABLE : 27|2@1+ (1,0) [0|255] "" XXX - SG_ LKA_WARNING : 32|1@1+ (1,0) [0|1] "" XXX - SG_ LKA_ICON : 38|2@1+ (1,0) [0|255] "" XXX - SG_ FCA_SYSWARN : 40|1@0+ (1,0) [0|1] "" XXX - SG_ TORQUE_REQUEST : 41|11@1+ (1,-1024) [0|4095] "" XXX - SG_ STEER_REQ : 52|1@1+ (1,0) [0|1] "" XXX + SG_ LKA_OptUsmSta : 24|3@1+ (1,0) [0|7] "" ADAS_DRV + SG_ LKA_RcgSta : 27|3@1+ (1,0) [0|7] "" ADAS_DRV + SG_ LKA_LHLnWrnSta : 30|2@1+ (1,0) [0|3] "" ADAS_DRV + SG_ LKA_RHLnWrnSta : 32|2@1+ (1,0) [0|3] "" ADAS_DRV + SG_ LKA_HndsoffSnd : 34|2@1+ (1,0) [0|3] "" ADAS_DRV + SG_ LKA_StrSnd : 36|2@1+ (1,0) [0|3] "" ADAS_DRV + SG_ LKA_SysIndReq : 38|3@1+ (1,0) [0|7] "" ADAS_DRV + SG_ StrTqReqVal : 41|11@1+ (1,-1024) [0|4095] "" XXX + SG_ ActToiSta : 52|2@1+ (1,0) [0|3] "" ADAS_DRV + SG_ ToiFltSta : 54|2@1+ (1,0) [0|3] "" ADAS_DRV SG_ LFA_BUTTON : 56|1@1+ (1,0) [0|255] "" XXX - SG_ LKA_ASSIST : 62|1@1+ (1,0) [0|1] "" XXX - SG_ STEER_MODE : 65|3@1+ (1,0) [0|1] "" XXX - SG_ NEW_SIGNAL_2 : 70|2@0+ (1,0) [0|3] "" XXX - SG_ HAS_LANE_SAFETY : 80|1@0+ (1,0) [0|1] "" XXX - SG_ DAMP_FACTOR : 64|8@1+ (1,0) [0|255] "" XXX + SG_ LKA_SysWrn : 60|4@1+ (1,0) [0|15] "" ADAS_DRV + SG_ Damping_Gain : 64|8@1+ (1,0) [0|255] "" CGW + SG_ LKA_UsmMod : 80|2@1+ (1,0) [0|3] "" ADAS_DRV + SG_ Info_PedtrnDst : 84|3@1+ (1,0) [0|7] "" ADAS_DRV BO_ 81 ADRV_0x51: 32 ADRV SG_ CHECKSUM : 0|16@1+ (1,0) [0|65535] "" XXX @@ -221,12 +223,26 @@ BO_ 702 CAM_0x2be: 32 CAMERA SG_ CHECKSUM : 0|16@1+ (1,0) [0|65535] "" XXX SG_ COUNTER : 16|8@1+ (1,0) [0|255] "" XXX +CM_ BO_ 80 "Known in official DBC as L_ADAS_CMD_30_10ms"; +CM_ SG_ 80 StrTqReqVal "This is the driver torque overlay demand value. A negative value represents a torque that would accelerate the steering wheel in a clockwise direction. This signal is always zero whilst the TOI is inactive. (the official DBC defines this as SG_ StrTqReqVal : xx|11@1+ (0.0078125,-8) [-8|7.9921875] \"Nm\" XXX but I am not changing it since it has a broader impact on the OP code)"; +CM_ SG_ 80 ActToiSta "This is a flag that is set to 1 when requesting the steering to activate the torque overlay interface (TOI). This must be done before an attempt is made to request non-zero steering torque overlay."; +CM_ SG_ 80 ToiFltSta "This fault flag is set when a fault in the LKA system has been detected by the LKA ECU such that LKA can no longer function. CAN failures, internal video ECU failures, hard-wired component (e.g. master switch) failures and other system logic failures are"; +CM_ SG_ 80 LKA_SysWrn "A signal that provides additional information on the operation of the LKA system for the HMI to display to the driver. This includes additional fault information, reasons for unavailability of the system and additional warnings like the hands-off warning"; +CM_ SG_ 80 LKA_UsmMod "This signal indicates LKA USM Mode"; +CM_ SG_ 80 Info_PedtrnDst "Distance of the nearest pedestrian"; CM_ BO_ 676 "Contains signals with detailed lane line information. Used by ADAS ECU on HDA 2 vehicles to operate LFA."; - -CM_ SG_ 80 HAS_LANE_SAFETY "If 0, hides LKAS 'Lane Safety' menu from vehicle settings"; CM_ SG_ 676 LEFT_LANE_LINE "Left lane line confidence"; CM_ SG_ 676 RIGHT_LANE_LINE "Right lane line confidence"; -VAL_ 80 LKA_ICON 0 "hidden" 1 "grey" 2 "green" 3 "flashing green" ; -VAL_ 80 LKA_MODE 1 "warning only" 2 "assist" 6 "off" ; +VAL_ 80 LKA_OptUsmSta 0 "None LKA/LDW Option (Default)" 1 "LDW" 2 "LKA" 3 "Reserved" 4 "LDW Only (None LKA)" 5 "LDW only OFF (None LKA)" 6 "LDW/LKA OFF" 7 "Invalid"; +VAL_ 80 LKA_RcgSta 0 "Not Recognized" 1 "Full Lane Recognized" 2 "Left Line Recognized" 3 "Right Line Recognized" 4 "Reserved" 5 "Reserved" 6 "Reserved" 7 "Reserved"; +VAL_ 80 LKA_LHLnWrnSta 0 "No Warning" 1 "Lane Departure Warning" 2 "Reserved" 3 "Reserved"; +VAL_ 80 LKA_RHLnWrnSta 0 "No Warning" 1 "Lane Departure Warning" 2 "Reserved" 3 "Reserved"; +VAL_ 80 LKA_HndsoffSnd 0 "Off" 1 "Hands-off Sound Warning" 2 "Reserved" 3 "Reserved"; +VAL_ 80 LKA_StrSnd 0 "Off" 1 "Warning" 2 "Reserved" 3 "Reserved"; +VAL_ 80 LKA_SysIndReq 0 "Off" 1 "Unavailable_(Grey On)" 2 "Lane Recognized_(Green On)" 3 "Lane Departure_(Green Blink)" 4 "System Fail_(Orange On)" 5 "Not Calibrated_(Orange Blink)" 6 "Regulation_(Orange On)" 7 "Reserved"; +VAL_ 80 ActToiSta 0 "De-activate TOI" 1 "Activate TOI" 2 "Reserved" 3 "Error indicator"; +VAL_ 80 ToiFltSta 0 "No Fault" 1 "Fault" 2 "Reserved" 3 "Error indicatorr"; +VAL_ 80 LKA_SysWrn 0 "No Info" 1 "Reserved" 2 "Reserved" 3 "Reserved" 4 "Hands-Off Warning 1" 5 "Hands-Off Warning 2" 6 "Reserved" 7 "Reserved" 8 "Reserved" 9 "System Automatic off" 10 "Reserved" 11 "Reserved" 12 "Reserved" 13 "Reserved" 14 "Reserved" 15 "System Fail"; +VAL_ 80 LKA_UsmMod 0 "NONE" 1 "LKA 1 mode" 2 "LKA 2 mode" 3 "LDW"; VAL_ 676 LEFT_LANE_LINE 0 "Not Detected" 1 "Low Confidence" 2 "Medium Confidence" 3 "High Confidence"; VAL_ 676 RIGHT_LANE_LINE 0 "Not Detected" 1 "Low Confidence" 2 "Medium Confidence" 3 "High Confidence"; diff --git a/opendbc/dbc/generator/hyundai/hyundai_canfd.dbc b/opendbc/dbc/generator/hyundai/hyundai_canfd.dbc index 7fc2ec6a19b..fd2d6e19abc 100644 --- a/opendbc/dbc/generator/hyundai/hyundai_canfd.dbc +++ b/opendbc/dbc/generator/hyundai/hyundai_canfd.dbc @@ -16,6 +16,25 @@ BO_ 69 GEAR: 24 XXX SG_ COUNTER : 16|8@1+ (1,0) [0|255] "" XXX SG_ GEAR : 44|3@1+ (1,0) [0|7] "" XXX +BO_ 74 IMU_01_10ms: 32 CGW_CCU + SG_ IMU_Crc1Val : 0|16@1+ (1,0) [0|0] "" ECS,ESC,FCU_C,GW_RGW,ICSC,MDPS,RCU,RWS,SFA,VPC_C + SG_ IMU_AlvCnt1Val : 16|8@1+ (1,0) [0|0] "" ECS,ESC,FCU_C,GW_RGW,ICSC,MDPS,RCU,RWS,SFA,VPC_C + SG_ IMU_YawSigSta : 24|4@1+ (1,0) [0|15] "" CLU,ADAS_PRK,FR_CMR,RR_C_RDR + SG_ IMU_LatAccelSigSta : 28|4@1+ (1,0) [0|15] "" CLU,ADAS_PRK,FR_CMR,RR_C_RDR + SG_ IMU_LongAccelSigSta : 32|4@1+ (1,0) [0|15] "" CLU,ADAS_PRK,FR_CMR,RR_C_RDR + SG_ IMU_VerAccelSigSta : 36|4@1+ (1,0) [0|15] "" XXX + SG_ IMU_McuVoltSta : 40|4@1+ (1,0) [0|15] "" XXX + SG_ IMU_AcuRstSta : 44|4@1+ (1,0) [0|15] "" XXX + SG_ IMU_SnsrTyp : 48|8@1+ (1,0) [0|255] "" XXX + SG_ IMU_RollSigSta : 56|8@1+ (1,0) [0|255] "" XXX + SG_ IMU_YawRtVal : 64|16@1+ (0.005,-163.84) [-163.84|163.835] "Deg/s" CLU,ADAS_PRK,FR_CMR,RR_C_RDR + SG_ IMU_LatAccelVal : 80|16@1+ (0.000127465,-4.17677312) [-4.17677312|4.176645655] "g" CLU,ADAS_PRK,FR_CMR,RR_C_RDR + SG_ IMU_LongAccelVal : 96|16@1+ (0.000127465,-4.17677312) [-4.17677312|4.176645655] "g" CLU,ADAS_PRK,FR_CMR,RR_C_RDR + SG_ IMU_SnsrTempVal : 112|16@1+ (1,0) [0|65535] "" XXX + SG_ IMU_SeralNumVal : 128|64@1+ (1,0) [0|1.84467440737096e+19] "" XXX + SG_ IMU_RollRtVal : 192|16@1+ (0.005,-163.84) [0|0] "º/s" XXX + SG_ IMU_VerAccelVal : 208|8@1+ (1,0) [0|255] "" XXX + BO_ 96 ESP_STATUS: 32 XXX SG_ CHECKSUM : 0|16@1+ (1,0) [0|65535] "" XXX SG_ COUNTER : 16|8@1+ (1,0) [0|255] "" XXX @@ -46,7 +65,7 @@ BO_ 160 WHEEL_SPEEDS: 24 XXX SG_ WHL_SpdRLVal : 96|14@1+ (0.03125,0) [0|0] "km^h" XXX SG_ WHL_SpdRRVal : 112|14@1+ (0.03125,0) [0|0] "km^h" XXX -BO_ 203 ADAS_CMD_35_10ms: 24 CGW_CCU +BO_ 203 LFA_ALT: 24 CGW_CCU SG_ CHECKSUM : 0|16@1+ (1,0) [0|0] "0" FCU_C,GW_RGW,MDPS,SFA SG_ COUNTER : 16|8@1+ (1,0) [0|0] "0" FCU_C,GW_RGW,MDPS,SFA SG_ ADAS_ActvACISta : 24|4@1+ (1,0) [0|0] "" GW_RGW,MDPS,SFA @@ -56,17 +75,50 @@ BO_ 203 ADAS_CMD_35_10ms: 24 CGW_CCU SG_ FCA_ESA_ActvSta : 56|2@1+ (1,0) [0|0] "" GW_RGW,MDPS,SFA SG_ FCA_ESA_TqBstGainVal : 64|8@1+ (0.004,0) [0|0] "" GW_RGW,MDPS,SFA -BO_ 234 MDPS: 24 XXX - SG_ CHECKSUM : 0|16@1+ (1,0) [0|65535] "" XXX - SG_ COUNTER : 16|8@1+ (1,0) [0|255] "" XXX - SG_ LKA_ACTIVE : 48|1@0+ (1,0) [0|16777215] "" XXX - SG_ LKA_FAULT : 54|1@0+ (1,0) [0|1] "" XXX - SG_ STEERING_OUT_TORQUE : 64|12@1+ (0.1,-204.8) [0|65535] "" XXX - SG_ STEERING_COL_TORQUE : 80|13@1+ (1,-4095) [0|4095] "" XXX - SG_ STEERING_ANGLE : 96|16@1- (0.1,0) [0|255] "deg" XXX - SG_ STEERING_ANGLE_2 : 128|16@1- (0.1,0) [0|65535] "deg" XXX - SG_ LKA_ANGLE_ACTIVE : 145|2@0+ (1,0) [0|3] "" XXX - SG_ LKA_ANGLE_FAULT : 149|1@0+ (1,0) [0|1] "" XXX +BO_ 229 ESC_02_10ms: 32 CGW + SG_ ESC_YawSigSta : 24|4@1+ (1,0) [0|15] "" CLU,ADAS_PRK,FR_CMR,RR_C_RDR + SG_ ESC_LatAccelSigSta : 28|4@1+ (1,0) [0|15] "" CLU,ADAS_PRK,FR_CMR,RR_C_RDR + SG_ ESC_LongAccelSigSta : 32|4@1+ (1,0) [0|15] "" CLU,ADAS_PRK,FR_CMR,RR_C_RDR + SG_ ESC_YawRtVal : 64|16@1+ (0.005,-163.84) [-163.84|163.835] "Deg/s" CLU,ADAS_PRK,FR_CMR,RR_C_RDR + SG_ ESC_LatAccelVal : 80|16@1+ (0.000127465,-4.17677312) [-4.17677312|4.176645655] "g" CLU,ADAS_PRK,FR_CMR,RR_C_RDR + SG_ ESC_LongAccelVal : 96|16@1+ (0.000127465,-4.17677312) [-4.17677312|4.176645655] "g" CLU,ADAS_PRK,FR_CMR,RR_C_RDR + +BO_ 234 MDPS: 24 SFA + SG_ CHECKSUM : 0|16@1+ (1,0) [0|0] "" CGW_CCU,ESC,ICSC,RCU,RWA,RWS,VPC_C + SG_ COUNTER : 16|8@1+ (1,0) [0|0] "" CGW_CCU,ESC,ICSC,RCU,RWA,RWS,VPC_C + SG_ MDPS_WrngLmpSta : 24|3@1+ (1,0) [0|0] "" CGW_CCU,ESC,ICSC,RCU,RWA,RWS + SG_ MDPS_Typ : 27|3@1+ (1,0) [0|0] "" CGW_CCU,ICSC,RWA + SG_ MDPS_EngIdleRpmReq : 30|2@1+ (1,0) [0|0] "" CGW_CCU,RWA + SG_ MDPS_VsmPlgInSta : 32|2@1+ (1,0) [0|0] "flag" ESC,ICSC,RCU,RWA + SG_ MDPS_VsmDfctvSta : 34|2@1+ (1,0) [0|0] "" ESC,ICSC,RCU,RWA + SG_ MDPS_VsmSigErrSta : 36|2@1+ (1,0) [0|0] "" ESC,RCU,RWA + SG_ MDPS_PaPlugInSta : 38|2@1+ (1,0) [0|0] "" CGW_CCU,ESC,RCU,RWA + SG_ MDPS_PaModeSta : 40|4@1+ (1,0) [0|0] "" CGW_CCU,RWA + SG_ MDPS_PaCanfltSta : 44|2@1+ (1,0) [0|0] "" CGW_CCU,RWA + SG_ MDPS_LkaPlgInSta : 46|2@1+ (1,0) [0|0] "" CGW_CCU,ICSC,RWA + SG_ MDPS_LkaToiActvSta : 48|2@1+ (1,0) [0|0] "" CGW_CCU,RWA + SG_ MDPS_LkaToiUnblSta : 50|2@1+ (1,0) [0|0] "" CGW_CCU,RWA + SG_ MDPS_LkaToiFltSta : 52|2@1+ (1,0) [0|0] "" CGW_CCU,RWA + SG_ MDPS_LkaFailSta : 54|2@1+ (1,0) [0|0] "" CGW_CCU,RWA + SG_ MDPS_ResetOpSta : 59|2@1+ (1,0) [0|0] "" Vector__XXX + SG_ MDPS_CurrModVal : 61|3@1+ (1,0) [0|0] "" CGW_CCU,RWA + SG_ MDPS_OutTqVal : 64|12@1+ (0.1,-204.8) [0|0] "Nm" CGW_CCU,ESC,ICSC,RCU,RWA + SG_ MDPS_VsmActResp : 76|2@1+ (1,0) [0|0] "" ESC,RCU,RWA + SG_ Reprogram_State_MDPS : 78|2@1+ (1,0) [0|0] "" CGW_CCU + SG_ MDPS_StrTqSnsrVal : 80|13@1+ (1,-4095) [0|4095] "" CGW_CCU,ESC,ICSC,RCU,RWA,VPC_C + SG_ MDPS_PaStrAnglVal : 96|16@1- (0.1,0) [0|0] "Deg" CGW_CCU,RWA + SG_ MDPS_LoamModSta : 112|2@1+ (1,0) [0|0] "" CGW_CCU,RWA + SG_ MDPS_HDPSpprtSWVer : 114|5@1+ (1,0) [0|0] "" CGW_CCU,RWA + SG_ MDPS_ADASAciActvSta : 120|4@1+ (1,0) [0|0] "" CGW_CCU,ESC,RWA,RWS + SG_ MDPS_ADASAciPluginSta : 124|2@1+ (1,0) [0|0] "" RWA + SG_ MDPS_ADAS_AciFltSig : 126|2@1+ (1,0) [0|0] "" CGW_CCU,ESC,RWA + SG_ MDPS_EstStrAnglVal : 128|16@1- (0.1,0) [0|0] "Deg" CGW_CCU,RWA,RWS + SG_ MDPS_ADASAciActvSta_Lv2 : 144|4@1+ (1,0) [0|0] "" CGW_CCU,RWA + SG_ MDPS_ADAS_AciFltSig_Lv2 : 148|3@1+ (1,0) [0|0] "" CGW_CCU,RWA + SG_ MDPS_TpaPlugInSta : 152|2@1+ (1,0) [0|0] "" RWA,VPC_C + SG_ MDPS_TpaCanfltSta : 154|2@1+ (1,0) [0|0] "" RWA,VPC_C + SG_ MDPS_TpaModeSta : 156|4@1+ (1,0) [0|0] "" RWA,VPC_C + SG_ MDPS_TpaStrAnglVal : 160|16@1- (0.1,0) [0|0] "Deg" RWA,VPC_C BO_ 256 ACCELERATOR_BRAKE_ALT: 32 XXX SG_ CHECKSUM : 0|16@1+ (1,0) [0|65535] "" XXX @@ -82,22 +134,24 @@ BO_ 261 ACCELERATOR_ALT: 32 XXX BO_ 272 LKAS_ALT: 32 XXX SG_ CHECKSUM : 0|16@1+ (1,0) [0|65535] "" XXX SG_ COUNTER : 16|8@1+ (1,0) [0|255] "" XXX - SG_ LKA_MODE : 24|3@1+ (1,0) [0|7] "" XXX - SG_ LKA_AVAILABLE : 27|2@1+ (1,0) [0|255] "" XXX - SG_ LKA_WARNING : 32|1@1+ (1,0) [0|1] "" XXX - SG_ LKA_ICON : 38|2@1+ (1,0) [0|255] "" XXX - SG_ FCA_SYSWARN : 40|1@0+ (1,0) [0|1] "" XXX - SG_ TORQUE_REQUEST : 41|11@1+ (1,-1024) [0|4095] "" XXX - SG_ STEER_REQ : 52|1@1+ (1,0) [0|1] "" XXX + SG_ LKA_OptUsmSta : 24|3@1+ (1,0) [0|7] "" ADAS_DRV + SG_ LKA_RcgSta : 27|3@1+ (1,0) [0|7] "" ADAS_DRV + SG_ LKA_LHLnWrnSta : 30|2@1+ (1,0) [0|3] "" ADAS_DRV + SG_ LKA_RHLnWrnSta : 32|2@1+ (1,0) [0|3] "" ADAS_DRV + SG_ LKA_HndsoffSnd : 34|2@1+ (1,0) [0|3] "" ADAS_DRV + SG_ LKA_StrSnd : 36|2@1+ (1,0) [0|3] "" ADAS_DRV + SG_ LKA_SysIndReq : 38|3@1+ (1,0) [0|7] "" ADAS_DRV + SG_ StrTqReqVal : 41|11@1+ (1,-1024) [0|4095] "" XXX + SG_ ActToiSta : 52|2@1+ (1,0) [0|3] "" ADAS_DRV + SG_ ToiFltSta : 54|2@1+ (1,0) [0|3] "" ADAS_DRV SG_ LFA_BUTTON : 56|1@1+ (1,0) [0|255] "" XXX - SG_ LKA_ASSIST : 62|1@1+ (1,0) [0|1] "" XXX - SG_ STEER_MODE : 65|3@1+ (1,0) [0|1] "" XXX - SG_ NEW_SIGNAL_2 : 70|2@0+ (1,0) [0|3] "" XXX + SG_ LKA_SysWrn : 60|4@1+ (1,0) [0|15] "" ADAS_DRV + SG_ Damping_Gain : 64|8@1+ (1,0) [0|255] "" CGW SG_ LKAS_ANGLE_ACTIVE : 77|2@0+ (1,0) [0|3] "" XXX - SG_ HAS_LANE_SAFETY : 80|1@0+ (1,0) [0|1] "" XXX + SG_ LKA_UsmMod : 80|2@1+ (1,0) [0|3] "" ADAS_DRV SG_ ADAS_StrAnglReqVal : 82|14@1- (0.1,0) [0|176.7] "Deg" GW_RGW,MDPS,SFA SG_ ADAS_ACIAnglTqRedcGainVal : 96|8@1+ (0.004,0) [0|1] "" GW_RGW,MDPS,SFA - SG_ DAMP_FACTOR : 64|8@1+ (1,0) [0|255] "" XXX + SG_ FCA_ESA_CtrlSta : 107|1@0+ (1,0) [0|1] "" XXX BO_ 282 FR_CMR_01_10ms: 16 FR_CMR SG_ FR_CMR_Crc1Val : 0|16@1+ (1,0) [0|0] "" Dummy,IBU_HS,vBDM @@ -131,21 +185,31 @@ BO_ 293 STEERING_SENSORS: 16 XXX SG_ STEERING_RATE : 40|8@1+ (4,0) [0|1016] "deg/s" XXX BO_ 298 LFA: 16 ADRV - SG_ CHECKSUM : 0|16@1+ (1,0) [0|65535] "" XXX - SG_ COUNTER : 16|8@1+ (1,0) [0|255] "" XXX - SG_ LKA_MODE : 24|3@1+ (1,0) [0|7] "" XXX - SG_ NEW_SIGNAL_1 : 27|2@1+ (1,0) [0|255] "" XXX - SG_ LKA_WARNING : 32|1@1+ (1,0) [0|1] "" XXX - SG_ LKA_ICON : 38|2@1+ (1,0) [0|255] "" XXX - SG_ TORQUE_REQUEST : 41|11@1+ (1,-1024) [0|4095] "" XXX - SG_ STEER_REQ : 52|1@1+ (1,0) [0|1] "" XXX - SG_ LFA_BUTTON : 56|1@1+ (1,0) [0|255] "" XXX - SG_ LKA_ASSIST : 62|1@1+ (1,0) [0|1] "" XXX - SG_ STEER_MODE : 65|3@1+ (1,0) [0|1] "" XXX - SG_ NEW_SIGNAL_2 : 70|2@0+ (1,0) [0|3] "" XXX - SG_ NEW_SIGNAL_4 : 72|4@1+ (1,0) [0|15] "" XXX - SG_ HAS_LANE_SAFETY : 80|1@0+ (1,0) [0|1] "" XXX - SG_ DAMP_FACTOR : 104|8@1+ (1,0) [0|255] "" XXX + SG_ CHECKSUM : 0|16@1+ (1,0) [0|65535] "" CLU,CGW + SG_ COUNTER : 16|8@1+ (1,0) [0|255] "" CLU,CGW + SG_ LKA_OptUsmSta : 24|3@1+ (1,0) [0|7] "" CLU,CGW + SG_ LKA_RcgSta : 27|3@1+ (1,0) [0|7] "" CLU,CGW + SG_ LKA_LHLnWrnSta : 30|2@1+ (1,0) [0|3] "" CLU,CGW + SG_ LKA_RHLnWrnSta : 32|2@1+ (1,0) [0|3] "" CLU,CGW + SG_ LKA_HndsoffSnd : 34|2@1+ (1,0) [0|3] "" CLU,CGW + SG_ LKA_StrSnd : 36|2@1+ (1,0) [0|3] "" CLU,CGW + SG_ LKA_SysIndReq : 38|3@1+ (1,0) [0|7] "" CLU,RR_C_RDR,CGW + SG_ StrTqReqVal : 41|11@1+ (1,-1024) [0|4095] "" XXX + SG_ ActToiSta : 52|2@1+ (1,0) [0|3] "" CLU,CGW + SG_ ToiFltSta : 54|2@1+ (1,0) [0|3] "" CGW + SG_ LFA_BUTTON : 56|1@0+ (1,0) [0|255] "" XXX + SG_ BCA_Rear_WrnSta : 57|3@1+ (1,0) [0|255] "" ADRV + SG_ LKA_SysWrn : 60|4@1+ (1,0) [0|15] "" CLU,CGW + SG_ FCA_LO_WrnSta : 64|1@1+ (1,0) [0|1] "" ADRV + SG_ FCA_LS_WrnSta : 68|1@1+ (1,0) [0|1] "" ADRV + SG_ LKA_OnOffEquip2Sta : 72|2@1+ (1,0) [0|255] "" ADRV + SG_ LKA_UsmMod : 80|2@1+ (1,0) [0|3] "" CLU,CGW + SG_ Info_PedtrnDst : 84|3@0+ (1,0) [0|7] "" ADAS_DRV + SG_ ELK_SysFlrSta : 85|5@1+ (1,0) [0|31] "" ADRV + SG_ ELK_SymbDisp : 90|3@1+ (1,0) [0|7] "" ADRV + SG_ FCA_ESA_WrnSta : 93|1@1+ (1,0) [0|7] "" ADRV + SG_ FCA_ESA_CtrlSta : 101|1@1+ (1,0) [0|7] "" ADRV + SG_ Damping_Gain : 104|8@1+ (1,0) [0|255] "" CGW BO_ 304 GEAR_SHIFTER: 16 XXX SG_ CHECKSUM : 0|16@1+ (1,0) [0|65535] "" XXX @@ -327,7 +391,7 @@ BO_ 416 SCC_CONTROL: 32 ADRV SG_ VSetDis : 103|8@0+ (1,0) [0|255] "km/h or mph" XXX SG_ NEW_SIGNAL_6 : 104|1@0+ (1,0) [0|1] "" XXX SG_ SET_ME_2 : 105|3@1+ (1,0) [0|7] "" XXX - SG_ NEW_SIGNAL_3 : 109|2@0+ (1,0) [0|1] "" XXX + SG_ SCC_ObjSta : 108|3@1+ (1,0) [0|7] "" CLU,CGW SG_ ZEROS_10 : 111|2@0+ (1,0) [0|3] "" XXX SG_ ZEROS_6 : 119|16@0+ (1,0) [0|65535] "" XXX SG_ aReqValue : 128|11@1+ (0.01,-10.23) [-10.23|10.24] "m/s^2" XXX @@ -674,16 +738,136 @@ BO_ 1264 LOCAL_TIME: 8 XXX SG_ MINUTES : 21|6@0+ (1,0) [0|63] "" XXX SG_ SECONDS : 31|8@0+ (1,0) [0|59] "" XXX +CM_ BO_ 74 "[P] Periodic"; +CM_ SG_ 74 IMU_Crc1Val "The data area for CRC calculation is based on the data length (DLC) of the message DB.The CRC shall be calculated over the entire data block (excluding the CRC bytes) including the user data, alive counter and Data ID- CRC Polynomial (0x1021) , Ini"; +CM_ SG_ 74 IMU_AlvCnt1Val "For the first transmission request for a data element the counter shall be initialized with 0 and shall be incremented by 1 for every subsequent send request. When the counter reaches the maximum value(0xFF), then it shall restart with 0 for the next s"; +CM_ SG_ 74 IMU_YawSigSta "This signal indicates failure status of yaw rate signal and yaw rate sensing element.0000B : No failure xxx1B : IMU_Yawrate_failurexx1xB : Initialization is runningx1xxB : Reserved1xxxB : ReservedThis signal represents the physica"; +CM_ SG_ 74 IMU_LatAccelSigSta "This signal indicates failure status of lateral acceleration signal and sensing element.0000B : No failurexxx1B : IMU_Lateral acceleration failurexx1xB : Initialization is runningx1xxB : Reserved1xxxB : ReservedThis signal represe"; +CM_ SG_ 74 IMU_AcuRstSta "This signal indicates the status of IMU.0000B : Normal mode xxx1B : IMU Reset modexx1xB : Reservedx1xxB : Reserved1xxxB : ReservedIf ACU reset is required, ACU will send IMU RESET bit(XXX1B) up to 30 times and perform a reset. If "; +CM_ SG_ 74 IMU_YawRtVal "This signal indicates Information regarding yaw rate.physical range : -163.84..163.83 ˚/s = 0000H..FFFEhConversion : (PH) = ((HEX)-8000H)*0.005[˚/s/digit] = (HEX)*0.005[˚/s/digit] - 163.84[˚/s] "; +CM_ SG_ 74 IMU_LatAccelVal "This signal indicates Information regarding lateral acceleration.physical range : -4.1768g..4.1765g = 0000H..FFFEhConversion : (PH) = ((HEX)-8000H)*0.000127465[g/digit] = (HEX)*0.000127465[g/digit] - 4.17677312[g]"; + CM_ SG_ 96 BRAKE_PRESSURE "User applied brake pedal pressure. Ramps from computer applied pressure on falling edge of cruise. Cruise cancels if !=0"; CM_ SG_ 101 BRAKE_POSITION "User applied brake pedal position, max is ~700. Signed on some vehicles"; +CM_ BO_ 203 "Known in official DBC as ADAS_CMD_35_10ms"; CM_ SG_ 203 ADAS_ActvACISta "ADAS Active AngleControlInterface State"; CM_ SG_ 203 ADAS_ActvACILvl2Sta "ADAS Active AngleControlInterface Level 2 State"; CM_ SG_ 203 ADAS_StrAnglReqVal "(LFA) ADAS Steering Angle Request Value; Capped at 119.9;"; CM_ SG_ 203 ADAS_ACIAnglTqRedcGainVal "(LFA) ADAS AngleControlInterface Angle Torque Reduction Gain Value"; CM_ SG_ 203 FCA_ESA_ActvSta "FCA_ESA Active State"; CM_ SG_ 203 FCA_ESA_TqBstGainVal "FCA_ESA Torque Boost Gain Value"; +CM_ BO_ 234 "Named MDPS_01_10ms on the official DBC."; +CM_ SG_ 234 CHECKSUM "The data area for CRC calculation is based on the data length (DLC) of the message DB. + +The CRC shall be calculated over the entire data block (excluding the CRC bytes) including the user data, alive counter and Data ID + +CM_ BO_ 229 "[P] Periodic"; +CM_ SG_ 229 ESC_YawSigSta "ESC_YawSigSta"; +CM_ SG_ 229 ESC_LatAccelSigSta "ESC_LatAccelSigSta"; +CM_ SG_ 229 ESC_LongAccelSigSta "ESC_LongAccelSigSta"; +CM_ SG_ 229 ESC_YawRtVal "ESC_YawRtVal"; +CM_ SG_ 229 ESC_LatAccelVal "ESC_LatAccelVal"; +CM_ SG_ 229 ESC_LongAccelVal "ESC_LongAccelVal"; + +- CRC Polynomial (0x1021) , In"; +CM_ SG_ 234 COUNTER "For the first transmission request for a data element the counter shall be initialized with 0 and shall be incremented by 1 for every subsequent send request. + +When the counter reaches the maximum value(0xFF), then it shall restart with 0 for the next s"; +CM_ SG_ 234 MDPS_WrngLmpSta "The signal indicates the ststus of the MDPS Warning lamp"; +CM_ SG_ 234 MDPS_Typ "Information regarding the type of MDPS. (C-MDPS / R-MDPS / SbW)"; +CM_ SG_ 234 MDPS_EngIdleRpmReq "This signal indicates the request status for engine idle rpm up according to MDPS fast rotation."; +CM_ SG_ 234 MDPS_VsmPlgInSta "This signal indicates whether the VSM function of MDPS is plugged in or not."; +CM_ SG_ 234 MDPS_VsmDfctvSta "Information regarding the MDPS defective Indication For VSM"; +CM_ SG_ 234 MDPS_VsmSigErrSta "Information indicating VSM signal status"; +CM_ SG_ 234 MDPS_PaPlugInSta "This signal indicates whether the PA function of MDPS is plugged in or not."; +CM_ SG_ 234 MDPS_PaModeSta "This signal indicates the status of the PA steering function."; +CM_ SG_ 234 MDPS_PaCanfltSta "This Signal should be used by only PA + +This signal indicates whether the MDPS is defective in PA cooperation control. + +This signal is set as '1' only when MDPS Detects CAN Failure(TIMEOUT, Signal Error) of PA CAN Message"; +CM_ SG_ 234 MDPS_LkaPlgInSta "This signal indicates whether the LKA function of MDPS is plugged in or not."; +CM_ SG_ 234 MDPS_LkaToiActvSta "This flag is set to 1 in response to the LKA Controller requesting the activation of the torque interface and set back to 0 in response to the LKA Controller requesting the de-activation of the torque interface."; +CM_ SG_ 234 MDPS_LkaToiUnblSta "This is a flag that is set when the MDPS is not faulty, but is temporarily unable to activate the TOI due to steering torque limiting e.g. when the supply voltage is too low."; +CM_ SG_ 234 MDPS_LkaToiFltSta "This fault flag is set when a fault within the MDPS system has been detected such that the LKA TOI can no longer function. CAN failures, internal MDPS failures, and LKA controller logic failures are all reported by this flag. Failures reported by the LKA"; +CM_ SG_ 234 MDPS_LkaFailSta "This fault flag is set whilst the MDPS TOI is in a fail state and has not yet recovered from it. This could either be due to an MDPS detected fault (as communicated by the MDPS_LkaToiFltSta' flag) or an LKA detected fault (as communicated by the LKA_"; +CM_ SG_ 234 MDPS_ResetOpSta "Information regarding the state of reset"; +CM_ SG_ 234 MDPS_CurrModVal "This signal indicates flex steer parameter value in MDPS. + + + + For information about flex steer mode set by user, refer to MDPS_FlxStrSta signal."; +CM_ SG_ 234 MDPS_OutTqVal "MDPS column torque + +this signal has direction information. + +'+' Value means Counter clock wise rotation. + +'-' value means Clock wise rotation."; +CM_ SG_ 234 MDPS_VsmActResp "Information of VSM Tqrque Intervention Act Response"; +CM_ SG_ 234 Reprogram_State_MDPS "Information regarding the reprogram state"; +CM_ SG_ 234 MDPS_StrTqSnsrVal "Steering torque sensor value + + + +Physical Value > 0: Left Direction (CCW) + +Physical Value < 0: Right Direction (CW) + + + +this signal has direction information. + +'+' Value means Counter clock wise rotation. + +'-' value means Clock wise rotation. (Original definition was (0.005,-20.48) [0|0] but it's different from all OP expects)"; +CM_ SG_ 234 MDPS_PaStrAnglVal "This value is used to inform PA of a compensated steering wheel angle by MDPS. The signal is signed 16bits. + + + +(PH) = (HEX) 0.1 (for 0 < HEX 32767) or + += (HEX - 65536) 0.1 (for HEX > 32767) [Deg] + + + +this signal has direction information. + +'+' V"; +CM_ SG_ 234 MDPS_LoamModSta "The signal represent status of the LOAM(Loss Of Assist Mitigation) Mode"; +CM_ SG_ 234 MDPS_HDPSpprtSWVer "This signal indicates HDP-MDPS Control Requirement Spec Version"; +CM_ SG_ 234 MDPS_ADASAciActvSta "State for angle control"; +CM_ SG_ 234 MDPS_ADASAciPluginSta "This signal indicates whether the ADASAci function of MDPS is plugged in or not."; +CM_ SG_ 234 MDPS_ADAS_AciFltSig "MDPS Fault Status for HDP Function"; +CM_ SG_ 234 MDPS_EstStrAnglVal "This value is used to inform of a compensated steering wheel angle by MDPS . The signal is signed 16bits, and made by motor position sensor. + + + +(PH) = (HEX) 0.1 (for 0 < HEX 32767) or + += (HEX - 65536) 0.1 (for HEX > 32767) [Deg] + + + +this signal"; +CM_ SG_ 234 MDPS_ADASAciActvSta_Lv2 "States for angle control (LV2)"; +CM_ SG_ 234 MDPS_ADAS_AciFltSig_Lv2 "MDPS Fault Status for LV2 Angle Control Function"; +CM_ SG_ 234 MDPS_TpaPlugInSta "This signal indicates whether the TPA function of MDPS is plugged in or not."; +CM_ SG_ 234 MDPS_TpaCanfltSta "This Signal should be used by only TPA + +This signal indicates whether the MDPS is defective in TPA cooperation control. + +This signal is set as '1' only when MDPS Detects CAN Failure(TIMEOUT, Signal Error) of TPA CAN Message"; +CM_ SG_ 234 MDPS_TpaModeSta "This signal indicates the status of the TPA steering function."; +CM_ SG_ 234 MDPS_TpaStrAnglVal "This value is used to inform TPA of a compensated steering wheel angle by MDPS. The signal is signed 16bits. + + + +(PH) = (HEX) 0.1 (for 0 < HEX 32767) or + += (HEX - 65536) 0.1 (for HEX > 32767) [Deg]"; CM_ BO_ 272 "Alternative LKAS message, used on cars such as 2023 Ioniq 6, 2nd gen Kona. Matches LKAS except size is 32 bytes"; -CM_ SG_ 272 LKA_AVAILABLE "Angle control cars: 3 when LKA is generally available, goes to 0 during changes with LFA"; +CM_ SG_ 272 ToiFltSta "This fault flag is set when a fault in the LKA system has been detected by the LKA ECU such that LKA can no longer function. CAN failures, internal video ECU failures, hard-wired component (e.g. master switch) failures and other system logic failures are"; CM_ SG_ 272 ADAS_StrAnglReqVal "(LKAS) ADAS Steering Angle Request Value; Capped at 176.7; tracks MDPS->STEERING_ANGLE when not engaged, not STEERING_SENSORS->STEERING_ANGLE"; CM_ SG_ 272 ADAS_ACIAnglTqRedcGainVal "(LKAS) ADAS AngleControlInterface Angle Torque Reduction Gain Value"; CM_ BO_ 282 "Sent by the camera containing DAW (Driver Attention Warning) information and information about HBA (High Beam Assist)."; @@ -705,7 +889,24 @@ CM_ SG_ 282 FR_CMR_SCCEquipSta "This signal indicates equipment for SCC"; CM_ SG_ 282 FR_CMR_ReqADASMapMsgVal "This signal indicates an ADAS map message request from FR_CMR to H_U. Each bit indicates the request messages as follows. - Bit 0 : H_U_NAVI_V2_STUB_E - Bit 1 : HU_NAVI_V2_PROSHORT_E_00 (곡률) - Bit 2 : HU_NAVI_V2_PROSHORT_E_00 (곡률 외 정보)"; CM_ SG_ 282 FR_CMR_SwVer1Val "This signal indicates a major version of FR_CMR software. If FR_CMR software version is A.00, 'A' and '00' mean major and minor version respectively."; CM_ SG_ 282 FR_CMR_SwVer2Val "This signal indicates a minor version of FR_CMR software. If FR_CMR software version is A.00, 'A' and '00' mean major and minor version respectively."; -CM_ SG_ 298 NEW_SIGNAL_4 "todo: figure out why always set to 9"; +CM_ BO_ 298 "This message controls steering and alerts regarding lateral control. Formerly known as LFA. + +Node is flagged as ADRV, but in reality this signal can be seen from either the FR_CMR (front camera) or the ADRV (adas ecu) for some trims."; +CM_ SG_ 298 LKA_OptUsmSta "LKA_OptionUsmStatus ##2G##LDW_LKA - LKA11 - CF_LKA_Opt_USM"; +CM_ SG_ 298 LKA_RcgSta "LKA_RecognitionStatus ##2G##LDW_LKA - LKA11 - CF_LKA_LaneRecogState"; +CM_ SG_ 298 LKA_LHLnWrnSta "LKA_LHLaneWarningStatus ##2G##LDW_LKA - LKA11 - CF_LKA_LHWarning"; +CM_ SG_ 298 LKA_RHLnWrnSta "LKA_RHLaneWarningStatus ##2G##LDW_LKA - LKA11 - CF_LKA_RHWarning"; +CM_ SG_ 298 LKA_HndsoffSnd "LKA_HandsoffSound ##2G##LDW_LKA - LKA11 - CF_LKA_HandsOff_Snd"; +CM_ SG_ 298 LKA_StrSnd "LKA_SteeringSound ##2G##LDW_LKA - LKA11 - CF_LKA_Steer_Snd"; +CM_ SG_ 298 LKA_SysIndReq "LKA_SystemIndicatorRequest ##2G##LDW_LKA - LKA11 - CF_LKA_SymbolState"; +CM_ SG_ 298 StrTqReqVal "This is the driver torque overlay demand value. A negative value represents a torque that would accelerate the steering wheel in a clockwise direction. This signal is always zero whilst the TOI is inactive. (the official DBC defines this as SG_ StrTqReqVal : xx|11@1+ (0.0078125,-8) [-8|7.9921875] \"Nm\" XXX but I am not changing it since it has a broader impact on the OP code)"; +CM_ SG_ 298 ActToiSta "This is a flag that is set to 1 when requesting the steering to activate the torque overlay interface (TOI). This must be done before an attempt is made to request non-zero steering torque overlay."; +CM_ SG_ 298 ToiFltSta "This fault flag is set when a fault in the LKA system has been detected by the LKA ECU such that LKA can no longer function. CAN failures, internal video ECU failures, hard-wired component (e.g. master switch) failures and other system logic failures are"; +CM_ SG_ 298 LKA_SysWrn "A signal that provides additional information on the operation of the LKA system for the HMI to display to the driver. This includes additional fault information, reasons for unavailability of the system and additional warnings like the hands-off warning"; +CM_ SG_ 298 FCA_LS_WrnSta "(Reverse Engineered) This signal was observed while ELK was taking over to prevent a blind spot collision."; +CM_ SG_ 298 LKA_UsmMod "This signal indicates LKA USM Mode"; +CM_ SG_ 298 ELK_SymbDisp "Emergency Lane-Keeping"; +CM_ SG_ 298 Damping_Gain "ADAS Damping Gain for MDPS"; CM_ SG_ 352 SET_ME_9 "has something to do with AEB settings"; CM_ SG_ 373 ACCEnable "Likely a copy of CAN's TCS13->ACCEnable"; CM_ SG_ 373 DriverBraking "Likely derived from BRAKE->BRAKE_POSITION"; @@ -727,6 +928,7 @@ CM_ SG_ 437 Info_RtLnHdingAnglVal "This signal outputs the heading angle of righ CM_ SG_ 437 Info_RtLnCvtrVal "This signal outputs the curvature of right line."; CM_ SG_ 437 ID_CIPV "Valid Object = 1 to 255 - ID detected by front camera can vary depending on vehicle environment. - Additional logic would be required to apply this signal for ISG."; CM_ SG_ 437 Relative_Velocity "+ : Preceding, - : Oncoming - Velocity detected by front camera can vary depending on vehicle environment. - Additional logic would be required to apply this signal for ISG. - Confirmaiton by Autonomous Driving Engineering Team is required to use ID_C"; +CM_ SG_ 416 SCC_ObjSta "state of in-path object and information of controllable state."; CM_ SG_ 480 NEW_SIGNAL_5 "todo: figure out why always set to 1"; CM_ BO_ 506 "Sent by the camera containing speed limit information. ISLW stands for Intelligent Speed Limit Warning, and ISLA is Intelligent Speed Limit Assist. it also contains road sign information."; CM_ SG_ 506 FR_CMR_Crc2Val "The data area for CRC calculation is based on the data length (DLC) of the message DB.The CRC shall be calculated over the entire data block (excluding the CRC bytes) including the user data, alive counter and Data ID - CRC Polynomial (0x1021) , In"; @@ -811,14 +1013,56 @@ VAL_ 96 TRACTION_AND_STABILITY_CONTROL 0 "On" 5 "Limited" 1 "Off"; VAL_ 112 GEAR 0 "P" 5 "D" 6 "N" 7 "R"; VAL_ 203 ADAS_ActvACISta 0 "INIT" 1 "INACTIVE" 2 "ACTIVE35(ACTIVE)" 3 "ACTIVE33(Redundancy)" 4 "RESERVED" 5 "RESERVED" 6 "RESERVED" 7 "RESERVED" 8 "RESERVED" 9 "RESERVED" 10 "RESERVED" 11 "RESERVED" 12 "RESERVED" 13 "RESERVED" 14 "RESERVED" 15 "RESERVED"; VAL_ 203 ADAS_ActvACILvl2Sta 0 "INIT" 1 "INACTIVE" 2 "ACTIVE35(ACTIVE)" 3 "RESERVED" 4 "RESERVED" 5 "RESERVED" 6 "RESERVED" 7 "RESERVED" 8 "RESERVED" 9 "RESERVED" 10 "RESERVED" 11 "RESERVED" 12 "RESERVED" 13 "RESERVED" 14 "RESERVED" 15 "RESERVED"; -VAL_ 203 ADAS_StrAnglReqVal 0 "0x0x000~0x3FFF:Real Values" 16383 "0x0x000~0x3FFF:Real Values"; +VAL_ 203 ADAS_StrAnglReqVal 0 "0 (0x000~0x3FFF valid range)" 16383 "16383 (0x000~0x3FFF valid range)"; VAL_ 203 ADAS_ACIAnglTqRedcGainVal 0 "0x0x00~0xFA:Real Values" 250 "0x0x00~0xFA:Real Values" 251 "RESERVED" 252 "RESERVED" 253 "RESERVED" 254 "RESERVED" 255 "RESERVED"; VAL_ 203 FCA_ESA_ActvSta 0 "Inactive" 1 "Active" 2 "RESERVED" 3 "RESERVED"; VAL_ 203 FCA_ESA_TqBstGainVal 0 "0x0x00~0xFA:Real Values" 250 "0x0x00~0xFA:Real Values" 251 "RESERVED" 252 "RESERVED" 253 "RESERVED" 254 "RESERVED" 255 "RESERVED"; -VAL_ 234 LKA_FAULT 0 "ok" 1 "lka fault"; -VAL_ 272 LKA_MODE 1 "warning only" 2 "assist" 6 "off"; -VAL_ 272 LKA_ICON 0 "hidden" 1 "grey" 2 "green" 3 "flashing green"; -VAL_ 272 LKAS_ANGLE_ACTIVE 0 "off" 1 "not active" 2 "active"; +VAL_ 234 MDPS_WrngLmpSta 0 "MDPS Malfunction Warning lamp OFF" 1 "MDPS Malfunciton Warning lamp BLANKING(2Hz)" 2 "MDPS Malfunction Warning lamp ON" 3 "MDPS Malfunction Warning lamp BLANKING(1Hz)" 4 "RESERVED" 5 "RESERVED" 6 "RESERVED" 7 "Error Indicator"; +VAL_ 234 MDPS_Typ 0 "C-MDPS" 1 "R-MDPS(Dual Pinion)" 2 "R-MDPS(Belt)" 3 "SbW" 4 "RESERVED" 5 "RESERVED" 6 "RESERVED" 7 "Error Indicator"; +VAL_ 234 MDPS_EngIdleRpmReq 0 "Current Consumption is Low" 1 "Current Consumption is High" 2 ":RESERVED" 3 "Error Indicator"; +VAL_ 234 MDPS_VsmPlgInSta 0 "The VSM function of MDPS is not plugged in (unplugged)." 1 "The VSM function of MDPS is plugged in." 2 "RESERVED" 3 "Error Indicator"; +VAL_ 234 MDPS_VsmDfctvSta 0 "MDPS is not defective" 1 "MDPS is defective" 2 "RESERVED" 3 "Error Indicator"; +VAL_ 234 MDPS_VsmSigErrSta 0 "VSM1 signal is not error" 1 "VSM signal is error" 2 "RESERVED" 3 "Error Indicator"; +VAL_ 234 MDPS_PaPlugInSta 0 "The PA function of MDPS is not plugged in (unplugged)." 1 "The PA function of MDPS is plugged in." 2 "RESERVED" 3 "Error Indicator"; +VAL_ 234 MDPS_PaModeSta 0 "RESERVED" 1 "Steering still in initialization phase" 2 "Steering ready, waits for PA command" 3 "Steering set in standby by PA" 4 "Steering requested to go to first activation step" 5 "Steering requested to go to final activation step" 6 "Steering went to error internally" 7 "Steering aborted the automatic function" 8 "RESERVED" 9 "RESERVED" 10 "RESERVED" 11 "RESERVED" 12 "RESERVED" 13 "RESERVED" 14 "RESERVED" 15 "Error Indicator"; +VAL_ 234 MDPS_PaCanfltSta 0 "No Failure" 1 "Failure about Pa can message" 2 "RESERVED" 3 "Error Indicator"; +VAL_ 234 MDPS_LkaPlgInSta 0 "The LKA function of MDPS is not plugged in (unplugged)." 1 "The LKA function of MDPS is plugged in." 2 "RESERVED" 3 "Error Indicator"; +VAL_ 234 MDPS_LkaToiActvSta 0 "Deactivated" 1 "Activated" 2 "RESERVED" 3 "Error Indicator"; +VAL_ 234 MDPS_LkaToiUnblSta 0 "Available" 1 "Unavailable" 2 "RESERVED" 3 "Error Indicator"; +VAL_ 234 MDPS_LkaToiFltSta 0 "No fault" 1 "Faulty" 2 "RESERVED" 3 "Error Indicator"; +VAL_ 234 MDPS_LkaFailSta 0 "Not in fail state" 1 "In fail state" 2 "RESERVED" 3 "Error Indicator"; +VAL_ 234 MDPS_ResetOpSta 0 "Normal" 1 "Reset Complete" 2 "Reset Fail" 3 "RESERVED"; +VAL_ 234 MDPS_CurrModVal 0 "Comfort Mode" 1 "Sport Mode" 2 "Sport+ Mode" 3 "Chauffeur Mode" 4 "Mild Mode" 5 "Drift Mode" 6 "RESERVED" 7 "Error Indicator"; +VAL_ 234 MDPS_OutTqVal 0 "0x0x000~0xFFD:real values" 4093 "0x0x000~0xFFD:real values" 4094 "RESERVED" 4095 "Error Indicator"; +VAL_ 234 MDPS_VsmActResp 0 "VSM Control inactivated" 1 "VSM Control Activated" 2 "RESERVED" 3 "Invalid"; +VAL_ 234 Reprogram_State_MDPS 0 "normal operation" 1 "reprogramming" 2 "RESERVED" 3 "Error Indicator"; +VAL_ 234 MDPS_StrTqSnsrVal 0 "0 (0x000~0x7FFD valid range)" 8189 "32765 (0x000~0x1FFD valid range)" 8190 "RESERVED" 8191 "Error Indicator"; +VAL_ 234 MDPS_PaStrAnglVal 0 "0 (0x000~0x7FFD valid range)" 32765 "32765 (0x000~0x7FFD valid range)" 32766 "Not Initialized" 32767 "Error Indicator" 32768 "32768 (0x8000~0xFFFF valid range)" 65535 "65535 (0x8000~0xFFFF valid range)"; +VAL_ 234 MDPS_LoamModSta 0 "Normal" 1 "Loam Flag Warning Display" 2 "RESERVED" 3 "Error Indicator"; +VAL_ 234 MDPS_HDPSpprtSWVer 0 "HDP-MDPS Control Requirement Version" 1 "HDP-MDPS Control Requirement Version" 2 "HDP-MDPS Control Requirement Version" 3 "HDP-MDPS Control Requirement Version" 4 "HDP-MDPS Control Requirement Version" 5 "HDP-MDPS Control Requirement Version" 6 "HDP-MDPS Control Requirement Version" 7 "HDP-MDPS Control Requirement Version" 8 "HDP-MDPS Control Requirement Version" 9 "HDP-MDPS Control Requirement Version" 10 "HDP-MDPS Control Requirement Version" 11 "HDP-MDPS Control Requirement Version" 12 "HDP-MDPS Control Requirement Version" 13 "HDP-MDPS Control Requirement Version" 14 "HDP-MDPS Control Requirement Version" 15 "HDP-MDPS Control Requirement Version" 16 "HDP-MDPS Control Requirement Version" 17 "HDP-MDPS Control Requirement Version" 18 "HDP-MDPS Control Requirement Version" 19 "HDP-MDPS Control Requirement Version" 20 "HDP-MDPS Control Requirement Version" 21 "HDP-MDPS Control Requirement Version" 22 "HDP-MDPS Control Requirement Version" 23 "HDP-MDPS Control Requirement Version" 24 "HDP-MDPS Control Requirement Version" 25 "HDP-MDPS Control Requirement Version" 26 "HDP-MDPS Control Requirement Version" 27 "HDP-MDPS Control Requirement Version" 28 "HDP-MDPS Control Requirement Version" 29 "HDP-MDPS Control Requirement Version" 30 "HDP-MDPS Control Requirement Version" 31 "HDP-MDPS Control Requirement Version"; +VAL_ 234 MDPS_ADASAciActvSta 0 "INIT" 1 "INACTIVE" 2 "ACTIVE35(ACTIVE)" 3 "ACTIVE33(Redundancy)" 4 "RESERVED" 5 "RESERVED" 6 "RESERVED" 7 "RESERVED" 8 "RESERVED" 9 "RESERVED" 10 "RESERVED" 11 "RESERVED" 12 "RESERVED" 13 "RESERVED" 14 "RESERVED" 15 "RESERVED"; +VAL_ 234 MDPS_ADASAciPluginSta 0 "ADASAciNotPlugged-in" 1 "ADASAciPlugged-in" 2 "RESERVED" 3 "ErrorIndicator"; +VAL_ 234 MDPS_ADAS_AciFltSig 0 "No Fault" 1 "MDPS Fault" 2 "Fault Except MDPS" 3 "Both Fault"; +VAL_ 234 MDPS_EstStrAnglVal 0 "0 (0x000~0x7FFD valid range)" 32765 "32765 (0x000~0x7FFD valid range)" 32766 "Not Initialized" 32767 "Error Indicator" 32768 "32768 (0x8000~0xFFFF valid range)" 65535 "65535 (0x8000~0xFFFF valid range)"; +VAL_ 234 MDPS_ADASAciActvSta_Lv2 0 "Not USED" 1 "INACTIVE" 2 "ACTIVE35(Active)" 3 "Reserved" 4 "Reserved" 5 "Reserved" 6 "Reserved" 7 "Reserved" 8 "Reserved" 9 "Reserved" 10 "Reserved" 11 "Reserved" 12 "Reserved" 13 "Reserved" 14 "Reserved" 15 "Reserved"; +VAL_ 234 MDPS_ADAS_AciFltSig_Lv2 0 "No Fault" 1 "MDPS Fault" 2 "Fault Except MDPS" 3 "Both Fault" 4 "Temporarily Unavailable" 5 "Temporarily Unavailable and MDPS Fault" 6 "Temporarily Unavailable and Fault Except MDPS" 7 "Temporarily Unavailable and Both Fault"; +VAL_ 234 MDPS_TpaPlugInSta 0 "The TPA function of MDPS is not plugged in (unplugged)" 1 "The TPA function of MDPS is plugged in" 2 "RESERVED" 3 "Error Indicator"; +VAL_ 234 MDPS_TpaCanfltSta 0 "No Failure" 1 "Failure about Tpa can message" 2 "RESERVED" 3 "Error Indicator"; +VAL_ 234 MDPS_TpaModeSta 0 "RESERVED" 1 "Steering still in initialization phase" 2 "Steering ready, waits for TPA command" 3 "Steering set in standby by TPA" 4 "Steering requested to go to first activation step activation step" 5 "Steering requested to go to final activation step" 6 "Steering went to error internally" 7 "Steering aborted the automatic function" 14 "RESERVED" 15 "Error Indicator"; +VAL_ 234 MDPS_TpaStrAnglVal 0 "0 (0x000~0x7FFD valid range)" 32765 "32765 (0x000~0x7FFD valid range)" 32766 "Not Initialized" 32767 "Error Indicator" 32768 "32768 (0x8000~0xFFFF valid range)" 65535 "65535 (0x8000~0xFFFF valid range)"; +VAL_ 272 LKA_OptUsmSta 0 "None LKA/LDW Option (Default)" 1 "LDW" 2 "LKA" 3 "Reserved" 4 "LDW Only (None LKA)" 5 "LDW only OFF (None LKA)" 6 "LDW/LKA OFF" 7 "Invalid"; +VAL_ 272 LKA_RcgSta 0 "Not Recognized" 1 "Left Lane Recognition" 2 "Right Lane Recognition" 3 "Full Lane Recognition" 4 "Reserved" 5 "Reserved" 6 "Reserved" 7 "Reserved"; +VAL_ 272 LKA_LHLnWrnSta 0 "No Warning" 1 "Lane Departure Warning" 2 "Reserved" 3 "Reserved"; +VAL_ 272 LKA_RHLnWrnSta 0 "No Warning" 1 "Lane Departure Warning" 2 "Reserved" 3 "Reserved"; +VAL_ 272 LKA_HndsoffSnd 0 "Off" 1 "Hands-off Sound Warning" 2 "Reserved" 3 "Reserved"; +VAL_ 272 LKA_StrSnd 0 "Off" 1 "Warning" 2 "Reserved" 3 "Reserved"; +VAL_ 272 LKA_SysIndReq 0 "Off" 1 "Unavailable_(Grey On)" 2 "Lane Recognized_(Green On)" 3 "Lane Departure_(Green Blink)" 4 "System Fail_(Orange On)" 5 "Not Calibrated_(Orange Blink)" 6 "Regulation_(Orange On)" 7 "Reserved"; +VAL_ 272 StrTqReqVal 2046 "Reserved" 2047 "Invalid"; +VAL_ 272 ActToiSta 0 "De-activate TOI" 1 "Activate TOI" 2 "Reserved" 3 "Error indicator"; +VAL_ 272 ToiFltSta 0 "No Fault" 1 "Fault" 2 "Reserved" 3 "Error indicatorr"; +VAL_ 272 LKA_SysWrn 0 "No Info" 1 "Reserved" 2 "Reserved" 3 "Reserved" 4 "Hands-Off Warning 1" 5 "Hands-Off Warning 2" 6 "Hands-Off Warning 3" 7 "Reserved" 8 "Reserved" 9 "System Automatic off" 10 "Reserved" 11 "Reserved" 12 "Reserved" 13 "Reserved" 14 "Reserved" 15 "System Fail"; +VAL_ 272 LKA_UsmMod 0 "NONE" 1 "LKA 1 mode" 2 "Reserved" 3 "LDW"; +VAL_ 272 ADAS_ACIAnglTqRedcGainVal 0 "0x0x00~0xFA:Real Values" 250 "0x0x00~0xFA:Real Values" 251 "RESERVED" 252 "RESERVED" 253 "RESERVED" 254 "RESERVED" 255 "RESERVED"; VAL_ 282 HBA_SysOptSta 0 "None HBA Option (Default)" 1 "HBA Option" 2 "Reserved" 3 "Error indicator"; VAL_ 282 HBA_SysSta 0 "HBA Disable" 1 "HBA Enable & High Beam Off" 2 "HBA Enable & High Beam On" 3 "Reserved" 4 "Reserved" 5 "Reserved" 6 "Reserved" 7 "System Fail"; VAL_ 282 HBA_IndLmpReq 0 "HBA Indicator Lamp Off" 1 "HBA Indicator Lamp On" 2 "Reserved" 3 "Error indicator"; @@ -832,8 +1076,20 @@ VAL_ 282 DAW_WrnMsgSta 0 "No Warning" 1 "Rest Recommend Warning" 2 "Hands-Off TM VAL_ 282 DAW_TimeRstReq 0 "No signal" 1 "Time reset" 2 "Reserved" 3 "Error indicator"; VAL_ 282 DAW_SnstvtyModRetVal 0 "Default" 1 "Late" 2 "Normal" 3 "Reserved" 4 "Reserved" 5 "Reserved" 6 "Reserved" 7 "Invalid"; VAL_ 282 FR_CMR_SCCEquipSta 0 "Not Applied" 1 "Applied" 2 "Not used" 3 "Error Indicator"; -VAL_ 298 LKA_MODE 1 "warning only" 2 "assist" 6 "off"; -VAL_ 298 LKA_ICON 0 "hidden" 1 "grey" 2 "green" 3 "flashing green"; +VAL_ 298 LKA_OptUsmSta 0 "None LKA/LDW Option (Default)" 1 "LDW" 2 "LKA" 3 "Reserved" 4 "LDW Only (None LKA)" 5 "LDW only OFF (None LKA)" 6 "LDW/LKA OFF" 7 "Invalid"; +VAL_ 298 LKA_RcgSta 0 "Not Recognized" 1 "Left Lane Recognition" 2 "Right Lane Recognition" 3 "Full Lane Recognition" 4 "Reserved" 5 "Reserved" 6 "Reserved" 7 "Reserved"; +VAL_ 298 LKA_LHLnWrnSta 0 "No Warning" 1 "Lane Departure Warning" 2 "Reserved" 3 "Reserved"; +VAL_ 298 LKA_RHLnWrnSta 0 "No Warning" 1 "Lane Departure Warning" 2 "Reserved" 3 "Reserved"; +VAL_ 298 LKA_HndsoffSnd 0 "Off" 1 "Hands-off Sound Warning" 2 "Reserved" 3 "Reserved"; +VAL_ 298 LKA_StrSnd 0 "Off" 1 "Warning" 2 "Reserved" 3 "Reserved"; +VAL_ 298 LKA_SysIndReq 0 "Off" 1 "Unavailable_(Grey On)" 2 "Lane Recognized_(Green On)" 3 "Lane Departure_(Green Blink)" 4 "System Fail_(Orange On)" 5 "Not Calibrated_(Orange Blink)" 6 "Regulation_(Orange On)" 7 "Reserved"; +VAL_ 298 StrTqReqVal 2046 "Reserved" 2047 "Invalid"; +VAL_ 298 ActToiSta 0 "De-activate TOI" 1 "Activate TOI" 2 "Reserved" 3 "Error indicator"; +VAL_ 298 ToiFltSta 0 "No Fault" 1 "Fault" 2 "Reserved" 3 "Error indicatorr"; +VAL_ 298 LKA_SysWrn 0 "No Info" 1 "Reserved" 2 "Reserved" 3 "Reserved" 4 "Hands-Off Warning 1" 5 "Hands-Off Warning 2" 6 "Hands-Off Warning 3" 7 "Reserved" 8 "Reserved" 9 "System Automatic off" 10 "Reserved" 11 "Reserved" 12 "Reserved" 13 "Reserved" 14 "Reserved" 15 "System Fail"; +VAL_ 298 FCA_LS_WrnSta 3 "ELK Steering to the right"; +VAL_ 298 LKA_UsmMod 0 "NONE" 1 "LKA 1 mode" 2 "Reserved" 3 "LDW"; +VAL_ 298 ELK_SymbDisp 3 "Evasive Action Taking Place"; VAL_ 304 PARK_BUTTON 1 "Pressed" 2 "Not Pressed"; VAL_ 304 KNOB_POSITION 1 "R" 2 "N (on R side)" 3 "Centered" 4 "N (on D side)" 5 "D"; VAL_ 304 GEAR 1 "P" 2 "R" 3 "N" 4 "D"; @@ -904,6 +1160,7 @@ VAL_ 354 FAULT_ESS 0 "HIDDEN" 1 "CHECK_EMERGENCY_STOPPING_FUNCTION" 2 "EMERGENCY VAL_ 362 BLINKER_CONTROL 1 "hazards" 2 "hazards button backlight" 3 "left blinkers" 4 "right blinkers"; VAL_ 373 ACCEnable 0 "SCC ready" 1 "SCC temp fault" 2 "SCC permanent fault" 3 "SCC permanent fault, communication issue"; VAL_ 416 ACCMode 0 "off" 1 "enabled" 2 "driver_override" 3 "off_maybe_fault" 4 "cancelled"; +VAL_ 416 SCC_ObjSta 0 "No in-path object detected" 1 "In-path object detected (uncontrollable)" 2 "In-path object detected (controllable:longitudinal)" 3 "Reserved" 4 "Reserved" 5 "Reserved" 6 "Reserved" 7 "Reserved"; VAL_ 426 CRUISE_BUTTONS 0 "none" 1 "res_accel" 2 "set_decel" 3 "gap_distance" 4 "pause_resume"; VAL_ 437 Info_LftLnQualSta 0 "Very Low Quality" 1 "Low Quality" 2 "High Quality" 3 "Very High Quality" 4 "Reserved" 5 "Reserved" 6 "Reserved" 7 "Error indicator"; VAL_ 437 Info_LftLnDptSta 0 "No Left Line Departure" 1 "Left Line Departure" 2 "Reserved" 3 "Error Indicator"; diff --git a/opendbc/safety/tests/test_hyundai_canfd.py b/opendbc/safety/tests/test_hyundai_canfd.py index d993525a0c5..b24c6dcaf6d 100755 --- a/opendbc/safety/tests/test_hyundai_canfd.py +++ b/opendbc/safety/tests/test_hyundai_canfd.py @@ -49,11 +49,11 @@ class TestHyundaiCanfdBase(HyundaiButtonBase, common.CarSafetyTest, common.Drive BUTTONS_TX_BUS = 1 def _torque_driver_msg(self, torque): - values = {"STEERING_COL_TORQUE": torque} + values = {"MDPS_StrTqSnsrVal": torque} return self.packer.make_can_msg_safety("MDPS", self.PT_BUS, values) def _torque_cmd_msg(self, torque, steer_req=1): - values = {"TORQUE_REQUEST": torque, "STEER_REQ": steer_req} + values = {"StrTqReqVal": torque, "ActToiSta": steer_req} return self.packer.make_can_msg_safety(self.STEER_MSG, self.STEER_BUS, values) def _speed_msg(self, speed): From 9e8d876adedcba465a14a31329f3367280f98ab5 Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Fri, 27 Mar 2026 19:48:27 -0700 Subject: [PATCH 181/229] Honda: Democratize the manual transmission (#3245) * REVERSE_LIGHT for nidec_scm_group_a cars * use car_state_scm_message as the source of REVERSE_LIGHT * retire the ALLOW_MANUAL_TRANS flag --- opendbc/car/honda/carstate.py | 2 +- opendbc/car/honda/interface.py | 3 +-- opendbc/car/honda/values.py | 6 ++---- opendbc/dbc/generator/honda/_nidec_scm_group_a.dbc | 1 + 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/opendbc/car/honda/carstate.py b/opendbc/car/honda/carstate.py index 52519eef260..fd61ca35f6b 100644 --- a/opendbc/car/honda/carstate.py +++ b/opendbc/car/honda/carstate.py @@ -145,7 +145,7 @@ def update(self, can_parsers) -> structs.CarState: ret.parkingBrake = bool(cp.vl[self.car_state_scm_msg]["PARKING_BRAKE_ON"]) if self.CP.transmissionType == TransmissionType.manual: - ret.gearShifter = GearShifter.reverse if bool(cp.vl["SCM_FEEDBACK"]["REVERSE_LIGHT"]) else GearShifter.drive + ret.gearShifter = GearShifter.reverse if bool(cp.vl[self.car_state_scm_msg]["REVERSE_LIGHT"]) else GearShifter.drive else: gear_position = self.shifter_values.get(cp.vl[self.gearbox_msg]["GEAR_SHIFTER"], None) ret.gearShifter = self.parse_gear_shifter(gear_position) diff --git a/opendbc/car/honda/interface.py b/opendbc/car/honda/interface.py index 3ee165d534e..cf38d581d98 100755 --- a/opendbc/car/honda/interface.py +++ b/opendbc/car/honda/interface.py @@ -68,8 +68,7 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo if 0x184 in fingerprint[CAN.pt]: ret.flags |= HondaFlags.HYBRID.value - if ret.flags & HondaFlags.ALLOW_MANUAL_TRANS and all(msg not in fingerprint[CAN.pt] for msg in (0x191, 0x1A3)): - # Manual transmission support for allowlisted cars only, to prevent silent fall-through on auto-detection failures + if all(msg not in fingerprint[CAN.pt] for msg in (0x191, 0x1A3)): ret.transmissionType = TransmissionType.manual elif 0x191 in fingerprint[CAN.pt] and candidate != CAR.ACURA_RDX: # Traditional CVTs, gearshift position in GEARBOX_CVT diff --git a/opendbc/car/honda/values.py b/opendbc/car/honda/values.py index a5b2f510b14..b0c964a3dee 100644 --- a/opendbc/car/honda/values.py +++ b/opendbc/car/honda/values.py @@ -76,7 +76,7 @@ class HondaFlags(IntFlag): HAS_ALL_DOOR_STATES = 256 # Some Hondas have all door states, others only driver door BOSCH_ALT_RADAR = 512 - ALLOW_MANUAL_TRANS = 1024 + # 1024 is available HYBRID = 2048 BOSCH_TJA_CONTROL = 4096 @@ -167,7 +167,6 @@ class CAR(Platforms): # steerRatio: 11.82 is spec end-to-end CarSpecs(mass=3279 * CV.LB_TO_KG, wheelbase=2.83, steerRatio=16.33, centerToFrontRatio=0.39, tireStiffnessFactor=0.8467), {Bus.pt: 'honda_civic_hatchback_ex_2017_can_generated'}, - flags=HondaFlags.ALLOW_MANUAL_TRANS, ) HONDA_ACCORD_11G = HondaBoschCANFDPlatformConfig( [ @@ -185,7 +184,6 @@ class CAR(Platforms): ], CarSpecs(mass=1326, wheelbase=2.7, steerRatio=15.38, centerToFrontRatio=0.4), # steerRatio: 10.93 is end-to-end spec {Bus.pt: 'honda_civic_hatchback_ex_2017_can_generated'}, - flags=HondaFlags.ALLOW_MANUAL_TRANS, ) HONDA_CIVIC_BOSCH_DIESEL = HondaBoschPlatformConfig( [], # don't show in docs @@ -203,7 +201,7 @@ class CAR(Platforms): ], HONDA_CIVIC_BOSCH.specs, {Bus.pt: 'honda_bosch_radarless_generated'}, - flags=HondaFlags.BOSCH_RADARLESS | HondaFlags.ALLOW_MANUAL_TRANS + flags=HondaFlags.BOSCH_RADARLESS ) HONDA_CRV_5G = HondaBoschPlatformConfig( [HondaCarDocs("Honda CR-V 2017-22", min_steer_speed=15. * CV.MPH_TO_MS)], diff --git a/opendbc/dbc/generator/honda/_nidec_scm_group_a.dbc b/opendbc/dbc/generator/honda/_nidec_scm_group_a.dbc index 7b25e2406dc..37145967223 100644 --- a/opendbc/dbc/generator/honda/_nidec_scm_group_a.dbc +++ b/opendbc/dbc/generator/honda/_nidec_scm_group_a.dbc @@ -9,6 +9,7 @@ BO_ 422 SCM_BUTTONS: 8 SCM SG_ CRUISE_BUTTONS : 7|3@0+ (1,0) [0|7] "" EON SG_ LIGHTS_SETTING : 1|2@0+ (1,0) [0|3] "" EON SG_ PARKING_BRAKE_ON : 2|1@0+ (1,0) [0|1] "" EON + SG_ REVERSE_LIGHT : 18|1@0+ (1,0) [0|1] "" XXX SG_ MAIN_ON : 47|1@0+ (1,0) [0|1] "" EON SG_ CRUISE_SETTING : 43|2@0+ (1,0) [0|3] "" EON SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EON From 09153d33cc13534e3314fe9db03e72426573cd21 Mon Sep 17 00:00:00 2001 From: MVL Date: Fri, 27 Mar 2026 22:56:19 -0400 Subject: [PATCH 182/229] Honda: Fit manual transmission (#3166) * temp gearshifter override for Honda Fit * Allow manual transmission for Honda Fit * Add 2018 Fit MT fingerprints * fix uppercase * Add REVERSE_LIGHT for nidec_scm_group_a.dbc * Autodetect reverse_light_msg * Add HONDA_FIT MT test route * Switching timing as SCM_BUTTONS is faster on canbus * switch to fingerprint-based reverse light detection due to canbus timing * Testroute for 2018 manual-transmission Honda Fit * GC the last copy of ALLOW_MANUAL_TRANS * diff reduction * PEP 8 --------- Co-authored-by: Jason Young --- opendbc/car/honda/fingerprints.py | 2 ++ opendbc/car/tests/routes.py | 1 + 2 files changed, 3 insertions(+) diff --git a/opendbc/car/honda/fingerprints.py b/opendbc/car/honda/fingerprints.py index 1e77f110fc2..4691bcb86b6 100644 --- a/opendbc/car/honda/fingerprints.py +++ b/opendbc/car/honda/fingerprints.py @@ -490,6 +490,7 @@ (Ecu.vsa, 0x18da28f1, None): [ b'57114-T5R-L020\x00\x00', b'57114-T5R-L220\x00\x00', + b'57114-T5R-L320\x00\x00', ], (Ecu.eps, 0x18da30f1, None): [ b'39990-T5R-C020\x00\x00', @@ -501,6 +502,7 @@ (Ecu.fwdRadar, 0x18dab0f1, None): [ b'36161-T5R-A040\x00\x00', b'36161-T5R-A240\x00\x00', + b'36161-T5R-A340\x00\x00', b'36161-T5R-A520\x00\x00', ], (Ecu.srs, 0x18da53f1, None): [ diff --git a/opendbc/car/tests/routes.py b/opendbc/car/tests/routes.py index 87b0e66005d..c53c083db33 100644 --- a/opendbc/car/tests/routes.py +++ b/opendbc/car/tests/routes.py @@ -94,6 +94,7 @@ class CarTestRoute(NamedTuple): CarTestRoute("68aac44ad69f838e/2021-05-18--20-40-52", HONDA.HONDA_CRV), CarTestRoute("14fed2e5fa0aa1a5/2021-05-25--14-59-42", HONDA.HONDA_CRV_HYBRID), CarTestRoute("52f3e9ae60c0d886/2021-05-23--15-59-43", HONDA.HONDA_FIT), + CarTestRoute("7a27edd824e984f1/0000000a--4fb8a92b44", HONDA.HONDA_FIT), # manual transmission CarTestRoute("2c4292a5cd10536c/2021-08-19--21-32-15", HONDA.HONDA_FREED), CarTestRoute("03be5f2fd5c508d1/2020-04-19--18-44-15", HONDA.HONDA_HRV), CarTestRoute("320098ff6c5e4730/2023-04-13--17-47-46", HONDA.HONDA_HRV_3G), From 7933f6d5fcfb70b7b16b8411dc923886712d47c9 Mon Sep 17 00:00:00 2001 From: MVL Date: Fri, 27 Mar 2026 23:43:35 -0400 Subject: [PATCH 183/229] Honda - Odyssey Singapore (#2776) * Adding Singapore fingerprints * Adding Singapore Odyssey to ODYSSEY_TWN * Add Singapore Odyssey testroute * PEP 8 --------- Co-authored-by: Jason Young --- opendbc/car/honda/fingerprints.py | 9 +++++++++ opendbc/car/honda/values.py | 5 ++++- opendbc/car/tests/routes.py | 3 ++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/opendbc/car/honda/fingerprints.py b/opendbc/car/honda/fingerprints.py index 4691bcb86b6..3d3fc30442e 100644 --- a/opendbc/car/honda/fingerprints.py +++ b/opendbc/car/honda/fingerprints.py @@ -592,12 +592,21 @@ CAR.HONDA_ODYSSEY_TWN: { (Ecu.eps, 0x18da30f1, None): [ b'39990-T6A-J210\x00\x00', + b'39990-T6A-J420\x00\x00', ], (Ecu.srs, 0x18da53f1, None): [ + b'77959-T6A-J130\x00\x00', b'77959-T6A-P110\x00\x00', ], (Ecu.fwdRadar, 0x18dab0f1, None): [ b'36161-T6A-P040\x00\x00', + b'36161-T6A-U230\x00\x00', + ], + (Ecu.gateway, 0x18daeff1, None): [ + b'38897-T6A-J110\x00\x00', + ], + (Ecu.transmission, 0x18da1ef1, None): [ + b'28101-5X9-U010\x00\x00', ], }, CAR.HONDA_ODYSSEY_5G_MMR: { diff --git a/opendbc/car/honda/values.py b/opendbc/car/honda/values.py index b0c964a3dee..eb67e449e6f 100644 --- a/opendbc/car/honda/values.py +++ b/opendbc/car/honda/values.py @@ -329,7 +329,10 @@ class CAR(Platforms): flags=HondaFlags.NIDEC_ALT_PCM_ACCEL | HondaFlags.HAS_ALL_DOOR_STATES, ) HONDA_ODYSSEY_TWN = HondaNidecPlatformConfig( - [HondaCarDocs("Honda Odyssey (Taiwan) 2018-19")], + [ + HondaCarDocs("Honda Odyssey (Taiwan) 2018-19"), + HondaCarDocs("Honda Odyssey (Singapore) 2021") + ], CarSpecs(mass=1865, wheelbase=2.9, steerRatio=14.35, centerToFrontRatio=0.44, tireStiffnessFactor=0.82), radar_dbc_dict('honda_odyssey_twn_2018_generated'), flags=HondaFlags.NIDEC_ALT_SCM_MESSAGES, diff --git a/opendbc/car/tests/routes.py b/opendbc/car/tests/routes.py index c53c083db33..ef793fc5e3c 100644 --- a/opendbc/car/tests/routes.py +++ b/opendbc/car/tests/routes.py @@ -108,7 +108,8 @@ class CarTestRoute(NamedTuple): CarTestRoute("f29e2b57a55e7ad5/2021-03-24--20-52-38", HONDA.HONDA_ACCORD), # hybrid, 2021 with new style HUD msgs CarTestRoute("1ad763dd22ef1a0e/2020-02-29--18-37-03", HONDA.HONDA_CRV_5G), CarTestRoute("0a96f86fcfe35964/2020-02-05--07-25-51", HONDA.HONDA_ODYSSEY), - CarTestRoute("7817fe954aff07b8/00000001--fdaaf36c4f", HONDA.HONDA_ODYSSEY_TWN), + CarTestRoute("7817fe954aff07b8/00000001--fdaaf36c4f", HONDA.HONDA_ODYSSEY_TWN), # Taiwan + CarTestRoute("5bd1fcb9a66f60e1/000001d6--f1bff3e876", HONDA.HONDA_ODYSSEY_TWN), # Singapore CarTestRoute("d7233a428eb7d0b5/00000001--9b99b04d43", HONDA.HONDA_ODYSSEY_5G_MMR), CarTestRoute("d83f36766f8012a5/2020-02-05--18-42-21", HONDA.HONDA_CIVIC_BOSCH_DIESEL), CarTestRoute("f0890d16a07a236b/2021-05-25--17-27-22", HONDA.HONDA_INSIGHT), From 8d8f1dded9e208e1d9c29a1b7b6948042c50fb17 Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Fri, 27 Mar 2026 20:46:44 -0700 Subject: [PATCH 184/229] Hyundai CAN FD: Fix DBC signal comments (#3246) --- .../dbc/generator/hyundai/hyundai_canfd.dbc | 91 +++---------------- 1 file changed, 11 insertions(+), 80 deletions(-) diff --git a/opendbc/dbc/generator/hyundai/hyundai_canfd.dbc b/opendbc/dbc/generator/hyundai/hyundai_canfd.dbc index fd2d6e19abc..4a9cec5b127 100644 --- a/opendbc/dbc/generator/hyundai/hyundai_canfd.dbc +++ b/opendbc/dbc/generator/hyundai/hyundai_canfd.dbc @@ -757,10 +757,7 @@ CM_ SG_ 203 ADAS_ACIAnglTqRedcGainVal "(LFA) ADAS AngleControlInterface Angle To CM_ SG_ 203 FCA_ESA_ActvSta "FCA_ESA Active State"; CM_ SG_ 203 FCA_ESA_TqBstGainVal "FCA_ESA Torque Boost Gain Value"; CM_ BO_ 234 "Named MDPS_01_10ms on the official DBC."; -CM_ SG_ 234 CHECKSUM "The data area for CRC calculation is based on the data length (DLC) of the message DB. - -The CRC shall be calculated over the entire data block (excluding the CRC bytes) including the user data, alive counter and Data ID - +CM_ SG_ 234 CHECKSUM "The data area for CRC calculation is based on the data length (DLC) of the message DB. The CRC shall be calculated over the entire data block (excluding the CRC bytes) including the user data, alive counter and Data ID. CRC Polynomial (0x1021)."; CM_ BO_ 229 "[P] Periodic"; CM_ SG_ 229 ESC_YawSigSta "ESC_YawSigSta"; CM_ SG_ 229 ESC_LatAccelSigSta "ESC_LatAccelSigSta"; @@ -768,11 +765,7 @@ CM_ SG_ 229 ESC_LongAccelSigSta "ESC_LongAccelSigSta"; CM_ SG_ 229 ESC_YawRtVal "ESC_YawRtVal"; CM_ SG_ 229 ESC_LatAccelVal "ESC_LatAccelVal"; CM_ SG_ 229 ESC_LongAccelVal "ESC_LongAccelVal"; - -- CRC Polynomial (0x1021) , In"; -CM_ SG_ 234 COUNTER "For the first transmission request for a data element the counter shall be initialized with 0 and shall be incremented by 1 for every subsequent send request. - -When the counter reaches the maximum value(0xFF), then it shall restart with 0 for the next s"; +CM_ SG_ 234 COUNTER "For the first transmission request for a data element the counter shall be initialized with 0 and shall be incremented by 1 for every subsequent send request. When the counter reaches the maximum value(0xFF), then it shall restart with 0 for the next send request."; CM_ SG_ 234 MDPS_WrngLmpSta "The signal indicates the ststus of the MDPS Warning lamp"; CM_ SG_ 234 MDPS_Typ "Information regarding the type of MDPS. (C-MDPS / R-MDPS / SbW)"; CM_ SG_ 234 MDPS_EngIdleRpmReq "This signal indicates the request status for engine idle rpm up according to MDPS fast rotation."; @@ -781,91 +774,31 @@ CM_ SG_ 234 MDPS_VsmDfctvSta "Information regarding the MDPS defective Indicatio CM_ SG_ 234 MDPS_VsmSigErrSta "Information indicating VSM signal status"; CM_ SG_ 234 MDPS_PaPlugInSta "This signal indicates whether the PA function of MDPS is plugged in or not."; CM_ SG_ 234 MDPS_PaModeSta "This signal indicates the status of the PA steering function."; -CM_ SG_ 234 MDPS_PaCanfltSta "This Signal should be used by only PA - -This signal indicates whether the MDPS is defective in PA cooperation control. - -This signal is set as '1' only when MDPS Detects CAN Failure(TIMEOUT, Signal Error) of PA CAN Message"; +CM_ SG_ 234 MDPS_PaCanfltSta "This Signal should be used by only PA. This signal indicates whether the MDPS is defective in PA cooperation control. This signal is set as '1' only when MDPS Detects CAN Failure(TIMEOUT, Signal Error) of PA CAN Message"; CM_ SG_ 234 MDPS_LkaPlgInSta "This signal indicates whether the LKA function of MDPS is plugged in or not."; CM_ SG_ 234 MDPS_LkaToiActvSta "This flag is set to 1 in response to the LKA Controller requesting the activation of the torque interface and set back to 0 in response to the LKA Controller requesting the de-activation of the torque interface."; CM_ SG_ 234 MDPS_LkaToiUnblSta "This is a flag that is set when the MDPS is not faulty, but is temporarily unable to activate the TOI due to steering torque limiting e.g. when the supply voltage is too low."; CM_ SG_ 234 MDPS_LkaToiFltSta "This fault flag is set when a fault within the MDPS system has been detected such that the LKA TOI can no longer function. CAN failures, internal MDPS failures, and LKA controller logic failures are all reported by this flag. Failures reported by the LKA"; CM_ SG_ 234 MDPS_LkaFailSta "This fault flag is set whilst the MDPS TOI is in a fail state and has not yet recovered from it. This could either be due to an MDPS detected fault (as communicated by the MDPS_LkaToiFltSta' flag) or an LKA detected fault (as communicated by the LKA_"; CM_ SG_ 234 MDPS_ResetOpSta "Information regarding the state of reset"; -CM_ SG_ 234 MDPS_CurrModVal "This signal indicates flex steer parameter value in MDPS. - - - - For information about flex steer mode set by user, refer to MDPS_FlxStrSta signal."; -CM_ SG_ 234 MDPS_OutTqVal "MDPS column torque - -this signal has direction information. - -'+' Value means Counter clock wise rotation. - -'-' value means Clock wise rotation."; +CM_ SG_ 234 MDPS_CurrModVal "This signal indicates flex steer parameter value in MDPS. For information about flex steer mode set by user, refer to MDPS_FlxStrSta signal."; +CM_ SG_ 234 MDPS_OutTqVal "MDPS column torque. This signal has direction information. '+' Value means Counter clock wise rotation. '-' value means Clock wise rotation."; CM_ SG_ 234 MDPS_VsmActResp "Information of VSM Tqrque Intervention Act Response"; CM_ SG_ 234 Reprogram_State_MDPS "Information regarding the reprogram state"; -CM_ SG_ 234 MDPS_StrTqSnsrVal "Steering torque sensor value - - - -Physical Value > 0: Left Direction (CCW) - -Physical Value < 0: Right Direction (CW) - - - -this signal has direction information. - -'+' Value means Counter clock wise rotation. - -'-' value means Clock wise rotation. (Original definition was (0.005,-20.48) [0|0] but it's different from all OP expects)"; -CM_ SG_ 234 MDPS_PaStrAnglVal "This value is used to inform PA of a compensated steering wheel angle by MDPS. The signal is signed 16bits. - - - -(PH) = (HEX) 0.1 (for 0 < HEX 32767) or - -= (HEX - 65536) 0.1 (for HEX > 32767) [Deg] - - - -this signal has direction information. - -'+' V"; +CM_ SG_ 234 MDPS_StrTqSnsrVal "Steering torque sensor value. Physical Value > 0: Left Direction (CCW). Physical Value < 0: Right Direction (CW). '+' Value means Counter clock wise rotation. '-' value means Clock wise rotation. (Original definition was (0.005,-20.48) [0|0] but it's different from all OP expects)"; +CM_ SG_ 234 MDPS_PaStrAnglVal "This value is used to inform PA of a compensated steering wheel angle by MDPS. The signal is signed 16bits. (PH) = (HEX) * 0.1 (for 0 < HEX <= 32767) or = (HEX - 65536) * 0.1 (for HEX > 32767) [Deg]. This signal has direction information."; CM_ SG_ 234 MDPS_LoamModSta "The signal represent status of the LOAM(Loss Of Assist Mitigation) Mode"; CM_ SG_ 234 MDPS_HDPSpprtSWVer "This signal indicates HDP-MDPS Control Requirement Spec Version"; CM_ SG_ 234 MDPS_ADASAciActvSta "State for angle control"; CM_ SG_ 234 MDPS_ADASAciPluginSta "This signal indicates whether the ADASAci function of MDPS is plugged in or not."; CM_ SG_ 234 MDPS_ADAS_AciFltSig "MDPS Fault Status for HDP Function"; -CM_ SG_ 234 MDPS_EstStrAnglVal "This value is used to inform of a compensated steering wheel angle by MDPS . The signal is signed 16bits, and made by motor position sensor. - - - -(PH) = (HEX) 0.1 (for 0 < HEX 32767) or - -= (HEX - 65536) 0.1 (for HEX > 32767) [Deg] - - - -this signal"; +CM_ SG_ 234 MDPS_EstStrAnglVal "This value is used to inform of a compensated steering wheel angle by MDPS. The signal is signed 16bits, and made by motor position sensor. (PH) = (HEX) * 0.1 (for 0 < HEX <= 32767) or = (HEX - 65536) * 0.1 (for HEX > 32767) [Deg]."; CM_ SG_ 234 MDPS_ADASAciActvSta_Lv2 "States for angle control (LV2)"; CM_ SG_ 234 MDPS_ADAS_AciFltSig_Lv2 "MDPS Fault Status for LV2 Angle Control Function"; CM_ SG_ 234 MDPS_TpaPlugInSta "This signal indicates whether the TPA function of MDPS is plugged in or not."; -CM_ SG_ 234 MDPS_TpaCanfltSta "This Signal should be used by only TPA - -This signal indicates whether the MDPS is defective in TPA cooperation control. - -This signal is set as '1' only when MDPS Detects CAN Failure(TIMEOUT, Signal Error) of TPA CAN Message"; +CM_ SG_ 234 MDPS_TpaCanfltSta "This Signal should be used by only TPA. This signal indicates whether the MDPS is defective in TPA cooperation control. This signal is set as '1' only when MDPS Detects CAN Failure(TIMEOUT, Signal Error) of TPA CAN Message"; CM_ SG_ 234 MDPS_TpaModeSta "This signal indicates the status of the TPA steering function."; -CM_ SG_ 234 MDPS_TpaStrAnglVal "This value is used to inform TPA of a compensated steering wheel angle by MDPS. The signal is signed 16bits. - - - -(PH) = (HEX) 0.1 (for 0 < HEX 32767) or - -= (HEX - 65536) 0.1 (for HEX > 32767) [Deg]"; +CM_ SG_ 234 MDPS_TpaStrAnglVal "This value is used to inform TPA of a compensated steering wheel angle by MDPS. The signal is signed 16bits. (PH) = (HEX) * 0.1 (for 0 < HEX <= 32767) or = (HEX - 65536) * 0.1 (for HEX > 32767) [Deg]"; CM_ BO_ 272 "Alternative LKAS message, used on cars such as 2023 Ioniq 6, 2nd gen Kona. Matches LKAS except size is 32 bytes"; CM_ SG_ 272 ToiFltSta "This fault flag is set when a fault in the LKA system has been detected by the LKA ECU such that LKA can no longer function. CAN failures, internal video ECU failures, hard-wired component (e.g. master switch) failures and other system logic failures are"; CM_ SG_ 272 ADAS_StrAnglReqVal "(LKAS) ADAS Steering Angle Request Value; Capped at 176.7; tracks MDPS->STEERING_ANGLE when not engaged, not STEERING_SENSORS->STEERING_ANGLE"; @@ -889,9 +822,7 @@ CM_ SG_ 282 FR_CMR_SCCEquipSta "This signal indicates equipment for SCC"; CM_ SG_ 282 FR_CMR_ReqADASMapMsgVal "This signal indicates an ADAS map message request from FR_CMR to H_U. Each bit indicates the request messages as follows. - Bit 0 : H_U_NAVI_V2_STUB_E - Bit 1 : HU_NAVI_V2_PROSHORT_E_00 (곡률) - Bit 2 : HU_NAVI_V2_PROSHORT_E_00 (곡률 외 정보)"; CM_ SG_ 282 FR_CMR_SwVer1Val "This signal indicates a major version of FR_CMR software. If FR_CMR software version is A.00, 'A' and '00' mean major and minor version respectively."; CM_ SG_ 282 FR_CMR_SwVer2Val "This signal indicates a minor version of FR_CMR software. If FR_CMR software version is A.00, 'A' and '00' mean major and minor version respectively."; -CM_ BO_ 298 "This message controls steering and alerts regarding lateral control. Formerly known as LFA. - -Node is flagged as ADRV, but in reality this signal can be seen from either the FR_CMR (front camera) or the ADRV (adas ecu) for some trims."; +CM_ BO_ 298 "This message controls steering and alerts regarding lateral control. Formerly known as LFA. Node is flagged as ADRV, but in reality this signal can be seen from either the FR_CMR (front camera) or the ADRV (adas ecu) for some trims."; CM_ SG_ 298 LKA_OptUsmSta "LKA_OptionUsmStatus ##2G##LDW_LKA - LKA11 - CF_LKA_Opt_USM"; CM_ SG_ 298 LKA_RcgSta "LKA_RecognitionStatus ##2G##LDW_LKA - LKA11 - CF_LKA_LaneRecogState"; CM_ SG_ 298 LKA_LHLnWrnSta "LKA_LHLaneWarningStatus ##2G##LDW_LKA - LKA11 - CF_LKA_LHWarning"; From 76cecd38c648914c8dea27482facf57b4a062c88 Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Fri, 27 Mar 2026 23:53:00 -0700 Subject: [PATCH 185/229] Hyundai CAN FD: universal BSM detection (#3247) * Hyundai CAN FD: improve blindspot detection * new detection * update name * update dbc * bool it --- opendbc/car/hyundai/carstate.py | 4 +- opendbc/car/hyundai/interface.py | 2 +- .../dbc/generator/hyundai/hyundai_canfd.dbc | 38 +++++++++++++------ 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/opendbc/car/hyundai/carstate.py b/opendbc/car/hyundai/carstate.py index 5532d67eebf..0c52d51658e 100644 --- a/opendbc/car/hyundai/carstate.py +++ b/opendbc/car/hyundai/carstate.py @@ -250,8 +250,8 @@ def update_canfd(self, can_parsers) -> structs.CarState: ret.leftBlinker, ret.rightBlinker = self.update_blinker_from_lamp(50, cp.vl["BLINKERS"][left_blinker_sig], cp.vl["BLINKERS"][right_blinker_sig]) if self.CP.enableBsm: - ret.leftBlindspot = cp.vl["BLINDSPOTS_REAR_CORNERS"]["FL_INDICATOR"] != 0 - ret.rightBlindspot = cp.vl["BLINDSPOTS_REAR_CORNERS"]["FR_INDICATOR"] != 0 + ret.leftBlindspot = bool(cp.vl["ADAS_CMD_50_50ms"]["BCW_LtIndSta"]) + ret.rightBlindspot = bool(cp.vl["ADAS_CMD_50_50ms"]["BCW_RtIndSta"]) # cruise state # CAN FD cars enable on main button press, set available if no TCS faults preventing engagement diff --git a/opendbc/car/hyundai/interface.py b/opendbc/car/hyundai/interface.py index 9dc18c93c79..d3178b3125f 100644 --- a/opendbc/car/hyundai/interface.py +++ b/opendbc/car/hyundai/interface.py @@ -41,7 +41,7 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo # this needs to be figured out for cars without an ADAS ECU ret.alphaLongitudinalAvailable = False - ret.enableBsm = 0x1e5 in fingerprint[CAN.ECAN] + ret.enableBsm = 0x1ba in fingerprint[CAN.ECAN] # Check if the car is hybrid. Only HEV/PHEV cars have 0xFA on E-CAN. if 0xFA in fingerprint[CAN.ECAN]: diff --git a/opendbc/dbc/generator/hyundai/hyundai_canfd.dbc b/opendbc/dbc/generator/hyundai/hyundai_canfd.dbc index 4a9cec5b127..fdce6fbc70a 100644 --- a/opendbc/dbc/generator/hyundai/hyundai_canfd.dbc +++ b/opendbc/dbc/generator/hyundai/hyundai_canfd.dbc @@ -454,19 +454,33 @@ BO_ 437 FR_CMR_03_50ms: 32 FR_CMR SG_ Relative_Velocity : 200|12@1+ (0.05,-100) [-100|104.75] "m/s" XXX SG_ Longitudinal_Distance : 212|12@1+ (0.05,0) [0|204.75] "m" XXX -BO_ 442 BLINDSPOTS_REAR_CORNERS: 24 XXX - SG_ CHECKSUM : 0|16@1+ (1,0) [0|65535] "" XXX - SG_ COUNTER : 16|8@1+ (1,0) [0|255] "" XXX - SG_ LEFT_BLOCKED : 24|1@0+ (1,0) [0|1] "" XXX - SG_ LEFT_MB : 30|1@0+ (1,0) [0|3] "" XXX - SG_ MORE_LEFT_PROB : 32|1@1+ (1,0) [0|3] "" XXX +BO_ 442 ADAS_CMD_50_50ms: 24 XXX + SG_ ADAS_CMD_Crc50Val : 0|16@1+ (1,0) [0|65535] "" XXX + SG_ ADAS_CMD_AlvCnt50Val : 16|8@1+ (1,0) [0|255] "" XXX + SG_ BCW_Sta : 24|1@0+ (1,0) [0|1] "" XXX + SG_ BCW_OnOffEquipSta : 28|2@1+ (1,0) [0|3] "" XXX + SG_ BCW_LtIndSta : 30|1@0+ (1,0) [0|3] "" XXX + SG_ BCW_RtIndSta : 32|1@1+ (1,0) [0|3] "" XXX + SG_ BCW_LtSndWrngSta : 34|2@1+ (1,0) [0|3] "" XXX + SG_ BCW_RtSndWrngSta : 36|10@1+ (1,0) [0|1023] "" XXX SG_ FL_INDICATOR : 46|6@0+ (1,0) [0|1] "" XXX - SG_ FR_INDICATOR : 54|6@0+ (1,0) [0|63] "" XXX - SG_ RIGHT_BLOCKED : 64|1@0+ (1,0) [0|1] "" XXX - SG_ COLLISION_AVOIDANCE_ACTIVE : 68|1@0+ (1,0) [0|1] "" XXX - SG_ NEW_SIGNAL_2 : 96|1@0+ (1,0) [0|1] "" XXX - SG_ FL_INDICATOR_ALT : 138|1@0+ (1,0) [0|1] "" XXX - SG_ FR_INDICATOR_ALT : 141|1@0+ (1,0) [0|1] "" XXX + SG_ FR_INDICATOR : 54|2@0+ (1,0) [0|3] "" XXX + SG_ BCW_SnstvtyModRetVal : 56|3@1+ (1,0) [0|7] "" XXX + SG_ BCW_IndSta : 59|3@1+ (1,0) [0|7] "" XXX + SG_ BCA_OnOffEquip2Sta : 62|2@1+ (1,0) [0|3] "" XXX + SG_ BCA_Sta : 64|1@0+ (1,0) [0|1] "" XXX + SG_ BCA_OnOffEquipSta : 68|1@0+ (1,0) [0|1] "" XXX + SG_ BCA_DRV_WarnSta : 76|4@1+ (1,0) [0|15] "" XXX + SG_ BCA_Plus_Deccel_Req : 80|4@1+ (1,0) [0|15] "" XXX + SG_ BCA_Plus_BrkCmdSta : 84|2@1+ (1,0) [0|3] "" XXX + SG_ BCA_Plus_LtWrngSta : 86|2@1+ (1,0) [0|3] "" XXX + SG_ BCA_Plus_RtWrngSta : 88|5@1+ (1,0) [0|31] "" XXX + SG_ BCA_Plus_FuncStat : 93|3@1+ (1,0) [0|7] "" XXX + SG_ BCA_Plus_Sta : 96|1@0+ (1,0) [0|1] "" XXX + SG_ Brake_Control_RL : 110|2@1+ (1,0) [0|3] "" XXX + SG_ Brake_Control_RR : 118|2@1+ (1,0) [0|3] "" XXX + SG_ OSMrrLamp_LtIndSta : 128|2@1+ (1,0) [0|3] "" XXX + SG_ OSMrrLamp_RtIndSta : 130|6@1+ (1,0) [0|63] "" XXX BO_ 463 CRUISE_BUTTONS: 8 XXX SG_ _CHECKSUM : 0|8@1+ (1,0) [0|65535] "" XXX From b3cba834d06ba64c94d66f0073cbb87e075192fe Mon Sep 17 00:00:00 2001 From: MVL Date: Sat, 28 Mar 2026 03:45:00 -0400 Subject: [PATCH 186/229] Honda - Honda E 2020 Advance trim (#3180) * Add Honda e dbc * Honda e MMR * Add Honda E advance trim * Rename dbc to honda_e_advance_2020_can * Add HONDA_E_ADVANCE * Add HONDA_E_ADVANCE * temp testroute for Honda E Advance * Add HONDA_E_ADVANCE * update dbc name * formatting fix * Correct reversed Honda E firmware * testroute for Honda E Advance --------- Co-authored-by: Jason Young --- opendbc/car/honda/fingerprints.py | 8 ++++++++ opendbc/car/honda/interface.py | 2 +- opendbc/car/honda/values.py | 11 ++++++++--- opendbc/car/tests/routes.py | 1 + opendbc/car/torque_data/substitute.toml | 1 + .../dbc/generator/honda/honda_e_advance_2020_can.dbc | 7 +++++++ 6 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 opendbc/dbc/generator/honda/honda_e_advance_2020_can.dbc diff --git a/opendbc/car/honda/fingerprints.py b/opendbc/car/honda/fingerprints.py index 3d3fc30442e..5361b1da905 100644 --- a/opendbc/car/honda/fingerprints.py +++ b/opendbc/car/honda/fingerprints.py @@ -954,6 +954,14 @@ b'57114-TYF-E030\x00\x00', ], }, + CAR.HONDA_E_ADVANCE: { + (Ecu.fwdCamera, 0x18dab5f1, None): [ + b'36161-TYF-E020\x00\x00', + ], + (Ecu.fwdRadar, 0x18dab0f1, None): [ + b'36802-TYF-E050\x00\x00', + ], + }, CAR.HONDA_CIVIC_2022: { (Ecu.eps, 0x18da30f1, None): [ b'39990-T24-T120\x00\x00', diff --git a/opendbc/car/honda/interface.py b/opendbc/car/honda/interface.py index cf38d581d98..c55ff6b1fec 100755 --- a/opendbc/car/honda/interface.py +++ b/opendbc/car/honda/interface.py @@ -178,7 +178,7 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo ret.lateralParams.torqueBP, ret.lateralParams.torqueV = [[0, 4096], [0, 4096]] # TODO: determine if there is a dead zone at the top end ret.lateralTuning.pid.kpV, ret.lateralTuning.pid.kiV = [[0.6], [0.18]] - elif candidate == CAR.HONDA_E: + elif candidate in (CAR.HONDA_E, CAR.HONDA_E_ADVANCE): ret.lateralParams.torqueBP, ret.lateralParams.torqueV = [[0, 4096], [0, 4096]] # TODO: determine if there is a dead zone at the top end ret.lateralTuning.pid.kpV, ret.lateralTuning.pid.kiV = [[0.6], [0.18]] # TODO: can probably use some tuning diff --git a/opendbc/car/honda/values.py b/opendbc/car/honda/values.py index eb67e449e6f..55516abc5f7 100644 --- a/opendbc/car/honda/values.py +++ b/opendbc/car/honda/values.py @@ -251,6 +251,11 @@ class CAR(Platforms): CarSpecs(mass=3338.8 * CV.LB_TO_KG, wheelbase=2.5, centerToFrontRatio=0.5, steerRatio=16.71, tireStiffnessFactor=0.82), {Bus.pt: 'acura_rdx_2020_can_generated'}, ) + HONDA_E_ADVANCE = HondaBoschPlatformConfig( + [], # don't show in docs, base trim already in docs + CarSpecs(mass=1527, wheelbase=2.5, centerToFrontRatio=0.5, steerRatio=16.71, tireStiffnessFactor=0.82), + {Bus.pt: 'honda_e_advance_2020_can_generated'}, # 8 bit LKAS_HUD in Advance trim + ) HONDA_PILOT_4G = HondaBoschCANFDPlatformConfig( [HondaCarDocs("Honda Pilot 2023-25", "All")], CarSpecs(mass=4660 * CV.LB_TO_KG, wheelbase=2.89, centerToFrontRatio=0.442, steerRatio=17.5), @@ -433,9 +438,9 @@ class CAR(Platforms): # Note that we still attempt to match with them when they are present # This is or'd with (ALL_ECUS - ESSENTIAL_ECUS) from fw_versions.py non_essential_ecus={ - Ecu.eps: [CAR.ACURA_RDX_3G, CAR.HONDA_ACCORD, CAR.HONDA_E, *HONDA_BOSCH_ALT_RADAR, *HONDA_BOSCH_RADARLESS, *HONDA_BOSCH_CANFD], - Ecu.vsa: [CAR.ACURA_RDX_3G, CAR.HONDA_ACCORD, CAR.HONDA_CIVIC, CAR.HONDA_CIVIC_BOSCH, CAR.HONDA_CRV_5G, CAR.HONDA_CRV_HYBRID, - CAR.HONDA_E, CAR.HONDA_INSIGHT, CAR.HONDA_NBOX_2G, *HONDA_BOSCH_ALT_RADAR, *HONDA_BOSCH_RADARLESS, *HONDA_BOSCH_CANFD], + Ecu.eps: [CAR.ACURA_RDX_3G, CAR.HONDA_ACCORD, CAR.HONDA_E, CAR.HONDA_E_ADVANCE, *HONDA_BOSCH_ALT_RADAR, *HONDA_BOSCH_RADARLESS, *HONDA_BOSCH_CANFD], + Ecu.vsa: [CAR.ACURA_RDX_3G, CAR.HONDA_ACCORD, CAR.HONDA_CIVIC, CAR.HONDA_CIVIC_BOSCH, CAR.HONDA_CRV_5G, CAR.HONDA_CRV_HYBRID, CAR.HONDA_E, + CAR.HONDA_E_ADVANCE, CAR.HONDA_INSIGHT, CAR.HONDA_NBOX_2G, *HONDA_BOSCH_ALT_RADAR, *HONDA_BOSCH_RADARLESS, *HONDA_BOSCH_CANFD], }, extra_ecus=[ (Ecu.combinationMeter, 0x18da60f1, None), diff --git a/opendbc/car/tests/routes.py b/opendbc/car/tests/routes.py index ef793fc5e3c..420e75d9b37 100644 --- a/opendbc/car/tests/routes.py +++ b/opendbc/car/tests/routes.py @@ -119,6 +119,7 @@ class CarTestRoute(NamedTuple): CarTestRoute("f34a60d68d83b1e5/2020-10-06--14-35-55", HONDA.ACURA_RDX), CarTestRoute("54fd8451b3974762/2021-04-01--14-50-10", HONDA.HONDA_RIDGELINE), CarTestRoute("2d5808fae0b38ac6/2021-09-01--17-14-11", HONDA.HONDA_E), + CarTestRoute("16a94dfbfdf5a51f/00000007--5ac9e58f1b", HONDA.HONDA_E_ADVANCE), CarTestRoute("f44aa96ace22f34a/2021-12-22--06-22-31", HONDA.HONDA_CIVIC_2022), CarTestRoute("1f032f5173c8ad99/00000006--573b3fcaf5", HONDA.HONDA_CIVIC_2022), # Civic Type R with manual transmission CarTestRoute("b1c832ad56b6bc9d/00000010--debfcf5867", HONDA.HONDA_CIVIC_2022), # 2025 Civic Hatch Hybrid with new eCVT transmission diff --git a/opendbc/car/torque_data/substitute.toml b/opendbc/car/torque_data/substitute.toml index 134f85a2a14..d530ecd3ef4 100644 --- a/opendbc/car/torque_data/substitute.toml +++ b/opendbc/car/torque_data/substitute.toml @@ -50,6 +50,7 @@ legend = ["LAT_ACCEL_FACTOR", "MAX_LAT_ACCEL_MEASURED", "FRICTION"] "HONDA_CRV_EU" = "HONDA_CRV" "HONDA_CIVIC_BOSCH_DIESEL" = "HONDA_CIVIC_BOSCH" "HONDA_E" = "HONDA_CIVIC_BOSCH" +"HONDA_E_ADVANCE" = "HONDA_CIVIC_BOSCH" "HONDA_ODYSSEY_TWN" = "HONDA_ODYSSEY" "BUICK_LACROSSE" = "CHEVROLET_VOLT" diff --git a/opendbc/dbc/generator/honda/honda_e_advance_2020_can.dbc b/opendbc/dbc/generator/honda/honda_e_advance_2020_can.dbc new file mode 100644 index 00000000000..9955f009145 --- /dev/null +++ b/opendbc/dbc/generator/honda/honda_e_advance_2020_can.dbc @@ -0,0 +1,7 @@ +CM_ "IMPORT _honda_common.dbc"; +CM_ "IMPORT _bosch_2018.dbc"; +CM_ "IMPORT _bosch_radar_acc.dbc"; +CM_ "IMPORT _lkas_hud_8byte.dbc"; +CM_ "IMPORT _bosch_standstill.dbc"; +CM_ "IMPORT _steering_sensors_b.dbc"; +CM_ "IMPORT _gearbox_common.dbc"; From 54d4fb9485141c61fe223c699bcfdb0914933162 Mon Sep 17 00:00:00 2001 From: adeebshihadeh Date: Sat, 28 Mar 2026 08:15:36 +0000 Subject: [PATCH 187/229] docs: Scheduled auto-update CARS.md --- docs/CARS.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/CARS.md b/docs/CARS.md index ae657cee346..39f96f6e163 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -1,6 +1,6 @@ -# Support Information for 392 Known Cars +# Support Information for 393 Known Cars |Make|Model|Package|Support Level| |---|---|---|:---:| @@ -118,6 +118,7 @@ |Honda|N-Box 2018|All|[Upstream](#upstream)| |Honda|Odyssey 2018-20|Honda Sensing|[Upstream](#upstream)| |Honda|Odyssey 2021-26|All|[Upstream](#upstream)| +|Honda|Odyssey (Singapore) 2021|Honda Sensing|[Upstream](#upstream)| |Honda|Odyssey (Taiwan) 2018-19|Honda Sensing|[Upstream](#upstream)| |Honda|Passport 2019-25|All|[Upstream](#upstream)| |Honda|Passport 2026|All|[Upstream](#upstream)| @@ -171,7 +172,7 @@ |Hyundai|Tucson Hybrid 2022-24|All|[Upstream](#upstream)| |Hyundai|Tucson Plug-in Hybrid 2024|All|[Upstream](#upstream)| |Hyundai|Veloster 2019-20|Smart Cruise Control (SCC)|[Upstream](#upstream)| -|Jeep|Cherokee 2019-23|Adaptive Cruise Control (ACC)|[Upstream](#upstream)| +|Jeep|Cherokee 2019-23|Adaptive Cruise Control (ACC)|[Dashcam mode](#dashcam)| |Jeep|Grand Cherokee 2016-18|Adaptive Cruise Control (ACC)|[Upstream](#upstream)| |Jeep|Grand Cherokee 2019-21|Adaptive Cruise Control (ACC)|[Upstream](#upstream)| |Kia|Carnival 2022-24|Smart Cruise Control (SCC)|[Upstream](#upstream)| @@ -257,8 +258,8 @@ |Peugeot|208 2019-25|Adaptive Cruise Control (ACC) & Lane Assist|[Dashcam mode](#dashcam)| |Porsche|Macan 2017-24|Adaptive Cruise Control (ACC) & Lane Assist|[Dashcam mode](#dashcam)| |Ram|1500 2019-24|Adaptive Cruise Control (ACC)|[Upstream](#upstream)| -|Ram|2500 2020-24|Adaptive Cruise Control (ACC)|[Upstream](#upstream)| -|Ram|3500 2019-22|Adaptive Cruise Control (ACC)|[Upstream](#upstream)| +|Ram|2500 2020-24|Adaptive Cruise Control (ACC)|[Dashcam mode](#dashcam)| +|Ram|3500 2019-22|Adaptive Cruise Control (ACC)|[Dashcam mode](#dashcam)| |Rivian|R1S 2022-24|All|[Upstream](#upstream)| |Rivian|R1T 2022-24|All|[Upstream](#upstream)| |SEAT|Alhambra 2018-20|Adaptive Cruise Control (ACC) & Lane Assist|[Dashcam mode](#dashcam)| From 90a9e4b5bc707b2734a6f940408be704b3d4ad1c Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Sat, 28 Mar 2026 13:42:47 -0700 Subject: [PATCH 188/229] Chrysler CUSW: Bug fixes for driver brake and LKAS HUD (#3250) --- opendbc/car/chrysler/carstate.py | 4 ++-- opendbc/car/chrysler/chryslercan.py | 4 ++-- opendbc/dbc/chrysler_cusw.dbc | 8 +++++++- opendbc/safety/modes/chrysler_cusw.h | 8 ++++---- opendbc/safety/tests/test_chrysler_cusw.py | 4 ++-- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/opendbc/car/chrysler/carstate.py b/opendbc/car/chrysler/carstate.py index 8c569f7f9b0..be4391f053d 100644 --- a/opendbc/car/chrysler/carstate.py +++ b/opendbc/car/chrysler/carstate.py @@ -111,8 +111,8 @@ def update_cusw(self, cp, cp_cam): cp.vl["DOORS"]["DOOR_OPEN_RR"]]) ret.seatbeltUnlatched = bool(cp.vl["SEATBELT_STATUS"]["SEATBELT_DRIVER_UNLATCHED"]) - ret.brakePressed = bool(cp.vl["BRAKE_2"]["BRAKE_HUMAN"]) - ret.brake = cp.vl["BRAKE_1"]["BRAKE_PSI"] + ret.brakePressed = bool(cp.vl["BRAKE_3"]["DRIVER_BRAKE_SWITCH"]) + ret.brake = cp.vl["BRAKE_1"]["DRIVER_BRAKE_PRESSURE"] ret.gasPressed = cp.vl["ACCEL_GAS"]["GAS_HUMAN"] > 0 ret.espDisabled = bool(cp.vl["TRACTION_BUTTON"]["TRACTION_OFF"]) diff --git a/opendbc/car/chrysler/chryslercan.py b/opendbc/car/chrysler/chryslercan.py index 677582ef409..1f2b0118ee4 100644 --- a/opendbc/car/chrysler/chryslercan.py +++ b/opendbc/car/chrysler/chryslercan.py @@ -1,6 +1,6 @@ from opendbc.car import structs from opendbc.car.crc import CRC8J1850 -from opendbc.car.chrysler.values import RAM_CARS +from opendbc.car.chrysler.values import CUSW_CARS, RAM_CARS GearShifter = structs.CarState.GearShifter VisualAlert = structs.CarControl.HUDControl.VisualAlert @@ -45,7 +45,7 @@ def create_lkas_hud(packer, CP, lkas_active, hud_alert, hud_count, car_model, au "LKAS_ICON_COLOR": color, "CAR_MODEL": car_model, "LKAS_LANE_LINES": lines, - "LKAS_ALERTS": alerts, + "LKAS_ALERTS": alerts if CP.carFingerprint not in CUSW_CARS else 0, # TODO: HUD behavior not yet understood for CUSW } if CP.carFingerprint in RAM_CARS: diff --git a/opendbc/dbc/chrysler_cusw.dbc b/opendbc/dbc/chrysler_cusw.dbc index d1aaf0d5033..9379cad6cca 100644 --- a/opendbc/dbc/chrysler_cusw.dbc +++ b/opendbc/dbc/chrysler_cusw.dbc @@ -128,11 +128,17 @@ BO_ 762 CRUISE_BUTTONS: 3 XXX SG_ CHECKSUM : 23|8@0+ (1,0) [0|1] "" XXX BO_ 484 BRAKE_1: 8 XXX - SG_ BRAKE_PSI : 7|12@0+ (1,0) [0|1] "" XXX + SG_ DRIVER_BRAKE_PRESSURE : 7|12@0+ (1,0) [0|1] "" XXX SG_ VEHICLE_SPEED : 35|12@0+ (0.0174,0) [0|4095] "m/s" XXX SG_ COUNTER : 51|4@0+ (1,0) [0|1] "" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|1] "" XXX +BO_ 488 BRAKE_3: 5 XXX + SG_ DRIVER_BRAKE_UNKNOWN : 17|1@0+ (1,0) [0|1] "" XXX + SG_ DRIVER_BRAKE_SWITCH : 18|1@0+ (1,0) [0|1] "" XXX + SG_ COUNTER : 27|4@0+ (1,0) [0|15] "" XXX + SG_ CHECKSUM : 39|8@0+ (1,0) [0|255] "" XXX + BO_ 500 GEARBOX_1: 7 XXX SG_ DESIRED_GEAR : 35|4@0+ (1,0) [0|1] "" XXX SG_ ACTUAL_GEAR : 39|4@0+ (1,0) [0|1] "" XXX diff --git a/opendbc/safety/modes/chrysler_cusw.h b/opendbc/safety/modes/chrysler_cusw.h index b173b0df2a4..a9fb94601e1 100644 --- a/opendbc/safety/modes/chrysler_cusw.h +++ b/opendbc/safety/modes/chrysler_cusw.h @@ -12,7 +12,7 @@ static safety_config chrysler_cusw_init(uint16_t param) { static RxCheck chrysler_cusw_rx_checks[] = { {.msg = {{0x1E4U, 0, 8, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, - {.msg = {{0x2E2U, 0, 8, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{0x1E8U, 0, 5, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, {.msg = {{0x1ECU, 0, 8, 100U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, {.msg = {{0x1FEU, 0, 5, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, {.msg = {{0x2ECU, 0, 8, 50U, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, @@ -45,9 +45,9 @@ static void chrysler_cusw_rx_hook(const CANPacket_t *msg) { gas_pressed = msg->data[1] != 0U; } - if (msg->addr == 0x2E2U) { - // Signal: BRAKE_2.BRAKE_HUMAN - brake_pressed = GET_BIT(msg, 9U); + if (msg->addr == 0x1E8U) { + // Signal: BRAKE_3.DRIVER_BRAKE_SWITCH + brake_pressed = GET_BIT(msg, 18U); } } } diff --git a/opendbc/safety/tests/test_chrysler_cusw.py b/opendbc/safety/tests/test_chrysler_cusw.py index 3477853f66f..3fe78c625f0 100644 --- a/opendbc/safety/tests/test_chrysler_cusw.py +++ b/opendbc/safety/tests/test_chrysler_cusw.py @@ -41,8 +41,8 @@ def _user_gas_msg(self, gas): return self.packer.make_can_msg_safety("ACCEL_GAS", 0, values) def _user_brake_msg(self, brake): - values = {"BRAKE_HUMAN": 1 if brake else 0} - return self.packer.make_can_msg_safety("BRAKE_2", 0, values) + values = {"DRIVER_BRAKE_SWITCH": 1 if brake else 0} + return self.packer.make_can_msg_safety("BRAKE_3", 0, values) def _torque_meas_msg(self, torque): values = {"TORQUE_MOTOR": torque} From 0287df5885fc132155f9dd5ee4f853376baaf6af Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Sat, 28 Mar 2026 18:04:17 -0700 Subject: [PATCH 189/229] VW MLB: Migrate to new turn signal message (#3252) * add reverse-engineered BCM message for turn signals * migrate VW MLB to the new turn signal message --- opendbc/car/volkswagen/carstate.py | 4 ++-- opendbc/dbc/vw_mlb.dbc | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/opendbc/car/volkswagen/carstate.py b/opendbc/car/volkswagen/carstate.py index a43a16651f3..c4838d30387 100644 --- a/opendbc/car/volkswagen/carstate.py +++ b/opendbc/car/volkswagen/carstate.py @@ -259,8 +259,8 @@ def update_mlb(self, pt_cp, cam_cp, ext_cp) -> structs.CarState: ret.parkingBrake = bool(pt_cp.vl["Kombi_01"]["KBI_Handbremse"]) ret.espDisabled = pt_cp.vl["ESP_01"]["ESP_Tastung_passiv"] != 0 - ret.leftBlinker, ret.rightBlinker = self.update_blinker_from_stalk(300, pt_cp.vl["Gateway_11"]["BH_Blinker_li"], - pt_cp.vl["Gateway_11"]["BH_Blinker_re"]) + ret.leftBlinker = bool(pt_cp.vl["BCM"]["BLINKER_LEFT"]) + ret.rightBlinker = bool(pt_cp.vl["BCM"]["BLINKER_RIGHT"]) ret.seatbeltUnlatched = pt_cp.vl["Gateway_06"]["AB_Gurtschloss_FA"] != 3 ret.doorOpen = any([pt_cp.vl["Gateway_05"]["FT_Tuer_geoeffnet"], diff --git a/opendbc/dbc/vw_mlb.dbc b/opendbc/dbc/vw_mlb.dbc index 9afda9cb145..145b975e808 100644 --- a/opendbc/dbc/vw_mlb.dbc +++ b/opendbc/dbc/vw_mlb.dbc @@ -1758,6 +1758,13 @@ BO_ 1716 VIN_01: 8 Gateway_D4C7 BO_ 1414 Waehlhebel_02: 8 Getriebe_AL551_951_D4_C7 SG_ WH_KD_Fehler : 63|1@1+ (1.0,0.0) [0.0|1] "" Gateway_D4C7 +BO_ 1318 BCM: 8 XXX + SG_ INVERTED_BLINKER_ACTIVE : 4|1@0+ (1,0) [0|1] "" XXX + SG_ TURNSTALK_LEFT : 26|1@0+ (1,0) [0|1] "" XXX + SG_ TURNSTALK_RIGHT : 27|1@0+ (1,0) [0|1] "" XXX + SG_ BLINKER_LEFT : 34|1@0+ (1,0) [0|1] "" XXX + SG_ BLINKER_RIGHT : 35|1@0+ (1,0) [0|1] "" XXX + SG_ UNKNOWN_DRIVER_DOOR_RELATED : 43|1@0+ (1,0) [0|1] "" XXX VAL_ 159 EPS_HCA_Status 0 "disabled" 1 "initializing" 2 "fault" 3 "ready" 4 "rejected" 5 "active" ; VAL_ 269 ACC_Freigabe_Momentenanf 0 "Momanf_nicht_freigegeben" 1 "Momanf_freigegeben" ; From 65f2f240b374a613a6d5c6a9d4e465f8774a50b5 Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Sat, 28 Mar 2026 18:30:08 -0700 Subject: [PATCH 190/229] VW MLB: Migrate to alternate signal for driver's seatbelt (#3253) VW MLB: Migrate to alternate driver-seatbelt signal --- opendbc/car/volkswagen/carstate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendbc/car/volkswagen/carstate.py b/opendbc/car/volkswagen/carstate.py index c4838d30387..050aeeb7915 100644 --- a/opendbc/car/volkswagen/carstate.py +++ b/opendbc/car/volkswagen/carstate.py @@ -262,7 +262,7 @@ def update_mlb(self, pt_cp, cam_cp, ext_cp) -> structs.CarState: ret.leftBlinker = bool(pt_cp.vl["BCM"]["BLINKER_LEFT"]) ret.rightBlinker = bool(pt_cp.vl["BCM"]["BLINKER_RIGHT"]) - ret.seatbeltUnlatched = pt_cp.vl["Gateway_06"]["AB_Gurtschloss_FA"] != 3 + ret.seatbeltUnlatched = bool(pt_cp.vl["Airbag_01"]["AB_Gurtwarn_VF"]) ret.doorOpen = any([pt_cp.vl["Gateway_05"]["FT_Tuer_geoeffnet"], pt_cp.vl["Gateway_05"]["BT_Tuer_geoeffnet"], pt_cp.vl["Gateway_05"]["HL_Tuer_geoeffnet"], From 8a3a9e11743a03bc2a3e2130716d1f69786b10d8 Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Sat, 28 Mar 2026 22:33:00 -0700 Subject: [PATCH 191/229] Honda: HUD and DBC updates (#3254) * Honda: Stop abusing LKAS_PROBLEM * Honda: Add TJA variant of low speed lockout --- opendbc/car/honda/carcontroller.py | 3 +-- opendbc/car/honda/hondacan.py | 3 +-- opendbc/dbc/generator/honda/_bosch_2018.dbc | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/opendbc/car/honda/carcontroller.py b/opendbc/car/honda/carcontroller.py index 4319b5c2808..d08a191a1bc 100644 --- a/opendbc/car/honda/carcontroller.py +++ b/opendbc/car/honda/carcontroller.py @@ -225,9 +225,8 @@ def update(self, CC, CS, now_nanos): hud_control, hud_v_cruise, CS.is_metric, CS.acc_hud)) steering_available = CS.out.cruiseState.available and CS.out.vEgo > self.CP.minSteerSpeed - reduced_steering = CS.out.steeringPressed can_sends.extend(hondacan.create_lkas_hud(self.packer, self.CAN.lkas, self.CP, hud_control, CC.latActive, - steering_available, reduced_steering, alert_steer_required, CS.lkas_hud)) + steering_available, alert_steer_required, CS.lkas_hud)) if self.CP.openpilotLongitudinalControl: # TODO: combining with create_acc_hud block above will change message order and will need replay logs regenerated diff --git a/opendbc/car/honda/hondacan.py b/opendbc/car/honda/hondacan.py index 34364c20898..aadee2b9319 100644 --- a/opendbc/car/honda/hondacan.py +++ b/opendbc/car/honda/hondacan.py @@ -165,7 +165,7 @@ def create_acc_hud(packer, bus, CP, enabled, pcm_speed, pcm_accel, hud_control, return packer.make_can_msg("ACC_HUD", bus, acc_hud_values) -def create_lkas_hud(packer, bus, CP, hud_control, lat_active, steering_available, reduced_steering, alert_steer_required, lkas_hud): +def create_lkas_hud(packer, bus, CP, hud_control, lat_active, steering_available, alert_steer_required, lkas_hud): commands = [] lkas_hud_values = { @@ -194,7 +194,6 @@ def create_lkas_hud(packer, bus, CP, hud_control, lat_active, steering_available if CP.carFingerprint in HONDA_BOSCH_ALT_RADAR: lkas_hud_values['DASHED_LANES'] = steering_available lkas_hud_values['SOLID_LANES'] = lat_active - lkas_hud_values['LKAS_PROBLEM'] = lat_active and reduced_steering if CP.flags & HondaFlags.BOSCH_EXT_HUD and not CP.openpilotLongitudinalControl: commands.append(packer.make_can_msg('LKAS_HUD_A', bus, lkas_hud_values)) diff --git a/opendbc/dbc/generator/honda/_bosch_2018.dbc b/opendbc/dbc/generator/honda/_bosch_2018.dbc index d5171fdefa0..796bda17b4e 100644 --- a/opendbc/dbc/generator/honda/_bosch_2018.dbc +++ b/opendbc/dbc/generator/honda/_bosch_2018.dbc @@ -212,7 +212,7 @@ CM_ SG_ 577 LINE_DASHED "1 = line is dashed"; CM_ SG_ 577 LINE_SOLID "1 = line is solid"; VAL_ 228 CONTROL_STATE 0 "init" 1 "standby" 2 "lka_active" 3 "driver_override" 5 "rdm_active"; -VAL_ 399 STEER_STATUS 6 "tmp_fault" 5 "fault_1" 4 "no_torque_alert_2" 3 "low_speed_lockout" 2 "no_torque_alert_1" 0 "normal"; +VAL_ 399 STEER_STATUS 6 "tmp_fault" 5 "fault_1" 4 "no_torque_alert_2" 3 "low_speed_lockout" 2 "no_torque_alert_1" 1 "tja_low_speed_lockout" 0 "normal"; VAL_ 662 CRUISE_BUTTONS 7 "tbd" 6 "tbd" 5 "tbd" 4 "accel_res" 3 "decel_set" 2 "cancel" 1 "main" 0 "none" ; VAL_ 662 CRUISE_SETTING 3 "distance_adj" 2 "tbd" 1 "lkas_button" 0 "none" ; VAL_ 806 CMBS_STATES 3 "pressed" 0 "released" ; From c9f2ab30cc4ae3f39dd1d62909959616802cd65c Mon Sep 17 00:00:00 2001 From: Lukas Heintz <61192133+lukasloetkolben@users.noreply.github.com> Date: Sat, 28 Mar 2026 22:59:37 -0700 Subject: [PATCH 192/229] Rivian: Generation 2 Support (#3227) * Rivian Gen2 * ESP_AebFb for brake * Fixing messages * Revert "Fixing messages" This reverts commit 10f01a36b485fe2f368736b448dedb1dcc72415d. * Revert "ESP_AebFb for brake" This reverts commit 11520da4f387efbc1e8fe0155a6680cfe81b7137. * Reapply "ESP_AebFb for brake" This reverts commit 58c8f23e9e75654f8c1615f4a2c9f6a50b9ae783. * 90deg fault prevention * VDM_AdasSts send all messages * vl_all for VDM_AdasSts to send all frames * torque fault signal and zero torque when inactive * fix StopIteration when vl_all is empty * not needed * update fault prevention * zip it up * fault avoidance part 2 * no need to send elk * 250 angle frames * 95 angle frames * 92 angle frames * 92 angle frames * 89 frames are the maximum * own counter for adas status * fix adas status loop * reduce diff & clean up * add tests back * use vl_all for VDM_AdasSts * Apply suggestion from @sshane Co-authored-by: Shane Smiskol * Apply suggestion from @sshane Co-authored-by: Shane Smiskol * try to engage sub 20mph * Revert "try to engage sub 20mph" This reverts commit e93961fd3a8e484cc4cb3b727116d55cb7038b3d. * ACM_lkaToiFlt = 0 is needed for fault prevention * no torque during torque_fault is important * reduce diff * reduce diff * reduce diff * remove fw for gen2 Co-authored-by: elkoled * add test route for gen2 Co-authored-by: elkoled * remove fault avoidance and merge it as a standalone Co-authored-by: elkoled * fix ruff line too long Co-authored-by: elkoled * Update opendbc/car/rivian/carstate.py Co-authored-by: Adeeb Shihadeh * GEN2 as a Flag * RIVIAN_R1 * add rivian 2026 VIN --------- Co-authored-by: Shane Smiskol Co-authored-by: elkoled Co-authored-by: Adeeb Shihadeh --- opendbc/car/rivian/carcontroller.py | 4 ++-- opendbc/car/rivian/carstate.py | 18 ++++++++++-------- opendbc/car/rivian/fingerprints.py | 4 ++-- opendbc/car/rivian/interface.py | 6 +++++- opendbc/car/rivian/tests/test_rivian.py | 2 +- opendbc/car/rivian/values.py | 22 +++++++++++++--------- opendbc/car/tests/routes.py | 3 ++- opendbc/car/torque_data/override.toml | 2 +- 8 files changed, 36 insertions(+), 25 deletions(-) diff --git a/opendbc/car/rivian/carcontroller.py b/opendbc/car/rivian/carcontroller.py index 13e7f5cb019..01785813b6f 100644 --- a/opendbc/car/rivian/carcontroller.py +++ b/opendbc/car/rivian/carcontroller.py @@ -4,7 +4,7 @@ from opendbc.car.lateral import apply_driver_steer_torque_limits from opendbc.car.interfaces import CarControllerBase from opendbc.car.rivian.riviancan import create_lka_steering, create_longitudinal, create_wheel_touch, create_adas_status -from opendbc.car.rivian.values import CarControllerParams +from opendbc.car.rivian.values import CarControllerParams, RivianFlags class CarController(CarControllerBase): @@ -31,7 +31,7 @@ def update(self, CC, CS, now_nanos): self.apply_torque_last = apply_torque can_sends.append(create_lka_steering(self.packer, self.frame, CS.acm_lka_hba_cmd, apply_torque, CC.enabled, CC.latActive)) - if self.frame % 5 == 0: + if self.frame % 5 == 0 and not (self.CP.flags & RivianFlags.GEN2): can_sends.append(create_wheel_touch(self.packer, CS.sccm_wheel_touch, CC.enabled)) # Longitudinal control diff --git a/opendbc/car/rivian/carstate.py b/opendbc/car/rivian/carstate.py index fe644305893..f867f2abd73 100644 --- a/opendbc/car/rivian/carstate.py +++ b/opendbc/car/rivian/carstate.py @@ -2,7 +2,7 @@ from opendbc.can import CANParser from opendbc.car import Bus, structs from opendbc.car.interfaces import CarStateBase -from opendbc.car.rivian.values import DBC, GEAR_MAP +from opendbc.car.rivian.values import DBC, GEAR_MAP, RivianFlags from opendbc.car.common.conversions import Conversions as CV GearShifter = structs.CarState.GearShifter @@ -70,16 +70,18 @@ def update(self, can_parsers) -> structs.CarState: # Gear ret.gearShifter = GEAR_MAP.get(int(cp.vl["VDM_PropStatus"]["VDM_Prndl_Status"]), GearShifter.unknown) - # Doors - ret.doorOpen = any(cp_adas.vl["IndicatorLights"][door] != 2 for door in ("RearDriverDoor", "FrontPassengerDoor", "DriverDoor", "RearPassengerDoor")) + # Doors and seatbelt + # GEN2 has no CAN signal for these, but stock ACC already handles disengaging + # door locks prevent opening while driving + # on standstill, stock ACC disengages when a door is opened or seatbelt is unbuckled + if not (self.CP.flags & RivianFlags.GEN2): + ret.doorOpen = any(cp_adas.vl["IndicatorLights"][door] != 2 for door in ("RearDriverDoor", "FrontPassengerDoor", "DriverDoor", "RearPassengerDoor")) + ret.seatbeltUnlatched = cp.vl["RCM_Status"]["RCM_Status_IND_WARN_BELT_DRIVER"] != 0 # Blinkers ret.leftBlinker = cp_adas.vl["IndicatorLights"]["TurnLightLeft"] in (1, 2) ret.rightBlinker = cp_adas.vl["IndicatorLights"]["TurnLightRight"] in (1, 2) - # Seatbelt - ret.seatbeltUnlatched = cp.vl["RCM_Status"]["RCM_Status_IND_WARN_BELT_DRIVER"] != 0 - # Blindspot # ret.leftBlindspot = False # ret.rightBlindspot = False @@ -89,8 +91,8 @@ def update(self, can_parsers) -> structs.CarState: # Messages needed by carcontroller self.acm_lka_hba_cmd = copy.copy(cp_cam.vl["ACM_lkaHbaCmd"]) - self.sccm_wheel_touch = copy.copy(cp.vl["SCCM_WheelTouch"]) - + if not (self.CP.flags & RivianFlags.GEN2): + self.sccm_wheel_touch = copy.copy(cp.vl["SCCM_WheelTouch"]) # This message can lag and send two messages at once, make sure we forward all of them adas_status_msgs = cp.vl_all["VDM_AdasSts"] self.vdm_adas_status = [dict(zip(adas_status_msgs, vals, strict=True)) for vals in zip(*adas_status_msgs.values(), strict=True)] diff --git a/opendbc/car/rivian/fingerprints.py b/opendbc/car/rivian/fingerprints.py index bc58d971502..fe8b1b0b747 100644 --- a/opendbc/car/rivian/fingerprints.py +++ b/opendbc/car/rivian/fingerprints.py @@ -5,10 +5,10 @@ Ecu = CarParams.Ecu FW_VERSIONS = { - CAR.RIVIAN_R1_GEN1: { + CAR.RIVIAN_R1: { (Ecu.eps, 0x733, None): [ b'R1TS_v3.4.1(51),3.4.1\x00', b'R1TS_v4.4.1(63),4.4.1\x00', ], }, -} +} \ No newline at end of file diff --git a/opendbc/car/rivian/interface.py b/opendbc/car/rivian/interface.py index d3acef1cc3d..64aed29e9c7 100644 --- a/opendbc/car/rivian/interface.py +++ b/opendbc/car/rivian/interface.py @@ -3,7 +3,7 @@ from opendbc.car.rivian.carcontroller import CarController from opendbc.car.rivian.carstate import CarState from opendbc.car.rivian.radar_interface import RadarInterface -from opendbc.car.rivian.values import RivianSafetyFlags +from opendbc.car.rivian.values import RivianFlags, RivianSafetyFlags class CarInterface(CarInterfaceBase): @@ -17,6 +17,10 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo ret.safetyConfigs = [get_safety_config(structs.CarParams.SafetyModel.rivian)] + # GEN2 (2025+) doesn't have SCCM_WheelTouch on the bus + if 0x321 not in fingerprint[0]: + ret.flags |= RivianFlags.GEN2.value + ret.steerActuatorDelay = 0.15 ret.steerLimitTimer = 0.4 CarInterfaceBase.configure_torque_tune(candidate, ret.lateralTuning) diff --git a/opendbc/car/rivian/tests/test_rivian.py b/opendbc/car/rivian/tests/test_rivian.py index 90dcfcd5dd3..7780638d37b 100644 --- a/opendbc/car/rivian/tests/test_rivian.py +++ b/opendbc/car/rivian/tests/test_rivian.py @@ -19,5 +19,5 @@ def test_custom_fuzzy_fingerprinting(self, subtests): vin = "".join(vin) matches = FW_QUERY_CONFIG.match_fw_to_car_fuzzy({}, vin, FW_VERSIONS) - should_match = year != ModelYear.S_2025 and not bad + should_match = year in platform.config.years and not bad assert (matches == {platform}) == should_match, "Bad match" diff --git a/opendbc/car/rivian/values.py b/opendbc/car/rivian/values.py index 1686a3f6eef..f632da8441f 100644 --- a/opendbc/car/rivian/values.py +++ b/opendbc/car/rivian/values.py @@ -22,6 +22,7 @@ class ModelYear(StrEnum): P_2023 = "P" R_2024 = "R" S_2025 = "S" + T_2026 = "T" @dataclass @@ -39,17 +40,24 @@ class RivianPlatformConfig(PlatformConfig): years: set[ModelYear] = field(default_factory=set) +class RivianFlags(IntFlag): + GEN2 = 1 + + +class RivianSafetyFlags(IntFlag): + LONG_CONTROL = 1 + + class CAR(Platforms): - RIVIAN_R1_GEN1 = RivianPlatformConfig( - # TODO: verify this + RIVIAN_R1 = RivianPlatformConfig( [ - RivianCarDocs("Rivian R1S 2022-24"), - RivianCarDocs("Rivian R1T 2022-24"), + RivianCarDocs("Rivian R1S 2022-25"), + RivianCarDocs("Rivian R1T 2022-25"), ], CarSpecs(mass=3206., wheelbase=3.08, steerRatio=15.2), wmis={WMI.RIVIAN_TRUCK, WMI.RIVIAN_MPV}, lines={ModelLine.R1T, ModelLine.R1S}, - years={ModelYear.N_2022, ModelYear.P_2023, ModelYear.R_2024}, + years={ModelYear.N_2022, ModelYear.P_2023, ModelYear.R_2024, ModelYear.S_2025}, ) @@ -131,8 +139,4 @@ def __init__(self, CP): pass -class RivianSafetyFlags(IntFlag): - LONG_CONTROL = 1 - - DBC = CAR.create_dbc_map() diff --git a/opendbc/car/tests/routes.py b/opendbc/car/tests/routes.py index 420e75d9b37..d08e86d4d6b 100644 --- a/opendbc/car/tests/routes.py +++ b/opendbc/car/tests/routes.py @@ -338,7 +338,8 @@ class CarTestRoute(NamedTuple): CarTestRoute("6a7075a4fdd765ee/0000004e--1f612006dd", PSA.PSA_PEUGEOT_208), - CarTestRoute("bc095dc92e101734/000000db--ee9fe46e57", RIVIAN.RIVIAN_R1_GEN1), + CarTestRoute("bc095dc92e101734/000000db--ee9fe46e57", RIVIAN.RIVIAN_R1), + CarTestRoute("c70d59e4150956fc/0000006e--48bfbfda01", RIVIAN.RIVIAN_R1), # GEN2 CarTestRoute("7dc058789994da80/00000112--adb970f6a8", TESLA.TESLA_MODEL_3), CarTestRoute("c8a98e58647765ad/00000002--84e4746136", TESLA.TESLA_MODEL_Y), diff --git a/opendbc/car/torque_data/override.toml b/opendbc/car/torque_data/override.toml index a7e4c124222..0010218f75c 100644 --- a/opendbc/car/torque_data/override.toml +++ b/opendbc/car/torque_data/override.toml @@ -80,7 +80,7 @@ legend = ["LAT_ACCEL_FACTOR", "MAX_LAT_ACCEL_MEASURED", "FRICTION"] "GENESIS_GV70_ELECTRIFIED_1ST_GEN" = [1.9, 1.9, 0.09] "GENESIS_G80_2ND_GEN_FL" = [2.5819356441497803, 2.5, 0.11244568973779678] # Note that some Rivians achieve significantly less lateral acceleration than this -"RIVIAN_R1_GEN1" = [2.8, 2.5, 0.07] +"RIVIAN_R1" = [2.8, 2.5, 0.07] "HYUNDAI_NEXO_1ST_GEN" = [2.5, 2.5, 0.1] "HONDA_ACCORD_11G" = [1.35, 1.35, 0.17] "HONDA_PILOT_4G" = [1.25, 1.25, 0.21] From 3cb9a2db15c220d0f6be5979b1bbbaab93116a19 Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Sat, 28 Mar 2026 23:16:27 -0700 Subject: [PATCH 193/229] VW MLB: Get door state and gearshift position from PT CAN (#3255) --- opendbc/car/volkswagen/carstate.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/opendbc/car/volkswagen/carstate.py b/opendbc/car/volkswagen/carstate.py index 050aeeb7915..8c143ed2405 100644 --- a/opendbc/car/volkswagen/carstate.py +++ b/opendbc/car/volkswagen/carstate.py @@ -46,11 +46,12 @@ def update(self, can_parsers) -> structs.CarState: pt_cp = can_parsers[Bus.pt] cam_cp = can_parsers[Bus.cam] ext_cp = pt_cp if self.CP.networkLocation == NetworkLocation.fwdCamera else cam_cp + alt_cp = can_parsers[Bus.alt] if self.CP.flags & VolkswagenFlags.PQ: return self.update_pq(pt_cp, cam_cp, ext_cp) elif self.CP.flags & VolkswagenFlags.MLB: - return self.update_mlb(pt_cp, cam_cp, ext_cp) + return self.update_mlb(pt_cp, cam_cp, ext_cp, alt_cp) ret = structs.CarState() @@ -230,7 +231,7 @@ def update_pq(self, pt_cp, cam_cp, ext_cp) -> structs.CarState: self.frame += 1 return ret - def update_mlb(self, pt_cp, cam_cp, ext_cp) -> structs.CarState: + def update_mlb(self, pt_cp, cam_cp, ext_cp, alt_cp) -> structs.CarState: ret = structs.CarState() self.parse_wheel_speeds(ret, @@ -241,7 +242,7 @@ def update_mlb(self, pt_cp, cam_cp, ext_cp) -> structs.CarState: ) ret.gasPressed = pt_cp.vl["Motor_03"]["MO_Fahrpedalrohwert_01"] > 0 - ret.gearShifter = self.parse_gear_shifter(self.CCP.shifter_values.get(pt_cp.vl["Getriebe_03"]["GE_Waehlhebel"], None)) + ret.gearShifter = self.parse_gear_shifter(self.CCP.shifter_values.get(alt_cp.vl["Getriebe_03"]["GE_Waehlhebel"], None)) # ACC okay but disabled (1), ACC ready (2), a radar visibility or other fault/disruption (6 or 7) # currently regulating speed (3), driver accel override (4), brake only (5) @@ -263,10 +264,10 @@ def update_mlb(self, pt_cp, cam_cp, ext_cp) -> structs.CarState: ret.rightBlinker = bool(pt_cp.vl["BCM"]["BLINKER_RIGHT"]) ret.seatbeltUnlatched = bool(pt_cp.vl["Airbag_01"]["AB_Gurtwarn_VF"]) - ret.doorOpen = any([pt_cp.vl["Gateway_05"]["FT_Tuer_geoeffnet"], - pt_cp.vl["Gateway_05"]["BT_Tuer_geoeffnet"], - pt_cp.vl["Gateway_05"]["HL_Tuer_geoeffnet"], - pt_cp.vl["Gateway_05"]["HR_Tuer_geoeffnet"]]) + ret.doorOpen = any([alt_cp.vl["Gateway_05"]["FT_Tuer_geoeffnet"], + alt_cp.vl["Gateway_05"]["BT_Tuer_geoeffnet"], + alt_cp.vl["Gateway_05"]["HL_Tuer_geoeffnet"], + alt_cp.vl["Gateway_05"]["HR_Tuer_geoeffnet"]]) # Consume blind-spot monitoring info/warning LED states, if available. # Infostufe: BSM LED on, Warnung: BSM LED flashing @@ -317,7 +318,7 @@ def get_can_parsers(CP): return CarState.get_can_parsers_pq(CP) # manually configure some optional and variable-rate/edge-triggered messages - pt_messages, cam_messages = [], [] + pt_messages, cam_messages, alt_messages = [], [], [] if not CP.flags & VolkswagenFlags.MLB: pt_messages += [ @@ -331,6 +332,7 @@ def get_can_parsers(CP): return { Bus.pt: CANParser(DBC[CP.carFingerprint][Bus.pt], pt_messages, CanBus(CP).pt), Bus.cam: CANParser(DBC[CP.carFingerprint][Bus.pt], cam_messages, CanBus(CP).cam), + Bus.alt: CANParser(DBC[CP.carFingerprint][Bus.pt], alt_messages, CanBus(CP).alt), } @staticmethod @@ -338,4 +340,5 @@ def get_can_parsers_pq(CP): return { Bus.pt: CANParser(DBC[CP.carFingerprint][Bus.pt], [], CanBus(CP).pt), Bus.cam: CANParser(DBC[CP.carFingerprint][Bus.pt], [], CanBus(CP).cam), + Bus.alt: CANParser(DBC[CP.carFingerprint][Bus.pt], [], CanBus(CP).alt), } From f8f0ead129275927767ae80af83f597178901e61 Mon Sep 17 00:00:00 2001 From: MVL Date: Sun, 29 Mar 2026 03:13:00 -0400 Subject: [PATCH 194/229] Honda: Acura MDX 2022 - 2024 (#2410) * Add 2022 MDX fingerprints * Add 4G MDX * Add MDX 2022 values * fall back to dashed lines when cruise enable, matching stock ACC * hide lines at steer max * Revert "hide lines at steer max" This reverts commit 481b7997a0408e22680f9ff8e61f1a148bbf01a7. * hide lines at steer max - using steer_restricted bool * use steer_restricted bool in hondacan * revise lane line logic to rely on openpilot signals * Honda: Bosch alternate radar support * add that * Add wheeljerk lkas mitigation * fix - duplicate import * backout lkas ui changes - move to separate PR * whitespace fix * Revert "revise lane line logic to rely on openpilot signals" This reverts commit f4062735e8112cf219069a4b40495508d4032c2e. * Revert "hide lines at steer max - using steer_restricted bool" This reverts commit c7b85f4980a7ed0031533e498b12fa3b5e52d10c. * show dashed lines at steermax or steerFaultTemporary * revise ui fieldname to show_dashed_lines * adding dashed lane lines * comment spelling fix * try CS.out * whitespace fix * more fixes * more typofixes * try more CS.out * update MDX values * Revert "Add 4G MDX" This reverts commit a6596fb39548dc13307a2da64ec7028c999fc7a4. * revert cleanup * add bosch adas 2022 * reference new bosch_adas_2022 * copy canfd common to 2022 mdx * repoint to 2022 MDX * repoint torque data * temporarily ignore test route * Revert "copy canfd common to 2022 mdx" - wrong file This reverts commit 0ae265e9143c107c03a9d844aa213ee142b39cc7. * copy canfd common to mdx 2022 * repack flags * repoint ADAS after DBC refactor * Revert "add bosch adas 2022" - not needed after ADAS refactor This reverts commit 3fdf9d5e67caa9e9a11b06b754e231c0bce29588. * Revert "try more CS.out" This reverts commit a9b29256e7ffb17e4d2eb9aabfa8340cf997eea2. * Revert "more typofixes" This reverts commit 8950f4773b736efc77f5edfe195ff4c4fe4d96f0. * Revert "more fixes" This reverts commit 97d901bf251c82d2fba90f7bb05536dd789f4b57. * Revert "whitespace fix" This reverts commit 01685c5002300f63d2f67dcca19b50976299a1ae. * Revert "try CS.out" This reverts commit 7f3c640171893ba55bbdb5c58d9686cbcc5290f5. * manually revert custom LKAS code - will be separate PR * manually revert custom LKAS code - will be separate PR * whitespace fix * try steer to zero * rename steertozero * Add 8-byte-lkas to safety * remove substitute torque * torque data from recent test log * Adding MDX testroute * Restrict steer_down_to_zero to MDX only * Adding fingerprint to steering_control for MDX steer_to_zero * different syntax * Update steerratio * whitespace fix * merge typo fix * removing 21MDX from community list * enable TJA control flag * Add 2024 MDX * Add 2024 MDX to values * Move 2024 MDX to supported * remove ALT_RADAR * Add MDX to alt_brake autodetect * Add dynamic units to TJA control * Syntax fix * label fix * unnecessary backslash * add lowspeed status for TJA * Add TJA lowspeed lockout to carstate exception * line too long * updating to newer test route * Revise accFaulted to use BRAKE_MODULE * Update message to accFaulted * Add fingerprint for 2022 MDX Advance trim * 4G MDX does not send EPS and VSA fingerprints without Comma Power * Add traffic jam assist footnote * Adding comma power fingerprints for 2022 Advance trim * Add 2023 to Acura MDX * Remove 23 MDX from community * point 4G MDX to canfd dbc * Delete opendbc/dbc/generator/honda/acura_mdx_2022_can.dbc * increase 4G MDX to 3840 steer * Clear out TJA * Remove TRAFFIC_JAM_ASSIST * Remote TJA * whitespace fix * Update Acura MDX 4G steering speed documentation * typo fix * align whitespace * Restrict ALT_RADAR - causes HUD blinking * Don't use ALT adar * update to newer test route * update to current testroute torque parameters * Update to testroute learned torque parameters * oops * revert back to ALT_RADAR after removing LKAS_PROBLEM * update torque values from latest test route --------- Co-authored-by: Jason Young --- opendbc/car/extra_cars.py | 1 - opendbc/car/honda/carstate.py | 9 +++++- opendbc/car/honda/fingerprints.py | 43 +++++++++++++++++++++++++++ opendbc/car/honda/interface.py | 5 ++-- opendbc/car/honda/values.py | 12 ++++++-- opendbc/car/tests/routes.py | 1 + opendbc/car/torque_data/override.toml | 1 + opendbc/safety/modes/honda.h | 2 +- 8 files changed, 67 insertions(+), 7 deletions(-) diff --git a/opendbc/car/extra_cars.py b/opendbc/car/extra_cars.py index a4924675523..1c8ac68827d 100644 --- a/opendbc/car/extra_cars.py +++ b/opendbc/car/extra_cars.py @@ -42,7 +42,6 @@ class CAR(Platforms): CommunityCarDocs("Acura MDX 2015-16", "Advance Package"), CommunityCarDocs("Acura MDX 2017-20"), CommunityCarDocs("Acura MDX Hybrid 2017-20"), - CommunityCarDocs("Acura MDX 2022-24"), CommunityCarDocs("Acura RDX 2022-25"), CommunityCarDocs("Acura RLX 2017", "Advance Package or Technology Package"), CommunityCarDocs("Acura TLX 2015-17", "Advance Package"), diff --git a/opendbc/car/honda/carstate.py b/opendbc/car/honda/carstate.py index fd61ca35f6b..ee402a1cf80 100644 --- a/opendbc/car/honda/carstate.py +++ b/opendbc/car/honda/carstate.py @@ -109,6 +109,10 @@ def update(self, can_parsers) -> structs.CarState: # FIXME: the stock camera stops steering on NO_TORQUE_ALERT_1 ret.steerFaultTemporary = steer_status not in ("NORMAL", "LOW_SPEED_LOCKOUT", "NO_TORQUE_ALERT_2") + if (self.CP.carFingerprint == CAR.ACURA_MDX_4G) and (steer_status == "TJA_LOW_SPEED_LOCKOUT"): + ret.steerFaultPermanent = False + ret.steerFaultTemporary = False + # All Honda EPS cut off slightly above standstill, some much higher # Don't alert in the near-standstill range, but alert for per-vehicle configured minimums above that if CarControllerParams.STEER_GLOBAL_MIN_SPEED < ret.vEgo < (self.CP.minSteerSpeed + 0.5): @@ -122,7 +126,10 @@ def update(self, can_parsers) -> structs.CarState: ret.accFaulted = bool(cp.vl["CRUISE_FAULT_STATUS"]["CRUISE_FAULT"]) else: if self.CP.openpilotLongitudinalControl: - ret.accFaulted = bool(cp.vl[self.brake_error_msg]["BRAKE_ERROR_1"] or cp.vl[self.brake_error_msg]["BRAKE_ERROR_2"]) + if (self.CP.carFingerprint == CAR.ACURA_MDX_4G) and (self.CP.flags & HondaFlags.BOSCH_ALT_BRAKE): + ret.accFaulted = bool(cp.vl["BRAKE_MODULE"]["CRUISE_FAULT"]) + else: + ret.accFaulted = bool(cp.vl[self.brake_error_msg]["BRAKE_ERROR_1"] or cp.vl[self.brake_error_msg]["BRAKE_ERROR_2"]) # Log non-critical stock ACC/LKAS faults if Nidec (camera) if self.CP.carFingerprint not in HONDA_BOSCH: diff --git a/opendbc/car/honda/fingerprints.py b/opendbc/car/honda/fingerprints.py index 5361b1da905..0d49dd109af 100644 --- a/opendbc/car/honda/fingerprints.py +++ b/opendbc/car/honda/fingerprints.py @@ -527,6 +527,49 @@ b'36161-TDK-J530\x00\x00', ], }, + CAR.ACURA_MDX_4G: { + (Ecu.gateway, 0x18daeff1, None): [ + b'38897-TYA-A010\x00\x00', + b'38897-TYB-A010\x00\x00', + b'38897-TYC-A010\x00\x00', + ], + (Ecu.eps, 0x18da30f1, None): [ + b'39990-TYA-A070\x00\x00', + b'39990-TYA-A080\x00\x00', + b'39990-TYB-A020\x00\x00', + ], + (Ecu.srs, 0x18da53f1, None): [ + b'77959-TYA-A050\x00\x00', + b'77959-TYB-A020\x00\x00', + b'77959-TYC-A050\x00\x00', + ], + (Ecu.fwdCamera, 0x18dab5f1, None): [ + b'36161-TYA-A040\x00\x00', + b'36161-TYA-A050\x00\x00', + b'36161-TYB-A030\x00\x00', + ], + (Ecu.fwdRadar, 0x18dab0f1, None): [ + b'36802-TYA-A040\x00\x00', + b'36802-TYB-A040\x00\x00', + ], + (Ecu.transmission, 0x18da1ef1, None): [ + b'28102-61D-A000\x00\x00', + b'28102-61E-A010\x00\x00', + b'28102-61F-A010\x00\x00', + ], + (Ecu.vsa, 0x18da28f1, None): [ + b'57114-TYA-A060\x00\x00', + b'57114-TYA-A070\x00\x00', + b'57114-TYB-A150\x00\x00', + ], + (Ecu.shiftByWire, 0x18da0bf1, None): [ + b'54008-TGV-A810\x00\x00', + ], + (Ecu.electricBrakeBooster, 0x18da2bf1, None): [ + b'46114-TYA-A040\x00\x00', + b'46114-TYA-A060\x00\x00', + ], + }, CAR.ACURA_MDX_4G_MMR: { (Ecu.fwdCamera, 0x18dab5f1, None): [ b'8S102-TYA-A020\x00\x00', diff --git a/opendbc/car/honda/interface.py b/opendbc/car/honda/interface.py index c55ff6b1fec..c44511281da 100755 --- a/opendbc/car/honda/interface.py +++ b/opendbc/car/honda/interface.py @@ -194,7 +194,7 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo # When using stock ACC, the radar intercepts and filters steering commands the EPS would otherwise accept ret.minSteerSpeed = 70. * CV.KPH_TO_MS - elif candidate == CAR.ACURA_TLX_2G_MMR: + elif candidate in (CAR.ACURA_TLX_2G_MMR, CAR.ACURA_MDX_4G): ret.steerActuatorDelay = 0.15 ret.lateralParams.torqueBP, ret.lateralParams.torqueV = [[0, 3840], [0, 3840]] CarInterfaceBase.configure_torque_tune(candidate, ret.lateralTuning) @@ -205,7 +205,8 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo CarInterfaceBase.configure_torque_tune(candidate, ret.lateralTuning) # These cars use alternate user brake msg (0x1BE) - if 0x1BE in fingerprint[CAN.pt] and candidate in (CAR.HONDA_ACCORD, CAR.HONDA_HRV_3G, CAR.ACURA_RDX_3G, *HONDA_BOSCH_CANFD): + if 0x1BE in fingerprint[CAN.pt] and candidate in (CAR.HONDA_ACCORD, CAR.HONDA_HRV_3G, CAR.ACURA_RDX_3G, CAR.ACURA_MDX_4G, + *HONDA_BOSCH_CANFD): ret.flags |= HondaFlags.BOSCH_ALT_BRAKE.value if ret.flags & HondaFlags.BOSCH_ALT_BRAKE: diff --git a/opendbc/car/honda/values.py b/opendbc/car/honda/values.py index 55516abc5f7..0183e142a86 100644 --- a/opendbc/car/honda/values.py +++ b/opendbc/car/honda/values.py @@ -264,6 +264,12 @@ class CAR(Platforms): [HondaCarDocs("Honda Passport 2026", "All")], CarSpecs(mass=4620 * CV.LB_TO_KG, wheelbase=2.89, centerToFrontRatio=0.442, steerRatio=18.5), ) + ACURA_MDX_4G = HondaBoschPlatformConfig( + [HondaCarDocs("Acura MDX 2022-24", "All", min_steer_speed=70. * CV.KPH_TO_MS)], + CarSpecs(mass=4788 * CV.LB_TO_KG, wheelbase=2.89, steerRatio=15.8, centerToFrontRatio=0.428), # as spec + {Bus.pt: 'honda_common_canfd_generated'}, # not CANFD car but shares same dbc + flags=HondaFlags.BOSCH_ALT_RADAR, + ) # mid-model refresh ACURA_MDX_4G_MMR = HondaBoschCANFDPlatformConfig( [HondaCarDocs("Acura MDX 2025-26", "All except Type S")], @@ -438,9 +444,11 @@ class CAR(Platforms): # Note that we still attempt to match with them when they are present # This is or'd with (ALL_ECUS - ESSENTIAL_ECUS) from fw_versions.py non_essential_ecus={ - Ecu.eps: [CAR.ACURA_RDX_3G, CAR.HONDA_ACCORD, CAR.HONDA_E, CAR.HONDA_E_ADVANCE, *HONDA_BOSCH_ALT_RADAR, *HONDA_BOSCH_RADARLESS, *HONDA_BOSCH_CANFD], + Ecu.eps: [CAR.ACURA_RDX_3G, CAR.HONDA_ACCORD, CAR.HONDA_E, CAR.HONDA_E_ADVANCE, CAR.ACURA_MDX_4G, *HONDA_BOSCH_ALT_RADAR, + *HONDA_BOSCH_RADARLESS, *HONDA_BOSCH_CANFD], Ecu.vsa: [CAR.ACURA_RDX_3G, CAR.HONDA_ACCORD, CAR.HONDA_CIVIC, CAR.HONDA_CIVIC_BOSCH, CAR.HONDA_CRV_5G, CAR.HONDA_CRV_HYBRID, CAR.HONDA_E, - CAR.HONDA_E_ADVANCE, CAR.HONDA_INSIGHT, CAR.HONDA_NBOX_2G, *HONDA_BOSCH_ALT_RADAR, *HONDA_BOSCH_RADARLESS, *HONDA_BOSCH_CANFD], + CAR.HONDA_E_ADVANCE, CAR.HONDA_INSIGHT, CAR.HONDA_NBOX_2G, CAR.ACURA_MDX_4G, *HONDA_BOSCH_ALT_RADAR, *HONDA_BOSCH_RADARLESS, + *HONDA_BOSCH_CANFD], }, extra_ecus=[ (Ecu.combinationMeter, 0x18da60f1, None), diff --git a/opendbc/car/tests/routes.py b/opendbc/car/tests/routes.py index d08e86d4d6b..68853461ae7 100644 --- a/opendbc/car/tests/routes.py +++ b/opendbc/car/tests/routes.py @@ -131,6 +131,7 @@ class CarTestRoute(NamedTuple): CarTestRoute("414af83891dbf72c/00000006--51fa6d99cd", HONDA.HONDA_NBOX_2G), CarTestRoute("ad9840558640c31d/0000001a--d6cd4871c2", HONDA.ACURA_MDX_4G_MMR), # 2025 MDX CarTestRoute("ad9840558640c31d/000001f2--026c4f6275", HONDA.ACURA_TLX_2G_MMR), + CarTestRoute("619b464263ab23f2/00000025--ece505fdfc", HONDA.ACURA_MDX_4G), CarTestRoute("87d7f06ade479c2e/2023-09-11--23-30-11", HYUNDAI.HYUNDAI_AZERA_6TH_GEN), CarTestRoute("66189dd8ec7b50e6/2023-09-20--07-02-12", HYUNDAI.HYUNDAI_AZERA_HEV_6TH_GEN), diff --git a/opendbc/car/torque_data/override.toml b/opendbc/car/torque_data/override.toml index 0010218f75c..3d912300383 100644 --- a/opendbc/car/torque_data/override.toml +++ b/opendbc/car/torque_data/override.toml @@ -98,6 +98,7 @@ legend = ["LAT_ACCEL_FACTOR", "MAX_LAT_ACCEL_MEASURED", "FRICTION"] "TOYOTA_RAV4_TSS2_2022" = [1.9, 1.9304407208090029, 0.112174] "KIA_K7_2017" = [2.2, 2.2, 0.1] "JEEP_CHEROKEE_5TH_GEN" = [1.5, 1.5, 0.15] +"ACURA_MDX_4G" = [1.4, 1.4, 0.17] # Dashcam or fallback configured as ideal car "MOCK" = [10.0, 10, 0.0] diff --git a/opendbc/safety/modes/honda.h b/opendbc/safety/modes/honda.h index 9f49ef762ce..c5d2498e55e 100644 --- a/opendbc/safety/modes/honda.h +++ b/opendbc/safety/modes/honda.h @@ -322,7 +322,7 @@ static safety_config honda_bosch_init(uint16_t param) { {0x33D, 0, 5, .check_relay = true}, {0x33D, 0, 8, .check_relay = true}, {0x33DA, 0, 5, .check_relay = true}, {0x33DB, 0, 8, .check_relay = true}}; // Bosch static CanMsg HONDA_BOSCH_LONG_TX_MSGS[] = {{0xE4, 1, 5, .check_relay = true}, {0x1DF, 1, 8, .check_relay = true}, {0x1EF, 1, 8, .check_relay = false}, - {0x1FA, 1, 8, .check_relay = false}, {0x30C, 1, 8, .check_relay = false}, {0x33D, 1, 5, .check_relay = true}, + {0x1FA, 1, 8, .check_relay = false}, {0x30C, 1, 8, .check_relay = false}, {0x33D, 1, 5, .check_relay = true}, {0x33D, 1, 8, .check_relay = true}, {0x33DA, 1, 5, .check_relay = true}, {0x33DB, 1, 8, .check_relay = true}, {0x39F, 1, 8, .check_relay = false}, {0x18DAB0F1, 1, 8, .check_relay = false}}; // Bosch w/ gas and brakes From 176ec7e00f17dbfde084f25ca417c87c4b00538e Mon Sep 17 00:00:00 2001 From: adeebshihadeh Date: Sun, 29 Mar 2026 08:16:01 +0000 Subject: [PATCH 195/229] docs: Scheduled auto-update CARS.md --- docs/CARS.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/CARS.md b/docs/CARS.md index 39f96f6e163..b52cfef369a 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -10,7 +10,7 @@ |Acura|Integra 2023-25|All|[Community](#community)| |Acura|MDX 2015-16|Advance Package|[Community](#community)| |Acura|MDX 2017-20|All|[Community](#community)| -|Acura|MDX 2022-24|All|[Community](#community)| +|Acura|MDX 2022-24|All|[Upstream](#upstream)| |Acura|MDX 2025-26|All except Type S|[Upstream](#upstream)| |Acura|MDX Hybrid 2017-20|All|[Community](#community)| |Acura|RDX 2016-18|AcuraWatch Plus or Advance Package|[Upstream](#upstream)| @@ -260,8 +260,8 @@ |Ram|1500 2019-24|Adaptive Cruise Control (ACC)|[Upstream](#upstream)| |Ram|2500 2020-24|Adaptive Cruise Control (ACC)|[Dashcam mode](#dashcam)| |Ram|3500 2019-22|Adaptive Cruise Control (ACC)|[Dashcam mode](#dashcam)| -|Rivian|R1S 2022-24|All|[Upstream](#upstream)| -|Rivian|R1T 2022-24|All|[Upstream](#upstream)| +|Rivian|R1S 2022-25|All|[Upstream](#upstream)| +|Rivian|R1T 2022-25|All|[Upstream](#upstream)| |SEAT|Alhambra 2018-20|Adaptive Cruise Control (ACC) & Lane Assist|[Dashcam mode](#dashcam)| |SEAT|Ateca 2016-23|Adaptive Cruise Control (ACC) & Lane Assist|[Upstream](#upstream)| |SEAT|Leon 2014-20|Adaptive Cruise Control (ACC) & Lane Assist|[Upstream](#upstream)| From 4d85875eb8107380441fb9612eadb297892c1905 Mon Sep 17 00:00:00 2001 From: MVL Date: Sun, 29 Mar 2026 14:09:37 -0400 Subject: [PATCH 196/229] Honda: Acura RDX 2022-24 (#1967) * Cleanup_carstate_doors * typo fix * CanFD value no longer needed * Add RDX_MMR to gearbox message * Imperial units on RDX * segregate 2022 into separate fingerprints * Adding values from RDX_3G values into MMR * Adding RDX 3G MMR values * test route for 3GRDX_MMR * add 3G RDX MMR * whitespace fix * whitespace fix * more whitespace fixes * mirroring pre-MMR extra ecu's * including lowspeed steer warning * Adding non-long steer minimum * Including minimum steer speed * changing comment to retry timed out CI * whitespace fix * fixing copy/paste error * fix comment spelling * Updating RDX to 2025 * added 25 camera fingerprint - only visible w comma power * oops - camera was already correct * adding 25 fingerprints only visible w comma power * reverting 2168 baseline changes * Revert "CanFD value no longer needed" This reverts commit f5df1f90fc5db2427129bce1920cf40ccde41d2b. * route comment cleanup * adding RDX_3G_MMR to door signals lists * fix for line length * Gas pedal tuning for RDX 3G MMR * Updating max gas for RDX * Gas pedal tuning for RDX 3G MMR * add 12kph minsteer for long on * set to 3840 to prevent faults * try torqueV max alone without minsteer * Don't command steering if user is steering * Creating BOSCH_ALT_CAMERA to share logic with 5G Odyssey * referencing alt camera * reference HONDA_BOSCH_ALT_CAMERA * switch to zero steer instead of steer disable * add alt camera import * typo fixes * remove comment * properly revert comment change * give 30 second allowance for repeating steer warning - too obtrusive * adding gearbox to alt_camera * change alt camera to alt radar * disable steer control when steering, and update display * Update lane line display * update dashed lines and disable faults * add fingerprint to steer control * update steer threshold and minsteer speed * typo cleanup * more cleanup * remove duplicate minspeed, update gas max * Revert safety changes in "Updating max gas for RDX" This reverts commit 35047d53e9367033adc7be9bbfbf2654892bc465. * 3810 steer max to prevent faults * update lowspeed fault signal name * add driver steering message * add driver steering message * block lkas forward * Updating test for LKAS fwd block * updating steer disable to longcontrol only based on driver feedback * Revert "adding 25 fingerprints only visible w comma power" This reverts commit 72d75fe8d3d17c09e4d91d7c8cf60dfed4df83de. * Aligning with odyssey changes * aligning with odyssey carstate changes * aligning with odyssey hondacan changes * aligning with odysey values changes * aligning with odyssey bosch2018 dbc changes * Revert "block lkas forward" safety change, only impacts 2025 This reverts commit 221e6e437e037e85df761cd5983c7c64c017a33d. * Revert "Updating test for LKAS fwd block" safety change, only impacts 2025 This reverts commit 3f5d7b5edfa46b7fa320979db35bc432f942483c. * update compatible years to only 2024 * Reducing community support to 2025 only * remove RDX from community list * remove parentheses change * repack flags * Revert "aligning with odyssey bosch2018 dbc changes" - only impacted 2025 RDX which was removed from this PR This reverts commit 021872aeabaa45245d0be59a61f379b4f1bf2575. * moving to torque tuning based on log * moving to torque tuning based on log * Revert "add 3G RDX MMR" This reverts commit fb76f39c98bc859fee55d7e58834e5502674d574. * Comment cleanup * typo fix * Update steer ratio and standardize minspeed * aligning with odyssey carcontroller changes * aligning with odyssey carstate changes * clean up merge conflict * spelling * Update test route for ACURA_RDX_3G_MMR * not in release until there's more driving history --------- Co-authored-by: Jason Young --- opendbc/car/extra_cars.py | 2 +- opendbc/car/honda/fingerprints.py | 30 +++++++++++++++++++++++++++ opendbc/car/honda/interface.py | 4 ++++ opendbc/car/honda/values.py | 6 ++++++ opendbc/car/tests/routes.py | 1 + opendbc/car/torque_data/override.toml | 1 + 6 files changed, 43 insertions(+), 1 deletion(-) diff --git a/opendbc/car/extra_cars.py b/opendbc/car/extra_cars.py index 1c8ac68827d..ad68d6af104 100644 --- a/opendbc/car/extra_cars.py +++ b/opendbc/car/extra_cars.py @@ -42,7 +42,7 @@ class CAR(Platforms): CommunityCarDocs("Acura MDX 2015-16", "Advance Package"), CommunityCarDocs("Acura MDX 2017-20"), CommunityCarDocs("Acura MDX Hybrid 2017-20"), - CommunityCarDocs("Acura RDX 2022-25"), + CommunityCarDocs("Acura RDX 2025"), CommunityCarDocs("Acura RLX 2017", "Advance Package or Technology Package"), CommunityCarDocs("Acura TLX 2015-17", "Advance Package"), CommunityCarDocs("Acura TLX 2018-20"), diff --git a/opendbc/car/honda/fingerprints.py b/opendbc/car/honda/fingerprints.py index 0d49dd109af..59b7780ca86 100644 --- a/opendbc/car/honda/fingerprints.py +++ b/opendbc/car/honda/fingerprints.py @@ -837,6 +837,36 @@ b'39990-TJB-A130\x00\x00', ], }, + # mid-model refresh + CAR.ACURA_RDX_3G_MMR: { + (Ecu.vsa, 0x18da28f1, None): [ + b'57114-TJB-A120\x00\x00', + ], + (Ecu.fwdRadar, 0x18dab0f1, None): [ + b'36802-TJB-A540\x00\x00', + ], + (Ecu.fwdCamera, 0x18dab5f1, None): [ + b'36161-TJB-A530\x00\x00', + ], + (Ecu.shiftByWire, 0x18da0bf1, None): [ + b'54008-TJB-A530\x00\x00', + ], + (Ecu.transmission, 0x18da1ef1, None): [ + b'28102-5YK-A800\x00\x00', + ], + (Ecu.srs, 0x18da53f1, None): [ + b'77959-TJB-A120\x00\x00', + ], + (Ecu.electricBrakeBooster, 0x18da2bf1, None): [ + b'46114-TJB-A120\x00\x00', + ], + (Ecu.gateway, 0x18daeff1, None): [ + b'38897-TJB-A220\x00\x00', + ], + (Ecu.eps, 0x18da30f1, None): [ + b'39990-TJB-A070\x00\x00', + ], + }, CAR.HONDA_RIDGELINE: { (Ecu.eps, 0x18da30f1, None): [ b'39990-T6Z-A020\x00\x00', diff --git a/opendbc/car/honda/interface.py b/opendbc/car/honda/interface.py index c44511281da..cac1306b666 100755 --- a/opendbc/car/honda/interface.py +++ b/opendbc/car/honda/interface.py @@ -204,6 +204,10 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo ret.lateralParams.torqueBP, ret.lateralParams.torqueV = [[0, 2560], [0, 2560]] CarInterfaceBase.configure_torque_tune(candidate, ret.lateralTuning) + if candidate == CAR.ACURA_RDX_3G_MMR: + CarControllerParams.BOSCH_GAS_LOOKUP_V = [0, 2000] # alpha longitudinal pedal tuning + ret.dashcamOnly = is_release # TODO: release from dashcam when there's enough driving data for torqued/paramsd to converge + # These cars use alternate user brake msg (0x1BE) if 0x1BE in fingerprint[CAN.pt] and candidate in (CAR.HONDA_ACCORD, CAR.HONDA_HRV_3G, CAR.ACURA_RDX_3G, CAR.ACURA_MDX_4G, *HONDA_BOSCH_CANFD): diff --git a/opendbc/car/honda/values.py b/opendbc/car/honda/values.py index 0183e142a86..8a9d6556fac 100644 --- a/opendbc/car/honda/values.py +++ b/opendbc/car/honda/values.py @@ -241,6 +241,12 @@ class CAR(Platforms): {Bus.pt: 'acura_rdx_2020_can_generated'}, flags=HondaFlags.BOSCH_ALT_BRAKE, ) + ACURA_RDX_3G_MMR = HondaBoschPlatformConfig( + [HondaCarDocs("Acura RDX 2022-24", "All", min_steer_speed=70. * CV.KPH_TO_MS)], + CarSpecs(mass=4079 * CV.LB_TO_KG, wheelbase=2.75, centerToFrontRatio=0.41, steerRatio=16.2), + {Bus.pt: 'acura_rdx_2020_can_generated'}, + flags=HondaFlags.BOSCH_ALT_BRAKE | HondaFlags.BOSCH_ALT_RADAR, + ) HONDA_INSIGHT = HondaBoschPlatformConfig( [HondaCarDocs("Honda Insight 2019-22", "All", min_steer_speed=3. * CV.MPH_TO_MS)], CarSpecs(mass=2987 * CV.LB_TO_KG, wheelbase=2.7, steerRatio=15.0, centerToFrontRatio=0.39, tireStiffnessFactor=0.82), # as spec diff --git a/opendbc/car/tests/routes.py b/opendbc/car/tests/routes.py index 68853461ae7..cafc0fb3288 100644 --- a/opendbc/car/tests/routes.py +++ b/opendbc/car/tests/routes.py @@ -117,6 +117,7 @@ class CarTestRoute(NamedTuple): CarTestRoute("684e8f96bd491a0e/2021-11-03--11-08-42", HONDA.HONDA_PILOT), # Passport CarTestRoute("0a78dfbacc8504ef/2020-03-04--13-29-55", HONDA.HONDA_CIVIC_BOSCH), CarTestRoute("f34a60d68d83b1e5/2020-10-06--14-35-55", HONDA.ACURA_RDX), + CarTestRoute("23412c73dbeccd3a/00000000--be4606224f", HONDA.ACURA_RDX_3G_MMR), CarTestRoute("54fd8451b3974762/2021-04-01--14-50-10", HONDA.HONDA_RIDGELINE), CarTestRoute("2d5808fae0b38ac6/2021-09-01--17-14-11", HONDA.HONDA_E), CarTestRoute("16a94dfbfdf5a51f/00000007--5ac9e58f1b", HONDA.HONDA_E_ADVANCE), diff --git a/opendbc/car/torque_data/override.toml b/opendbc/car/torque_data/override.toml index 3d912300383..40aa53154c2 100644 --- a/opendbc/car/torque_data/override.toml +++ b/opendbc/car/torque_data/override.toml @@ -99,6 +99,7 @@ legend = ["LAT_ACCEL_FACTOR", "MAX_LAT_ACCEL_MEASURED", "FRICTION"] "KIA_K7_2017" = [2.2, 2.2, 0.1] "JEEP_CHEROKEE_5TH_GEN" = [1.5, 1.5, 0.15] "ACURA_MDX_4G" = [1.4, 1.4, 0.17] +"ACURA_RDX_3G_MMR" = [1.5, 1.5, 0.16] # Dashcam or fallback configured as ideal car "MOCK" = [10.0, 10, 0.0] From ff6882feb78fc094cb9a7eefe5b33cf7c0b61980 Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Sun, 29 Mar 2026 12:08:56 -0700 Subject: [PATCH 197/229] VW MLB: Migrate to TSK_04 for cruise state (#3259) * VW MLB: Migrate to TSK_04 for cruise state * dump the mainswitch placeholders --- opendbc/car/volkswagen/carstate.py | 12 ++++++------ opendbc/dbc/vw_mlb.dbc | 4 ++-- opendbc/safety/modes/volkswagen_common.h | 3 +-- opendbc/safety/modes/volkswagen_mlb.h | 19 ++++++------------- opendbc/safety/tests/test_volkswagen_mlb.py | 10 +++++----- 5 files changed, 20 insertions(+), 28 deletions(-) diff --git a/opendbc/car/volkswagen/carstate.py b/opendbc/car/volkswagen/carstate.py index 8c143ed2405..0eed80fc0ca 100644 --- a/opendbc/car/volkswagen/carstate.py +++ b/opendbc/car/volkswagen/carstate.py @@ -244,12 +244,12 @@ def update_mlb(self, pt_cp, cam_cp, ext_cp, alt_cp) -> structs.CarState: ret.gasPressed = pt_cp.vl["Motor_03"]["MO_Fahrpedalrohwert_01"] > 0 ret.gearShifter = self.parse_gear_shifter(self.CCP.shifter_values.get(alt_cp.vl["Getriebe_03"]["GE_Waehlhebel"], None)) - # ACC okay but disabled (1), ACC ready (2), a radar visibility or other fault/disruption (6 or 7) - # currently regulating speed (3), driver accel override (4), brake only (5) - # TODO: get this from the drivetrain side instead, for openpilot long support later - ret.cruiseState.available = ext_cp.vl["ACC_05"]["ACC_Status_ACC"] in (2, 3, 4, 5) - ret.cruiseState.enabled = ext_cp.vl["ACC_05"]["ACC_Status_ACC"] in (3, 4, 5) - ret.accFaulted = ext_cp.vl["ACC_05"]["ACC_Status_ACC"] in (6, 7) + # TODO: We don't have a true mainswitch state yet, might need stateful tracking on LS_01 if momentary-press is a thing + # TSK_04.TSK_Status_GRA_ACC_02 0 = not engaged, 1 = engaged, 2 = engaged with driver accel override, 3 = fault + ret.cruiseState.available = alt_cp.vl["TSK_04"]["TSK_Status_GRA_ACC_02"] in (0, 1, 2) + ret.cruiseState.available = alt_cp.vl["TSK_04"]["TSK_Status_GRA_ACC_02"] in (1, 2) + ret.accFaulted = alt_cp.vl["TSK_04"]["TSK_Status_GRA_ACC_02"] == 3 + ret.cruiseState.speed = ext_cp.vl["ACC_02"]["ACC_Wunschgeschw_02"] * CV.KPH_TO_MS self.parse_mlb_mqb_steering_state(ret, pt_cp) diff --git a/opendbc/dbc/vw_mlb.dbc b/opendbc/dbc/vw_mlb.dbc index 145b975e808..135df310e60 100644 --- a/opendbc/dbc/vw_mlb.dbc +++ b/opendbc/dbc/vw_mlb.dbc @@ -1707,8 +1707,8 @@ BO_ 786 TSK_03: 8 Motor_EDC17_D4 SG_ FAS_Status_Anzeige : 61|3@1+ (1.0,0.0) [0.0|7] "" Gateway_D4C7 BO_ 270 TSK_04: 8 Motor_EDC17_D4 - SG_ TSK_04_CHK : 0|8@1+ (1,0) [0|255] "" Getriebe_AL551_951_D4_C7,Getriebe_DL501_C7,Getriebe_VL381_C7 - SG_ TSK_04_BZ : 8|4@1+ (1,0) [0|15] "" Getriebe_AL551_951_D4_C7,Getriebe_DL501_C7,Getriebe_VL381_C7 + SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" Getriebe_AL551_951_D4_C7,Getriebe_DL501_C7,Getriebe_VL381_C7 + SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" Getriebe_AL551_951_D4_C7,Getriebe_DL501_C7,Getriebe_VL381_C7 SG_ TSK_zul_Regelabw : 12|6@1+ (0.024,0) [0.000|1.512] "Unit_MeterPerSeconSquar" Getriebe_AL551_951_D4_C7,Getriebe_DL501_C7,Getriebe_VL381_C7 SG_ TSK_ax_Getriebe : 18|9@1+ (0.024,-2.016) [-2.016|10.224] "Unit_MeterPerSeconSquar" Getriebe_AL551_951_D4_C7,Getriebe_DL501_C7,Getriebe_VL381_C7 SG_ TSK_Wunsch_Uebersetz : 27|10@1+ (0.0245,0) [0.0245|25.0635] "" Getriebe_AL551_951_D4_C7,Getriebe_DL501_C7,Getriebe_VL381_C7 diff --git a/opendbc/safety/modes/volkswagen_common.h b/opendbc/safety/modes/volkswagen_common.h index 484f4851f3a..37e880a627e 100644 --- a/opendbc/safety/modes/volkswagen_common.h +++ b/opendbc/safety/modes/volkswagen_common.h @@ -36,8 +36,7 @@ bool volkswagen_brake_pressure_detected = false; #define MSG_ESP_03 0x103U // RX from ABS, for wheel speeds #define MSG_LS_01 0x10BU // TX by OP, ACC control buttons for cancel/resume #define MSG_MOTOR_03 0x105U // RX from ECU, for driver throttle input and brake switch status -#define MSG_TSK_02 0x10CU // RX from ECU, for ACC status from drivetrain coordinator -#define MSG_ACC_05 0x10DU // RX from radar, for ACC status +#define MSG_TSK_04 0x10EU // RX from ECU, for ACC status from drivetrain coordinator static void volkswagen_common_init(void) { volkswagen_set_button_prev = false; diff --git a/opendbc/safety/modes/volkswagen_mlb.h b/opendbc/safety/modes/volkswagen_mlb.h index 6469da6d865..1390ea7e529 100644 --- a/opendbc/safety/modes/volkswagen_mlb.h +++ b/opendbc/safety/modes/volkswagen_mlb.h @@ -14,7 +14,7 @@ static safety_config volkswagen_mlb_init(uint16_t param) { {.msg = {{MSG_ESP_03, 0, 8, 50U, .ignore_checksum = true, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, {.msg = {{MSG_LH_EPS_03, 0, 8, 100U, .ignore_checksum = true, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, {.msg = {{MSG_ESP_05, 0, 8, 50U, .ignore_checksum = true, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, - {.msg = {{MSG_ACC_05, 2, 8, 50U, .ignore_checksum = true, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{MSG_TSK_04, 1, 8, 50U, .ignore_checksum = true, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, {.msg = {{MSG_MOTOR_03, 0, 8, 100U, .ignore_checksum = true, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, {.msg = {{MSG_LS_01, 0, 4, 10U, .ignore_checksum = true, .max_counter = 15U, .ignore_quality_flag = true}, { 0 }, { 0 }}}, }; @@ -66,21 +66,14 @@ static void volkswagen_mlb_rx_hook(const CANPacket_t *msg) { } - if (msg->bus == 2U) { - // TODO: See if there's a bus-agnostic TSK message we can use instead - if (msg->addr == MSG_ACC_05) { + if (msg->bus == 1U) { + if (msg->addr == MSG_TSK_04) { // When using stock ACC, enter controls on rising edge of stock ACC engage, exit on disengage - // Always exit controls on main switch off - // Signal: ACC_05.ACC_Status_ACC - int acc_status = (msg->data[7] & 0xEU) >> 1; - bool cruise_engaged = (acc_status == 3) || (acc_status == 4) || (acc_status == 5); - acc_main_on = cruise_engaged || (acc_status == 2); + // Signal: TSK_04.TSK_Status_GRA_ACC_02 + int acc_status = (msg->data[7] & 0xC0U) >> 6; + bool cruise_engaged = (acc_status == 1) || (acc_status == 2); pcm_cruise_check(cruise_engaged); - - if (!acc_main_on) { - controls_allowed = false; - } } } } diff --git a/opendbc/safety/tests/test_volkswagen_mlb.py b/opendbc/safety/tests/test_volkswagen_mlb.py index 562bfce6180..804e57ec46a 100755 --- a/opendbc/safety/tests/test_volkswagen_mlb.py +++ b/opendbc/safety/tests/test_volkswagen_mlb.py @@ -10,7 +10,7 @@ MSG_MOTOR_03 = 0x105 # RX from ECU, for driver throttle input and driver brake input MSG_ESP_05 = 0x106 # RX from ABS, for brake light state MSG_LS_01 = 0x10B # TX by OP, ACC control buttons for cancel/resume -MSG_TSK_02 = 0x10C # RX from ECU, for ACC status from drivetrain coordinator +MSG_TSK_04 = 0x10E # RX from ECU, for ACC status from drivetrain coordinator MSG_HCA_01 = 0x126 # TX by OP, Heading Control Assist steering torque MSG_LDW_02 = 0x397 # TX by OP, Lane line recognition and text alerts @@ -51,9 +51,9 @@ def _user_gas_msg(self, gas): return self._motor_03_msg(gas_signal=gas) # ACC engagement status - def _tsk_status_msg(self, enable, main_switch=True): - values = {"ACC_Status_ACC": 1 if not main_switch else 3 if enable else 2} - return self.packer.make_can_msg_safety("ACC_05", 2, values) + def _tsk_status_msg(self, enable): + values = {"TSK_Status_GRA_ACC_02": 1 if enable else 0} + return self.packer.make_can_msg_safety("TSK_04", 1, values) def _pcm_status_msg(self, enable): return self._tsk_status_msg(enable) @@ -131,7 +131,7 @@ def test_spam_cancel_safety_check(self): def test_cancel_button(self): # Disable on rising edge of cancel button - self._rx(self._tsk_status_msg(False, main_switch=True)) + self._rx(self._tsk_status_msg(False)) self.safety.set_controls_allowed(1) self._rx(self._ls_01_msg(cancel=True, bus=0)) self.assertFalse(self.safety.get_controls_allowed(), "controls allowed after cancel") From 279d834f650c989f984593386e975fe51e80e724 Mon Sep 17 00:00:00 2001 From: Dennis <43215753+Dennis-NL@users.noreply.github.com> Date: Sun, 29 Mar 2026 21:23:58 +0200 Subject: [PATCH 198/229] VW MLB: Add support for Audi Q5 Mk1 (#3138) * Support for Q5 8R * Use ALT bus for compatibility with MLB_B8 * Fix alt bus error for pq * No test route yet * Remove math * Add Audi Q5 2013-17 to CARS.md * Revert "Add Audi Q5 2013-17 to CARS.md" This reverts commit fa1c10c1545825a55609b430c11b6c8078ad0328. * Safety fix * Fix for ruff fail * Revert DBC change * Add test route for Q5 MK1 * diff reduction from upstream * this is a no-op * diff reduction * no-op change, diff reduction * need to calculate the magic value first --------- Co-authored-by: Jason Young --- opendbc/car/tests/routes.py | 1 + opendbc/car/torque_data/override.toml | 1 + opendbc/car/volkswagen/fingerprints.py | 20 ++++++++++++++++++++ opendbc/car/volkswagen/values.py | 6 ++++++ opendbc/dbc/vw_mlb.dbc | 2 +- 5 files changed, 29 insertions(+), 1 deletion(-) diff --git a/opendbc/car/tests/routes.py b/opendbc/car/tests/routes.py index cafc0fb3288..2fe80c0f781 100644 --- a/opendbc/car/tests/routes.py +++ b/opendbc/car/tests/routes.py @@ -297,6 +297,7 @@ class CarTestRoute(NamedTuple): CarTestRoute("07667b885add75fd/2021-01-23--19-48-42", VOLKSWAGEN.AUDI_A3_MK3), CarTestRoute("6c6b466346192818/2021-06-06--14-17-47", VOLKSWAGEN.AUDI_Q2_MK1), CarTestRoute("0cd0b7f7e31a3853/2021-12-03--03-12-05", VOLKSWAGEN.AUDI_Q3_MK2), + CarTestRoute("5432d2499e17e646/00000001--a99353214f", VOLKSWAGEN.AUDI_Q5_MK1), CarTestRoute("8f205bdd11bcbb65/2021-03-26--01-00-17", VOLKSWAGEN.SEAT_ATECA_MK1), CarTestRoute("fc6b6c9a3471c846/2021-05-27--13-39-56", VOLKSWAGEN.SEAT_ATECA_MK1), # Leon CarTestRoute("0bbe367c98fa1538/2023-03-04--17-46-11", VOLKSWAGEN.SKODA_FABIA_MK4), diff --git a/opendbc/car/torque_data/override.toml b/opendbc/car/torque_data/override.toml index 40aa53154c2..f6bab7603f9 100644 --- a/opendbc/car/torque_data/override.toml +++ b/opendbc/car/torque_data/override.toml @@ -93,6 +93,7 @@ legend = ["LAT_ACCEL_FACTOR", "MAX_LAT_ACCEL_MEASURED", "FRICTION"] "ACURA_TLX_2G" = [1.2, 1.2, 0.15] "ACURA_TLX_2G_MMR" = [1.7, 1.7, 0.16] "PORSCHE_MACAN_MK1" = [2.0, 2.0, 0.2] +"AUDI_Q5_MK1" = [1.8, 1.8, 0.18] "LEXUS_LS" = [1.35, 1.7, 0.17] "TOYOTA_RAV4_PRIME" = [1.7, 2.0, 0.14] "TOYOTA_RAV4_TSS2_2022" = [1.9, 1.9304407208090029, 0.112174] diff --git a/opendbc/car/volkswagen/fingerprints.py b/opendbc/car/volkswagen/fingerprints.py index 816d0f433f8..1c35edf5387 100644 --- a/opendbc/car/volkswagen/fingerprints.py +++ b/opendbc/car/volkswagen/fingerprints.py @@ -972,6 +972,26 @@ b'\xf1\x872Q0907572T \xf1\x890383', ], }, + CAR.AUDI_Q5_MK1: { + (Ecu.engine, 0x7e0, None): [ + b'\xf1\x878R0907115N \xf1\x890006', + b'\xf1\x878R0907551F \xf1\x890007', + ], + (Ecu.transmission, 0x7e1, None): [ + b'\xf1\x878R0927158D \xf1\x891010', + b'\xf1\x878R0927158AM\xf1\x891003', + ], + (Ecu.srs, 0x715, None): [ + b'\xf1\x878R0959655F \xf1\x890610\xf1\x82\x050304010402', + ], + (Ecu.eps, 0x712, None): [ + b'\xf1\x878R0909144R \xf1\x890511\xf1\x82\x01\n\x1a', + b'\xf1\x878R0909144F \xf1\x890507\xf1\x82\x01\t\xe6', + ], + (Ecu.fwdRadar, 0x757, None): [ + b'\xf1\x878R0907561A\x00\xf1\x890410\xf1\x80100', + ], + }, CAR.PORSCHE_MACAN_MK1: { (Ecu.engine, 0x7e0, None): [ b'\xf1\x8795B906259BJ\xf1\x890001', diff --git a/opendbc/car/volkswagen/values.py b/opendbc/car/volkswagen/values.py index ec29df5afdf..50214ac69b5 100644 --- a/opendbc/car/volkswagen/values.py +++ b/opendbc/car/volkswagen/values.py @@ -445,6 +445,12 @@ class CAR(Platforms): chassis_codes={"8U", "F3", "FS"}, wmis={WMI.AUDI_EUROPE_MPV, WMI.AUDI_GERMANY_CAR, WMI.VOLKSWAGEN_CHINA_FAW}, ) + AUDI_Q5_MK1 = VolkswagenMLBPlatformConfig( + [VWCarDocs("Audi Q5 2013-17")], + VolkswagenCarSpecs(mass=1895, wheelbase=2.81), + chassis_codes={"8R"}, + wmis={WMI.AUDI_EUROPE_MPV, WMI.AUDI_GERMANY_CAR}, + ) PORSCHE_MACAN_MK1 = VolkswagenMLBPlatformConfig( [VWCarDocs("Porsche Macan 2017-24")], VolkswagenCarSpecs(mass=1895, wheelbase=2.81, steerRatio=16.2), diff --git a/opendbc/dbc/vw_mlb.dbc b/opendbc/dbc/vw_mlb.dbc index 135df310e60..4f7bb05a0b5 100644 --- a/opendbc/dbc/vw_mlb.dbc +++ b/opendbc/dbc/vw_mlb.dbc @@ -1707,7 +1707,7 @@ BO_ 786 TSK_03: 8 Motor_EDC17_D4 SG_ FAS_Status_Anzeige : 61|3@1+ (1.0,0.0) [0.0|7] "" Gateway_D4C7 BO_ 270 TSK_04: 8 Motor_EDC17_D4 - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" Getriebe_AL551_951_D4_C7,Getriebe_DL501_C7,Getriebe_VL381_C7 + SG_ TSK_04_CHK : 0|8@1+ (1,0) [0|255] "" Getriebe_AL551_951_D4_C7,Getriebe_DL501_C7,Getriebe_VL381_C7 SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" Getriebe_AL551_951_D4_C7,Getriebe_DL501_C7,Getriebe_VL381_C7 SG_ TSK_zul_Regelabw : 12|6@1+ (0.024,0) [0.000|1.512] "Unit_MeterPerSeconSquar" Getriebe_AL551_951_D4_C7,Getriebe_DL501_C7,Getriebe_VL381_C7 SG_ TSK_ax_Getriebe : 18|9@1+ (0.024,-2.016) [-2.016|10.224] "Unit_MeterPerSeconSquar" Getriebe_AL551_951_D4_C7,Getriebe_DL501_C7,Getriebe_VL381_C7 From eb3b7eb56c91b82d8f57ab41839646a108d71cbf Mon Sep 17 00:00:00 2001 From: MVL Date: Sun, 29 Mar 2026 16:48:06 -0400 Subject: [PATCH 199/229] HONDA - fix alt_radar standstill lane blinking (#3261) Include STEER_GLOBAL_MIN_SPEED in steering_available calc --- opendbc/car/honda/carcontroller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendbc/car/honda/carcontroller.py b/opendbc/car/honda/carcontroller.py index d08a191a1bc..fc430c4853f 100644 --- a/opendbc/car/honda/carcontroller.py +++ b/opendbc/car/honda/carcontroller.py @@ -224,7 +224,7 @@ def update(self, CC, CS, now_nanos): can_sends.append(hondacan.create_acc_hud(self.packer, self.CAN.pt, self.CP, CC.enabled, pcm_speed, pcm_accel, hud_control, hud_v_cruise, CS.is_metric, CS.acc_hud)) - steering_available = CS.out.cruiseState.available and CS.out.vEgo > self.CP.minSteerSpeed + steering_available = CS.out.cruiseState.available and CS.out.vEgo > max(self.params.STEER_GLOBAL_MIN_SPEED, self.CP.minSteerSpeed) can_sends.extend(hondacan.create_lkas_hud(self.packer, self.CAN.lkas, self.CP, hud_control, CC.latActive, steering_available, alert_steer_required, CS.lkas_hud)) From e7b3d8585b16c029ecaced9423265905c2e57086 Mon Sep 17 00:00:00 2001 From: adeebshihadeh Date: Mon, 30 Mar 2026 08:38:14 +0000 Subject: [PATCH 200/229] docs: Scheduled auto-update CARS.md --- docs/CARS.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/CARS.md b/docs/CARS.md index b52cfef369a..93d14d5ee23 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -1,6 +1,6 @@ -# Support Information for 393 Known Cars +# Support Information for 395 Known Cars |Make|Model|Package|Support Level| |---|---|---|:---:| @@ -15,7 +15,8 @@ |Acura|MDX Hybrid 2017-20|All|[Community](#community)| |Acura|RDX 2016-18|AcuraWatch Plus or Advance Package|[Upstream](#upstream)| |Acura|RDX 2019-21|All|[Upstream](#upstream)| -|Acura|RDX 2022-25|All|[Community](#community)| +|Acura|RDX 2022-24|All|[Dashcam mode](#dashcam)| +|Acura|RDX 2025|All|[Community](#community)| |Acura|RLX 2017|Advance Package or Technology Package|[Community](#community)| |Acura|TLX 2015-17|Advance Package|[Community](#community)| |Acura|TLX 2018-20|All|[Community](#community)| @@ -29,6 +30,7 @@ |Audi|A5 2016-24|All|[Not compatible](#flexray)| |Audi|Q2 2018|Adaptive Cruise Control (ACC) & Lane Assist|[Upstream](#upstream)| |Audi|Q3 2019-24|Adaptive Cruise Control (ACC) & Lane Assist|[Upstream](#upstream)| +|Audi|Q5 2013-17|Adaptive Cruise Control (ACC) & Lane Assist|[Dashcam mode](#dashcam)| |Audi|Q5 2017-24|All|[Not compatible](#flexray)| |Audi|RS3 2018|Adaptive Cruise Control (ACC) & Lane Assist|[Upstream](#upstream)| |Audi|S3 2015-17|Adaptive Cruise Control (ACC) & Lane Assist|[Upstream](#upstream)| From 543bb1beb1c52455f99561fd2ab0d427c44cd385 Mon Sep 17 00:00:00 2001 From: commaci-public <60409688+commaci-public@users.noreply.github.com> Date: Mon, 30 Mar 2026 09:35:33 -0700 Subject: [PATCH 201/229] [bot] Update uv.lock (#3266) Co-authored-by: Vehicle Researcher --- uv.lock | 162 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/uv.lock b/uv.lock index 686341414b3..0af35dd0419 100644 --- a/uv.lock +++ b/uv.lock @@ -183,7 +183,7 @@ wheels = [ [[package]] name = "cppcheck" version = "2.16.0" -source = { git = "https://github.com/commaai/dependencies.git?subdirectory=cppcheck&rev=release-cppcheck#72fa6116c0e5be735e9a5974544f83868e3402d6" } +source = { git = "https://github.com/commaai/dependencies.git?subdirectory=cppcheck&rev=release-cppcheck#b631125c6c762b2ff19df670401b462dd75fb19f" } [[package]] name = "cpplint" @@ -345,39 +345,39 @@ wheels = [ [[package]] name = "numpy" -version = "2.4.3" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/10/8b/c265f4823726ab832de836cdd184d0986dcf94480f81e8739692a7ac7af2/numpy-2.4.3.tar.gz", hash = "sha256:483a201202b73495f00dbc83796c6ae63137a9bdade074f7648b3e32613412dd", size = 20727743, upload-time = "2026-03-09T07:58:53.426Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/f9/51/5093a2df15c4dc19da3f79d1021e891f5dcf1d9d1db6ba38891d5590f3fe/numpy-2.4.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:33b3bf58ee84b172c067f56aeadc7ee9ab6de69c5e800ab5b10295d54c581adb", size = 16957183, upload-time = "2026-03-09T07:55:57.774Z" }, - { url = "https://files.pythonhosted.org/packages/b5/7c/c061f3de0630941073d2598dc271ac2f6cbcf5c83c74a5870fea07488333/numpy-2.4.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:8ba7b51e71c05aa1f9bc3641463cd82308eab40ce0d5c7e1fd4038cbf9938147", size = 14968734, upload-time = "2026-03-09T07:56:00.494Z" }, - { url = "https://files.pythonhosted.org/packages/ef/27/d26c85cbcd86b26e4f125b0668e7a7c0542d19dd7d23ee12e87b550e95b5/numpy-2.4.3-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:a1988292870c7cb9d0ebb4cc96b4d447513a9644801de54606dc7aabf2b7d920", size = 5475288, upload-time = "2026-03-09T07:56:02.857Z" }, - { url = "https://files.pythonhosted.org/packages/2b/09/3c4abbc1dcd8010bf1a611d174c7aa689fc505585ec806111b4406f6f1b1/numpy-2.4.3-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:23b46bb6d8ecb68b58c09944483c135ae5f0e9b8d8858ece5e4ead783771d2a9", size = 6805253, upload-time = "2026-03-09T07:56:04.53Z" }, - { url = "https://files.pythonhosted.org/packages/21/bc/e7aa3f6817e40c3f517d407742337cbb8e6fc4b83ce0b55ab780c829243b/numpy-2.4.3-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a016db5c5dba78fa8fe9f5d80d6708f9c42ab087a739803c0ac83a43d686a470", size = 15969479, upload-time = "2026-03-09T07:56:06.638Z" }, - { url = "https://files.pythonhosted.org/packages/78/51/9f5d7a41f0b51649ddf2f2320595e15e122a40610b233d51928dd6c92353/numpy-2.4.3-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:715de7f82e192e8cae5a507a347d97ad17598f8e026152ca97233e3666daaa71", size = 16901035, upload-time = "2026-03-09T07:56:09.405Z" }, - { url = "https://files.pythonhosted.org/packages/64/6e/b221dd847d7181bc5ee4857bfb026182ef69499f9305eb1371cbb1aea626/numpy-2.4.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:2ddb7919366ee468342b91dea2352824c25b55814a987847b6c52003a7c97f15", size = 17325657, upload-time = "2026-03-09T07:56:12.067Z" }, - { url = "https://files.pythonhosted.org/packages/eb/b8/8f3fd2da596e1063964b758b5e3c970aed1949a05200d7e3d46a9d46d643/numpy-2.4.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:a315e5234d88067f2d97e1f2ef670a7569df445d55400f1e33d117418d008d52", size = 18635512, upload-time = "2026-03-09T07:56:14.629Z" }, - { url = "https://files.pythonhosted.org/packages/5c/24/2993b775c37e39d2f8ab4125b44337ab0b2ba106c100980b7c274a22bee7/numpy-2.4.3-cp311-cp311-win32.whl", hash = "sha256:2b3f8d2c4589b1a2028d2a770b0fc4d1f332fb5e01521f4de3199a896d158ddd", size = 6238100, upload-time = "2026-03-09T07:56:17.243Z" }, - { url = "https://files.pythonhosted.org/packages/76/1d/edccf27adedb754db7c4511d5eac8b83f004ae948fe2d3509e8b78097d4c/numpy-2.4.3-cp311-cp311-win_amd64.whl", hash = "sha256:77e76d932c49a75617c6d13464e41203cd410956614d0a0e999b25e9e8d27eec", size = 12609816, upload-time = "2026-03-09T07:56:19.089Z" }, - { url = "https://files.pythonhosted.org/packages/92/82/190b99153480076c8dce85f4cfe7d53ea84444145ffa54cb58dcd460d66b/numpy-2.4.3-cp311-cp311-win_arm64.whl", hash = "sha256:eb610595dd91560905c132c709412b512135a60f1851ccbd2c959e136431ff67", size = 10485757, upload-time = "2026-03-09T07:56:21.753Z" }, - { url = "https://files.pythonhosted.org/packages/a9/ed/6388632536f9788cea23a3a1b629f25b43eaacd7d7377e5d6bc7b9deb69b/numpy-2.4.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:61b0cbabbb6126c8df63b9a3a0c4b1f44ebca5e12ff6997b80fcf267fb3150ef", size = 16669628, upload-time = "2026-03-09T07:56:24.252Z" }, - { url = "https://files.pythonhosted.org/packages/74/1b/ee2abfc68e1ce728b2958b6ba831d65c62e1b13ce3017c13943f8f9b5b2e/numpy-2.4.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:7395e69ff32526710748f92cd8c9849b361830968ea3e24a676f272653e8983e", size = 14696872, upload-time = "2026-03-09T07:56:26.991Z" }, - { url = "https://files.pythonhosted.org/packages/ba/d1/780400e915ff5638166f11ca9dc2c5815189f3d7cf6f8759a1685e586413/numpy-2.4.3-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:abdce0f71dcb4a00e4e77f3faf05e4616ceccfe72ccaa07f47ee79cda3b7b0f4", size = 5203489, upload-time = "2026-03-09T07:56:29.414Z" }, - { url = "https://files.pythonhosted.org/packages/0b/bb/baffa907e9da4cc34a6e556d6d90e032f6d7a75ea47968ea92b4858826c4/numpy-2.4.3-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:48da3a4ee1336454b07497ff7ec83903efa5505792c4e6d9bf83d99dc07a1e18", size = 6550814, upload-time = "2026-03-09T07:56:32.225Z" }, - { url = "https://files.pythonhosted.org/packages/7b/12/8c9f0c6c95f76aeb20fc4a699c33e9f827fa0d0f857747c73bb7b17af945/numpy-2.4.3-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:32e3bef222ad6b052280311d1d60db8e259e4947052c3ae7dd6817451fc8a4c5", size = 15666601, upload-time = "2026-03-09T07:56:34.461Z" }, - { url = "https://files.pythonhosted.org/packages/bd/79/cc665495e4d57d0aa6fbcc0aa57aa82671dfc78fbf95fe733ed86d98f52a/numpy-2.4.3-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e7dd01a46700b1967487141a66ac1a3cf0dd8ebf1f08db37d46389401512ca97", size = 16621358, upload-time = "2026-03-09T07:56:36.852Z" }, - { url = "https://files.pythonhosted.org/packages/a8/40/b4ecb7224af1065c3539f5ecfff879d090de09608ad1008f02c05c770cb3/numpy-2.4.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:76f0f283506c28b12bba319c0fab98217e9f9b54e6160e9c79e9f7348ba32e9c", size = 17016135, upload-time = "2026-03-09T07:56:39.337Z" }, - { url = "https://files.pythonhosted.org/packages/f7/b1/6a88e888052eed951afed7a142dcdf3b149a030ca59b4c71eef085858e43/numpy-2.4.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:737f630a337364665aba3b5a77e56a68cc42d350edd010c345d65a3efa3addcc", size = 18345816, upload-time = "2026-03-09T07:56:42.31Z" }, - { url = "https://files.pythonhosted.org/packages/f3/8f/103a60c5f8c3d7fc678c19cd7b2476110da689ccb80bc18050efbaeae183/numpy-2.4.3-cp312-cp312-win32.whl", hash = "sha256:26952e18d82a1dbbc2f008d402021baa8d6fc8e84347a2072a25e08b46d698b9", size = 5960132, upload-time = "2026-03-09T07:56:44.851Z" }, - { url = "https://files.pythonhosted.org/packages/d7/7c/f5ee1bf6ed888494978046a809df2882aad35d414b622893322df7286879/numpy-2.4.3-cp312-cp312-win_amd64.whl", hash = "sha256:65f3c2455188f09678355f5cae1f959a06b778bc66d535da07bf2ef20cd319d5", size = 12316144, upload-time = "2026-03-09T07:56:47.057Z" }, - { url = "https://files.pythonhosted.org/packages/71/46/8d1cb3f7a00f2fb6394140e7e6623696e54c6318a9d9691bb4904672cf42/numpy-2.4.3-cp312-cp312-win_arm64.whl", hash = "sha256:2abad5c7fef172b3377502bde47892439bae394a71bc329f31df0fd829b41a9e", size = 10220364, upload-time = "2026-03-09T07:56:49.849Z" }, - { url = "https://files.pythonhosted.org/packages/64/e4/4dab9fb43c83719c29241c535d9e07be73bea4bc0c6686c5816d8e1b6689/numpy-2.4.3-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:c6b124bfcafb9e8d3ed09130dbee44848c20b3e758b6bbf006e641778927c028", size = 16834892, upload-time = "2026-03-09T07:58:35.334Z" }, - { url = "https://files.pythonhosted.org/packages/c9/29/f8b6d4af90fed3dfda84ebc0df06c9833d38880c79ce954e5b661758aa31/numpy-2.4.3-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:76dbb9d4e43c16cf9aa711fcd8de1e2eeb27539dcefb60a1d5e9f12fae1d1ed8", size = 14893070, upload-time = "2026-03-09T07:58:37.7Z" }, - { url = "https://files.pythonhosted.org/packages/9a/04/a19b3c91dbec0a49269407f15d5753673a09832daed40c45e8150e6fa558/numpy-2.4.3-pp311-pypy311_pp73-macosx_14_0_arm64.whl", hash = "sha256:29363fbfa6f8ee855d7569c96ce524845e3d726d6c19b29eceec7dd555dab152", size = 5399609, upload-time = "2026-03-09T07:58:39.853Z" }, - { url = "https://files.pythonhosted.org/packages/79/34/4d73603f5420eab89ea8a67097b31364bf7c30f811d4dd84b1659c7476d9/numpy-2.4.3-pp311-pypy311_pp73-macosx_14_0_x86_64.whl", hash = "sha256:bc71942c789ef415a37f0d4eab90341425a00d538cd0642445d30b41023d3395", size = 6714355, upload-time = "2026-03-09T07:58:42.365Z" }, - { url = "https://files.pythonhosted.org/packages/58/ad/1100d7229bb248394939a12a8074d485b655e8ed44207d328fdd7fcebc7b/numpy-2.4.3-pp311-pypy311_pp73-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7e58765ad74dcebd3ef0208a5078fba32dc8ec3578fe84a604432950cd043d79", size = 15800434, upload-time = "2026-03-09T07:58:44.837Z" }, - { url = "https://files.pythonhosted.org/packages/0c/fd/16d710c085d28ba4feaf29ac60c936c9d662e390344f94a6beaa2ac9899b/numpy-2.4.3-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8e236dbda4e1d319d681afcbb136c0c4a8e0f1a5c58ceec2adebb547357fe857", size = 16729409, upload-time = "2026-03-09T07:58:47.972Z" }, - { url = "https://files.pythonhosted.org/packages/57/a7/b35835e278c18b85206834b3aa3abe68e77a98769c59233d1f6300284781/numpy-2.4.3-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:4b42639cdde6d24e732ff823a3fa5b701d8acad89c4142bc1d0bd6dc85200ba5", size = 12504685, upload-time = "2026-03-09T07:58:50.525Z" }, +version = "2.4.4" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d7/9f/b8cef5bffa569759033adda9481211426f12f53299629b410340795c2514/numpy-2.4.4.tar.gz", hash = "sha256:2d390634c5182175533585cc89f3608a4682ccb173cc9bb940b2881c8d6f8fa0", size = 20731587, upload-time = "2026-03-29T13:22:01.298Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ef/c6/4218570d8c8ecc9704b5157a3348e486e84ef4be0ed3e38218ab473c83d2/numpy-2.4.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:f983334aea213c99992053ede6168500e5f086ce74fbc4acc3f2b00f5762e9db", size = 16976799, upload-time = "2026-03-29T13:18:15.438Z" }, + { url = "https://files.pythonhosted.org/packages/dd/92/b4d922c4a5f5dab9ed44e6153908a5c665b71acf183a83b93b690996e39b/numpy-2.4.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:72944b19f2324114e9dc86a159787333b77874143efcf89a5167ef83cfee8af0", size = 14971552, upload-time = "2026-03-29T13:18:18.606Z" }, + { url = "https://files.pythonhosted.org/packages/8a/dc/df98c095978fa6ee7b9a9387d1d58cbb3d232d0e69ad169a4ce784bde4fd/numpy-2.4.4-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:86b6f55f5a352b48d7fbfd2dbc3d5b780b2d79f4d3c121f33eb6efb22e9a2015", size = 5476566, upload-time = "2026-03-29T13:18:21.532Z" }, + { url = "https://files.pythonhosted.org/packages/28/34/b3fdcec6e725409223dd27356bdf5a3c2cc2282e428218ecc9cb7acc9763/numpy-2.4.4-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:ba1f4fc670ed79f876f70082eff4f9583c15fb9a4b89d6188412de4d18ae2f40", size = 6806482, upload-time = "2026-03-29T13:18:23.634Z" }, + { url = "https://files.pythonhosted.org/packages/68/62/63417c13aa35d57bee1337c67446761dc25ea6543130cf868eace6e8157b/numpy-2.4.4-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8a87ec22c87be071b6bdbd27920b129b94f2fc964358ce38f3822635a3e2e03d", size = 15973376, upload-time = "2026-03-29T13:18:26.677Z" }, + { url = "https://files.pythonhosted.org/packages/cf/c5/9fcb7e0e69cef59cf10c746b84f7d58b08bc66a6b7d459783c5a4f6101a6/numpy-2.4.4-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:df3775294accfdd75f32c74ae39fcba920c9a378a2fc18a12b6820aa8c1fb502", size = 16925137, upload-time = "2026-03-29T13:18:30.14Z" }, + { url = "https://files.pythonhosted.org/packages/7e/43/80020edacb3f84b9efdd1591120a4296462c23fd8db0dde1666f6ef66f13/numpy-2.4.4-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:0d4e437e295f18ec29bc79daf55e8a47a9113df44d66f702f02a293d93a2d6dd", size = 17329414, upload-time = "2026-03-29T13:18:33.733Z" }, + { url = "https://files.pythonhosted.org/packages/fd/06/af0658593b18a5f73532d377188b964f239eb0894e664a6c12f484472f97/numpy-2.4.4-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:6aa3236c78803afbcb255045fbef97a9e25a1f6c9888357d205ddc42f4d6eba5", size = 18658397, upload-time = "2026-03-29T13:18:37.511Z" }, + { url = "https://files.pythonhosted.org/packages/e6/ce/13a09ed65f5d0ce5c7dd0669250374c6e379910f97af2c08c57b0608eee4/numpy-2.4.4-cp311-cp311-win32.whl", hash = "sha256:30caa73029a225b2d40d9fae193e008e24b2026b7ee1a867b7ee8d96ca1a448e", size = 6239499, upload-time = "2026-03-29T13:18:40.372Z" }, + { url = "https://files.pythonhosted.org/packages/bd/63/05d193dbb4b5eec1eca73822d80da98b511f8328ad4ae3ca4caf0f4db91d/numpy-2.4.4-cp311-cp311-win_amd64.whl", hash = "sha256:6bbe4eb67390b0a0265a2c25458f6b90a409d5d069f1041e6aff1e27e3d9a79e", size = 12614257, upload-time = "2026-03-29T13:18:42.95Z" }, + { url = "https://files.pythonhosted.org/packages/87/c5/8168052f080c26fa984c413305012be54741c9d0d74abd7fbeeccae3889f/numpy-2.4.4-cp311-cp311-win_arm64.whl", hash = "sha256:fcfe2045fd2e8f3cb0ce9d4ba6dba6333b8fa05bb8a4939c908cd43322d14c7e", size = 10486775, upload-time = "2026-03-29T13:18:45.835Z" }, + { url = "https://files.pythonhosted.org/packages/28/05/32396bec30fb2263770ee910142f49c1476d08e8ad41abf8403806b520ce/numpy-2.4.4-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:15716cfef24d3a9762e3acdf87e27f58dc823d1348f765bbea6bef8c639bfa1b", size = 16689272, upload-time = "2026-03-29T13:18:49.223Z" }, + { url = "https://files.pythonhosted.org/packages/c5/f3/a983d28637bfcd763a9c7aafdb6d5c0ebf3d487d1e1459ffdb57e2f01117/numpy-2.4.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:23cbfd4c17357c81021f21540da84ee282b9c8fba38a03b7b9d09ba6b951421e", size = 14699573, upload-time = "2026-03-29T13:18:52.629Z" }, + { url = "https://files.pythonhosted.org/packages/9b/fd/e5ecca1e78c05106d98028114f5c00d3eddb41207686b2b7de3e477b0e22/numpy-2.4.4-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:8b3b60bb7cba2c8c81837661c488637eee696f59a877788a396d33150c35d842", size = 5204782, upload-time = "2026-03-29T13:18:55.579Z" }, + { url = "https://files.pythonhosted.org/packages/de/2f/702a4594413c1a8632092beae8aba00f1d67947389369b3777aed783fdca/numpy-2.4.4-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:e4a010c27ff6f210ff4c6ef34394cd61470d01014439b192ec22552ee867f2a8", size = 6552038, upload-time = "2026-03-29T13:18:57.769Z" }, + { url = "https://files.pythonhosted.org/packages/7f/37/eed308a8f56cba4d1fdf467a4fc67ef4ff4bf1c888f5fc980481890104b1/numpy-2.4.4-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f9e75681b59ddaa5e659898085ae0eaea229d054f2ac0c7e563a62205a700121", size = 15670666, upload-time = "2026-03-29T13:19:00.341Z" }, + { url = "https://files.pythonhosted.org/packages/0a/0d/0e3ecece05b7a7e87ab9fb587855548da437a061326fff64a223b6dcb78a/numpy-2.4.4-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:81f4a14bee47aec54f883e0cad2d73986640c1590eb9bfaaba7ad17394481e6e", size = 16645480, upload-time = "2026-03-29T13:19:03.63Z" }, + { url = "https://files.pythonhosted.org/packages/34/49/f2312c154b82a286758ee2f1743336d50651f8b5195db18cdb63675ff649/numpy-2.4.4-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:62d6b0f03b694173f9fcb1fb317f7222fd0b0b103e784c6549f5e53a27718c44", size = 17020036, upload-time = "2026-03-29T13:19:07.428Z" }, + { url = "https://files.pythonhosted.org/packages/7b/e9/736d17bd77f1b0ec4f9901aaec129c00d59f5d84d5e79bba540ef12c2330/numpy-2.4.4-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:fbc356aae7adf9e6336d336b9c8111d390a05df88f1805573ebb0807bd06fd1d", size = 18368643, upload-time = "2026-03-29T13:19:10.775Z" }, + { url = "https://files.pythonhosted.org/packages/63/f6/d417977c5f519b17c8a5c3bc9e8304b0908b0e21136fe43bf628a1343914/numpy-2.4.4-cp312-cp312-win32.whl", hash = "sha256:0d35aea54ad1d420c812bfa0385c71cd7cc5bcf7c65fed95fc2cd02fe8c79827", size = 5961117, upload-time = "2026-03-29T13:19:13.464Z" }, + { url = "https://files.pythonhosted.org/packages/2d/5b/e1deebf88ff431b01b7406ca3583ab2bbb90972bbe1c568732e49c844f7e/numpy-2.4.4-cp312-cp312-win_amd64.whl", hash = "sha256:b5f0362dc928a6ecd9db58868fca5e48485205e3855957bdedea308f8672ea4a", size = 12320584, upload-time = "2026-03-29T13:19:16.155Z" }, + { url = "https://files.pythonhosted.org/packages/58/89/e4e856ac82a68c3ed64486a544977d0e7bdd18b8da75b78a577ca31c4395/numpy-2.4.4-cp312-cp312-win_arm64.whl", hash = "sha256:846300f379b5b12cc769334464656bc882e0735d27d9726568bc932fdc49d5ec", size = 10221450, upload-time = "2026-03-29T13:19:18.994Z" }, + { url = "https://files.pythonhosted.org/packages/6b/33/8fae8f964a4f63ed528264ddf25d2b683d0b663e3cba26961eb838a7c1bd/numpy-2.4.4-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:58c8b5929fcb8287cbd6f0a3fae19c6e03a5c48402ae792962ac465224a629a4", size = 16854491, upload-time = "2026-03-29T13:21:38.03Z" }, + { url = "https://files.pythonhosted.org/packages/bc/d0/1aabee441380b981cf8cdda3ae7a46aa827d1b5a8cce84d14598bc94d6d9/numpy-2.4.4-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:eea7ac5d2dce4189771cedb559c738a71512768210dc4e4753b107a2048b3d0e", size = 14895830, upload-time = "2026-03-29T13:21:41.509Z" }, + { url = "https://files.pythonhosted.org/packages/a5/b8/aafb0d1065416894fccf4df6b49ef22b8db045187949545bced89c034b8e/numpy-2.4.4-pp311-pypy311_pp73-macosx_14_0_arm64.whl", hash = "sha256:51fc224f7ca4d92656d5a5eb315f12eb5fe2c97a66249aa7b5f562528a3be38c", size = 5400927, upload-time = "2026-03-29T13:21:44.747Z" }, + { url = "https://files.pythonhosted.org/packages/d6/77/063baa20b08b431038c7f9ff5435540c7b7265c78cf56012a483019ca72d/numpy-2.4.4-pp311-pypy311_pp73-macosx_14_0_x86_64.whl", hash = "sha256:28a650663f7314afc3e6ec620f44f333c386aad9f6fc472030865dc0ebb26ee3", size = 6715557, upload-time = "2026-03-29T13:21:47.406Z" }, + { url = "https://files.pythonhosted.org/packages/c7/a8/379542d45a14f149444c5c4c4e7714707239ce9cc1de8c2803958889da14/numpy-2.4.4-pp311-pypy311_pp73-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:19710a9ca9992d7174e9c52f643d4272dcd1558c5f7af7f6f8190f633bd651a7", size = 15804253, upload-time = "2026-03-29T13:21:50.753Z" }, + { url = "https://files.pythonhosted.org/packages/a2/c8/f0a45426d6d21e7ea3310a15cf90c43a14d9232c31a837702dba437f3373/numpy-2.4.4-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9b2aec6af35c113b05695ebb5749a787acd63cafc83086a05771d1e1cd1e555f", size = 16753552, upload-time = "2026-03-29T13:21:54.344Z" }, + { url = "https://files.pythonhosted.org/packages/04/74/f4c001f4714c3ad9ce037e18cf2b9c64871a84951eaa0baf683a9ca9301c/numpy-2.4.4-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:f2cf083b324a467e1ab358c105f6cad5ea950f50524668a80c486ff1db24e119", size = 12509075, upload-time = "2026-03-29T13:21:57.644Z" }, ] [[package]] @@ -502,16 +502,16 @@ wheels = [ [[package]] name = "pygments" -version = "2.19.2" +version = "2.20.0" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/b0/77/a5b8c569bf593b0140bde72ea885a803b82086995367bf2037de0159d924/pygments-2.19.2.tar.gz", hash = "sha256:636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887", size = 4968631, upload-time = "2025-06-21T13:39:12.283Z" } +sdist = { url = "https://files.pythonhosted.org/packages/c3/b2/bc9c9196916376152d655522fdcebac55e66de6603a76a02bca1b6414f6c/pygments-2.20.0.tar.gz", hash = "sha256:6757cd03768053ff99f3039c1a36d6c0aa0b263438fcab17520b30a303a82b5f", size = 4955991, upload-time = "2026-03-29T13:29:33.898Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/c7/21/705964c7812476f378728bdf590ca4b771ec72385c533964653c68e86bdc/pygments-2.19.2-py3-none-any.whl", hash = "sha256:86540386c03d588bb81d44bc3928634ff26449851e99741617ecb9037ee5ec0b", size = 1225217, upload-time = "2025-06-21T13:39:07.939Z" }, + { url = "https://files.pythonhosted.org/packages/f4/7e/a72dd26f3b0f4f2bf1dd8923c85f7ceb43172af56d63c7383eb62b332364/pygments-2.20.0-py3-none-any.whl", hash = "sha256:81a9e26dd42fd28a23a2d169d86d7ac03b46e2f8b59ed4698fb4785f946d0176", size = 1231151, upload-time = "2026-03-29T13:29:30.038Z" }, ] [[package]] name = "requests" -version = "2.32.5" +version = "2.33.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "certifi" }, @@ -519,34 +519,34 @@ dependencies = [ { name = "idna" }, { name = "urllib3" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/c9/74/b3ff8e6c8446842c3f5c837e9c3dfcfe2018ea6ecef224c710c85ef728f4/requests-2.32.5.tar.gz", hash = "sha256:dbba0bac56e100853db0ea71b82b4dfd5fe2bf6d3754a8893c3af500cec7d7cf", size = 134517, upload-time = "2025-08-18T20:46:02.573Z" } +sdist = { url = "https://files.pythonhosted.org/packages/34/64/8860370b167a9721e8956ae116825caff829224fbca0ca6e7bf8ddef8430/requests-2.33.0.tar.gz", hash = "sha256:c7ebc5e8b0f21837386ad0e1c8fe8b829fa5f544d8df3b2253bff14ef29d7652", size = 134232, upload-time = "2026-03-25T15:10:41.586Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/1e/db/4254e3eabe8020b458f1a747140d32277ec7a271daf1d235b70dc0b4e6e3/requests-2.32.5-py3-none-any.whl", hash = "sha256:2462f94637a34fd532264295e186976db0f5d453d1cdd31473c85a6a161affb6", size = 64738, upload-time = "2025-08-18T20:46:00.542Z" }, + { url = "https://files.pythonhosted.org/packages/56/5d/c814546c2333ceea4ba42262d8c4d55763003e767fa169adc693bd524478/requests-2.33.0-py3-none-any.whl", hash = "sha256:3324635456fa185245e24865e810cecec7b4caf933d7eb133dcde67d48cee69b", size = 65017, upload-time = "2026-03-25T15:10:40.382Z" }, ] [[package]] name = "ruff" -version = "0.15.7" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/a1/22/9e4f66ee588588dc6c9af6a994e12d26e19efbe874d1a909d09a6dac7a59/ruff-0.15.7.tar.gz", hash = "sha256:04f1ae61fc20fe0b148617c324d9d009b5f63412c0b16474f3d5f1a1a665f7ac", size = 4601277, upload-time = "2026-03-19T16:26:22.605Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/41/2f/0b08ced94412af091807b6119ca03755d651d3d93a242682bf020189db94/ruff-0.15.7-py3-none-linux_armv6l.whl", hash = "sha256:a81cc5b6910fb7dfc7c32d20652e50fa05963f6e13ead3c5915c41ac5d16668e", size = 10489037, upload-time = "2026-03-19T16:26:32.47Z" }, - { url = "https://files.pythonhosted.org/packages/91/4a/82e0fa632e5c8b1eba5ee86ecd929e8ff327bbdbfb3c6ac5d81631bef605/ruff-0.15.7-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:722d165bd52403f3bdabc0ce9e41fc47070ac56d7a91b4e0d097b516a53a3477", size = 10955433, upload-time = "2026-03-19T16:27:00.205Z" }, - { url = "https://files.pythonhosted.org/packages/ab/10/12586735d0ff42526ad78c049bf51d7428618c8b5c467e72508c694119df/ruff-0.15.7-py3-none-macosx_11_0_arm64.whl", hash = "sha256:7fbc2448094262552146cbe1b9643a92f66559d3761f1ad0656d4991491af49e", size = 10269302, upload-time = "2026-03-19T16:26:26.183Z" }, - { url = "https://files.pythonhosted.org/packages/eb/5d/32b5c44ccf149a26623671df49cbfbd0a0ae511ff3df9d9d2426966a8d57/ruff-0.15.7-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6b39329b60eba44156d138275323cc726bbfbddcec3063da57caa8a8b1d50adf", size = 10607625, upload-time = "2026-03-19T16:27:03.263Z" }, - { url = "https://files.pythonhosted.org/packages/5d/f1/f0001cabe86173aaacb6eb9bb734aa0605f9a6aa6fa7d43cb49cbc4af9c9/ruff-0.15.7-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:87768c151808505f2bfc93ae44e5f9e7c8518943e5074f76ac21558ef5627c85", size = 10324743, upload-time = "2026-03-19T16:27:09.791Z" }, - { url = "https://files.pythonhosted.org/packages/7a/87/b8a8f3d56b8d848008559e7c9d8bf367934d5367f6d932ba779456e2f73b/ruff-0.15.7-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fb0511670002c6c529ec66c0e30641c976c8963de26a113f3a30456b702468b0", size = 11138536, upload-time = "2026-03-19T16:27:06.101Z" }, - { url = "https://files.pythonhosted.org/packages/e4/f2/4fd0d05aab0c5934b2e1464784f85ba2eab9d54bffc53fb5430d1ed8b829/ruff-0.15.7-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e0d19644f801849229db8345180a71bee5407b429dd217f853ec515e968a6912", size = 11994292, upload-time = "2026-03-19T16:26:48.718Z" }, - { url = "https://files.pythonhosted.org/packages/64/22/fc4483871e767e5e95d1622ad83dad5ebb830f762ed0420fde7dfa9d9b08/ruff-0.15.7-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4806d8e09ef5e84eb19ba833d0442f7e300b23fe3f0981cae159a248a10f0036", size = 11398981, upload-time = "2026-03-19T16:26:54.513Z" }, - { url = "https://files.pythonhosted.org/packages/b0/99/66f0343176d5eab02c3f7fcd2de7a8e0dd7a41f0d982bee56cd1c24db62b/ruff-0.15.7-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dce0896488562f09a27b9c91b1f58a097457143931f3c4d519690dea54e624c5", size = 11242422, upload-time = "2026-03-19T16:26:29.277Z" }, - { url = "https://files.pythonhosted.org/packages/5d/3a/a7060f145bfdcce4c987ea27788b30c60e2c81d6e9a65157ca8afe646328/ruff-0.15.7-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:1852ce241d2bc89e5dc823e03cff4ce73d816b5c6cdadd27dbfe7b03217d2a12", size = 11232158, upload-time = "2026-03-19T16:26:42.321Z" }, - { url = "https://files.pythonhosted.org/packages/a7/53/90fbb9e08b29c048c403558d3cdd0adf2668b02ce9d50602452e187cd4af/ruff-0.15.7-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:5f3e4b221fb4bd293f79912fc5e93a9063ebd6d0dcbd528f91b89172a9b8436c", size = 10577861, upload-time = "2026-03-19T16:26:57.459Z" }, - { url = "https://files.pythonhosted.org/packages/2f/aa/5f486226538fe4d0f0439e2da1716e1acf895e2a232b26f2459c55f8ddad/ruff-0.15.7-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:b15e48602c9c1d9bdc504b472e90b90c97dc7d46c7028011ae67f3861ceba7b4", size = 10327310, upload-time = "2026-03-19T16:26:35.909Z" }, - { url = "https://files.pythonhosted.org/packages/99/9e/271afdffb81fe7bfc8c43ba079e9d96238f674380099457a74ccb3863857/ruff-0.15.7-py3-none-musllinux_1_2_i686.whl", hash = "sha256:1b4705e0e85cedc74b0a23cf6a179dbb3df184cb227761979cc76c0440b5ab0d", size = 10840752, upload-time = "2026-03-19T16:26:45.723Z" }, - { url = "https://files.pythonhosted.org/packages/bf/29/a4ae78394f76c7759953c47884eb44de271b03a66634148d9f7d11e721bd/ruff-0.15.7-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:112c1fa316a558bb34319282c1200a8bf0495f1b735aeb78bfcb2991e6087580", size = 11336961, upload-time = "2026-03-19T16:26:39.076Z" }, - { url = "https://files.pythonhosted.org/packages/26/6b/8786ba5736562220d588a2f6653e6c17e90c59ced34a2d7b512ef8956103/ruff-0.15.7-py3-none-win32.whl", hash = "sha256:6d39e2d3505b082323352f733599f28169d12e891f7dd407f2d4f54b4c2886de", size = 10582538, upload-time = "2026-03-19T16:26:15.992Z" }, - { url = "https://files.pythonhosted.org/packages/2b/e9/346d4d3fffc6871125e877dae8d9a1966b254fbd92a50f8561078b88b099/ruff-0.15.7-py3-none-win_amd64.whl", hash = "sha256:4d53d712ddebcd7dace1bc395367aec12c057aacfe9adbb6d832302575f4d3a1", size = 11755839, upload-time = "2026-03-19T16:26:19.897Z" }, - { url = "https://files.pythonhosted.org/packages/8f/e8/726643a3ea68c727da31570bde48c7a10f1aa60eddd628d94078fec586ff/ruff-0.15.7-py3-none-win_arm64.whl", hash = "sha256:18e8d73f1c3fdf27931497972250340f92e8c861722161a9caeb89a58ead6ed2", size = 11023304, upload-time = "2026-03-19T16:26:51.669Z" }, +version = "0.15.8" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/14/b0/73cf7550861e2b4824950b8b52eebdcc5adc792a00c514406556c5b80817/ruff-0.15.8.tar.gz", hash = "sha256:995f11f63597ee362130d1d5a327a87cb6f3f5eae3094c620bcc632329a4d26e", size = 4610921, upload-time = "2026-03-26T18:39:38.675Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/4a/92/c445b0cd6da6e7ae51e954939cb69f97e008dbe750cfca89b8cedc081be7/ruff-0.15.8-py3-none-linux_armv6l.whl", hash = "sha256:cbe05adeba76d58162762d6b239c9056f1a15a55bd4b346cfd21e26cd6ad7bc7", size = 10527394, upload-time = "2026-03-26T18:39:41.566Z" }, + { url = "https://files.pythonhosted.org/packages/eb/92/f1c662784d149ad1414cae450b082cf736430c12ca78367f20f5ed569d65/ruff-0.15.8-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:d3e3d0b6ba8dca1b7ef9ab80a28e840a20070c4b62e56d675c24f366ef330570", size = 10905693, upload-time = "2026-03-26T18:39:30.364Z" }, + { url = "https://files.pythonhosted.org/packages/ca/f2/7a631a8af6d88bcef997eb1bf87cc3da158294c57044aafd3e17030613de/ruff-0.15.8-py3-none-macosx_11_0_arm64.whl", hash = "sha256:6ee3ae5c65a42f273f126686353f2e08ff29927b7b7e203b711514370d500de3", size = 10323044, upload-time = "2026-03-26T18:39:33.37Z" }, + { url = "https://files.pythonhosted.org/packages/67/18/1bf38e20914a05e72ef3b9569b1d5c70a7ef26cd188d69e9ca8ef588d5bf/ruff-0.15.8-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fdce027ada77baa448077ccc6ebb2fa9c3c62fd110d8659d601cf2f475858d94", size = 10629135, upload-time = "2026-03-26T18:39:44.142Z" }, + { url = "https://files.pythonhosted.org/packages/d2/e9/138c150ff9af60556121623d41aba18b7b57d95ac032e177b6a53789d279/ruff-0.15.8-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:12e617fc01a95e5821648a6df341d80456bd627bfab8a829f7cfc26a14a4b4a3", size = 10348041, upload-time = "2026-03-26T18:39:52.178Z" }, + { url = "https://files.pythonhosted.org/packages/02/f1/5bfb9298d9c323f842c5ddeb85f1f10ef51516ac7a34ba446c9347d898df/ruff-0.15.8-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:432701303b26416d22ba696c39f2c6f12499b89093b61360abc34bcc9bf07762", size = 11121987, upload-time = "2026-03-26T18:39:55.195Z" }, + { url = "https://files.pythonhosted.org/packages/10/11/6da2e538704e753c04e8d86b1fc55712fdbdcc266af1a1ece7a51fff0d10/ruff-0.15.8-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d910ae974b7a06a33a057cb87d2a10792a3b2b3b35e33d2699fdf63ec8f6b17a", size = 11951057, upload-time = "2026-03-26T18:39:19.18Z" }, + { url = "https://files.pythonhosted.org/packages/83/f0/c9208c5fd5101bf87002fed774ff25a96eea313d305f1e5d5744698dc314/ruff-0.15.8-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2033f963c43949d51e6fdccd3946633c6b37c484f5f98c3035f49c27395a8ab8", size = 11464613, upload-time = "2026-03-26T18:40:06.301Z" }, + { url = "https://files.pythonhosted.org/packages/f8/22/d7f2fabdba4fae9f3b570e5605d5eb4500dcb7b770d3217dca4428484b17/ruff-0.15.8-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0f29b989a55572fb885b77464cf24af05500806ab4edf9a0fd8977f9759d85b1", size = 11257557, upload-time = "2026-03-26T18:39:57.972Z" }, + { url = "https://files.pythonhosted.org/packages/71/8c/382a9620038cf6906446b23ce8632ab8c0811b8f9d3e764f58bedd0c9a6f/ruff-0.15.8-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:ac51d486bf457cdc985a412fb1801b2dfd1bd8838372fc55de64b1510eff4bec", size = 11169440, upload-time = "2026-03-26T18:39:22.205Z" }, + { url = "https://files.pythonhosted.org/packages/4d/0d/0994c802a7eaaf99380085e4e40c845f8e32a562e20a38ec06174b52ef24/ruff-0.15.8-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:c9861eb959edab053c10ad62c278835ee69ca527b6dcd72b47d5c1e5648964f6", size = 10605963, upload-time = "2026-03-26T18:39:46.682Z" }, + { url = "https://files.pythonhosted.org/packages/19/aa/d624b86f5b0aad7cef6bbf9cd47a6a02dfdc4f72c92a337d724e39c9d14b/ruff-0.15.8-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:8d9a5b8ea13f26ae90838afc33f91b547e61b794865374f114f349e9036835fb", size = 10357484, upload-time = "2026-03-26T18:39:49.176Z" }, + { url = "https://files.pythonhosted.org/packages/35/c3/e0b7835d23001f7d999f3895c6b569927c4d39912286897f625736e1fd04/ruff-0.15.8-py3-none-musllinux_1_2_i686.whl", hash = "sha256:c2a33a529fb3cbc23a7124b5c6ff121e4d6228029cba374777bd7649cc8598b8", size = 10830426, upload-time = "2026-03-26T18:40:03.702Z" }, + { url = "https://files.pythonhosted.org/packages/f0/51/ab20b322f637b369383adc341d761eaaa0f0203d6b9a7421cd6e783d81b9/ruff-0.15.8-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:75e5cd06b1cf3f47a3996cfc999226b19aa92e7cce682dcd62f80d7035f98f49", size = 11345125, upload-time = "2026-03-26T18:39:27.799Z" }, + { url = "https://files.pythonhosted.org/packages/37/e6/90b2b33419f59d0f2c4c8a48a4b74b460709a557e8e0064cf33ad894f983/ruff-0.15.8-py3-none-win32.whl", hash = "sha256:bc1f0a51254ba21767bfa9a8b5013ca8149dcf38092e6a9eb704d876de94dc34", size = 10571959, upload-time = "2026-03-26T18:39:36.117Z" }, + { url = "https://files.pythonhosted.org/packages/1f/a2/ef467cb77099062317154c63f234b8a7baf7cb690b99af760c5b68b9ee7f/ruff-0.15.8-py3-none-win_amd64.whl", hash = "sha256:04f79eff02a72db209d47d665ba7ebcad609d8918a134f86cb13dd132159fc89", size = 11743893, upload-time = "2026-03-26T18:39:25.01Z" }, + { url = "https://files.pythonhosted.org/packages/15/e2/77be4fff062fa78d9b2a4dea85d14785dac5f1d0c1fb58ed52331f0ebe28/ruff-0.15.8-py3-none-win_arm64.whl", hash = "sha256:cf891fa8e3bb430c0e7fac93851a5978fc99c8fa2c053b57b118972866f8e5f2", size = 11048175, upload-time = "2026-03-26T18:40:01.06Z" }, ] [[package]] @@ -609,26 +609,26 @@ wheels = [ [[package]] name = "ty" -version = "0.0.24" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/7a/96/652a425030f95dc2c9548d9019e52502e17079e1daeefbc4036f1c0905b4/ty-0.0.24.tar.gz", hash = "sha256:9fe42f6b98207bdaef51f71487d6d087f2cb02555ee3939884d779b2b3cc8bfc", size = 5354286, upload-time = "2026-03-19T16:55:57.035Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/da/e5/34457ee11708e734ba81ad65723af83030e484f961e281d57d1eecf08951/ty-0.0.24-py3-none-linux_armv6l.whl", hash = "sha256:1ab4f1f61334d533a3fdf5d9772b51b1300ac5da4f3cdb0be9657a3ccb2ce3e7", size = 10394877, upload-time = "2026-03-19T16:55:54.246Z" }, - { url = "https://files.pythonhosted.org/packages/44/81/bc9a1b1a87f43db15ab64ad781a4f999734ec3b470ad042624fa875b20e6/ty-0.0.24-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:facbf2c4aaa6985229e08f8f9bf152215eb078212f22b5c2411f35386688ab42", size = 10211109, upload-time = "2026-03-19T16:55:28.554Z" }, - { url = "https://files.pythonhosted.org/packages/e4/63/cfc805adeaa61d63ba3ea71127efa7d97c40ba36d97ee7bd957341d05107/ty-0.0.24-py3-none-macosx_11_0_arm64.whl", hash = "sha256:b6d2a3b6d4470c483552a31e9b368c86f154dcc964bccb5406159dc9cd362246", size = 9694769, upload-time = "2026-03-19T16:55:34.309Z" }, - { url = "https://files.pythonhosted.org/packages/33/09/edc220726b6ec44a58900401f6b27140997ef15026b791e26b69a6e69eb5/ty-0.0.24-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0c94c25d0500939fd5f8f16ce41cbed5b20528702c1d649bf80300253813f0a2", size = 10176287, upload-time = "2026-03-19T16:55:37.17Z" }, - { url = "https://files.pythonhosted.org/packages/f8/bf/cbe2227be711e65017655d8ee4d050f4c92b113fb4dc4c3bd6a19d3a86d8/ty-0.0.24-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:89cbe7bc7df0fab02dbd8cda79b737df83f1ef7fb573b08c0ee043dc68cffb08", size = 10214832, upload-time = "2026-03-19T16:56:08.518Z" }, - { url = "https://files.pythonhosted.org/packages/af/1d/d15803ee47e9143d10e10bd81ccc14761d08758082bda402950685f0ddfe/ty-0.0.24-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:db2c5d269bcc9b764850c99f457b5018a79b3ef40ecfbc03344e65effd6cf743", size = 10709892, upload-time = "2026-03-19T16:56:05.727Z" }, - { url = "https://files.pythonhosted.org/packages/36/12/6db0d86c477147f67b9052de209421d76c3e855197b000c25fcbbe86b3a2/ty-0.0.24-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ba44512db5b97c3bbd59d93e11296e8548d0c9a3bdd1280de36d7ff22d351896", size = 11280872, upload-time = "2026-03-19T16:56:02.899Z" }, - { url = "https://files.pythonhosted.org/packages/1b/fc/155fe83a97c06d33ccc9e0f428258b32df2e08a428300c715d34757f0111/ty-0.0.24-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a52b7f589c3205512a9c50ba5b2b1e8c0698b72e51b8b9285c90420c06f1cae8", size = 11060520, upload-time = "2026-03-19T16:55:59.956Z" }, - { url = "https://files.pythonhosted.org/packages/ac/f1/32c05a1c4c3c2a95c5b7361dee03a9bf1231d4ad096b161c838b45bce5a0/ty-0.0.24-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7981df5c709c054da4ac5d7c93f8feb8f45e69e829e4461df4d5f0988fe67d04", size = 10791455, upload-time = "2026-03-19T16:55:25.728Z" }, - { url = "https://files.pythonhosted.org/packages/17/2c/53c1ea6bedfa4d4ab64d4de262d8f5e405ecbffefd364459c628c0310d33/ty-0.0.24-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:b2860151ad95a00d0f0280b8fef79900d08dcd63276b57e6e5774f2c055979c5", size = 10156708, upload-time = "2026-03-19T16:55:45.563Z" }, - { url = "https://files.pythonhosted.org/packages/45/39/7d2919cf194707169474d80720a5f3d793e983416f25e7ffcf80504c9df2/ty-0.0.24-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:5674a1146d927ab77ff198a88e0c4505134ced342a0e7d1beb4a076a728b7496", size = 10236263, upload-time = "2026-03-19T16:55:31.474Z" }, - { url = "https://files.pythonhosted.org/packages/cf/7f/48eac722f2fd12a5b7aae0effdcb75c46053f94b783d989e3ef0d7380082/ty-0.0.24-py3-none-musllinux_1_2_i686.whl", hash = "sha256:438ecbf1608a9b16dd84502f3f1b23ef2ef32bbd0ab3e0ca5a82f0e0d1cd41ea", size = 10402559, upload-time = "2026-03-19T16:55:39.602Z" }, - { url = "https://files.pythonhosted.org/packages/75/e0/8cf868b9749ce1e5166462759545964e95b02353243594062b927d8bff2a/ty-0.0.24-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:ddeed3098dd92a83964e7aa7b41e509ba3530eb539fc4cd8322ff64a09daf1f5", size = 10893684, upload-time = "2026-03-19T16:55:51.439Z" }, - { url = "https://files.pythonhosted.org/packages/17/9f/f54bf3be01d2c2ed731d10a5afa3324dc66f987a6ae0a4a6cbfa2323d080/ty-0.0.24-py3-none-win32.whl", hash = "sha256:83013fb3a4764a8f8bcc6ca11ff8bdfd8c5f719fc249241cb2b8916e80778eb1", size = 9781542, upload-time = "2026-03-19T16:56:11.588Z" }, - { url = "https://files.pythonhosted.org/packages/fb/49/c004c5cc258b10b3a145666e9a9c28ae7678bc958c8926e8078d5d769081/ty-0.0.24-py3-none-win_amd64.whl", hash = "sha256:748a60eb6912d1cf27aaab105ffadb6f4d2e458a3fcadfbd3cf26db0d8062eeb", size = 10764801, upload-time = "2026-03-19T16:55:42.752Z" }, - { url = "https://files.pythonhosted.org/packages/e2/59/006a074e185bfccf5e4c026015245ab4fcd2362b13a8d24cf37a277909a9/ty-0.0.24-py3-none-win_arm64.whl", hash = "sha256:280a3d31e86d0721947238f17030c33f0911cae851d108ea9f4e3ab12a5ed01f", size = 10194093, upload-time = "2026-03-19T16:55:48.303Z" }, +version = "0.0.26" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/18/94/4879b81f8681117ccaf31544579304f6dc2ddcc0c67f872afb35869643a2/ty-0.0.26.tar.gz", hash = "sha256:0496b62405d62de7b954d6d677dc1cc5d3046197215d7a0a7fef37745d7b6d29", size = 5393643, upload-time = "2026-03-26T16:27:11.067Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/83/24/99fe33ecd7e16d23c53b0d4244778c6d1b6eb1663b091236dcba22882d67/ty-0.0.26-py3-none-linux_armv6l.whl", hash = "sha256:35beaa56cf59725fd59ab35d8445bbd40b97fe76db39b052b1fcb31f9bf8adf7", size = 10521856, upload-time = "2026-03-26T16:27:06.335Z" }, + { url = "https://files.pythonhosted.org/packages/55/97/1b5e939e2ff69b9bb279ab680bfa8f677d886309a1ac8d9588fd6ce58146/ty-0.0.26-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:487a0be58ab0eb02e31ba71eb6953812a0f88e50633469b0c0ce3fb795fe0fa1", size = 10320958, upload-time = "2026-03-26T16:27:13.849Z" }, + { url = "https://files.pythonhosted.org/packages/71/25/37081461e13d38a190e5646948d7bc42084f7bd1c6b44f12550be3923e7e/ty-0.0.26-py3-none-macosx_11_0_arm64.whl", hash = "sha256:a01b7de5693379646d423b68f119719a1338a20017ba48a93eefaff1ee56f97b", size = 9799905, upload-time = "2026-03-26T16:26:55.805Z" }, + { url = "https://files.pythonhosted.org/packages/a1/1c/295d8f55a7b0e037dfc3a5ec4bdda3ab3cbca6f492f725bf269f96a4d841/ty-0.0.26-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:628c3ee869d113dd2bd249925662fd39d9d0305a6cb38f640ddaa7436b74a1ef", size = 10317507, upload-time = "2026-03-26T16:27:31.887Z" }, + { url = "https://files.pythonhosted.org/packages/1d/62/48b3875c5d2f48fe017468d4bbdde1164c76a8184374f1d5e6162cf7d9b8/ty-0.0.26-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:63d04f35f5370cbc91c0b9675dc83e0c53678125a7b629c9c95769e86f123e65", size = 10319821, upload-time = "2026-03-26T16:27:29.647Z" }, + { url = "https://files.pythonhosted.org/packages/ff/28/cfb2d495046d5bf42d532325cea7412fa1189912d549dbfae417a24fd794/ty-0.0.26-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4a53c4e6f6a91927f8b90e584a4b12bcde05b0c1870ddff8d17462168ad7947a", size = 10831757, upload-time = "2026-03-26T16:27:37.441Z" }, + { url = "https://files.pythonhosted.org/packages/26/bf/dbc3e42f448a2d862651de070b4108028c543ca18cab096b38d7de449915/ty-0.0.26-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:caf2ced0e58d898d5e3ba5cb843e0ebd377c8a461464748586049afbd9321f51", size = 11369556, upload-time = "2026-03-26T16:26:58.655Z" }, + { url = "https://files.pythonhosted.org/packages/92/4c/6d2f8f34bc6d502ab778c9345a4a936a72ae113de11329c1764bb1f204f6/ty-0.0.26-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:384807bbcb7d7ce9b97ee5aaa6417a8ae03ccfb426c52b08018ca62cf60f5430", size = 11085679, upload-time = "2026-03-26T16:27:21.746Z" }, + { url = "https://files.pythonhosted.org/packages/cc/f4/f3f61c203bc980dd9bba0ba7ed3c6e81ddfd36b286330f9487c2c7d041aa/ty-0.0.26-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8a2c766a94d79b4f82995d41229702caf2d76e5c440ec7e543d05c70e98bf8ab", size = 10900581, upload-time = "2026-03-26T16:27:24.39Z" }, + { url = "https://files.pythonhosted.org/packages/3d/fd/3ca1b4e4bdd129829e9ce78677e0f8e0f1038a7702dccecfa52f037c6046/ty-0.0.26-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:f41ac45a0f8e3e8e181508d863a0a62156341db0f624ffd004b97ee550a9de80", size = 10294401, upload-time = "2026-03-26T16:27:03.999Z" }, + { url = "https://files.pythonhosted.org/packages/de/20/4ee3d8c3f90e008843795c765cb8bb245f188c23e5e5cc612c7697406fba/ty-0.0.26-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:73eb8327a34d529438dfe4db46796946c4e825167cbee434dc148569892e435f", size = 10351469, upload-time = "2026-03-26T16:27:19.003Z" }, + { url = "https://files.pythonhosted.org/packages/3d/b1/9fb154ade65906d4148f0b999c4a8257c2a34253cb72e15d84c1f04a064e/ty-0.0.26-py3-none-musllinux_1_2_i686.whl", hash = "sha256:4bb53a79259516535a1b55f613ba1619e9c666854946474ca8418c35a5c4fd60", size = 10529488, upload-time = "2026-03-26T16:27:01.378Z" }, + { url = "https://files.pythonhosted.org/packages/a5/70/9b02b03b1862e27b64143db65946d68b138160a5b6bfea193bee0b8bbc34/ty-0.0.26-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:2f0e75edc1aeb1b4b84af516c7891f631254a4ca3dcd15e848fa1e061e1fe9da", size = 10999015, upload-time = "2026-03-26T16:27:34.636Z" }, + { url = "https://files.pythonhosted.org/packages/21/16/0a56b8667296e2989b9d48095472d98ebf57a0006c71f2a101bbc62a142d/ty-0.0.26-py3-none-win32.whl", hash = "sha256:943c998c5523ed6b519c899c0c39b26b4c751a9759e460fb964765a44cde226f", size = 9912378, upload-time = "2026-03-26T16:27:08.999Z" }, + { url = "https://files.pythonhosted.org/packages/60/c2/fef0d4bba9cd89a82d725b3b1a66efb1b36629ecf0fb1d8e916cb75b8829/ty-0.0.26-py3-none-win_amd64.whl", hash = "sha256:19c856d343efeb1ecad8ee220848f5d2c424daf7b2feda357763ad3036e2172f", size = 10863737, upload-time = "2026-03-26T16:27:27.06Z" }, + { url = "https://files.pythonhosted.org/packages/4d/05/888ebcb3c4d3b6b72d5d3241fddd299142caa3c516e6d26a9cd887dfed3b/ty-0.0.26-py3-none-win_arm64.whl", hash = "sha256:2cde58ccffa046db1223dc28f3e7d4f2c7da8267e97cc5cd186af6fe85f1758a", size = 10285408, upload-time = "2026-03-26T16:27:16.432Z" }, ] [[package]] From c40213bdf056c6273f010ffb6392919b013ecce7 Mon Sep 17 00:00:00 2001 From: Daniel Koepping Date: Tue, 31 Mar 2026 11:12:48 -0700 Subject: [PATCH 202/229] Add Tesla FSD 14 firmware (#3269) Add Model Y FSD 14 FW --- opendbc/car/tesla/fingerprints.py | 1 + opendbc/car/tesla/values.py | 1 + 2 files changed, 2 insertions(+) diff --git a/opendbc/car/tesla/fingerprints.py b/opendbc/car/tesla/fingerprints.py index 1a96263c048..9b33fd007fd 100644 --- a/opendbc/car/tesla/fingerprints.py +++ b/opendbc/car/tesla/fingerprints.py @@ -39,6 +39,7 @@ b'TeMYG4_Legacy3Y_0.0.0 (5),Y4P003.03.2', b'TeMYG4_Legacy3Y_0.0.0 (6),Y4003.04.0', b'TeMYG4_Main_0.0.0 (77),Y4003.05.4', + b'TeMYG4_Main_0.0.0 (78),Y4003.06.0', b'TeMYG4_SingleECU_0.0.0 (28),Y4S002.23.0', b'TeMYG4_SingleECU_0.0.0 (33),Y4S002.26', ], diff --git a/opendbc/car/tesla/values.py b/opendbc/car/tesla/values.py index 5f25e990ec7..1d7f1775b53 100644 --- a/opendbc/car/tesla/values.py +++ b/opendbc/car/tesla/values.py @@ -83,6 +83,7 @@ class CAR(Platforms): CAR.TESLA_MODEL_Y: [ b'TeMYG4_Legacy3Y_0.0.0 (6),Y4003.04.0', b'TeMYG4_Main_0.0.0 (77),Y4003.05.4', + b'TeMYG4_Main_0.0.0 (78),Y4003.06.0', ] } From ef70686afee3e0fe5e6be4938eaafc52e9e77935 Mon Sep 17 00:00:00 2001 From: Daniel Koepping Date: Wed, 1 Apr 2026 16:03:56 -0700 Subject: [PATCH 203/229] Rivian migration (#3273) rivian migration --- opendbc/car/fingerprints.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/opendbc/car/fingerprints.py b/opendbc/car/fingerprints.py index 206177f8ce7..81800aaa3a9 100644 --- a/opendbc/car/fingerprints.py +++ b/opendbc/car/fingerprints.py @@ -8,6 +8,7 @@ from opendbc.car.mazda.values import CAR as MAZDA from opendbc.car.mock.values import CAR as MOCK from opendbc.car.nissan.values import CAR as NISSAN +from opendbc.car.rivian.values import CAR as RIVIAN from opendbc.car.subaru.values import CAR as SUBARU from opendbc.car.toyota.values import CAR as TOYOTA from opendbc.car.volkswagen.values import CAR as VW @@ -333,6 +334,8 @@ def all_legacy_fingerprint_cars(): "SKODA SCALA 1ST GEN": VW.SKODA_KAMIQ_MK1, "SKODA_SCALA_MK1": VW.SKODA_KAMIQ_MK1, "SKODA SUPERB 3RD GEN": VW.SKODA_SUPERB_MK3, + "RIVIAN_R1_GEN1": RIVIAN.RIVIAN_R1, + "RIVIAN_R1_GEN2": RIVIAN.RIVIAN_R1, "mock": MOCK.MOCK, } From b5ed5d7052a3bcd333c922134af277180c4a5685 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Thu, 2 Apr 2026 21:21:43 -0700 Subject: [PATCH 204/229] HKG CANFD: rename LKA steering param (#3279) * sane name * HDA1 * one more --- opendbc/car/hyundai/carcontroller.py | 10 ++-- opendbc/car/hyundai/carstate.py | 4 +- opendbc/car/hyundai/hyundaicanfd.py | 8 ++-- opendbc/car/hyundai/interface.py | 16 +++---- opendbc/car/hyundai/tests/test_hyundai.py | 2 +- opendbc/car/hyundai/values.py | 14 +++--- opendbc/safety/modes/hyundai_canfd.h | 48 +++++++++---------- opendbc/safety/modes/hyundai_common.h | 8 ++-- opendbc/safety/tests/safety_replay/helpers.py | 4 +- opendbc/safety/tests/test_hyundai_canfd.py | 8 ++-- 10 files changed, 61 insertions(+), 61 deletions(-) diff --git a/opendbc/car/hyundai/carcontroller.py b/opendbc/car/hyundai/carcontroller.py index 6d6aa8ad947..ee9a5d6586b 100644 --- a/opendbc/car/hyundai/carcontroller.py +++ b/opendbc/car/hyundai/carcontroller.py @@ -90,12 +90,12 @@ def update(self, CC, CS, now_nanos): if self.frame % 100 == 0 and not (self.CP.flags & HyundaiFlags.CANFD_CAMERA_SCC) and self.CP.openpilotLongitudinalControl: # for longitudinal control, either radar or ADAS driving ECU addr, bus = 0x7d0, self.CAN.ECAN if self.CP.flags & HyundaiFlags.CANFD else 0 - if self.CP.flags & HyundaiFlags.CANFD_LKA_STEERING.value: + if self.CP.flags & HyundaiFlags.CANFD_LKA_STEER_MSG.value: addr, bus = 0x730, self.CAN.ECAN can_sends.append(make_tester_present_msg(addr, bus, suppress_response=True)) # for blinkers - if self.CP.flags & HyundaiFlags.ENABLE_BLINKERS: + if self.CP.flags & HyundaiFlags.CANFD_ENABLE_BLINKERS: can_sends.append(make_tester_present_msg(0x7b1, self.CAN.ECAN, suppress_response=True)) # *** CAN/CAN FD specific *** @@ -163,7 +163,7 @@ def create_can_msgs(self, apply_steer_req, apply_torque, torque_fault, set_speed def create_canfd_msgs(self, apply_steer_req, apply_torque, set_speed_in_units, accel, stopping, hud_control, CS, CC): can_sends = [] - lka_steering = self.CP.flags & HyundaiFlags.CANFD_LKA_STEERING + lka_steering = self.CP.flags & HyundaiFlags.CANFD_LKA_STEER_MSG lka_steering_long = lka_steering and self.CP.openpilotLongitudinalControl # steering control @@ -172,14 +172,14 @@ def create_canfd_msgs(self, apply_steer_req, apply_torque, set_speed_in_units, a # prevent LFA from activating on LKA steering cars by sending "no lane lines detected" to ADAS ECU if self.frame % 5 == 0 and lka_steering: can_sends.append(hyundaicanfd.create_suppress_lfa(self.packer, self.CAN, CS.lfa_block_msg, - self.CP.flags & HyundaiFlags.CANFD_LKA_STEERING_ALT)) + self.CP.flags & HyundaiFlags.CANFD_LKA_STEER_MSG_ALT)) # LFA and HDA icons if self.frame % 5 == 0 and (not lka_steering or lka_steering_long): can_sends.append(hyundaicanfd.create_lfahda_cluster(self.packer, self.CAN, CC.enabled)) # blinkers - if lka_steering and self.CP.flags & HyundaiFlags.ENABLE_BLINKERS: + if lka_steering and self.CP.flags & HyundaiFlags.CANFD_ENABLE_BLINKERS: can_sends.extend(hyundaicanfd.create_spas_messages(self.packer, self.CAN, CC.leftBlinker, CC.rightBlinker)) if self.CP.openpilotLongitudinalControl: diff --git a/opendbc/car/hyundai/carstate.py b/opendbc/car/hyundai/carstate.py index 0c52d51658e..5786006be2e 100644 --- a/opendbc/car/hyundai/carstate.py +++ b/opendbc/car/hyundai/carstate.py @@ -283,8 +283,8 @@ def update_canfd(self, can_parsers) -> structs.CarState: self.buttons_counter = cp.vl[self.cruise_btns_msg_canfd]["COUNTER"] ret.accFaulted = cp.vl["TCS"]["ACCEnable"] != 0 # 0 ACC CONTROL ENABLED, 1-3 ACC CONTROL DISABLED - if self.CP.flags & HyundaiFlags.CANFD_LKA_STEERING: - self.lfa_block_msg = copy.copy(cp_cam.vl["CAM_0x362"] if self.CP.flags & HyundaiFlags.CANFD_LKA_STEERING_ALT + if self.CP.flags & HyundaiFlags.CANFD_LKA_STEER_MSG: + self.lfa_block_msg = copy.copy(cp_cam.vl["CAM_0x362"] if self.CP.flags & HyundaiFlags.CANFD_LKA_STEER_MSG_ALT else cp_cam.vl["CAM_0x2a4"]) ret.buttonEvents = [*create_button_events(self.cruise_buttons[-1], prev_cruise_buttons, BUTTONS_DICT), diff --git a/opendbc/car/hyundai/hyundaicanfd.py b/opendbc/car/hyundai/hyundaicanfd.py index 7059bf169c1..1d12549deb0 100644 --- a/opendbc/car/hyundai/hyundaicanfd.py +++ b/opendbc/car/hyundai/hyundaicanfd.py @@ -9,7 +9,7 @@ def __init__(self, CP, fingerprint=None, lka_steering=None) -> None: super().__init__(CP, fingerprint) if lka_steering is None: - lka_steering = CP.flags & HyundaiFlags.CANFD_LKA_STEERING.value if CP is not None else False + lka_steering = CP.flags & HyundaiFlags.CANFD_LKA_STEER_MSG.value if CP is not None else False # On the CAN-FD platforms, the LKAS camera is on both A-CAN and E-CAN. LKA steering cars # have a different harness than the LFA steering variants in order to split @@ -48,8 +48,8 @@ def create_steering_messages(packer, CP, CAN, enabled, lat_active, apply_torque) } ret = [] - if CP.flags & HyundaiFlags.CANFD_LKA_STEERING: - lkas_msg = "LKAS_ALT" if CP.flags & HyundaiFlags.CANFD_LKA_STEERING_ALT else "LKAS" + if CP.flags & HyundaiFlags.CANFD_LKA_STEER_MSG: + lkas_msg = "LKAS_ALT" if CP.flags & HyundaiFlags.CANFD_LKA_STEER_MSG_ALT else "LKAS" if CP.openpilotLongitudinalControl: ret.append(packer.make_can_msg("LFA", CAN.ECAN, values)) ret.append(packer.make_can_msg(lkas_msg, CAN.ACAN, values)) @@ -79,7 +79,7 @@ def create_buttons(packer, CP, CAN, cnt, btn): "CRUISE_BUTTONS": btn, } - bus = CAN.ECAN if CP.flags & HyundaiFlags.CANFD_LKA_STEERING else CAN.CAM + bus = CAN.ECAN if CP.flags & HyundaiFlags.CANFD_LKA_STEER_MSG else CAN.CAM return packer.make_can_msg("CRUISE_BUTTONS", bus, values) diff --git a/opendbc/car/hyundai/interface.py b/opendbc/car/hyundai/interface.py index d3178b3125f..c2e949bb07e 100644 --- a/opendbc/car/hyundai/interface.py +++ b/opendbc/car/hyundai/interface.py @@ -49,9 +49,9 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo if lka_steering: # detect LKA steering - ret.flags |= HyundaiFlags.CANFD_LKA_STEERING.value + ret.flags |= HyundaiFlags.CANFD_LKA_STEER_MSG.value if 0x110 in fingerprint[CAN.CAM]: - ret.flags |= HyundaiFlags.CANFD_LKA_STEERING_ALT.value + ret.flags |= HyundaiFlags.CANFD_LKA_STEER_MSG_ALT.value else: # no LKA steering if 0x1cf not in fingerprint[CAN.ECAN]: @@ -72,10 +72,10 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo cfgs.insert(0, get_safety_config(structs.CarParams.SafetyModel.noOutput)) ret.safetyConfigs = cfgs - if ret.flags & HyundaiFlags.CANFD_LKA_STEERING: - ret.safetyConfigs[-1].safetyParam |= HyundaiSafetyFlags.CANFD_LKA_STEERING.value - if ret.flags & HyundaiFlags.CANFD_LKA_STEERING_ALT: - ret.safetyConfigs[-1].safetyParam |= HyundaiSafetyFlags.CANFD_LKA_STEERING_ALT.value + if ret.flags & HyundaiFlags.CANFD_LKA_STEER_MSG: + ret.safetyConfigs[-1].safetyParam |= HyundaiSafetyFlags.CANFD_LKA_STEER_MSG.value + if ret.flags & HyundaiFlags.CANFD_LKA_STEER_MSG_ALT: + ret.safetyConfigs[-1].safetyParam |= HyundaiSafetyFlags.CANFD_LKA_STEER_MSG_ALT.value if ret.flags & HyundaiFlags.CANFD_ALT_BUTTONS: ret.safetyConfigs[-1].safetyParam |= HyundaiSafetyFlags.CANFD_ALT_BUTTONS.value if ret.flags & HyundaiFlags.CANFD_CAMERA_SCC: @@ -162,12 +162,12 @@ def init(CP, can_recv, can_send, communication_control=None): if CP.openpilotLongitudinalControl and not (CP.flags & (HyundaiFlags.CANFD_CAMERA_SCC | HyundaiFlags.CAMERA_SCC)): addr, bus = 0x7d0, CanBus(CP).ECAN if CP.flags & HyundaiFlags.CANFD else 0 - if CP.flags & HyundaiFlags.CANFD_LKA_STEERING.value: + if CP.flags & HyundaiFlags.CANFD_LKA_STEER_MSG.value: addr, bus = 0x730, CanBus(CP).ECAN disable_ecu(can_recv, can_send, bus=bus, addr=addr, com_cont_req=communication_control) # for blinkers - if CP.flags & HyundaiFlags.ENABLE_BLINKERS: + if CP.flags & HyundaiFlags.CANFD_ENABLE_BLINKERS: disable_ecu(can_recv, can_send, bus=CanBus(CP).ECAN, addr=0x7B1, com_cont_req=communication_control) @staticmethod diff --git a/opendbc/car/hyundai/tests/test_hyundai.py b/opendbc/car/hyundai/tests/test_hyundai.py index 4481c621516..fddd8fc3f45 100644 --- a/opendbc/car/hyundai/tests/test_hyundai.py +++ b/opendbc/car/hyundai/tests/test_hyundai.py @@ -52,7 +52,7 @@ def test_feature_detection(self): cam_can = CanBus(None, fingerprint).CAM fingerprint[cam_can] = [0x50, 0x110] # LKA steering messages CP = CarInterface.get_params(CAR.KIA_EV6, fingerprint, [], False, False, False) - assert bool(CP.flags & HyundaiFlags.CANFD_LKA_STEERING) == lka_steering + assert bool(CP.flags & HyundaiFlags.CANFD_LKA_STEER_MSG) == lka_steering # radar available for radar in (True, False): diff --git a/opendbc/car/hyundai/values.py b/opendbc/car/hyundai/values.py index 0042982de30..e6d433dc683 100644 --- a/opendbc/car/hyundai/values.py +++ b/opendbc/car/hyundai/values.py @@ -60,10 +60,10 @@ class HyundaiSafetyFlags(IntFlag): HYBRID_GAS = 2 LONG = 4 CAMERA_SCC = 8 - CANFD_LKA_STEERING = 16 + CANFD_LKA_STEER_MSG = 16 CANFD_ALT_BUTTONS = 32 ALT_LIMITS = 64 - CANFD_LKA_STEERING_ALT = 128 + CANFD_LKA_STEER_MSG_ALT = 128 FCEV_GAS = 256 ALT_LIMITS_2 = 512 @@ -71,21 +71,21 @@ class HyundaiSafetyFlags(IntFlag): class HyundaiFlags(IntFlag): # Dynamic Flags - # Default assumption: all cars use LFA (ADAS) steering from the camera. - # CANFD_LKA_STEERING/CANFD_LKA_STEERING_ALT cars typically have both LKA (camera) and LFA (ADAS) steering messages, + # Default assumption: all cars use LFA (ADAS) steering from the camera (HDA1). + # CANFD_LKA_STEER_MSG/CANFD_LKA_STEER_MSG_ALT cars typically have both LKA (camera) and LFA (ADAS) steering messages, # with LKA commands forwarded to the ADAS DRV ECU. # Most HDA2 trims are assumed to be equipped with the ADAS DRV ECU, though some variants may not be equipped with one. - CANFD_LKA_STEERING = 1 + CANFD_LKA_STEER_MSG = 1 CANFD_ALT_BUTTONS = 2 CANFD_ALT_GEARS = 2 ** 2 CANFD_CAMERA_SCC = 2 ** 3 ALT_LIMITS = 2 ** 4 - ENABLE_BLINKERS = 2 ** 5 + CANFD_ENABLE_BLINKERS = 2 ** 5 CANFD_ALT_GEARS_2 = 2 ** 6 SEND_LFA = 2 ** 7 USE_FCA = 2 ** 8 - CANFD_LKA_STEERING_ALT = 2 ** 9 + CANFD_LKA_STEER_MSG_ALT = 2 ** 9 # these cars use a different gas signal HYBRID = 2 ** 10 diff --git a/opendbc/safety/modes/hyundai_canfd.h b/opendbc/safety/modes/hyundai_canfd.h index 7c345bf483b..bf08fb173bb 100644 --- a/opendbc/safety/modes/hyundai_canfd.h +++ b/opendbc/safety/modes/hyundai_canfd.h @@ -6,12 +6,12 @@ #define HYUNDAI_CANFD_CRUISE_BUTTON_TX_MSGS(bus) \ {0x1CF, bus, 8, .check_relay = false}, /* CRUISE_BUTTON */ \ -#define HYUNDAI_CANFD_LKA_STEERING_COMMON_TX_MSGS(a_can, e_can) \ +#define HYUNDAI_CANFD_LKA_STEER_MSG_COMMON_TX_MSGS(a_can, e_can) \ HYUNDAI_CANFD_CRUISE_BUTTON_TX_MSGS(e_can) \ {0x50, a_can, 16, .check_relay = (a_can) == 0}, /* LKAS */ \ {0x2A4, a_can, 24, .check_relay = (a_can) == 0}, /* CAM_0x2A4 */ \ -#define HYUNDAI_CANFD_LKA_STEERING_ALT_COMMON_TX_MSGS(a_can, e_can) \ +#define HYUNDAI_CANFD_LKA_STEER_MSG_ALT_COMMON_TX_MSGS(a_can, e_can) \ HYUNDAI_CANFD_CRUISE_BUTTON_TX_MSGS(e_can) \ {0x110, a_can, 32, .check_relay = (a_can) == 0}, /* LKAS_ALT */ \ {0x362, a_can, 32, .check_relay = (a_can) == 0}, /* CAM_0x362 */ \ @@ -46,10 +46,10 @@ {.msg = {{0x1a0, (scc_bus), 32, 50U, .max_counter = 0xffU, .ignore_quality_flag = true}, { 0 }, { 0 }}}, \ static bool hyundai_canfd_alt_buttons = false; -static bool hyundai_canfd_lka_steering_alt = false; +static bool hyundai_canfd_lka_steer_msg_alt = false; static unsigned int hyundai_canfd_get_lka_addr(void) { - return hyundai_canfd_lka_steering_alt ? 0x110U : 0x50U; + return hyundai_canfd_lka_steer_msg_alt ? 0x110U : 0x50U; } static uint8_t hyundai_canfd_get_counter(const CANPacket_t *msg) { @@ -69,7 +69,7 @@ static uint32_t hyundai_canfd_get_checksum(const CANPacket_t *msg) { static void hyundai_canfd_rx_hook(const CANPacket_t *msg) { - const unsigned pt_bus = hyundai_canfd_lka_steering ? 1U : 0U; + const unsigned pt_bus = hyundai_canfd_lka_steer_msg ? 1U : 0U; const unsigned int scc_bus = hyundai_camera_scc ? 2U : pt_bus; if (msg->bus == pt_bus) { @@ -156,7 +156,7 @@ static bool hyundai_canfd_tx_hook(const CANPacket_t *msg) { bool tx = true; // steering - const unsigned int steer_addr = (hyundai_canfd_lka_steering && !hyundai_longitudinal) ? hyundai_canfd_get_lka_addr() : 0x12aU; + const unsigned int steer_addr = (hyundai_canfd_lka_steer_msg && !hyundai_longitudinal) ? hyundai_canfd_get_lka_addr() : 0x12aU; if (msg->addr == steer_addr) { int desired_torque = (((msg->data[6] & 0xFU) << 7U) | (msg->data[5] >> 1U)) - 1024U; bool steer_req = GET_BIT(msg, 52U); @@ -179,7 +179,7 @@ static bool hyundai_canfd_tx_hook(const CANPacket_t *msg) { } // UDS: only tester present ("\x02\x3E\x80\x00\x00\x00\x00\x00") allowed on diagnostics address - if (((msg->addr == 0x730U) && hyundai_canfd_lka_steering) || ((msg->addr == 0x7D0U) && !hyundai_camera_scc)) { + if (((msg->addr == 0x730U) && hyundai_canfd_lka_steer_msg) || ((msg->addr == 0x7D0U) && !hyundai_camera_scc)) { if ((GET_BYTES(msg, 0, 4) != 0x00803E02U) || (GET_BYTES(msg, 4, 4) != 0x0U)) { tx = false; } @@ -216,19 +216,19 @@ static bool hyundai_canfd_tx_hook(const CANPacket_t *msg) { } static safety_config hyundai_canfd_init(uint16_t param) { - const uint16_t HYUNDAI_PARAM_CANFD_LKA_STEERING_ALT = 128; + const uint16_t HYUNDAI_PARAM_CANFD_LKA_STEER_MSG_ALT = 128; const uint16_t HYUNDAI_PARAM_CANFD_ALT_BUTTONS = 32; - static const CanMsg HYUNDAI_CANFD_LKA_STEERING_TX_MSGS[] = { - HYUNDAI_CANFD_LKA_STEERING_COMMON_TX_MSGS(0, 1) + static const CanMsg HYUNDAI_CANFD_LKA_STEER_MSG_TX_MSGS[] = { + HYUNDAI_CANFD_LKA_STEER_MSG_COMMON_TX_MSGS(0, 1) }; - static const CanMsg HYUNDAI_CANFD_LKA_STEERING_ALT_TX_MSGS[] = { - HYUNDAI_CANFD_LKA_STEERING_ALT_COMMON_TX_MSGS(0, 1) + static const CanMsg HYUNDAI_CANFD_LKA_STEER_MSG_ALT_TX_MSGS[] = { + HYUNDAI_CANFD_LKA_STEER_MSG_ALT_COMMON_TX_MSGS(0, 1) }; - static const CanMsg HYUNDAI_CANFD_LKA_STEERING_LONG_TX_MSGS[] = { - HYUNDAI_CANFD_LKA_STEERING_COMMON_TX_MSGS(0, 1) + static const CanMsg HYUNDAI_CANFD_LKA_STEER_MSG_LONG_TX_MSGS[] = { + HYUNDAI_CANFD_LKA_STEER_MSG_COMMON_TX_MSGS(0, 1) HYUNDAI_CANFD_LFA_STEERING_COMMON_TX_MSGS(1) HYUNDAI_CANFD_SCC_CONTROL_COMMON_TX_MSGS(1, true) {0x51, 0, 32, .check_relay = false}, // ADRV_0x51 @@ -266,16 +266,16 @@ static safety_config hyundai_canfd_init(uint16_t param) { gen_crc_lookup_table_16(0x1021, hyundai_canfd_crc_lut); hyundai_canfd_alt_buttons = GET_FLAG(param, HYUNDAI_PARAM_CANFD_ALT_BUTTONS); - hyundai_canfd_lka_steering_alt = GET_FLAG(param, HYUNDAI_PARAM_CANFD_LKA_STEERING_ALT); + hyundai_canfd_lka_steer_msg_alt = GET_FLAG(param, HYUNDAI_PARAM_CANFD_LKA_STEER_MSG_ALT); safety_config ret; if (hyundai_longitudinal) { - if (hyundai_canfd_lka_steering) { - static RxCheck hyundai_canfd_lka_steering_long_rx_checks[] = { + if (hyundai_canfd_lka_steer_msg) { + static RxCheck hyundai_canfd_lka_steer_msg_long_rx_checks[] = { HYUNDAI_CANFD_STD_BUTTONS_RX_CHECKS(1) }; - ret = BUILD_SAFETY_CFG(hyundai_canfd_lka_steering_long_rx_checks, HYUNDAI_CANFD_LKA_STEERING_LONG_TX_MSGS); + ret = BUILD_SAFETY_CFG(hyundai_canfd_lka_steer_msg_long_rx_checks, HYUNDAI_CANFD_LKA_STEER_MSG_LONG_TX_MSGS); } else { // Longitudinal checks for LFA steering @@ -305,20 +305,20 @@ static safety_config hyundai_canfd_init(uint16_t param) { } } else { - if (hyundai_canfd_lka_steering) { + if (hyundai_canfd_lka_steer_msg) { // *** LKA steering checks *** // E-CAN is on bus 1, SCC messages are sent on cars with ADRV ECU. // Does not use the alt buttons message - static RxCheck hyundai_canfd_lka_steering_rx_checks[] = { + static RxCheck hyundai_canfd_lka_steer_msg_rx_checks[] = { HYUNDAI_CANFD_STD_BUTTONS_RX_CHECKS(1) HYUNDAI_CANFD_SCC_ADDR_CHECK(1) }; - SET_RX_CHECKS(hyundai_canfd_lka_steering_rx_checks, ret); - if (hyundai_canfd_lka_steering_alt) { - SET_TX_MSGS(HYUNDAI_CANFD_LKA_STEERING_ALT_TX_MSGS, ret); + SET_RX_CHECKS(hyundai_canfd_lka_steer_msg_rx_checks, ret); + if (hyundai_canfd_lka_steer_msg_alt) { + SET_TX_MSGS(HYUNDAI_CANFD_LKA_STEER_MSG_ALT_TX_MSGS, ret); } else { - SET_TX_MSGS(HYUNDAI_CANFD_LKA_STEERING_TX_MSGS, ret); + SET_TX_MSGS(HYUNDAI_CANFD_LKA_STEER_MSG_TX_MSGS, ret); } } else if (!hyundai_camera_scc) { diff --git a/opendbc/safety/modes/hyundai_common.h b/opendbc/safety/modes/hyundai_common.h index 68584b211bb..6797ae74c44 100644 --- a/opendbc/safety/modes/hyundai_common.h +++ b/opendbc/safety/modes/hyundai_common.h @@ -30,8 +30,8 @@ bool hyundai_longitudinal = false; extern bool hyundai_camera_scc; bool hyundai_camera_scc = false; -extern bool hyundai_canfd_lka_steering; -bool hyundai_canfd_lka_steering = false; +extern bool hyundai_canfd_lka_steer_msg; +bool hyundai_canfd_lka_steer_msg = false; extern bool hyundai_alt_limits; bool hyundai_alt_limits = false; @@ -48,7 +48,7 @@ void hyundai_common_init(uint16_t param) { const uint16_t HYUNDAI_PARAM_EV_GAS = 1; const uint16_t HYUNDAI_PARAM_HYBRID_GAS = 2; const uint16_t HYUNDAI_PARAM_CAMERA_SCC = 8; - const uint16_t HYUNDAI_PARAM_CANFD_LKA_STEERING = 16; + const uint16_t HYUNDAI_PARAM_CANFD_LKA_STEER_MSG = 16; const uint16_t HYUNDAI_PARAM_ALT_LIMITS = 64; // TODO: shift this down with the rest of the common flags const uint16_t HYUNDAI_PARAM_FCEV_GAS = 256; const uint16_t HYUNDAI_PARAM_ALT_LIMITS_2 = 512; @@ -56,7 +56,7 @@ void hyundai_common_init(uint16_t param) { hyundai_ev_gas_signal = GET_FLAG(param, HYUNDAI_PARAM_EV_GAS); hyundai_hybrid_gas_signal = !hyundai_ev_gas_signal && GET_FLAG(param, HYUNDAI_PARAM_HYBRID_GAS); hyundai_camera_scc = GET_FLAG(param, HYUNDAI_PARAM_CAMERA_SCC); - hyundai_canfd_lka_steering = GET_FLAG(param, HYUNDAI_PARAM_CANFD_LKA_STEERING); + hyundai_canfd_lka_steer_msg = GET_FLAG(param, HYUNDAI_PARAM_CANFD_LKA_STEER_MSG); hyundai_alt_limits = GET_FLAG(param, HYUNDAI_PARAM_ALT_LIMITS); hyundai_fcev_gas_signal = GET_FLAG(param, HYUNDAI_PARAM_FCEV_GAS); hyundai_alt_limits_2 = GET_FLAG(param, HYUNDAI_PARAM_ALT_LIMITS_2); diff --git a/opendbc/safety/tests/safety_replay/helpers.py b/opendbc/safety/tests/safety_replay/helpers.py index 4f91a9bf68c..4b6d4c8d8c8 100644 --- a/opendbc/safety/tests/safety_replay/helpers.py +++ b/opendbc/safety/tests/safety_replay/helpers.py @@ -23,8 +23,8 @@ def is_steering_msg(mode, param, addr): elif mode in (CarParams.SafetyModel.hyundai, CarParams.SafetyModel.hyundaiLegacy): ret = addr == 832 elif mode == CarParams.SafetyModel.hyundaiCanfd: - ret = addr == (0x110 if param & HyundaiSafetyFlags.CANFD_LKA_STEERING_ALT else - 0x50 if param & HyundaiSafetyFlags.CANFD_LKA_STEERING else + ret = addr == (0x110 if param & HyundaiSafetyFlags.CANFD_LKA_STEER_MSG_ALT else + 0x50 if param & HyundaiSafetyFlags.CANFD_LKA_STEER_MSG else 0x12A) elif mode == CarParams.SafetyModel.chrysler: ret = addr == 0x292 diff --git a/opendbc/safety/tests/test_hyundai_canfd.py b/opendbc/safety/tests/test_hyundai_canfd.py index b24c6dcaf6d..6cec7376ece 100755 --- a/opendbc/safety/tests/test_hyundai_canfd.py +++ b/opendbc/safety/tests/test_hyundai_canfd.py @@ -170,7 +170,7 @@ class TestHyundaiCanfdLKASteeringEV(TestHyundaiCanfdBase): def setUp(self): self.packer = CANPackerSafety("hyundai_canfd_generated") self.safety = libsafety_py.libsafety - self.safety.set_safety_hooks(CarParams.SafetyModel.hyundaiCanfd, HyundaiSafetyFlags.CANFD_LKA_STEERING | HyundaiSafetyFlags.EV_GAS) + self.safety.set_safety_hooks(CarParams.SafetyModel.hyundaiCanfd, HyundaiSafetyFlags.CANFD_LKA_STEER_MSG | HyundaiSafetyFlags.EV_GAS) self.safety.init_tests() @@ -189,8 +189,8 @@ class TestHyundaiCanfdLKASteeringAltEV(TestHyundaiCanfdBase): def setUp(self): self.packer = CANPackerSafety("hyundai_canfd_generated") self.safety = libsafety_py.libsafety - self.safety.set_safety_hooks(CarParams.SafetyModel.hyundaiCanfd, HyundaiSafetyFlags.CANFD_LKA_STEERING | HyundaiSafetyFlags.EV_GAS | - HyundaiSafetyFlags.CANFD_LKA_STEERING_ALT) + self.safety.set_safety_hooks(CarParams.SafetyModel.hyundaiCanfd, HyundaiSafetyFlags.CANFD_LKA_STEER_MSG | HyundaiSafetyFlags.EV_GAS | + HyundaiSafetyFlags.CANFD_LKA_STEER_MSG_ALT) self.safety.init_tests() @@ -211,7 +211,7 @@ class TestHyundaiCanfdLKASteeringLongEV(HyundaiLongitudinalBase, TestHyundaiCanf def setUp(self): self.packer = CANPackerSafety("hyundai_canfd_generated") self.safety = libsafety_py.libsafety - self.safety.set_safety_hooks(CarParams.SafetyModel.hyundaiCanfd, HyundaiSafetyFlags.CANFD_LKA_STEERING | + self.safety.set_safety_hooks(CarParams.SafetyModel.hyundaiCanfd, HyundaiSafetyFlags.CANFD_LKA_STEER_MSG | HyundaiSafetyFlags.LONG | HyundaiSafetyFlags.EV_GAS) self.safety.init_tests() From a3a9aaa3d500bd99ff430b8a378bda83ac7fa5a8 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Thu, 2 Apr 2026 21:43:56 -0700 Subject: [PATCH 205/229] HKG: document all supported car architectures (#3280) * document architecture finally * more * rename radar * document lfa --- opendbc/car/hyundai/interface.py | 2 +- opendbc/car/hyundai/values.py | 33 ++++++++++++++++++++++++++------ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/opendbc/car/hyundai/interface.py b/opendbc/car/hyundai/interface.py index c2e949bb07e..6d1c374b855 100644 --- a/opendbc/car/hyundai/interface.py +++ b/opendbc/car/hyundai/interface.py @@ -56,7 +56,7 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo # no LKA steering if 0x1cf not in fingerprint[CAN.ECAN]: ret.flags |= HyundaiFlags.CANFD_ALT_BUTTONS.value - if not ret.flags & HyundaiFlags.RADAR_SCC: + if not ret.flags & HyundaiFlags.CANFD_RADAR_SCC: ret.flags |= HyundaiFlags.CANFD_CAMERA_SCC.value # Some LKA steering cars have alternative messages for gear checks diff --git a/opendbc/car/hyundai/values.py b/opendbc/car/hyundai/values.py index e6d433dc683..ecfbb1dcaef 100644 --- a/opendbc/car/hyundai/values.py +++ b/opendbc/car/hyundai/values.py @@ -68,6 +68,27 @@ class HyundaiSafetyFlags(IntFlag): ALT_LIMITS_2 = 512 +# Hyundai/Kia/Genesis SCC (Smart Cruise Control) and steering architecture: +# +# CAN cars: +# - Default: Radar sends SCC messages on bus 0. For longitudinal control, disable radar +# (0x7d0) and send our own SCC messages. AEB is lost since radar is disabled. +# - CAMERA_SCC: Camera sends SCC and AEB/FCA messages (all on bus 2). Block camera SCC +# and send our own. Stock FCA/AEB messages from camera are forwarded through. +# +# CAN-FD cars: +# - CANFD_LKA_STEER_MSG (typically HDA2 with ADAS ECU): Camera sends LKA steering +# message, ADAS DRV ECU forwards it as LFA to MDPS. For longitudinal, disable ADAS +# ECU (0x730) and send ACC on ECAN. OP also suppresses LFA from ADAS ECU to prevent +# fighting. Some cars lack the ADAS ECU (long not available). +# - Non-LKA (HDA1): Camera sends LFA steering directly to MDPS (no ADAS ECU). +# + CANFD_CAMERA_SCC: Camera also sends SCC (no CANFD_RADAR_SCC flag set). +# Block camera SCC and send our own. +# + CANFD_RADAR_SCC: Radar handles SCC instead. +# Disable radar (0x7d0 on ECAN) for longitudinal. +# - CANFD_NO_RADAR_DISABLE: Some CAN-FD cars refuse the communication control disable +# request (0x7F2822 'conditions not correct') — longitudinal not available. + class HyundaiFlags(IntFlag): # Dynamic Flags @@ -99,7 +120,7 @@ class HyundaiFlags(IntFlag): CANFD = 2 ** 13 # The radar does SCC on these cars when HDA I, rather than the camera - RADAR_SCC = 2 ** 14 + CANFD_RADAR_SCC = 2 ** 14 # The camera does SCC on these cars, rather than the radar CAMERA_SCC = 2 ** 15 CHECKSUM_CRC8 = 2 ** 16 @@ -488,7 +509,7 @@ class CAR(Platforms): KIA_SORENTO_4TH_GEN = HyundaiCanFDPlatformConfig( [HyundaiCarDocs("Kia Sorento 2021-23", car_parts=CarParts.common([CarHarness.hyundai_k]))], CarSpecs(mass=3957 * CV.LB_TO_KG, wheelbase=2.81, steerRatio=13.5), # average of the platforms - flags=HyundaiFlags.RADAR_SCC, + flags=HyundaiFlags.CANFD_RADAR_SCC, ) KIA_SORENTO_HEV_4TH_GEN = HyundaiCanFDPlatformConfig( [ @@ -496,7 +517,7 @@ class CAR(Platforms): HyundaiCarDocs("Kia Sorento Plug-in Hybrid 2022-23", "All", car_parts=CarParts.common([CarHarness.hyundai_a])), ], CarSpecs(mass=4395 * CV.LB_TO_KG, wheelbase=2.81, steerRatio=13.5), # average of the platforms - flags=HyundaiFlags.RADAR_SCC, + flags=HyundaiFlags.CANFD_RADAR_SCC, ) KIA_STINGER = HyundaiPlatformConfig( [HyundaiCarDocs("Kia Stinger 2018-20", video="https://www.youtube.com/watch?v=MJ94qoofYw0", @@ -527,7 +548,7 @@ class CAR(Platforms): HyundaiCarDocs("Kia Carnival (China only) 2023", car_parts=CarParts.common([CarHarness.hyundai_k])) ], CarSpecs(mass=2087, wheelbase=3.09, steerRatio=14.23), - flags=HyundaiFlags.RADAR_SCC, + flags=HyundaiFlags.CANFD_RADAR_SCC, ) # Genesis @@ -561,7 +582,7 @@ class CAR(Platforms): HyundaiCarDocs("Genesis GV70 (3.5T Trim, without HDA II) 2022-23", "All", car_parts=CarParts.common([CarHarness.hyundai_m])), ], CarSpecs(mass=1950, wheelbase=2.87, steerRatio=14.6), - flags=HyundaiFlags.RADAR_SCC, + flags=HyundaiFlags.CANFD_RADAR_SCC, ) GENESIS_GV70_ELECTRIFIED_1ST_GEN = HyundaiCanFDPlatformConfig( [ @@ -587,7 +608,7 @@ class CAR(Platforms): GENESIS_GV80 = HyundaiCanFDPlatformConfig( [HyundaiCarDocs("Genesis GV80 2023", "All", car_parts=CarParts.common([CarHarness.hyundai_m]))], CarSpecs(mass=2258, wheelbase=2.95, steerRatio=14.14), - flags=HyundaiFlags.RADAR_SCC, + flags=HyundaiFlags.CANFD_RADAR_SCC, ) From 4c035f27945563e68fddd66dcf5afa656bca5534 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Thu, 2 Apr 2026 22:37:44 -0700 Subject: [PATCH 206/229] HKG: CAN config (#3281) * can config * clean up * simple to start * add fuel type * last * auto detection support * cast * move * spaciing * sort * static --- opendbc/car/hyundai/interface.py | 16 +---- opendbc/car/hyundai/values.py | 115 ++++++++++++++++++++++++------- 2 files changed, 94 insertions(+), 37 deletions(-) diff --git a/opendbc/car/hyundai/interface.py b/opendbc/car/hyundai/interface.py index 6d1c374b855..201386433b0 100644 --- a/opendbc/car/hyundai/interface.py +++ b/opendbc/car/hyundai/interface.py @@ -1,6 +1,6 @@ from opendbc.car import Bus, get_safety_config, structs, uds from opendbc.car.hyundai.hyundaicanfd import CanBus -from opendbc.car.hyundai.values import HyundaiFlags, CAR, DBC, HyundaiSafetyFlags +from opendbc.car.hyundai.values import HyundaiFlags, HyundaiCANConfig, CAR, DBC, HyundaiSafetyFlags from opendbc.car.hyundai.radar_interface import RADAR_START_ADDR from opendbc.car.interfaces import CarInterfaceBase from opendbc.car.disable_ecu import disable_ecu @@ -83,17 +83,11 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo else: # Shared configuration for non CAN-FD cars + ret.flags |= HyundaiCANConfig.detect(fingerprint) + ret.alphaLongitudinalAvailable = not (ret.flags & (HyundaiFlags.LEGACY | HyundaiFlags.UNSUPPORTED_LONGITUDINAL)) ret.enableBsm = 0x58b in fingerprint[0] - # Send LFA message on cars with HDA - if 0x485 in fingerprint[2]: - ret.flags |= HyundaiFlags.SEND_LFA.value - - # These cars use the FCA11 message for the AEB and FCW signals, all others use SCC12 - if 0x38d in fingerprint[0] or 0x38d in fingerprint[2]: - ret.flags |= HyundaiFlags.USE_FCA.value - if ret.flags & HyundaiFlags.LEGACY: # these cars require a special panda safety mode due to missing counters and checksums in the messages ret.safetyConfigs = [get_safety_config(structs.CarParams.SafetyModel.hyundaiLegacy)] @@ -103,10 +97,6 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo if ret.flags & HyundaiFlags.CAMERA_SCC: ret.safetyConfigs[0].safetyParam |= HyundaiSafetyFlags.CAMERA_SCC.value - # These cars have the LFA button on the steering wheel - if 0x391 in fingerprint[0]: - ret.flags |= HyundaiFlags.HAS_LDA_BUTTON.value - # Common lateral control setup ret.centerToFront = ret.wheelbase * 0.4 diff --git a/opendbc/car/hyundai/values.py b/opendbc/car/hyundai/values.py index ecfbb1dcaef..1b70354ba8b 100644 --- a/opendbc/car/hyundai/values.py +++ b/opendbc/car/hyundai/values.py @@ -1,6 +1,6 @@ import re from dataclasses import dataclass, field -from enum import IntFlag +from enum import IntFlag, StrEnum, auto from opendbc.car import Bus, CarSpecs, DbcDict, PlatformConfig, Platforms, uds from opendbc.car.common.conversions import Conversions as CV @@ -153,11 +153,60 @@ class HyundaiCarDocs(CarDocs): package: str = "Smart Cruise Control (SCC)" +class FuelType(StrEnum): + ICE = auto() # default + HYBRID = auto() + EV = auto() + FCEV = auto() + + +@dataclass +class HyundaiCANConfig: + camera_scc: bool = False + fuel_type: FuelType = FuelType.ICE + + @staticmethod + def detect(fingerprint) -> int: + flags = 0 + + # Send LFA message on cars with HDA + if 0x485 in fingerprint[2]: + flags |= HyundaiFlags.SEND_LFA + + # These cars use the FCA11 message for the AEB and FCW signals, all others use SCC12 + if 0x38d in fingerprint[0] or 0x38d in fingerprint[2]: + flags |= HyundaiFlags.USE_FCA + + # These cars have the LFA button on the steering wheel + if 0x391 in fingerprint[0]: + flags |= HyundaiFlags.HAS_LDA_BUTTON + + return int(flags) + + def static_flags(self) -> int: + flags = 0 + + if self.camera_scc: + flags |= HyundaiFlags.CAMERA_SCC + + if self.fuel_type == FuelType.HYBRID: + flags |= HyundaiFlags.HYBRID + elif self.fuel_type == FuelType.EV: + flags |= HyundaiFlags.EV + elif self.fuel_type == FuelType.FCEV: + flags |= HyundaiFlags.FCEV + + return flags + + @dataclass class HyundaiPlatformConfig(PlatformConfig): dbc_dict: DbcDict = field(default_factory=lambda: {Bus.pt: "hyundai_kia_generic"}) + can_config: HyundaiCANConfig = field(default_factory=HyundaiCANConfig) def init(self): + self.flags |= self.can_config.static_flags() + if self.flags & HyundaiFlags.MANDO_RADAR: self.dbc_dict = {Bus.pt: "hyundai_kia_generic", Bus.radar: 'hyundai_kia_mando_front_radar_generated'} @@ -185,7 +234,7 @@ class CAR(Platforms): HyundaiCarDocs("Hyundai Azera Hybrid 2020", "All", car_parts=CarParts.common([CarHarness.hyundai_k])), ], CarSpecs(mass=1675, wheelbase=2.885, steerRatio=14.5), - flags=HyundaiFlags.HYBRID, + can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), ) HYUNDAI_ELANTRA = HyundaiPlatformConfig( [ @@ -214,7 +263,8 @@ class CAR(Platforms): [HyundaiCarDocs("Hyundai Elantra Hybrid 2021-23", video="https://youtu.be/_EdYQtV52-c", car_parts=CarParts.common([CarHarness.hyundai_k]))], CarSpecs(mass=3017 * CV.LB_TO_KG, wheelbase=2.72, steerRatio=12.9, tireStiffnessFactor=0.65), - flags=HyundaiFlags.CHECKSUM_CRC8 | HyundaiFlags.HYBRID, + flags=HyundaiFlags.CHECKSUM_CRC8, + can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), ) HYUNDAI_GENESIS = HyundaiPlatformConfig( [ @@ -228,32 +278,36 @@ class CAR(Platforms): HYUNDAI_IONIQ = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Ioniq Hybrid 2017-19", car_parts=CarParts.common([CarHarness.hyundai_c]))], CarSpecs(mass=1490, wheelbase=2.7, steerRatio=13.73, tireStiffnessFactor=0.385), - flags=HyundaiFlags.HYBRID | HyundaiFlags.MIN_STEER_32_MPH, + flags=HyundaiFlags.MIN_STEER_32_MPH, + can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), ) HYUNDAI_IONIQ_HEV_2022 = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Ioniq Hybrid 2020-22", car_parts=CarParts.common([CarHarness.hyundai_h]))], CarSpecs(mass=1490, wheelbase=2.7, steerRatio=13.73, tireStiffnessFactor=0.385), - flags=HyundaiFlags.HYBRID | HyundaiFlags.LEGACY, + flags=HyundaiFlags.LEGACY, + can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), ) HYUNDAI_IONIQ_EV_LTD = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Ioniq Electric 2019", car_parts=CarParts.common([CarHarness.hyundai_c]))], CarSpecs(mass=1490, wheelbase=2.7, steerRatio=13.73, tireStiffnessFactor=0.385), - flags=HyundaiFlags.MANDO_RADAR | HyundaiFlags.EV | HyundaiFlags.LEGACY | HyundaiFlags.MIN_STEER_32_MPH, + flags=HyundaiFlags.MANDO_RADAR | HyundaiFlags.LEGACY | HyundaiFlags.MIN_STEER_32_MPH, + can_config=HyundaiCANConfig(fuel_type=FuelType.EV), ) HYUNDAI_IONIQ_EV_2020 = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Ioniq Electric 2020", "All", car_parts=CarParts.common([CarHarness.hyundai_h]))], CarSpecs(mass=1490, wheelbase=2.7, steerRatio=13.73, tireStiffnessFactor=0.385), - flags=HyundaiFlags.EV, + can_config=HyundaiCANConfig(fuel_type=FuelType.EV), ) HYUNDAI_IONIQ_PHEV_2019 = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Ioniq Plug-in Hybrid 2019", car_parts=CarParts.common([CarHarness.hyundai_c]))], CarSpecs(mass=1490, wheelbase=2.7, steerRatio=13.73, tireStiffnessFactor=0.385), - flags=HyundaiFlags.HYBRID | HyundaiFlags.MIN_STEER_32_MPH, + flags=HyundaiFlags.MIN_STEER_32_MPH, + can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), ) HYUNDAI_IONIQ_PHEV = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Ioniq Plug-in Hybrid 2020-22", "All", car_parts=CarParts.common([CarHarness.hyundai_h]))], CarSpecs(mass=1490, wheelbase=2.7, steerRatio=13.73, tireStiffnessFactor=0.385), - flags=HyundaiFlags.HYBRID, + can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), ) HYUNDAI_KONA = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Kona 2020", min_enable_speed=6 * CV.MPH_TO_MS, car_parts=CarParts.common([CarHarness.hyundai_b]))], @@ -263,17 +317,20 @@ class CAR(Platforms): HYUNDAI_KONA_2022 = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Kona 2022-23", car_parts=CarParts.common([CarHarness.hyundai_o]))], CarSpecs(mass=1491, wheelbase=2.6, steerRatio=13.42, tireStiffnessFactor=0.385), - flags=HyundaiFlags.CAMERA_SCC | HyundaiFlags.ALT_LIMITS_2, + flags=HyundaiFlags.ALT_LIMITS_2, + can_config=HyundaiCANConfig(camera_scc=True), ) HYUNDAI_KONA_EV = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Kona Electric 2018-21", car_parts=CarParts.common([CarHarness.hyundai_g]))], CarSpecs(mass=1685, wheelbase=2.6, steerRatio=13.42, tireStiffnessFactor=0.385), - flags=HyundaiFlags.EV | HyundaiFlags.ALT_LIMITS, + flags=HyundaiFlags.ALT_LIMITS, + can_config=HyundaiCANConfig(fuel_type=FuelType.EV), ) HYUNDAI_KONA_EV_2022 = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Kona Electric 2022-23", car_parts=CarParts.common([CarHarness.hyundai_o]))], CarSpecs(mass=1743, wheelbase=2.6, steerRatio=13.42, tireStiffnessFactor=0.385), - flags=HyundaiFlags.CAMERA_SCC | HyundaiFlags.EV | HyundaiFlags.ALT_LIMITS, + flags=HyundaiFlags.ALT_LIMITS, + can_config=HyundaiCANConfig(camera_scc=True, fuel_type=FuelType.EV), ) HYUNDAI_KONA_EV_2ND_GEN = HyundaiCanFDPlatformConfig( [HyundaiCarDocs("Hyundai Kona Electric (with HDA II, Korea only) 2023", video="https://www.youtube.com/watch?v=U2fOCmcQ8hw", @@ -284,12 +341,13 @@ class CAR(Platforms): HYUNDAI_KONA_HEV = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Kona Hybrid 2020", car_parts=CarParts.common([CarHarness.hyundai_i]))], # TODO: check packages, CarSpecs(mass=1425, wheelbase=2.6, steerRatio=13.42, tireStiffnessFactor=0.385), - flags=HyundaiFlags.HYBRID | HyundaiFlags.ALT_LIMITS, + flags=HyundaiFlags.ALT_LIMITS, + can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), ) HYUNDAI_NEXO_1ST_GEN = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Nexo 2021", "All", car_parts=CarParts.common([CarHarness.hyundai_h]))], CarSpecs(mass=3990 * CV.LB_TO_KG, wheelbase=2.79, steerRatio=14.19), # https://www.hyundainews.com/assets/documents/original/42768-2021NEXOProductGuideSpecs.pdf - flags=HyundaiFlags.FCEV, + can_config=HyundaiCANConfig(fuel_type=FuelType.FCEV), ) HYUNDAI_SANTA_FE = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Santa Fe 2019-20", "All", video="https://youtu.be/bjDR0YjM__s", @@ -306,12 +364,14 @@ class CAR(Platforms): HYUNDAI_SANTA_FE_HEV_2022 = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Santa Fe Hybrid 2022-23", "All", car_parts=CarParts.common([CarHarness.hyundai_l]))], HYUNDAI_SANTA_FE.specs, - flags=HyundaiFlags.CHECKSUM_CRC8 | HyundaiFlags.HYBRID, + flags=HyundaiFlags.CHECKSUM_CRC8, + can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), ) HYUNDAI_SANTA_FE_PHEV_2022 = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Santa Fe Plug-in Hybrid 2022-23", "All", car_parts=CarParts.common([CarHarness.hyundai_l]))], HYUNDAI_SANTA_FE.specs, - flags=HyundaiFlags.CHECKSUM_CRC8 | HyundaiFlags.HYBRID, + flags=HyundaiFlags.CHECKSUM_CRC8, + can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), ) HYUNDAI_SONATA = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Sonata 2020-23", "All", video="https://www.youtube.com/watch?v=ix63r9kE3Fw", @@ -352,7 +412,8 @@ class CAR(Platforms): HYUNDAI_SONATA_HYBRID = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Sonata Hybrid 2020-23", "All", car_parts=CarParts.common([CarHarness.hyundai_a]))], HYUNDAI_SONATA.specs, - flags=HyundaiFlags.MANDO_RADAR | HyundaiFlags.CHECKSUM_CRC8 | HyundaiFlags.HYBRID, + flags=HyundaiFlags.MANDO_RADAR | HyundaiFlags.CHECKSUM_CRC8, + can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), ) HYUNDAI_IONIQ_5 = HyundaiCanFDPlatformConfig( [ @@ -404,7 +465,8 @@ class CAR(Platforms): KIA_K5_HEV_2020 = HyundaiPlatformConfig( [HyundaiCarDocs("Kia K5 Hybrid 2020-22", car_parts=CarParts.common([CarHarness.hyundai_a]))], KIA_K5_2021.specs, - flags=HyundaiFlags.MANDO_RADAR | HyundaiFlags.CHECKSUM_CRC8 | HyundaiFlags.HYBRID, + flags=HyundaiFlags.MANDO_RADAR | HyundaiFlags.CHECKSUM_CRC8, + can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), ) KIA_K7_2017 = HyundaiPlatformConfig( [HyundaiCarDocs("Kia K7 2017", car_parts=CarParts.common([CarHarness.hyundai_c]))], @@ -423,7 +485,8 @@ class CAR(Platforms): HyundaiCarDocs("Kia Niro EV 2022", "All", video="https://www.youtube.com/watch?v=lT7zcG6ZpGo", car_parts=CarParts.common([CarHarness.hyundai_h])), ], CarSpecs(mass=3543 * CV.LB_TO_KG, wheelbase=2.7, steerRatio=13.6, tireStiffnessFactor=0.385), # average of all the cars - flags=HyundaiFlags.MANDO_RADAR | HyundaiFlags.EV, + flags=HyundaiFlags.MANDO_RADAR, + can_config=HyundaiCANConfig(fuel_type=FuelType.EV), ) KIA_NIRO_EV_2ND_GEN = HyundaiCanFDPlatformConfig( [ @@ -440,7 +503,8 @@ class CAR(Platforms): HyundaiCarDocs("Kia Niro Plug-in Hybrid 2020", car_parts=CarParts.common([CarHarness.hyundai_d])), ], KIA_NIRO_EV.specs, - flags=HyundaiFlags.MANDO_RADAR | HyundaiFlags.HYBRID | HyundaiFlags.UNSUPPORTED_LONGITUDINAL | HyundaiFlags.MIN_STEER_32_MPH, + flags=HyundaiFlags.MANDO_RADAR | HyundaiFlags.UNSUPPORTED_LONGITUDINAL | HyundaiFlags.MIN_STEER_32_MPH, + can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), ) KIA_NIRO_PHEV_2022 = HyundaiPlatformConfig( [ @@ -448,7 +512,8 @@ class CAR(Platforms): HyundaiCarDocs("Kia Niro Plug-in Hybrid 2022", car_parts=CarParts.common([CarHarness.hyundai_f])), ], KIA_NIRO_EV.specs, - flags=HyundaiFlags.HYBRID | HyundaiFlags.MANDO_RADAR, + flags=HyundaiFlags.MANDO_RADAR, + can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), ) KIA_NIRO_HEV_2021 = HyundaiPlatformConfig( [ @@ -456,7 +521,7 @@ class CAR(Platforms): HyundaiCarDocs("Kia Niro Hybrid 2022", car_parts=CarParts.common([CarHarness.hyundai_f])), ], KIA_NIRO_EV.specs, - flags=HyundaiFlags.HYBRID, + can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), ) KIA_NIRO_HEV_2ND_GEN = HyundaiCanFDPlatformConfig( [HyundaiCarDocs("Kia Niro Hybrid 2023-24", car_parts=CarParts.common([CarHarness.hyundai_a]))], @@ -477,12 +542,14 @@ class CAR(Platforms): KIA_OPTIMA_H = HyundaiPlatformConfig( [HyundaiCarDocs("Kia Optima Hybrid 2017", "Advanced Smart Cruise Control", car_parts=CarParts.common([CarHarness.hyundai_c]))], CarSpecs(mass=3558 * CV.LB_TO_KG, wheelbase=2.8, steerRatio=13.75, tireStiffnessFactor=0.5), - flags=HyundaiFlags.HYBRID | HyundaiFlags.LEGACY, + flags=HyundaiFlags.LEGACY, + can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), ) KIA_OPTIMA_H_G4_FL = HyundaiPlatformConfig( [HyundaiCarDocs("Kia Optima Hybrid 2019", car_parts=CarParts.common([CarHarness.hyundai_h]))], CarSpecs(mass=3558 * CV.LB_TO_KG, wheelbase=2.8, steerRatio=13.75, tireStiffnessFactor=0.5), - flags=HyundaiFlags.HYBRID | HyundaiFlags.UNSUPPORTED_LONGITUDINAL, + flags=HyundaiFlags.UNSUPPORTED_LONGITUDINAL, + can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), ) KIA_SELTOS = HyundaiPlatformConfig( [HyundaiCarDocs("Kia Seltos 2021", car_parts=CarParts.common([CarHarness.hyundai_a]))], From eee85c69baddadf2fc99f1190c353695a23a86a1 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Thu, 2 Apr 2026 23:15:18 -0700 Subject: [PATCH 207/229] Revert "HKG: CAN config" (#3283) Revert "HKG: CAN config (#3281)" This reverts commit 4c035f27945563e68fddd66dcf5afa656bca5534. --- opendbc/car/hyundai/interface.py | 16 ++++- opendbc/car/hyundai/values.py | 115 +++++++------------------------ 2 files changed, 37 insertions(+), 94 deletions(-) diff --git a/opendbc/car/hyundai/interface.py b/opendbc/car/hyundai/interface.py index 201386433b0..6d1c374b855 100644 --- a/opendbc/car/hyundai/interface.py +++ b/opendbc/car/hyundai/interface.py @@ -1,6 +1,6 @@ from opendbc.car import Bus, get_safety_config, structs, uds from opendbc.car.hyundai.hyundaicanfd import CanBus -from opendbc.car.hyundai.values import HyundaiFlags, HyundaiCANConfig, CAR, DBC, HyundaiSafetyFlags +from opendbc.car.hyundai.values import HyundaiFlags, CAR, DBC, HyundaiSafetyFlags from opendbc.car.hyundai.radar_interface import RADAR_START_ADDR from opendbc.car.interfaces import CarInterfaceBase from opendbc.car.disable_ecu import disable_ecu @@ -83,11 +83,17 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo else: # Shared configuration for non CAN-FD cars - ret.flags |= HyundaiCANConfig.detect(fingerprint) - ret.alphaLongitudinalAvailable = not (ret.flags & (HyundaiFlags.LEGACY | HyundaiFlags.UNSUPPORTED_LONGITUDINAL)) ret.enableBsm = 0x58b in fingerprint[0] + # Send LFA message on cars with HDA + if 0x485 in fingerprint[2]: + ret.flags |= HyundaiFlags.SEND_LFA.value + + # These cars use the FCA11 message for the AEB and FCW signals, all others use SCC12 + if 0x38d in fingerprint[0] or 0x38d in fingerprint[2]: + ret.flags |= HyundaiFlags.USE_FCA.value + if ret.flags & HyundaiFlags.LEGACY: # these cars require a special panda safety mode due to missing counters and checksums in the messages ret.safetyConfigs = [get_safety_config(structs.CarParams.SafetyModel.hyundaiLegacy)] @@ -97,6 +103,10 @@ def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_lo if ret.flags & HyundaiFlags.CAMERA_SCC: ret.safetyConfigs[0].safetyParam |= HyundaiSafetyFlags.CAMERA_SCC.value + # These cars have the LFA button on the steering wheel + if 0x391 in fingerprint[0]: + ret.flags |= HyundaiFlags.HAS_LDA_BUTTON.value + # Common lateral control setup ret.centerToFront = ret.wheelbase * 0.4 diff --git a/opendbc/car/hyundai/values.py b/opendbc/car/hyundai/values.py index 1b70354ba8b..ecfbb1dcaef 100644 --- a/opendbc/car/hyundai/values.py +++ b/opendbc/car/hyundai/values.py @@ -1,6 +1,6 @@ import re from dataclasses import dataclass, field -from enum import IntFlag, StrEnum, auto +from enum import IntFlag from opendbc.car import Bus, CarSpecs, DbcDict, PlatformConfig, Platforms, uds from opendbc.car.common.conversions import Conversions as CV @@ -153,60 +153,11 @@ class HyundaiCarDocs(CarDocs): package: str = "Smart Cruise Control (SCC)" -class FuelType(StrEnum): - ICE = auto() # default - HYBRID = auto() - EV = auto() - FCEV = auto() - - -@dataclass -class HyundaiCANConfig: - camera_scc: bool = False - fuel_type: FuelType = FuelType.ICE - - @staticmethod - def detect(fingerprint) -> int: - flags = 0 - - # Send LFA message on cars with HDA - if 0x485 in fingerprint[2]: - flags |= HyundaiFlags.SEND_LFA - - # These cars use the FCA11 message for the AEB and FCW signals, all others use SCC12 - if 0x38d in fingerprint[0] or 0x38d in fingerprint[2]: - flags |= HyundaiFlags.USE_FCA - - # These cars have the LFA button on the steering wheel - if 0x391 in fingerprint[0]: - flags |= HyundaiFlags.HAS_LDA_BUTTON - - return int(flags) - - def static_flags(self) -> int: - flags = 0 - - if self.camera_scc: - flags |= HyundaiFlags.CAMERA_SCC - - if self.fuel_type == FuelType.HYBRID: - flags |= HyundaiFlags.HYBRID - elif self.fuel_type == FuelType.EV: - flags |= HyundaiFlags.EV - elif self.fuel_type == FuelType.FCEV: - flags |= HyundaiFlags.FCEV - - return flags - - @dataclass class HyundaiPlatformConfig(PlatformConfig): dbc_dict: DbcDict = field(default_factory=lambda: {Bus.pt: "hyundai_kia_generic"}) - can_config: HyundaiCANConfig = field(default_factory=HyundaiCANConfig) def init(self): - self.flags |= self.can_config.static_flags() - if self.flags & HyundaiFlags.MANDO_RADAR: self.dbc_dict = {Bus.pt: "hyundai_kia_generic", Bus.radar: 'hyundai_kia_mando_front_radar_generated'} @@ -234,7 +185,7 @@ class CAR(Platforms): HyundaiCarDocs("Hyundai Azera Hybrid 2020", "All", car_parts=CarParts.common([CarHarness.hyundai_k])), ], CarSpecs(mass=1675, wheelbase=2.885, steerRatio=14.5), - can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), + flags=HyundaiFlags.HYBRID, ) HYUNDAI_ELANTRA = HyundaiPlatformConfig( [ @@ -263,8 +214,7 @@ class CAR(Platforms): [HyundaiCarDocs("Hyundai Elantra Hybrid 2021-23", video="https://youtu.be/_EdYQtV52-c", car_parts=CarParts.common([CarHarness.hyundai_k]))], CarSpecs(mass=3017 * CV.LB_TO_KG, wheelbase=2.72, steerRatio=12.9, tireStiffnessFactor=0.65), - flags=HyundaiFlags.CHECKSUM_CRC8, - can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), + flags=HyundaiFlags.CHECKSUM_CRC8 | HyundaiFlags.HYBRID, ) HYUNDAI_GENESIS = HyundaiPlatformConfig( [ @@ -278,36 +228,32 @@ class CAR(Platforms): HYUNDAI_IONIQ = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Ioniq Hybrid 2017-19", car_parts=CarParts.common([CarHarness.hyundai_c]))], CarSpecs(mass=1490, wheelbase=2.7, steerRatio=13.73, tireStiffnessFactor=0.385), - flags=HyundaiFlags.MIN_STEER_32_MPH, - can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), + flags=HyundaiFlags.HYBRID | HyundaiFlags.MIN_STEER_32_MPH, ) HYUNDAI_IONIQ_HEV_2022 = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Ioniq Hybrid 2020-22", car_parts=CarParts.common([CarHarness.hyundai_h]))], CarSpecs(mass=1490, wheelbase=2.7, steerRatio=13.73, tireStiffnessFactor=0.385), - flags=HyundaiFlags.LEGACY, - can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), + flags=HyundaiFlags.HYBRID | HyundaiFlags.LEGACY, ) HYUNDAI_IONIQ_EV_LTD = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Ioniq Electric 2019", car_parts=CarParts.common([CarHarness.hyundai_c]))], CarSpecs(mass=1490, wheelbase=2.7, steerRatio=13.73, tireStiffnessFactor=0.385), - flags=HyundaiFlags.MANDO_RADAR | HyundaiFlags.LEGACY | HyundaiFlags.MIN_STEER_32_MPH, - can_config=HyundaiCANConfig(fuel_type=FuelType.EV), + flags=HyundaiFlags.MANDO_RADAR | HyundaiFlags.EV | HyundaiFlags.LEGACY | HyundaiFlags.MIN_STEER_32_MPH, ) HYUNDAI_IONIQ_EV_2020 = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Ioniq Electric 2020", "All", car_parts=CarParts.common([CarHarness.hyundai_h]))], CarSpecs(mass=1490, wheelbase=2.7, steerRatio=13.73, tireStiffnessFactor=0.385), - can_config=HyundaiCANConfig(fuel_type=FuelType.EV), + flags=HyundaiFlags.EV, ) HYUNDAI_IONIQ_PHEV_2019 = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Ioniq Plug-in Hybrid 2019", car_parts=CarParts.common([CarHarness.hyundai_c]))], CarSpecs(mass=1490, wheelbase=2.7, steerRatio=13.73, tireStiffnessFactor=0.385), - flags=HyundaiFlags.MIN_STEER_32_MPH, - can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), + flags=HyundaiFlags.HYBRID | HyundaiFlags.MIN_STEER_32_MPH, ) HYUNDAI_IONIQ_PHEV = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Ioniq Plug-in Hybrid 2020-22", "All", car_parts=CarParts.common([CarHarness.hyundai_h]))], CarSpecs(mass=1490, wheelbase=2.7, steerRatio=13.73, tireStiffnessFactor=0.385), - can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), + flags=HyundaiFlags.HYBRID, ) HYUNDAI_KONA = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Kona 2020", min_enable_speed=6 * CV.MPH_TO_MS, car_parts=CarParts.common([CarHarness.hyundai_b]))], @@ -317,20 +263,17 @@ class CAR(Platforms): HYUNDAI_KONA_2022 = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Kona 2022-23", car_parts=CarParts.common([CarHarness.hyundai_o]))], CarSpecs(mass=1491, wheelbase=2.6, steerRatio=13.42, tireStiffnessFactor=0.385), - flags=HyundaiFlags.ALT_LIMITS_2, - can_config=HyundaiCANConfig(camera_scc=True), + flags=HyundaiFlags.CAMERA_SCC | HyundaiFlags.ALT_LIMITS_2, ) HYUNDAI_KONA_EV = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Kona Electric 2018-21", car_parts=CarParts.common([CarHarness.hyundai_g]))], CarSpecs(mass=1685, wheelbase=2.6, steerRatio=13.42, tireStiffnessFactor=0.385), - flags=HyundaiFlags.ALT_LIMITS, - can_config=HyundaiCANConfig(fuel_type=FuelType.EV), + flags=HyundaiFlags.EV | HyundaiFlags.ALT_LIMITS, ) HYUNDAI_KONA_EV_2022 = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Kona Electric 2022-23", car_parts=CarParts.common([CarHarness.hyundai_o]))], CarSpecs(mass=1743, wheelbase=2.6, steerRatio=13.42, tireStiffnessFactor=0.385), - flags=HyundaiFlags.ALT_LIMITS, - can_config=HyundaiCANConfig(camera_scc=True, fuel_type=FuelType.EV), + flags=HyundaiFlags.CAMERA_SCC | HyundaiFlags.EV | HyundaiFlags.ALT_LIMITS, ) HYUNDAI_KONA_EV_2ND_GEN = HyundaiCanFDPlatformConfig( [HyundaiCarDocs("Hyundai Kona Electric (with HDA II, Korea only) 2023", video="https://www.youtube.com/watch?v=U2fOCmcQ8hw", @@ -341,13 +284,12 @@ class CAR(Platforms): HYUNDAI_KONA_HEV = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Kona Hybrid 2020", car_parts=CarParts.common([CarHarness.hyundai_i]))], # TODO: check packages, CarSpecs(mass=1425, wheelbase=2.6, steerRatio=13.42, tireStiffnessFactor=0.385), - flags=HyundaiFlags.ALT_LIMITS, - can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), + flags=HyundaiFlags.HYBRID | HyundaiFlags.ALT_LIMITS, ) HYUNDAI_NEXO_1ST_GEN = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Nexo 2021", "All", car_parts=CarParts.common([CarHarness.hyundai_h]))], CarSpecs(mass=3990 * CV.LB_TO_KG, wheelbase=2.79, steerRatio=14.19), # https://www.hyundainews.com/assets/documents/original/42768-2021NEXOProductGuideSpecs.pdf - can_config=HyundaiCANConfig(fuel_type=FuelType.FCEV), + flags=HyundaiFlags.FCEV, ) HYUNDAI_SANTA_FE = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Santa Fe 2019-20", "All", video="https://youtu.be/bjDR0YjM__s", @@ -364,14 +306,12 @@ class CAR(Platforms): HYUNDAI_SANTA_FE_HEV_2022 = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Santa Fe Hybrid 2022-23", "All", car_parts=CarParts.common([CarHarness.hyundai_l]))], HYUNDAI_SANTA_FE.specs, - flags=HyundaiFlags.CHECKSUM_CRC8, - can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), + flags=HyundaiFlags.CHECKSUM_CRC8 | HyundaiFlags.HYBRID, ) HYUNDAI_SANTA_FE_PHEV_2022 = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Santa Fe Plug-in Hybrid 2022-23", "All", car_parts=CarParts.common([CarHarness.hyundai_l]))], HYUNDAI_SANTA_FE.specs, - flags=HyundaiFlags.CHECKSUM_CRC8, - can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), + flags=HyundaiFlags.CHECKSUM_CRC8 | HyundaiFlags.HYBRID, ) HYUNDAI_SONATA = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Sonata 2020-23", "All", video="https://www.youtube.com/watch?v=ix63r9kE3Fw", @@ -412,8 +352,7 @@ class CAR(Platforms): HYUNDAI_SONATA_HYBRID = HyundaiPlatformConfig( [HyundaiCarDocs("Hyundai Sonata Hybrid 2020-23", "All", car_parts=CarParts.common([CarHarness.hyundai_a]))], HYUNDAI_SONATA.specs, - flags=HyundaiFlags.MANDO_RADAR | HyundaiFlags.CHECKSUM_CRC8, - can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), + flags=HyundaiFlags.MANDO_RADAR | HyundaiFlags.CHECKSUM_CRC8 | HyundaiFlags.HYBRID, ) HYUNDAI_IONIQ_5 = HyundaiCanFDPlatformConfig( [ @@ -465,8 +404,7 @@ class CAR(Platforms): KIA_K5_HEV_2020 = HyundaiPlatformConfig( [HyundaiCarDocs("Kia K5 Hybrid 2020-22", car_parts=CarParts.common([CarHarness.hyundai_a]))], KIA_K5_2021.specs, - flags=HyundaiFlags.MANDO_RADAR | HyundaiFlags.CHECKSUM_CRC8, - can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), + flags=HyundaiFlags.MANDO_RADAR | HyundaiFlags.CHECKSUM_CRC8 | HyundaiFlags.HYBRID, ) KIA_K7_2017 = HyundaiPlatformConfig( [HyundaiCarDocs("Kia K7 2017", car_parts=CarParts.common([CarHarness.hyundai_c]))], @@ -485,8 +423,7 @@ class CAR(Platforms): HyundaiCarDocs("Kia Niro EV 2022", "All", video="https://www.youtube.com/watch?v=lT7zcG6ZpGo", car_parts=CarParts.common([CarHarness.hyundai_h])), ], CarSpecs(mass=3543 * CV.LB_TO_KG, wheelbase=2.7, steerRatio=13.6, tireStiffnessFactor=0.385), # average of all the cars - flags=HyundaiFlags.MANDO_RADAR, - can_config=HyundaiCANConfig(fuel_type=FuelType.EV), + flags=HyundaiFlags.MANDO_RADAR | HyundaiFlags.EV, ) KIA_NIRO_EV_2ND_GEN = HyundaiCanFDPlatformConfig( [ @@ -503,8 +440,7 @@ class CAR(Platforms): HyundaiCarDocs("Kia Niro Plug-in Hybrid 2020", car_parts=CarParts.common([CarHarness.hyundai_d])), ], KIA_NIRO_EV.specs, - flags=HyundaiFlags.MANDO_RADAR | HyundaiFlags.UNSUPPORTED_LONGITUDINAL | HyundaiFlags.MIN_STEER_32_MPH, - can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), + flags=HyundaiFlags.MANDO_RADAR | HyundaiFlags.HYBRID | HyundaiFlags.UNSUPPORTED_LONGITUDINAL | HyundaiFlags.MIN_STEER_32_MPH, ) KIA_NIRO_PHEV_2022 = HyundaiPlatformConfig( [ @@ -512,8 +448,7 @@ class CAR(Platforms): HyundaiCarDocs("Kia Niro Plug-in Hybrid 2022", car_parts=CarParts.common([CarHarness.hyundai_f])), ], KIA_NIRO_EV.specs, - flags=HyundaiFlags.MANDO_RADAR, - can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), + flags=HyundaiFlags.HYBRID | HyundaiFlags.MANDO_RADAR, ) KIA_NIRO_HEV_2021 = HyundaiPlatformConfig( [ @@ -521,7 +456,7 @@ class CAR(Platforms): HyundaiCarDocs("Kia Niro Hybrid 2022", car_parts=CarParts.common([CarHarness.hyundai_f])), ], KIA_NIRO_EV.specs, - can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), + flags=HyundaiFlags.HYBRID, ) KIA_NIRO_HEV_2ND_GEN = HyundaiCanFDPlatformConfig( [HyundaiCarDocs("Kia Niro Hybrid 2023-24", car_parts=CarParts.common([CarHarness.hyundai_a]))], @@ -542,14 +477,12 @@ class CAR(Platforms): KIA_OPTIMA_H = HyundaiPlatformConfig( [HyundaiCarDocs("Kia Optima Hybrid 2017", "Advanced Smart Cruise Control", car_parts=CarParts.common([CarHarness.hyundai_c]))], CarSpecs(mass=3558 * CV.LB_TO_KG, wheelbase=2.8, steerRatio=13.75, tireStiffnessFactor=0.5), - flags=HyundaiFlags.LEGACY, - can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), + flags=HyundaiFlags.HYBRID | HyundaiFlags.LEGACY, ) KIA_OPTIMA_H_G4_FL = HyundaiPlatformConfig( [HyundaiCarDocs("Kia Optima Hybrid 2019", car_parts=CarParts.common([CarHarness.hyundai_h]))], CarSpecs(mass=3558 * CV.LB_TO_KG, wheelbase=2.8, steerRatio=13.75, tireStiffnessFactor=0.5), - flags=HyundaiFlags.UNSUPPORTED_LONGITUDINAL, - can_config=HyundaiCANConfig(fuel_type=FuelType.HYBRID), + flags=HyundaiFlags.HYBRID | HyundaiFlags.UNSUPPORTED_LONGITUDINAL, ) KIA_SELTOS = HyundaiPlatformConfig( [HyundaiCarDocs("Kia Seltos 2021", car_parts=CarParts.common([CarHarness.hyundai_a]))], From bf19cabe799902548fa2a0eef65f991fb8e091da Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Thu, 2 Apr 2026 23:47:47 -0700 Subject: [PATCH 208/229] HKG: small clean up (#3285) * move to where used * split params * not sure * this can go here --- opendbc/car/hyundai/carcontroller.py | 8 ++++---- opendbc/car/hyundai/interface.py | 17 +++++++++-------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/opendbc/car/hyundai/carcontroller.py b/opendbc/car/hyundai/carcontroller.py index ee9a5d6586b..603e57f299c 100644 --- a/opendbc/car/hyundai/carcontroller.py +++ b/opendbc/car/hyundai/carcontroller.py @@ -71,10 +71,6 @@ def update(self, CC, CS, now_nanos): if not CC.latActive: apply_torque = 0 - # Hold torque with induced temporary fault when cutting the actuation bit - # FIXME: we don't use this with CAN FD? - torque_fault = CC.latActive and not apply_steer_req - self.apply_torque_last = apply_torque # accel + longitudinal @@ -103,6 +99,10 @@ def update(self, CC, CS, now_nanos): can_sends.extend(self.create_canfd_msgs(apply_steer_req, apply_torque, set_speed_in_units, accel, stopping, hud_control, CS, CC)) else: + # Hold torque with induced temporary fault when cutting the actuation bit + # FIXME: we don't use this with CAN FD? + torque_fault = CC.latActive and not apply_steer_req + can_sends.extend(self.create_can_msgs(apply_steer_req, apply_torque, torque_fault, set_speed_in_units, accel, stopping, hud_control, actuators, CS, CC)) diff --git a/opendbc/car/hyundai/interface.py b/opendbc/car/hyundai/interface.py index 6d1c374b855..c3373aa19ff 100644 --- a/opendbc/car/hyundai/interface.py +++ b/opendbc/car/hyundai/interface.py @@ -26,16 +26,17 @@ class CarInterface(CarInterfaceBase): def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_long, is_release, docs) -> structs.CarParams: ret.brand = "hyundai" - # "LKA steering" if LKAS or LKAS_ALT messages are seen coming from the camera. - # Generally means our LKAS message is forwarded to another ECU (commonly ADAS ECU) - # that finally retransmits our steering command in LFA or LFA_ALT to the MDPS. - # "LFA steering" if camera directly sends LFA to the MDPS - cam_can = CanBus(None, fingerprint).CAM - lka_steering = 0x50 in fingerprint[cam_can] or 0x110 in fingerprint[cam_can] - CAN = CanBus(None, fingerprint, lka_steering) - if ret.flags & HyundaiFlags.CANFD: # Shared configuration for CAN-FD cars + + # "LKA steering" if LKAS or LKAS_ALT messages are seen coming from the camera. + # Generally means our LKAS message is forwarded to another ECU (commonly ADAS ECU) + # that finally retransmits our steering command in LFA or LFA_ALT to the MDPS. + # "LFA steering" if camera directly sends LFA to the MDPS + cam_can = CanBus(None, fingerprint).CAM + lka_steering = 0x50 in fingerprint[cam_can] or 0x110 in fingerprint[cam_can] + CAN = CanBus(None, fingerprint, lka_steering) + ret.alphaLongitudinalAvailable = not (ret.flags & HyundaiFlags.CANFD_NO_RADAR_DISABLE) if lka_steering and Ecu.adas not in [fw.ecu for fw in car_fw]: # this needs to be figured out for cars without an ADAS ECU From c011754081bf89486ad4e8ea8ad6e31225f43ab0 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 3 Apr 2026 16:05:54 -0700 Subject: [PATCH 209/229] Rivian: add GEN 2 B harness (#3286) * add b * update template * no default * capital * we don't have a driving video?! --- .github/pull_request_template.md | 6 ++++-- opendbc/car/docs_definitions.py | 3 ++- opendbc/car/rivian/values.py | 8 ++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 39601109dc7..7af11b38612 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -3,7 +3,9 @@ We need these details to verify your pull request. Find your device's dongle ID and a route at https://connect.comma.ai. Ideally, the route is recorded with the exact branch of your pull request. + +If you are porting a car with a new harness variant, please add it to https://github.com/commaai/opendbc/blob/master/opendbc/car/docs_definitions.py. Let us know and we can add it to the shop at the time of merge. --> Validation -* Dongle ID: -* Route: +* Dongle ID: +* Route: diff --git a/opendbc/car/docs_definitions.py b/opendbc/car/docs_definitions.py index 565814aef16..75edf795c04 100644 --- a/opendbc/car/docs_definitions.py +++ b/opendbc/car/docs_definitions.py @@ -139,7 +139,8 @@ class CarHarness(EnumBase): mazda = BaseCarHarness("Mazda connector") ford_q3 = BaseCarHarness("Ford Q3 connector") ford_q4 = BaseCarHarness("Ford Q4 connector", parts=[Accessory.harness_box, Accessory.comma_power, Cable.long_obdc_cable]) - rivian = BaseCarHarness("Rivian A connector", parts=[Accessory.harness_box, Accessory.comma_power, Cable.long_obdc_cable]) + rivian_a = BaseCarHarness("Rivian A connector", parts=[Accessory.harness_box, Accessory.comma_power, Cable.long_obdc_cable]) + rivian_b = BaseCarHarness("Rivian B connector", parts=[Accessory.harness_box, Accessory.comma_power, Cable.long_obdc_cable]) tesla_a = BaseCarHarness("Tesla A connector", parts=[Accessory.harness_box, Cable.long_obdc_cable]) tesla_b = BaseCarHarness("Tesla B connector", parts=[Accessory.harness_box, Cable.long_obdc_cable]) psa_a = BaseCarHarness("PSA A connector", parts=[Accessory.harness_box, Cable.long_obdc_cable]) diff --git a/opendbc/car/rivian/values.py b/opendbc/car/rivian/values.py index f632da8441f..f950839e345 100644 --- a/opendbc/car/rivian/values.py +++ b/opendbc/car/rivian/values.py @@ -28,8 +28,6 @@ class ModelYear(StrEnum): @dataclass class RivianCarDocs(CarDocs): package: str = "All" - car_parts: CarParts = field(default_factory=CarParts.common([CarHarness.rivian])) - setup_video: str = "https://youtu.be/uaISd1j7Z4U" @dataclass @@ -51,8 +49,10 @@ class RivianSafetyFlags(IntFlag): class CAR(Platforms): RIVIAN_R1 = RivianPlatformConfig( [ - RivianCarDocs("Rivian R1S 2022-25"), - RivianCarDocs("Rivian R1T 2022-25"), + RivianCarDocs("Rivian R1S 2022-24", setup_video="https://youtu.be/uaISd1j7Z4U", car_parts=CarParts.common([CarHarness.rivian_a])), + RivianCarDocs("Rivian R1S 2025", car_parts=CarParts.common([CarHarness.rivian_b])), + RivianCarDocs("Rivian R1T 2022-24", setup_video="https://youtu.be/uaISd1j7Z4U", car_parts=CarParts.common([CarHarness.rivian_a])), + RivianCarDocs("Rivian R1T 2025", car_parts=CarParts.common([CarHarness.rivian_b])), ], CarSpecs(mass=3206., wheelbase=3.08, steerRatio=15.2), wmis={WMI.RIVIAN_TRUCK, WMI.RIVIAN_MPV}, From 01871c73bfcfe3892252a70db3438609433e89ec Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Sat, 4 Apr 2026 00:09:42 -0700 Subject: [PATCH 210/229] Tesla: add new FSD 14 fingerprint (#3234) our tesla is fsd 14 --- opendbc/car/tesla/values.py | 1 + 1 file changed, 1 insertion(+) diff --git a/opendbc/car/tesla/values.py b/opendbc/car/tesla/values.py index 1d7f1775b53..873abfeaf09 100644 --- a/opendbc/car/tesla/values.py +++ b/opendbc/car/tesla/values.py @@ -79,6 +79,7 @@ class CAR(Platforms): CAR.TESLA_MODEL_3: [ b'TeMYG4_Main_0.0.0 (77),E4HP015.04.5', b'TeMYG4_Main_0.0.0 (78),E4HP015.05.0', + b'TeMYG4_Main_0.0.0 (77),E4H015.04.5', ], CAR.TESLA_MODEL_Y: [ b'TeMYG4_Legacy3Y_0.0.0 (6),Y4003.04.0', From d1858b60530a6e0d447de6a79e993a616460bf22 Mon Sep 17 00:00:00 2001 From: adeebshihadeh Date: Sat, 4 Apr 2026 08:16:47 +0000 Subject: [PATCH 211/229] docs: Scheduled auto-update CARS.md --- docs/CARS.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/CARS.md b/docs/CARS.md index 93d14d5ee23..2ba37acb726 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -1,6 +1,6 @@ -# Support Information for 395 Known Cars +# Support Information for 397 Known Cars |Make|Model|Package|Support Level| |---|---|---|:---:| @@ -262,8 +262,10 @@ |Ram|1500 2019-24|Adaptive Cruise Control (ACC)|[Upstream](#upstream)| |Ram|2500 2020-24|Adaptive Cruise Control (ACC)|[Dashcam mode](#dashcam)| |Ram|3500 2019-22|Adaptive Cruise Control (ACC)|[Dashcam mode](#dashcam)| -|Rivian|R1S 2022-25|All|[Upstream](#upstream)| -|Rivian|R1T 2022-25|All|[Upstream](#upstream)| +|Rivian|R1S 2022-24|All|[Upstream](#upstream)| +|Rivian|R1S 2025|All|[Upstream](#upstream)| +|Rivian|R1T 2022-24|All|[Upstream](#upstream)| +|Rivian|R1T 2025|All|[Upstream](#upstream)| |SEAT|Alhambra 2018-20|Adaptive Cruise Control (ACC) & Lane Assist|[Dashcam mode](#dashcam)| |SEAT|Ateca 2016-23|Adaptive Cruise Control (ACC) & Lane Assist|[Upstream](#upstream)| |SEAT|Leon 2014-20|Adaptive Cruise Control (ACC) & Lane Assist|[Upstream](#upstream)| From ec284cf4ca257ee50edd4e31f08eaf3abdba88d8 Mon Sep 17 00:00:00 2001 From: DevTekVE Date: Sun, 5 Apr 2026 00:02:21 +0200 Subject: [PATCH 212/229] refactor: prioritize in-memory generated DBCs over disk files (#3291) Swapped the resolution order to check `get_generated_dbcs()` before falling back to `DBC_PATH`. --- opendbc/can/dbc.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/opendbc/can/dbc.py b/opendbc/can/dbc.py index 595590356fc..97300c55e5c 100644 --- a/opendbc/can/dbc.py +++ b/opendbc/can/dbc.py @@ -81,15 +81,12 @@ def __init__(self, name: str): self._parse_file(name) else: dbc_path = os.path.join(DBC_PATH, name + ".dbc") - if os.path.exists(dbc_path): + if content := get_generated_dbcs().get(name): + self._parse_content(name, content) + elif os.path.exists(dbc_path): self._parse_file(dbc_path) else: - # try in-memory generated DBC - generated = get_generated_dbcs() - content = generated.get(name) - if content is None: - raise FileNotFoundError(f"DBC not found: {name}") - self._parse_content(name, content) + raise FileNotFoundError(f"DBC not found: {name}") def _parse_file(self, path: str): self.name = os.path.basename(path).replace(".dbc", "") From 03142750099c5888088d57e3b0a5f8c97001e97f Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Sat, 4 Apr 2026 21:19:50 -0700 Subject: [PATCH 213/229] Tesla: FSD 14 FW test (#3293) * start * new safety and match stock * oops can't violate even though it won't actuate this * clean up junk * cmt * use aego when disengaged * test tesla * revert * rev * document * fw re * Revert "fw re" This reverts commit 292868b0a1e71afa3b5055bf7ac1943a02ecdffb. --- opendbc/car/tesla/tests/test_tesla.py | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/opendbc/car/tesla/tests/test_tesla.py b/opendbc/car/tesla/tests/test_tesla.py index 2ccc777fd24..946ca39996f 100644 --- a/opendbc/car/tesla/tests/test_tesla.py +++ b/opendbc/car/tesla/tests/test_tesla.py @@ -1,10 +1,30 @@ from opendbc.car import gen_empty_fingerprint +from opendbc.car.structs import CarParams from opendbc.car.tesla.interface import CarInterface +from opendbc.car.tesla.fingerprints import FW_VERSIONS from opendbc.car.tesla.radar_interface import RADAR_START_ADDR -from opendbc.car.tesla.values import CAR +from opendbc.car.tesla.values import CAR, FSD_14_FW + +Ecu = CarParams.Ecu class TestTeslaFingerprint: + def test_fsd_14_fw(self): + for car_model, ecus in FW_VERSIONS.items(): + for fw in ecus.get((Ecu.eps, 0x730, None), []): + _, _, version = fw.partition(b',') + is_fsd_14 = fw in FSD_14_FW.get(car_model, []) + + if car_model == CAR.TESLA_MODEL_3: + # Model 3: FSD 14 FW has 'P' in the Highland suffix (E4HP vs E4H) + assert is_fsd_14 == version.startswith(b'E4HP'), f"{fw}" + elif car_model == CAR.TESLA_MODEL_Y: + # Model Y: FSD 14 FW is Y4x version >= 003.04 + prefix, _, ver = version.partition(b'.') + y4_003 = prefix.startswith(b'Y4') and prefix.endswith(b'003') # Y4=HW4, 003=version series (002 is never FSD 14) + high_version = y4_003 and int(ver.split(b'.')[0]) >= 4 + assert is_fsd_14 == high_version, f"{fw}" + def test_radar_detection(self): # Test radar availability detection for cars with radar DBC defined for radar in (True, False): From 25d32b2d43751a6c9fc3fe42ce0aad029f08b8bf Mon Sep 17 00:00:00 2001 From: commaci-public <60409688+commaci-public@users.noreply.github.com> Date: Mon, 6 Apr 2026 09:35:13 -0700 Subject: [PATCH 214/229] [bot] Update uv.lock (#3298) Co-authored-by: Vehicle Researcher --- uv.lock | 174 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 86 insertions(+), 88 deletions(-) diff --git a/uv.lock b/uv.lock index 0af35dd0419..7155d447de4 100644 --- a/uv.lock +++ b/uv.lock @@ -58,43 +58,43 @@ wheels = [ [[package]] name = "charset-normalizer" -version = "3.4.6" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/7b/60/e3bec1881450851b087e301bedc3daa9377a4d45f1c26aa90b0b235e38aa/charset_normalizer-3.4.6.tar.gz", hash = "sha256:1ae6b62897110aa7c79ea2f5dd38d1abca6db663687c0b1ad9aed6f6bae3d9d6", size = 143363, upload-time = "2026-03-15T18:53:25.478Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/62/28/ff6f234e628a2de61c458be2779cb182bc03f6eec12200d4a525bbfc9741/charset_normalizer-3.4.6-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:82060f995ab5003a2d6e0f4ad29065b7672b6593c8c63559beefe5b443242c3e", size = 293582, upload-time = "2026-03-15T18:50:25.454Z" }, - { url = "https://files.pythonhosted.org/packages/1c/b7/b1a117e5385cbdb3205f6055403c2a2a220c5ea80b8716c324eaf75c5c95/charset_normalizer-3.4.6-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:60c74963d8350241a79cb8feea80e54d518f72c26db618862a8f53e5023deaf9", size = 197240, upload-time = "2026-03-15T18:50:27.196Z" }, - { url = "https://files.pythonhosted.org/packages/a1/5f/2574f0f09f3c3bc1b2f992e20bce6546cb1f17e111c5be07308dc5427956/charset_normalizer-3.4.6-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:f6e4333fb15c83f7d1482a76d45a0818897b3d33f00efd215528ff7c51b8e35d", size = 217363, upload-time = "2026-03-15T18:50:28.601Z" }, - { url = "https://files.pythonhosted.org/packages/4a/d1/0ae20ad77bc949ddd39b51bf383b6ca932f2916074c95cad34ae465ab71f/charset_normalizer-3.4.6-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:bc72863f4d9aba2e8fd9085e63548a324ba706d2ea2c83b260da08a59b9482de", size = 212994, upload-time = "2026-03-15T18:50:30.102Z" }, - { url = "https://files.pythonhosted.org/packages/60/ac/3233d262a310c1b12633536a07cde5ddd16985e6e7e238e9f3f9423d8eb9/charset_normalizer-3.4.6-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9cc4fc6c196d6a8b76629a70ddfcd4635a6898756e2d9cac5565cf0654605d73", size = 204697, upload-time = "2026-03-15T18:50:31.654Z" }, - { url = "https://files.pythonhosted.org/packages/25/3c/8a18fc411f085b82303cfb7154eed5bd49c77035eb7608d049468b53f87c/charset_normalizer-3.4.6-cp311-cp311-manylinux_2_31_armv7l.whl", hash = "sha256:0c173ce3a681f309f31b87125fecec7a5d1347261ea11ebbb856fa6006b23c8c", size = 191673, upload-time = "2026-03-15T18:50:33.433Z" }, - { url = "https://files.pythonhosted.org/packages/ff/a7/11cfe61d6c5c5c7438d6ba40919d0306ed83c9ab957f3d4da2277ff67836/charset_normalizer-3.4.6-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:c907cdc8109f6c619e6254212e794d6548373cc40e1ec75e6e3823d9135d29cc", size = 201120, upload-time = "2026-03-15T18:50:35.105Z" }, - { url = "https://files.pythonhosted.org/packages/b5/10/cf491fa1abd47c02f69687046b896c950b92b6cd7337a27e6548adbec8e4/charset_normalizer-3.4.6-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:404a1e552cf5b675a87f0651f8b79f5f1e6fd100ee88dc612f89aa16abd4486f", size = 200911, upload-time = "2026-03-15T18:50:36.819Z" }, - { url = "https://files.pythonhosted.org/packages/28/70/039796160b48b18ed466fde0af84c1b090c4e288fae26cd674ad04a2d703/charset_normalizer-3.4.6-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:e3c701e954abf6fc03a49f7c579cc80c2c6cc52525340ca3186c41d3f33482ef", size = 192516, upload-time = "2026-03-15T18:50:38.228Z" }, - { url = "https://files.pythonhosted.org/packages/ff/34/c56f3223393d6ff3124b9e78f7de738047c2d6bc40a4f16ac0c9d7a1cb3c/charset_normalizer-3.4.6-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:7a6967aaf043bceabab5412ed6bd6bd26603dae84d5cb75bf8d9a74a4959d398", size = 218795, upload-time = "2026-03-15T18:50:39.664Z" }, - { url = "https://files.pythonhosted.org/packages/e8/3b/ce2d4f86c5282191a041fdc5a4ce18f1c6bd40a5bd1f74cf8625f08d51c1/charset_normalizer-3.4.6-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:5feb91325bbceade6afab43eb3b508c63ee53579fe896c77137ded51c6b6958e", size = 201833, upload-time = "2026-03-15T18:50:41.552Z" }, - { url = "https://files.pythonhosted.org/packages/3b/9b/b6a9f76b0fd7c5b5ec58b228ff7e85095370282150f0bd50b3126f5506d6/charset_normalizer-3.4.6-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:f820f24b09e3e779fe84c3c456cb4108a7aa639b0d1f02c28046e11bfcd088ed", size = 213920, upload-time = "2026-03-15T18:50:43.33Z" }, - { url = "https://files.pythonhosted.org/packages/ae/98/7bc23513a33d8172365ed30ee3a3b3fe1ece14a395e5fc94129541fc6003/charset_normalizer-3.4.6-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:b35b200d6a71b9839a46b9b7fff66b6638bb52fc9658aa58796b0326595d3021", size = 206951, upload-time = "2026-03-15T18:50:44.789Z" }, - { url = "https://files.pythonhosted.org/packages/32/73/c0b86f3d1458468e11aec870e6b3feac931facbe105a894b552b0e518e79/charset_normalizer-3.4.6-cp311-cp311-win32.whl", hash = "sha256:9ca4c0b502ab399ef89248a2c84c54954f77a070f28e546a85e91da627d1301e", size = 143703, upload-time = "2026-03-15T18:50:46.103Z" }, - { url = "https://files.pythonhosted.org/packages/c6/e3/76f2facfe8eddee0bbd38d2594e709033338eae44ebf1738bcefe0a06185/charset_normalizer-3.4.6-cp311-cp311-win_amd64.whl", hash = "sha256:a9e68c9d88823b274cf1e72f28cb5dc89c990edf430b0bfd3e2fb0785bfeabf4", size = 153857, upload-time = "2026-03-15T18:50:47.563Z" }, - { url = "https://files.pythonhosted.org/packages/e2/dc/9abe19c9b27e6cd3636036b9d1b387b78c40dedbf0b47f9366737684b4b0/charset_normalizer-3.4.6-cp311-cp311-win_arm64.whl", hash = "sha256:97d0235baafca5f2b09cf332cc275f021e694e8362c6bb9c96fc9a0eb74fc316", size = 142751, upload-time = "2026-03-15T18:50:49.234Z" }, - { url = "https://files.pythonhosted.org/packages/e5/62/c0815c992c9545347aeea7859b50dc9044d147e2e7278329c6e02ac9a616/charset_normalizer-3.4.6-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:2ef7fedc7a6ecbe99969cd09632516738a97eeb8bd7258bf8a0f23114c057dab", size = 295154, upload-time = "2026-03-15T18:50:50.88Z" }, - { url = "https://files.pythonhosted.org/packages/a8/37/bdca6613c2e3c58c7421891d80cc3efa1d32e882f7c4a7ee6039c3fc951a/charset_normalizer-3.4.6-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a4ea868bc28109052790eb2b52a9ab33f3aa7adc02f96673526ff47419490e21", size = 199191, upload-time = "2026-03-15T18:50:52.658Z" }, - { url = "https://files.pythonhosted.org/packages/6c/92/9934d1bbd69f7f398b38c5dae1cbf9cc672e7c34a4adf7b17c0a9c17d15d/charset_normalizer-3.4.6-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:836ab36280f21fc1a03c99cd05c6b7af70d2697e374c7af0b61ed271401a72a2", size = 218674, upload-time = "2026-03-15T18:50:54.102Z" }, - { url = "https://files.pythonhosted.org/packages/af/90/25f6ab406659286be929fd89ab0e78e38aa183fc374e03aa3c12d730af8a/charset_normalizer-3.4.6-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:f1ce721c8a7dfec21fcbdfe04e8f68174183cf4e8188e0645e92aa23985c57ff", size = 215259, upload-time = "2026-03-15T18:50:55.616Z" }, - { url = "https://files.pythonhosted.org/packages/4e/ef/79a463eb0fff7f96afa04c1d4c51f8fc85426f918db467854bfb6a569ce3/charset_normalizer-3.4.6-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0e28d62a8fc7a1fa411c43bd65e346f3bce9716dc51b897fbe930c5987b402d5", size = 207276, upload-time = "2026-03-15T18:50:57.054Z" }, - { url = "https://files.pythonhosted.org/packages/f7/72/d0426afec4b71dc159fa6b4e68f868cd5a3ecd918fec5813a15d292a7d10/charset_normalizer-3.4.6-cp312-cp312-manylinux_2_31_armv7l.whl", hash = "sha256:530d548084c4a9f7a16ed4a294d459b4f229db50df689bfe92027452452943a0", size = 195161, upload-time = "2026-03-15T18:50:58.686Z" }, - { url = "https://files.pythonhosted.org/packages/bf/18/c82b06a68bfcb6ce55e508225d210c7e6a4ea122bfc0748892f3dc4e8e11/charset_normalizer-3.4.6-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:30f445ae60aad5e1f8bdbb3108e39f6fbc09f4ea16c815c66578878325f8f15a", size = 203452, upload-time = "2026-03-15T18:51:00.196Z" }, - { url = "https://files.pythonhosted.org/packages/44/d6/0c25979b92f8adafdbb946160348d8d44aa60ce99afdc27df524379875cb/charset_normalizer-3.4.6-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:ac2393c73378fea4e52aa56285a3d64be50f1a12395afef9cce47772f60334c2", size = 202272, upload-time = "2026-03-15T18:51:01.703Z" }, - { url = "https://files.pythonhosted.org/packages/2e/3d/7fea3e8fe84136bebbac715dd1221cc25c173c57a699c030ab9b8900cbb7/charset_normalizer-3.4.6-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:90ca27cd8da8118b18a52d5f547859cc1f8354a00cd1e8e5120df3e30d6279e5", size = 195622, upload-time = "2026-03-15T18:51:03.526Z" }, - { url = "https://files.pythonhosted.org/packages/57/8a/d6f7fd5cb96c58ef2f681424fbca01264461336d2a7fc875e4446b1f1346/charset_normalizer-3.4.6-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:8e5a94886bedca0f9b78fecd6afb6629142fd2605aa70a125d49f4edc6037ee6", size = 220056, upload-time = "2026-03-15T18:51:05.269Z" }, - { url = "https://files.pythonhosted.org/packages/16/50/478cdda782c8c9c3fb5da3cc72dd7f331f031e7f1363a893cdd6ca0f8de0/charset_normalizer-3.4.6-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:695f5c2823691a25f17bc5d5ffe79fa90972cc34b002ac6c843bb8a1720e950d", size = 203751, upload-time = "2026-03-15T18:51:06.858Z" }, - { url = "https://files.pythonhosted.org/packages/75/fc/cc2fcac943939c8e4d8791abfa139f685e5150cae9f94b60f12520feaa9b/charset_normalizer-3.4.6-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:231d4da14bcd9301310faf492051bee27df11f2bc7549bc0bb41fef11b82daa2", size = 216563, upload-time = "2026-03-15T18:51:08.564Z" }, - { url = "https://files.pythonhosted.org/packages/a8/b7/a4add1d9a5f68f3d037261aecca83abdb0ab15960a3591d340e829b37298/charset_normalizer-3.4.6-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:a056d1ad2633548ca18ffa2f85c202cfb48b68615129143915b8dc72a806a923", size = 209265, upload-time = "2026-03-15T18:51:10.312Z" }, - { url = "https://files.pythonhosted.org/packages/6c/18/c094561b5d64a24277707698e54b7f67bd17a4f857bbfbb1072bba07c8bf/charset_normalizer-3.4.6-cp312-cp312-win32.whl", hash = "sha256:c2274ca724536f173122f36c98ce188fd24ce3dad886ec2b7af859518ce008a4", size = 144229, upload-time = "2026-03-15T18:51:11.694Z" }, - { url = "https://files.pythonhosted.org/packages/ab/20/0567efb3a8fd481b8f34f739ebddc098ed062a59fed41a8d193a61939e8f/charset_normalizer-3.4.6-cp312-cp312-win_amd64.whl", hash = "sha256:c8ae56368f8cc97c7e40a7ee18e1cedaf8e780cd8bc5ed5ac8b81f238614facb", size = 154277, upload-time = "2026-03-15T18:51:13.004Z" }, - { url = "https://files.pythonhosted.org/packages/15/57/28d79b44b51933119e21f65479d0864a8d5893e494cf5daab15df0247c17/charset_normalizer-3.4.6-cp312-cp312-win_arm64.whl", hash = "sha256:899d28f422116b08be5118ef350c292b36fc15ec2daeb9ea987c89281c7bb5c4", size = 142817, upload-time = "2026-03-15T18:51:14.408Z" }, - { url = "https://files.pythonhosted.org/packages/2a/68/687187c7e26cb24ccbd88e5069f5ef00eba804d36dde11d99aad0838ab45/charset_normalizer-3.4.6-py3-none-any.whl", hash = "sha256:947cf925bc916d90adba35a64c82aace04fa39b46b52d4630ece166655905a69", size = 61455, upload-time = "2026-03-15T18:53:23.833Z" }, +version = "3.4.7" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/e7/a1/67fe25fac3c7642725500a3f6cfe5821ad557c3abb11c9d20d12c7008d3e/charset_normalizer-3.4.7.tar.gz", hash = "sha256:ae89db9e5f98a11a4bf50407d4363e7b09b31e55bc117b4f7d80aab97ba009e5", size = 144271, upload-time = "2026-04-02T09:28:39.342Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/c2/d7/b5b7020a0565c2e9fa8c09f4b5fa6232feb326b8c20081ccded47ea368fd/charset_normalizer-3.4.7-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:7641bb8895e77f921102f72833904dcd9901df5d6d72a2ab8f31d04b7e51e4e7", size = 309705, upload-time = "2026-04-02T09:26:02.191Z" }, + { url = "https://files.pythonhosted.org/packages/5a/53/58c29116c340e5456724ecd2fff4196d236b98f3da97b404bc5e51ac3493/charset_normalizer-3.4.7-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:202389074300232baeb53ae2569a60901f7efadd4245cf3a3bf0617d60b439d7", size = 206419, upload-time = "2026-04-02T09:26:03.583Z" }, + { url = "https://files.pythonhosted.org/packages/b2/02/e8146dc6591a37a00e5144c63f29fb7c97a734ea8a111190783c0e60ab63/charset_normalizer-3.4.7-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:30b8d1d8c52a48c2c5690e152c169b673487a2a58de1ec7393196753063fcd5e", size = 227901, upload-time = "2026-04-02T09:26:04.738Z" }, + { url = "https://files.pythonhosted.org/packages/fb/73/77486c4cd58f1267bf17db420e930c9afa1b3be3fe8c8b8ebbebc9624359/charset_normalizer-3.4.7-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:532bc9bf33a68613fd7d65e4b1c71a6a38d7d42604ecf239c77392e9b4e8998c", size = 222742, upload-time = "2026-04-02T09:26:06.36Z" }, + { url = "https://files.pythonhosted.org/packages/a1/fa/f74eb381a7d94ded44739e9d94de18dc5edc9c17fb8c11f0a6890696c0a9/charset_normalizer-3.4.7-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2fe249cb4651fd12605b7288b24751d8bfd46d35f12a20b1ba33dea122e690df", size = 214061, upload-time = "2026-04-02T09:26:08.347Z" }, + { url = "https://files.pythonhosted.org/packages/dc/92/42bd3cefcf7687253fb86694b45f37b733c97f59af3724f356fa92b8c344/charset_normalizer-3.4.7-cp311-cp311-manylinux_2_31_armv7l.whl", hash = "sha256:65bcd23054beab4d166035cabbc868a09c1a49d1efe458fe8e4361215df40265", size = 199239, upload-time = "2026-04-02T09:26:09.823Z" }, + { url = "https://files.pythonhosted.org/packages/4c/3d/069e7184e2aa3b3cddc700e3dd267413dc259854adc3380421c805c6a17d/charset_normalizer-3.4.7-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:08e721811161356f97b4059a9ba7bafb23ea5ee2255402c42881c214e173c6b4", size = 210173, upload-time = "2026-04-02T09:26:10.953Z" }, + { url = "https://files.pythonhosted.org/packages/62/51/9d56feb5f2e7074c46f93e0ebdbe61f0848ee246e2f0d89f8e20b89ebb8f/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:e060d01aec0a910bdccb8be71faf34e7799ce36950f8294c8bf612cba65a2c9e", size = 209841, upload-time = "2026-04-02T09:26:12.142Z" }, + { url = "https://files.pythonhosted.org/packages/d2/59/893d8f99cc4c837dda1fe2f1139079703deb9f321aabcb032355de13b6c7/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:38c0109396c4cfc574d502df99742a45c72c08eff0a36158b6f04000043dbf38", size = 200304, upload-time = "2026-04-02T09:26:13.711Z" }, + { url = "https://files.pythonhosted.org/packages/7d/1d/ee6f3be3464247578d1ed5c46de545ccc3d3ff933695395c402c21fa6b77/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:1c2a768fdd44ee4a9339a9b0b130049139b8ce3c01d2ce09f67f5a68048d477c", size = 229455, upload-time = "2026-04-02T09:26:14.941Z" }, + { url = "https://files.pythonhosted.org/packages/54/bb/8fb0a946296ea96a488928bdce8ef99023998c48e4713af533e9bb98ef07/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:1a87ca9d5df6fe460483d9a5bbf2b18f620cbed41b432e2bddb686228282d10b", size = 210036, upload-time = "2026-04-02T09:26:16.478Z" }, + { url = "https://files.pythonhosted.org/packages/9a/bc/015b2387f913749f82afd4fcba07846d05b6d784dd16123cb66860e0237d/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:d635aab80466bc95771bb78d5370e74d36d1fe31467b6b29b8b57b2a3cd7d22c", size = 224739, upload-time = "2026-04-02T09:26:17.751Z" }, + { url = "https://files.pythonhosted.org/packages/17/ab/63133691f56baae417493cba6b7c641571a2130eb7bceba6773367ab9ec5/charset_normalizer-3.4.7-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:ae196f021b5e7c78e918242d217db021ed2a6ace2bc6ae94c0fc596221c7f58d", size = 216277, upload-time = "2026-04-02T09:26:18.981Z" }, + { url = "https://files.pythonhosted.org/packages/06/6d/3be70e827977f20db77c12a97e6a9f973631a45b8d186c084527e53e77a4/charset_normalizer-3.4.7-cp311-cp311-win32.whl", hash = "sha256:adb2597b428735679446b46c8badf467b4ca5f5056aae4d51a19f9570301b1ad", size = 147819, upload-time = "2026-04-02T09:26:20.295Z" }, + { url = "https://files.pythonhosted.org/packages/20/d9/5f67790f06b735d7c7637171bbfd89882ad67201891b7275e51116ed8207/charset_normalizer-3.4.7-cp311-cp311-win_amd64.whl", hash = "sha256:8e385e4267ab76874ae30db04c627faaaf0b509e1ccc11a95b3fc3e83f855c00", size = 159281, upload-time = "2026-04-02T09:26:21.74Z" }, + { url = "https://files.pythonhosted.org/packages/ca/83/6413f36c5a34afead88ce6f66684d943d91f233d76dd083798f9602b75ae/charset_normalizer-3.4.7-cp311-cp311-win_arm64.whl", hash = "sha256:d4a48e5b3c2a489fae013b7589308a40146ee081f6f509e047e0e096084ceca1", size = 147843, upload-time = "2026-04-02T09:26:22.901Z" }, + { url = "https://files.pythonhosted.org/packages/0c/eb/4fc8d0a7110eb5fc9cc161723a34a8a6c200ce3b4fbf681bc86feee22308/charset_normalizer-3.4.7-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:eca9705049ad3c7345d574e3510665cb2cf844c2f2dcfe675332677f081cbd46", size = 311328, upload-time = "2026-04-02T09:26:24.331Z" }, + { url = "https://files.pythonhosted.org/packages/f8/e3/0fadc706008ac9d7b9b5be6dc767c05f9d3e5df51744ce4cc9605de7b9f4/charset_normalizer-3.4.7-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6178f72c5508bfc5fd446a5905e698c6212932f25bcdd4b47a757a50605a90e2", size = 208061, upload-time = "2026-04-02T09:26:25.568Z" }, + { url = "https://files.pythonhosted.org/packages/42/f0/3dd1045c47f4a4604df85ec18ad093912ae1344ac706993aff91d38773a2/charset_normalizer-3.4.7-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:e1421b502d83040e6d7fb2fb18dff63957f720da3d77b2fbd3187ceb63755d7b", size = 229031, upload-time = "2026-04-02T09:26:26.865Z" }, + { url = "https://files.pythonhosted.org/packages/dc/67/675a46eb016118a2fbde5a277a5d15f4f69d5f3f5f338e5ee2f8948fcf43/charset_normalizer-3.4.7-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:edac0f1ab77644605be2cbba52e6b7f630731fc42b34cb0f634be1a6eface56a", size = 225239, upload-time = "2026-04-02T09:26:28.044Z" }, + { url = "https://files.pythonhosted.org/packages/4b/f8/d0118a2f5f23b02cd166fa385c60f9b0d4f9194f574e2b31cef350ad7223/charset_normalizer-3.4.7-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5649fd1c7bade02f320a462fdefd0b4bd3ce036065836d4f42e0de958038e116", size = 216589, upload-time = "2026-04-02T09:26:29.239Z" }, + { url = "https://files.pythonhosted.org/packages/b1/f1/6d2b0b261b6c4ceef0fcb0d17a01cc5bc53586c2d4796fa04b5c540bc13d/charset_normalizer-3.4.7-cp312-cp312-manylinux_2_31_armv7l.whl", hash = "sha256:203104ed3e428044fd943bc4bf45fa73c0730391f9621e37fe39ecf477b128cb", size = 202733, upload-time = "2026-04-02T09:26:30.5Z" }, + { url = "https://files.pythonhosted.org/packages/6f/c0/7b1f943f7e87cc3db9626ba17807d042c38645f0a1d4415c7a14afb5591f/charset_normalizer-3.4.7-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:298930cec56029e05497a76988377cbd7457ba864beeea92ad7e844fe74cd1f1", size = 212652, upload-time = "2026-04-02T09:26:31.709Z" }, + { url = "https://files.pythonhosted.org/packages/38/dd/5a9ab159fe45c6e72079398f277b7d2b523e7f716acc489726115a910097/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:708838739abf24b2ceb208d0e22403dd018faeef86ddac04319a62ae884c4f15", size = 211229, upload-time = "2026-04-02T09:26:33.282Z" }, + { url = "https://files.pythonhosted.org/packages/d5/ff/531a1cad5ca855d1c1a8b69cb71abfd6d85c0291580146fda7c82857caa1/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:0f7eb884681e3938906ed0434f20c63046eacd0111c4ba96f27b76084cd679f5", size = 203552, upload-time = "2026-04-02T09:26:34.845Z" }, + { url = "https://files.pythonhosted.org/packages/c1/4c/a5fb52d528a8ca41f7598cb619409ece30a169fbdf9cdce592e53b46c3a6/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:4dc1e73c36828f982bfe79fadf5919923f8a6f4df2860804db9a98c48824ce8d", size = 230806, upload-time = "2026-04-02T09:26:36.152Z" }, + { url = "https://files.pythonhosted.org/packages/59/7a/071feed8124111a32b316b33ae4de83d36923039ef8cf48120266844285b/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:aed52fea0513bac0ccde438c188c8a471c4e0f457c2dd20cdbf6ea7a450046c7", size = 212316, upload-time = "2026-04-02T09:26:37.672Z" }, + { url = "https://files.pythonhosted.org/packages/fd/35/f7dba3994312d7ba508e041eaac39a36b120f32d4c8662b8814dab876431/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:fea24543955a6a729c45a73fe90e08c743f0b3334bbf3201e6c4bc1b0c7fa464", size = 227274, upload-time = "2026-04-02T09:26:38.93Z" }, + { url = "https://files.pythonhosted.org/packages/8a/2d/a572df5c9204ab7688ec1edc895a73ebded3b023bb07364710b05dd1c9be/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:bb6d88045545b26da47aa879dd4a89a71d1dce0f0e549b1abcb31dfe4a8eac49", size = 218468, upload-time = "2026-04-02T09:26:40.17Z" }, + { url = "https://files.pythonhosted.org/packages/86/eb/890922a8b03a568ca2f336c36585a4713c55d4d67bf0f0c78924be6315ca/charset_normalizer-3.4.7-cp312-cp312-win32.whl", hash = "sha256:2257141f39fe65a3fdf38aeccae4b953e5f3b3324f4ff0daf9f15b8518666a2c", size = 148460, upload-time = "2026-04-02T09:26:41.416Z" }, + { url = "https://files.pythonhosted.org/packages/35/d9/0e7dffa06c5ab081f75b1b786f0aefc88365825dfcd0ac544bdb7b2b6853/charset_normalizer-3.4.7-cp312-cp312-win_amd64.whl", hash = "sha256:5ed6ab538499c8644b8a3e18debabcd7ce684f3fa91cf867521a7a0279cab2d6", size = 159330, upload-time = "2026-04-02T09:26:42.554Z" }, + { url = "https://files.pythonhosted.org/packages/9e/5d/481bcc2a7c88ea6b0878c299547843b2521ccbc40980cb406267088bc701/charset_normalizer-3.4.7-cp312-cp312-win_arm64.whl", hash = "sha256:56be790f86bfb2c98fb742ce566dfb4816e5a83384616ab59c49e0604d49c51d", size = 147828, upload-time = "2026-04-02T09:26:44.075Z" }, + { url = "https://files.pythonhosted.org/packages/db/8f/61959034484a4a7c527811f4721e75d02d653a35afb0b6054474d8185d4c/charset_normalizer-3.4.7-py3-none-any.whl", hash = "sha256:3dce51d0f5e7951f8bb4900c257dad282f49190fdbebecd4ba99bcc41fef404d", size = 61958, upload-time = "2026-04-02T09:28:37.794Z" }, ] [[package]] @@ -254,15 +254,13 @@ wheels = [ [[package]] name = "lefthook" -version = "2.1.4" +version = "2.1.5" source = { registry = "https://pypi.org/simple" } wheels = [ - { url = "https://files.pythonhosted.org/packages/3c/c1/0e76e13ff1cc52e6dcf295d6b1d9ea18eb7b48bda54075cbdcc0aa6df20c/lefthook-2.1.4-py3-none-macosx_10_15_x86_64.whl", hash = "sha256:f1dc03042222ee7f1ee7dbbae7ee3046beb9a12ebdfae09bca1107c19c1be988", size = 5432992, upload-time = "2026-03-12T07:25:17.326Z" }, - { url = "https://files.pythonhosted.org/packages/53/73/93f1a67afac0fa97c38004c43eb14df97414b6d3b4b0069b6d2b96b9de10/lefthook-2.1.4-py3-none-macosx_11_0_arm64.whl", hash = "sha256:a8db48e35307394cf0277d199b3b5a541324308642a16c3b3a9de688d64e165d", size = 4957289, upload-time = "2026-03-12T07:25:26.561Z" }, - { url = "https://files.pythonhosted.org/packages/03/70/2b5641a32f4ae7f31f38d67e987c4943d1f0ec401395e779c03dbca2484b/lefthook-2.1.4-py3-none-manylinux_2_17_aarch64.whl", hash = "sha256:31300ac6bde3512a62252da4c6e0685b5c5d0adefb5dfa1f7f5e1f0aea63ba8b", size = 4785792, upload-time = "2026-03-12T07:25:21.731Z" }, - { url = "https://files.pythonhosted.org/packages/8d/58/b6253c7ba669ecb21300c03ba0342e30392d2a22d3d54a7dfa398beb5bcd/lefthook-2.1.4-py3-none-manylinux_2_17_x86_64.whl", hash = "sha256:9b4e34d5771bb4484e10df644ad0bb3e348ac026d8c2305b9a151e932fc3e2b8", size = 5359026, upload-time = "2026-03-12T07:25:23.372Z" }, - { url = "https://files.pythonhosted.org/packages/a0/d2/a9ae9afe0b728b4eae171c5f95b1f57d213154533fbfb0cbb9281c3c60e9/lefthook-2.1.4-py3-none-win_amd64.whl", hash = "sha256:d8ae5640d4393e460d00f9b53cc60c9f8112b6194c1d85efd9cad9682e1e91ac", size = 5509363, upload-time = "2026-03-12T07:25:24.961Z" }, - { url = "https://files.pythonhosted.org/packages/2a/44/ab9d096f758f8de7e45a80eb5b49a60dbb5b12de20df308489cc4738ed50/lefthook-2.1.4-py3-none-win_arm64.whl", hash = "sha256:8c7ae0094d8d946cab0fd7977a9cd935a4c2d302401a561ab64bb175c6b5eb9d", size = 4862370, upload-time = "2026-03-12T07:25:19.554Z" }, + { url = "https://files.pythonhosted.org/packages/ec/69/e459ad7ad13ec4db36a8ef37f1a0e09912fc281f110ea40f42341aa64252/lefthook-2.1.5-py3-none-macosx_10_15_x86_64.whl", hash = "sha256:945ad336e0fe90796b3ea0ca6d65dd40f397fa41b099347419a0bc5a86b87b51", size = 5441480, upload-time = "2026-04-06T07:20:21.938Z" }, + { url = "https://files.pythonhosted.org/packages/2f/f0/72349a7aeca5818bf342a921f1515817724759df0ae6fa302a8244583eb0/lefthook-2.1.5-py3-none-macosx_11_0_arm64.whl", hash = "sha256:ee8342c207626959a2153aa6a280dcf2ee5021d20a10cc4a323c4ee7c6a8b7ec", size = 4966744, upload-time = "2026-04-06T07:20:23.544Z" }, + { url = "https://files.pythonhosted.org/packages/16/6f/6c3185e9aca0e04cdc09777becc945ebffbf14acac823417343575761ee7/lefthook-2.1.5-py3-none-manylinux_2_17_x86_64.whl", hash = "sha256:c352dd0d00b363dc745d6c490ead9c5a02f237a01dfaa90065aec68cb98e3354", size = 5369473, upload-time = "2026-04-06T07:20:25.138Z" }, + { url = "https://files.pythonhosted.org/packages/fb/2c/0324ac75fcb52f94670e3f94e6d236f8b341d962bc6f8881e07d95a8d60e/lefthook-2.1.5-py3-none-win_amd64.whl", hash = "sha256:c3e02d8bf4c95e763ee3affa0712f5ac9fe4205d7a2d902fdd4601a339c9c508", size = 5516337, upload-time = "2026-04-06T07:20:20.108Z" }, ] [[package]] @@ -511,7 +509,7 @@ wheels = [ [[package]] name = "requests" -version = "2.33.0" +version = "2.33.1" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "certifi" }, @@ -519,34 +517,34 @@ dependencies = [ { name = "idna" }, { name = "urllib3" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/34/64/8860370b167a9721e8956ae116825caff829224fbca0ca6e7bf8ddef8430/requests-2.33.0.tar.gz", hash = "sha256:c7ebc5e8b0f21837386ad0e1c8fe8b829fa5f544d8df3b2253bff14ef29d7652", size = 134232, upload-time = "2026-03-25T15:10:41.586Z" } +sdist = { url = "https://files.pythonhosted.org/packages/5f/a4/98b9c7c6428a668bf7e42ebb7c79d576a1c3c1e3ae2d47e674b468388871/requests-2.33.1.tar.gz", hash = "sha256:18817f8c57c6263968bc123d237e3b8b08ac046f5456bd1e307ee8f4250d3517", size = 134120, upload-time = "2026-03-30T16:09:15.531Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/56/5d/c814546c2333ceea4ba42262d8c4d55763003e767fa169adc693bd524478/requests-2.33.0-py3-none-any.whl", hash = "sha256:3324635456fa185245e24865e810cecec7b4caf933d7eb133dcde67d48cee69b", size = 65017, upload-time = "2026-03-25T15:10:40.382Z" }, + { url = "https://files.pythonhosted.org/packages/d7/8e/7540e8a2036f79a125c1d2ebadf69ed7901608859186c856fa0388ef4197/requests-2.33.1-py3-none-any.whl", hash = "sha256:4e6d1ef462f3626a1f0a0a9c42dd93c63bad33f9f1c1937509b8c5c8718ab56a", size = 64947, upload-time = "2026-03-30T16:09:13.83Z" }, ] [[package]] name = "ruff" -version = "0.15.8" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/14/b0/73cf7550861e2b4824950b8b52eebdcc5adc792a00c514406556c5b80817/ruff-0.15.8.tar.gz", hash = "sha256:995f11f63597ee362130d1d5a327a87cb6f3f5eae3094c620bcc632329a4d26e", size = 4610921, upload-time = "2026-03-26T18:39:38.675Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/4a/92/c445b0cd6da6e7ae51e954939cb69f97e008dbe750cfca89b8cedc081be7/ruff-0.15.8-py3-none-linux_armv6l.whl", hash = "sha256:cbe05adeba76d58162762d6b239c9056f1a15a55bd4b346cfd21e26cd6ad7bc7", size = 10527394, upload-time = "2026-03-26T18:39:41.566Z" }, - { url = "https://files.pythonhosted.org/packages/eb/92/f1c662784d149ad1414cae450b082cf736430c12ca78367f20f5ed569d65/ruff-0.15.8-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:d3e3d0b6ba8dca1b7ef9ab80a28e840a20070c4b62e56d675c24f366ef330570", size = 10905693, upload-time = "2026-03-26T18:39:30.364Z" }, - { url = "https://files.pythonhosted.org/packages/ca/f2/7a631a8af6d88bcef997eb1bf87cc3da158294c57044aafd3e17030613de/ruff-0.15.8-py3-none-macosx_11_0_arm64.whl", hash = "sha256:6ee3ae5c65a42f273f126686353f2e08ff29927b7b7e203b711514370d500de3", size = 10323044, upload-time = "2026-03-26T18:39:33.37Z" }, - { url = "https://files.pythonhosted.org/packages/67/18/1bf38e20914a05e72ef3b9569b1d5c70a7ef26cd188d69e9ca8ef588d5bf/ruff-0.15.8-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fdce027ada77baa448077ccc6ebb2fa9c3c62fd110d8659d601cf2f475858d94", size = 10629135, upload-time = "2026-03-26T18:39:44.142Z" }, - { url = "https://files.pythonhosted.org/packages/d2/e9/138c150ff9af60556121623d41aba18b7b57d95ac032e177b6a53789d279/ruff-0.15.8-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:12e617fc01a95e5821648a6df341d80456bd627bfab8a829f7cfc26a14a4b4a3", size = 10348041, upload-time = "2026-03-26T18:39:52.178Z" }, - { url = "https://files.pythonhosted.org/packages/02/f1/5bfb9298d9c323f842c5ddeb85f1f10ef51516ac7a34ba446c9347d898df/ruff-0.15.8-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:432701303b26416d22ba696c39f2c6f12499b89093b61360abc34bcc9bf07762", size = 11121987, upload-time = "2026-03-26T18:39:55.195Z" }, - { url = "https://files.pythonhosted.org/packages/10/11/6da2e538704e753c04e8d86b1fc55712fdbdcc266af1a1ece7a51fff0d10/ruff-0.15.8-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d910ae974b7a06a33a057cb87d2a10792a3b2b3b35e33d2699fdf63ec8f6b17a", size = 11951057, upload-time = "2026-03-26T18:39:19.18Z" }, - { url = "https://files.pythonhosted.org/packages/83/f0/c9208c5fd5101bf87002fed774ff25a96eea313d305f1e5d5744698dc314/ruff-0.15.8-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2033f963c43949d51e6fdccd3946633c6b37c484f5f98c3035f49c27395a8ab8", size = 11464613, upload-time = "2026-03-26T18:40:06.301Z" }, - { url = "https://files.pythonhosted.org/packages/f8/22/d7f2fabdba4fae9f3b570e5605d5eb4500dcb7b770d3217dca4428484b17/ruff-0.15.8-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0f29b989a55572fb885b77464cf24af05500806ab4edf9a0fd8977f9759d85b1", size = 11257557, upload-time = "2026-03-26T18:39:57.972Z" }, - { url = "https://files.pythonhosted.org/packages/71/8c/382a9620038cf6906446b23ce8632ab8c0811b8f9d3e764f58bedd0c9a6f/ruff-0.15.8-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:ac51d486bf457cdc985a412fb1801b2dfd1bd8838372fc55de64b1510eff4bec", size = 11169440, upload-time = "2026-03-26T18:39:22.205Z" }, - { url = "https://files.pythonhosted.org/packages/4d/0d/0994c802a7eaaf99380085e4e40c845f8e32a562e20a38ec06174b52ef24/ruff-0.15.8-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:c9861eb959edab053c10ad62c278835ee69ca527b6dcd72b47d5c1e5648964f6", size = 10605963, upload-time = "2026-03-26T18:39:46.682Z" }, - { url = "https://files.pythonhosted.org/packages/19/aa/d624b86f5b0aad7cef6bbf9cd47a6a02dfdc4f72c92a337d724e39c9d14b/ruff-0.15.8-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:8d9a5b8ea13f26ae90838afc33f91b547e61b794865374f114f349e9036835fb", size = 10357484, upload-time = "2026-03-26T18:39:49.176Z" }, - { url = "https://files.pythonhosted.org/packages/35/c3/e0b7835d23001f7d999f3895c6b569927c4d39912286897f625736e1fd04/ruff-0.15.8-py3-none-musllinux_1_2_i686.whl", hash = "sha256:c2a33a529fb3cbc23a7124b5c6ff121e4d6228029cba374777bd7649cc8598b8", size = 10830426, upload-time = "2026-03-26T18:40:03.702Z" }, - { url = "https://files.pythonhosted.org/packages/f0/51/ab20b322f637b369383adc341d761eaaa0f0203d6b9a7421cd6e783d81b9/ruff-0.15.8-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:75e5cd06b1cf3f47a3996cfc999226b19aa92e7cce682dcd62f80d7035f98f49", size = 11345125, upload-time = "2026-03-26T18:39:27.799Z" }, - { url = "https://files.pythonhosted.org/packages/37/e6/90b2b33419f59d0f2c4c8a48a4b74b460709a557e8e0064cf33ad894f983/ruff-0.15.8-py3-none-win32.whl", hash = "sha256:bc1f0a51254ba21767bfa9a8b5013ca8149dcf38092e6a9eb704d876de94dc34", size = 10571959, upload-time = "2026-03-26T18:39:36.117Z" }, - { url = "https://files.pythonhosted.org/packages/1f/a2/ef467cb77099062317154c63f234b8a7baf7cb690b99af760c5b68b9ee7f/ruff-0.15.8-py3-none-win_amd64.whl", hash = "sha256:04f79eff02a72db209d47d665ba7ebcad609d8918a134f86cb13dd132159fc89", size = 11743893, upload-time = "2026-03-26T18:39:25.01Z" }, - { url = "https://files.pythonhosted.org/packages/15/e2/77be4fff062fa78d9b2a4dea85d14785dac5f1d0c1fb58ed52331f0ebe28/ruff-0.15.8-py3-none-win_arm64.whl", hash = "sha256:cf891fa8e3bb430c0e7fac93851a5978fc99c8fa2c053b57b118972866f8e5f2", size = 11048175, upload-time = "2026-03-26T18:40:01.06Z" }, +version = "0.15.9" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/e6/97/e9f1ca355108ef7194e38c812ef40ba98c7208f47b13ad78d023caa583da/ruff-0.15.9.tar.gz", hash = "sha256:29cbb1255a9797903f6dde5ba0188c707907ff44a9006eb273b5a17bfa0739a2", size = 4617361, upload-time = "2026-04-02T18:17:20.829Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/0b/1f/9cdfd0ac4b9d1e5a6cf09bedabdf0b56306ab5e333c85c87281273e7b041/ruff-0.15.9-py3-none-linux_armv6l.whl", hash = "sha256:6efbe303983441c51975c243e26dff328aca11f94b70992f35b093c2e71801e1", size = 10511206, upload-time = "2026-04-02T18:16:41.574Z" }, + { url = "https://files.pythonhosted.org/packages/3d/f6/32bfe3e9c136b35f02e489778d94384118bb80fd92c6d92e7ccd97db12ce/ruff-0.15.9-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:4965bac6ac9ea86772f4e23587746f0b7a395eccabb823eb8bfacc3fa06069f7", size = 10923307, upload-time = "2026-04-02T18:17:08.645Z" }, + { url = "https://files.pythonhosted.org/packages/ca/25/de55f52ab5535d12e7aaba1de37a84be6179fb20bddcbe71ec091b4a3243/ruff-0.15.9-py3-none-macosx_11_0_arm64.whl", hash = "sha256:eaf05aad70ca5b5a0a4b0e080df3a6b699803916d88f006efd1f5b46302daab8", size = 10316722, upload-time = "2026-04-02T18:16:44.206Z" }, + { url = "https://files.pythonhosted.org/packages/48/11/690d75f3fd6278fe55fff7c9eb429c92d207e14b25d1cae4064a32677029/ruff-0.15.9-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9439a342adb8725f32f92732e2bafb6d5246bd7a5021101166b223d312e8fc59", size = 10623674, upload-time = "2026-04-02T18:16:50.951Z" }, + { url = "https://files.pythonhosted.org/packages/bd/ec/176f6987be248fc5404199255522f57af1b4a5a1b57727e942479fec98ad/ruff-0.15.9-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:9c5e6faf9d97c8edc43877c3f406f47446fc48c40e1442d58cfcdaba2acea745", size = 10351516, upload-time = "2026-04-02T18:16:57.206Z" }, + { url = "https://files.pythonhosted.org/packages/b2/fc/51cffbd2b3f240accc380171d51446a32aa2ea43a40d4a45ada67368fbd2/ruff-0.15.9-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7b34a9766aeec27a222373d0b055722900fbc0582b24f39661aa96f3fe6ad901", size = 11150202, upload-time = "2026-04-02T18:17:06.452Z" }, + { url = "https://files.pythonhosted.org/packages/d6/d4/25292a6dfc125f6b6528fe6af31f5e996e19bf73ca8e3ce6eb7fa5b95885/ruff-0.15.9-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:89dd695bc72ae76ff484ae54b7e8b0f6b50f49046e198355e44ea656e521fef9", size = 11988891, upload-time = "2026-04-02T18:17:18.575Z" }, + { url = "https://files.pythonhosted.org/packages/13/e1/1eebcb885c10e19f969dcb93d8413dfee8172578709d7ee933640f5e7147/ruff-0.15.9-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ce187224ef1de1bd225bc9a152ac7102a6171107f026e81f317e4257052916d5", size = 11480576, upload-time = "2026-04-02T18:16:52.986Z" }, + { url = "https://files.pythonhosted.org/packages/ff/6b/a1548ac378a78332a4c3dcf4a134c2475a36d2a22ddfa272acd574140b50/ruff-0.15.9-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2b0c7c341f68adb01c488c3b7d4b49aa8ea97409eae6462d860a79cf55f431b6", size = 11254525, upload-time = "2026-04-02T18:17:02.041Z" }, + { url = "https://files.pythonhosted.org/packages/42/aa/4bb3af8e61acd9b1281db2ab77e8b2c3c5e5599bf2a29d4a942f1c62b8d6/ruff-0.15.9-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:55cc15eee27dc0eebdfcb0d185a6153420efbedc15eb1d38fe5e685657b0f840", size = 11204072, upload-time = "2026-04-02T18:17:13.581Z" }, + { url = "https://files.pythonhosted.org/packages/69/48/d550dc2aa6e423ea0bcc1d0ff0699325ffe8a811e2dba156bd80750b86dc/ruff-0.15.9-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:a6537f6eed5cda688c81073d46ffdfb962a5f29ecb6f7e770b2dc920598997ed", size = 10594998, upload-time = "2026-04-02T18:16:46.369Z" }, + { url = "https://files.pythonhosted.org/packages/63/47/321167e17f5344ed5ec6b0aa2cff64efef5f9e985af8f5622cfa6536043f/ruff-0.15.9-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:6d3fcbca7388b066139c523bda744c822258ebdcfbba7d24410c3f454cc9af71", size = 10359769, upload-time = "2026-04-02T18:17:10.994Z" }, + { url = "https://files.pythonhosted.org/packages/67/5e/074f00b9785d1d2c6f8c22a21e023d0c2c1817838cfca4c8243200a1fa87/ruff-0.15.9-py3-none-musllinux_1_2_i686.whl", hash = "sha256:058d8e99e1bfe79d8a0def0b481c56059ee6716214f7e425d8e737e412d69677", size = 10850236, upload-time = "2026-04-02T18:16:48.749Z" }, + { url = "https://files.pythonhosted.org/packages/76/37/804c4135a2a2caf042925d30d5f68181bdbd4461fd0d7739da28305df593/ruff-0.15.9-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:8e1ddb11dbd61d5983fa2d7d6370ef3eb210951e443cace19594c01c72abab4c", size = 11358343, upload-time = "2026-04-02T18:16:55.068Z" }, + { url = "https://files.pythonhosted.org/packages/88/3d/1364fcde8656962782aa9ea93c92d98682b1ecec2f184e625a965ad3b4a6/ruff-0.15.9-py3-none-win32.whl", hash = "sha256:bde6ff36eaf72b700f32b7196088970bf8fdb2b917b7accd8c371bfc0fd573ec", size = 10583382, upload-time = "2026-04-02T18:17:04.261Z" }, + { url = "https://files.pythonhosted.org/packages/4c/56/5c7084299bd2cacaa07ae63a91c6f4ba66edc08bf28f356b24f6b717c799/ruff-0.15.9-py3-none-win_amd64.whl", hash = "sha256:45a70921b80e1c10cf0b734ef09421f71b5aa11d27404edc89d7e8a69505e43d", size = 11744969, upload-time = "2026-04-02T18:16:59.611Z" }, + { url = "https://files.pythonhosted.org/packages/03/36/76704c4f312257d6dbaae3c959add2a622f63fcca9d864659ce6d8d97d3d/ruff-0.15.9-py3-none-win_arm64.whl", hash = "sha256:0694e601c028fd97dc5c6ee244675bc241aeefced7ef80cd9c6935a871078f53", size = 11005870, upload-time = "2026-04-02T18:17:15.773Z" }, ] [[package]] @@ -609,26 +607,26 @@ wheels = [ [[package]] name = "ty" -version = "0.0.26" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/18/94/4879b81f8681117ccaf31544579304f6dc2ddcc0c67f872afb35869643a2/ty-0.0.26.tar.gz", hash = "sha256:0496b62405d62de7b954d6d677dc1cc5d3046197215d7a0a7fef37745d7b6d29", size = 5393643, upload-time = "2026-03-26T16:27:11.067Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/83/24/99fe33ecd7e16d23c53b0d4244778c6d1b6eb1663b091236dcba22882d67/ty-0.0.26-py3-none-linux_armv6l.whl", hash = "sha256:35beaa56cf59725fd59ab35d8445bbd40b97fe76db39b052b1fcb31f9bf8adf7", size = 10521856, upload-time = "2026-03-26T16:27:06.335Z" }, - { url = "https://files.pythonhosted.org/packages/55/97/1b5e939e2ff69b9bb279ab680bfa8f677d886309a1ac8d9588fd6ce58146/ty-0.0.26-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:487a0be58ab0eb02e31ba71eb6953812a0f88e50633469b0c0ce3fb795fe0fa1", size = 10320958, upload-time = "2026-03-26T16:27:13.849Z" }, - { url = "https://files.pythonhosted.org/packages/71/25/37081461e13d38a190e5646948d7bc42084f7bd1c6b44f12550be3923e7e/ty-0.0.26-py3-none-macosx_11_0_arm64.whl", hash = "sha256:a01b7de5693379646d423b68f119719a1338a20017ba48a93eefaff1ee56f97b", size = 9799905, upload-time = "2026-03-26T16:26:55.805Z" }, - { url = "https://files.pythonhosted.org/packages/a1/1c/295d8f55a7b0e037dfc3a5ec4bdda3ab3cbca6f492f725bf269f96a4d841/ty-0.0.26-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:628c3ee869d113dd2bd249925662fd39d9d0305a6cb38f640ddaa7436b74a1ef", size = 10317507, upload-time = "2026-03-26T16:27:31.887Z" }, - { url = "https://files.pythonhosted.org/packages/1d/62/48b3875c5d2f48fe017468d4bbdde1164c76a8184374f1d5e6162cf7d9b8/ty-0.0.26-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:63d04f35f5370cbc91c0b9675dc83e0c53678125a7b629c9c95769e86f123e65", size = 10319821, upload-time = "2026-03-26T16:27:29.647Z" }, - { url = "https://files.pythonhosted.org/packages/ff/28/cfb2d495046d5bf42d532325cea7412fa1189912d549dbfae417a24fd794/ty-0.0.26-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4a53c4e6f6a91927f8b90e584a4b12bcde05b0c1870ddff8d17462168ad7947a", size = 10831757, upload-time = "2026-03-26T16:27:37.441Z" }, - { url = "https://files.pythonhosted.org/packages/26/bf/dbc3e42f448a2d862651de070b4108028c543ca18cab096b38d7de449915/ty-0.0.26-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:caf2ced0e58d898d5e3ba5cb843e0ebd377c8a461464748586049afbd9321f51", size = 11369556, upload-time = "2026-03-26T16:26:58.655Z" }, - { url = "https://files.pythonhosted.org/packages/92/4c/6d2f8f34bc6d502ab778c9345a4a936a72ae113de11329c1764bb1f204f6/ty-0.0.26-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:384807bbcb7d7ce9b97ee5aaa6417a8ae03ccfb426c52b08018ca62cf60f5430", size = 11085679, upload-time = "2026-03-26T16:27:21.746Z" }, - { url = "https://files.pythonhosted.org/packages/cc/f4/f3f61c203bc980dd9bba0ba7ed3c6e81ddfd36b286330f9487c2c7d041aa/ty-0.0.26-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8a2c766a94d79b4f82995d41229702caf2d76e5c440ec7e543d05c70e98bf8ab", size = 10900581, upload-time = "2026-03-26T16:27:24.39Z" }, - { url = "https://files.pythonhosted.org/packages/3d/fd/3ca1b4e4bdd129829e9ce78677e0f8e0f1038a7702dccecfa52f037c6046/ty-0.0.26-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:f41ac45a0f8e3e8e181508d863a0a62156341db0f624ffd004b97ee550a9de80", size = 10294401, upload-time = "2026-03-26T16:27:03.999Z" }, - { url = "https://files.pythonhosted.org/packages/de/20/4ee3d8c3f90e008843795c765cb8bb245f188c23e5e5cc612c7697406fba/ty-0.0.26-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:73eb8327a34d529438dfe4db46796946c4e825167cbee434dc148569892e435f", size = 10351469, upload-time = "2026-03-26T16:27:19.003Z" }, - { url = "https://files.pythonhosted.org/packages/3d/b1/9fb154ade65906d4148f0b999c4a8257c2a34253cb72e15d84c1f04a064e/ty-0.0.26-py3-none-musllinux_1_2_i686.whl", hash = "sha256:4bb53a79259516535a1b55f613ba1619e9c666854946474ca8418c35a5c4fd60", size = 10529488, upload-time = "2026-03-26T16:27:01.378Z" }, - { url = "https://files.pythonhosted.org/packages/a5/70/9b02b03b1862e27b64143db65946d68b138160a5b6bfea193bee0b8bbc34/ty-0.0.26-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:2f0e75edc1aeb1b4b84af516c7891f631254a4ca3dcd15e848fa1e061e1fe9da", size = 10999015, upload-time = "2026-03-26T16:27:34.636Z" }, - { url = "https://files.pythonhosted.org/packages/21/16/0a56b8667296e2989b9d48095472d98ebf57a0006c71f2a101bbc62a142d/ty-0.0.26-py3-none-win32.whl", hash = "sha256:943c998c5523ed6b519c899c0c39b26b4c751a9759e460fb964765a44cde226f", size = 9912378, upload-time = "2026-03-26T16:27:08.999Z" }, - { url = "https://files.pythonhosted.org/packages/60/c2/fef0d4bba9cd89a82d725b3b1a66efb1b36629ecf0fb1d8e916cb75b8829/ty-0.0.26-py3-none-win_amd64.whl", hash = "sha256:19c856d343efeb1ecad8ee220848f5d2c424daf7b2feda357763ad3036e2172f", size = 10863737, upload-time = "2026-03-26T16:27:27.06Z" }, - { url = "https://files.pythonhosted.org/packages/4d/05/888ebcb3c4d3b6b72d5d3241fddd299142caa3c516e6d26a9cd887dfed3b/ty-0.0.26-py3-none-win_arm64.whl", hash = "sha256:2cde58ccffa046db1223dc28f3e7d4f2c7da8267e97cc5cd186af6fe85f1758a", size = 10285408, upload-time = "2026-03-26T16:27:16.432Z" }, +version = "0.0.29" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/47/d5/853561de49fae38c519e905b2d8da9c531219608f1fccc47a0fc2c896980/ty-0.0.29.tar.gz", hash = "sha256:e7936cca2f691eeda631876c92809688dbbab68687c3473f526cd83b6a9228d8", size = 5469221, upload-time = "2026-04-05T15:01:21.328Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/03/b7/911f9962115acfa24e3b2ec9d4992dd994c38e8769e1b1d7680bb4d28a51/ty-0.0.29-py3-none-linux_armv6l.whl", hash = "sha256:b8a40955f7660d3eaceb0d964affc81b790c0765e7052921a5f861ff8a471c30", size = 10568206, upload-time = "2026-04-05T15:01:19.165Z" }, + { url = "https://files.pythonhosted.org/packages/fe/c3/fcae2167d4c77a97269f92f11d1b43b03617f81de1283d5d05b43432110c/ty-0.0.29-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:6b6849adae15b00bbe2d3c5b078967dcb62eba37d38936b8eeb4c81a82d2e3b8", size = 10442530, upload-time = "2026-04-05T15:01:28.471Z" }, + { url = "https://files.pythonhosted.org/packages/97/33/5a6bfa240cfcb9c36046ae2459fa9ea23238d20130d8656ff5ac4d6c012a/ty-0.0.29-py3-none-macosx_11_0_arm64.whl", hash = "sha256:dcdd9b17209788152f7b7ea815eda07989152325052fe690013537cc7904ce49", size = 9915735, upload-time = "2026-04-05T15:01:10.365Z" }, + { url = "https://files.pythonhosted.org/packages/b3/1e/318f45fae232118e81a6306c30f50de42c509c412128d5bd231eab699ffb/ty-0.0.29-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9d8ed4789bae78ffaf94462c0d25589a734cab0366b86f2bbcb1bb90e1a7a169", size = 10419748, upload-time = "2026-04-05T15:01:32.375Z" }, + { url = "https://files.pythonhosted.org/packages/a9/a8/5687872e2ab5a0f7dd4fd8456eac31e9381ad4dc74961f6f29965ad4dd91/ty-0.0.29-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:91ec374b8565e0ad0900011c24641ebbef2da51adbd4fb69ff3280c8a7eceb02", size = 10394738, upload-time = "2026-04-05T15:01:06.473Z" }, + { url = "https://files.pythonhosted.org/packages/de/68/015d118097eeb95e6a44c4abce4c0a28b7b9dfb3085b7f0ee48e4f099633/ty-0.0.29-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:298a8d5faa2502d3810bbbb47a030b9455495b9921594206043c785dd61548cf", size = 10910613, upload-time = "2026-04-05T15:01:17.17Z" }, + { url = "https://files.pythonhosted.org/packages/1c/01/47ce3c6c53e0670eadbe80756b167bf80ed6681d1ba57cfde2e8065a13d1/ty-0.0.29-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3c8fba1a3524c6109d1e020d92301c79d41bf442fa8d335b9fa366239339cb70", size = 11475750, upload-time = "2026-04-05T15:01:30.461Z" }, + { url = "https://files.pythonhosted.org/packages/c4/cf/e361845b1081c9264ad5b7c963231bab03f2666865a9f2a115c4233f2137/ty-0.0.29-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4c48adf88a70d264128c39ee922ed14a947817fced1e93c08c1a89c9244edcde", size = 11190055, upload-time = "2026-04-05T15:01:12.369Z" }, + { url = "https://files.pythonhosted.org/packages/79/12/0fb0857e9a62cb11586e9a712103877bbf717f5fb570d16634408cfdefee/ty-0.0.29-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2ce0a7a0e96bc7b42518cd3a1a6a6298ef64ff40ca4614355c1aa807059b5c6f", size = 11020539, upload-time = "2026-04-05T15:01:37.022Z" }, + { url = "https://files.pythonhosted.org/packages/20/36/5a26753802083f80cd125db6c4348ad42b3c982ec36e718e0bf4c18f75e5/ty-0.0.29-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:a6ac86a05b4a3731d45365ab97780acc7b8146fa62fccb3cbe94fe6546c67a97", size = 10396399, upload-time = "2026-04-05T15:01:26.167Z" }, + { url = "https://files.pythonhosted.org/packages/00/e6/b4e75b5752239ab3ab400f19faef4dbef81d05aab5d3419fda0c062a3765/ty-0.0.29-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:6bbbf53141af0f3150bf288d716263f1a3550054e4b3551ca866d38192ba9891", size = 10421461, upload-time = "2026-04-05T15:01:08.367Z" }, + { url = "https://files.pythonhosted.org/packages/c0/21/1084b5b609f9abed62070ec0b31c283a403832a6310c8bbc208bd45ee1e6/ty-0.0.29-py3-none-musllinux_1_2_i686.whl", hash = "sha256:1c9e06b770c1d0ff5efc51e34312390db31d53fcf3088163f413030b42b74f84", size = 10599187, upload-time = "2026-04-05T15:01:23.52Z" }, + { url = "https://files.pythonhosted.org/packages/ab/a1/ce19a2ca717bbcc1ee11378aba52ef70b6ce5b87245162a729d9fdc2360f/ty-0.0.29-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:0307fe37e3f000ef1a4ae230bbaf511508a78d24a5e51b40902a21b09d5e6037", size = 11121198, upload-time = "2026-04-05T15:01:15.22Z" }, + { url = "https://files.pythonhosted.org/packages/6b/6b/f1430b279af704321566ce7ec2725d3d8258c2f815ebd93e474c64cd4543/ty-0.0.29-py3-none-win32.whl", hash = "sha256:7a2a898217960a825f8bc0087e1fdbaf379606175e98f9807187221d53a4a8ed", size = 9995331, upload-time = "2026-04-05T15:01:01.32Z" }, + { url = "https://files.pythonhosted.org/packages/d2/ef/3ef01c17785ff9a69378465c7d0faccd48a07b163554db0995e5d65a5a23/ty-0.0.29-py3-none-win_amd64.whl", hash = "sha256:fc1294200226b91615acbf34e0a9ad81caf98c081e9c6a912a31b0a7b603bc3f", size = 11023644, upload-time = "2026-04-05T15:01:04.432Z" }, + { url = "https://files.pythonhosted.org/packages/2c/55/87280a994d6a2d2647c65e12abbc997ed49835794366153c04c4d9304d76/ty-0.0.29-py3-none-win_arm64.whl", hash = "sha256:f9794bbd1bb3ce13f78c191d0c89ae4c63f52c12b6daa0c6fe220b90d019d12c", size = 10428165, upload-time = "2026-04-05T15:01:34.665Z" }, ] [[package]] From 918c401dcf7d2201efe37ec945dbb4f69eaf4fac Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Mon, 6 Apr 2026 16:48:12 -0400 Subject: [PATCH 215/229] Hyundai CAN FD: fix Blind-spot Collision Warning (BCW) signal bit (#3296) Co-authored-by: Test User --- opendbc/dbc/generator/hyundai/hyundai_canfd.dbc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/opendbc/dbc/generator/hyundai/hyundai_canfd.dbc b/opendbc/dbc/generator/hyundai/hyundai_canfd.dbc index fdce6fbc70a..3687b762918 100644 --- a/opendbc/dbc/generator/hyundai/hyundai_canfd.dbc +++ b/opendbc/dbc/generator/hyundai/hyundai_canfd.dbc @@ -459,12 +459,10 @@ BO_ 442 ADAS_CMD_50_50ms: 24 XXX SG_ ADAS_CMD_AlvCnt50Val : 16|8@1+ (1,0) [0|255] "" XXX SG_ BCW_Sta : 24|1@0+ (1,0) [0|1] "" XXX SG_ BCW_OnOffEquipSta : 28|2@1+ (1,0) [0|3] "" XXX - SG_ BCW_LtIndSta : 30|1@0+ (1,0) [0|3] "" XXX - SG_ BCW_RtIndSta : 32|1@1+ (1,0) [0|3] "" XXX + SG_ BCW_LtIndSta : 31|2@0+ (1,0) [0|3] "" XXX + SG_ BCW_RtIndSta : 32|2@1+ (1,0) [0|3] "" XXX SG_ BCW_LtSndWrngSta : 34|2@1+ (1,0) [0|3] "" XXX SG_ BCW_RtSndWrngSta : 36|10@1+ (1,0) [0|1023] "" XXX - SG_ FL_INDICATOR : 46|6@0+ (1,0) [0|1] "" XXX - SG_ FR_INDICATOR : 54|2@0+ (1,0) [0|3] "" XXX SG_ BCW_SnstvtyModRetVal : 56|3@1+ (1,0) [0|7] "" XXX SG_ BCW_IndSta : 59|3@1+ (1,0) [0|7] "" XXX SG_ BCA_OnOffEquip2Sta : 62|2@1+ (1,0) [0|3] "" XXX @@ -873,6 +871,8 @@ CM_ SG_ 437 Info_RtLnHdingAnglVal "This signal outputs the heading angle of righ CM_ SG_ 437 Info_RtLnCvtrVal "This signal outputs the curvature of right line."; CM_ SG_ 437 ID_CIPV "Valid Object = 1 to 255 - ID detected by front camera can vary depending on vehicle environment. - Additional logic would be required to apply this signal for ISG."; CM_ SG_ 437 Relative_Velocity "+ : Preceding, - : Oncoming - Velocity detected by front camera can vary depending on vehicle environment. - Additional logic would be required to apply this signal for ISG. - Confirmaiton by Autonomous Driving Engineering Team is required to use ID_C"; +CM_ SG_ 442 BCW_LtIndSta "Left blind-spot indicator. When a vehicle is detected, the BCW light on the side mirror illuminates. When the blinker is also on, the BCW light flashes on both the dash and the mirror to alert the driver."; +CM_ SG_ 442 BCW_RtIndSta "Right blind-spot indicator. When a vehicle is detected, the BCW light on the side mirror illuminates. When the blinker is also on, the BCW light flashes on both the dash and the mirror to alert the driver."; CM_ SG_ 416 SCC_ObjSta "state of in-path object and information of controllable state."; CM_ SG_ 480 NEW_SIGNAL_5 "todo: figure out why always set to 1"; CM_ BO_ 506 "Sent by the camera containing speed limit information. ISLW stands for Intelligent Speed Limit Warning, and ISLA is Intelligent Speed Limit Assist. it also contains road sign information."; @@ -1112,6 +1112,8 @@ VAL_ 437 Info_LftLnDptSta 0 "No Left Line Departure" 1 "Left Line Departure" 2 " VAL_ 437 Info_RtLnQualSta 0 "Very Low Quality" 1 "Low Quality" 2 "High Quality" 3 "Very High Quality" 4 "Reserved" 5 "Reserved" 6 "Reserved" 7 "Error indicator"; VAL_ 437 Info_RtLnDptSta 0 "No Right Line Departure" 1 "Right Line Departure" 2 "Reserved" 3 "Error Indicator"; VAL_ 437 Info_RtLnCvtrVal 65534 "Reserved" 65535 "Error indicator"; +VAL_ 442 BCW_LtIndSta 0 "No detection" 1 "Blind-spot warning active" 2 "Blind-spot warning + blinker, flashing" 3 "Reserved"; +VAL_ 442 BCW_RtIndSta 0 "No detection" 1 "Blind-spot warning active" 2 "Blind-spot warning + blinker, flashing" 3 "Reserved"; VAL_ 463 CRUISE_BUTTONS 0 "none" 1 "res_accel" 2 "set_decel" 3 "gap_distance" 4 "pause_resume"; VAL_ 463 RIGHT_PADDLE 0 "Not Pulled" 1 "Pulled"; VAL_ 463 LEFT_PADDLE 0 "Not Pulled" 1 "Pulled"; From 140010dce8487aae639b1626647c886ac2f73065 Mon Sep 17 00:00:00 2001 From: MVL Date: Mon, 6 Apr 2026 23:22:20 -0400 Subject: [PATCH 216/229] Honda - Add additional 2025 CRV fingerprint (#3304) Add additional 2025 CRV Hybrid fingerprint --- opendbc/car/honda/fingerprints.py | 1 + 1 file changed, 1 insertion(+) diff --git a/opendbc/car/honda/fingerprints.py b/opendbc/car/honda/fingerprints.py index 59b7780ca86..c1732c1a702 100644 --- a/opendbc/car/honda/fingerprints.py +++ b/opendbc/car/honda/fingerprints.py @@ -1150,6 +1150,7 @@ b'8S102-3D4-A070\x00\x00', b'8S102-3D4-A080\x00\x00', b'8S102-3D4-A090\x00\x00', + b'8S102-3D4-A110\x00\x00', ], }, CAR.HONDA_CITY_7G: { From 56111c5fee134fe0c5e45f83e8380d3b9ebb5ab1 Mon Sep 17 00:00:00 2001 From: Griffin Date: Mon, 6 Apr 2026 20:24:57 -0700 Subject: [PATCH 217/229] Honda: add fwdCamera FW for 2023 CR-V EX-L AWD (#3303) Honda CRV 6G: add fwdCamera FW version for 2023 CR-V EX-L AWD Route: 18358e6a68b7e09c|00000001--2cc543bcf4 Co-authored-by: Claude Opus 4.6 (1M context) --- opendbc/car/honda/fingerprints.py | 1 + 1 file changed, 1 insertion(+) diff --git a/opendbc/car/honda/fingerprints.py b/opendbc/car/honda/fingerprints.py index c1732c1a702..780b6f9e981 100644 --- a/opendbc/car/honda/fingerprints.py +++ b/opendbc/car/honda/fingerprints.py @@ -1142,6 +1142,7 @@ ], (Ecu.fwdCamera, 0x18dab5f1, None): [ b'8S102-3A0-A070\x00\x00', + b'8S102-3A0-A080\x00\x00', b'8S102-3A0-A090\x00\x00', b'8S102-3A0-A110\x00\x00', b'8S102-3A0-A230\x00\x00', From f6fb00d949aaa262b86d68560d4826f581f61e1c Mon Sep 17 00:00:00 2001 From: MVL Date: Mon, 6 Apr 2026 23:31:39 -0400 Subject: [PATCH 218/229] Honda - additional 26 CRV fingerprint (#3297) 26crv --- opendbc/car/honda/fingerprints.py | 1 + 1 file changed, 1 insertion(+) diff --git a/opendbc/car/honda/fingerprints.py b/opendbc/car/honda/fingerprints.py index 780b6f9e981..6c378151ac8 100644 --- a/opendbc/car/honda/fingerprints.py +++ b/opendbc/car/honda/fingerprints.py @@ -1146,6 +1146,7 @@ b'8S102-3A0-A090\x00\x00', b'8S102-3A0-A110\x00\x00', b'8S102-3A0-A230\x00\x00', + b'8S102-3A0-A240\x00\x00', b'8S102-3C0-Q060\x00\x00', b'8S102-3D4-A060\x00\x00', b'8S102-3D4-A070\x00\x00', From 946a49624023bf0e98d0eac65b8889b4d988f090 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Mon, 6 Apr 2026 21:04:53 -0700 Subject: [PATCH 219/229] Fix safety test race condition (#3306) * hmm * yep eaach worker * clean up * fix cov --- opendbc/safety/tests/libsafety/libsafety_py.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/opendbc/safety/tests/libsafety/libsafety_py.py b/opendbc/safety/tests/libsafety/libsafety_py.py index 244c0ae6679..7d88bdf301e 100644 --- a/opendbc/safety/tests/libsafety/libsafety_py.py +++ b/opendbc/safety/tests/libsafety/libsafety_py.py @@ -14,7 +14,6 @@ def _build_libsafety() -> str: """Compile libsafety.so to a temp file and return its path.""" root = str(Path(libsafety_dir).parents[3]) safety_c = os.path.join(libsafety_dir, "safety.c") - safety_os = os.path.join(libsafety_dir, "safety.os") cflags = [ '-Wall', '-Wextra', '-Werror', '-nostdlib', '-fno-builtin', @@ -27,6 +26,8 @@ def _build_libsafety() -> str: '-fprofile-arcs', '-ftest-coverage', ] + fd, safety_os = tempfile.mkstemp(suffix='.os', dir=libsafety_dir) + os.close(fd) fd, libsafety_so = tempfile.mkstemp(suffix='.so') os.close(fd) From ebaca24c02b2d5eb9765ca6f63d5b11e67f52eca Mon Sep 17 00:00:00 2001 From: Nikita Pylypyuk <147505783+nikitap066@users.noreply.github.com> Date: Tue, 7 Apr 2026 06:04:44 +0100 Subject: [PATCH 220/229] Toyota: clarification for GAS_PEDAL on non-SECOC vehicles (#3299) * removing todo and clarify toyota GAS_PEDAL * Update opendbc/car/toyota/carstate.py --------- Co-authored-by: Shane Smiskol --- opendbc/car/toyota/carstate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendbc/car/toyota/carstate.py b/opendbc/car/toyota/carstate.py index ca50e70b4cf..d69cf1324c9 100644 --- a/opendbc/car/toyota/carstate.py +++ b/opendbc/car/toyota/carstate.py @@ -75,7 +75,7 @@ def update(self, can_parsers) -> structs.CarState: ret.gasPressed = cp.vl["GAS_PEDAL"]["GAS_PEDAL_USER"] > 0 can_gear = int(cp.vl["GEAR_PACKET_HYBRID"]["GEAR"]) else: - ret.gasPressed = cp.vl["PCM_CRUISE"]["GAS_RELEASED"] == 0 # TODO: these also have GAS_PEDAL, come back and unify + ret.gasPressed = cp.vl["PCM_CRUISE"]["GAS_RELEASED"] == 0 can_gear = int(cp.vl["GEAR_PACKET"]["GEAR"]) if not self.CP.flags & ToyotaFlags.DISABLE_RADAR.value: ret.stockAeb = bool(cp_acc.vl["PRE_COLLISION"]["PRECOLLISION_ACTIVE"] and cp_acc.vl["PRE_COLLISION"]["FORCE"] < -1e-5) From 37c8ae0c2d6830b70d11e1a4e849721cedfe3f03 Mon Sep 17 00:00:00 2001 From: stef <19478336+stefpi@users.noreply.github.com> Date: Tue, 7 Apr 2026 16:49:48 -0700 Subject: [PATCH 221/229] include all v1 body addresses in fingerprint (#3308) --- opendbc/car/body/fingerprints.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendbc/car/body/fingerprints.py b/opendbc/car/body/fingerprints.py index 5806112fb15..f5669418a2a 100644 --- a/opendbc/car/body/fingerprints.py +++ b/opendbc/car/body/fingerprints.py @@ -9,7 +9,7 @@ FINGERPRINTS = { CAR.COMMA_BODY: [{ - 513: 8, 516: 8, 514: 3, 515: 4 + 513: 8, 516: 8, 514: 3, 515: 4, 517: 8, 518: 6, 519: 6 }], } From 901c138423c16f24445732c57432cc5ff73f7e19 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Thu, 9 Apr 2026 00:55:55 -0700 Subject: [PATCH 222/229] Tesla long: more closely match stock setSpeed (#3314) use real set speed --- opendbc/car/tesla/teslacan.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/opendbc/car/tesla/teslacan.py b/opendbc/car/tesla/teslacan.py index 7449b961f17..902cc31bdc8 100644 --- a/opendbc/car/tesla/teslacan.py +++ b/opendbc/car/tesla/teslacan.py @@ -29,12 +29,7 @@ def create_steering_control(self, angle, enabled): return self.packer.make_can_msg("DAS_steeringControl", CANBUS.party, values) def create_longitudinal_command(self, acc_state, accel, counter, v_ego, active): - from opendbc.car.interfaces import V_CRUISE_MAX - - set_speed = max(v_ego * CV.MS_TO_KPH, 0) - if active: - # TODO: this causes jerking after gas override when above set speed - set_speed = 0 if accel < 0 else V_CRUISE_MAX + set_speed = min(max(v_ego + accel, 0) * CV.MS_TO_KPH, 400) values = { "DAS_setSpeed": set_speed, From 6123dde9f67259aa3c8b1fa962f242f522bdd5a4 Mon Sep 17 00:00:00 2001 From: commaci-public <60409688+commaci-public@users.noreply.github.com> Date: Mon, 13 Apr 2026 09:14:38 -0700 Subject: [PATCH 223/229] [bot] Update uv.lock (#3327) Co-authored-by: Vehicle Researcher --- uv.lock | 142 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 72 insertions(+), 70 deletions(-) diff --git a/uv.lock b/uv.lock index 7155d447de4..9f6fe98125a 100644 --- a/uv.lock +++ b/uv.lock @@ -254,61 +254,63 @@ wheels = [ [[package]] name = "lefthook" -version = "2.1.5" +version = "2.1.4" source = { registry = "https://pypi.org/simple" } wheels = [ - { url = "https://files.pythonhosted.org/packages/ec/69/e459ad7ad13ec4db36a8ef37f1a0e09912fc281f110ea40f42341aa64252/lefthook-2.1.5-py3-none-macosx_10_15_x86_64.whl", hash = "sha256:945ad336e0fe90796b3ea0ca6d65dd40f397fa41b099347419a0bc5a86b87b51", size = 5441480, upload-time = "2026-04-06T07:20:21.938Z" }, - { url = "https://files.pythonhosted.org/packages/2f/f0/72349a7aeca5818bf342a921f1515817724759df0ae6fa302a8244583eb0/lefthook-2.1.5-py3-none-macosx_11_0_arm64.whl", hash = "sha256:ee8342c207626959a2153aa6a280dcf2ee5021d20a10cc4a323c4ee7c6a8b7ec", size = 4966744, upload-time = "2026-04-06T07:20:23.544Z" }, - { url = "https://files.pythonhosted.org/packages/16/6f/6c3185e9aca0e04cdc09777becc945ebffbf14acac823417343575761ee7/lefthook-2.1.5-py3-none-manylinux_2_17_x86_64.whl", hash = "sha256:c352dd0d00b363dc745d6c490ead9c5a02f237a01dfaa90065aec68cb98e3354", size = 5369473, upload-time = "2026-04-06T07:20:25.138Z" }, - { url = "https://files.pythonhosted.org/packages/fb/2c/0324ac75fcb52f94670e3f94e6d236f8b341d962bc6f8881e07d95a8d60e/lefthook-2.1.5-py3-none-win_amd64.whl", hash = "sha256:c3e02d8bf4c95e763ee3affa0712f5ac9fe4205d7a2d902fdd4601a339c9c508", size = 5516337, upload-time = "2026-04-06T07:20:20.108Z" }, + { url = "https://files.pythonhosted.org/packages/3c/c1/0e76e13ff1cc52e6dcf295d6b1d9ea18eb7b48bda54075cbdcc0aa6df20c/lefthook-2.1.4-py3-none-macosx_10_15_x86_64.whl", hash = "sha256:f1dc03042222ee7f1ee7dbbae7ee3046beb9a12ebdfae09bca1107c19c1be988", size = 5432992, upload-time = "2026-03-12T07:25:17.326Z" }, + { url = "https://files.pythonhosted.org/packages/53/73/93f1a67afac0fa97c38004c43eb14df97414b6d3b4b0069b6d2b96b9de10/lefthook-2.1.4-py3-none-macosx_11_0_arm64.whl", hash = "sha256:a8db48e35307394cf0277d199b3b5a541324308642a16c3b3a9de688d64e165d", size = 4957289, upload-time = "2026-03-12T07:25:26.561Z" }, + { url = "https://files.pythonhosted.org/packages/03/70/2b5641a32f4ae7f31f38d67e987c4943d1f0ec401395e779c03dbca2484b/lefthook-2.1.4-py3-none-manylinux_2_17_aarch64.whl", hash = "sha256:31300ac6bde3512a62252da4c6e0685b5c5d0adefb5dfa1f7f5e1f0aea63ba8b", size = 4785792, upload-time = "2026-03-12T07:25:21.731Z" }, + { url = "https://files.pythonhosted.org/packages/8d/58/b6253c7ba669ecb21300c03ba0342e30392d2a22d3d54a7dfa398beb5bcd/lefthook-2.1.4-py3-none-manylinux_2_17_x86_64.whl", hash = "sha256:9b4e34d5771bb4484e10df644ad0bb3e348ac026d8c2305b9a151e932fc3e2b8", size = 5359026, upload-time = "2026-03-12T07:25:23.372Z" }, + { url = "https://files.pythonhosted.org/packages/a0/d2/a9ae9afe0b728b4eae171c5f95b1f57d213154533fbfb0cbb9281c3c60e9/lefthook-2.1.4-py3-none-win_amd64.whl", hash = "sha256:d8ae5640d4393e460d00f9b53cc60c9f8112b6194c1d85efd9cad9682e1e91ac", size = 5509363, upload-time = "2026-03-12T07:25:24.961Z" }, + { url = "https://files.pythonhosted.org/packages/2a/44/ab9d096f758f8de7e45a80eb5b49a60dbb5b12de20df308489cc4738ed50/lefthook-2.1.4-py3-none-win_arm64.whl", hash = "sha256:8c7ae0094d8d946cab0fd7977a9cd935a4c2d302401a561ab64bb175c6b5eb9d", size = 4862370, upload-time = "2026-03-12T07:25:19.554Z" }, ] [[package]] name = "lxml" -version = "6.0.2" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/aa/88/262177de60548e5a2bfc46ad28232c9e9cbde697bd94132aeb80364675cb/lxml-6.0.2.tar.gz", hash = "sha256:cd79f3367bd74b317dda655dc8fcfa304d9eb6e4fb06b7168c5cf27f96e0cd62", size = 4073426, upload-time = "2025-09-22T04:04:59.287Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/77/d5/becbe1e2569b474a23f0c672ead8a29ac50b2dc1d5b9de184831bda8d14c/lxml-6.0.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:13e35cbc684aadf05d8711a5d1b5857c92e5e580efa9a0d2be197199c8def607", size = 8634365, upload-time = "2025-09-22T04:00:45.672Z" }, - { url = "https://files.pythonhosted.org/packages/28/66/1ced58f12e804644426b85d0bb8a4478ca77bc1761455da310505f1a3526/lxml-6.0.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3b1675e096e17c6fe9c0e8c81434f5736c0739ff9ac6123c87c2d452f48fc938", size = 4650793, upload-time = "2025-09-22T04:00:47.783Z" }, - { url = "https://files.pythonhosted.org/packages/11/84/549098ffea39dfd167e3f174b4ce983d0eed61f9d8d25b7bf2a57c3247fc/lxml-6.0.2-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:8ac6e5811ae2870953390452e3476694196f98d447573234592d30488147404d", size = 4944362, upload-time = "2025-09-22T04:00:49.845Z" }, - { url = "https://files.pythonhosted.org/packages/ac/bd/f207f16abf9749d2037453d56b643a7471d8fde855a231a12d1e095c4f01/lxml-6.0.2-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:5aa0fc67ae19d7a64c3fe725dc9a1bb11f80e01f78289d05c6f62545affec438", size = 5083152, upload-time = "2025-09-22T04:00:51.709Z" }, - { url = "https://files.pythonhosted.org/packages/15/ae/bd813e87d8941d52ad5b65071b1affb48da01c4ed3c9c99e40abb266fbff/lxml-6.0.2-cp311-cp311-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:de496365750cc472b4e7902a485d3f152ecf57bd3ba03ddd5578ed8ceb4c5964", size = 5023539, upload-time = "2025-09-22T04:00:53.593Z" }, - { url = "https://files.pythonhosted.org/packages/02/cd/9bfef16bd1d874fbe0cb51afb00329540f30a3283beb9f0780adbb7eec03/lxml-6.0.2-cp311-cp311-manylinux_2_26_i686.manylinux_2_28_i686.whl", hash = "sha256:200069a593c5e40b8f6fc0d84d86d970ba43138c3e68619ffa234bc9bb806a4d", size = 5344853, upload-time = "2025-09-22T04:00:55.524Z" }, - { url = "https://files.pythonhosted.org/packages/b8/89/ea8f91594bc5dbb879734d35a6f2b0ad50605d7fb419de2b63d4211765cc/lxml-6.0.2-cp311-cp311-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7d2de809c2ee3b888b59f995625385f74629707c9355e0ff856445cdcae682b7", size = 5225133, upload-time = "2025-09-22T04:00:57.269Z" }, - { url = "https://files.pythonhosted.org/packages/b9/37/9c735274f5dbec726b2db99b98a43950395ba3d4a1043083dba2ad814170/lxml-6.0.2-cp311-cp311-manylinux_2_31_armv7l.whl", hash = "sha256:b2c3da8d93cf5db60e8858c17684c47d01fee6405e554fb55018dd85fc23b178", size = 4677944, upload-time = "2025-09-22T04:00:59.052Z" }, - { url = "https://files.pythonhosted.org/packages/20/28/7dfe1ba3475d8bfca3878365075abe002e05d40dfaaeb7ec01b4c587d533/lxml-6.0.2-cp311-cp311-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:442de7530296ef5e188373a1ea5789a46ce90c4847e597856570439621d9c553", size = 5284535, upload-time = "2025-09-22T04:01:01.335Z" }, - { url = "https://files.pythonhosted.org/packages/e7/cf/5f14bc0de763498fc29510e3532bf2b4b3a1c1d5d0dff2e900c16ba021ef/lxml-6.0.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:2593c77efde7bfea7f6389f1ab249b15ed4aa5bc5cb5131faa3b843c429fbedb", size = 5067343, upload-time = "2025-09-22T04:01:03.13Z" }, - { url = "https://files.pythonhosted.org/packages/1c/b0/bb8275ab5472f32b28cfbbcc6db7c9d092482d3439ca279d8d6fa02f7025/lxml-6.0.2-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:3e3cb08855967a20f553ff32d147e14329b3ae70ced6edc2f282b94afbc74b2a", size = 4725419, upload-time = "2025-09-22T04:01:05.013Z" }, - { url = "https://files.pythonhosted.org/packages/25/4c/7c222753bc72edca3b99dbadba1b064209bc8ed4ad448af990e60dcce462/lxml-6.0.2-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:2ed6c667fcbb8c19c6791bbf40b7268ef8ddf5a96940ba9404b9f9a304832f6c", size = 5275008, upload-time = "2025-09-22T04:01:07.327Z" }, - { url = "https://files.pythonhosted.org/packages/6c/8c/478a0dc6b6ed661451379447cdbec77c05741a75736d97e5b2b729687828/lxml-6.0.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:b8f18914faec94132e5b91e69d76a5c1d7b0c73e2489ea8929c4aaa10b76bbf7", size = 5248906, upload-time = "2025-09-22T04:01:09.452Z" }, - { url = "https://files.pythonhosted.org/packages/2d/d9/5be3a6ab2784cdf9accb0703b65e1b64fcdd9311c9f007630c7db0cfcce1/lxml-6.0.2-cp311-cp311-win32.whl", hash = "sha256:6605c604e6daa9e0d7f0a2137bdc47a2e93b59c60a65466353e37f8272f47c46", size = 3610357, upload-time = "2025-09-22T04:01:11.102Z" }, - { url = "https://files.pythonhosted.org/packages/e2/7d/ca6fb13349b473d5732fb0ee3eec8f6c80fc0688e76b7d79c1008481bf1f/lxml-6.0.2-cp311-cp311-win_amd64.whl", hash = "sha256:e5867f2651016a3afd8dd2c8238baa66f1e2802f44bc17e236f547ace6647078", size = 4036583, upload-time = "2025-09-22T04:01:12.766Z" }, - { url = "https://files.pythonhosted.org/packages/ab/a2/51363b5ecd3eab46563645f3a2c3836a2fc67d01a1b87c5017040f39f567/lxml-6.0.2-cp311-cp311-win_arm64.whl", hash = "sha256:4197fb2534ee05fd3e7afaab5d8bfd6c2e186f65ea7f9cd6a82809c887bd1285", size = 3680591, upload-time = "2025-09-22T04:01:14.874Z" }, - { url = "https://files.pythonhosted.org/packages/f3/c8/8ff2bc6b920c84355146cd1ab7d181bc543b89241cfb1ebee824a7c81457/lxml-6.0.2-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:a59f5448ba2ceccd06995c95ea59a7674a10de0810f2ce90c9006f3cbc044456", size = 8661887, upload-time = "2025-09-22T04:01:17.265Z" }, - { url = "https://files.pythonhosted.org/packages/37/6f/9aae1008083bb501ef63284220ce81638332f9ccbfa53765b2b7502203cf/lxml-6.0.2-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:e8113639f3296706fbac34a30813929e29247718e88173ad849f57ca59754924", size = 4667818, upload-time = "2025-09-22T04:01:19.688Z" }, - { url = "https://files.pythonhosted.org/packages/f1/ca/31fb37f99f37f1536c133476674c10b577e409c0a624384147653e38baf2/lxml-6.0.2-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:a8bef9b9825fa8bc816a6e641bb67219489229ebc648be422af695f6e7a4fa7f", size = 4950807, upload-time = "2025-09-22T04:01:21.487Z" }, - { url = "https://files.pythonhosted.org/packages/da/87/f6cb9442e4bada8aab5ae7e1046264f62fdbeaa6e3f6211b93f4c0dd97f1/lxml-6.0.2-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:65ea18d710fd14e0186c2f973dc60bb52039a275f82d3c44a0e42b43440ea534", size = 5109179, upload-time = "2025-09-22T04:01:23.32Z" }, - { url = "https://files.pythonhosted.org/packages/c8/20/a7760713e65888db79bbae4f6146a6ae5c04e4a204a3c48896c408cd6ed2/lxml-6.0.2-cp312-cp312-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c371aa98126a0d4c739ca93ceffa0fd7a5d732e3ac66a46e74339acd4d334564", size = 5023044, upload-time = "2025-09-22T04:01:25.118Z" }, - { url = "https://files.pythonhosted.org/packages/a2/b0/7e64e0460fcb36471899f75831509098f3fd7cd02a3833ac517433cb4f8f/lxml-6.0.2-cp312-cp312-manylinux_2_26_i686.manylinux_2_28_i686.whl", hash = "sha256:700efd30c0fa1a3581d80a748157397559396090a51d306ea59a70020223d16f", size = 5359685, upload-time = "2025-09-22T04:01:27.398Z" }, - { url = "https://files.pythonhosted.org/packages/b9/e1/e5df362e9ca4e2f48ed6411bd4b3a0ae737cc842e96877f5bf9428055ab4/lxml-6.0.2-cp312-cp312-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:c33e66d44fe60e72397b487ee92e01da0d09ba2d66df8eae42d77b6d06e5eba0", size = 5654127, upload-time = "2025-09-22T04:01:29.629Z" }, - { url = "https://files.pythonhosted.org/packages/c6/d1/232b3309a02d60f11e71857778bfcd4acbdb86c07db8260caf7d008b08f8/lxml-6.0.2-cp312-cp312-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:90a345bbeaf9d0587a3aaffb7006aa39ccb6ff0e96a57286c0cb2fd1520ea192", size = 5253958, upload-time = "2025-09-22T04:01:31.535Z" }, - { url = "https://files.pythonhosted.org/packages/35/35/d955a070994725c4f7d80583a96cab9c107c57a125b20bb5f708fe941011/lxml-6.0.2-cp312-cp312-manylinux_2_31_armv7l.whl", hash = "sha256:064fdadaf7a21af3ed1dcaa106b854077fbeada827c18f72aec9346847cd65d0", size = 4711541, upload-time = "2025-09-22T04:01:33.801Z" }, - { url = "https://files.pythonhosted.org/packages/1e/be/667d17363b38a78c4bd63cfd4b4632029fd68d2c2dc81f25ce9eb5224dd5/lxml-6.0.2-cp312-cp312-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:fbc74f42c3525ac4ffa4b89cbdd00057b6196bcefe8bce794abd42d33a018092", size = 5267426, upload-time = "2025-09-22T04:01:35.639Z" }, - { url = "https://files.pythonhosted.org/packages/ea/47/62c70aa4a1c26569bc958c9ca86af2bb4e1f614e8c04fb2989833874f7ae/lxml-6.0.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:6ddff43f702905a4e32bc24f3f2e2edfe0f8fde3277d481bffb709a4cced7a1f", size = 5064917, upload-time = "2025-09-22T04:01:37.448Z" }, - { url = "https://files.pythonhosted.org/packages/bd/55/6ceddaca353ebd0f1908ef712c597f8570cc9c58130dbb89903198e441fd/lxml-6.0.2-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:6da5185951d72e6f5352166e3da7b0dc27aa70bd1090b0eb3f7f7212b53f1bb8", size = 4788795, upload-time = "2025-09-22T04:01:39.165Z" }, - { url = "https://files.pythonhosted.org/packages/cf/e8/fd63e15da5e3fd4c2146f8bbb3c14e94ab850589beab88e547b2dbce22e1/lxml-6.0.2-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:57a86e1ebb4020a38d295c04fc79603c7899e0df71588043eb218722dabc087f", size = 5676759, upload-time = "2025-09-22T04:01:41.506Z" }, - { url = "https://files.pythonhosted.org/packages/76/47/b3ec58dc5c374697f5ba37412cd2728f427d056315d124dd4b61da381877/lxml-6.0.2-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:2047d8234fe735ab77802ce5f2297e410ff40f5238aec569ad7c8e163d7b19a6", size = 5255666, upload-time = "2025-09-22T04:01:43.363Z" }, - { url = "https://files.pythonhosted.org/packages/19/93/03ba725df4c3d72afd9596eef4a37a837ce8e4806010569bedfcd2cb68fd/lxml-6.0.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:6f91fd2b2ea15a6800c8e24418c0775a1694eefc011392da73bc6cef2623b322", size = 5277989, upload-time = "2025-09-22T04:01:45.215Z" }, - { url = "https://files.pythonhosted.org/packages/c6/80/c06de80bfce881d0ad738576f243911fccf992687ae09fd80b734712b39c/lxml-6.0.2-cp312-cp312-win32.whl", hash = "sha256:3ae2ce7d6fedfb3414a2b6c5e20b249c4c607f72cb8d2bb7cc9c6ec7c6f4e849", size = 3611456, upload-time = "2025-09-22T04:01:48.243Z" }, - { url = "https://files.pythonhosted.org/packages/f7/d7/0cdfb6c3e30893463fb3d1e52bc5f5f99684a03c29a0b6b605cfae879cd5/lxml-6.0.2-cp312-cp312-win_amd64.whl", hash = "sha256:72c87e5ee4e58a8354fb9c7c84cbf95a1c8236c127a5d1b7683f04bed8361e1f", size = 4011793, upload-time = "2025-09-22T04:01:50.042Z" }, - { url = "https://files.pythonhosted.org/packages/ea/7b/93c73c67db235931527301ed3785f849c78991e2e34f3fd9a6663ffda4c5/lxml-6.0.2-cp312-cp312-win_arm64.whl", hash = "sha256:61cb10eeb95570153e0c0e554f58df92ecf5109f75eacad4a95baa709e26c3d6", size = 3672836, upload-time = "2025-09-22T04:01:52.145Z" }, - { url = "https://files.pythonhosted.org/packages/0b/11/29d08bc103a62c0eba8016e7ed5aeebbf1e4312e83b0b1648dd203b0e87d/lxml-6.0.2-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:1c06035eafa8404b5cf475bb37a9f6088b0aca288d4ccc9d69389750d5543700", size = 3949829, upload-time = "2025-09-22T04:04:45.608Z" }, - { url = "https://files.pythonhosted.org/packages/12/b3/52ab9a3b31e5ab8238da241baa19eec44d2ab426532441ee607165aebb52/lxml-6.0.2-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:c7d13103045de1bdd6fe5d61802565f1a3537d70cd3abf596aa0af62761921ee", size = 4226277, upload-time = "2025-09-22T04:04:47.754Z" }, - { url = "https://files.pythonhosted.org/packages/a0/33/1eaf780c1baad88224611df13b1c2a9dfa460b526cacfe769103ff50d845/lxml-6.0.2-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:0a3c150a95fbe5ac91de323aa756219ef9cf7fde5a3f00e2281e30f33fa5fa4f", size = 4330433, upload-time = "2025-09-22T04:04:49.907Z" }, - { url = "https://files.pythonhosted.org/packages/7a/c1/27428a2ff348e994ab4f8777d3a0ad510b6b92d37718e5887d2da99952a2/lxml-6.0.2-pp311-pypy311_pp73-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:60fa43be34f78bebb27812ed90f1925ec99560b0fa1decdb7d12b84d857d31e9", size = 4272119, upload-time = "2025-09-22T04:04:51.801Z" }, - { url = "https://files.pythonhosted.org/packages/f0/d0/3020fa12bcec4ab62f97aab026d57c2f0cfd480a558758d9ca233bb6a79d/lxml-6.0.2-pp311-pypy311_pp73-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:21c73b476d3cfe836be731225ec3421fa2f048d84f6df6a8e70433dff1376d5a", size = 4417314, upload-time = "2025-09-22T04:04:55.024Z" }, - { url = "https://files.pythonhosted.org/packages/6c/77/d7f491cbc05303ac6801651aabeb262d43f319288c1ea96c66b1d2692ff3/lxml-6.0.2-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:27220da5be049e936c3aca06f174e8827ca6445a4353a1995584311487fc4e3e", size = 3518768, upload-time = "2025-09-22T04:04:57.097Z" }, +version = "6.0.4" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/ce/08/1217ca4043f55c3c92993b283a7dbfa456a2058d8b57bbb416cc96b6efff/lxml-6.0.4.tar.gz", hash = "sha256:4137516be2a90775f99d8ef80ec0283f8d78b5d8bd4630ff20163b72e7e9abf2", size = 4237780, upload-time = "2026-04-12T16:28:24.182Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/15/93/5145f2c9210bf99c01f2f54d364be805f556f2cb13af21d3c2d80e0780bb/lxml-6.0.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:3602d57fdb6f744f4c5d0bd49513fe5abbced08af85bba345fc354336667cd47", size = 8525003, upload-time = "2026-04-12T16:23:34.045Z" }, + { url = "https://files.pythonhosted.org/packages/93/19/9d61560a53ac1b26aec1a83ae51fadbe0cc0b6534e2c753ad5af854f231b/lxml-6.0.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b8c7976c384dcab4bca42f371449fb711e20f1bfce99c135c9b25614aed80e55", size = 4594697, upload-time = "2026-04-12T16:23:36.403Z" }, + { url = "https://files.pythonhosted.org/packages/93/1a/0db40884f959c94ede238507ea0967dd47527ab11d130c5a571088637e78/lxml-6.0.4-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:579e20c120c3d231e53f0376058e4e1926b71ca4f7b77a7a75f82aea7a9b501e", size = 4922365, upload-time = "2026-04-12T16:23:38.709Z" }, + { url = "https://files.pythonhosted.org/packages/04/db/4136fab3201087bd5a4db433b9a36e50808d8af759045e7d7af757b46178/lxml-6.0.4-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:7f32a27be5fb286febd16c0d13d4a3aee474d34417bd172e64d76c6a28e2dc14", size = 5066748, upload-time = "2026-04-12T16:23:41.048Z" }, + { url = "https://files.pythonhosted.org/packages/03/d9/aad543afc57e6268200332ebe695be0320fdd2219b175d34a52027aa1bad/lxml-6.0.4-cp311-cp311-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2d53b7cdaa961a4343312964f6c5a150d075a55e95e1338078d413bf38eba8c0", size = 5000464, upload-time = "2026-04-12T16:23:42.946Z" }, + { url = "https://files.pythonhosted.org/packages/ab/92/14cc575b97dedf02eb8de96af8d977f06b9f2500213805165606ff06c011/lxml-6.0.4-cp311-cp311-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0d4cc697347f6c61764b58767109e270d0b4a92aba4a8053a967ed9de23a5ea9", size = 5201395, upload-time = "2026-04-12T16:23:45.227Z" }, + { url = "https://files.pythonhosted.org/packages/a7/72/0ff17f32a737a9c2840f781aee4bbd5cec947b966ff0c74c5dec56098beb/lxml-6.0.4-cp311-cp311-manylinux_2_28_i686.whl", hash = "sha256:108b8d6da624133eaa1a6a5bbcb1f116b878ea9fd050a1724792d979251706fb", size = 5329108, upload-time = "2026-04-12T16:23:48.094Z" }, + { url = "https://files.pythonhosted.org/packages/f7/f7/3b1f43e0db54462b5f1ebd96ee43b240388e3b9bf372546694175bec2d41/lxml-6.0.4-cp311-cp311-manylinux_2_31_armv7l.whl", hash = "sha256:c087d643746489df06fe3ac03460d235b4b3ae705e25838257510c79f834e50f", size = 4658132, upload-time = "2026-04-12T16:23:50.279Z" }, + { url = "https://files.pythonhosted.org/packages/94/cb/90513445e4f08c500f953543aadf18501e5438b31bc816d0ce9a5e09cc5c/lxml-6.0.4-cp311-cp311-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:2063c486f80c32a576112201c93269a09ebeca5b663092112c5fb39b32556340", size = 5264665, upload-time = "2026-04-12T16:23:52.397Z" }, + { url = "https://files.pythonhosted.org/packages/17/d2/c1fa939ea0fa75190dd452d9246f97c16372e2d593fe9f4684cae5c37dda/lxml-6.0.4-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:ff016e86ec14ae96253a3834302e0e89981956b73e4e74617eeba4a6a81da08b", size = 5043801, upload-time = "2026-04-12T16:23:55.634Z" }, + { url = "https://files.pythonhosted.org/packages/22/d4/01cdd3c367045526a376cc1eadacf647f193630db3f902b8842a76b3eb2e/lxml-6.0.4-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:0e9ba5bcd75efb8cb4613463e6cfb55b5a76d4143e4cfa06ea027bc6cc696a3e", size = 4711416, upload-time = "2026-04-12T16:23:57.647Z" }, + { url = "https://files.pythonhosted.org/packages/8d/77/f6af805c6e23b9a12970c8c38891b087ffd884c2d4df6069e63ff1623fd6/lxml-6.0.4-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:9a69668bef9268f54a92f2254917df530ca4630a621027437f0e948eb1937e7b", size = 5251326, upload-time = "2026-04-12T16:23:59.901Z" }, + { url = "https://files.pythonhosted.org/packages/2b/bb/bcd429655f6d12845d91f17e3977d63de22cde5fa77f7d4eef7669a80e8c/lxml-6.0.4-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:280f8e7398bdc48c7366ad375a5586692cd73b269d9e82e6898f9ada70dc0bcb", size = 5224752, upload-time = "2026-04-12T16:24:02.002Z" }, + { url = "https://files.pythonhosted.org/packages/69/cd/0342c5a3663115560899a0529789969a72bc5209c8f0084e5b0598cda94d/lxml-6.0.4-cp311-cp311-win32.whl", hash = "sha256:a8eddf3c705e00738db695a9a77830f8d57f7d21a54954fbef23a1b8806384ed", size = 3592977, upload-time = "2026-04-12T16:24:03.847Z" }, + { url = "https://files.pythonhosted.org/packages/92/c1/386ee2e8a8008cccc4903435f19aaffd16d9286186106752d08be2bd7ccb/lxml-6.0.4-cp311-cp311-win_amd64.whl", hash = "sha256:b74d5b391fc49fc3cc213c930f87a7dedf2b4b0755aae4638e91e4501e278430", size = 4023718, upload-time = "2026-04-12T16:24:06.135Z" }, + { url = "https://files.pythonhosted.org/packages/a7/a0/19f5072fdc7c73d44004506172dba4b7e3d179d9b3a387efce9c30365afd/lxml-6.0.4-cp311-cp311-win_arm64.whl", hash = "sha256:2f0cf04bafc14b0eebfbc3b5b73b296dd76b5d7640d098c02e75884bb0a70f2b", size = 3666955, upload-time = "2026-04-12T16:24:08.438Z" }, + { url = "https://files.pythonhosted.org/packages/3d/18/4732abab49bbb041b1ded9dd913ca89735a0dcca038eacec64c44ba02163/lxml-6.0.4-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:af0b8459c4e21a8417db967b2e453d1855022dac79c79b61fb8214f3da50f17e", size = 8570033, upload-time = "2026-04-12T16:24:10.728Z" }, + { url = "https://files.pythonhosted.org/packages/72/7e/38523ec7178ca35376551911455d1b2766bc9d98bcc18f606a167fa9ecbb/lxml-6.0.4-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:e0cdcea2affa53fa17dc4bf5cefc0edf72583eac987d669493a019998a623fa3", size = 4623270, upload-time = "2026-04-12T16:24:13.2Z" }, + { url = "https://files.pythonhosted.org/packages/f1/cf/f9b6c9bf9d8c63d923ef893915141767cea4cea71774f20c36d0c14e1585/lxml-6.0.4-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:8da4d4840c1bc07da6fcd647784f7fbaf538eeb7a57ce6b2487acc54c5e33330", size = 4929471, upload-time = "2026-04-12T16:24:15.453Z" }, + { url = "https://files.pythonhosted.org/packages/e5/53/3117f988c9e20be4156d2b8e1bda82ae06878d11aeb820dea111a7cfa4e3/lxml-6.0.4-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:fb04a997588c3980894ded9172c10c5a3e45d3f1c5410472733626d268683806", size = 5092355, upload-time = "2026-04-12T16:24:17.876Z" }, + { url = "https://files.pythonhosted.org/packages/4e/ca/05c6ac773a2bd3edb48fa8a5c5101e927ce044c4a8aed1a85ff00fab20a5/lxml-6.0.4-cp312-cp312-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ca449642a08a6ceddf6e6775b874b6aee1b6242ed80aea84124497aba28e5384", size = 5004520, upload-time = "2026-04-12T16:24:20.184Z" }, + { url = "https://files.pythonhosted.org/packages/f1/db/d8aa5aa3a51d0aa6706ef85f85027f7c972cd840fe69ba058ecaf32d093d/lxml-6.0.4-cp312-cp312-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:35b3ccdd137e62033662787dd4d2b8be900c686325d6b91e3b1ff6213d05ba11", size = 5629961, upload-time = "2026-04-12T16:24:22.242Z" }, + { url = "https://files.pythonhosted.org/packages/9d/75/8fff4444e0493aeb15ab0f4a55c767b5baed9074cf67a1835dc1161f3a1f/lxml-6.0.4-cp312-cp312-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:45dc690c54b1341fec01743caed02e5f1ea49d7cfb81e3ba48903e5e844ed68a", size = 5237561, upload-time = "2026-04-12T16:24:24.572Z" }, + { url = "https://files.pythonhosted.org/packages/2a/9f/6d6cd73014f2dbf47a8aa7accd9712726f46ef4891e1c126bc285cfb94e4/lxml-6.0.4-cp312-cp312-manylinux_2_28_i686.whl", hash = "sha256:15ae922e8f74b05798a0e88cee46c0244aaec6a66b5e00be7d18648fed8c432e", size = 5349197, upload-time = "2026-04-12T16:24:26.805Z" }, + { url = "https://files.pythonhosted.org/packages/2d/43/e3e9a126e166234d1659d1dd9004dc1dd50cdc3c68575b071b0a1524b4de/lxml-6.0.4-cp312-cp312-manylinux_2_31_armv7l.whl", hash = "sha256:ebd816653707fbf10c65e3dee3bc24dac6b691654c21533b1ae49287433f4db0", size = 4693123, upload-time = "2026-04-12T16:24:28.812Z" }, + { url = "https://files.pythonhosted.org/packages/6c/98/b146dd123a4a7b69b571ff23ea8e8c68de8d8c1b03e23d01c6374d4fd835/lxml-6.0.4-cp312-cp312-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:21284cf36b95dd8be774eb06c304b440cf49ee811800a30080ce6d93700f0383", size = 5242967, upload-time = "2026-04-12T16:24:30.811Z" }, + { url = "https://files.pythonhosted.org/packages/7e/60/8c275584452b55a902c883e8ab63d755c5ef35d7ad1f06f9e6559095521d/lxml-6.0.4-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:0c08a2a9d0c4028ef5fc5a513b2e1e51af069a83c5b4206139edd08b3b8c2926", size = 5046810, upload-time = "2026-04-12T16:24:33.289Z" }, + { url = "https://files.pythonhosted.org/packages/19/aa/19ec216147e1105e5403fe73657c693a6e91bde855a13242dd6031e829e5/lxml-6.0.4-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:1bc2f0f417112cf1a428599dd58125ab74d8e1c66893efd9b907cbb4a5db6e44", size = 4776383, upload-time = "2026-04-12T16:24:36.008Z" }, + { url = "https://files.pythonhosted.org/packages/41/c8/90afdb838705a736268fcffd2698c05e9a129144ce215d5e14db3bdfc295/lxml-6.0.4-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:c0d86e328405529bc93913add9ff377e8b8ea9be878e611f19dbac7766a84483", size = 5643497, upload-time = "2026-04-12T16:24:38.276Z" }, + { url = "https://files.pythonhosted.org/packages/32/ec/1135261ec9822dafb90be0ff6fb0ec79cee0b7fe878833dfe5f2b8c393bd/lxml-6.0.4-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:3cce9420fe8f91eae5d457582599d282195c958cb670aa4bea313a79103ba33f", size = 5232185, upload-time = "2026-04-12T16:24:40.516Z" }, + { url = "https://files.pythonhosted.org/packages/13/f2/7380b11cae6943720f525e5a28ad9dbead96ac710417e556b7c03f3a8af3/lxml-6.0.4-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:96214985ec194ce97b9028414e179cfb21230cba4e2413aee7e249461bb84f4d", size = 5259968, upload-time = "2026-04-12T16:24:42.917Z" }, + { url = "https://files.pythonhosted.org/packages/65/8f/141734f2c456f2253fed4237d8d4b241e3d701129cf6f0b135ccf241a75a/lxml-6.0.4-cp312-cp312-win32.whl", hash = "sha256:b2209b310e7ed1d4cd1c00d405ec9c49722fce731c7036abc1d876bf8df78139", size = 3594958, upload-time = "2026-04-12T16:24:45.039Z" }, + { url = "https://files.pythonhosted.org/packages/b7/a9/c6d3531c6d8814af0919fbdb9bda43c9e8b5deffcb70c8534017db233512/lxml-6.0.4-cp312-cp312-win_amd64.whl", hash = "sha256:03affcacfba4671ebc305813b02bfaf34d80b6a7c5b23eafc5d6da14a1a6e623", size = 3995897, upload-time = "2026-04-12T16:24:46.98Z" }, + { url = "https://files.pythonhosted.org/packages/03/5d/1dabeddf762e5a315a31775b2bca39811d7e7a15fc3e677d044b9da973fe/lxml-6.0.4-cp312-cp312-win_arm64.whl", hash = "sha256:af9678e3a2a047465515d95a61690109af7a4c9486f708249119adcef7861049", size = 3658607, upload-time = "2026-04-12T16:24:49.19Z" }, + { url = "https://files.pythonhosted.org/packages/41/25/260b86340ec5aadda5e18ed39df0eea61ef8781fb0fcc16c847cdb9dfdff/lxml-6.0.4-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:b29bcca95e82cd201d16c2101085faa2669838f4697fd914b7124a6c77032f80", size = 3929209, upload-time = "2026-04-12T16:28:07.628Z" }, + { url = "https://files.pythonhosted.org/packages/8a/cc/b2157461584525fb0ceb7f4c3b6c1b276f6c7dd34858d78075ae8973bf3d/lxml-6.0.4-pp311-pypy311_pp73-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:a95e29710ecdf99b446990144598f6117271cb2ec19fd45634aa087892087077", size = 4209535, upload-time = "2026-04-12T16:28:10.071Z" }, + { url = "https://files.pythonhosted.org/packages/1d/fa/7fdcd1eb31ec0d5871a4a0b1587e78a331f59941ff3af59bed064175499e/lxml-6.0.4-pp311-pypy311_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:13085e0174e9c9fa4eb5a6bdfb81646d1f7be07e5895c958e89838afb77630c6", size = 4316979, upload-time = "2026-04-12T16:28:12.42Z" }, + { url = "https://files.pythonhosted.org/packages/53/0c/dab9f5855e7d2e51c8eb461713ada38a7d4eb3ab07fec8d13c46ed353ad6/lxml-6.0.4-pp311-pypy311_pp73-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e205c4869a28ec4447375333072978356cd0eeadd0412c643543238e638b89a3", size = 4249929, upload-time = "2026-04-12T16:28:15.739Z" }, + { url = "https://files.pythonhosted.org/packages/a4/88/39e8e4ca7ee1bc9e7cd2f6b311279624afa70a375eef8727f0bb83db2936/lxml-6.0.4-pp311-pypy311_pp73-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:aec26080306a66ad5c62fad0053dd2170899b465137caca7eac4b72bda3588bf", size = 4399464, upload-time = "2026-04-12T16:28:18.397Z" }, + { url = "https://files.pythonhosted.org/packages/66/54/14c518cc9ce5151fcd1fa95a1c2396799a505dca2c4f0acdf85fb23fe293/lxml-6.0.4-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:3912221f41d96283b10a7232344351c8511e31f18734c752ed4798c12586ea35", size = 3507404, upload-time = "2026-04-12T16:28:21.188Z" }, ] [[package]] @@ -524,27 +526,27 @@ wheels = [ [[package]] name = "ruff" -version = "0.15.9" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/e6/97/e9f1ca355108ef7194e38c812ef40ba98c7208f47b13ad78d023caa583da/ruff-0.15.9.tar.gz", hash = "sha256:29cbb1255a9797903f6dde5ba0188c707907ff44a9006eb273b5a17bfa0739a2", size = 4617361, upload-time = "2026-04-02T18:17:20.829Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/0b/1f/9cdfd0ac4b9d1e5a6cf09bedabdf0b56306ab5e333c85c87281273e7b041/ruff-0.15.9-py3-none-linux_armv6l.whl", hash = "sha256:6efbe303983441c51975c243e26dff328aca11f94b70992f35b093c2e71801e1", size = 10511206, upload-time = "2026-04-02T18:16:41.574Z" }, - { url = "https://files.pythonhosted.org/packages/3d/f6/32bfe3e9c136b35f02e489778d94384118bb80fd92c6d92e7ccd97db12ce/ruff-0.15.9-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:4965bac6ac9ea86772f4e23587746f0b7a395eccabb823eb8bfacc3fa06069f7", size = 10923307, upload-time = "2026-04-02T18:17:08.645Z" }, - { url = "https://files.pythonhosted.org/packages/ca/25/de55f52ab5535d12e7aaba1de37a84be6179fb20bddcbe71ec091b4a3243/ruff-0.15.9-py3-none-macosx_11_0_arm64.whl", hash = "sha256:eaf05aad70ca5b5a0a4b0e080df3a6b699803916d88f006efd1f5b46302daab8", size = 10316722, upload-time = "2026-04-02T18:16:44.206Z" }, - { url = "https://files.pythonhosted.org/packages/48/11/690d75f3fd6278fe55fff7c9eb429c92d207e14b25d1cae4064a32677029/ruff-0.15.9-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9439a342adb8725f32f92732e2bafb6d5246bd7a5021101166b223d312e8fc59", size = 10623674, upload-time = "2026-04-02T18:16:50.951Z" }, - { url = "https://files.pythonhosted.org/packages/bd/ec/176f6987be248fc5404199255522f57af1b4a5a1b57727e942479fec98ad/ruff-0.15.9-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:9c5e6faf9d97c8edc43877c3f406f47446fc48c40e1442d58cfcdaba2acea745", size = 10351516, upload-time = "2026-04-02T18:16:57.206Z" }, - { url = "https://files.pythonhosted.org/packages/b2/fc/51cffbd2b3f240accc380171d51446a32aa2ea43a40d4a45ada67368fbd2/ruff-0.15.9-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7b34a9766aeec27a222373d0b055722900fbc0582b24f39661aa96f3fe6ad901", size = 11150202, upload-time = "2026-04-02T18:17:06.452Z" }, - { url = "https://files.pythonhosted.org/packages/d6/d4/25292a6dfc125f6b6528fe6af31f5e996e19bf73ca8e3ce6eb7fa5b95885/ruff-0.15.9-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:89dd695bc72ae76ff484ae54b7e8b0f6b50f49046e198355e44ea656e521fef9", size = 11988891, upload-time = "2026-04-02T18:17:18.575Z" }, - { url = "https://files.pythonhosted.org/packages/13/e1/1eebcb885c10e19f969dcb93d8413dfee8172578709d7ee933640f5e7147/ruff-0.15.9-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ce187224ef1de1bd225bc9a152ac7102a6171107f026e81f317e4257052916d5", size = 11480576, upload-time = "2026-04-02T18:16:52.986Z" }, - { url = "https://files.pythonhosted.org/packages/ff/6b/a1548ac378a78332a4c3dcf4a134c2475a36d2a22ddfa272acd574140b50/ruff-0.15.9-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2b0c7c341f68adb01c488c3b7d4b49aa8ea97409eae6462d860a79cf55f431b6", size = 11254525, upload-time = "2026-04-02T18:17:02.041Z" }, - { url = "https://files.pythonhosted.org/packages/42/aa/4bb3af8e61acd9b1281db2ab77e8b2c3c5e5599bf2a29d4a942f1c62b8d6/ruff-0.15.9-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:55cc15eee27dc0eebdfcb0d185a6153420efbedc15eb1d38fe5e685657b0f840", size = 11204072, upload-time = "2026-04-02T18:17:13.581Z" }, - { url = "https://files.pythonhosted.org/packages/69/48/d550dc2aa6e423ea0bcc1d0ff0699325ffe8a811e2dba156bd80750b86dc/ruff-0.15.9-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:a6537f6eed5cda688c81073d46ffdfb962a5f29ecb6f7e770b2dc920598997ed", size = 10594998, upload-time = "2026-04-02T18:16:46.369Z" }, - { url = "https://files.pythonhosted.org/packages/63/47/321167e17f5344ed5ec6b0aa2cff64efef5f9e985af8f5622cfa6536043f/ruff-0.15.9-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:6d3fcbca7388b066139c523bda744c822258ebdcfbba7d24410c3f454cc9af71", size = 10359769, upload-time = "2026-04-02T18:17:10.994Z" }, - { url = "https://files.pythonhosted.org/packages/67/5e/074f00b9785d1d2c6f8c22a21e023d0c2c1817838cfca4c8243200a1fa87/ruff-0.15.9-py3-none-musllinux_1_2_i686.whl", hash = "sha256:058d8e99e1bfe79d8a0def0b481c56059ee6716214f7e425d8e737e412d69677", size = 10850236, upload-time = "2026-04-02T18:16:48.749Z" }, - { url = "https://files.pythonhosted.org/packages/76/37/804c4135a2a2caf042925d30d5f68181bdbd4461fd0d7739da28305df593/ruff-0.15.9-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:8e1ddb11dbd61d5983fa2d7d6370ef3eb210951e443cace19594c01c72abab4c", size = 11358343, upload-time = "2026-04-02T18:16:55.068Z" }, - { url = "https://files.pythonhosted.org/packages/88/3d/1364fcde8656962782aa9ea93c92d98682b1ecec2f184e625a965ad3b4a6/ruff-0.15.9-py3-none-win32.whl", hash = "sha256:bde6ff36eaf72b700f32b7196088970bf8fdb2b917b7accd8c371bfc0fd573ec", size = 10583382, upload-time = "2026-04-02T18:17:04.261Z" }, - { url = "https://files.pythonhosted.org/packages/4c/56/5c7084299bd2cacaa07ae63a91c6f4ba66edc08bf28f356b24f6b717c799/ruff-0.15.9-py3-none-win_amd64.whl", hash = "sha256:45a70921b80e1c10cf0b734ef09421f71b5aa11d27404edc89d7e8a69505e43d", size = 11744969, upload-time = "2026-04-02T18:16:59.611Z" }, - { url = "https://files.pythonhosted.org/packages/03/36/76704c4f312257d6dbaae3c959add2a622f63fcca9d864659ce6d8d97d3d/ruff-0.15.9-py3-none-win_arm64.whl", hash = "sha256:0694e601c028fd97dc5c6ee244675bc241aeefced7ef80cd9c6935a871078f53", size = 11005870, upload-time = "2026-04-02T18:17:15.773Z" }, +version = "0.15.10" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/e7/d9/aa3f7d59a10ef6b14fe3431706f854dbf03c5976be614a9796d36326810c/ruff-0.15.10.tar.gz", hash = "sha256:d1f86e67ebfdef88e00faefa1552b5e510e1d35f3be7d423dc7e84e63788c94e", size = 4631728, upload-time = "2026-04-09T14:06:09.884Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/eb/00/a1c2fdc9939b2c03691edbda290afcd297f1f389196172826b03d6b6a595/ruff-0.15.10-py3-none-linux_armv6l.whl", hash = "sha256:0744e31482f8f7d0d10a11fcbf897af272fefdfcb10f5af907b18c2813ff4d5f", size = 10563362, upload-time = "2026-04-09T14:06:21.189Z" }, + { url = "https://files.pythonhosted.org/packages/5c/15/006990029aea0bebe9d33c73c3e28c80c391ebdba408d1b08496f00d422d/ruff-0.15.10-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:b1e7c16ea0ff5a53b7c2df52d947e685973049be1cdfe2b59a9c43601897b22e", size = 10951122, upload-time = "2026-04-09T14:06:02.236Z" }, + { url = "https://files.pythonhosted.org/packages/f2/c0/4ac978fe874d0618c7da647862afe697b281c2806f13ce904ad652fa87e4/ruff-0.15.10-py3-none-macosx_11_0_arm64.whl", hash = "sha256:93cc06a19e5155b4441dd72808fdf84290d84ad8a39ca3b0f994363ade4cebb1", size = 10314005, upload-time = "2026-04-09T14:06:00.026Z" }, + { url = "https://files.pythonhosted.org/packages/da/73/c209138a5c98c0d321266372fc4e33ad43d506d7e5dd817dd89b60a8548f/ruff-0.15.10-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:83e1dd04312997c99ea6965df66a14fb4f03ba978564574ffc68b0d61fd3989e", size = 10643450, upload-time = "2026-04-09T14:05:42.137Z" }, + { url = "https://files.pythonhosted.org/packages/ec/76/0deec355d8ec10709653635b1f90856735302cb8e149acfdf6f82a5feb70/ruff-0.15.10-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:8154d43684e4333360fedd11aaa40b1b08a4e37d8ffa9d95fee6fa5b37b6fab1", size = 10379597, upload-time = "2026-04-09T14:05:49.984Z" }, + { url = "https://files.pythonhosted.org/packages/dc/be/86bba8fc8798c081e28a4b3bb6d143ccad3fd5f6f024f02002b8f08a9fa3/ruff-0.15.10-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8ab88715f3a6deb6bde6c227f3a123410bec7b855c3ae331b4c006189e895cef", size = 11146645, upload-time = "2026-04-09T14:06:12.246Z" }, + { url = "https://files.pythonhosted.org/packages/a8/89/140025e65911b281c57be1d385ba1d932c2366ca88ae6663685aed8d4881/ruff-0.15.10-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a768ff5969b4f44c349d48edf4ab4f91eddb27fd9d77799598e130fb628aa158", size = 12030289, upload-time = "2026-04-09T14:06:04.776Z" }, + { url = "https://files.pythonhosted.org/packages/88/de/ddacca9545a5e01332567db01d44bd8cf725f2db3b3d61a80550b48308ea/ruff-0.15.10-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ee3ef42dab7078bda5ff6a1bcba8539e9857deb447132ad5566a038674540d0", size = 11496266, upload-time = "2026-04-09T14:05:55.485Z" }, + { url = "https://files.pythonhosted.org/packages/bc/bb/7ddb00a83760ff4a83c4e2fc231fd63937cc7317c10c82f583302e0f6586/ruff-0.15.10-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:51cb8cc943e891ba99989dd92d61e29b1d231e14811db9be6440ecf25d5c1609", size = 11256418, upload-time = "2026-04-09T14:05:57.69Z" }, + { url = "https://files.pythonhosted.org/packages/dc/8d/55de0d35aacf6cd50b6ee91ee0f291672080021896543776f4170fc5c454/ruff-0.15.10-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:e59c9bdc056a320fb9ea1700a8d591718b8faf78af065484e801258d3a76bc3f", size = 11288416, upload-time = "2026-04-09T14:05:44.695Z" }, + { url = "https://files.pythonhosted.org/packages/68/cf/9438b1a27426ec46a80e0a718093c7f958ef72f43eb3111862949ead3cc1/ruff-0.15.10-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:136c00ca2f47b0018b073f28cb5c1506642a830ea941a60354b0e8bc8076b151", size = 10621053, upload-time = "2026-04-09T14:05:52.782Z" }, + { url = "https://files.pythonhosted.org/packages/4c/50/e29be6e2c135e9cd4cb15fbade49d6a2717e009dff3766dd080fcb82e251/ruff-0.15.10-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:8b80a2f3c9c8a950d6237f2ca12b206bccff626139be9fa005f14feb881a1ae8", size = 10378302, upload-time = "2026-04-09T14:06:14.361Z" }, + { url = "https://files.pythonhosted.org/packages/18/2f/e0b36a6f99c51bb89f3a30239bc7bf97e87a37ae80aa2d6542d6e5150364/ruff-0.15.10-py3-none-musllinux_1_2_i686.whl", hash = "sha256:e3e53c588164dc025b671c9df2462429d60357ea91af7e92e9d56c565a9f1b07", size = 10850074, upload-time = "2026-04-09T14:06:16.581Z" }, + { url = "https://files.pythonhosted.org/packages/11/08/874da392558ce087a0f9b709dc6ec0d60cbc694c1c772dab8d5f31efe8cb/ruff-0.15.10-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:b0c52744cf9f143a393e284125d2576140b68264a93c6716464e129a3e9adb48", size = 11358051, upload-time = "2026-04-09T14:06:18.948Z" }, + { url = "https://files.pythonhosted.org/packages/e4/46/602938f030adfa043e67112b73821024dc79f3ab4df5474c25fa4c1d2d14/ruff-0.15.10-py3-none-win32.whl", hash = "sha256:d4272e87e801e9a27a2e8df7b21011c909d9ddd82f4f3281d269b6ba19789ca5", size = 10588964, upload-time = "2026-04-09T14:06:07.14Z" }, + { url = "https://files.pythonhosted.org/packages/25/b6/261225b875d7a13b33a6d02508c39c28450b2041bb01d0f7f1a83d569512/ruff-0.15.10-py3-none-win_amd64.whl", hash = "sha256:28cb32d53203242d403d819fd6983152489b12e4a3ae44993543d6fe62ab42ed", size = 11745044, upload-time = "2026-04-09T14:05:39.473Z" }, + { url = "https://files.pythonhosted.org/packages/58/ed/dea90a65b7d9e69888890fb14c90d7f51bf0c1e82ad800aeb0160e4bacfd/ruff-0.15.10-py3-none-win_arm64.whl", hash = "sha256:601d1610a9e1f1c2165a4f561eeaa2e2ea1e97f3287c5aa258d3dab8b57c6188", size = 11035607, upload-time = "2026-04-09T14:05:47.593Z" }, ] [[package]] From 280261d472e92e06f306e0e54f3f7787a0d6ad35 Mon Sep 17 00:00:00 2001 From: Paper1 Date: Wed, 18 Mar 2026 10:24:05 +0000 Subject: [PATCH 224/229] Volvo CMA support (squashed, rebased onto v0.11.0 opendbc) --- opendbc/car/car.capnp | 1 + opendbc/car/torque_data/override.toml | 2 + opendbc/car/torque_data/substitute.toml | 3 + opendbc/car/values.py | 3 +- opendbc/car/volvo/__init__.py | 1 + opendbc/car/volvo/calibrate_angle_factor.py | 556 ++++++++++++++++++++ opendbc/car/volvo/carcontroller.py | 189 +++++++ opendbc/car/volvo/carstate.py | 151 ++++++ opendbc/car/volvo/fingerprints.py | 27 + opendbc/car/volvo/helpers.py | 380 +++++++++++++ opendbc/car/volvo/interface.py | 41 ++ opendbc/car/volvo/live_testing.py | 101 ++++ opendbc/car/volvo/live_testing.txt.sample | 25 + opendbc/car/volvo/test_lca_new_signal_4.py | 419 +++++++++++++++ opendbc/car/volvo/values.py | 92 ++++ opendbc/car/volvo/volvocan.py | 466 ++++++++++++++++ opendbc/dbc/volvo_cma.dbc | 245 +++++++++ opendbc/dbc/volvo_front_1_cma.dbc | 14 + opendbc/dbc/volvo_front_1_spa.dbc | 10 + opendbc/dbc/volvo_mid_1.dbc | 188 +++++++ opendbc/safety/declarations.h | 2 + opendbc/safety/modes/volvo.h | 262 +++++++++ opendbc/safety/safety.h | 2 + 23 files changed, 3179 insertions(+), 1 deletion(-) create mode 100644 opendbc/car/volvo/__init__.py create mode 100644 opendbc/car/volvo/calibrate_angle_factor.py create mode 100644 opendbc/car/volvo/carcontroller.py create mode 100644 opendbc/car/volvo/carstate.py create mode 100644 opendbc/car/volvo/fingerprints.py create mode 100644 opendbc/car/volvo/helpers.py create mode 100644 opendbc/car/volvo/interface.py create mode 100644 opendbc/car/volvo/live_testing.py create mode 100644 opendbc/car/volvo/live_testing.txt.sample create mode 100644 opendbc/car/volvo/test_lca_new_signal_4.py create mode 100644 opendbc/car/volvo/values.py create mode 100644 opendbc/car/volvo/volvocan.py create mode 100644 opendbc/dbc/volvo_cma.dbc create mode 100644 opendbc/dbc/volvo_front_1_cma.dbc create mode 100644 opendbc/dbc/volvo_front_1_spa.dbc create mode 100644 opendbc/dbc/volvo_mid_1.dbc create mode 100644 opendbc/safety/modes/volvo.h diff --git a/opendbc/car/car.capnp b/opendbc/car/car.capnp index d2b8d758a7c..2c3f61b8dcf 100644 --- a/opendbc/car/car.capnp +++ b/opendbc/car/car.capnp @@ -635,6 +635,7 @@ struct CarParams { fcaGiorgio @32; rivian @33; volkswagenMeb @34; + volvo @35; } enum SteerControlType { diff --git a/opendbc/car/torque_data/override.toml b/opendbc/car/torque_data/override.toml index f6bab7603f9..a2278965351 100644 --- a/opendbc/car/torque_data/override.toml +++ b/opendbc/car/torque_data/override.toml @@ -101,6 +101,8 @@ legend = ["LAT_ACCEL_FACTOR", "MAX_LAT_ACCEL_MEASURED", "FRICTION"] "JEEP_CHEROKEE_5TH_GEN" = [1.5, 1.5, 0.15] "ACURA_MDX_4G" = [1.4, 1.4, 0.17] "ACURA_RDX_3G_MMR" = [1.5, 1.5, 0.16] +"VOLVO_XC40_RECHARGE" = [1.5, 1.5, 0.1] # Guess TODO: Check +"VOLVO_S60_RECHARGE" = [1.5, 1.5, 0.1] # Guess TODO: Check # Dashcam or fallback configured as ideal car "MOCK" = [10.0, 10, 0.0] diff --git a/opendbc/car/torque_data/substitute.toml b/opendbc/car/torque_data/substitute.toml index d530ecd3ef4..f47f6ead4ad 100644 --- a/opendbc/car/torque_data/substitute.toml +++ b/opendbc/car/torque_data/substitute.toml @@ -86,3 +86,6 @@ legend = ["LAT_ACCEL_FACTOR", "MAX_LAT_ACCEL_MEASURED", "FRICTION"] "SUBARU_FORESTER_PREGLOBAL" = "SUBARU_IMPREZA" "SUBARU_LEGACY_PREGLOBAL" = "SUBARU_IMPREZA" "SUBARU_ASCENT" = "SUBARU_FORESTER" + +# Will need to check on this +"POLESTAR_2" = "VOLVO_XC40_RECHARGE" diff --git a/opendbc/car/values.py b/opendbc/car/values.py index f606249a4e0..d1fc2a54135 100644 --- a/opendbc/car/values.py +++ b/opendbc/car/values.py @@ -14,8 +14,9 @@ from opendbc.car.tesla.values import CAR as TESLA from opendbc.car.toyota.values import CAR as TOYOTA from opendbc.car.volkswagen.values import CAR as VOLKSWAGEN +from opendbc.car.volvo.values import CAR as VOLVO -Platform = BODY | CHRYSLER | FORD | GM | HONDA | HYUNDAI | MAZDA | MOCK | NISSAN | PSA | RIVIAN | SUBARU | TESLA | TOYOTA | VOLKSWAGEN +Platform = BODY | CHRYSLER | FORD | GM | HONDA | HYUNDAI | MAZDA | MOCK | NISSAN | PSA | RIVIAN | SUBARU | TESLA | TOYOTA | VOLKSWAGEN | VOLVO BRANDS = get_args(Platform) PLATFORMS: dict[str, Platform] = {str(platform): platform for brand in BRANDS for platform in brand} diff --git a/opendbc/car/volvo/__init__.py b/opendbc/car/volvo/__init__.py new file mode 100644 index 00000000000..5c127dcae6e --- /dev/null +++ b/opendbc/car/volvo/__init__.py @@ -0,0 +1 @@ +# Volvo CMA platform support for openpilot \ No newline at end of file diff --git a/opendbc/car/volvo/calibrate_angle_factor.py b/opendbc/car/volvo/calibrate_angle_factor.py new file mode 100644 index 00000000000..42e0142e5fb --- /dev/null +++ b/opendbc/car/volvo/calibrate_angle_factor.py @@ -0,0 +1,556 @@ +#!/usr/bin/env python3 +""" +Calibration script to discover the relationship between LCA_5 signals and steering angle. + +Modes: + 1. scale (default): Test if DBC scale is correct by commanding sub-degree angles + 2. single: Test LCA_5_STEER only (legacy integer values) + 3. discover: Test old 2-byte encoding scheme + +Usage: + python calibrate_angle_factor.py # Scale verification mode + python calibrate_angle_factor.py --single # Single byte mode (legacy) + python calibrate_angle_factor.py --discover # Discovery mode (legacy) + +Requirements: + - openpilot must be running (carState must be published) + - Car should be stationary or moving slowly + - Steering must be free to move (not held by driver) +""" + +import sys +import time +import signal +import argparse +import statistics +from pathlib import Path + +# Add openpilot to path if needed +OPENPILOT_PATH = Path(__file__).resolve().parents[5] +if str(OPENPILOT_PATH) not in sys.path: + sys.path.insert(0, str(OPENPILOT_PATH)) + +import cereal.messaging as messaging + +# Configuration +LIVE_TESTING_FILE = "/data/openpilot/live_testing.txt" +LOG_FILE = "/data/openpilot/angle_calibration.csv" + +# Settling detection parameters +SETTLE_THRESHOLD_DEG = 0.15 # Angle must be stable within this range +SETTLE_WINDOW = 15 # Number of samples to check for stability +SETTLE_TIMEOUT_S = 5.0 # Max time to wait for settling +SAMPLE_INTERVAL_S = 0.05 # 50ms between samples (20Hz) + +# Final sampling after settling +FINAL_SAMPLE_COUNT = 20 # Number of samples to average for final reading + +# Safety limits +MAX_ANGLE_DEG = 40.0 # Stop if angle exceeds this + + +class SteeringCalibrator: + def __init__(self, max_angle: float): + self.max_angle = max_angle + self.results = [] # List of (turn_bits, steer, avg_angle, std_angle) tuples + self.running = True + self.sm = None + + signal.signal(signal.SIGINT, self._signal_handler) + signal.signal(signal.SIGTERM, self._signal_handler) + + def _signal_handler(self, sig, frame): + print("\nInterrupted, cleaning up...") + self.running = False + self._disable_live_testing() + sys.exit(0) + + def _write_live_testing(self, turn_bits: int | None, steer: float | None): + """Write test configuration to live_testing.txt""" + lines = ["# Auto-generated by calibrate_angle_factor.py", "lat_active=True"] + if turn_bits is not None: + lines.append(f"lca_5.lca_turn_bits={turn_bits}") + if steer is not None: + # Support float values for sub-degree testing + lines.append(f"lca_5.lca_5_steer={steer}") + + with open(LIVE_TESTING_FILE, 'w') as f: + f.write('\n'.join(lines) + '\n') + + def _disable_live_testing(self): + """Disable live testing""" + with open(LIVE_TESTING_FILE, 'w') as f: + f.write("# Auto-generated\nlat_active=False\n") + print("Live testing disabled") + + def _get_angle(self) -> float | None: + """Get current steering angle from carState""" + self.sm.update(timeout=1000) + if self.sm.updated['carState']: + return self.sm['carState'].steeringAngleDeg + return None + + def _wait_for_settle(self) -> bool: + """Wait until steering angle stabilizes""" + recent_angles = [] + start_time = time.time() + + while self.running: + if time.time() - start_time > SETTLE_TIMEOUT_S: + print(f" WARNING: Settle timeout after {SETTLE_TIMEOUT_S}s") + return False + + angle = self._get_angle() + if angle is None: + continue + + recent_angles.append(angle) + if len(recent_angles) > SETTLE_WINDOW: + recent_angles.pop(0) + + if len(recent_angles) >= SETTLE_WINDOW: + angle_range = max(recent_angles) - min(recent_angles) + if angle_range < SETTLE_THRESHOLD_DEG: + elapsed = time.time() - start_time + print(f" Settled in {elapsed:.2f}s (range: {angle_range:.3f}°)") + return True + + time.sleep(SAMPLE_INTERVAL_S) + + return False + + def _collect_samples(self, count: int) -> list[float]: + """Collect steering angle samples""" + samples = [] + for _ in range(count): + if not self.running: + break + angle = self._get_angle() + if angle is not None: + samples.append(angle) + time.sleep(SAMPLE_INTERVAL_S) + return samples + + def _test_point(self, turn_bits: int | None, steer: float | None, log_file) -> tuple[float, float] | None: + """Test a single (turn_bits, steer) combination""" + tb_str = str(turn_bits) if turn_bits is not None else "stock" + st_str = f"{steer:.3f}" if steer is not None else "stock" + print(f" Testing LCA_TURN_BITS={tb_str}, LCA_5_STEER={st_str}") + + self._write_live_testing(turn_bits, steer) + + print(f" Waiting for settle...") + if not self._wait_for_settle(): + return None + + # Safety check + current_angle = self._get_angle() + if current_angle is not None and abs(current_angle) > self.max_angle: + print(f" SAFETY: Angle {current_angle:.1f}° exceeds limit!") + return None + + print(f" Collecting samples...") + samples = self._collect_samples(FINAL_SAMPLE_COUNT) + + if len(samples) < 3: + print(f" WARNING: Only {len(samples)} samples") + return None + + avg_angle = statistics.mean(samples) + std_angle = statistics.stdev(samples) if len(samples) > 1 else 0 + + # Log to file + timestamp = time.time() + for i, angle in enumerate(samples): + log_file.write(f"{timestamp},{turn_bits},{steer},{angle:.4f},{i}\n") + log_file.flush() + + print(f" Result: {avg_angle:.3f}° (±{std_angle:.3f}°)") + return (avg_angle, std_angle) + + def connect(self) -> bool: + """Connect to carState""" + print("Connecting to carState...") + self.sm = messaging.SubMaster(['carState']) + + print("Waiting for messages...") + for _ in range(50): + self.sm.update(timeout=100) + if self.sm.updated['carState']: + print(f"Connected! Initial angle: {self.sm['carState'].steeringAngleDeg:.2f}°") + return True + time.sleep(0.1) + + print("ERROR: No carState messages. Is openpilot running?") + return False + + def run_scale_mode(self): + """Test sub-degree angles to verify DBC scale factor. + + If DBC scale (0.05596) is correct: + - Commanded 0.5° should produce actual ~0.5° + - Commanded 1.0° should produce actual ~1.0° + + If DBC scale is wrong (should be 1.0): + - Commanded 0.5° would produce actual ~9° (packer sends raw=9) + - Commanded 1.0° would produce actual ~18° + """ + if not self.connect(): + return + + # Test sub-degree increments from a base angle + # Going 10° → 10.1° → 10.2° tests if we can detect small changes + test_values = [ + 0.0, # Neutral baseline + # Test fine increments around 10° left + 10.0, + 10.1, + 10.2, + 10.5, + 11.0, + 10.0, # Back to 10° to verify repeatability + # Test fine increments around 10° right + -10.0, + -10.1, + -10.2, + -10.5, + -11.0, + -10.0, # Back to -10° + # Also test small angles from zero + 0.0, + 0.5, + 1.0, + 0.0, + -0.5, + -1.0, + 0.0, # Back to neutral + ] + + print(f"\n{'='*60}") + print("SCALE VERIFICATION MODE") + print(f"{'='*60}") + print("Testing if DBC scale (0.05596 deg/count) is correct.") + print("Commanding sub-degree angles and measuring actual response.") + print() + print("If correct: Commanded ≈ Actual") + print("If wrong: Commanded 0.5° → Actual ~9°") + print(f"\nTest values: {test_values}") + print(f"Safety limit: ±{self.max_angle}°\n") + + with open(LOG_FILE, 'w') as log: + log.write("timestamp,commanded_deg,actual_deg,error_deg,sample_num\n") + + for i, commanded in enumerate(test_values): + if not self.running: + break + print(f"\n[{i+1}/{len(test_values)}] Commanding: {commanded:.1f}°") + result = self._test_point_scale(commanded, log) + if result: + self.results.append((commanded, result[0], result[1])) + + # Return to neutral + print("\nReturning to neutral...") + self._write_live_testing(None, 0.0) + self._wait_for_settle() + self._disable_live_testing() + + self._analyze_scale_mode() + + def _test_point_scale(self, commanded_deg: float, log_file) -> tuple[float, float] | None: + """Test a single commanded angle (in degrees)""" + print(f" Commanding LCA_5_STEER = {commanded_deg:.3f}°") + + self._write_live_testing(None, commanded_deg) + + print(f" Waiting for settle...") + if not self._wait_for_settle(): + return None + + # Safety check + current_angle = self._get_angle() + if current_angle is not None and abs(current_angle) > self.max_angle: + print(f" SAFETY: Angle {current_angle:.1f}° exceeds limit!") + return None + + print(f" Collecting samples...") + samples = self._collect_samples(FINAL_SAMPLE_COUNT) + + if len(samples) < 3: + print(f" WARNING: Only {len(samples)} samples") + return None + + avg_angle = statistics.mean(samples) + std_angle = statistics.stdev(samples) if len(samples) > 1 else 0 + + # Log to file + timestamp = time.time() + for i, angle in enumerate(samples): + error = angle - commanded_deg + log_file.write(f"{timestamp},{commanded_deg:.4f},{angle:.4f},{error:.4f},{i}\n") + log_file.flush() + + error = avg_angle - commanded_deg + print(f" Result: {avg_angle:.3f}° (error: {error:+.3f}°, std: ±{std_angle:.3f}°)") + return (avg_angle, std_angle) + + def _analyze_scale_mode(self): + """Analyze scale verification results""" + if len(self.results) < 2: + print("\nERROR: Not enough data") + return + + print(f"\n{'='*60}") + print("RESULTS: DBC Scale Verification") + print(f"{'='*60}") + + print(f"\n{'Commanded':>12} {'Actual':>10} {'Error':>10} {'Std':>8}") + print("-" * 45) + for commanded, actual, std in self.results: + error = actual - commanded + print(f"{commanded:>12.3f} {actual:>10.3f} {error:>+10.3f} {std:>8.3f}") + + # Calculate metrics + errors = [r[1] - r[0] for r in self.results] + abs_errors = [abs(e) for e in errors] + mean_abs_error = statistics.mean(abs_errors) + max_abs_error = max(abs_errors) + + # Calculate ratio (actual/commanded) for non-zero commanded values + ratios = [] + for commanded, actual, _ in self.results: + if abs(commanded) > 0.05: # Avoid division by near-zero + ratios.append(actual / commanded) + + print(f"\n{'Analysis':^45}") + print("-" * 45) + print(f"Mean absolute error: {mean_abs_error:.3f}°") + print(f"Max absolute error: {max_abs_error:.3f}°") + + if ratios: + mean_ratio = statistics.mean(ratios) + print(f"Mean ratio (actual/commanded): {mean_ratio:.3f}") + + if 0.8 < mean_ratio < 1.2 and mean_abs_error < 1.0: + print("\n✓ DBC SCALE IS CORRECT!") + print(" Fine-grained control (~0.056°/count) is working.") + elif mean_ratio > 10: + print("\n✗ DBC SCALE IS WRONG!") + print(f" Actual ratio ~{mean_ratio:.0f}x means scale should be ~1.0, not 0.05596") + print(" The packer is sending raw values that are too large.") + else: + print(f"\n? INCONCLUSIVE - ratio={mean_ratio:.2f}, error={mean_abs_error:.2f}°") + print(" Check the raw data for more insight.") + + print(f"\nLog saved to: {LOG_FILE}") + + def run_single_mode(self): + """Test LCA_5_STEER only (stock LCA_TURN_BITS) - legacy integer mode""" + if not self.connect(): + return + + test_values = [0, 5, 10, 15, 20, 25, 30, 0, -5, -10, -15, -20, -25, -30, 0] + + print(f"\n{'='*60}") + print("SINGLE BYTE MODE: Testing LCA_5_STEER with stock LCA_TURN_BITS") + print(f"{'='*60}") + print(f"Test values: {test_values}") + print(f"Safety limit: ±{self.max_angle}°\n") + + with open(LOG_FILE, 'w') as log: + log.write("timestamp,lca_turn_bits,lca_5_steer,angle_deg,sample_num\n") + + for i, steer in enumerate(test_values): + if not self.running: + break + print(f"\n[{i+1}/{len(test_values)}]") + result = self._test_point(None, steer, log) + if result: + self.results.append((None, steer, result[0], result[1])) + + # Return to neutral + print("\nReturning to neutral...") + self._write_live_testing(None, 0) + self._wait_for_settle() + self._disable_live_testing() + + self._analyze_single_mode() + + def run_discovery_mode(self): + """Discover the relationship between both bytes""" + if not self.connect(): + return + + # Test combinations to understand the 2D relationship + # First, find what stock LCA_TURN_BITS is + # Then test various combinations + + # Test old encoding scheme values + # Old encoder: for angle >= 0, lca_turn_bits=128, lca_5_steer = angle/0.05596 + # For angle < 0, lca_turn_bits=255, lca_5_steer = 255 - abs(angle)/0.05596 + # + # Test points (target_angle -> expected LCA_TURN_BITS, LCA_5_STEER): + # 0.5° left -> 128, 9 + # 1.0° left -> 128, 18 + # 5.0° left -> 128, 89 + # 10.0° left -> 128, 179 + # 0.5° right -> 255, 246 + # 1.0° right -> 255, 237 + # 5.0° right -> 255, 166 + # 10.0° right -> 255, 76 + + test_points = [ + # (LCA_TURN_BITS, LCA_5_STEER, expected_angle_if_old_encoding_works) + (128, 0, 0), + (128, 9, 0.5), # 0.5° left + (128, 18, 1.0), # 1.0° left + (128, 45, 2.5), # 2.5° left + (128, 89, 5.0), # 5.0° left + (128, 179, 10.0), # 10.0° left + (255, 255, 0), # 0° (right zero point) + (255, 246, -0.5), # 0.5° right + (255, 237, -1.0), # 1.0° right + (255, 210, -2.5), # 2.5° right + (255, 166, -5.0), # 5.0° right + (255, 76, -10.0), # 10.0° right + ] + + turn_bits_values = None # Signal to use test_points instead + steer_values = None + + print(f"\n{'='*60}") + print("DISCOVERY MODE: Testing OLD ENCODING scheme values") + print(f"{'='*60}") + print("Testing if old 2-byte encoding produces expected angles:") + print(" Old scheme: counts = angle / 0.05596") + print(" LEFT: LCA_TURN_BITS=128, LCA_5_STEER=counts") + print(" RIGHT: LCA_TURN_BITS=255, LCA_5_STEER=255-counts") + print(f"Safety limit: ±{self.max_angle}°\n") + + total_tests = len(test_points) + test_num = 0 + + with open(LOG_FILE, 'w') as log: + log.write("timestamp,lca_turn_bits,lca_5_steer,expected_angle,actual_angle,sample_num\n") + + for turn_bits, steer, expected_angle in test_points: + if not self.running: + break + test_num += 1 + print(f"\n[{test_num}/{total_tests}] Expected: {expected_angle}°") + result = self._test_point(turn_bits, steer, log) + if result: + self.results.append((turn_bits, steer, expected_angle, result[0], result[1])) + + # Return to neutral + print("\nReturning to neutral...") + self._write_live_testing(128, 0) # Left zero point + self._wait_for_settle() + self._disable_live_testing() + + self._analyze_discovery_mode() + + def _analyze_single_mode(self): + """Analyze single byte mode results""" + if len(self.results) < 2: + print("\nERROR: Not enough data") + return + + print(f"\n{'='*60}") + print("RESULTS: LCA_5_STEER → Steering Angle") + print(f"{'='*60}") + + print(f"\n{'LCA_5_STEER':>12} {'Angle':>10} {'Std':>8}") + print("-" * 35) + for _, steer, angle, std in self.results: + print(f"{steer:>12} {angle:>10.3f} {std:>8.3f}") + + # Linear regression + steer_vals = [r[1] for r in self.results] + angles = [r[2] for r in self.results] + + steer_mean = statistics.mean(steer_vals) + angle_mean = statistics.mean(angles) + + num = sum((s - steer_mean) * (a - angle_mean) for s, a in zip(steer_vals, angles)) + den = sum((s - steer_mean) ** 2 for s in steer_vals) + + if abs(den) > 1e-10: + slope = num / den + intercept = angle_mean - slope * steer_mean + print(f"\nLinear fit: angle = {slope:.4f} * LCA_5_STEER + {intercept:.3f}") + print(f"(1 raw unit ≈ {slope:.3f}°)") + + print(f"\nLog saved to: {LOG_FILE}") + + def _analyze_discovery_mode(self): + """Analyze discovery mode results""" + if len(self.results) < 2: + print("\nERROR: Not enough data") + return + + print(f"\n{'='*60}") + print("RESULTS: Old Encoding Test") + print(f"{'='*60}") + print("\nIf old encoding works: Expected ≈ Actual") + print("If 1:1 mapping: Actual ≈ LCA_5_STEER (for TB=128) or 255-LCA_5_STEER (for TB=255)\n") + + print(f"{'TB':>4} {'Steer':>6} {'Expected':>10} {'Actual':>10} {'Error':>8} {'Std':>6}") + print("-" * 50) + + for turn_bits, steer, expected, actual, std in self.results: + error = actual - expected + print(f"{turn_bits:>4} {steer:>6} {expected:>10.2f} {actual:>10.3f} {error:>+8.3f} {std:>6.3f}") + + # Check if old encoding works (errors should be small) + errors = [abs(r[3] - r[2]) for r in self.results] + mean_error = statistics.mean(errors) + max_error = max(errors) + + print(f"\n{'Analysis':^50}") + print("-" * 50) + print(f"Mean absolute error: {mean_error:.3f}°") + print(f"Max absolute error: {max_error:.3f}°") + + if max_error < 1.0: + print("\n✓ OLD ENCODING WORKS! Fine-grained control is possible.") + print(" Resolution: ~0.056° per count") + else: + print("\n✗ Old encoding does NOT produce expected angles.") + print(" The 2-byte encoding theory may be incorrect.") + + print(f"\nLog saved to: {LOG_FILE}") + + +def main(): + parser = argparse.ArgumentParser(description='Verify LCA_5 steering signal scale factor') + parser.add_argument('--single', action='store_true', + help='Legacy mode: test integer LCA_5_STEER values') + parser.add_argument('--discover', action='store_true', + help='Legacy mode: test old 2-byte encoding scheme') + parser.add_argument('--max-angle', type=float, default=MAX_ANGLE_DEG, + help=f'Safety limit (default: {MAX_ANGLE_DEG}°)') + args = parser.parse_args() + + print("=" * 60) + print("LCA_5 Steering Scale Verification") + print("=" * 60) + print() + print("IMPORTANT:") + print(" 1. openpilot must be running") + print(" 2. Car should be stationary or moving slowly") + print(" 3. Don't touch the steering wheel") + print() + input("Press Enter to start...") + + calibrator = SteeringCalibrator(args.max_angle) + + if args.single: + calibrator.run_single_mode() + elif args.discover: + calibrator.run_discovery_mode() + else: + calibrator.run_scale_mode() + + +if __name__ == "__main__": + main() diff --git a/opendbc/car/volvo/carcontroller.py b/opendbc/car/volvo/carcontroller.py new file mode 100644 index 00000000000..137e900a51c --- /dev/null +++ b/opendbc/car/volvo/carcontroller.py @@ -0,0 +1,189 @@ +from opendbc.can.packer import CANPacker +from opendbc.car import Bus +from opendbc.car.interfaces import CarControllerBase +from opendbc.car.volvo.helpers import LCA3CounterSync +from opendbc.car.volvo.live_testing import LiveTestingManager +from opendbc.car.volvo.volvocan import create_lca_message, create_pscm_message, create_lca_3_message, create_lca_2_message, create_lca_4_message, create_lca_5_message, create_lca_6_message, create_lca_7_message, create_speed_message, create_speed_2_message, create_speed_3_message, create_0x1a_message, create_gear_position_message, create_egsm_message, create_pscm_related_message +from opendbc.car.volvo.values import CarControllerParams + + +class CarController(CarControllerBase): + def __init__(self, dbc_names, CP): + super().__init__(dbc_names, CP) + self.packer = CANPacker(dbc_names[Bus.party]) + self.apply_angle_last = 0.0 # Track last applied steering angle + + # Live testing configuration manager + self.live_testing = LiveTestingManager() + self.liveTestingConfig = None # Updated at 50 Hz, persists between frames + + self.gear_acc = 60 + self.lca_4_acc = 0 # Bresenham accumulator for 29 Hz + + # Counter management for LCA_2 + self.lca_2_counter_1 = None # Will grab initial value from CarState + self.lca_2_counter_2 = None + + # Counter management for PSCM_RELATED + self.pscm_related_counter = None # Will grab initial value from CarState + + # Counter management for LCA_3 (pattern-based) + self.lca_3_counter_sync = LCA3CounterSync() + + # Counter management for LCA_5 (formerly SPEED_1) + self.lca_5_counter = None # Will grab initial value from CarState + + self.last_lat_active = False # Track state + + self.lca_7_acc = 0 # Bresenham accumulator for 29 Hz + self.lca_7_last_steer = 0 # used to calculate change in steer from last update + + def update(self, CC, CS, now_nanos): + CS.CC_frame = self.frame + can_sends = [] + actuators = CC.actuators + + # Detect disengagement + if not CC.latActive and self.last_lat_active: + #self.lca_commands.reset() # Clear state ← IMPORTANT! + pass + + # Explicit if condition for lat_active override (uses config loaded at 50 Hz) + if self.liveTestingConfig: + lat_active = self.liveTestingConfig.get('lat_active', CC.latActive) + else: + lat_active = CC.latActive + #lat_active = True + + # lateral control - angle-based steering + # NOTE: LCA message is sent every frame (even when inactive) to replace stock LCA + # Stock LCA is permanently blocked by panda safety, so we must always send + if self.frame % CarControllerParams.STEER_STEP == 0: # 100 Hz + # Get desired steering angle from controlsd (LatControlAngle) + apply_angle = actuators.steeringAngleDeg # degrees + + if not CC.latActive: + apply_angle = CS.out.steeringAngleDeg # Use current angle when inactive + + # Override apply_angle from live testing config if provided + if self.liveTestingConfig: + override_apply_angle = self.liveTestingConfig.get('apply_angle') + if override_apply_angle is not None: + apply_angle = override_apply_angle + + # No rate limiting initially - apply desired angle directly + # TODO: Add rate limiting after basic functionality is confirmed + + # LCA - 0x58 - 100 Hz (angle-based) + lca_overrides = self.liveTestingConfig.get('lca') if self.liveTestingConfig else None + can_sends.append(create_lca_message(self.packer, lat_active, apply_angle, CS.msg_lca, lca_overrides)) + self.apply_angle_last = apply_angle + + # Check if PA hands-on-wheel spoof toggle is enabled (bit 7 of alternativeExperience) + spoof_pa_hands_enabled = bool(self.CP.alternativeExperience & 128) + spoof_pa_hands = CS.pilot_assist_engaged and spoof_pa_hands_enabled + # PSCM (bus 2 -> 0) - 0x16 - 100 Hz + can_sends.append(create_pscm_message(self.packer, lat_active, CS.msg_pscm, self.frame, spoof_pa_hands)) + # EGSM - 0x45 - 100 Hz + #can_sends.append(create_egsm_message(self.packer, CS.msg_egsm)) + + # PSCM_RELATED (bus 2 -> 0) - 0x17 - 100 Hz + # Initialize counter from CarState on first run + if self.pscm_related_counter is None: + self.pscm_related_counter = CS.msg_pscm_related['SIG1_BYTE_1_HI_NIBBLE'] + + # Increment counter by +1, wrap from 14 → 0 (modulo 15) + self.pscm_related_counter = (self.pscm_related_counter + 1) % 15 + + can_sends.append(create_pscm_related_message(self.packer, lat_active, CS.pilot_assist_engaged, + CS.msg_pscm_related, self.pscm_related_counter)) + + # LCA_3 - 0x57 - avg 66.66 Hz + #if (self.frame * 67) % 100 < 67: # if (self.frame % 3) < 2: + # 0x57 at ~66.67 Hz: send on 2 out of every 3 frames + # Pattern: send on frame % 3 == 0 or 2, skip when frame % 3 == 1 + if self.frame % 3 != 1: # → 2/3 * 100 Hz = 66.67 Hz + # Update counter with observed value, get counter to send + counter, is_synced = self.lca_3_counter_sync.update(CS.msg_lca_3['COUNTER_1']) + can_sends.append(create_lca_3_message(self.packer, lat_active, apply_angle, CS.msg_lca_3, counter)) + #can_sends.append(create_0x1a_message(self.packer, CS.msg_0x1a)) + pass + + # SPEED messages - 0x60, 0x68 - 50 Hz + if self.frame % 2 == 0: # 50 Hz + #can_sends.append(create_speed_message(self.packer, CS.msg_speed)) + #can_sends.append(create_speed_2_message(self.packer, CS.msg_speed_2)) + pass + + # LCA_2 - 0x69 - 50 Hz + # Spoof PILOT_ASSIST_ENGAGED to keep PSCM accepting LCA commands + if self.frame % 2 == 0: # 50 Hz + # Initialize counters from CarState on first run + if self.lca_2_counter_1 is None: + self.lca_2_counter_1 = CS.msg_lca_2['COUNTER_1'] + self.lca_2_counter_2 = CS.msg_lca_2['COUNTER_2'] + + # Increment counters (COUNTER_1 by +2, COUNTER_2 by +4, both modulo 16) + self.lca_2_counter_1 = (self.lca_2_counter_1 + 2) % 16 + self.lca_2_counter_2 = (self.lca_2_counter_2 + 4) % 16 + + can_sends.append(create_lca_2_message(self.packer, lat_active, CS.msg_lca_2, + self.lca_2_counter_1, self.lca_2_counter_2)) + pass + + # LCA_5 (formerly SPEED_1) - 0x67 - 50 Hz + # Contains wheel speeds + LCA signals (LCA_TURN_BITS, LCA_5_STEER) + if self.frame % 2 == 0: # 50 Hz + # === LIVE TESTING: Load config at 50 Hz (matches LCA_5 message frequency) === + # Returns None if file doesn't exist or lat_active=False in file + # Config persists between frames for use by other messages + self.liveTestingConfig = self.live_testing.load_config() + + # Initialize counter from CarState on first run + if self.lca_5_counter is None: + self.lca_5_counter = CS.msg_lca_5['COUNTER'] + + # Increment counter by +4, wrap at 15 (0xF never used) + self.lca_5_counter = (self.lca_5_counter + 4) % 15 + + lca_5_overrides = self.liveTestingConfig.get('lca_5') if self.liveTestingConfig else None + can_sends.append(create_lca_5_message(self.packer, lat_active, apply_angle, + CS.msg_lca_5, self.lca_5_counter, lca_5_overrides)) + + # LCA_4 - 0x90 - 29 Hz + # Spoof LCA_ENABLE bits to maintain PA ON state when openpilot is active + # Using Bresenham-style accumulator for precise 29 Hz + self.lca_4_acc += 29 + if self.lca_4_acc >= 100: + self.lca_4_acc -= 100 + lca_4_overrides = self.liveTestingConfig.get('lca_4') if self.liveTestingConfig else None + can_sends.append(create_lca_4_message(self.packer, lat_active, CS.msg_lca_4, apply_angle, lca_4_overrides)) + + # LCA_6 - 0X97 - 25 Hz + if self.frame % 4 == 0: # 25 Hz + lca_6_overrides = self.liveTestingConfig.get('lca_6') if self.liveTestingConfig else None + can_sends.append(create_lca_6_message(self.packer, lat_active, CS.msg_lca_6, apply_angle, lca_6_overrides)) + + # LCA_7 - 0x92 - 29 Hz + # Using Bresenham-style accumulator for precise 29 Hz + self.lca_7_acc += 29 + if self.lca_7_acc >= 100: + self.lca_7_acc -= 100 + delta_steer = apply_angle - self.lca_7_last_steer + lca_7_overrides = self.liveTestingConfig.get('lca_7') if self.liveTestingConfig else None + can_sends.append(create_lca_7_message(self.packer, lat_active, CS.msg_lca_7, apply_angle, delta_steer, lca_7_overrides)) + self.lca_7_last_steer = apply_angle + + # GEAR_POSITION - 0x80 - 40 Hz + #self.gear_acc += 40 # Bresenham-style approach + #if self.gear_acc >= 100: + # self.gear_acc -= 100 + if self.frame % 5 == 0 or self.frame % 5 == 2: # 2/5 * 100 Hz = 40 Hz # openpilot forward delay causes DTC in EGSM, but fixes DTC in PSCM + #can_sends.append(create_gear_position_message(self.packer, CS.msg_gear_position)) + pass + + new_actuators = actuators.as_builder() + new_actuators.steeringAngleDeg = self.apply_angle_last + self.frame += 1 + self.last_lat_active = CC.latActive + return new_actuators, can_sends diff --git a/opendbc/car/volvo/carstate.py b/opendbc/car/volvo/carstate.py new file mode 100644 index 00000000000..52fb1ef48c3 --- /dev/null +++ b/opendbc/car/volvo/carstate.py @@ -0,0 +1,151 @@ +from opendbc.car import structs, Bus +from opendbc.can.parser import CANParser +from opendbc.car.common.conversions import Conversions as CV +from opendbc.car.volvo.values import DBC, CarControllerParams, VolvoSPAPlatformConfig, CAR +from opendbc.car.interfaces import CarStateBase + +GearShifter = structs.CarState.GearShifter +TransmissionType = structs.CarParams.TransmissionType + + +class CarState(CarStateBase): + def __init__(self, CP): + super().__init__(CP) + self.is_spa = isinstance(CAR(CP.carFingerprint).config, VolvoSPAPlatformConfig) + self.cruise_enabled_prev = False + self.cruise_last_disabled_frame = 0 + self.cruise_double_tap_active = False + self.gas_pressed_prev = False + self.CC_frame = 0 # CarController frame + self.dispatch_lca_2_msg = False + self.msg_pscm = {} + self.msg_lca = {} + self.msg_lca_2 = {} + self.msg_lca_3 = {} + self.msg_gear_position = {} + self.pilot_assist_engaged = False + self.msg_lca_5 = {} # Formerly msg_speed_1 + self.msg_speed = {} + self.msg_speed_2 = {} + self.msg_0x1a = {} + self.msg_egsm = {} + self.msg_pscm_related = {} + self.msg_lca_4 = {} + self.msg_lca_6 = {} + self.msg_lca_7 = {} + def update(self, can_parsers) -> structs.CarState: + cp_main = can_parsers[Bus.main] + cp_pt = can_parsers[Bus.pt] + cp_party = can_parsers[Bus.party] + ret = structs.CarState() + + # car speed + # Basic vehicle state from BUS1_SPEED on PT bus + ret.vEgoRaw = cp_pt.vl["BUS1_SPEED"]["BUS1_SPEED"] + ret.vEgo, ret.aEgo = self.update_speed_kf(ret.vEgoRaw) + ret.standstill = ret.vEgoRaw <= 0.1 # 0.1 m/s + + # gas + ret.gasPressed = cp_pt.vl["ECM_1"]["ACCELERATOR_PEDAL_POS"] > 20+1 # 20 baseline + 1 tolerance + + # brake + #ret.brakePressed = bool(cp_main.vl["LCA_2"]["BRAKE_PEDAL_PRESSED_A"] or cp_main.vl["LCA_2"]["BRAKE_PEDAL_PRESSED_B"]) + # BRAKE_PEDAL_PRESSED_A goes active when user starts pressing brake pedal, but no brake light is on yet due to tolerance + # BRAKE_PEDAL_PRESSED_B goes active when when the brake pedal is pressed above minimum threshold, brake light is on + ret.brakePressed = cp_main.vl["LCA_2"]["BRAKE_PEDAL_PRESSED_B"] == 1 + ret.parkingBrake = False # TODO: add parking brake + + # stability control - becomes true when ESC intervenes (e.g., aquaplaning) + ret.espActive = cp_main.vl["LCA_2"]["ESC_ACTUATING"] == 1 and cp_main.vl["LCA_2"]["ESC_ELIGIBLE"] == 1 + + # steering wheel + ret.steeringAngleDeg = cp_party.vl['PSCM']['PSCM_ANGLE_SENSOR'] # openpilot expects a negative value for a right turn + #ret.steeringAngleDeg = cp_party.vl['SAS']['SAS_ANGLE_SENSOR'] + + # Driver steering torque feedback (used for driver override detection) + ret.steeringTorque = -cp_party.vl['DRIVER_INPUT']['STEERING_DRIVER_INPUT'] # Car right turn is negative, openpilot right turn is positive + ret.steeringPressed = abs(cp_party.vl['DRIVER_INPUT']['STEERING_DRIVER_INPUT']) > 2 + + # EPS status - placeholder until actual signal is found + self.eps_active = True # Assume EPS is active for now + + # cruise - double-tap detection (on-off-on within 500ms/50 frames / 1000ms/100 frames) + if self.is_spa: + # SPA: byte 0 bit 1, inverted (0 = cruise on, 1 = cruise off) + cruise_raw = cp_pt.vl["BUS1_CRUISE_CONTROL"]["CRUISE_CONTROL_SPA_ENABLED"] == 1 + else: + # CMA: two separate boolean signals + cruise_raw = cp_pt.vl["BUS1_CRUISE_CONTROL"]["CRUISE_CONTROL_ENABLED"] == 1 or cp_pt.vl["BUS1_CRUISE_CONTROL"]["CRUISE_CONTROL_ENABLED_IDLE_TRAFFIC"] == 1 + + # Check if double-tap cruise feature is enabled (bit 6 of alternativeExperience) + use_double_tap = bool(self.CP.alternativeExperience & 64) + + if use_double_tap: + # Detect on-off-on double-tap pattern + if cruise_raw and not self.cruise_enabled_prev: + # Just turned ON - check if we turned OFF recently (within 100 frames = 1000ms) + if self.CC_frame - self.cruise_last_disabled_frame <= 100: + self.cruise_double_tap_active = True + elif not cruise_raw and self.cruise_enabled_prev: + # Just turned OFF - clear the double-tap flag + self.cruise_last_disabled_frame = self.CC_frame + self.cruise_double_tap_active = False + + # cruiseState.enabled always reflects raw car state (must match panda safety) + # blockPcmEnable prevents openpilot engagement until double-tap detected + ret.cruiseState.enabled = cruise_raw + ret.blockPcmEnable = use_double_tap and not self.cruise_double_tap_active + + self.cruise_enabled_prev = cruise_raw + self.gas_pressed_prev = ret.gasPressed + ret.cruiseState.available = True # TODO: Determine actual availability + ret.cruiseState.speed = 0 # TODO: Find cruise set speed (not required for lateral control) + ret.cruiseState.nonAdaptive = False + ret.cruiseState.standstill = ret.standstill # False # Todo: Find cruise control standstill signal + + # gear + gearPosition = cp_main.vl['GEAR_POSITION']['GEAR_POSITION'] # 0: P; 1: R; 2: N; 3: D; 4: B; + if gearPosition == 0: + ret.gearShifter = GearShifter.park + elif gearPosition == 1: + ret.gearShifter = GearShifter.reverse + elif gearPosition == 2: + ret.gearShifter = GearShifter.neutral + elif gearPosition == 3: + ret.gearShifter = GearShifter.drive + elif gearPosition == 4: + ret.gearShifter = GearShifter.drive + + # blinkers TODO FlexRay + ret.leftBlinker = False + ret.rightBlinker = False + + # lock info TODO FlexRay + ret.doorOpen = False # TODO: add door open + ret.seatbeltUnlatched = False # TODO: add seatbelt unlatched + + # Store entire message dictionaries + self.msg_pscm = cp_party.vl['PSCM'] + self.msg_lca = cp_main.vl['LCA'] + self.msg_lca_2 = cp_main.vl['LCA_2'] + self.msg_lca_3 = cp_main.vl['LCA_3'] + self.msg_lca_4 = cp_main.vl['LCA_4'] + self.msg_lca_5 = cp_main.vl['LCA_5'] + self.msg_lca_6 = cp_main.vl['LCA_6'] + self.msg_lca_7 = cp_main.vl['LCA_7'] + self.msg_speed = cp_main.vl['SPEED'] + self.msg_speed_2 = cp_main.vl['SPEED_2'] + self.msg_gear_position = cp_main.vl['GEAR_POSITION'] + self.msg_egsm = cp_party.vl['EGSM'] + self.msg_pscm_related = cp_party.vl['PSCM_RELATED'] + + self.pilot_assist_engaged = cp_main.vl['LCA_2']['PILOT_ASSIST_ENGAGED'] == 1 + return ret + + @staticmethod + def get_can_parsers(CP): + return { + Bus.main: CANParser(DBC[CP.carFingerprint][Bus.main], [], 0), + Bus.pt: CANParser(DBC[CP.carFingerprint][Bus.pt], [], 1), + Bus.party: CANParser(DBC[CP.carFingerprint][Bus.party], [], 2), + } diff --git a/opendbc/car/volvo/fingerprints.py b/opendbc/car/volvo/fingerprints.py new file mode 100644 index 00000000000..a760114c735 --- /dev/null +++ b/opendbc/car/volvo/fingerprints.py @@ -0,0 +1,27 @@ +""" AUTO-FORMATTED USING opendbc/car/debug/format_fingerprints.py, EDIT STRUCTURE THERE.""" +from opendbc.car.structs import CarParams +from opendbc.car.volvo.values import CAR + +Ecu = CarParams.Ecu + +FW_VERSIONS = { +} + +FINGERPRINTS = { + CAR.VOLVO_XC40_RECHARGE: [ + { + 21: 8, 22: 8, 23: 8, 26: 8, 69: 8, 85: 8, 87: 8, 88: 8, 96: 8, 103: 8, 104: 8, 105: 8, 128: 8, 144: 8, 146: 8, 147: 8, 151: 8, 304: 8, 336: 8, 339: 8, 341: 8, 394: 8, 395: 8, 640: 8, 656: 8, 666: 8, 773: 8, 778: 8, 1072: 8, 1120: 8, 1302: 8, 1336: 8, 1407: 8, 1422: 8, 1423: 8, 1424: 8, 1425: 8, 1426: 8 + } + ], + CAR.VOLVO_S60_RECHARGE: [ + { + 21: 8, 22: 8, 23: 8, 26: 8, 69: 8, 85: 8, 87: 8, 88: 8, 96: 8, 103: 8, 104: 8, 105: 8, 128: 8, 144: 8, 146: 8, 147: 8, 151: 8, 336: 8, 339: 8, 341: 8, 395: 8, 587: 8, 640: 8, 656: 8, 666: 8, 773: 8, 778: 8, 1072: 8, 1120: 8, 1298: 8, 1302: 8, 1319: 8, 1336: 8, 1407: 8, 1422: 8, 1423: 8, 1424: 8, 1425: 8, 1426: 8, 1554: 8, 1587: 8, 1718: 8, 1792: 8, 1793: 8, 1798: 8, 1799: 8, 1810: 8, 1813: 8, 1824: 8, 1825: 8, 1840: 8, 1842: 8, 1843: 8, 1856: 8, 1858: 8, 1859: 8, 1860: 8, 1862: 8, 1863: 8, 1871: 8, 1872: 8, 1875: 8, 1879: 8, 1882: 8, 1888: 8, 1889: 8, 1892: 8, 1920: 8, 1927: 8, 1937: 8, 1943: 8, 1953: 8, 1954: 8, 1955: 8, 1968: 8, 1969: 8, 1971: 8, 1975: 8, 1988: 8, 1990: 8, 2000: 8, 2001: 8, 2002: 8, 2004: 8, 2017: 8, 2018: 8, 2020: 8 + } + ], + CAR.POLESTAR_2: [ + { + 7: 4, 21: 8, 22: 8, 23: 8, 26: 8, 35: 8, 37: 8, 53: 8, 58: 8, 67: 8, 69: 8, 70: 8, 85: 8, 87: 8, 88: 8, 96: 8, 103: 8, 104: 8, 105: 8, 112: 8, 117: 8, 128: 8, 133: 8, 138: 8, 144: 8, 146: 8, 147: 8, 151: 8, 256: 8, 277: 8, 278: 8, 284: 8, 293: 8, 309: 8, 320: 8, 325: 8, 336: 8, 339: 8, 341: 8, 348: 8, 349: 8, 352: 8, 368: 8, 370: 8, 373: 8, 375: 8, 376: 8, 389: 8, 395: 8, 400: 8, 408: 8, 411: 8, 417: 8, 420: 8, 426: 8, 429: 8, 435: 8, 440: 8, 464: 8, 556: 8, 640: 8, 656: 8, 666: 8, 773: 8, 778: 8, 789: 8, 791: 8, 800: 8, 805: 8, 807: 8, 816: 8, 821: 8, 832: 8, 837: 8, 841: 8, 848: 8, 853: 8, 854: 8, 858: 8, 860: 8, 873: 8, 882: 8, 889: 8, 890: 8, 891: 8, 892: 8, 893: 8, 896: 8, 899: 8, 901: 8, 917: 8, 919: 8, 1043: 8, 1045: 8, 1061: 8, 1072: 8, 1077: 8, 1088: 8, 1093: 8, 1120: 8, 1127: 8, 1160: 8, 1168: 8, 1171: 8, 1174: 8, 1175: 8, 1177: 8, 1296: 8, 1302: 8, 1320: 8, 1334: 8, 1336: 8, 1407: 8, 1422: 8, 1423: 8, 1424: 8, 1425: 8, 1426: 8, 1428: 8, 1429: 8, 1430: 8, 1431: 8, 1432: 8, 1554: 8, 1584: 8, 1587: 8, 2022: 8 + } + ], +} + diff --git a/opendbc/car/volvo/helpers.py b/opendbc/car/volvo/helpers.py new file mode 100644 index 00000000000..b60d4eeddf5 --- /dev/null +++ b/opendbc/car/volvo/helpers.py @@ -0,0 +1,380 @@ +def checksum_lca_2_message(b0: int, b5: int) -> int: + """ + Compute checksum for VCU1 CAN ID 0x69 from bytes b0 and b5. + + b0: first data byte (MSB) of the frame (usually 0x18 in your logs) + b5: sixth data byte of the frame (what you called Byte5) + + Returns: checksum byte (0..255) that goes into byte index 6. + """ + if b0 == 0 and b5 == 128: # Hotfix openpilot test (don't know where this alleged test message comes from) + return 0 + + # Masks per checksum bit (bit 0..7) for b0 and b5 + M0 = [0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00] + M5 = [0x83, 0x86, 0xCF, 0xCD, 0x09, 0x02, 0x44, 0x89] + + def parity8(x: int) -> int: + # 1 if x has an odd number of bits set, else 0 + x ^= x >> 4 + x ^= x >> 2 + x ^= x >> 1 + return x & 1 + + b0 &= 0xFF + b5 &= 0xFF + + c = 0 + for bit in range(8): + p = 0 + if M0[bit]: + p ^= parity8(b0 & M0[bit]) + if M5[bit]: + p ^= parity8(b5 & M5[bit]) + c |= (p << bit) + + return c & 0xFF + +def checksum_2_0x69_message(b0: int, b1: int, b3: int = 0, b4: int = 0) -> int: + """ + Compute checksum byte (b2) for CAN ID 0x69 (LCA_2 message). + + The checksum depends on bytes 0, 1, 3, and 4. During normal driving (BYTE_1_MSBS_3=0), + bytes 3-4 (NEW_SIGNAL_2) are always 0, so only b0 and b1 matter. During stability + control events (aquaplaning, etc.), BYTE_1_MSBS_3 becomes non-zero and bytes 3-4 + contain non-zero values that affect the checksum. + + Args: + b0: Byte 0 (usually 0x18) + b1: Byte 1 ([7:5] BYTE_1_MSBS_3 | [4] PILOT_ASSIST_ENGAGED | [3:0] COUNTER_1) + b3: Byte 3 (NEW_SIGNAL_2 high byte, default 0) + b4: Byte 4 (NEW_SIGNAL_2 low byte, default 0) + + Returns: + Checksum byte (0-255) for position 2 + """ + b0 &= 0xFF + b1 &= 0xFF + b3 &= 0xFF + b4 &= 0xFF + + def bit(byte, pos): + return (byte >> pos) & 1 + + c = 0 + # Bit 0 + c |= (bit(b0, 0) ^ bit(b1, 2) ^ bit(b1, 3) ^ bit(b1, 4) ^ bit(b1, 5) ^ bit(b4, 0) ^ bit(b4, 1)) << 0 + # Bit 1 + c |= (bit(b0, 1) ^ bit(b0, 3) ^ bit(b1, 0) ^ bit(b1, 3) ^ bit(b1, 5) ^ bit(b1, 6) ^ + bit(b3, 1) ^ bit(b4, 0) ^ bit(b4, 1) ^ bit(b4, 2)) << 1 + # Bit 2 + c |= (bit(b0, 0) ^ bit(b0, 3) ^ bit(b1, 1) ^ bit(b1, 2) ^ bit(b1, 3) ^ bit(b1, 4) ^ bit(b1, 5) ^ bit(b1, 6) ^ + bit(b3, 0) ^ bit(b3, 1) ^ bit(b4, 0) ^ bit(b4, 2) ^ bit(b4, 3)) << 2 + # Bit 3 + c |= (bit(b0, 0) ^ bit(b0, 1) ^ bit(b1, 0) ^ bit(b1, 4) ^ bit(b1, 6) ^ + bit(b3, 0) ^ bit(b3, 1) ^ bit(b4, 0) ^ bit(b4, 3) ^ bit(b4, 4)) << 3 + # Bit 4 + c |= (bit(b0, 0) ^ bit(b0, 1) ^ bit(b0, 3) ^ bit(b1, 1) ^ bit(b1, 2) ^ bit(b1, 3) ^ bit(b1, 4) ^ + bit(b4, 4) ^ bit(b4, 5)) << 4 + # Bit 5 + c |= (bit(b0, 1) ^ bit(b1, 0) ^ bit(b1, 2) ^ bit(b1, 3) ^ bit(b1, 5) ^ + bit(b3, 1) ^ bit(b4, 5) ^ bit(b4, 6)) << 5 + # Bit 6 + c |= (bit(b0, 3) ^ bit(b1, 0) ^ bit(b1, 1) ^ bit(b1, 3) ^ bit(b1, 6) ^ + bit(b3, 0) ^ bit(b4, 6) ^ bit(b4, 7)) << 6 + # Bit 7 + c |= (bit(b0, 3) ^ bit(b1, 1) ^ bit(b1, 2) ^ bit(b1, 4) ^ bit(b4, 0) ^ bit(b4, 7)) << 7 + return c & 0xFF + +def checksum_1_pscm_related_message(b1, b2): + """ + Computes checksum #1 (goes in byte[0]) for PSCM-related 0x17 message. + Depends only on (byte[1], byte[2]). + """ + + lut = { + (0x00, 0x80): 0xD4, (0x01, 0x80): 0xC9, (0x04, 0x80): 0xA0, + (0x10, 0x81): 0x98, (0x11, 0x81): 0x85, (0x14, 0x81): 0xEC, + (0x20, 0x82): 0x4C, (0x21, 0x82): 0x51, (0x24, 0x82): 0x38, + (0x30, 0x83): 0x00, (0x31, 0x83): 0x1D, (0x34, 0x83): 0x74, + (0x40, 0x84): 0xF9, (0x41, 0x84): 0xE4, (0x44, 0x84): 0x8D, + (0x50, 0x85): 0xB5, (0x51, 0x85): 0xA8, (0x54, 0x85): 0xC1, + (0x60, 0x86): 0x61, (0x61, 0x86): 0x7C, (0x64, 0x86): 0x15, + (0x70, 0x87): 0x2D, (0x71, 0x87): 0x30, (0x74, 0x87): 0x59, + (0x80, 0x88): 0x8E, (0x81, 0x88): 0x93, (0x84, 0x88): 0xFA, + (0x90, 0x89): 0xC2, (0x91, 0x89): 0xDF, (0x94, 0x89): 0xB6, + (0xA0, 0x8A): 0x16, (0xA1, 0x8A): 0x0B, (0xA4, 0x8A): 0x62, + (0xB0, 0x8B): 0x5A, (0xB1, 0x8B): 0x47, (0xB4, 0x8B): 0x2E, + (0xC0, 0x8C): 0xA3, (0xC1, 0x8C): 0xBE, (0xC4, 0x8C): 0xD7, + (0xD0, 0x8D): 0xEF, (0xD1, 0x8D): 0xF2, (0xD4, 0x8D): 0x9B, + (0xE0, 0x8E): 0x3B, (0xE1, 0x8E): 0x26, (0xE4, 0x8E): 0x4F, + } + + return lut.get((b1, b2), 0) + + +def checksum_2_pscm_related_message(b2): + """ + Computes checksum #2 (goes in byte[3]) for PSCM-related 0x17 message. + Depends only on byte[2]. + """ + + lut = { + 0x80: 0xBF, + 0x81: 0xF3, + 0x82: 0x27, + 0x83: 0x6B, + 0x84: 0x92, + 0x85: 0xDE, + 0x86: 0x0A, + 0x87: 0x46, + 0x88: 0xE5, + 0x89: 0xA9, + 0x8A: 0x7D, + 0x8B: 0x31, + 0x8C: 0xC8, + 0x8D: 0x84, + 0x8E: 0x50, + } + + return lut.get(b2, 0) + + +def checksum_lca_4_message(*args) -> int: + """ + Placeholder for LCA_4 (0x90) checksum calculation. + + TODO: Implementation will be provided after checksum analysis is complete. + For now, returns 0 as a placeholder. + + Args: + *args: Byte values needed for checksum calculation (TBD) + + Returns: + Checksum byte (0-255) + """ + # Placeholder - will be replaced with actual checksum algorithm + return 0 + + +class LCA3CounterSync: + """ + Best-effort pattern synchronization for LCA_3 COUNTER_1. + + The counter follows a 20-element pattern that cycles based on transmission count. + We track recent observed counter values and match them against the pattern to + determine the current index. While not synchronized, we pass through stock values. + Once synchronized, we permanently use the pattern. + """ + + PATTERN = [2, 2, 1, 2, 2, 2, 1, 2, 2, 3, 0, 2, 3, 2, 0, 2, 3, 2, 0, 3] + PATTERN_LEN = 20 + WINDOW_SIZE = 5 # Track last 5 values for matching + MIN_CONFIDENCE = 4 # Need 4 consecutive matches to sync + + def __init__(self): + self.pattern_index = None # Current index in pattern (None = not synced) + self.observed_window = [] # Circular buffer of last N observed values + self.confidence = 0 # Number of consecutive successful matches + + def update(self, observed_counter: int) -> tuple: + """ + Update with newly observed counter value from stock message. + + Args: + observed_counter: Counter value from CS.msg_lca_3['COUNTER_1'] + + Returns: + Tuple of (counter_to_send, is_synchronized) + """ + # If already synchronized, ignore stock and use our pattern permanently + if self.pattern_index is not None: + counter_to_send = self.PATTERN[self.pattern_index] + self.pattern_index = (self.pattern_index + 1) % self.PATTERN_LEN + return counter_to_send, True + + # Not synchronized yet - try to find pattern index + self.observed_window.append(observed_counter) + if len(self.observed_window) > self.WINDOW_SIZE: + self.observed_window.pop(0) + + # Attempt to sync if we have enough samples + if len(self.observed_window) >= 3: + self._attempt_sync() + + # While not synced, pass through stock counter + return observed_counter, False + + def _attempt_sync(self): + """Try to find current pattern index based on observed window.""" + # Try to match observation window against all positions in pattern + best_match_idx = None + best_match_len = 0 + + for start_idx in range(self.PATTERN_LEN): + match_len = self._count_match(start_idx) + if match_len > best_match_len: + best_match_len = match_len + best_match_idx = start_idx + + # Require MIN_CONFIDENCE matching values to declare sync + if best_match_len >= self.MIN_CONFIDENCE: + # The match tells us where we WERE in the pattern + # We need to set index to NEXT position for next transmission + self.pattern_index = (best_match_idx + len(self.observed_window)) % self.PATTERN_LEN + self.confidence = best_match_len + + def _count_match(self, pattern_start_idx: int) -> int: + """ + Count how many values in observed_window match pattern starting at pattern_start_idx. + + Returns: + Number of consecutive matching values from start + """ + match_count = 0 + for i, observed in enumerate(self.observed_window): + pattern_idx = (pattern_start_idx + i) % self.PATTERN_LEN + if observed == self.PATTERN[pattern_idx]: + match_count += 1 + else: + break # Stop at first mismatch + return match_count + + def is_synchronized(self) -> bool: + """Returns True if we have synchronized to the pattern.""" + return self.pattern_index is not None + +def checksum_lca_5_message(byte0: int, byte1: int, byte3: int, byte4: int, byte5: int) -> int: + """ + Calculate checksum for LCA_5 message 0x67 (byte 2) + + Args: + byte0: Byte 0 (0-255) + byte1: Byte 1 (0-255) + byte3: Byte 3 (0-255) + byte4: Byte 4 (0-255) + byte5: Byte 5 (0-255) + byte6: Byte 6 (0-255) + byte7: Byte 7 (0-255) + + Returns: + int: Checksum value (0-255) for byte 2 + + Example: + >>> checksum = calculate_checksum_0x67(0x80, 0x00, 0x4F, 0x00, 0x00, 0xBA, 0x00) + >>> print(f"0x{checksum:02X}") + 0x32 + """ + + # Helper function to extract a bit (LSB = bit 0) + def bit(byte_val, pos): + return (byte_val >> pos) & 1 + + checksum = 0 + + # Bit 0: XOR of 13 bits + checksum |= ( + bit(byte0, 2) ^ bit(byte0, 3) ^ bit(byte0, 5) ^ bit(byte0, 7) ^ + bit(byte1, 2) ^ + bit(byte3, 4) ^ bit(byte3, 6) ^ + bit(byte4, 0) ^ bit(byte4, 1) ^ bit(byte4, 5) ^ bit(byte4, 6) ^ + bit(byte5, 3) ^ bit(byte5, 6) + ) << 0 + + # Bit 1: XOR of 12 bits + checksum |= ( + bit(byte0, 0) ^ bit(byte0, 3) ^ bit(byte0, 4) ^ bit(byte0, 7) ^ + bit(byte1, 0) ^ bit(byte1, 3) ^ + bit(byte3, 5) ^ bit(byte3, 7) ^ + bit(byte4, 2) ^ bit(byte4, 6) ^ + bit(byte5, 4) ^ bit(byte5, 7) + ) << 1 + + # Bit 2: XOR of 17 bits + checksum |= ( + bit(byte0, 1) ^ bit(byte0, 2) ^ bit(byte0, 3) ^ bit(byte0, 4) ^ + bit(byte1, 0) ^ bit(byte1, 1) ^ bit(byte1, 2) ^ bit(byte1, 4) ^ + bit(byte3, 4) ^ + bit(byte4, 1) ^ bit(byte4, 3) ^ bit(byte4, 5) ^ bit(byte4, 6) ^ + bit(byte5, 1) ^ bit(byte5, 3) ^ bit(byte5, 5) ^ bit(byte5, 6) + ) << 2 + + # Bit 3: XOR of 19 bits + checksum |= ( + bit(byte0, 0) ^ bit(byte0, 4) ^ bit(byte0, 7) ^ + bit(byte1, 1) ^ bit(byte1, 3) ^ bit(byte1, 5) ^ + bit(byte3, 4) ^ bit(byte3, 5) ^ bit(byte3, 6) ^ + bit(byte4, 0) ^ bit(byte4, 1) ^ bit(byte4, 2) ^ bit(byte4, 4) ^ bit(byte4, 5) ^ + bit(byte5, 1) ^ bit(byte5, 2) ^ bit(byte5, 3) ^ bit(byte5, 4) ^ bit(byte5, 7) + ) << 3 + + # Bit 4: XOR of 16 bits + checksum |= ( + bit(byte0, 1) ^ bit(byte0, 2) ^ bit(byte0, 3) ^ bit(byte0, 7) ^ + bit(byte1, 4) ^ bit(byte1, 6) ^ + bit(byte3, 4) ^ bit(byte3, 5) ^ bit(byte3, 7) ^ + bit(byte4, 1) ^ bit(byte4, 2) ^ bit(byte4, 3) ^ + bit(byte5, 2) ^ bit(byte5, 4) ^ bit(byte5, 5) ^ bit(byte5, 6) + ) << 4 + + # Bit 5: XOR of 15 bits + checksum |= ( + bit(byte0, 0) ^ bit(byte0, 2) ^ bit(byte0, 3) ^ bit(byte0, 4) ^ + bit(byte1, 5) ^ bit(byte1, 7) ^ + bit(byte3, 5) ^ bit(byte3, 6) ^ + bit(byte4, 2) ^ bit(byte4, 3) ^ bit(byte4, 4) ^ + bit(byte5, 3) ^ bit(byte5, 5) ^ bit(byte5, 6) ^ bit(byte5, 7) + ) << 5 + + # Bit 6: XOR of 19 bits + checksum |= ( + bit(byte0, 0) ^ bit(byte0, 1) ^ bit(byte0, 3) ^ bit(byte0, 4) ^ bit(byte0, 5) ^ bit(byte0, 7) ^ + bit(byte1, 0) ^ bit(byte1, 6) ^ + bit(byte3, 4) ^ bit(byte3, 6) ^ bit(byte3, 7) ^ + bit(byte4, 0) ^ bit(byte4, 3) ^ bit(byte4, 4) ^ bit(byte4, 5) ^ + bit(byte5, 1) ^ bit(byte5, 4) ^ bit(byte5, 6) ^ bit(byte5, 7) + ) << 6 + + # Bit 7: XOR of 15 bits + checksum |= ( + bit(byte0, 1) ^ bit(byte0, 2) ^ bit(byte0, 4) ^ bit(byte0, 5) ^ + bit(byte1, 1) ^ bit(byte1, 7) ^ + bit(byte3, 5) ^ bit(byte3, 7) ^ + bit(byte4, 0) ^ bit(byte4, 4) ^ bit(byte4, 5) ^ bit(byte4, 6) ^ + bit(byte5, 2) ^ bit(byte5, 5) ^ bit(byte5, 7) + ) << 7 + + return checksum + + +# Test examples +if __name__ == "__main__": + print("CAN 0x67 Checksum Calculator") + print("=" * 60) + + # Test cases + tests = [ + ([0x80, 0x00, 0x4F, 0x00, 0x00, 0xBA, 0x00], 0x32), + ([0x80, 0x00, 0x8F, 0x00, 0x00, 0xBA, 0x00], 0x89), + ([0x80, 0x00, 0xCF, 0x00, 0x00, 0xBA, 0x00], 0xE0), + ([0x80, 0x00, 0x1F, 0x00, 0x00, 0xBA, 0x00], 0x06), + ] + + all_passed = True + for i, (bytes_list, expected) in enumerate(tests, 1): + calculated = calculate_checksum_0x67(*bytes_list) + status = "✓" if calculated == expected else "✗" + + print(f"\nTest {i}: {status}") + print(f" Bytes: {' '.join(f'{b:02X}' for b in bytes_list)}") + print(f" Expected: 0x{expected:02X}") + print(f" Calculated: 0x{calculated:02X}") + + if calculated != expected: + all_passed = False + + print("\n" + "=" * 60) + if all_passed: + print("All tests passed! ✓") + else: + print("Some tests failed! ✗") \ No newline at end of file diff --git a/opendbc/car/volvo/interface.py b/opendbc/car/volvo/interface.py new file mode 100644 index 00000000000..38eae61d25a --- /dev/null +++ b/opendbc/car/volvo/interface.py @@ -0,0 +1,41 @@ +from opendbc.car import structs, get_safety_config +from opendbc.car.interfaces import CarInterfaceBase +from opendbc.car.volvo.carcontroller import CarController +from opendbc.car.volvo.carstate import CarState +from opendbc.car.volvo.values import VolvoSPAPlatformConfig, CAR + +TransmissionType = structs.CarParams.TransmissionType + +VOLVO_FLAG_SPA = 1 + + +class CarInterface(CarInterfaceBase): + CarState = CarState + CarController = CarController + + @staticmethod + def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, alpha_long, is_release, docs) -> structs.CarParams: + ret.brand = 'volvo' + + safety_param = 0 + if isinstance(CAR(candidate).config, VolvoSPAPlatformConfig): + safety_param = VOLVO_FLAG_SPA + ret.safetyConfigs = [get_safety_config(structs.CarParams.SafetyModel.volvo, safety_param)] + #ret.safetyConfigs = [get_safety_config(structs.CarParams.SafetyModel.noOutput)] + + ret.dashcamOnly = False + + ret.steerActuatorDelay = 0.3 + ret.steerLimitTimer = 0.1 + ret.steerAtStandstill = True + + # Use angle-based steering control for Volvo CMA platform + ret.steerControlType = structs.CarParams.SteerControlType.angle + # Note: No lateral tuning configuration needed for basic angle control + ret.radarUnavailable = True + + ret.alphaLongitudinalAvailable = False + + ret.pcmCruise = True + + return ret \ No newline at end of file diff --git a/opendbc/car/volvo/live_testing.py b/opendbc/car/volvo/live_testing.py new file mode 100644 index 00000000000..26df283f136 --- /dev/null +++ b/opendbc/car/volvo/live_testing.py @@ -0,0 +1,101 @@ +class LiveTestingManager: + TESTING_FILE = "/data/openpilot/live_testing.txt" + + # Valid function names for dot-notation overrides + VALID_FUNCTIONS = {'lca_5', 'lca', 'lca_2', 'lca_3', 'lca_4'} + + def __init__(self): + pass # No state needed - reads file fresh every call + + @staticmethod + def _parse_value(value_str: str): + """Auto-detect type: try bool, then int, then float, else keep as string.""" + if value_str in ('True', 'False'): + return value_str == 'True' + try: + return int(value_str) + except ValueError: + try: + return float(value_str) + except ValueError: + return value_str + + def load_config(self) -> dict | None: + """ + Load live testing configuration from file. + + Supports two formats: + - Global keys: lat_active=True, apply_angle=5.0 + - Function-scoped keys (dot notation): lca_5.lca_turn_bits=128 + + Function-scoped keys are grouped into nested dicts with UPPERCASE field names + (to match DBC signal names). + + Returns: + - None if file doesn't exist, parse fails, or lat_active=False + - dict with global keys and function-scoped nested dicts + + Example return values: + - File doesn't exist → None + - File contains lat_active=False → None + - File contains: lat_active=True, lca_5.lca_turn_bits=128, lca.lca_steer=100 + → {'lat_active': True, 'lca_5': {'LCA_TURN_BITS': 128}, 'lca': {'LCA_STEER': 100}} + """ + try: + with open(self.TESTING_FILE, 'r') as f: + lines = f.readlines() + + config = {} + + for line in lines: + line = line.strip() + + if not line or line.startswith('#'): + continue + + if '=' not in line: + continue + + key, value = line.split('=', 1) + key = key.strip() + value = value.strip() + + # Strip inline comments + if '#' in value: + value = value.split('#', 1)[0].strip() + + # Check for dot notation (function-scoped override) + if '.' in key: + func_name, field_name = key.split('.', 1) + if func_name not in self.VALID_FUNCTIONS: + continue + if func_name not in config: + config[func_name] = {} + # Convert field name to UPPERCASE (DBC signals are uppercase) + config[func_name][field_name.upper()] = self._parse_value(value) + else: + # Global keys (lat_active, apply_angle) + if key == 'lat_active': + if value == 'True': + config['lat_active'] = True + elif value == 'False': + config['lat_active'] = False + elif key == 'apply_angle': + try: + config['apply_angle'] = float(value) + except ValueError: + continue + + # If lat_active is explicitly False, return None + if 'lat_active' in config and config['lat_active'] is False: + return None + + if not config: + return None + + return config + + except FileNotFoundError: + return None + except Exception: + return None diff --git a/opendbc/car/volvo/live_testing.txt.sample b/opendbc/car/volvo/live_testing.txt.sample new file mode 100644 index 00000000000..e58bc5bd0fa --- /dev/null +++ b/opendbc/car/volvo/live_testing.txt.sample @@ -0,0 +1,25 @@ +# Live testing configuration for Volvo CMA steering +# Copy to /data/openpilot/live_testing.txt and modify values +# +# Syntax: +# Global keys: key=value (e.g. lat_active=True) +# Message overrides: message.signal=value (e.g. lca_5.lca_turn_bits=128) +# +# Signal names are case-insensitive (converted to UPPERCASE for DBC) + +# Global overrides +lat_active=True + +# Steering angle override (degrees, positive=left, negative=right) +# Overrides angle for all messages (LCA, LCA_3, LCA_4, LCA_5) +#apply_angle=5.0 + +# LCA_5 message (0x67) - Primary angle control +# Any DBC signal can be overridden +#lca_5.lca_turn_bits=128 # -> LCA_TURN_BITS: 128=left neutral, 255=right neutral, 186=inactive +#lca_5.lca_5_steer=0 # -> LCA_5_STEER: Angle encoding (0-255) +#lca_5.wheel_speed_1=1000 # -> WHEEL_SPEED_1 + +# LCA message (0x58) - Secondary angle control +#lca.lca_steer=0 # -> LCA_STEER signal (0-255) +#lca.curve_right=0 # -> CURVE_RIGHT signal: 0=left/neutral, 63=right diff --git a/opendbc/car/volvo/test_lca_new_signal_4.py b/opendbc/car/volvo/test_lca_new_signal_4.py new file mode 100644 index 00000000000..ad5dc4b9735 --- /dev/null +++ b/opendbc/car/volvo/test_lca_new_signal_4.py @@ -0,0 +1,419 @@ +#!/usr/bin/env python3 +""" +Test script to investigate whether NEW_SIGNAL_4 in LCA (0x58) controls steering rate of change. + +Theory: Stock LCA uses NEW_SIGNAL_4=39 when active (observed increasing from 35 to 39 when +the PSCM couldn't meet the requested angle fast enough). This suggests it may be a steering +authority/rate parameter. + +Method: + 1. Command a fixed angle step (e.g., 0 -> 15 degrees) + 2. Vary NEW_SIGNAL_4 across test values (stock=39, then 50, 80, 120, etc.) + 3. Measure how fast the steering angle reaches the target + 4. Compare rate-of-change profiles across NEW_SIGNAL_4 values + +Usage: + python test_lca_new_signal_4.py # Default test + python test_lca_new_signal_4.py --angle 10 # Custom step angle + python test_lca_new_signal_4.py --values 39,60,80 # Custom NEW_SIGNAL_4 values + python test_lca_new_signal_4.py --repeat 3 # Repeat each test 3 times + +Requirements: + - openpilot must be running (carState must be published) + - Car should be stationary or moving slowly + - Steering must be free to move (not held by driver) +""" + +import sys +import time +import signal +import argparse +import statistics +from pathlib import Path + +# Add openpilot to path if needed +OPENPILOT_PATH = Path(__file__).resolve().parents[5] +if str(OPENPILOT_PATH) not in sys.path: + sys.path.insert(0, str(OPENPILOT_PATH)) + +import cereal.messaging as messaging + +# Configuration +LIVE_TESTING_FILE = "/data/openpilot/live_testing.txt" +LOG_FILE = "/data/openpilot/lca_new_signal_4_test.csv" + +# Timing +SAMPLE_INTERVAL_S = 0.02 # 50 Hz sampling (20ms) +NEUTRAL_SETTLE_S = 3.0 # Time to settle at neutral before each test +RECORD_DURATION_S = 4.0 # How long to record after commanding the step +SETTLE_THRESHOLD_DEG = 0.3 # Angle must be stable within this range +SETTLE_WINDOW = 15 # Number of samples for settle detection + +# Safety +MAX_ANGLE_DEG = 40.0 +DEFAULT_STEP_ANGLE = 15.0 + +# Stock value for reference +STOCK_NEW_SIGNAL_4 = 39 +DEFAULT_TEST_VALUES = [39, 50, 70, 100, 130, 170, 200, 251] + + +class RateOfChangeTester: + def __init__(self, step_angle: float, test_values: list[int], repeats: int, max_angle: float): + self.step_angle = step_angle + self.test_values = test_values + self.repeats = repeats + self.max_angle = max_angle + self.running = True + self.sm = None + self.all_results = {} # {ns4_value: [list of trial results]} + + signal.signal(signal.SIGINT, self._signal_handler) + signal.signal(signal.SIGTERM, self._signal_handler) + + def _signal_handler(self, sig, frame): + print("\nInterrupted, cleaning up...") + self.running = False + self._disable_live_testing() + sys.exit(0) + + def _write_live_testing(self, lat_active: bool, apply_angle: float | None = None, + new_signal_4: int | None = None): + """Write test configuration to live_testing.txt""" + lines = ["# Auto-generated by test_lca_new_signal_4.py"] + + if not lat_active: + lines.append("lat_active=False") + else: + lines.append("lat_active=True") + if apply_angle is not None: + lines.append(f"apply_angle={apply_angle}") + if new_signal_4 is not None: + lines.append(f"lca.new_signal_4={new_signal_4}") + + with open(LIVE_TESTING_FILE, 'w') as f: + f.write('\n'.join(lines) + '\n') + + def _disable_live_testing(self): + """Disable live testing""" + with open(LIVE_TESTING_FILE, 'w') as f: + f.write("# Auto-generated\nlat_active=False\n") + print("Live testing disabled") + + def _get_angle(self) -> float | None: + """Get current steering angle from carState""" + self.sm.update(timeout=1000) + if self.sm.updated['carState']: + return self.sm['carState'].steeringAngleDeg + return None + + def _wait_for_settle(self, target: float | None = None) -> bool: + """Wait until steering angle stabilizes near target""" + recent_angles = [] + start_time = time.time() + timeout = NEUTRAL_SETTLE_S + 2.0 + + while self.running: + if time.time() - start_time > timeout: + if recent_angles: + avg = statistics.mean(recent_angles[-SETTLE_WINDOW:]) + print(f" Settle timeout (current: {avg:.2f}°)") + return True # Proceed anyway after timeout + + angle = self._get_angle() + if angle is None: + continue + + # Safety check + if abs(angle) > self.max_angle: + print(f" SAFETY: Angle {angle:.1f}° exceeds limit!") + return False + + recent_angles.append(angle) + if len(recent_angles) > SETTLE_WINDOW: + recent_angles.pop(0) + + if len(recent_angles) >= SETTLE_WINDOW: + angle_range = max(recent_angles) - min(recent_angles) + if angle_range < SETTLE_THRESHOLD_DEG: + return True + + time.sleep(SAMPLE_INTERVAL_S) + + return False + + def _record_step_response(self, new_signal_4: int, log_file) -> dict | None: + """ + Record a single step response: + 1. Command neutral (0°) and wait for settle + 2. Command step_angle with given NEW_SIGNAL_4 + 3. Record angle samples at 50 Hz for RECORD_DURATION_S + 4. Return to neutral + + Returns dict with timing/rate metrics, or None on failure. + """ + # Phase 1: Go to neutral + print(f" Returning to neutral...") + self._write_live_testing(True, apply_angle=0.0, new_signal_4=STOCK_NEW_SIGNAL_4) + if not self._wait_for_settle(target=0.0): + return None + time.sleep(NEUTRAL_SETTLE_S) + + initial_angle = self._get_angle() + if initial_angle is None: + return None + + # Phase 2: Command step with test NEW_SIGNAL_4 value + print(f" Commanding {self.step_angle}° with NEW_SIGNAL_4={new_signal_4}...") + step_time = time.monotonic() + self._write_live_testing(True, apply_angle=self.step_angle, new_signal_4=new_signal_4) + + # Phase 3: Record at 50 Hz + samples = [] # (elapsed_s, angle_deg) + record_start = time.monotonic() + + while self.running: + now = time.monotonic() + elapsed = now - step_time + if elapsed > RECORD_DURATION_S: + break + + angle = self._get_angle() + if angle is not None: + samples.append((elapsed, angle)) + + # Safety check + if abs(angle) > self.max_angle: + print(f" SAFETY: Angle {angle:.1f}° exceeds limit!") + self._write_live_testing(True, apply_angle=0.0, new_signal_4=STOCK_NEW_SIGNAL_4) + return None + + time.sleep(SAMPLE_INTERVAL_S) + + if len(samples) < 10: + print(f" WARNING: Only {len(samples)} samples collected") + return None + + # Write samples to CSV + for elapsed, angle in samples: + log_file.write(f"{new_signal_4},{elapsed:.4f},{angle:.4f},{self.step_angle},{initial_angle:.4f}\n") + log_file.flush() + + # Analyze the step response + return self._analyze_step(samples, initial_angle) + + def _analyze_step(self, samples: list[tuple[float, float]], initial_angle: float) -> dict: + """Compute rate-of-change metrics from a step response.""" + target = self.step_angle + threshold_90 = initial_angle + 0.9 * (target - initial_angle) + threshold_63 = initial_angle + 0.63 * (target - initial_angle) # time constant + + # Find time to reach 63% and 90% of target + time_to_63 = None + time_to_90 = None + for elapsed, angle in samples: + if time_to_63 is None and angle >= threshold_63: + time_to_63 = elapsed + if time_to_90 is None and angle >= threshold_90: + time_to_90 = elapsed + + # Compute max rate of change (deg/s) using sliding window + max_rate = 0.0 + window = 5 # 5 samples at 50Hz = 100ms window + for i in range(window, len(samples)): + dt = samples[i][0] - samples[i - window][0] + if dt > 0: + rate = abs(samples[i][1] - samples[i - window][1]) / dt + max_rate = max(max_rate, rate) + + # Final angle (average of last 20 samples) + final_angles = [a for _, a in samples[-20:]] + final_angle = statistics.mean(final_angles) if final_angles else samples[-1][1] + + return { + 'initial_angle': initial_angle, + 'final_angle': final_angle, + 'time_to_63pct': time_to_63, + 'time_to_90pct': time_to_90, + 'max_rate_deg_s': max_rate, + 'n_samples': len(samples), + } + + def connect(self) -> bool: + """Connect to carState""" + print("Connecting to carState...") + self.sm = messaging.SubMaster(['carState']) + + print("Waiting for messages...") + for _ in range(50): + self.sm.update(timeout=100) + if self.sm.updated['carState']: + angle = self.sm['carState'].steeringAngleDeg + print(f"Connected! Current angle: {angle:.2f}°") + return True + time.sleep(0.1) + + print("ERROR: No carState messages. Is openpilot running?") + return False + + def run(self): + if not self.connect(): + return + + print(f"\n{'='*65}") + print("LCA NEW_SIGNAL_4 Rate-of-Change Test") + print(f"{'='*65}") + print(f"Step angle: 0° -> {self.step_angle}°") + print(f"Test values: {self.test_values}") + print(f"Repeats per value: {self.repeats}") + print(f"Sample rate: {1/SAMPLE_INTERVAL_S:.0f} Hz") + print(f"Record duration: {RECORD_DURATION_S}s per step") + print(f"Safety limit: ±{self.max_angle}°") + print(f"Log file: {LOG_FILE}") + print() + print("Stock NEW_SIGNAL_4 = 39 (baseline)") + print("Hypothesis: Higher values = faster steering rate") + print() + + with open(LOG_FILE, 'w') as log: + log.write("new_signal_4,elapsed_s,angle_deg,target_deg,initial_deg\n") + + for ns4_val in self.test_values: + if not self.running: + break + + self.all_results[ns4_val] = [] + + for trial in range(self.repeats): + if not self.running: + break + + print(f"\n[NEW_SIGNAL_4={ns4_val}] Trial {trial+1}/{self.repeats}") + result = self._record_step_response(ns4_val, log) + + if result: + self.all_results[ns4_val].append(result) + t63 = f"{result['time_to_63pct']:.3f}s" if result['time_to_63pct'] else "N/A" + t90 = f"{result['time_to_90pct']:.3f}s" if result['time_to_90pct'] else "N/A" + print(f" -> max_rate={result['max_rate_deg_s']:.1f}°/s, " + f"t63={t63}, t90={t90}, final={result['final_angle']:.2f}°") + else: + print(f" -> FAILED") + + # Return to neutral and disable + print("\nReturning to neutral...") + self._write_live_testing(True, apply_angle=0.0, new_signal_4=STOCK_NEW_SIGNAL_4) + time.sleep(2.0) + self._disable_live_testing() + + self._print_summary() + + def _print_summary(self): + """Print comparison table across all NEW_SIGNAL_4 values""" + print(f"\n{'='*65}") + print("SUMMARY: NEW_SIGNAL_4 vs Steering Rate of Change") + print(f"{'='*65}") + print(f"Step: 0° -> {self.step_angle}°") + print() + + header = f"{'NS4':>5} {'MaxRate(°/s)':>13} {'t63(s)':>8} {'t90(s)':>8} {'Final(°)':>9} {'Trials':>7}" + print(header) + print("-" * len(header)) + + for ns4_val in self.test_values: + trials = self.all_results.get(ns4_val, []) + if not trials: + print(f"{ns4_val:>5} {'FAILED':>13}") + continue + + rates = [t['max_rate_deg_s'] for t in trials] + t63s = [t['time_to_63pct'] for t in trials if t['time_to_63pct'] is not None] + t90s = [t['time_to_90pct'] for t in trials if t['time_to_90pct'] is not None] + finals = [t['final_angle'] for t in trials] + + avg_rate = statistics.mean(rates) + avg_t63 = statistics.mean(t63s) if t63s else None + avg_t90 = statistics.mean(t90s) if t90s else None + avg_final = statistics.mean(finals) + + t63_str = f"{avg_t63:.3f}" if avg_t63 else "N/A" + t90_str = f"{avg_t90:.3f}" if avg_t90 else "N/A" + + marker = " <-- stock" if ns4_val == STOCK_NEW_SIGNAL_4 else "" + print(f"{ns4_val:>5} {avg_rate:>13.1f} {t63_str:>8} {t90_str:>8} {avg_final:>9.2f} {len(trials):>7}{marker}") + + # Verdict + stock_trials = self.all_results.get(STOCK_NEW_SIGNAL_4, []) + if stock_trials: + stock_rate = statistics.mean([t['max_rate_deg_s'] for t in stock_trials]) + + faster = [] + for ns4_val in self.test_values: + if ns4_val == STOCK_NEW_SIGNAL_4: + continue + trials = self.all_results.get(ns4_val, []) + if trials: + rate = statistics.mean([t['max_rate_deg_s'] for t in trials]) + if rate > stock_rate * 1.1: # 10% faster threshold + faster.append((ns4_val, rate)) + + print() + if faster: + print("RESULT: NEW_SIGNAL_4 DOES affect steering rate!") + print(f" Stock rate (NS4={STOCK_NEW_SIGNAL_4}): {stock_rate:.1f}°/s") + for ns4_val, rate in faster: + improvement = (rate / stock_rate - 1) * 100 + print(f" NS4={ns4_val}: {rate:.1f}°/s (+{improvement:.0f}%)") + else: + print("RESULT: No significant rate difference detected.") + print(" NEW_SIGNAL_4 may not control steering rate,") + print(" or the PSCM ignores it for rate limiting.") + + print(f"\nRaw data saved to: {LOG_FILE}") + print("Analyze with: plot columns elapsed_s vs angle_deg, grouped by new_signal_4") + + +def main(): + parser = argparse.ArgumentParser(description='Test if LCA NEW_SIGNAL_4 controls steering rate') + parser.add_argument('--angle', type=float, default=DEFAULT_STEP_ANGLE, + help=f'Step angle in degrees (default: {DEFAULT_STEP_ANGLE}°)') + parser.add_argument('--values', type=str, default=None, + help='Comma-separated NEW_SIGNAL_4 values to test (default: 39,50,70,100,130,170,200,251)') + parser.add_argument('--repeat', type=int, default=2, + help='Number of trials per value (default: 2)') + parser.add_argument('--max-angle', type=float, default=MAX_ANGLE_DEG, + help=f'Safety limit (default: {MAX_ANGLE_DEG}°)') + args = parser.parse_args() + + if args.values: + test_values = [int(v.strip()) for v in args.values.split(',')] + else: + test_values = DEFAULT_TEST_VALUES + + # Validate + for v in test_values: + if v < 0 or v > 255: + print(f"ERROR: NEW_SIGNAL_4 value {v} out of range (0-255)") + sys.exit(1) + + print("=" * 65) + print("LCA NEW_SIGNAL_4 Rate-of-Change Test") + print("=" * 65) + print() + print("IMPORTANT:") + print(" 1. openpilot must be running") + print(" 2. Car should be stationary or moving slowly") + print(" 3. Don't touch the steering wheel") + print(" 4. Be ready to grab the wheel if anything unexpected happens") + print() + print(f"Will command steps of {args.angle}° with varying NEW_SIGNAL_4 values.") + print(f"Stock value is 39 — testing: {test_values}") + print() + input("Press Enter to start...") + + tester = RateOfChangeTester(args.angle, test_values, args.repeat, args.max_angle) + tester.run() + + +if __name__ == "__main__": + main() diff --git a/opendbc/car/volvo/values.py b/opendbc/car/volvo/values.py new file mode 100644 index 00000000000..473541b1c9d --- /dev/null +++ b/opendbc/car/volvo/values.py @@ -0,0 +1,92 @@ +from dataclasses import dataclass, field + +from opendbc.car.structs import CarParams +from opendbc.car import Bus, CarSpecs, DbcDict, PlatformConfig, Platforms +from opendbc.car.lateral import AngleSteeringLimits +from opendbc.car.docs_definitions import CarDocs, CarHarness, CarParts +from opendbc.car.fw_query_definitions import FwQueryConfig, Request, StdQueries + +Ecu = CarParams.Ecu + + +class CarControllerParams: + STEER_STEP = 1 # 100 Hz LCA command frequency (controlsd runs at 100 Hz) + + # Angle limits for rate limiting + ANGLE_LIMITS: AngleSteeringLimits = AngleSteeringLimits( + 540, # deg - 1.5 turns to lock + ([0., 5., 25.], [2.5, 1.5, .2]), # rate up limits at different speeds + ([0., 5., 25.], [5., 2., .3]), # rate down limits at different speeds + ) + + +@dataclass +class VolvoCarDocs(CarDocs): + package: str = "Pilot Assist & Adaptive Cruise Control" + car_parts: CarParts = field(default_factory=CarParts.common([CarHarness.custom])) + + +@dataclass +class VolvoCMAPlatformConfig(PlatformConfig): + dbc_dict: DbcDict = field(default_factory=lambda: { + Bus.main: 'volvo_mid_1', + Bus.party: 'volvo_mid_1', + Bus.pt: 'volvo_front_1_cma', + }) + +@dataclass +class VolvoSPAPlatformConfig(PlatformConfig): + dbc_dict: DbcDict = field(default_factory=lambda: { + Bus.main: 'volvo_mid_1', + Bus.party: 'volvo_mid_1', + Bus.pt: 'volvo_front_1_spa', + }) + + +class CAR(Platforms): + VOLVO_XC40_RECHARGE = VolvoCMAPlatformConfig( + [VolvoCarDocs("Volvo XC40 Recharge 2021-2023")], + CarSpecs( + mass=2170, + wheelbase=2.702, + steerRatio=15.8, + centerToFrontRatio=0.52, + ), + ) + + VOLVO_S60_RECHARGE = VolvoSPAPlatformConfig( + [VolvoCarDocs("Volvo S60 Recharge 2024")], + CarSpecs( + mass=2020, + wheelbase=2.872, + steerRatio=16.2, + centerToFrontRatio=0.516, + ), + ) + + # Polestar 2 is technically CMA, but appears to use SPA DBC for CAN 1 bus + POLESTAR_2 = VolvoSPAPlatformConfig( + [VolvoCarDocs("Polestar 2 2020+")], + CarSpecs( + mass=2123, + wheelbase=2.735, + steerRatio=15.8, + centerToFrontRatio=0.52, + ), + ) + +# FW Query configuration for Volvo CMA platform +# FW_QUERY_CONFIG = FwQueryConfig( +# requests=[ +# Request( +# [StdQueries.TESTER_PRESENT_REQUEST, StdQueries.UDS_VERSION_REQUEST], +# [StdQueries.TESTER_PRESENT_RESPONSE, StdQueries.UDS_VERSION_RESPONSE], +# bus=0, +# ), +# ], +# ) +FW_QUERY_CONFIG = FwQueryConfig( + requests=[] +) + +DBC = CAR.create_dbc_map() diff --git a/opendbc/car/volvo/volvocan.py b/opendbc/car/volvo/volvocan.py new file mode 100644 index 00000000000..8b9494eef1b --- /dev/null +++ b/opendbc/car/volvo/volvocan.py @@ -0,0 +1,466 @@ +import random +from opendbc.car.volvo.helpers import checksum_lca_2_message, checksum_2_0x69_message, checksum_1_pscm_related_message, checksum_2_pscm_related_message, checksum_lca_4_message, checksum_lca_5_message +from opendbc.car.carlog import carlog + +def create_lca_message(packer, lat_active: bool, apply_angle: float, msg_lca: dict, + overrides: dict | None = None): + """ + Create LCA (Lane Centering Assist) steering command for Volvo CMA platform. + Uses angle-based control via the LCA_STEER signal. + + NOTE: This message must be sent continuously (even when inactive) because + stock LCA is permanently blocked by panda safety. When lat_active=False, + we send a safe/inactive LCA message to maintain PSCM communication. + + Args: + packer: CAN packer instance + lat_active: Whether lateral control is active + apply_angle: Steering angle in degrees (positive = left, negative = right) + msg_lca: Dictionary containing LCA message values + overrides: Optional dict of signal overrides (keys are UPPERCASE DBC signal names) + """ + if not lat_active: + return packer.make_can_msg('LCA', 2, msg_lca) + + # In openpilot, a positive angle corresponds to a LEFT turn. + # In Volvo, a positive LCA_STEER value corresponds to a LEFT turn. + + values = { + 'NEW_SIGNAL_1': 3, + 'LCA_ENABLE_INV': 0 if lat_active else 1, + 'LANE_KEEP_ACTIVE_INV': 3, + 'LCA_STEER_LOOSELY': 614 if lat_active else 0, + 'NEW_SIGNAL_7': 7, + 'LCA_STEER_LOOSELY_INV': -614 if lat_active else 0, + 'LCA_RATE_OF_CHANGE': 80 if lat_active else 251, # Steering rate - Stock LCA increased from 35 to 39 steppedly when steering request was overriden by openpilot that couldn't steer enough + 'LCA_STEER': msg_lca['LCA_STEER'], + 'NEW_SIGNAL_6': 15, + } + + # Apply any overrides from live testing config + if overrides: + for key, val in overrides.items(): + values[key] = val + + return packer.make_can_msg('LCA', 2, values) + +def create_pscm_message(packer, lat_active: bool, msg_pscm: dict, frame: int, spoof_pa_hands_on_wheel: bool): + values = { + 'PSCM_ANGLE_SENSOR': msg_pscm['PSCM_ANGLE_SENSOR'], + 'BIT_0': msg_pscm['BIT_0'], + 'HANDS_ON_STEERING_WHEEL_A': msg_pscm['HANDS_ON_STEERING_WHEEL_A'], + 'HANDS_ON_STEERING_WHEEL_B': msg_pscm['HANDS_ON_STEERING_WHEEL_B'], + 'BYTE_4': msg_pscm['BYTE_4'], + 'DRIVER_INPUT_DEVIATION': msg_pscm['DRIVER_INPUT_DEVIATION'], + 'BYTE_6': msg_pscm['BYTE_6'], + 'BYTE_7': msg_pscm['BYTE_7'], + } + + # Spoof hands on wheel when: + # - lat_active (openpilot is steering), OR + # - spoof_pa_hands_on_wheel (Pilot Assist is engaged AND toggle enabled) + if lat_active or spoof_pa_hands_on_wheel: + #values['DRIVER_INPUT_DEVIATION'] = -1 # Spoof hands on steering wheel + #values['DRIVER_INPUT_DEVIATION'] = 1 if frame % 2 == 0 else 0 + values['HANDS_ON_STEERING_WHEEL_B'] = 186 if frame % 2 == 0 else 154 # msg_pscm['HANDS_ON_STEERING_WHEEL_B'] + values['HANDS_ON_STEERING_WHEEL_A'] = 195 if frame % 2 == 0 else 249 # msg_pscm['HANDS_ON_STEERING_WHEEL_A'] + + return packer.make_can_msg('PSCM', 0, values) + +def create_lca_3_message(packer, lat_active: bool, apply_angle: float, msg_lca_3: dict, counter_value: int): + """ + Create LCA_3 message for Volvo CMA platform. + This message enables PSCM to accept LCA commands. + + Args: + packer: CAN packer instance + lat_active: Whether lateral control is active + apply_angle: Steering angle in degrees (used for direction indicator) + msg_lca_3: Dictionary containing LCA_3 message values + counter_value: Counter value to use (from pattern or stock) + """ + values = { + 'NEW_SIGNAL_3': 0 if lat_active else msg_lca_3['NEW_SIGNAL_3'], + 'LCA_ACCEPT_COMMANDS_RELATED': 15 if lat_active else msg_lca_3['LCA_ACCEPT_COMMANDS_RELATED'], + 'NEW_SIGNAL_2': 0 if lat_active else msg_lca_3['NEW_SIGNAL_2'], + 'NEW_SIGNAL_5': 30 if lat_active else msg_lca_3['NEW_SIGNAL_5'], + 'LCA_ACCEPT_COMMANDS_INV': 0 if lat_active else msg_lca_3['LCA_ACCEPT_COMMANDS_INV'], + 'NEW_SIGNAL_4': 3 if lat_active else msg_lca_3['NEW_SIGNAL_4'], + 'SPEED_A': msg_lca_3['SPEED_A'], + 'SPEED_B': msg_lca_3['SPEED_B'], + 'NEW_SIGNAL_8': 1 if lat_active else msg_lca_3['NEW_SIGNAL_8'], + 'NEW_SIGNAL_7': 3 if lat_active else msg_lca_3['NEW_SIGNAL_7'], + 'NEW_SIGNAL_9': msg_lca_3['NEW_SIGNAL_9'], + 'COUNTER_1': counter_value, + } + + return packer.make_can_msg('LCA_3', 2, values) + +def diff_dicts(a, b): + only_in_a = a.keys() - b.keys() + only_in_b = b.keys() - a.keys() + in_both = a.keys() & b.keys() + + changed = {k: (a[k], b[k]) for k in in_both if a[k] != b[k]} + + return { + "only_in_a": {k: a[k] for k in only_in_a}, + "only_in_b": {k: b[k] for k in only_in_b}, + "changed": changed, + } + +def create_lca_2_message(packer, lat_active: bool, msg_lca_2: dict, counter_1: int, counter_2: int): + """ + Create LCA_2 message to spoof PILOT_ASSIST_ENGAGED when openpilot is active. + + When lat_active=True, we set PILOT_ASSIST_ENGAGED=1 to make PSCM accept LCA commands, + even if the driver has disabled stock Pilot Assist. + + Args: + packer: CAN packer instance + lat_active: Whether lateral control is active + msg_lca_2: Dictionary containing LCA_2 message values from car + counter_1: Managed COUNTER_1 value (increments by +2 mod 16) + counter_2: Managed COUNTER_2 value (increments by +4 mod 16) + """ + #return packer.make_can_msg('LCA_2', 2, msg_lca_2) + #if not lat_active: + # return packer.make_can_msg('LCA_2', 2, msg_lca_2) + + #values = dict(msg_lca_2) + + values = { + 'BYTE_0': 24 if lat_active else msg_lca_2['BYTE_0'], # 24 always + 'COUNTER_1': msg_lca_2['COUNTER_1'], # Byte 1 Low Nibble [5:8] - 4-bit counter that increments by +2 (modulo 16) + 'PILOT_ASSIST_ENGAGED': 1 if lat_active else msg_lca_2['PILOT_ASSIST_ENGAGED'], # Byte 1 [4] + 'BYTE_1_BITFIELD_0': msg_lca_2['BYTE_1_BITFIELD_0'], + 'ESC_ACTUATING': msg_lca_2['ESC_ACTUATING'], + 'ESC_ELIGIBLE': msg_lca_2['ESC_ELIGIBLE'], + 'CHECKSUM_2': msg_lca_2['CHECKSUM_2'], # Checksum on bytes 0 and 1 + 'NEW_SIGNAL_2': 0 if lat_active else msg_lca_2['NEW_SIGNAL_2'], + 'COUNTER_2': msg_lca_2['COUNTER_2'], # Byte 5 Low Nibble - 4-bit counter that increments by +4 (modulo 16) + 'NEW_SIGNAL_3': 3 if lat_active else msg_lca_2['NEW_SIGNAL_3'], + 'BRAKE_PEDAL_PRESSED_B': msg_lca_2['BRAKE_PEDAL_PRESSED_B'], + 'BRAKE_PEDAL_PRESSED_A': msg_lca_2['BRAKE_PEDAL_PRESSED_A'], + 'CHECKSUM_1': msg_lca_2['CHECKSUM_1'], # Byte 6 is a checksum based on Bytes 1, 2, and 5 only + 'BYTE_7': 0 if lat_active else msg_lca_2['BYTE_7'], + } + + dat = packer.make_can_msg('LCA_2', 2, values) + + built_bytes = dat[1] # dat is (addr, bytes, bus) tuple - extract bytes + b0 = built_bytes[0] + b1 = built_bytes[1] + b2 = built_bytes[2] + b3 = built_bytes[3] + b4 = built_bytes[4] + b5 = built_bytes[5] + + values['CHECKSUM_1'] = checksum_lca_2_message(b0, b5) + + # Only validate when not active and message is valid (BYTE_0 should be 24, not 0) + if not lat_active: + #assert values['CHECKSUM_1'] == msg_lca_2['CHECKSUM_1'] + if values['CHECKSUM_1'] != msg_lca_2['CHECKSUM_1']: + carlog.warning("[volvocan.py] LCA_2 CHECKSUM mismatch") + print(f"b0={b0}, b1={b1}, b2={b2}, b5={b5}, calculated={values['CHECKSUM_1']}, expected={msg_lca_2['CHECKSUM_1']}") + #assert False + + # Checksum 2 - depends on bytes 0, 1, 3, and 4 + checksum_2 = checksum_2_0x69_message(b0, b1, b3, b4) + values['CHECKSUM_2'] = checksum_2 + if not lat_active: + if values['CHECKSUM_2'] != msg_lca_2['CHECKSUM_2']: + carlog.warning("[volvocan.py] LCA_2 CHECKSUM_2 mismatch") + print(f"b0={b0}, b1={b1}, b3={b3}, b4={b4}, calculated={values['CHECKSUM_2']}, expected={msg_lca_2['CHECKSUM_2']}") + #assert False + values['COUNTER_1'] = counter_1 + values['COUNTER_2'] = counter_2 + # Re-pack with updated counters to get correct bytes for checksum calculation + dat = packer.make_can_msg('LCA_2', 2, values) + built_bytes = dat[1] # dat is (addr, bytes, bus) tuple - extract bytes + b0 = built_bytes[0] + b1 = built_bytes[1] + b3 = built_bytes[3] + b4 = built_bytes[4] + b5 = built_bytes[5] + values['CHECKSUM_1'] = checksum_lca_2_message(b0, b5) + values['CHECKSUM_2'] = checksum_2_0x69_message(b0, b1, b3, b4) + return packer.make_can_msg('LCA_2', 2, values) + +def create_lca_5_message(packer, lat_active: bool, target_angle_deg: float, msg_lca_5: dict, counter: int, + overrides: dict | None = None): + """ + Create LCA_5 message (0x67) with angle-based steering control. + + Args: + packer: CAN packer instance + lat_active: Whether lateral control is active + target_angle_deg: Target steering angle in degrees (positive = left, negative = right) + msg_lca_5: Stock LCA_5 values from car + counter: Counter value (0-15, increments by 4) + overrides: Optional dict of signal overrides (keys are UPPERCASE DBC signal names) + + Returns: + CAN message for LCA_5 on bus 2 + """ + + # DBC defines LCA_5_STEER as 15-bit signed with scale 0.05596 deg/count + # Packer handles the encoding automatically - just pass the angle in degrees + + # Build values dictionary (wheel speeds and counter unchanged) + values = { + 'WHEEL_SPEED_1': msg_lca_5['WHEEL_SPEED_1'], + 'NEW_SIGNAL_4': msg_lca_5['NEW_SIGNAL_4'], + 'NEW_SIGNAL_1': msg_lca_5['NEW_SIGNAL_1'], + 'WHEEL_SPEED_2': msg_lca_5['WHEEL_SPEED_2'], + 'NEW_SIGNAL_5': msg_lca_5['NEW_SIGNAL_5'], + 'NEW_SIGNAL_2': msg_lca_5['NEW_SIGNAL_2'], + 'LCA_5_STEER': target_angle_deg if lat_active else msg_lca_5['LCA_5_STEER'], + 'COUNTER': counter, + } + + # Apply any overrides from live testing config + if overrides: + for key, val in overrides.items(): + values[key] = val + + dat = packer.make_can_msg('LCA_5', 2, values) + built_bytes = dat[1] # dat is (addr, bytes, bus) tuple - extract bytes + values['CHECKSUM'] = checksum_lca_5_message(built_bytes[0], built_bytes[1], built_bytes[3], built_bytes[4], built_bytes[5]) + return packer.make_can_msg('LCA_5', 2, values) + +def create_speed_message(packer, msg_speed: dict): + """ + Forward SPEED message (0x60) by copying all bytes. + + Args: + packer: CAN packer instance + msg_speed: Dictionary containing SPEED message values from car + """ + values = { + 'SPEED': msg_speed['SPEED'], + 'NEW_SIGNAL_1': msg_speed['NEW_SIGNAL_1'], + 'NEW_SIGNAL_2': msg_speed['NEW_SIGNAL_2'], + 'NEW_SIGNAL_3': msg_speed['NEW_SIGNAL_3'], + 'NEW_SIGNAL_4': msg_speed['NEW_SIGNAL_4'], + 'NEW_SIGNAL_5': msg_speed['NEW_SIGNAL_5'], + 'NEW_SIGNAL_6': msg_speed['NEW_SIGNAL_6'], + } + + return packer.make_can_msg('SPEED', 2, values) + +def create_speed_2_message(packer, msg_speed_2: dict): + """ + Forward SPEED_2 message (0x68) by copying all bytes. + + Args: + packer: CAN packer instance + msg_speed_2: Dictionary containing SPEED_2 message values from car + """ + values = { + 'WHEEL_SPEED_LEFT': msg_speed_2['WHEEL_SPEED_LEFT'], + 'WHEEL_SPEED_RIGHT': msg_speed_2['WHEEL_SPEED_RIGHT'], + 'NEW_SIGNAL_1': msg_speed_2['NEW_SIGNAL_1'], + 'NEW_SIGNAL_2': msg_speed_2['NEW_SIGNAL_2'], + 'NEW_SIGNAL_3': msg_speed_2['NEW_SIGNAL_3'], + 'NEW_SIGNAL_4': msg_speed_2['NEW_SIGNAL_4'], + 'COUNTER_1': msg_speed_2['COUNTER_1'], + 'COUNTER_2': msg_speed_2['COUNTER_2'], + } + + return packer.make_can_msg('SPEED_2', 2, values) + +def create_speed_3_message(packer, msg_speed_3: dict): + """ + Forward SPEED_3 message (0x60) by copying all bytes. + + Args: + packer: CAN packer instance + msg_speed_3: Dictionary containing SPEED_3 message values from car + """ + values = { + 'ALL_BYTES': msg_speed_3['ALL_BYTES'], + } + + return packer.make_can_msg('SPEED_3', 2, values) + +def create_0x1a_message(packer, msg_0x1a: dict): + """ + Forward 0x1A message by copying all bytes. + + Args: + packer: CAN packer instance + msg_0x1a: Dictionary containing 0x1A message values from car + """ + values = { + 'ALL_BYTES': msg_0x1a['ALL_BYTES'], + } + return packer.make_can_msg('NEW_MSG_1A', 2, values) + +def create_gear_position_message(packer, msg_gear_position: dict): + """ + Forward GEAR_POSITION message by copying all bytes. + + Args: + packer: CAN packer instance + msg_gear_position: Dictionary containing GEAR_POSITION message values from car + """ + values = dict(msg_gear_position) + values['GEAR_POSITION'] = msg_gear_position['GEAR_POSITION'] # 3 + return packer.make_can_msg('GEAR_POSITION', 2, values) + +def create_egsm_message(packer, msg_egsm: dict): + """ + Forward EGSM message by copying all bytes. + + Args: + packer: CAN packer instance + msg_egsm: Dictionary containing EGSM message values from car + """ + values = { + 'ALL_BYTES': msg_egsm['ALL_BYTES'], + } + return packer.make_can_msg('EGSM', 0, values) + +def create_pscm_related_message(packer, lat_active: bool, stock_lca_engaged: bool, msg_pscm_related: dict, sig1_counter: int): + # BO_ 23 PSCM_RELATED: 8 XXX + # SG_ CHECKSUM : 7|8@0+ (1,0) [0|255] "" XXX + # SG_ LCA_ENABLED_ECHO : 11|4@0+ (1,0) [0|15] "" XXX + # SG_ SIG1_BYTE_1_HI_NIBBLE : 15|4@0+ (1,0) [0|15] "" XXX + # SG_ SIG1_REPLICA_BYTE_2_LO_NIBLE : 19|4@0+ (1,0) [0|15] "" XXX + # SG_ NEW_SIGNAL_2 : 23|4@0+ (1,0) [0|15] "" XXX + # SG_ BYTE_3 : 31|8@0+ (1,0) [0|255] "" XXX + # SG_ BYTE_4_5 : 39|16@0+ (1,0) [0|65535] "" XXX + # SG_ BYTE_6 : 55|8@0+ (1,0) [0|255] "" XXX + # SG_ BYTE_7 : 63|8@0+ (1,0) [0|255] "" XXX + values = dict(msg_pscm_related) + + # Update SIG1 counter (same value in both locations for redundancy) + values['SIG1_BYTE_1_HI_NIBBLE'] = sig1_counter + values['SIG1_REPLICA_BYTE_2_LO_NIBLE'] = sig1_counter + + dat = packer.make_can_msg('PSCM_RELATED', 0, values) + built_bytes = dat[1] # dat is (addr, bytes, bus) tuple - extract bytes + b1 = built_bytes[1] + b2 = built_bytes[2] + b3 = built_bytes[3] + b4 = built_bytes[4] + b5 = built_bytes[5] + b6 = built_bytes[6] + b7 = built_bytes[7] + values['CHECKSUM_1'] = checksum_1_pscm_related_message(b1, b2) + values['CHECKSUM_2'] = checksum_2_pscm_related_message(b2) + #assert values['CHECKSUM_1'] == msg_pscm_related['CHECKSUM_1'] + #assert values['CHECKSUM_2'] == msg_pscm_related['CHECKSUM_2'] + if lat_active and not stock_lca_engaged: + values['LCA_ENABLED_ECHO'] = 0 + b1 = packer.make_can_msg('PSCM_RELATED', 0, values)[1][1] + values['CHECKSUM_1'] = checksum_1_pscm_related_message(b1, b2) + return packer.make_can_msg('PSCM_RELATED', 0, values) + +def create_lca_4_message(packer, lat_active: bool, msg_lca_4: dict, lca_4_steer: int, + overrides: dict | None = None): + """ + Create LCA_4 (0x90) message to maintain Pilot Assist state when openpilot is active. + + Critical: LCA_ENABLE (byte 1 bits 0-1) must be held at 3 (both bits=1) when lat_active. + When PA turns off, these bits start varying (become counters). We need to keep them + stable at 3 to fool PSCM into thinking PA is still on, allowing LCA commands to be accepted. + + Based on analysis from route_analysis/pilot_assist_off/BASELINE_FILTERED_FINDINGS.md: + - Message 0x090 byte 1 bits 0-1 are PA state signals + - During PA ON: bits are stable at 3 (binary 11) + - During PA OFF: bits start varying (counters) + - PSCM uses this to determine whether to accept LCA steering commands + + Args: + packer: CAN packer instance + lat_active: Whether lateral control is active + msg_lca_4: Dictionary containing LCA_4 message values from car + lca_4_steer: Pre-computed signed angle with hysteresis applied + overrides: Optional dict of signal overrides (keys are UPPERCASE DBC signal names) + + Returns: + CAN message for LCA_4 on bus 2 + """ + if not lat_active: + # When not active, just relay stock message unchanged + return packer.make_can_msg('LCA_4', 2, msg_lca_4) + + # When lat_active, force LCA_ENABLE to 3 (PA ON state) + values = { + 'BYTE_0': msg_lca_4['BYTE_0'], + 'LCA_ENABLE': 3, # Force bits 0-1 to 1 (value=3 means both bits set) + 'BYTE_1_FLAGS': msg_lca_4['BYTE_1_FLAGS'], + 'BYTE_1_NIBBLE_HI': msg_lca_4['BYTE_1_NIBBLE_HI'], + 'BYTE_2_3': msg_lca_4['BYTE_2_3'], + 'YAW_RATE': msg_lca_4['YAW_RATE'], + 'BYTE_6': msg_lca_4['BYTE_6'], + 'BYTE_7_NIBBLE_LO': msg_lca_4['BYTE_7_NIBBLE_LO'], + 'BYTE_7_NIBBLE_HI': msg_lca_4['BYTE_7_NIBBLE_HI'], + } + + # Apply any overrides from live testing config + if overrides: + for key, val in overrides.items(): + values[key] = val + + # TODO: Add checksum calculation when checksum function is implemented + # If message has a checksum signal, it would be calculated here like: + # values['CHECKSUM'] = checksum_lca_4_message(...) + + # TODO: Add checksum validation when not active (once checksum is known) + # if not lat_active and 'CHECKSUM' in msg_lca_4: + # if values['CHECKSUM'] != msg_lca_4['CHECKSUM']: + # carlog.warning("[volvocan.py] LCA_4 CHECKSUM mismatch") + + return packer.make_can_msg('LCA_4', 2, values) + +def create_lca_6_message(packer, lat_active: bool, msg_lca_6: dict, lca_6_steer: int, + overrides: dict | None = None): + + if not lat_active: + # When not active, just relay stock message unchanged + return packer.make_can_msg('LCA_6', 2, msg_lca_6) + + values = { + 'LCA_6_STEER': msg_lca_6['LCA_6_STEER'], + 'LCA_6_STEER_2': msg_lca_6['LCA_6_STEER_2'], + 'NEW_SIGNAL_1': msg_lca_6['NEW_SIGNAL_1'], + 'NEW_SIGNAL_2': msg_lca_6['NEW_SIGNAL_2'], + 'NEW_SIGNAL_3': msg_lca_6['NEW_SIGNAL_3'], + 'NEW_SIGNAL_4': msg_lca_6['NEW_SIGNAL_4'], + 'NEW_SIGNAL_5': msg_lca_6['NEW_SIGNAL_5'], + } + + # Apply any overrides from live testing config + if overrides: + for key, val in overrides.items(): + values[key] = val + + return packer.make_can_msg('LCA_6', 2, values) + +def create_lca_7_message(packer, lat_active: bool, msg_lca_7: dict, lca_7_steer: int, lca_7_delta_steer: int, + overrides: dict | None = None, steer_active: bool = False): + + if not lat_active: + # When not active, just relay stock message unchanged + return packer.make_can_msg('LCA_7', 2, msg_lca_7) + + values = { + 'LCA_7_STEER': msg_lca_7['LCA_7_STEER'], + 'LCA_7_DELTA_STEER': msg_lca_7['LCA_7_DELTA_STEER'], + 'NEW_SIGNAL_1': msg_lca_7['NEW_SIGNAL_1'], + 'NEW_SIGNAL_2': msg_lca_7['NEW_SIGNAL_2'], + 'NEW_SIGNAL_3': msg_lca_7['NEW_SIGNAL_3'], + 'NEW_SIGNAL_4': msg_lca_7['NEW_SIGNAL_4'], + } + + # Apply any overrides from live testing config + if overrides: + for key, val in overrides.items(): + values[key] = val + + return packer.make_can_msg('LCA_7', 2, values) + diff --git a/opendbc/dbc/volvo_cma.dbc b/opendbc/dbc/volvo_cma.dbc new file mode 100644 index 00000000000..662930de742 --- /dev/null +++ b/opendbc/dbc/volvo_cma.dbc @@ -0,0 +1,245 @@ +BO_ 21 DRIVER_INPUT: 8 XXX + SG_ BYTE_0 : 7|8@0+ (1,0) [0|255] "" XXX + SG_ BYTE_1 : 15|8@0+ (1,0) [0|255] "" XXX + SG_ BYTE_2 : 16|8@1+ (1,0) [0|255] "" XXX + SG_ STEERING_DRIVER_RATE_OF_CHANGE : 31|8@0- (1,0) [0|255] "" XXX + SG_ BYTE_4 : 39|8@0+ (1,0) [0|255] "" XXX + SG_ BYTE_5 : 40|8@1+ (1,0) [0|255] "" XXX + SG_ STEERING_DRIVER_INPUT : 55|8@0- (1,1) [0|255] "" XXX + SG_ BYTE_7 : 63|8@0+ (1,0) [0|255] "" XXX + +BO_ 22 PSCM: 8 XXX + SG_ PSCM_ANGLE_SENSOR : 6|15@0- (0.05596,0) [-916|916] "º" XXX + SG_ BIT_0 : 7|1@0+ (1,0) [0|1] "" XXX + SG_ HANDS_ON_STEERING_WHEEL_A : 23|8@0+ (1,0) [0|255] "" XXX + SG_ HANDS_ON_STEERING_WHEEL_B : 31|8@0+ (1,0) [0|255] "" XXX + SG_ BYTE_4 : 39|8@0+ (1,0) [0|255] "" XXX + SG_ DRIVER_INPUT_DEVIATION : 47|8@0- (1,0) [-128|127] "" XXX + SG_ BYTE_6 : 55|8@0+ (1,0) [0|255] "" XXX + SG_ BYTE_7 : 63|8@0+ (1,0) [0|255] "" XXX + +BO_ 23 PSCM_RELATED: 8 XXX + SG_ CHECKSUM_1 : 7|8@0+ (1,0) [0|255] "" XXX + SG_ LCA_ENABLED_ECHO : 11|4@0+ (1,0) [0|15] "" XXX + SG_ SIG1_BYTE_1_HI_NIBBLE : 15|4@0+ (1,0) [0|15] "" XXX + SG_ SIG1_REPLICA_BYTE_2_LO_NIBLE : 19|4@0+ (1,0) [0|15] "" XXX + SG_ NEW_SIGNAL_2 : 23|4@0+ (1,0) [0|15] "" XXX + SG_ CHECKSUM_2 : 31|8@0+ (1,0) [0|255] "" XXX + SG_ BYTE_4 : 39|8@0+ (1,0) [0|255] "" XXX + SG_ BYTE_5 : 47|8@0+ (1,0) [0|255] "" XXX + SG_ BYTE_6 : 55|8@0+ (1,0) [0|255] "" XXX + SG_ BYTE_7 : 63|8@0+ (1,0) [0|255] "" XXX + +BO_ 26 NEW_MSG_1A: 8 XXX + SG_ NEW_SIGNAL_2 : 5|1@0+ (1,0) [0|1] "" XXX + SG_ NEW_SIGNAL_1 : 7|1@0+ (1,0) [0|1] "" XXX + +BO_ 38 NEW_MSG_26: 8 XXX + SG_ NEW_SIGNAL_1 : 5|4@0+ (1,0) [0|15] "" XXX + SG_ NEW_SIGNAL_2 : 15|8@0+ (1,0) [0|255] "" XXX + SG_ NEW_SIGNAL_4 : 35|12@0+ (1,0) [0|4095] "" XXX + SG_ NEW_SIGNAL_3 : 39|1@0+ (1,0) [0|1] "" XXX + SG_ NEW_SIGNAL_6 : 51|12@0+ (1,0) [0|4095] "" XXX + SG_ NEW_SIGNAL_5 : 55|1@0+ (1,0) [0|1] "" XXX + +BO_ 55 NEW_MSG_37: 8 XXX + SG_ ACCELERATOR_PEDAL_RATE_OF_CHANGE : 6|15@0+ (1,0) [0|32767] "" XXX + +BO_ 69 EGSM: 8 XXX + SG_ COUNTER_1 : 3|12@0+ (1,0) [0|4095] "" XXX + SG_ GEAR_LEVER_DBC_INCOHERENT : 5|2@0+ (1,0) [0|3] "" XXX + SG_ COUNTER_2 : 19|12@0+ (1,0) [0|4095] "" XXX + SG_ GEAR_1ST_RATCH : 20|1@0+ (1,0) [0|1] "" XXX + SG_ GEAR_RATCHED_UP : 21|1@0+ (1,0) [0|1] "" XXX + SG_ GEAR_RATCHED_DOWN : 22|1@0+ (1,0) [0|1] "" XXX + SG_ GEAR_PRESSED : 36|2@0+ (1,0) [0|3] "" XXX + SG_ PARKING_BRAKE_BUTTON : 38|1@0+ (1,0) [0|1] "" XXX + SG_ COUNTER_3 : 51|12@0+ (1,0) [0|4095] "" XXX + +BO_ 85 SAS: 8 XXX + SG_ SAS_ANGLE_SENSOR : 6|15@0- (0.05596,0) [0|32767] "º" XXX + SG_ NEW_SIGNAL_1 : 7|1@0+ (1,0) [0|1] "" XXX + SG_ SAS_INPUT_ACTIVITY : 21|6@0+ (1,0) [0|16383] "" XXX + SG_ NEW_SIGNAL_2 : 23|2@0+ (1,0) [0|3] "" XXX + SG_ SAS_RATE_OF_CHANGE : 31|8@0- (1,0) [0|255] "" XXX + SG_ SAS_CHECKSUM : 39|8@0+ (1,0) [0|4095] "" XXX + SG_ NEW_SIGNAL_4 : 43|20@0+ (1,0) [0|1048575] "" XXX + SG_ SAS_COUNTER : 44|4@1+ (1,0) [0|15] "" XXX + +BO_ 87 LCA_3: 8 XXX + SG_ NEW_SIGNAL_3 : 0|1@0+ (1,0) [0|1] "" XXX + SG_ LCA_ACCEPT_COMMANDS_RELATED : 4|4@0+ (1,0) [0|15] "" XXX + SG_ NEW_SIGNAL_2 : 7|3@0+ (1,0) [0|7] "" XXX + SG_ NEW_SIGNAL_5 : 12|5@0+ (1,0) [0|31] "" XXX + SG_ LCA_ACCEPT_COMMANDS_INV : 13|1@0+ (1,0) [0|1] "" XXX + SG_ NEW_SIGNAL_4 : 15|2@0+ (1,0) [0|3] "" XXX + SG_ SPEED_A : 23|16@0+ (1,0) [0|65535] "" XXX + SG_ SPEED_B : 39|16@0+ (1,0) [0|65535] "" XXX + SG_ NEW_SIGNAL_8 : 51|4@0+ (1,0) [0|15] "" XXX + SG_ COUNTER_1 : 53|2@0+ (1,0) [0|3] "" XXX + SG_ NEW_SIGNAL_7 : 55|2@0+ (1,0) [0|3] "" XXX + SG_ NEW_SIGNAL_9 : 63|8@0+ (1,0) [0|255] "" XXX + +BO_ 88 LCA: 8 XXX + SG_ NEW_SIGNAL_3 : 1|2@0+ (1,0) [0|3] "" XXX + SG_ NEW_SIGNAL_8 : 2|1@0+ (1,0) [0|1] "" XXX + SG_ LCA_ENABLE_INV : 3|1@0+ (1,0) [0|1] "" XXX + SG_ NEW_SIGNAL_2 : 5|2@0+ (1,0) [0|3] "" XXX + SG_ NEW_SIGNAL_1 : 7|2@0+ (1,0) [0|3] "" XXX + SG_ LCA_STEER_LOOSELY_1 : 15|8@0+ (1,0) [0|255] "" XXX + SG_ LCA_STEER_ACTIVE_INCOHERENT : 16|1@0+ (1,0) [0|1] "" XXX + SG_ LCA_STEER_ACTIVE : 18|2@0+ (1,0) [0|3] "" XXX + SG_ NEW_SIGNAL_7 : 21|3@0+ (1,0) [0|7] "" XXX + SG_ NEW_SIGNAL_9 : 23|2@0+ (1,0) [0|3] "" XXX + SG_ LCA_STEER_LOOSELY_2 : 31|8@0+ (1,0) [0|255] "" XXX + SG_ NEW_SIGNAL_4 : 39|8@0+ (1,0) [0|255] "" XXX + SG_ CURVE_RIGHT : 45|6@0+ (1,0) [0|63] "" XXX + SG_ NEW_SIGNAL_5 : 46|2@1+ (1,0) [0|3] "" XXX + SG_ LCA_STEER : 55|8@0+ (1,0) [0|255] "" XXX + SG_ NEW_SIGNAL_10 : 59|4@0+ (1,0) [0|15] "" XXX + SG_ NEW_SIGNAL_6 : 60|4@1+ (1,0) [0|15] "" XXX + +BO_ 96 SPEED_3: 8 XXX + SG_ NEW_SIGNAL_1 : 0|8@1+ (1,0) [0|255] "" XXX + SG_ SPEED_COUNTER : 15|8@0+ (1,0) [0|255] "" XXX + SG_ NEW_SIGNAL_3 : 23|8@0+ (1,0) [0|255] "" XXX + SG_ NEW_SIGNAL_5 : 24|1@0+ (1,0) [0|1] "" XXX + SG_ NEW_SIGNAL_2 : 27|3@0+ (1,0) [0|7] "" XXX + SG_ NEW_SIGNAL_4 : 31|4@0+ (1,0) [0|15] "" XXX + SG_ NEW_SIGNAL_8 : 34|3@0+ (1,0) [0|7] "" XXX + SG_ NEW_SIGNAL_6 : 35|1@0+ (1,0) [0|1] "" XXX + SG_ NEW_SIGNAL_7 : 39|4@0+ (1,0) [0|15] "" XXX + SG_ NEW_SIGNAL_9 : 40|8@1+ (1,0) [0|255] "" XXX + SG_ NEW_SIGNAL_10 : 55|8@0+ (1,0) [0|255] "" XXX + SG_ NEW_SIGNAL_11 : 56|8@1+ (1,0) [0|255] "" XXX + +BO_ 103 LCA_5: 8 XXX + SG_ WHEEL_SPEED_1 : 6|15@0+ (0.1,0) [0|255] "rpm" XXX + SG_ NEW_SIGNAL_4 : 7|1@0+ (1,0) [0|1] "" XXX + SG_ CHECKSUM : 23|8@0+ (1,0) [0|4095] "" XXX + SG_ NEW_SIGNAL_1 : 24|4@1+ (1,0) [0|15] "" XXX + SG_ COUNTER : 28|4@1+ (1,0) [0|15] "" XXX + SG_ WHEEL_SPEED_2 : 39|15@0+ (0.1,0) [0|32767] "rpm" XXX + SG_ NEW_SIGNAL_5 : 40|1@0+ (1,0) [0|1] "" XXX + SG_ LCA_TURN_BITS : 55|8@0+ (1,0) [0|255] "" XXX + SG_ LCA_5_STEER : 63|8@0+ (1,0) [0|255] "" XXX + +BO_ 104 SPEED_2: 8 XXX + SG_ WHEEL_SPEED_3 : 6|15@0+ (0.1,0) [0|32767] "rpm" XXX + SG_ WHEEL_SPEED_4 : 39|15@0+ (0.1,0) [0|32767] "rpm" XXX + SG_ NEW_SIGNAL_2 : 51|4@0+ (1,0) [0|15] "" XXX + SG_ NEW_SIGNAL_3 : 54|1@0+ (1,0) [0|1] "" XXX + SG_ NEW_SIGNAL_1 : 56|8@1+ (1,0) [0|255] "" XXX + +BO_ 105 LCA_2: 8 XXX + SG_ BYTE_0 : 7|8@0+ (1,0) [0|2047] "" XXX + SG_ COUNTER_1 : 11|4@0+ (1,0) [0|4095] "" XXX + SG_ PILOT_ASSIST_ENGAGED : 12|1@0+ (1,0) [0|1] "" XXX + SG_ BYTE_1_MSBS_3 : 15|3@0+ (1,0) [0|7] "" XXX + SG_ CHECKSUM_2 : 23|8@0+ (1,0) [0|255] "" XXX + SG_ NEW_SIGNAL_2 : 31|16@0+ (1,0) [0|65535] "" XXX + SG_ COUNTER_2 : 43|4@0+ (1,0) [0|4095] "" XXX + SG_ NEW_SIGNAL_3 : 45|2@0+ (1,0) [0|3] "" XXX + SG_ BRAKE_PEDAL_PRESSED_B : 46|1@0+ (1,0) [0|1] "" XXX + SG_ BRAKE_PEDAL_PRESSED_A : 47|1@0+ (-1,1) [0|1] "" XXX + SG_ CHECKSUM_1 : 55|8@0+ (1,0) [0|255] "" XXX + SG_ BYTE_7 : 63|8@0+ (1,0) [0|255] "" XXX + +BO_ 112 BUS1_SPEED: 8 XXX + SG_ BUS1_SPEED : 23|16@0+ (0.01886,0) [0|65535] "m/s" XXX + +BO_ 128 GEAR_POSITION: 8 XXX + SG_ NEW_SIGNAL_7 : 3|4@0+ (1,0) [0|15] "" XXX + SG_ NEW_SIGNAL_6 : 7|3@0+ (1,0) [0|7] "" XXX + SG_ NEW_SIGNAL_8 : 12|4@1+ (1,0) [0|15] "" XXX + SG_ NEW_SIGNAL_1 : 43|4@0+ (1,0) [0|15] "" XXX + SG_ NEW_SIGNAL_3 : 47|1@0+ (1,0) [0|1] "" XXX + SG_ NEW_SIGNAL_2 : 48|4@1+ (1,0) [0|15] "" XXX + SG_ NEW_SIGNAL_4 : 55|1@0+ (1,0) [0|1] "" XXX + SG_ GEAR_POSITION : 57|2@0+ (1,0) [0|3] "" XXX + SG_ NEW_SIGNAL_5 : 63|1@0+ (1,0) [0|1] "" XXX + +BO_ 144 LCA_4: 8 XXX + SG_ BYTE_0 : 7|8@0+ (1,0) [0|16383] "" XXX + SG_ LCA_ENABLE : 9|2@0+ (1,0) [0|3] "" XXX + SG_ BYTE_1_FLAGS : 11|2@0+ (1,0) [0|3] "" XXX + SG_ BYTE_1_NIBBLE_HI : 15|4@0+ (1,0) [0|63] "" XXX + SG_ BYTE_2_3 : 23|16@0- (1,0) [0|65535] "" XXX + SG_ YAW_RATE : 39|16@0- (1,0) [0|65535] "" XXX + SG_ BYTE_6 : 55|8@0+ (1,0) [0|255] "" XXX + SG_ BYTE_7_NIBBLE_LO : 59|4@0+ (1,0) [0|15] "" XXX + SG_ BYTE_7_NIBBLE_HI : 60|4@1+ (1,0) [0|15] "" XXX + +BO_ 146 NEW_MSG_92: 8 XXX + SG_ NEW_SIGNAL_1 : 7|8@0+ (1,0) [0|255] "" XXX + SG_ NEW_SIGNAL_2 : 12|4@1+ (1,0) [0|15] "" XXX + SG_ NEW_SIGNAL_3 : 23|8@0+ (1,0) [0|255] "" XXX + SG_ NEW_SIGNAL_4 : 25|7@1+ (1,0) [0|127] "" XXX + SG_ NEW_SIGNAL_5 : 38|7@0+ (1,0) [0|127] "" XXX + SG_ NEW_SIGNAL_6 : 40|7@1+ (1,0) [0|127] "" XXX + SG_ NEW_SIGNAL_7 : 48|1@0+ (1,0) [0|1] "" XXX + SG_ NEW_SIGNAL_8 : 49|3@1+ (1,0) [0|7] "" XXX + SG_ NEW_SIGNAL_9 : 57|7@1+ (1,0) [0|127] "" XXX + +BO_ 147 NEW_MSG_93: 8 XXX + SG_ NEW_SIGNAL_1 : 38|4@0+ (1,0) [0|15] "" XXX + SG_ NEW_SIGNAL_2 : 47|8@0+ (1,0) [0|255] "" XXX + SG_ NEW_SIGNAL_4 : 52|1@0+ (1,0) [0|1] "" XXX + SG_ NEW_SIGNAL_3 : 55|1@0+ (1,0) [0|1] "" XXX + +BO_ 151 LCA_SUSPECT: 8 XXX + SG_ NEW_SIGNAL_1 : 7|8@0+ (1,0) [0|255] "" XXX + SG_ NEW_SIGNAL_2 : 8|8@1+ (1,0) [0|255] "" XXX + SG_ NEW_SIGNAL_3 : 23|8@0+ (1,0) [0|255] "" XXX + SG_ NEW_SIGNAL_6 : 25|2@0+ (1,0) [0|3] "" XXX + SG_ NEW_SIGNAL_5 : 26|1@0+ (1,0) [0|1] "" XXX + SG_ NEW_SIGNAL_4 : 27|5@1+ (1,0) [0|31] "" XXX + SG_ NEW_SIGNAL_7 : 39|8@0+ (1,0) [0|255] "" XXX + SG_ NEW_SIGNAL_9 : 43|4@0+ (1,0) [0|15] "" XXX + SG_ NEW_SIGNAL_8 : 44|4@1+ (1,0) [0|15] "" XXX + SG_ NEW_SIGNAL_10 : 48|8@1+ (1,0) [0|255] "" XXX + SG_ NEW_SIGNAL_12 : 56|1@0+ (1,0) [0|1] "" XXX + SG_ NEW_SIGNAL_11 : 63|7@0+ (1,0) [0|127] "" XXX + +BO_ 336 NEW_MSG_150: 8 XXX + SG_ IGN_DRAFT : 5|2@0+ (1,0) [0|3] "" XXX + +BO_ 341 NEW_MSG_155: 8 XXX + SG_ NEW_SIGNAL_1 : 23|8@0+ (1,0) [0|255] "" XXX + +BO_ 592 ECM_1: 8 XXX + SG_ ACCELERATOR_PEDAL_POS : 31|8@0+ (1,0) [0|255] "" XXX + +BO_ 773 NEW_MSG_305: 8 XXX + SG_ NEW_SIGNAL_1 : 23|8@0+ (1,0) [0|255] "" XXX + +BO_ 778 NEW_MSG_30A: 8 XXX + SG_ NEW_SIGNAL_1 : 15|8@0+ (1,0) [0|255] "" XXX + +BO_ 832 BUS1_CRUISE_CONTROL: 8 XXX + SG_ CRUISE_CONTROL_ENABLED : 56|1@0+ (1,0) [0|1] "" XXX + SG_ CRUISE_CONTROL_ENABLED_IDLE_TRAFFIC : 57|1@0+ (1,0) [0|1] "" XXX + +BO_ 896 NEW_MSG_380: 8 XXX + SG_ NEW_SIGNAL_1 : 23|8@0+ (1,0) [0|255] "" XXX + +BO_ 1336 NEW_MSG_538: 8 XXX + SG_ SWM_MULTIMEDIA_ACTIVITY : 22|1@0+ (1,0) [0|1] "" XXX + SG_ NEW_SIGNAL_1 : 23|1@0+ (1,0) [0|1] "" XXX + SG_ NEW_SIGNAL_3 : 24|1@0+ (1,0) [0|1] "" XXX + SG_ NEW_SIGNAL_2 : 29|1@0+ (1,0) [0|1] "" XXX + +CM_ BO_ 23 "Might be related to PSCM 0x16"; +CM_ SG_ 87 LCA_ACCEPT_COMMANDS_RELATED "Goes to 15 when actively operating LCA"; +CM_ SG_ 87 LCA_ACCEPT_COMMANDS_INV "Goes to 0 when PSCM allowed to receive LCA commands"; +CM_ SG_ 87 NEW_SIGNAL_9 "NEW_SIGNAL_9 appears to be similar to LCA_5_STEER, but different scale, and zero-point is at 128. I haven't seen what happens once LCA_TURN_BITS wrap"; +CM_ SG_ 88 LCA_ENABLE_INV "Master enable, active-low"; +CM_ SG_ 88 CURVE_RIGHT "Only appears to be HIGH on curve right, LOW curve left"; +CM_ SG_ 88 LCA_STEER "Seems torque-based, signed, follows the road curvature"; +CM_ SG_ 103 WHEEL_SPEED_1 "Possible Front Left (FL)"; +CM_ SG_ 103 WHEEL_SPEED_2 "Possible Front Right (FR)"; +CM_ SG_ 103 LCA_TURN_BITS "Two-byte torque encoding (high byte). Left: 128->134 (increments), Right: 255->249 (decrements), Neutral: 186"; +CM_ SG_ 103 LCA_5_STEER "Two-byte torque encoding (low byte). Left: 0->255 (wraps at boundary), Right: 255->0 (wraps at boundary)"; +CM_ SG_ 104 WHEEL_SPEED_3 "Possible Rear Left (RR)"; +CM_ SG_ 104 WHEEL_SPEED_4 "Possibe Rear Right (RR)"; +CM_ SG_ 592 ACCELERATOR_PEDAL_POS "Full gas ~200; Idle ~20"; diff --git a/opendbc/dbc/volvo_front_1_cma.dbc b/opendbc/dbc/volvo_front_1_cma.dbc new file mode 100644 index 00000000000..1a0891e8f04 --- /dev/null +++ b/opendbc/dbc/volvo_front_1_cma.dbc @@ -0,0 +1,14 @@ +BO_ 55 NEW_MSG_37: 8 XXX + SG_ ACCELERATOR_PEDAL_RATE_OF_CHANGE : 6|15@0+ (1,0) [0|32767] "" XXX + +BO_ 112 BUS1_SPEED: 8 XXX + SG_ BUS1_SPEED : 23|16@0+ (0.01886,0) [0|65535] "m/s" XXX + +BO_ 592 ECM_1: 8 XXX + SG_ ACCELERATOR_PEDAL_POS : 31|8@0+ (1,0) [0|255] "" XXX + +BO_ 832 BUS1_CRUISE_CONTROL: 8 XXX + SG_ CRUISE_CONTROL_ENABLED : 56|1@0+ (1,0) [0|1] "" XXX + SG_ CRUISE_CONTROL_ENABLED_IDLE_TRAFFIC : 57|1@0+ (1,0) [0|1] "" XXX + +CM_ SG_ 592 ACCELERATOR_PEDAL_POS "Full gas ~200; Idle ~20"; diff --git a/opendbc/dbc/volvo_front_1_spa.dbc b/opendbc/dbc/volvo_front_1_spa.dbc new file mode 100644 index 00000000000..523c1edcc8b --- /dev/null +++ b/opendbc/dbc/volvo_front_1_spa.dbc @@ -0,0 +1,10 @@ +BO_ 37 ECM_1: 8 XXX + SG_ ACCELERATOR_PEDAL_POS : 6|15@0+ (0.00390625,0) [0|32767] "%" XXX + +BO_ 117 BUS1_SPEED: 8 XXX + SG_ BUS1_SPEED : 6|15@0+ (0.0044704,0) [0|32767] "" XXX + +BO_ 841 BUS1_CRUISE_CONTROL: 8 XXX + SG_ CRUISE_CONTROL_SPA_ENABLED : 1|1@0+ (-1,1) [0|1] "" XXX + +CM_ SG_ 117 BUS1_SPEED "m/s"; diff --git a/opendbc/dbc/volvo_mid_1.dbc b/opendbc/dbc/volvo_mid_1.dbc new file mode 100644 index 00000000000..1fb5c01162e --- /dev/null +++ b/opendbc/dbc/volvo_mid_1.dbc @@ -0,0 +1,188 @@ +BO_ 21 DRIVER_INPUT: 8 XXX + SG_ BYTE_0 : 7|8@0+ (1,0) [0|255] "" XXX + SG_ BYTE_1 : 15|8@0+ (1,0) [0|255] "" XXX + SG_ BYTE_2 : 16|8@1+ (1,0) [0|255] "" XXX + SG_ STEERING_DRIVER_RATE_OF_CHANGE : 31|8@0- (1,0) [0|255] "" XXX + SG_ BYTE_4 : 39|8@0+ (1,0) [0|255] "" XXX + SG_ BYTE_5 : 40|8@1+ (1,0) [0|255] "" XXX + SG_ STEERING_DRIVER_INPUT : 55|8@0- (1,1) [0|255] "" XXX + SG_ BYTE_7 : 63|8@0+ (1,0) [0|255] "" XXX + +BO_ 22 PSCM: 8 XXX + SG_ PSCM_ANGLE_SENSOR : 6|15@0- (0.05596,0) [-916|916] "º" XXX + SG_ BIT_0 : 7|1@0+ (1,0) [0|1] "" XXX + SG_ HANDS_ON_STEERING_WHEEL_A : 23|8@0+ (1,0) [0|255] "" XXX + SG_ HANDS_ON_STEERING_WHEEL_B : 31|8@0+ (1,0) [0|255] "" XXX + SG_ BYTE_4 : 39|8@0+ (1,0) [0|255] "" XXX + SG_ DRIVER_INPUT_DEVIATION : 47|8@0- (1,0) [-128|127] "" XXX + SG_ BYTE_6 : 55|8@0+ (1,0) [0|255] "" XXX + SG_ BYTE_7 : 63|8@0+ (1,0) [0|255] "" XXX + +BO_ 23 PSCM_RELATED: 8 XXX + SG_ CHECKSUM_1 : 7|8@0+ (1,0) [0|255] "" XXX + SG_ LCA_ENABLED_ECHO : 11|4@0+ (1,0) [0|15] "" XXX + SG_ SIG1_BYTE_1_HI_NIBBLE : 15|4@0+ (1,0) [0|15] "" XXX + SG_ SIG1_REPLICA_BYTE_2_LO_NIBLE : 19|4@0+ (1,0) [0|15] "" XXX + SG_ NEW_SIGNAL_2 : 23|4@0+ (1,0) [0|15] "" XXX + SG_ CHECKSUM_2 : 31|8@0+ (1,0) [0|255] "" XXX + SG_ BYTE_4_5 : 39|16@0+ (1,0) [0|65535] "" XXX + SG_ BYTE_6 : 55|8@0+ (1,0) [0|255] "" XXX + SG_ BYTE_7 : 63|8@0+ (1,0) [0|255] "" XXX + +BO_ 69 EGSM: 8 XXX + SG_ COUNTER_1 : 3|12@0+ (1,0) [0|4095] "" XXX + SG_ GEAR_LEVER_DBC_INCOHERENT : 5|2@0+ (1,0) [0|3] "" XXX + SG_ COUNTER_2 : 19|12@0+ (1,0) [0|4095] "" XXX + SG_ GEAR_1ST_RATCH : 20|1@0+ (1,0) [0|1] "" XXX + SG_ GEAR_RATCHED_UP : 21|1@0+ (1,0) [0|1] "" XXX + SG_ GEAR_RATCHED_DOWN : 22|1@0+ (1,0) [0|1] "" XXX + SG_ GEAR_PRESSED : 36|2@0+ (1,0) [0|3] "" XXX + SG_ PARKING_BRAKE_BUTTON : 38|1@0+ (1,0) [0|1] "" XXX + SG_ COUNTER_3 : 51|12@0+ (1,0) [0|4095] "" XXX + +BO_ 85 SAS: 8 XXX + SG_ SAS_ANGLE_SENSOR : 6|15@0- (0.05596,0) [0|32767] "º" XXX + SG_ SAS_RATE_OF_CHANGE : 21|14@0- (1,0) [0|16383] "" XXX + SG_ SAS_CHECKSUM : 39|8@0+ (1,0) [0|4095] "" XXX + SG_ SAS_COUNTER : 44|4@1+ (1,0) [0|15] "" XXX + +BO_ 87 LCA_3: 8 XXX + SG_ NEW_SIGNAL_3 : 0|1@0+ (1,0) [0|1] "" XXX + SG_ LCA_ACCEPT_COMMANDS_RELATED : 4|4@0+ (1,0) [0|15] "" XXX + SG_ NEW_SIGNAL_2 : 7|3@0+ (1,0) [0|7] "" XXX + SG_ NEW_SIGNAL_5 : 12|5@0+ (1,0) [0|31] "" XXX + SG_ LCA_ACCEPT_COMMANDS_INV : 13|1@0+ (1,0) [0|1] "" XXX + SG_ NEW_SIGNAL_4 : 15|2@0+ (1,0) [0|3] "" XXX + SG_ SPEED_A : 23|16@0+ (1,0) [0|65535] "" XXX + SG_ SPEED_B : 39|16@0+ (1,0) [0|65535] "" XXX + SG_ NEW_SIGNAL_8 : 51|4@0+ (1,0) [0|15] "" XXX + SG_ COUNTER_1 : 53|2@0+ (1,0) [0|3] "" XXX + SG_ NEW_SIGNAL_7 : 55|2@0+ (1,0) [0|3] "" XXX + SG_ NEW_SIGNAL_9 : 63|8@0+ (1,0) [0|255] "" XXX + +BO_ 88 LCA: 8 XXX + SG_ LCA_STEER_LOOSELY : 2|11@0- (1,0) [0|2047] "" XXX + SG_ LCA_ENABLE_INV : 3|1@0+ (1,0) [0|1] "" XXX + SG_ LANE_KEEP_ACTIVE_INV : 7|2@0+ (1,0) [0|3] "" XXX + SG_ LCA_STEER_LOOSELY_INV : 18|11@0- (1,0) [0|2047] "" XXX + SG_ NEW_SIGNAL_7 : 21|3@0+ (1,0) [0|7] "" XXX + SG_ LCA_RATE_OF_CHANGE : 39|8@0+ (1,0) [0|255] "" XXX + SG_ LCA_STEER : 45|14@0- (1,0) [0|16383] "" XXX + SG_ NEW_SIGNAL_1 : 47|2@0+ (1,0) [0|3] "" XXX + SG_ NEW_SIGNAL_6 : 60|4@1+ (1,0) [0|15] "" XXX + +BO_ 96 SPEED: 8 XXX + SG_ SPEED : 6|15@0+ (1,0) [0|32767] "" XXX + SG_ NEW_SIGNAL_1 : 7|1@0+ (1,0) [0|1] "" XXX + SG_ NEW_SIGNAL_2 : 23|12@0+ (1,0) [0|4095] "" XXX + SG_ NEW_SIGNAL_4 : 24|1@0+ (1,0) [0|1] "" XXX + SG_ NEW_SIGNAL_3 : 27|3@0+ (1,0) [0|7] "" XXX + SG_ NEW_SIGNAL_6 : 35|1@0+ (1,0) [0|1] "" XXX + SG_ NEW_SIGNAL_5 : 36|1@0+ (1,0) [0|1] "" XXX + +BO_ 103 LCA_5: 8 XXX + SG_ WHEEL_SPEED_1 : 6|15@0+ (0.1,0) [0|255] "rpm" XXX + SG_ NEW_SIGNAL_4 : 7|1@0+ (1,0) [0|1] "" XXX + SG_ CHECKSUM : 23|8@0+ (1,0) [0|4095] "" XXX + SG_ NEW_SIGNAL_1 : 24|4@1+ (1,0) [0|15] "" XXX + SG_ COUNTER : 28|4@1+ (1,0) [0|15] "" XXX + SG_ WHEEL_SPEED_2 : 39|15@0+ (0.1,0) [0|32767] "rpm" XXX + SG_ NEW_SIGNAL_5 : 40|1@0+ (1,0) [0|1] "" XXX + SG_ LCA_5_STEER : 54|15@0- (0.05596,0) [0|32767] "deg" XXX + SG_ NEW_SIGNAL_2 : 55|1@0+ (1,0) [0|1] "" XXX + +BO_ 104 SPEED_2: 8 XXX + SG_ WHEEL_SPEED_LEFT : 6|15@0+ (1,0) [0|32767] "" XXX + SG_ NEW_SIGNAL_1 : 7|1@0+ (1,0) [0|1] "" XXX + SG_ NEW_SIGNAL_2 : 23|12@0+ (1,0) [0|4095] "" XXX + SG_ NEW_SIGNAL_3 : 27|4@0+ (1,0) [0|15] "" XXX + SG_ WHEEL_SPEED_RIGHT : 39|15@0+ (1,0) [0|32767] "" XXX + SG_ COUNTER_1 : 51|12@0+ (1,0) [0|4095] "" XXX + SG_ NEW_SIGNAL_4 : 53|1@0+ (1,0) [0|1] "" XXX + SG_ COUNTER_2 : 54|1@0+ (1,0) [0|1] "" XXX + +BO_ 105 LCA_2: 8 XXX + SG_ BYTE_0 : 7|8@0+ (1,0) [0|2047] "" XXX + SG_ COUNTER_1 : 11|4@0+ (1,0) [0|4095] "" XXX + SG_ PILOT_ASSIST_ENGAGED : 12|1@0+ (1,0) [0|1] "" XXX + SG_ ESC_ACTUATING : 13|1@0+ (1,0) [0|1] "" XXX + SG_ ESC_ELIGIBLE : 14|1@0+ (1,0) [0|1] "" XXX + SG_ BYTE_1_BITFIELD_0 : 15|1@0+ (1,0) [0|7] "" XXX + SG_ CHECKSUM_2 : 23|8@0+ (1,0) [0|255] "" XXX + SG_ NEW_SIGNAL_2 : 31|16@0+ (1,0) [0|65535] "" XXX + SG_ COUNTER_2 : 43|4@0+ (1,0) [0|4095] "" XXX + SG_ NEW_SIGNAL_3 : 45|2@0+ (1,0) [0|3] "" XXX + SG_ BRAKE_PEDAL_PRESSED_B : 46|1@0+ (1,0) [0|1] "" XXX + SG_ BRAKE_PEDAL_PRESSED_A : 47|1@0+ (-1,1) [0|1] "" XXX + SG_ CHECKSUM_1 : 55|8@0+ (1,0) [0|255] "" XXX + SG_ BYTE_7 : 63|8@0+ (1,0) [0|255] "" XXX + +BO_ 128 GEAR_POSITION: 8 XXX + SG_ NEW_SIGNAL_3 : 3|4@0+ (1,0) [0|15] "" XXX + SG_ NEW_SIGNAL_2 : 4|1@0+ (1,0) [0|1] "" XXX + SG_ NEW_SIGNAL_1 : 7|3@0+ (1,0) [0|7] "" XXX + SG_ NEW_SIGNAL_5 : 11|4@0+ (1,0) [0|15] "" XXX + SG_ NEW_SIGNAL_4 : 15|4@0+ (1,0) [0|15] "" XXX + SG_ NEW_SIGNAL_17 : 17|2@0+ (1,0) [0|3] "" XXX + SG_ AEB_A : 18|1@0+ (1,0) [0|1] "" XXX + SG_ NEW_SIGNAL_18 : 19|1@0+ (1,0) [0|1] "" XXX + SG_ AEB_B : 20|1@0+ (1,0) [0|1] "" XXX + SG_ NEW_SIGNAL_6 : 23|3@0+ (1,0) [0|255] "" XXX + SG_ NEW_SIGNAL_7 : 24|8@1+ (1,0) [0|255] "" XXX + SG_ NEW_SIGNAL_8 : 39|8@0+ (1,0) [0|255] "" XXX + SG_ NEW_SIGNAL_13 : 43|4@0+ (1,0) [0|15] "" XXX + SG_ NEW_SIGNAL_10 : 46|3@0+ (1,0) [0|7] "" XXX + SG_ NEW_SIGNAL_9 : 47|1@0+ (1,0) [0|1] "" XXX + SG_ NEW_SIGNAL_14 : 51|4@0+ (1,0) [0|15] "" XXX + SG_ NEW_SIGNAL_12 : 54|3@0+ (1,0) [0|7] "" XXX + SG_ NEW_SIGNAL_11 : 55|1@0+ (1,0) [0|1] "" XXX + SG_ GEAR_POSITION : 58|3@0+ (1,0) [0|7] "" XXX + SG_ NEW_SIGNAL_16 : 62|4@0+ (1,0) [0|15] "" XXX + SG_ NEW_SIGNAL_15 : 63|1@0+ (1,0) [0|1] "" XXX + +BO_ 144 LCA_4: 8 XXX + SG_ BYTE_0 : 7|8@0+ (1,0) [0|16383] "" XXX + SG_ LCA_ENABLE : 9|2@0+ (1,0) [0|3] "" XXX + SG_ BYTE_1_FLAGS : 11|2@0+ (1,0) [0|3] "" XXX + SG_ BYTE_1_NIBBLE_HI : 15|4@0+ (1,0) [0|63] "" XXX + SG_ BYTE_2_3 : 23|16@0- (1,0) [0|65535] "" XXX + SG_ YAW_RATE : 39|16@0- (1,0) [0|65535] "" XXX + SG_ BYTE_6 : 55|8@0+ (1,0) [0|255] "" XXX + SG_ BYTE_7_NIBBLE_LO : 59|4@0+ (1,0) [0|15] "" XXX + SG_ BYTE_7_NIBBLE_HI : 60|4@1+ (1,0) [0|15] "" XXX + +BO_ 146 LCA_7: 8 XXX + SG_ NEW_SIGNAL_1 : 7|12@0+ (1,0) [0|4095] "" XXX + SG_ NEW_SIGNAL_2 : 11|4@0+ (1,0) [0|15] "" XXX + SG_ LCA_7_STEER : 23|15@0- (1,0) [0|32767] "" XXX + SG_ NEW_SIGNAL_3 : 24|2@0+ (1,0) [0|3] "" XXX + SG_ LCA_7_DELTA_STEER : 38|15@0- (1,0) [0|32767] "" XXX + SG_ NEW_SIGNAL_4 : 55|16@0+ (1,0) [0|65535] "" XXX + +BO_ 151 LCA_6: 8 XXX + SG_ LCA_6_STEER : 7|16@0- (1,0) [0|65535] "" XXX + SG_ NEW_SIGNAL_1 : 23|14@0- (1,0) [0|16383] "" XXX + SG_ NEW_SIGNAL_3 : 25|2@0+ (1,0) [0|3] "" XXX + SG_ NEW_SIGNAL_2 : 39|12@0+ (1,0) [0|4095] "" XXX + SG_ NEW_SIGNAL_4 : 43|4@0+ (1,0) [0|15] "" XXX + SG_ LCA_6_STEER_2 : 55|15@0- (1,0) [0|32767] "" XXX + SG_ NEW_SIGNAL_5 : 56|1@0+ (1,0) [0|1] "" XXX + +BO_ 336 NEW_MSG_150: 8 XXX + SG_ IGN_DRAFT : 5|2@0+ (1,0) [0|3] "" XXX + +BO_ 1336 NEW_MSG_538: 8 XXX + SG_ SWM_MULTIMEDIA_ACTIVITY : 22|1@0+ (1,0) [0|1] "" XXX + SG_ NEW_SIGNAL_1 : 23|1@0+ (1,0) [0|1] "" XXX + SG_ NEW_SIGNAL_3 : 24|1@0+ (1,0) [0|1] "" XXX + SG_ NEW_SIGNAL_2 : 29|1@0+ (1,0) [0|1] "" XXX + +CM_ BO_ 23 "Might be related to PSCM 0x16"; +CM_ SG_ 87 LCA_ACCEPT_COMMANDS_RELATED "Goes to 15 when actively operating LCA"; +CM_ SG_ 87 LCA_ACCEPT_COMMANDS_INV "Goes to 0 when PSCM allowed to receive LCA commands"; +CM_ SG_ 88 LCA_ENABLE_INV "Master enable, active-low"; +CM_ SG_ 103 WHEEL_SPEED_1 "Possible Front Left (FL)"; +CM_ SG_ 103 WHEEL_SPEED_2 "Possible Front Right (FR)"; +CM_ SG_ 105 ESC_ACTUATING "Goes to 1 in combination with ESC_ELIGIBLE when ESC is actively actuating"; +CM_ SG_ 105 ESC_ELIGIBLE "Goes to 1 on e.g. speed bump, but doesn't trigger any intervention"; +VAL_ 128 GEAR_POSITION 0 "Park" 1 "Reverse" 2 "Neutral" 3 "Drive" 4 "B-Mode"; diff --git a/opendbc/safety/declarations.h b/opendbc/safety/declarations.h index 1a68549445b..06db7ee258b 100644 --- a/opendbc/safety/declarations.h +++ b/opendbc/safety/declarations.h @@ -34,6 +34,7 @@ #define SAFETY_PSA 31U #define SAFETY_RIVIAN 33U #define SAFETY_VOLKSWAGEN_MEB 34U +#define SAFETY_VOLVO 35U #define GET_BIT(msg, b) ((bool)!!(((msg)->data[((b) / 8U)] >> ((b) % 8U)) & 0x1U)) #define GET_FLAG(value, mask) (((value) & (mask)) == (mask)) @@ -343,3 +344,4 @@ extern const safety_hooks volkswagen_mqb_hooks; extern const safety_hooks volkswagen_pq_hooks; extern const safety_hooks rivian_hooks; extern const safety_hooks psa_hooks; +extern const safety_hooks volvo_hooks; diff --git a/opendbc/safety/modes/volvo.h b/opendbc/safety/modes/volvo.h new file mode 100644 index 00000000000..5696a560fb5 --- /dev/null +++ b/opendbc/safety/modes/volvo.h @@ -0,0 +1,262 @@ +#pragma once + +#include "opendbc/safety/declarations.h" + +// safetyParam: 0 = CMA (XC40 Recharge), 1 = SPA (S60 Recharge, Polestar 2) +#define VOLVO_FLAG_SPA 1U + +// Volvo CAN message addresses shared between CMA and SPA +#define VOLVO_LCA_STEER 0x58U // TX from VCU1 to PSCM, LCA steering command (0x58) +#define VOLVO_LCA_2 0x69U // RX from BCM, brake pedal, cruise state +#define VOLVO_SAS 0x55U // RX from SAS, steering angle sensor +#define VOLVO_PSCM 0x16U // RX from PSCM, driver steering input +#define VOLVO_GEAR_POSITION 0x80U // RX from transmission, gear position +#define VOLVO_DRIVER_INPUT 0x15U +#define VOLVO_LCA_3 0x57U // TX from VCU1 to PSCM +#define VOLVO_LCA_5 0x67U // TX LCA_5 message (formerly SPEED_1, contains wheel speeds and LCA signals) +#define VOLVO_SPEED 0x60U // RX/TX SPEED message +#define VOLVO_SPEED_2 0x68U // RX +#define VOLVO_0x1a 0x1aU // RX +#define VOLVO_EGSM 0x45U // RX from EGSM +#define VOLVO_PSCM_RELATED 0x17U // RX from PSCM, related messages +#define VOLVO_LCA_4 0x90U // TX LCA_4 message (PA status spoofing) +#define VOLVO_LCA_6 0x97U // TX LCA_6 message +#define VOLVO_LCA_7 0x92U // TX LCA_7 message + +// CMA-specific PT bus addresses +#define VOLVO_CMA_BUS1_SPEED 0x70U // RX vehicle speed +#define VOLVO_CMA_ECM_1 0x250U // RX accelerator pedal position +#define VOLVO_CMA_BUS1_CRUISE_CONTROL 0x340U // RX cruise control state + +// SPA-specific PT bus addresses +#define VOLVO_SPA_BUS1_SPEED 0x75U // RX vehicle speed +#define VOLVO_SPA_ECM_1 0x25U // RX accelerator pedal position +#define VOLVO_SPA_BUS1_CRUISE_CONTROL 0x349U // RX cruise control state + + +// CAN bus definitions for Volvo +// Using same naming as carstate.py for consistency: main, pt, party +#define VOLVO_MAIN_BUS 0U // Bus.main - VCU1 car side +#define VOLVO_PT_BUS 1U // Bus.pt - VCU1 ECM side (where ECM is) +#define VOLVO_PARTY_BUS 2U // Bus.party - VCU PSCM/BCM2 side (BCM2, SAS, EGSM, PSCM, where LCA is sent to) + +// Runtime addresses set by volvo_init based on safetyParam +static uint16_t volvo_bus1_speed_addr; +static uint16_t volvo_ecm_1_addr; +static uint16_t volvo_bus1_cruise_control_addr; + +static void volvo_rx_hook(const CANPacket_t *msg) { + // Basic vehicle state monitoring - very relaxed implementation + + // Main bus (bus 0) messages + if (msg->bus == VOLVO_MAIN_BUS) { + // Update brake pedal and cruise state from BCM2 + if (msg->addr == VOLVO_LCA_2) { + // DBC: SG_ BRAKE_PEDAL_PRESSED_A : 47|1@0+ (-1,1) - inverted in DBC, so we invert raw bit + // DBC: SG_ BRAKE_PEDAL_PRESSED_B : 46|1@0+ (1,0) - not inverted + //bool brake_a = !((msg->data[5] >> 7) & 1U); // Raw bit, active low (DBC inverts it) + bool brake_b = (msg->data[5] >> 6) & 1U; // Raw bit, active high + //brake_pressed = brake_a || brake_b; + brake_pressed = brake_b; + } + } + + // PT bus (bus 1) messages + if (msg->bus == VOLVO_PT_BUS) { + if (msg->addr == volvo_ecm_1_addr) { + if (volvo_ecm_1_addr == VOLVO_CMA_ECM_1) { + // CMA: SG_ ACCELERATOR_PEDAL_POS : 31|8@0+ (1,0) [0|255] + uint8_t gas_pedal_position = msg->data[3]; + gas_pressed = gas_pedal_position > 21; // 20 baseline + 1 tolerance + } else { + // SPA: SG_ ACCELERATOR_PEDAL_POS : 6|15@0+ (0.00390625,0) [0|32767] "%" + uint16_t gas_raw = ((msg->data[0] & 0x7FU) << 8) | msg->data[1]; + gas_pressed = (gas_raw * 0.00390625) > 1.0; // > 1% + } + } + + // Update vehicle speed from BUS1_SPEED + if (msg->addr == volvo_bus1_speed_addr) { + if (volvo_bus1_speed_addr == VOLVO_CMA_BUS1_SPEED) { + // CMA: SG_ BUS1_SPEED : 23|16@0+ (0.01886,0) [0|65535] "m/s" + uint16_t speed_raw = ((msg->data[2] & 0xFFU) << 8) | msg->data[3]; + vehicle_moving = (speed_raw * 0.01886) > 0.1; + UPDATE_VEHICLE_SPEED(speed_raw * 0.01886); + } else { + // SPA: SG_ BUS1_SPEED : 6|15@0+ (0.0044704,0) [0|32767] "m/s" + uint16_t speed_raw = ((msg->data[0] & 0x7FU) << 8) | msg->data[1]; + vehicle_moving = (speed_raw * 0.0044704) > 0.1; + UPDATE_VEHICLE_SPEED(speed_raw * 0.0044704); + } + } + + if (msg->addr == volvo_bus1_cruise_control_addr) { + bool cruise_enabled; + if (volvo_bus1_cruise_control_addr == VOLVO_CMA_BUS1_CRUISE_CONTROL) { + // CMA: SG_ CRUISE_CONTROL_ENABLED : 56|1@0+ and CRUISE_CONTROL_ENABLED_IDLE_TRAFFIC : 57|1@0+ + cruise_enabled = ((msg->data[7] & 1U) || (msg->data[7] & 2U)); + } else { + // SPA: SG_ CRUISE_CONTROL_SPA_ENABLED : 1|1@0+ (-1,1) — byte 0 bit 1, active low + cruise_enabled = !((msg->data[0] >> 1) & 1U); + } + pcm_cruise_check(cruise_enabled); + } + } + + // Party bus (bus 2) messages - BCM2, SAS, PSCM, EGSM + if (msg->bus == VOLVO_PARTY_BUS) { + + // Update steering angle from SAS - Deprecated: Use PSCM instead + /*if (msg->addr == VOLVO_SAS) { + // DBC: SG_ SAS_ANGLE_SENSOR : 6|15@0- (-0.05596,0) + // carstate.py uses SAS (not PSCM) for steering angle + // Bit position 6, 15 bits, signed, little endian + int angle_raw = ((msg->data[0] & 0x7FU) << 8) | msg->data[1]; + if (msg->data[0] & 0x80U) { + angle_raw = -angle_raw; + } + update_sample(&angle_meas, angle_raw); + }*/ + + // Update driver steering input from PSCM + if (msg->addr == VOLVO_PSCM) { + // DBC: SG_ DRIVER_INPUT_DEVIATION : 47|8@0- (1,0) + // carstate.py uses abs(DRIVER_INPUT_DEVIATION) for steering torque and pressed detection + // Bit position 47, 8 bits, signed + int driver_input = msg->data[5]; + update_sample(&torque_driver, driver_input); + // The following might not be right, probably needs to be re-made, tests don't catch any inconsistencies with CarState (no checks are made) + /*uint8_t byte0_masked = msg->data[0] & 0x7F; // keep only lower 7 bits + uint16_t combined = ((uint16_t)byte0_masked << 8) | msg->data[1]; + update_sample(&angle_meas, -(int16_t)combined); // openpilot excepts a right turn to be negative*/ + } + } +} + +static bool volvo_tx_hook(const CANPacket_t *msg) { + bool tx = true; + + // Very relaxed safety policy - only basic frame ID checks + if (msg->addr == VOLVO_LCA_STEER) { + // LCA message flows: VCU1 (main bus) -> PSCM (party bus) + // We're acting as VCU1, so we send LCA message to party bus (bus 2) + if (msg->bus != VOLVO_PARTY_BUS) { + tx = false; // Wrong bus + } + } + + if (msg->addr == VOLVO_PSCM) { + // PSCM message: we relay from party bus (bus 2) to main bus (bus 0) + // So we TX on main bus (bus 0) + if (msg->bus != VOLVO_MAIN_BUS) { + tx = false; // Wrong bus + } + } + + if (msg->addr == VOLVO_DRIVER_INPUT) { + // Driver input message: we relay from party bus (bus 2) to main bus (bus 0) + // So we TX on main bus (bus 0) + if (msg->bus != VOLVO_MAIN_BUS) { + tx = false; // Wrong bus + } + } + + if (msg->addr == VOLVO_SAS) { + // SAS message: we relay from party bus (bus 2) to main bus (bus 0) + // So we TX on main bus (bus 0) + if (msg->bus != VOLVO_MAIN_BUS) { + tx = false; // Wrong bus + } + } + + if (msg->addr == VOLVO_LCA_2) { + // LCA_2 -> PSCM + if (msg->bus != VOLVO_PARTY_BUS) { + tx = false; // Wrong bus + } + } + + return tx; +} + +static safety_config volvo_init(uint16_t param) { + bool spa = (param & VOLVO_FLAG_SPA); + + // Set PT bus addresses based on platform + volvo_bus1_speed_addr = spa ? VOLVO_SPA_BUS1_SPEED : VOLVO_CMA_BUS1_SPEED; + volvo_ecm_1_addr = spa ? VOLVO_SPA_ECM_1 : VOLVO_CMA_ECM_1; + volvo_bus1_cruise_control_addr = spa ? VOLVO_SPA_BUS1_CRUISE_CONTROL : VOLVO_CMA_BUS1_CRUISE_CONTROL; + + // Define allowed TX messages - very permissive + static const CanMsg VOLVO_TX_MSGS[] = { + {VOLVO_LCA_STEER, VOLVO_PARTY_BUS, 8, .check_relay = true}, // LCA steering command to party bus + {VOLVO_PSCM, VOLVO_MAIN_BUS, 8, .check_relay = true}, // PSCM message sent to main bus (relay from party bus) + {VOLVO_LCA_3, VOLVO_PARTY_BUS, 8, .check_relay = true}, // LCA_3 message sent to party bus + {VOLVO_LCA_2, VOLVO_PARTY_BUS, 8, .check_relay = true}, // LCA_2 message sent to party bus (spoof PILOT_ASSIST_ENGAGED for PSCM) + {VOLVO_LCA_4, VOLVO_PARTY_BUS, 8, .check_relay = true}, // LCA_4 message sent to party bus (spoof LCA_ENABLE for PA state) + {VOLVO_LCA_5, VOLVO_PARTY_BUS, 8, .check_relay = true}, // LCA_5 message sent to party bus (wheel speeds + LCA signals) + {VOLVO_LCA_6, VOLVO_PARTY_BUS, 8, .check_relay = true}, // LCA_6 message sent to party bus + {VOLVO_LCA_7, VOLVO_PARTY_BUS, 8, .check_relay = true}, // LCA_7 message sent to party bus + //{VOLVO_SPEED, VOLVO_PARTY_BUS, 8, .check_relay = true}, // SPEED message sent to main bus + //{VOLVO_SPEED_2, VOLVO_PARTY_BUS, 8, .check_relay = true}, // SPEED_2 message sent to main bus + //{VOLVO_0x1a, VOLVO_PARTY_BUS, 8, .check_relay = true}, // 0x1a message sent to main bus + //{VOLVO_GEAR_POSITION, VOLVO_PARTY_BUS, 8, .check_relay = true}, // GEAR_POSITION message sent from main to party bus + //{VOLVO_EGSM, VOLVO_MAIN_BUS, 8, .check_relay = true}, // EGSM message sent from party to main bus + {VOLVO_PSCM_RELATED, VOLVO_MAIN_BUS, 8, .check_relay = true}, // PSCM_RELATED message sent to party bus + }; + + // Define RX checks - PT bus addresses depend on CMA vs SPA + static RxCheck volvo_rx_checks_cma[] = { + {.msg = {{VOLVO_GEAR_POSITION, VOLVO_MAIN_BUS, 8, 40U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_CMA_BUS1_SPEED, VOLVO_PT_BUS, 8, 100U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_LCA_2, VOLVO_MAIN_BUS, 8, 50U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_LCA_4, VOLVO_MAIN_BUS, 8, 29U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_LCA_6, VOLVO_MAIN_BUS, 8, 25U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_LCA_7, VOLVO_MAIN_BUS, 8, 29U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_SAS, VOLVO_PARTY_BUS, 8, 100U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_PSCM, VOLVO_PARTY_BUS, 8, 100U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_DRIVER_INPUT, VOLVO_PARTY_BUS, 8, 100U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_CMA_ECM_1, VOLVO_PT_BUS, 8, 17U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_LCA_STEER, VOLVO_MAIN_BUS, 8, 100U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_CMA_BUS1_CRUISE_CONTROL, VOLVO_PT_BUS, 8, 10U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_LCA_3, VOLVO_MAIN_BUS, 8, 67U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_LCA_5, VOLVO_MAIN_BUS, 8, 50U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_SPEED, VOLVO_MAIN_BUS, 8, 50U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_SPEED_2, VOLVO_MAIN_BUS, 8, 50U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_EGSM, VOLVO_PARTY_BUS, 8, 100U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_PSCM_RELATED, VOLVO_PARTY_BUS, 8, 100U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + }; + + static RxCheck volvo_rx_checks_spa[] = { + {.msg = {{VOLVO_GEAR_POSITION, VOLVO_MAIN_BUS, 8, 40U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_SPA_BUS1_SPEED, VOLVO_PT_BUS, 8, 100U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_LCA_2, VOLVO_MAIN_BUS, 8, 50U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_LCA_4, VOLVO_MAIN_BUS, 8, 29U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_LCA_6, VOLVO_MAIN_BUS, 8, 25U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_LCA_7, VOLVO_MAIN_BUS, 8, 29U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_SAS, VOLVO_PARTY_BUS, 8, 100U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_PSCM, VOLVO_PARTY_BUS, 8, 100U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_DRIVER_INPUT, VOLVO_PARTY_BUS, 8, 100U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_SPA_ECM_1, VOLVO_PT_BUS, 8, 100U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_LCA_STEER, VOLVO_MAIN_BUS, 8, 100U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_SPA_BUS1_CRUISE_CONTROL, VOLVO_PT_BUS, 8, 10U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_LCA_3, VOLVO_MAIN_BUS, 8, 67U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_LCA_5, VOLVO_MAIN_BUS, 8, 50U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_SPEED, VOLVO_MAIN_BUS, 8, 50U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_SPEED_2, VOLVO_MAIN_BUS, 8, 50U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_EGSM, VOLVO_PARTY_BUS, 8, 100U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_PSCM_RELATED, VOLVO_PARTY_BUS, 8, 100U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + }; + + if (spa) { + return BUILD_SAFETY_CFG(volvo_rx_checks_spa, VOLVO_TX_MSGS); + } + return BUILD_SAFETY_CFG(volvo_rx_checks_cma, VOLVO_TX_MSGS); +} + +const safety_hooks volvo_hooks = { + .init = volvo_init, + .rx = volvo_rx_hook, + .tx = volvo_tx_hook, + // No custom fwd hook - stock LCA always blocked by .check_relay = true +}; diff --git a/opendbc/safety/safety.h b/opendbc/safety/safety.h index 6417881df12..e81a548c110 100644 --- a/opendbc/safety/safety.h +++ b/opendbc/safety/safety.h @@ -28,6 +28,7 @@ #include "opendbc/safety/modes/body.h" #include "opendbc/safety/modes/psa.h" #include "opendbc/safety/modes/hyundai_canfd.h" +#include "opendbc/safety/modes/volvo.h" uint32_t GET_BYTES(const CANPacket_t *msg, int start, int len) { uint32_t ret = 0U; @@ -404,6 +405,7 @@ int set_safety_hooks(uint16_t mode, uint16_t param) { {SAFETY_RIVIAN, &rivian_hooks}, {SAFETY_TESLA, &tesla_hooks}, {SAFETY_HYUNDAI_CANFD, &hyundai_canfd_hooks}, + {SAFETY_VOLVO, &volvo_hooks}, #ifdef ALLOW_DEBUG {SAFETY_CHRYSLER_CUSW, &chrysler_cusw_hooks}, {SAFETY_PSA, &psa_hooks}, From ddaf17c29836a665bc7f9acd13e2a0a79302fee8 Mon Sep 17 00:00:00 2001 From: ellie Date: Tue, 21 Apr 2026 15:46:04 -0700 Subject: [PATCH 225/229] Volvo: add panda safety tests for CMA and SPA Scaffolds opendbc/safety/tests/test_volvo.py with TestVolvoCMA (safetyParam=0) and TestVolvoSPA (safetyParam=VOLVO_FLAG_SPA) sharing the generic CarSafetyTest harness plus a Volvo-specific test_gas_threshold_self_consistent regression guard. Without this, the CMA-vs-SPA gas-threshold scale mismatch that appeared on a real Polestar 2 drive (ECM_1.ACCELERATOR_PEDAL_POS is raw 0-255 on CMA but DBC-scaled percent on SPA) was only detectable via test_models.py on recorded routes. Now a laptop-only pytest run catches it. Also adds the Volvo sibling-exception in common.py test_tx_hook_on_wrong_safety_mode, matching the existing Subaru/Toyota pattern: CMA and SPA share TX_MSGS (static in volvo_init), so a TX from one while running tests for the other is expected. 38 pass, 31 skipped locally. --- opendbc/safety/tests/common.py | 4 + opendbc/safety/tests/test_volvo.py | 193 +++++++++++++++++++++++++++++ 2 files changed, 197 insertions(+) create mode 100644 opendbc/safety/tests/test_volvo.py diff --git a/opendbc/safety/tests/common.py b/opendbc/safety/tests/common.py index 267736cfac6..70350492e0a 100644 --- a/opendbc/safety/tests/common.py +++ b/opendbc/safety/tests/common.py @@ -898,6 +898,10 @@ def test_tx_hook_on_wrong_safety_mode(self): continue if attr.startswith('TestSubaruPreglobal') and current_test.startswith('TestSubaruPreglobal'): continue + # Volvo CMA and SPA share the same TX_MSGS list (static in volvo_init); + # safetyParam only switches RX checks and gas/speed scaling, not TX. + if attr.startswith('TestVolvo') and current_test.startswith('TestVolvo'): + continue if {attr, current_test}.issubset({'TestVolkswagenPqSafety', 'TestVolkswagenPqStockSafety', 'TestVolkswagenPqLongSafety'}): continue if {attr, current_test}.issubset({'TestGmCameraSafety', 'TestGmCameraLongitudinalSafety', 'TestGmAscmSafety', diff --git a/opendbc/safety/tests/test_volvo.py b/opendbc/safety/tests/test_volvo.py new file mode 100644 index 00000000000..e7a165412e0 --- /dev/null +++ b/opendbc/safety/tests/test_volvo.py @@ -0,0 +1,193 @@ +#!/usr/bin/env python3 +""" +Safety tests for Volvo CMA/SPA. + +The safety mode lives at ``opendbc/safety/modes/volvo.h`` and is parameterised +by ``safetyParam``: + + - ``safetyParam == 0`` → CMA platform (Volvo XC40 Recharge) + - ``safetyParam == VOLVO_FLAG_SPA`` → SPA platform (Volvo S60 Recharge, + Polestar 2) + +The two platforms share LCA/PSCM/etc. addresses on the main and party buses +but use *different* PT-bus addresses and signal scales for ECM_1, BUS1_SPEED, +and BUS1_CRUISE_CONTROL. This test file exercises both platforms through the +same generic ``CarSafetyTest`` harness so that any future divergence between +``carstate.py`` and ``volvo.h`` — e.g. a threshold drifting out of sync — is +caught on a laptop instead of in the car. + +Companion to: ``opendbc/car/volvo/carstate.py`` (must agree on thresholds). +""" + +import unittest + +from opendbc.car.structs import CarParams +from opendbc.safety.tests.libsafety import libsafety_py +import opendbc.safety.tests.common as common +from opendbc.safety.tests.common import CANPackerSafety + + +# Must match VOLVO_FLAG_SPA in opendbc/safety/modes/volvo.h +VOLVO_FLAG_SPA = 1 + +# Bus layout (must match volvo.h) +VOLVO_MAIN_BUS = 0 +VOLVO_PT_BUS = 1 +VOLVO_PARTY_BUS = 2 + +# Shared platform-independent addresses +VOLVO_LCA_STEER = 0x58 +VOLVO_LCA_2 = 0x69 +VOLVO_LCA_3 = 0x57 +VOLVO_LCA_4 = 0x90 +VOLVO_LCA_5 = 0x67 +VOLVO_LCA_6 = 0x97 +VOLVO_LCA_7 = 0x92 +VOLVO_PSCM = 0x16 +VOLVO_PSCM_RELATED = 0x17 + +# Addresses panda TX'd with .check_relay = true, grouped by bus +_TX_PARTY_BUS_ADDRS = ( + VOLVO_LCA_STEER, VOLVO_LCA_2, VOLVO_LCA_3, VOLVO_LCA_4, + VOLVO_LCA_5, VOLVO_LCA_6, VOLVO_LCA_7, +) +_TX_MAIN_BUS_ADDRS = (VOLVO_PSCM, VOLVO_PSCM_RELATED) + + +class TestVolvoSafetyBase(common.CarSafetyTest): + """Shared RX/TX/relay tests for both CMA and SPA. + + Subclasses pin down the PT-bus DBC and per-platform gas/cruise encoding. + """ + + TX_MSGS = ( + [[a, VOLVO_PARTY_BUS] for a in _TX_PARTY_BUS_ADDRS] + + [[a, VOLVO_MAIN_BUS] for a in _TX_MAIN_BUS_ADDRS] + ) + RELAY_MALFUNCTION_ADDRS = { + VOLVO_PARTY_BUS: _TX_PARTY_BUS_ADDRS, + VOLVO_MAIN_BUS: _TX_MAIN_BUS_ADDRS, + } + # volvo.h installs no custom fwd hook, so the panda uses the default main<->party + # forwarding (bus 0 <-> bus 2). For each TX addr with .check_relay=true, the panda + # automatically refuses to forward from the bus where stock traffic lives TO the + # bus where openpilot is TX'ing — that's what keeps the stock ECU from fighting us. + FWD_BLACKLISTED_ADDRS = { + VOLVO_MAIN_BUS: list(_TX_PARTY_BUS_ADDRS), # stock on 0 must not forward to 2 + VOLVO_PARTY_BUS: list(_TX_MAIN_BUS_ADDRS), # stock on 2 must not forward to 0 + } + STANDSTILL_THRESHOLD = 0.1 # m/s, matches volvo.h + + # Subclasses set these + SAFETY_PARAM: int = 0 + PT_DBC: str = "" + + MID_DBC = "volvo_mid_1" + + @classmethod + def setUpClass(cls): + if cls.__name__ == "TestVolvoSafetyBase": + cls.safety = None + raise unittest.SkipTest + super().setUpClass() + + def setUp(self): + self.pt_packer = CANPackerSafety(self.PT_DBC) + self.mid_packer = CANPackerSafety(self.MID_DBC) + # CarSafetyTest.packer is referenced by a few generic tests; point it at + # the mid-bus DBC since most shared messages live there. + self.packer = self.mid_packer + self.safety = libsafety_py.libsafety + self.safety.set_safety_hooks(CarParams.SafetyModel.volvo, self.SAFETY_PARAM) + self.safety.init_tests() + + # ---- Abstract methods from CarSafetyTest ---- + + def _user_brake_msg(self, brake): + # volvo.h reads BRAKE_PEDAL_PRESSED_B (bit 46, factor 1, active high) + values = {"BRAKE_PEDAL_PRESSED_B": 1 if brake else 0} + return self.mid_packer.make_can_msg_safety("LCA_2", VOLVO_MAIN_BUS, values) + + def _speed_msg(self, speed): + # PT-bus BUS1_SPEED in m/s; DBC factor converts to/from raw bits per platform. + values = {"BUS1_SPEED": speed} + return self.pt_packer.make_can_msg_safety("BUS1_SPEED", VOLVO_PT_BUS, values) + + def _speed_msg_2(self, speed): + # Volvo's safety mode only consumes a single vehicle-speed source, so the + # generic rx_hook_speed_mismatch test doesn't apply. Returning None asks + # the harness to skip it (see common.CarSafetyTest.test_rx_hook_speed_mismatch). + return None + + # ---- Volvo-specific consistency tests ---- + + def test_gas_threshold_self_consistent(self): + """ + Sanity: the panda's gas_pressed edge is exactly where GAS_PRESSED_THRESHOLD + is defined. Regression guard for the CMA-vs-SPA scale mismatch bug where + carstate.py applied CMA thresholds (raw 0-255) to SPA's DBC-scaled percent. + If you change the threshold in volvo.h, update carstate.py AND this test. + """ + # Just below threshold → not pressed. Use a value strictly less than threshold. + just_below = max(self.GAS_PRESSED_THRESHOLD - 1, 0) + self._rx(self._user_gas_msg(just_below)) + self.assertFalse(self.safety.get_gas_pressed_prev(), + f"gas flagged at {just_below} (threshold={self.GAS_PRESSED_THRESHOLD})") + + # Just above threshold → pressed. + self._rx(self._user_gas_msg(self.GAS_PRESSED_THRESHOLD + 1)) + self.assertTrue(self.safety.get_gas_pressed_prev(), + f"gas not flagged above {self.GAS_PRESSED_THRESHOLD}") + + +class TestVolvoCMA(TestVolvoSafetyBase): + """ + Volvo CMA: XC40 Recharge. + + ECM_1.ACCELERATOR_PEDAL_POS is raw 0-255 (DBC factor 1). Idle is ~20; panda + fires gas_pressed above 21. carstate.py uses the same raw threshold. + """ + SAFETY_PARAM = 0 + PT_DBC = "volvo_front_1_cma" + GAS_PRESSED_THRESHOLD = 21 # raw counts + + def _user_gas_msg(self, gas): + values = {"ACCELERATOR_PEDAL_POS": gas} + return self.pt_packer.make_can_msg_safety("ECM_1", VOLVO_PT_BUS, values) + + def _pcm_status_msg(self, enable): + # CMA cruise is a pair of bools; either one being high enables cruise. + values = {"CRUISE_CONTROL_ENABLED": 1 if enable else 0, + "CRUISE_CONTROL_ENABLED_IDLE_TRAFFIC": 0} + return self.pt_packer.make_can_msg_safety( + "BUS1_CRUISE_CONTROL", VOLVO_PT_BUS, values) + + +class TestVolvoSPA(TestVolvoSafetyBase): + """ + Volvo SPA: S60 Recharge, Polestar 2. + + ECM_1.ACCELERATOR_PEDAL_POS is DBC-scaled to percent (factor 0.00390625, + range 0-100%). Idle is ~0; panda fires gas_pressed above 1.0%. + carstate.py MUST use the same percent-based threshold — see + opendbc/car/volvo/carstate.py. A mismatch here manifests in test_models.py + as persistent ``panda safety doesn't agree with openpilot: {'gasPressed': N}``. + """ + SAFETY_PARAM = VOLVO_FLAG_SPA + PT_DBC = "volvo_front_1_spa" + GAS_PRESSED_THRESHOLD = 1.0 # percent + + def _user_gas_msg(self, gas): + values = {"ACCELERATOR_PEDAL_POS": gas} + return self.pt_packer.make_can_msg_safety("ECM_1", VOLVO_PT_BUS, values) + + def _pcm_status_msg(self, enable): + # SPA cruise signal has DBC factor -1 offset 1, so the "enabled" DBC value + # is 1 (which encodes as raw bit 0 — panda inverts it). + values = {"CRUISE_CONTROL_SPA_ENABLED": 1 if enable else 0} + return self.pt_packer.make_can_msg_safety( + "BUS1_CRUISE_CONTROL", VOLVO_PT_BUS, values) + + +if __name__ == "__main__": + unittest.main() From 9158499f8c22681f2ef1b5a55d7fc69313334baa Mon Sep 17 00:00:00 2001 From: ellie Date: Tue, 21 Apr 2026 15:46:17 -0700 Subject: [PATCH 226/229] Volvo SPA: fix gasPressed threshold for DBC-scaled ECM_1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ECM_1.ACCELERATOR_PEDAL_POS on SPA is DBC-scaled to percent (factor 0.00390625, idle ~0%), but the existing check applied CMA's raw-count threshold (> 21) to both platforms. On a Polestar 2 (b7d9bddaf834065c/00000025--29eeffa499) this produced 545 frames of gasPressed disagreement per test_panda_safety_carstate run — openpilot's percent-scaled value never climbed above 21, so the pedal effectively read as released regardless of driver input. Branch on self.is_spa to use > 1.0% for SPA and keep the original raw > 21 for CMA. Values match volvo.h and are regression-guarded by test_volvo.py::test_gas_threshold_self_consistent. --- opendbc/car/volvo/carstate.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/opendbc/car/volvo/carstate.py b/opendbc/car/volvo/carstate.py index 52fb1ef48c3..29eaa56062c 100644 --- a/opendbc/car/volvo/carstate.py +++ b/opendbc/car/volvo/carstate.py @@ -46,7 +46,14 @@ def update(self, can_parsers) -> structs.CarState: ret.standstill = ret.vEgoRaw <= 0.1 # 0.1 m/s # gas - ret.gasPressed = cp_pt.vl["ECM_1"]["ACCELERATOR_PEDAL_POS"] > 20+1 # 20 baseline + 1 tolerance + # CMA ECM_1.ACCELERATOR_PEDAL_POS is raw 0-255 (DBC factor 1, idle ~20). + # SPA ECM_1.ACCELERATOR_PEDAL_POS is DBC-scaled to percent (factor 0.00390625, idle ~0). + # Thresholds must match volvo.h (see opendbc/safety/modes/volvo.h GAS_PRESSED_THRESHOLD_*) + # and opendbc/safety/tests/test_volvo.py::test_gas_threshold_self_consistent. + if self.is_spa: + ret.gasPressed = cp_pt.vl["ECM_1"]["ACCELERATOR_PEDAL_POS"] > 1.0 # percent + else: + ret.gasPressed = cp_pt.vl["ECM_1"]["ACCELERATOR_PEDAL_POS"] > 20+1 # raw counts, 20 baseline + 1 tolerance # brake #ret.brakePressed = bool(cp_main.vl["LCA_2"]["BRAKE_PEDAL_PRESSED_A"] or cp_main.vl["LCA_2"]["BRAKE_PEDAL_PRESSED_B"]) From 6993a4d6b641118eaef8cacd41f4cdc583a25f72 Mon Sep 17 00:00:00 2001 From: ellie Date: Tue, 21 Apr 2026 19:37:55 -0700 Subject: [PATCH 227/229] Volvo/Polestar: add to non_tested_cars until routes exist Adds VOLVO_XC40_RECHARGE, VOLVO_S60_RECHARGE, and POLESTAR_2 to non_tested_cars so the test suite skips them with SkipTest instead of raising "missing test route" errors. --- opendbc/car/tests/routes.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/opendbc/car/tests/routes.py b/opendbc/car/tests/routes.py index 2fe80c0f781..8c2d499dbdb 100644 --- a/opendbc/car/tests/routes.py +++ b/opendbc/car/tests/routes.py @@ -14,6 +14,7 @@ from opendbc.car.toyota.values import CAR as TOYOTA from opendbc.car.values import Platform from opendbc.car.volkswagen.values import CAR as VOLKSWAGEN +from opendbc.car.volvo.values import CAR as VOLVO from opendbc.car.body.values import CAR as COMMA from opendbc.car.psa.values import CAR as PSA @@ -34,6 +35,9 @@ TOYOTA.TOYOTA_COROLLA, TOYOTA.TOYOTA_RAV4H, + VOLVO.VOLVO_XC40_RECHARGE, + VOLVO.VOLVO_S60_RECHARGE, + VOLVO.POLESTAR_2, ] From d691e720d9c86906b4ca70f2dee2086e4b05ac43 Mon Sep 17 00:00:00 2001 From: ellie Date: Tue, 21 Apr 2026 20:04:39 -0700 Subject: [PATCH 228/229] =?UTF-8?q?Volvo:=20clamp=20commanded=20angle=20to?= =?UTF-8?q?=20actual=20=C2=B1=20ANGLE=5FERROR=20+=20rate=20limit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The carcontroller passed actuators.steeringAngleDeg straight to the EPS with no measurement clamp and no rate limit, leaving a TODO in place. Under a sustained driver override the model's planner sees the car drifting off-line and desiredCurvature grows unbounded — observed +6.5° desired vs -5° actual on Polestar 2 (11° gap). On release, the EPS slams toward that stale command and overshoots ~20°. Stock Volvo Pilot Assist keeps commanded-vs-actual inside ~2° even under 10+ count torque holds for 5+ seconds (measured across 9 PA-engaged segments on a reference dashcam route). Fix: - ANGLE_ERROR = 3.0° clamp against CS.out.steeringAngleDeg (analog of Ford's CURVATURE_ERROR). 3° leaves ~20% headroom over stock's observed worst case. - Wire apply_std_steer_angle_limits with the already-defined but unused ANGLE_LIMITS rate curves. - Both run before the live-testing override so test configs still bypass them. Sim of the observed override scenario: gap converges from -4.8° to +0.1° over 100ms instead of overshooting. See cschmittiey/openpilot#1 (rate limits), #2 (steeringPressed gating), #3 (VM jerk limits) for follow-ups. --- opendbc/car/volvo/carcontroller.py | 25 ++++++++++++++++++------- opendbc/car/volvo/values.py | 6 ++++++ 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/opendbc/car/volvo/carcontroller.py b/opendbc/car/volvo/carcontroller.py index 137e900a51c..0eb8fc913ce 100644 --- a/opendbc/car/volvo/carcontroller.py +++ b/opendbc/car/volvo/carcontroller.py @@ -1,6 +1,9 @@ +import numpy as np + from opendbc.can.packer import CANPacker from opendbc.car import Bus from opendbc.car.interfaces import CarControllerBase +from opendbc.car.lateral import apply_std_steer_angle_limits from opendbc.car.volvo.helpers import LCA3CounterSync from opendbc.car.volvo.live_testing import LiveTestingManager from opendbc.car.volvo.volvocan import create_lca_message, create_pscm_message, create_lca_3_message, create_lca_2_message, create_lca_4_message, create_lca_5_message, create_lca_6_message, create_lca_7_message, create_speed_message, create_speed_2_message, create_speed_3_message, create_0x1a_message, create_gear_position_message, create_egsm_message, create_pscm_related_message @@ -62,18 +65,26 @@ def update(self, CC, CS, now_nanos): # Get desired steering angle from controlsd (LatControlAngle) apply_angle = actuators.steeringAngleDeg # degrees - if not CC.latActive: - apply_angle = CS.out.steeringAngleDeg # Use current angle when inactive - - # Override apply_angle from live testing config if provided + # Clamp commanded angle to actual ± ANGLE_ERROR. Without this, a driver override + # lets the model's plan drift far from the wheel's actual position; on release, + # the EPS slams back toward that stale command and overshoots. Stock Volvo Pilot + # Assist keeps this gap inside ~2° even under sustained override. + apply_angle = float(np.clip( + apply_angle, + CS.out.steeringAngleDeg - CarControllerParams.ANGLE_ERROR, + CS.out.steeringAngleDeg + CarControllerParams.ANGLE_ERROR, + )) + + # Rate limit + inactive passthrough (apply_angle = steering angle when not lat_active) + apply_angle = apply_std_steer_angle_limits(apply_angle, self.apply_angle_last, CS.out.vEgoRaw, + CS.out.steeringAngleDeg, lat_active, CarControllerParams.ANGLE_LIMITS) + + # Override apply_angle from live testing config if provided (bypasses limits for testing) if self.liveTestingConfig: override_apply_angle = self.liveTestingConfig.get('apply_angle') if override_apply_angle is not None: apply_angle = override_apply_angle - # No rate limiting initially - apply desired angle directly - # TODO: Add rate limiting after basic functionality is confirmed - # LCA - 0x58 - 100 Hz (angle-based) lca_overrides = self.liveTestingConfig.get('lca') if self.liveTestingConfig else None can_sends.append(create_lca_message(self.packer, lat_active, apply_angle, CS.msg_lca, lca_overrides)) diff --git a/opendbc/car/volvo/values.py b/opendbc/car/volvo/values.py index 473541b1c9d..9b2e5971a1a 100644 --- a/opendbc/car/volvo/values.py +++ b/opendbc/car/volvo/values.py @@ -12,6 +12,12 @@ class CarControllerParams: STEER_STEP = 1 # 100 Hz LCA command frequency (controlsd runs at 100 Hz) + # Max commanded-vs-actual steering angle error (deg). Stock Volvo Pilot Assist holds + # commanded within ~1.7° of actual even under sustained driver override; bounding the + # command to actual ± this error prevents the stale-command snap-back that causes + # aggressive post-release overcorrection. + ANGLE_ERROR = 3.0 + # Angle limits for rate limiting ANGLE_LIMITS: AngleSteeringLimits = AngleSteeringLimits( 540, # deg - 1.5 turns to lock From ede3d5460a56ab240154cadbe4454b07c7e25e90 Mon Sep 17 00:00:00 2001 From: ellie Date: Wed, 22 Apr 2026 10:06:09 -0700 Subject: [PATCH 229/229] Volvo SPA: fix 0x349 CRUISE_CONTROL rx_check frequency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The SPA_BUS1_CRUISE_CONTROL (0x349) safety rx_check declared 10 Hz, but the actual message rate is 5 Hz. The lagging threshold is MAX(timestep * 10, 1s), so at 10 Hz it was 1s — tight enough that normal driving with occasional ~1.6s gaps triggered false lagging. At 5 Hz the threshold becomes 2s, matching the real message cadence. Validated on POLESTAR_2 route b7d9bddaf834065c/00000025--29eeffa499 segments 1-30 (210/210 tests pass). Segments 0 and 31 still fail due to log-boundary artifacts (ELM boot period, end-of-drive relay closure), not the safety config. Co-Authored-By: Claude Opus 4.7 --- opendbc/safety/modes/volvo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendbc/safety/modes/volvo.h b/opendbc/safety/modes/volvo.h index 5696a560fb5..877d71dde8e 100644 --- a/opendbc/safety/modes/volvo.h +++ b/opendbc/safety/modes/volvo.h @@ -239,7 +239,7 @@ static safety_config volvo_init(uint16_t param) { {.msg = {{VOLVO_DRIVER_INPUT, VOLVO_PARTY_BUS, 8, 100U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, {.msg = {{VOLVO_SPA_ECM_1, VOLVO_PT_BUS, 8, 100U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, {.msg = {{VOLVO_LCA_STEER, VOLVO_MAIN_BUS, 8, 100U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, - {.msg = {{VOLVO_SPA_BUS1_CRUISE_CONTROL, VOLVO_PT_BUS, 8, 10U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, + {.msg = {{VOLVO_SPA_BUS1_CRUISE_CONTROL, VOLVO_PT_BUS, 8, 5U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, {.msg = {{VOLVO_LCA_3, VOLVO_MAIN_BUS, 8, 67U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, {.msg = {{VOLVO_LCA_5, VOLVO_MAIN_BUS, 8, 50U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}}, {.msg = {{VOLVO_SPEED, VOLVO_MAIN_BUS, 8, 50U, .ignore_checksum = true, .ignore_counter = true, .ignore_quality_flag = true}, { 0 }, { 0 }}},