|
|
@ -16,7 +16,6 @@ class CarState(CarStateBase): |
|
|
|
self.acc_active_last = False |
|
|
|
self.acc_active_last = False |
|
|
|
self.low_speed_alert = False |
|
|
|
self.low_speed_alert = False |
|
|
|
self.lkas_allowed_speed = False |
|
|
|
self.lkas_allowed_speed = False |
|
|
|
self.lkas_disabled = False |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def update(self, cp, cp_cam): |
|
|
|
def update(self, cp, cp_cam): |
|
|
|
|
|
|
|
|
|
|
@ -92,12 +91,9 @@ class CarState(CarStateBase): |
|
|
|
|
|
|
|
|
|
|
|
self.acc_active_last = ret.cruiseState.enabled |
|
|
|
self.acc_active_last = ret.cruiseState.enabled |
|
|
|
|
|
|
|
|
|
|
|
self.crz_btns_counter = cp.vl["CRZ_BTNS"]["CTR"] |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# camera signals |
|
|
|
|
|
|
|
self.lkas_disabled = cp_cam.vl["CAM_LANEINFO"]["LANE_LINES"] == 0 |
|
|
|
|
|
|
|
self.cam_lkas = cp_cam.vl["CAM_LKAS"] |
|
|
|
self.cam_lkas = cp_cam.vl["CAM_LKAS"] |
|
|
|
self.cam_laneinfo = cp_cam.vl["CAM_LANEINFO"] |
|
|
|
self.cam_laneinfo = cp_cam.vl["CAM_LANEINFO"] |
|
|
|
|
|
|
|
self.crz_btns_counter = cp.vl["CRZ_BTNS"]["CTR"] |
|
|
|
ret.steerError = cp_cam.vl["CAM_LKAS"]["ERR_BIT_1"] == 1 |
|
|
|
ret.steerError = cp_cam.vl["CAM_LKAS"]["ERR_BIT_1"] == 1 |
|
|
|
|
|
|
|
|
|
|
|
return ret |
|
|
|
return ret |
|
|
|