zhudongjer/carrot
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix..

Browse Source
This commit is contained in:
ajouatom 2025-04-21 22:37:03 +09:00
parent f60101314d
commit 818e78c677
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opendbc_repo/opendbc/car/hyundai/carstate.py
View File

@ -427,8 +427,8 @@ class CarState(CarStateBase):
if self.CP.extFlags & HyundaiExtFlags.CANFD_161.value:
if "ADRV_0x161" in cp_cam.vl:
self.adrv_info_161 = copy.copy(cp_cam.vl.get("ADRV_0x161", {}))
if "ADRV_0x162" in cp_cam.vl:
self.adrv_info_162 = copy.copy(cp_cam.vl.get("ADRV_0x162", {}))
if "CCNC_0x162" in cp_cam.vl:
self.adrv_info_162 = copy.copy(cp_cam.vl.get("CCNC_0x162", {}))
self.lf_distance = cp_cam.vl["CCNC_0x162"]["LF_DETECT_DISTANCE"]
self.rf_distance = cp_cam.vl["CCNC_0x162"]["RF_DETECT_DISTANCE"]
self.lr_distance = cp_cam.vl["CCNC_0x162"]["LR_DETECT_DISTANCE"]
@ -608,7 +608,7 @@ class CarState(CarStateBase):
if CP.extFlags & HyundaiExtFlags.CANFD_161:
cam_messages += [
("ADRV_0x161", 20),
("ADRV_0x162", 20),
("CCNC_0x162", 20),
]
if CP.flags & HyundaiFlags.ANGLE_CONTROL:
cam_messages += [

2
opendbc_repo/opendbc/car/hyundai/hyundaicanfd.py
View File

@ -567,7 +567,7 @@ def create_ccnc_messages(CP, packer, CAN, frame, CC, CS, hud_control, disp_angle
if (left_lane_warning and not CS.out.leftBlinker) or (right_lane_warning and not CS.out.rightBlinker):
values["VIBRATE"] = 1
ret.append(packer.make_can_msg("ADRV_0x162", CAN.ECAN, values))
ret.append(packer.make_can_msg("CCNC_0x162", CAN.ECAN, values))
if canfd_debug > 0:
if frame % 20 == 0: # 아직 시험중..

2
opendbc_repo/opendbc/dbc/generator/hyundai/hyundai_canfd.dbc
View File

@ -208,7 +208,7 @@ BO_ 353 ADRV_0x161: 32 ADRV
SG_ DAW_ICON : 240|3@1+ (1,0) [0|7] "" XXX
SG_ CAR_CIRCLE : 243|3@1+ (1,0) [0|7] "" XXX
BO_ 354 ADRV_0x162: 32 CCNC
BO_ 354 CCNC_0x162: 32 CCNC
SG_ CHECKSUM : 0|16@1+ (1,0) [0|65535] "" XXX
SG_ COUNTER : 16|8@1+ (1,0) [0|255] "" XXX
SG_ COUNTRY : 24|4@1+ (1,0) [0|7] "" XXX

2
opendbc_repo/opendbc/dbc/hyundai_canfd.dbc
View File

@ -306,7 +306,7 @@ BO_ 353 ADRV_0x161: 32 ADRV
SG_ DAW_ICON : 240|3@1+ (1,0) [0|7] "" XXX
SG_ CAR_CIRCLE : 243|3@1+ (1,0) [0|7] "" XXX
BO_ 354 ADRV_0x162: 32 CCNC
BO_ 354 CCNC_0x162: 32 CCNC
SG_ CHECKSUM : 0|16@1+ (1,0) [0|65535] "" XXX
SG_ COUNTER : 16|8@1+ (1,0) [0|255] "" XXX
SG_ COUNTRY : 24|4@1+ (1,0) [0|7] "" XXX