brianhansonxyz/clearpilot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Your Name
2024-05-21 00:03:13 -05:00
parent 8e71d08b82
commit fc451096c5
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/params.cc
View File

@@ -232,6 +232,7 @@ std::unordered_map<std::string, uint32_t> keys = {
{"CarMake", PERSISTENT}, {"CarMake", PERSISTENT},
{"CarModel", PERSISTENT}, {"CarModel", PERSISTENT},
{"CarCruiseDisplayActual", PERSISTENT},
{"CarSpeedLimit", PERSISTENT}, {"CarSpeedLimit", PERSISTENT},
{"CarSpeedLimitLiteral", PERSISTENT}, {"CarSpeedLimitLiteral", PERSISTENT},
{"SpeedLimitLatDesired", PERSISTENT}, {"SpeedLimitLatDesired", PERSISTENT},

2
selfdrive/car/hyundai/carstate.py
View File

@@ -211,6 +211,8 @@ class CarState(CarStateBase):
self.params_memory.put_int("CarSpeedLimitLiteral", self.calculate_speed_limit(cp, cp_cam)) 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("CarSpeedLimit", self.calculate_speed_limit(cp, cp_cam) * speed_conv)
self.params_memory.put_float("CarCruiseDisplayActual", cp_cruise.vl["SCC11"]["VSetDis"])
return ret return ret

7
selfdrive/car/hyundai/hyundaicanfd.py
View File

@@ -129,6 +129,9 @@ def create_buttons(packer, CP, CAN, cnt, btn):
def create_buttons_alt(packer, CP, CAN, cnt, btn, template): def create_buttons_alt(packer, CP, CAN, cnt, btn, template):
params_memory = Params("/dev/shm/params")
self.params_memory.get_float("CarCruiseDisplayActual")
values = { values = {
"COUNTER": cnt, "COUNTER": cnt,
"NEW_SIGNAL_1": 0.0, "NEW_SIGNAL_1": 0.0,
@@ -143,9 +146,9 @@ def create_buttons_alt(packer, CP, CAN, cnt, btn, template):
"NEW_SIGNAL_5": 0.0, "NEW_SIGNAL_5": 0.0,
"SET_ME_2": 2.0, "SET_ME_2": 2.0,
"NEW_SIGNAL_5": 1.0, "NEW_SIGNAL_5": 1.0,
"BYTE_6": 38.0, # Target speed? "BYTE_6": CarCruiseDisplayActual+1, # Target
"BYTE_7": 0.0, "BYTE_7": 0.0,
"BYTE_8": 31.0, # Current spedometer speed? "BYTE_8": CarCruiseDisplayActual, # Current cruise sets
"BYTE_9": 0.0, "BYTE_9": 0.0,
"BYTE_10": 0.0, "BYTE_10": 0.0,
"BYTE_11": 0.0, "BYTE_11": 0.0,