move to cam

selfdrive/car/honda/carstate.py

@@ -271,8 +271,12 @@ class CarState(CarStateBase):
 
     if self.CP.carFingerprint in HONDA_BOSCH or self.CP.carFingerprint in HONDA_RADARLESS:
       if not self.CP.openpilotLongitudinalControl:
-        ret.cruiseState.nonAdaptive = cp.vl["ACC_HUD"]["CRUISE_CONTROL_LABEL"] != 0
-        ret.cruiseState.standstill = cp.vl["ACC_HUD"]["CRUISE_SPEED"] == 252.
+        if self.CP.carFingerprint in (CAR.CIVIC_22):
+            ret.cruiseState.nonAdaptive = cp_cam.vl["ACC_HUD"]["CRUISE_CONTROL_LABEL"] != 0
+            ret.cruiseState.standstill = cp_cam.vl["ACC_HUD"]["CRUISE_SPEED"] == 252.
+        else:
+            ret.cruiseState.nonAdaptive = cp.vl["ACC_HUD"]["CRUISE_CONTROL_LABEL"] != 0
+            ret.cruiseState.standstill = cp.vl["ACC_HUD"]["CRUISE_SPEED"] == 252.
 
         # On set, cruise set speed pulses between 254~255 and the set speed prev is set to avoid this.
         if self.CP.carFingerprint in (CAR.CIVIC_22):