diff --git a/common/params.cc b/common/params.cc index f65de49..47f8bb0 100755 --- a/common/params.cc +++ b/common/params.cc @@ -232,6 +232,7 @@ std::unordered_map keys = { {"CarMake", PERSISTENT}, {"CarModel", PERSISTENT}, + {"CarCruiseDisplayActual", PERSISTENT}, {"CarSpeedLimit", PERSISTENT}, {"CarSpeedLimitLiteral", PERSISTENT}, {"SpeedLimitLatDesired", PERSISTENT}, diff --git a/selfdrive/car/hyundai/carstate.py b/selfdrive/car/hyundai/carstate.py index 771b79d..390bec3 100755 --- a/selfdrive/car/hyundai/carstate.py +++ b/selfdrive/car/hyundai/carstate.py @@ -211,6 +211,8 @@ class CarState(CarStateBase): self.params_memory.put_int("CarSpeedLimitLiteral", self.calculate_speed_limit(cp, cp_cam)) self.params_memory.put_float("CarSpeedLimit", self.calculate_speed_limit(cp, cp_cam) * speed_conv) + self.params_memory.put_float("CarCruiseDisplayActual", cp_cruise.vl["SCC11"]["VSetDis"]) + return ret diff --git a/selfdrive/car/hyundai/hyundaicanfd.py b/selfdrive/car/hyundai/hyundaicanfd.py index 9c111e4..892c638 100755 --- a/selfdrive/car/hyundai/hyundaicanfd.py +++ b/selfdrive/car/hyundai/hyundaicanfd.py @@ -129,6 +129,9 @@ def create_buttons(packer, CP, CAN, cnt, btn): def create_buttons_alt(packer, CP, CAN, cnt, btn, template): + params_memory = Params("/dev/shm/params") + self.params_memory.get_float("CarCruiseDisplayActual") + values = { "COUNTER": cnt, "NEW_SIGNAL_1": 0.0, @@ -143,9 +146,9 @@ def create_buttons_alt(packer, CP, CAN, cnt, btn, template): "NEW_SIGNAL_5": 0.0, "SET_ME_2": 2.0, "NEW_SIGNAL_5": 1.0, - "BYTE_6": 38.0, # Target speed? + "BYTE_6": CarCruiseDisplayActual+1, # Target "BYTE_7": 0.0, - "BYTE_8": 31.0, # Current spedometer speed? + "BYTE_8": CarCruiseDisplayActual, # Current cruise sets "BYTE_9": 0.0, "BYTE_10": 0.0, "BYTE_11": 0.0,