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-20 23:52:07 -05:00
parent 2c3a8273f7
commit b879b6790f
1 changed files with 73 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,25 +88,84 @@ def create_buttons(packer, CP, CAN, cnt, btn):
bus = CAN.ECAN if CP.flags & HyundaiFlags.CANFD_HDA2 else CAN.CAM bus = CAN.ECAN if CP.flags & HyundaiFlags.CANFD_HDA2 else CAN.CAM
return packer.make_can_msg("CRUISE_BUTTONS", bus, values) return packer.make_can_msg("CRUISE_BUTTONS", bus, values)
# def create_buttons_alt(packer, CP, CAN, cnt, btn): # null
# values = { # {'CHECKSUM': [], 'COUNTER': [], 'NEW_SIGNAL_1': [], 'SET_ME_1': [], 'DISTANCE_UNIT': [],
# "COUNTER": cnt, # 'NEW_SIGNAL_2': [], 'ADAPT
# "SET_ME_1": 1, # IVE_CRUISE_MAIN_BTN': [], 'NEW_SIGNAL_3': [], 'LFA_BTN': [], 'CRUISE_BUTTONS': [],
# "SET_ME_2": 2, # 'NEW_SIGNAL_4': [], 'NORMAL_CRUI
# "CRUISE_BUTTONS": btn, # SE_MAIN_BTN': [], 'NEW_SIGNAL_5': [], 'SET_ME_2': [], 'NEW_SIGNAL_6': [], 'BYTE6': [],
# } # 'BYTE7': [], 'BYTE8': [], 'B
# YTE9': [], 'BYTE10': [], 'BYTE11': [], 'BYTE12': [], 'BYTE13': [], 'BYTE14': [],
# 'BYTE15': []}
# bus = CAN.ECAN # if CP.flags & HyundaiFlags.CANFD_HDA2 else CAN.CAM # holding down up button
# return packer.make_can_msg("CRUISE_BUTTONS_ALT", bus, values) # {'CHECKSUM': [5774.0], 'COUNTER': [63.0], 'NEW_SIGNAL_1': [0.0], 'SET_ME_1':
# [0.0], 'DISTANCE_UNIT': [1.0], 'NEW_SIGNAL_2': [4.0], 'ADAPTIVE_CRUISE_MAIN_BTN':
# [0.0], 'NEW_SIGNAL_3': [0.0], 'LFA_BTN': [0.0], 'CRUISE_BUTTONS': [1.0],
# 'NEW_SIGNAL_4': [0.0], 'NORMAL_CRUISE_MAIN_BTN': [0.0], 'NEW_SIGNAL_5': [0.0],
# 'SET_ME_2': [2.0], 'NEW_SIGNAL_6': [1.0], 'BYTE6': [32.0], 'BYTE7': [0.0],
# 'BYTE8': [26.0], 'BYTE9': [0.0], 'BYTE10': [0.0], 'BYTE11': [0.0], 'BYTE12':
# [0.0], 'BYTE13': [0.0], 'BYTE14': [0.0], 'BYTE15': [0.0]}
# {'CHECKSUM': [14783.0], 'COUNTER': [150.0], 'NEW_SIGNAL_1': [0.0],
# 'SET_ME_1': [0.0], 'DISTANCE_UNIT': [1.0], 'NEW_
# SIGNAL_2': [6.0], 'ADAPTIVE_CRUISE_MAIN_BTN': [0.0], 'NEW_SIGNAL_3': [0.0],
# 'LFA_BTN': [0.0], 'CRUISE_BUTTONS': [1.
# 0], 'NEW_SIGNAL_4': [0.0], 'NORMAL_CRUISE_MAIN_BTN': [0.0], 'NEW_SIGNAL_5':
# [0.0], 'SET_ME_2': [2.0], 'NEW_SIGNAL_6
# ': [1.0], 'BYTE6': [37.0], 'BYTE7': [0.0], 'BYTE8': [30.0], 'BYTE9': [0.0],
# 'BYTE10': [0.0], 'BYTE11': [0.0], 'BYTE
# 12': [0.0], 'BYTE13': [0.0], 'BYTE14': [0.0], 'BYTE15': [0.0]}
# {'CHECKSUM': [61602.0], 'COUNTER': [153.0], 'NEW_SIGNAL_1': [0.0], 'SET_ME_1':
# [0.0], 'DISTANCE_UNIT': [1.0], 'NEW_
# SIGNAL_2': [0.0], 'ADAPTIVE_CRUISE_MAIN_BTN': [0.0], 'NEW_SIGNAL_3': [0.0],
# 'LFA_BTN': [1.0], 'CRUISE_BUTTONS': [1.
# 0], 'NEW_SIGNAL_4': [0.0], 'NORMAL_CRUISE_MAIN_BTN': [0.0], 'NEW_SIGNAL_5':
# [0.0], 'SET_ME_2': [2.0], 'NEW_SIGNAL_6
# ': [1.0], 'BYTE6': [38.0], 'BYTE7': [0.0], 'BYTE8': [31.0], 'BYTE9': [0.0],
# 'BYTE10': [0.0], 'BYTE11': [0.0], 'BYTE
# 12': [0.0], 'BYTE13': [0.0], 'BYTE14': [0.0], 'BYTE15': [0.0]}
def create_buttons_alt(packer, CP, CAN, cnt, btn, template): def create_buttons_alt(packer, CP, CAN, cnt, btn):
template.update({ values = {
"CRUISE_BUTTONS": btn "COUNTER": cnt,
}) "NEW_SIGNAL_1": 0.0,
"DISTANCE_UNIT": 1.0,
"SET_ME_1": 0.0,
"NEW_SIGNAL_2": 0.0,
"ADAPTIVE_CRUISE_MAIN_BTN": 0.0,
"NEW_SIGNAL_3": 0.0,
"CRUISE_BUTTONS": btn * 1.0,
"NEW_SIGNAL_4": 0.0,
"NORMAL_CRUISE_MAIN_BTN": 0.0,
"NEW_SIGNAL_5": 0.0,
"SET_ME_2": 2.0,
"NEW_SIGNAL_5": 1.0,
"BYTE_6": 38.0, # Target speed?
"BYTE_7": 0.0,
"BYTE_8": 31.0, # Current spedometer speed?
"BYTE_9": 0.0,
"BYTE_10": 0.0,
"BYTE_11": 0.0,
"BYTE_12": 0.0,
"BYTE_13": 0.0,
"BYTE_14": 0.0,
"BYTE_15": 0.0,
}
bus = CAN.ECAN # if CP.flags & HyundaiFlags.CANFD_HDA2 else CAN.CAM bus = CAN.ECAN # if CP.flags & HyundaiFlags.CANFD_HDA2 else CAN.CAM
return packer.make_can_msg("CRUISE_BUTTONS_ALT", bus, template) return packer.make_can_msg("CRUISE_BUTTONS_ALT", bus, values)
# def create_buttons_alt(packer, CP, CAN, cnt, btn, template):
# template.update({
# "CRUISE_BUTTONS": btn
# })
# bus = CAN.ECAN # if CP.flags & HyundaiFlags.CANFD_HDA2 else CAN.CAM
# return packer.make_can_msg("CRUISE_BUTTONS_ALT", bus, template)
def create_acc_set_speed(packer, CP, CAN, cruise_info_copy, speed): def create_acc_set_speed(packer, CP, CAN, cruise_info_copy, speed):