diff --git a/cereal/visionipc/visionipc_pyx.so b/cereal/visionipc/visionipc_pyx.so index 4bbbe3d68..9cd0c31f5 100755 Binary files a/cereal/visionipc/visionipc_pyx.so and b/cereal/visionipc/visionipc_pyx.so differ diff --git a/common/dp_conf.py b/common/dp_conf.py index 21eebe936..e77097105 100644 --- a/common/dp_conf.py +++ b/common/dp_conf.py @@ -107,7 +107,7 @@ confs = [ {'name': 'dp_dm', 'default': False, 'type': 'Bool', 'conf_type': ['param']}, {'name': 'dp_speed_check', 'default': True, 'type': 'Bool', 'conf_type': ['param', 'struct']}, {'name': 'dp_temp_check', 'default': True, 'type': 'Bool', 'conf_type': ['param']}, - {'name': 'dp_vag_resume_fix', 'default': False, 'type': 'Bool', 'conf_type': ['param']}, + # {'name': 'dp_vag_resume_fix', 'default': False, 'type': 'Bool', 'conf_type': ['param']}, # # lat ctrl # {'name': 'dp_lane_less_mode_ctrl', 'default': False, 'type': 'Bool', 'conf_type': ['param', 'struct']}, # {'name': 'dp_lane_less_mode', 'default': 2, 'type': 'UInt8', 'min': 0, 'max': 2, 'depends': [{'name': 'dp_lane_less_mode_ctrl', 'vals': [True]}], 'conf_type': ['param', 'struct']}, diff --git a/common/params_pyx.so b/common/params_pyx.so index 7f17f9802..5d625b2e6 100755 Binary files a/common/params_pyx.so and b/common/params_pyx.so differ diff --git a/common/version.h b/common/version.h index 0d8cff9d8..d323fe454 100644 --- a/common/version.h +++ b/common/version.h @@ -1 +1 @@ -#define COMMA_VERSION "2023.02.07" +#define COMMA_VERSION "2023.02.08" diff --git a/opendbc/can/libdbc.so b/opendbc/can/libdbc.so index 42aa5318e..cb4af2388 100755 Binary files a/opendbc/can/libdbc.so and b/opendbc/can/libdbc.so differ diff --git a/panda/board/obj/bootstub.panda.bin b/panda/board/obj/bootstub.panda.bin index ab66be26a..0a06c88cd 100755 Binary files a/panda/board/obj/bootstub.panda.bin and b/panda/board/obj/bootstub.panda.bin differ diff --git a/panda/board/obj/panda.bin.signed b/panda/board/obj/panda.bin.signed index 61042cfcb..cf26f8b6e 100644 Binary files a/panda/board/obj/panda.bin.signed and b/panda/board/obj/panda.bin.signed differ diff --git a/panda/python/__init__.py b/panda/python/__init__.py index e5a80163e..22543b908 100644 --- a/panda/python/__init__.py +++ b/panda/python/__init__.py @@ -131,6 +131,7 @@ class ALTERNATIVE_EXPERIENCE: DISABLE_DISENGAGE_ON_GAS = 1 DISABLE_STOCK_AEB = 2 RAISE_LONGITUDINAL_LIMITS_TO_ISO_MAX = 8 + ALKA = 16 class Panda: @@ -206,13 +207,11 @@ class Panda: # first byte is for EPS scaling factor FLAG_TOYOTA_ALT_BRAKE = (1 << 8) FLAG_TOYOTA_STOCK_LONGITUDINAL = (2 << 8) - FLAG_TOYOTA_ALKA = (4 << 8) FLAG_HONDA_ALT_BRAKE = 1 FLAG_HONDA_BOSCH_LONG = 2 FLAG_HONDA_NIDEC_ALT = 4 FLAG_HONDA_RADARLESS = 8 - FLAG_HONDA_ALKA = 16 FLAG_HYUNDAI_EV_GAS = 1 FLAG_HYUNDAI_HYBRID_GAS = 2 @@ -221,13 +220,11 @@ class Panda: FLAG_HYUNDAI_CANFD_HDA2 = 16 FLAG_HYUNDAI_CANFD_ALT_BUTTONS = 32 FLAG_HYUNDAI_ALT_LIMITS = 64 - FLAG_HYUNDAI_ALKA = 128 FLAG_TESLA_POWERTRAIN = 1 FLAG_TESLA_LONG_CONTROL = 2 FLAG_VOLKSWAGEN_LONG_CONTROL = 1 - FLAG_VOLKSWAGEN_ALKA = 2 FLAG_CHRYSLER_RAM_DT = 1 FLAG_CHRYSLER_RAM_HD = 2 diff --git a/rednose/helpers/ekf_sym_pyx.so b/rednose/helpers/ekf_sym_pyx.so index 5dbc1c3ab..c40372e0d 100755 Binary files a/rednose/helpers/ekf_sym_pyx.so and b/rednose/helpers/ekf_sym_pyx.so differ diff --git a/selfdrive/boardd/boardd b/selfdrive/boardd/boardd index 8dce10c9e..423a1e02d 100755 Binary files a/selfdrive/boardd/boardd and b/selfdrive/boardd/boardd differ diff --git a/selfdrive/car/honda/interface.py b/selfdrive/car/honda/interface.py index 2d17bd9b0..ebb13b390 100755 --- a/selfdrive/car/honda/interface.py +++ b/selfdrive/car/honda/interface.py @@ -53,14 +53,11 @@ class CarInterface(CarInterfaceBase): # dp - attempt to disable op long params = Params() - dp_atl = int(params.get("dp_atl").decode('utf-8')) - if dp_atl > 0: - ret.safetyConfigs[0].safetyParam |= Panda.FLAG_HONDA_ALKA - if dp_atl == 1: - ret.openpilotLongitudinalControl = False - # update pcmCruise again - if candidate in HONDA_BOSCH: - ret.pcmCruise = not ret.openpilotLongitudinalControl + if int(params.get("dp_atl").decode('utf-8')) == 1: + ret.openpilotLongitudinalControl = False + # update pcmCruise again + if candidate in HONDA_BOSCH: + ret.pcmCruise = True if candidate == CAR.CRV_5G: ret.enableBsm = 0x12f8bfa7 in fingerprint[0] diff --git a/selfdrive/car/hyundai/interface.py b/selfdrive/car/hyundai/interface.py index 4d7e0736c..86ad7f735 100644 --- a/selfdrive/car/hyundai/interface.py +++ b/selfdrive/car/hyundai/interface.py @@ -229,6 +229,9 @@ class CarInterface(CarInterfaceBase): ret.experimentalLongitudinalAvailable = candidate not in (LEGACY_SAFETY_MODE_CAR | CAMERA_SCC_CAR) ret.openpilotLongitudinalControl = experimental_long and ret.experimentalLongitudinalAvailable + params = Params() + if int(params.get("dp_atl").decode('utf-8')) == 1: + ret.openpilotLongitudinalControl = False ret.pcmCruise = not ret.openpilotLongitudinalControl ret.stoppingControl = True @@ -269,15 +272,6 @@ class CarInterface(CarInterfaceBase): if candidate in CAMERA_SCC_CAR: ret.safetyConfigs[0].safetyParam |= Panda.FLAG_HYUNDAI_CAMERA_SCC - params = Params() - dp_atl = int(params.get("dp_atl").decode('utf-8')) - if dp_atl > 0: - ret.safetyConfigs[0].safetyParam |= Panda.FLAG_HYUNDAI_ALKA - if dp_atl == 1: - ret.openpilotLongitudinalControl = False - # update pcmCruise again - ret.pcmCruise = not ret.openpilotLongitudinalControl - if ret.openpilotLongitudinalControl: ret.safetyConfigs[-1].safetyParam |= Panda.FLAG_HYUNDAI_LONG if candidate in HYBRID_CAR: diff --git a/selfdrive/car/toyota/interface.py b/selfdrive/car/toyota/interface.py index dc17d4451..aab552460 100644 --- a/selfdrive/car/toyota/interface.py +++ b/selfdrive/car/toyota/interface.py @@ -222,15 +222,8 @@ class CarInterface(CarInterfaceBase): ret.openpilotLongitudinalControl = smartDsu or ret.enableDsu or candidate in (TSS2_CAR - RADAR_ACC_CAR) ret.autoResumeSng = ret.openpilotLongitudinalControl and candidate in NO_STOP_TIMER_CAR - dp_atl = int(Params().get("dp_atl").decode('utf-8')) - if dp_atl > 0: - ret.safetyConfigs[0].safetyParam |= Panda.FLAG_TOYOTA_ALKA - - if dp_atl == 1: - ret.openpilotLongitudinalControl = False - - if smartDsu and dp_atl == 2: - ret.openpilotLongitudinalControl = True + if int(Params().get("dp_atl").decode('utf-8')) == 1: + ret.openpilotLongitudinalControl = False if candidate == CAR.CHR_TSS2: ret.enableBsm = True diff --git a/selfdrive/car/volkswagen/interface.py b/selfdrive/car/volkswagen/interface.py index c423b26c1..08ab417c2 100644 --- a/selfdrive/car/volkswagen/interface.py +++ b/selfdrive/car/volkswagen/interface.py @@ -82,10 +82,8 @@ class CarInterface(CarInterfaceBase): # Global longitudinal tuning defaults, can be overridden per-vehicle dp_atl = int(Params().get("dp_atl").decode('utf-8')) - if dp_atl > 0: - ret.safetyConfigs[0].safetyParam |= Panda.FLAG_VOLKSWAGEN_ALKA - if dp_atl == 1: - ret.openpilotLongitudinalControl = False + if dp_atl == 1: + ret.openpilotLongitudinalControl = False ret.experimentalLongitudinalAvailable = ret.networkLocation == NetworkLocation.gateway or use_off_car_defaults if experimental_long and dp_atl != 1: diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py index 8d973f0a3..58e280882 100755 --- a/selfdrive/controls/controlsd.py +++ b/selfdrive/controls/controlsd.py @@ -114,10 +114,6 @@ class Controls: self.CI, self.CP = CI, CI.CP self.joystick_mode = self.params.get_bool("JoystickDebugMode") or (self.CP.notCar and sm is None) - # dp - self.sm['dragonConf'].dpAtl = int(self.params.get('dp_atl', encoding='utf8')) - self.dp_temp_check = self.params.get_bool('dp_temp_check') - self.dp_vag_resume_fix = self.params.get_bool('dp_vag_resume_fix') # set alternative experiences from parameters self.disengage_on_accelerator = self.params.get_bool("DisengageOnAccelerator") @@ -128,6 +124,12 @@ class Controls: if self.CP.dashcamOnly and self.params.get_bool("DashcamOverride"): self.CP.dashcamOnly = False + # dp + self.sm['dragonConf'].dpAtl = int(self.params.get('dp_atl', encoding='utf8')) + if self.sm['dragonConf'].dpAtl: + self.CP.alternativeExperience |= ALTERNATIVE_EXPERIENCE.ALKA + self.dp_temp_check = self.params.get_bool('dp_temp_check') + # read params self.is_metric = self.params.get_bool("IsMetric") self.is_ldw_enabled = self.params.get_bool("IsLdwEnabled") @@ -597,16 +599,12 @@ class Controls: pass elif not CS.cruiseState.available: pass - # CC.latActive = False elif CS.steerFaultTemporary: pass - # CC.latActive = False elif CS.steerFaultPermanent: pass - # CC.latActive = False elif CS.standstill: pass - # CC.latActive = False elif CS.gearShifter == car.CarState.GearShifter.reverse: pass else: diff --git a/selfdrive/controls/lib/events.py b/selfdrive/controls/lib/events.py index de86d61a3..1ddb536ac 100644 --- a/selfdrive/controls/lib/events.py +++ b/selfdrive/controls/lib/events.py @@ -195,7 +195,7 @@ class NormalPermanentAlert(Alert): class StartupAlert(Alert): - def __init__(self, alert_text_1: str, alert_text_2: str = _("Always keep hands on wheel and eyes on road"), alert_status=AlertStatus.normal): + def __init__(self, alert_text_1: str, alert_text_2: str = _("Happy Holiday / New Years! Safe Travel, cya in 2023"), alert_status=AlertStatus.normal): super().__init__(alert_text_1, alert_text_2, alert_status, AlertSize.mid, Priority.LOWER, VisualAlert.none, AudibleAlert.none, 10.), diff --git a/selfdrive/locationd/locationd b/selfdrive/locationd/locationd index dbf34ab29..c6bc61612 100755 Binary files a/selfdrive/locationd/locationd and b/selfdrive/locationd/locationd differ diff --git a/selfdrive/locationd/ubloxd b/selfdrive/locationd/ubloxd index aa35152d4..32f32927f 100755 Binary files a/selfdrive/locationd/ubloxd and b/selfdrive/locationd/ubloxd differ diff --git a/selfdrive/modeld/_dmonitoringmodeld b/selfdrive/modeld/_dmonitoringmodeld index a247e16ce..e385b22ea 100755 Binary files a/selfdrive/modeld/_dmonitoringmodeld and b/selfdrive/modeld/_dmonitoringmodeld differ diff --git a/selfdrive/modeld/_modeld b/selfdrive/modeld/_modeld index f77b30bc4..6eaeb3f66 100755 Binary files a/selfdrive/modeld/_modeld and b/selfdrive/modeld/_modeld differ diff --git a/selfdrive/modeld/models/supercombo.onnx b/selfdrive/modeld/models/supercombo.onnx deleted file mode 100644 index 749ac1287..000000000 Binary files a/selfdrive/modeld/models/supercombo.onnx and /dev/null differ diff --git a/selfdrive/sensord/_sensord b/selfdrive/sensord/_sensord index 242f646df..b485c5ebf 100755 Binary files a/selfdrive/sensord/_sensord and b/selfdrive/sensord/_sensord differ diff --git a/selfdrive/ui/_ui b/selfdrive/ui/_ui index 9acecf683..39f22e4c9 100755 Binary files a/selfdrive/ui/_ui and b/selfdrive/ui/_ui differ diff --git a/selfdrive/ui/_ui_nonav b/selfdrive/ui/_ui_nonav index 64d7291b4..bb81ff205 100755 Binary files a/selfdrive/ui/_ui_nonav and b/selfdrive/ui/_ui_nonav differ diff --git a/selfdrive/ui/qt/spinner b/selfdrive/ui/qt/spinner index 87b4bb7ca..1b943ac25 100755 Binary files a/selfdrive/ui/qt/spinner and b/selfdrive/ui/qt/spinner differ diff --git a/selfdrive/ui/qt/text b/selfdrive/ui/qt/text index ccc58cd0c..2b165c710 100755 Binary files a/selfdrive/ui/qt/text and b/selfdrive/ui/qt/text differ diff --git a/selfdrive/ui/soundd/_soundd b/selfdrive/ui/soundd/_soundd index a49518549..359ea1b7c 100755 Binary files a/selfdrive/ui/soundd/_soundd and b/selfdrive/ui/soundd/_soundd differ diff --git a/system/camerad/camerad b/system/camerad/camerad index a0397bef9..982ab88c6 100755 Binary files a/system/camerad/camerad and b/system/camerad/camerad differ