diff --git a/opendbc_repo b/opendbc_repo index a09b2381aafdc5..df03c7379eaec0 160000 --- a/opendbc_repo +++ b/opendbc_repo @@ -1 +1 @@ -Subproject commit a09b2381aafdc575e82d5321d13f93002938abe1 +Subproject commit df03c7379eaec05d562a69f275422c924b92fcd4 diff --git a/panda b/panda index 5fabf5550c2f03..f6cc531cc6dc68 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit 5fabf5550c2f03d4941c6984ef92c1d8d51078df +Subproject commit f6cc531cc6dc683f053861e38555899986623d1f diff --git a/selfdrive/car/tesla/carstate.py b/selfdrive/car/tesla/carstate.py index 1bfe83daa08dce..547e11eac2a52f 100644 --- a/selfdrive/car/tesla/carstate.py +++ b/selfdrive/car/tesla/carstate.py @@ -150,6 +150,7 @@ def get_adas_can_parser(CP): # Vehicle Can on Model 3 ("SCCM_steeringAngleSensor", 100), ("DAS_bodyControls", 2), ("ID3F5VCFRONT_lighting", 10), + ("UI_status2", 100), ] return CANParser(DBC[CP.carFingerprint]["pt"], messages, CANBUS.vehicle) diff --git a/selfdrive/car/tesla/values.py b/selfdrive/car/tesla/values.py index 565318a8f22b16..20db4a276a8ce0 100644 --- a/selfdrive/car/tesla/values.py +++ b/selfdrive/car/tesla/values.py @@ -66,7 +66,7 @@ class CANBUS: Button(car.CarState.ButtonEvent.Type.decelCruise, "VCLEFT_switchStatus", "VCLEFT_swcRightScrollTicks", list(range(-9, 0)), None), Button(car.CarState.ButtonEvent.Type.cancel, "SCCM_rightStalk", "SCCM_rightStalkStatus", [1, 2], None), Button(car.CarState.ButtonEvent.Type.resumeCruise, "SCCM_rightStalk", "SCCM_rightStalkStatus", [3, 4], None), - Button(car.CarState.ButtonEvent.Type.altButton2, "VCLEFT_switchStatus", "VCLEFT_swcRightDoublePress", [1], 1), # Note that mux needs to be handled in carState + Button(car.CarState.ButtonEvent.Type.altButton2, "UI_status2", "UI_activeTouchPoints", [3], None), # 3-finger touch on center display for MADS Button(car.CarState.ButtonEvent.Type.gapAdjustCruise, "VCLEFT_switchStatus", "VCLEFT_swcRightTiltRight", [2], 1), # TODO: directional gap adjustment ]