IQ.Pilot Release Commit @ 9fe0487

iqdbc_repo/iqdbc/car/car_helpers.py

@@ -11,7 +11,7 @@ from iqdbc.car.mock.values import CAR as MOCK
 from iqdbc.car.values import BRANDS
 from iqdbc.car.vin import get_vin, is_valid_vin, VIN_UNKNOWN
 
-from iqdbc.iqpilot.car.interfaces import setup_interfaces as iqpilot_interfaces
+from iqdbc.lvbs.car.interfaces import apply_iq_car_config as iqpilot_interfaces
 
 FRAME_FINGERPRINT = 100  # 1s
 

iqdbc_repo/iqdbc/car/chrysler/carcontroller.py

@@ -5,9 +5,9 @@ from iqdbc.car.chrysler import chryslercan
 from iqdbc.car.chrysler.values import RAM_CARS, CarControllerParams, ChryslerFlags, RAM_DT
 from iqdbc.car.interfaces import CarControllerBase
 
-from iqdbc.iqpilot.car.chrysler.carcontroller_ext import CarControllerExt
-from iqdbc.iqpilot.car.chrysler.aol import AolCarController
-from iqdbc.iqpilot.car.chrysler.values_ext import ChryslerFlagsIQ
+from iqdbc.lvbs.car.chrysler.carcontroller_ext import CarControllerExt
+from iqdbc.lvbs.car.chrysler.aol import AolCarController
+from iqdbc.lvbs.car.chrysler.values_ext import ChryslerFlagsIQ
 
 
 class CarController(CarControllerBase, AolCarController, CarControllerExt):

iqdbc_repo/iqdbc/car/chrysler/carstate.py

@@ -4,8 +4,8 @@ from iqdbc.car.chrysler.values import DBC, STEER_THRESHOLD, RAM_CARS
 from iqdbc.car.common.conversions import Conversions as CV
 from iqdbc.car.interfaces import CarStateBase
 
-from iqdbc.iqpilot.car.chrysler.carstate_ext import CarStateExt
-from iqdbc.iqpilot.car.chrysler.aol import AolCarState
+from iqdbc.lvbs.car.chrysler.carstate_ext import CarStateExt
+from iqdbc.lvbs.car.chrysler.aol import AolCarState
 
 ButtonType = structs.CarState.ButtonEvent.Type
 

iqdbc_repo/iqdbc/car/chrysler/fingerprints.py

@@ -2,8 +2,8 @@
 from iqdbc.car.structs import CarParams
 from iqdbc.car.chrysler.values import CAR
 
-from iqdbc.iqpilot.car.fingerprints_ext import merge_fw_versions
-from iqdbc.iqpilot.car.chrysler.fingerprints_ext import FW_VERSIONS_EXT
+from iqdbc.lvbs.car.fingerprints_ext import extend_fw_versions
+from iqdbc.lvbs.car.chrysler.fingerprints_ext import FW_VERSIONS_EXT
 
 Ecu = CarParams.Ecu
 
@@ -789,4 +789,4 @@ FW_VERSIONS = {
   },
 }
 
-FW_VERSIONS = merge_fw_versions(FW_VERSIONS, FW_VERSIONS_EXT)
+FW_VERSIONS = extend_fw_versions(FW_VERSIONS, FW_VERSIONS_EXT)

iqdbc_repo/iqdbc/car/chrysler/interface.py

@@ -5,7 +5,7 @@ from iqdbc.car.chrysler.carstate import CarState
 from iqdbc.car.chrysler.radar_interface import RadarInterface
 from iqdbc.car.chrysler.values import CAR, RAM_HD, RAM_DT, RAM_CARS, ChryslerFlags, ChryslerSafetyFlags
 from iqdbc.car.interfaces import CarInterfaceBase
-from iqdbc.iqpilot.car.chrysler.values_ext import ChryslerFlagsIQ
+from iqdbc.lvbs.car.chrysler.values_ext import ChryslerFlagsIQ
 
 
 class CarInterface(CarInterfaceBase):

iqdbc_repo/iqdbc/car/ford/carstate.py

@@ -5,7 +5,7 @@ from iqdbc.car.ford.fordcan import CanBus
 from iqdbc.car.ford.values import DBC, CarControllerParams, FordFlags
 from iqdbc.car.interfaces import CarStateBase
 
-from iqdbc.iqpilot.car.ford.aol import AolCarState
+from iqdbc.lvbs.car.ford.aol import AolCarState
 
 ButtonType = structs.CarState.ButtonEvent.Type
 GearShifter = structs.CarState.GearShifter

iqdbc_repo/iqdbc/car/gm/carstate.py

@@ -5,8 +5,8 @@ from iqdbc.car.common.conversions import Conversions as CV
 from iqdbc.car.interfaces import CarStateBase
 from iqdbc.car.gm.values import DBC, AccState, CruiseButtons, STEER_THRESHOLD, SDGM_CAR, ALT_ACCS
 
-from iqdbc.iqpilot.car.gm.carstate_ext import CarStateExt
-from iqdbc.iqpilot.car.gm.values_ext import GMFlagsIQ
+from iqdbc.lvbs.car.gm.carstate_ext import CarStateExt
+from iqdbc.lvbs.car.gm.values_ext import GMFlagsIQ
 
 ButtonType = structs.CarState.ButtonEvent.Type
 TransmissionType = structs.CarParams.TransmissionType

iqdbc_repo/iqdbc/car/gm/fingerprints.py

@@ -2,8 +2,8 @@
 """ AUTO-FORMATTED USING iqdbc/car/debug/format_fingerprints.py, EDIT STRUCTURE THERE."""
 from iqdbc.car.gm.values import CAR
 
-from iqdbc.iqpilot.car.fingerprints_ext import merge_fingerprints
-from iqdbc.iqpilot.car.gm.fingerprints_ext import FINGERPRINTS_EXT
+from iqdbc.lvbs.car.fingerprints_ext import extend_fingerprints
+from iqdbc.lvbs.car.gm.fingerprints_ext import FINGERPRINTS_EXT
 
 # Trailblazer also matches as a SILVERADO, TODO: split with fw versions
 # FIXME: There are Equinox users with different message lengths, specifically 304 and 320
@@ -78,4 +78,4 @@ FINGERPRINTS = {
 FW_VERSIONS: dict[str, dict[tuple, list[bytes]]] = {
 }
 
-FINGERPRINTS = merge_fingerprints(FINGERPRINTS, FINGERPRINTS_EXT)
+FINGERPRINTS = extend_fingerprints(FINGERPRINTS, FINGERPRINTS_EXT)

iqdbc_repo/iqdbc/car/gm/interface.py

@@ -10,8 +10,8 @@ from iqdbc.car.gm.radar_interface import RadarInterface, RADAR_HEADER_MSG, CAMER
 from iqdbc.car.gm.values import CAR, CarControllerParams, EV_CAR, CAMERA_ACC_CAR, SDGM_CAR, ALT_ACCS, CanBus, GMSafetyFlags
 from iqdbc.car.interfaces import CarInterfaceBase, TorqueFromLateralAccelCallbackType, LateralAccelFromTorqueCallbackType
 
-from iqdbc.iqpilot.car.gm.interface_ext import CarInterfaceExt
-from iqdbc.iqpilot.car.gm.values_ext import GMFlagsIQ, GMSafetyFlagsIQ
+from iqdbc.lvbs.car.gm.interface_ext import CarInterfaceExt
+from iqdbc.lvbs.car.gm.values_ext import GMFlagsIQ, GMSafetyFlagsIQ
 
 TransmissionType = structs.CarParams.TransmissionType
 NetworkLocation = structs.CarParams.NetworkLocation

iqdbc_repo/iqdbc/car/gm/values.py

@@ -6,7 +6,7 @@ from iqdbc.car.structs import CarParams
 from iqdbc.car.docs_definitions import CarDocs, CarFootnote, CarHarness, CarParts, Column, SupportType
 from iqdbc.car.fw_query_definitions import FwQueryConfig, Request, StdQueries
 
-from iqdbc.iqpilot.car.gm.values_ext import GMFlagsIQ
+from iqdbc.lvbs.car.gm.values_ext import GMFlagsIQ
 
 Ecu = CarParams.Ecu
 

iqdbc_repo/iqdbc/car/honda/carcontroller.py

@@ -8,8 +8,8 @@ from iqdbc.car.honda.values import CAR, CruiseButtons, HONDA_BOSCH, HONDA_BOSCH_
                                      HONDA_BOSCH_TJA_CONTROL, HONDA_NIDEC_ALT_PCM_ACCEL, CarControllerParams
 from iqdbc.car.interfaces import CarControllerBase
 
-from iqdbc.iqpilot.car.honda.aol import AolCarController
-from iqdbc.iqpilot.car.honda.gas_interceptor import GasInterceptorCarController
+from iqdbc.lvbs.car.honda.aol import AolCarController
+from iqdbc.lvbs.car.honda.gas_interceptor import GasInterceptorCarController
 
 VisualAlert = structs.CarControl.HUDControl.VisualAlert
 LongCtrlState = structs.CarControl.Actuators.LongControlState

iqdbc_repo/iqdbc/car/honda/carstate.py

@@ -10,7 +10,7 @@ from iqdbc.car.honda.values import CAR, DBC, STEER_THRESHOLD, HONDA_BOSCH, HONDA
                                                  HondaFlags, CruiseButtons, CruiseSettings, GearShifter, CarControllerParams
 from iqdbc.car.interfaces import CarStateBase
 
-from iqdbc.iqpilot.car.honda.carstate_ext import CarStateExt
+from iqdbc.lvbs.car.honda.carstate_ext import CarStateExt
 
 TransmissionType = structs.CarParams.TransmissionType
 ButtonType = structs.CarState.ButtonEvent.Type

iqdbc_repo/iqdbc/car/honda/fingerprints.py

@@ -2,8 +2,8 @@
 from iqdbc.car.structs import CarParams
 from iqdbc.car.honda.values import CAR
 
-from iqdbc.iqpilot.car.fingerprints_ext import merge_fw_versions
-from iqdbc.iqpilot.car.honda.fingerprints_ext import FW_VERSIONS_EXT
+from iqdbc.lvbs.car.fingerprints_ext import extend_fw_versions
+from iqdbc.lvbs.car.honda.fingerprints_ext import FW_VERSIONS_EXT
 
 Ecu = CarParams.Ecu
 
@@ -1098,4 +1098,4 @@ FW_VERSIONS = {
   },
 }
 
-FW_VERSIONS = merge_fw_versions(FW_VERSIONS, FW_VERSIONS_EXT)
+FW_VERSIONS = extend_fw_versions(FW_VERSIONS, FW_VERSIONS_EXT)

iqdbc_repo/iqdbc/car/honda/hondacan.py

@@ -2,7 +2,7 @@ from iqdbc.car import CanBusBase
 from iqdbc.car.common.conversions import Conversions as CV
 from iqdbc.car.honda.values import (HondaFlags, HONDA_BOSCH, HONDA_BOSCH_ALT_RADAR, HONDA_BOSCH_RADARLESS,
                                       HONDA_BOSCH_CANFD, CarControllerParams)
-from iqdbc.iqpilot.car.honda.values_ext import HondaFlagsIQ
+from iqdbc.lvbs.car.honda.values_ext import HondaFlagsIQ
 
 # CAN bus layout with relay
 # 0 = ACC-CAN - radar side

iqdbc_repo/iqdbc/car/honda/interface.py

@@ -11,7 +11,7 @@ from iqdbc.car.honda.carstate import CarState
 from iqdbc.car.honda.radar_interface import RadarInterface
 from iqdbc.car.interfaces import CarInterfaceBase
 
-from iqdbc.iqpilot.car.honda.values_ext import HondaFlagsIQ, HondaSafetyFlagsIQ
+from iqdbc.lvbs.car.honda.values_ext import HondaFlagsIQ, HondaSafetyFlagsIQ
 
 TransmissionType = structs.CarParams.TransmissionType
 

iqdbc_repo/iqdbc/car/hyundai/carcontroller.py

@@ -8,10 +8,10 @@ from iqdbc.car.hyundai.hyundaicanfd import CanBus
 from iqdbc.car.hyundai.values import HyundaiFlags, Buttons, CarControllerParams, CAR
 from iqdbc.car.interfaces import CarControllerBase
 
-from iqdbc.iqpilot.car.hyundai.escc import EsccCarController
-from iqdbc.iqpilot.car.hyundai.longitudinal.controller import LongitudinalController
-from iqdbc.iqpilot.car.hyundai.lead_data_ext import LeadDataCarController
-from iqdbc.iqpilot.car.hyundai.aol import AolCarController
+from iqdbc.lvbs.car.hyundai.escc import EsccCarController
+from iqdbc.lvbs.car.hyundai.longitudinal.controller import LongitudinalController
+from iqdbc.lvbs.car.hyundai.lead_data_ext import LeadDataCarController
+from iqdbc.lvbs.car.hyundai.aol import AolCarController
 
 VisualAlert = structs.CarControl.HUDControl.VisualAlert
 LongCtrlState = structs.CarControl.Actuators.LongControlState

iqdbc_repo/iqdbc/car/hyundai/carstate.py

@@ -9,10 +9,10 @@ from iqdbc.car.hyundai.hyundaicanfd import CanBus
 from iqdbc.car.hyundai.values import HyundaiFlags, CAR, DBC, Buttons, CarControllerParams
 from iqdbc.car.interfaces import CarStateBase
 
-from iqdbc.iqpilot.car.hyundai.carstate_ext import CarStateExt
-from iqdbc.iqpilot.car.hyundai.escc import EsccCarStateBase
-from iqdbc.iqpilot.car.hyundai.aol import AolCarState
-from iqdbc.iqpilot.car.hyundai.values import HyundaiFlagsIQ
+from iqdbc.lvbs.car.hyundai.carstate_ext import CarStateExt
+from iqdbc.lvbs.car.hyundai.escc import EsccCarStateBase
+from iqdbc.lvbs.car.hyundai.aol import AolCarState
+from iqdbc.lvbs.car.hyundai.values import HyundaiFlagsIQ
 
 ButtonType = structs.CarState.ButtonEvent.Type
 

iqdbc_repo/iqdbc/car/hyundai/fingerprints.py

@@ -2,8 +2,8 @@
 from iqdbc.car.structs import CarParams
 from iqdbc.car.hyundai.values import CAR
 
-from iqdbc.iqpilot.car.fingerprints_ext import merge_fw_versions
-from iqdbc.iqpilot.car.hyundai.fingerprints_ext import FW_VERSIONS_EXT
+from iqdbc.lvbs.car.fingerprints_ext import extend_fw_versions
+from iqdbc.lvbs.car.hyundai.fingerprints_ext import FW_VERSIONS_EXT
 
 Ecu = CarParams.Ecu
 
@@ -1286,4 +1286,4 @@ FW_VERSIONS = {
   },
 }
 
-FW_VERSIONS = merge_fw_versions(FW_VERSIONS, FW_VERSIONS_EXT)
+FW_VERSIONS = extend_fw_versions(FW_VERSIONS, FW_VERSIONS_EXT)

iqdbc_repo/iqdbc/car/hyundai/hyundaican.py

@@ -1,8 +1,8 @@
 import crcmod
 from iqdbc.car.hyundai.values import CAR, HyundaiFlags
 
-from iqdbc.iqpilot.car.hyundai.escc import EnhancedSmartCruiseControl
-from iqdbc.iqpilot.car.hyundai.lead_data_ext import CanLeadData
+from iqdbc.lvbs.car.hyundai.escc import EnhancedSmartCruiseControl
+from iqdbc.lvbs.car.hyundai.lead_data_ext import CanLeadData
 
 hyundai_checksum = crcmod.mkCrcFun(0x11D, initCrc=0xFD, rev=False, xorOut=0xdf)
 

iqdbc_repo/iqdbc/car/hyundai/hyundaicanfd.py

@@ -3,7 +3,7 @@ import numpy as np
 from iqdbc.car import CanBusBase
 from iqdbc.car.crc import CRC16_XMODEM
 from iqdbc.car.hyundai.values import HyundaiFlags
-from iqdbc.iqpilot.car.hyundai.lead_data_ext import CanFdLeadData
+from iqdbc.lvbs.car.hyundai.lead_data_ext import CanFdLeadData
 
 
 class CanBus(CanBusBase):

iqdbc_repo/iqdbc/car/hyundai/interface.py

@@ -10,9 +10,9 @@ from iqdbc.car.hyundai.carcontroller import CarController
 from iqdbc.car.hyundai.carstate import CarState
 from iqdbc.car.hyundai.radar_interface import RadarInterface
 
-from iqdbc.iqpilot.car.hyundai.escc import ESCC_MSG
-from iqdbc.iqpilot.car.hyundai.longitudinal.helpers import get_longitudinal_tune
-from iqdbc.iqpilot.car.hyundai.values import HyundaiFlagsIQ, HyundaiSafetyFlagsIQ
+from iqdbc.lvbs.car.hyundai.escc import ESCC_MSG
+from iqdbc.lvbs.car.hyundai.longitudinal.helpers import get_longitudinal_tune
+from iqdbc.lvbs.car.hyundai.values import HyundaiFlagsIQ, HyundaiSafetyFlagsIQ
 
 ButtonType = structs.CarState.ButtonEvent.Type
 Ecu = structs.CarParams.Ecu

iqdbc_repo/iqdbc/car/hyundai/radar_interface.py

@@ -5,7 +5,7 @@ from iqdbc.car import Bus, structs
 from iqdbc.car.interfaces import RadarInterfaceBase
 from iqdbc.car.hyundai.values import DBC
 
-from iqdbc.iqpilot.car.hyundai.radar_interface_ext import RadarInterfaceExt
+from iqdbc.lvbs.car.hyundai.radar_interface_ext import RadarInterfaceExt
 
 RADAR_START_ADDR = 0x500
 RADAR_MSG_COUNT = 32

iqdbc_repo/iqdbc/car/hyundai/values.py

@@ -8,7 +8,7 @@ from iqdbc.car.structs import CarParams
 from iqdbc.car.docs_definitions import CarHarness, CarDocs, CarParts, SupportType
 from iqdbc.car.fw_query_definitions import FwQueryConfig, Request, p16
 
-from iqdbc.iqpilot.car.hyundai.values import HyundaiFlagsIQ
+from iqdbc.lvbs.car.hyundai.values import HyundaiFlagsIQ
 
 Ecu = CarParams.Ecu
 

iqdbc_repo/iqdbc/car/interfaces.py

@@ -18,7 +18,7 @@ from iqdbc.car.values import PLATFORMS
 from iqdbc.can import CANParser
 from iqdbc.car.carlog import carlog
 
-from iqdbc.iqpilot.car.interfaces import CarInterfaceBaseIQ
+from iqdbc.lvbs.car.interfaces import CarInterfaceBaseIQ
 
 GearShifter = structs.CarState.GearShifter
 ButtonType = structs.CarState.ButtonEvent.Type

iqdbc_repo/iqdbc/car/nissan/carstate.py

@@ -5,7 +5,7 @@ from iqdbc.car import Bus, create_button_events, structs
 from iqdbc.car.common.conversions import Conversions as CV
 from iqdbc.car.interfaces import CarStateBase
 from iqdbc.car.nissan.values import CAR, DBC, CarControllerParams
-from iqdbc.iqpilot.car.nissan.carstate_ext import CarStateExt
+from iqdbc.lvbs.car.nissan.carstate_ext import CarStateExt
 
 ButtonType = structs.CarState.ButtonEvent.Type
 

iqdbc_repo/iqdbc/car/nissan/interface.py

@@ -3,7 +3,7 @@ from iqdbc.car.interfaces import CarInterfaceBase
 from iqdbc.car.nissan.carcontroller import CarController
 from iqdbc.car.nissan.carstate import CarState
 from iqdbc.car.nissan.values import CAR, NissanSafetyFlags
-from iqdbc.iqpilot.car.nissan.values import NissanSafetyFlagsIQ
+from iqdbc.lvbs.car.nissan.values import NissanSafetyFlagsIQ
 
 class CarInterface(CarInterfaceBase):
   CarState = CarState

iqdbc_repo/iqdbc/car/rivian/carcontroller.py

@@ -6,7 +6,7 @@ from iqdbc.car.interfaces import CarControllerBase
 from iqdbc.car.rivian.riviancan import create_lka_steering, create_longitudinal, create_wheel_touch, create_adas_status
 from iqdbc.car.rivian.values import CarControllerParams
 
-from iqdbc.iqpilot.car.rivian.aol import AolCarController
+from iqdbc.lvbs.car.rivian.aol import AolCarController
 
 
 class CarController(CarControllerBase, AolCarController):

iqdbc_repo/iqdbc/car/rivian/carstate.py

@@ -4,7 +4,7 @@ from iqdbc.car import Bus, structs
 from iqdbc.car.interfaces import CarStateBase
 from iqdbc.car.rivian.values import DBC, GEAR_MAP
 from iqdbc.car.common.conversions import Conversions as CV
-from iqdbc.iqpilot.car.rivian.carstate_ext import CarStateExt
+from iqdbc.lvbs.car.rivian.carstate_ext import CarStateExt
 
 GearShifter = structs.CarState.GearShifter
 

iqdbc_repo/iqdbc/car/rivian/interface.py

@@ -4,7 +4,7 @@ from iqdbc.car.rivian.carcontroller import CarController
 from iqdbc.car.rivian.carstate import CarState
 from iqdbc.car.rivian.radar_interface import RadarInterface
 from iqdbc.car.rivian.values import RivianSafetyFlags
-from iqdbc.iqpilot.car.rivian.values import RivianFlagsIQ
+from iqdbc.lvbs.car.rivian.values import RivianFlagsIQ
 
 
 class CarInterface(CarInterfaceBase):

iqdbc_repo/iqdbc/car/subaru/carcontroller.py

@@ -6,7 +6,7 @@ from iqdbc.car.interfaces import CarControllerBase
 from iqdbc.car.subaru import subarucan
 from iqdbc.car.subaru.values import DBC, GLOBAL_ES_ADDR, CanBus, CarControllerParams, SubaruFlags
 
-from iqdbc.iqpilot.car.subaru.stop_and_go import SnGCarController
+from iqdbc.lvbs.car.subaru.stop_and_go import IQStopAndGoController
 
 # FIXME: These limits aren't exact. The real limit is more than likely over a larger time period and
 # involves the total steering angle change rather than rate, but these limits work well for now
@@ -14,10 +14,10 @@ MAX_STEER_RATE = 25  # deg/s
 MAX_STEER_RATE_FRAMES = 7  # tx control frames needed before torque can be cut
 
 
-class CarController(CarControllerBase, SnGCarController):
+class CarController(CarControllerBase, IQStopAndGoController):
   def __init__(self, dbc_names, CP, CP_IQ):
     CarControllerBase.__init__(self, dbc_names, CP, CP_IQ)
-    SnGCarController.__init__(self, CP, CP_IQ)
+    IQStopAndGoController.__init__(self, CP, CP_IQ)
     self.apply_torque_last = 0
 
     self.cruise_button_prev = 0
@@ -139,7 +139,7 @@ class CarController(CarControllerBase, SnGCarController):
         if self.frame % 2 == 0:
           can_sends.append(subarucan.create_es_static_2(self.packer))
 
-    can_sends.extend(SnGCarController.create_stop_and_go(self, self.packer, CC, CS, self.frame))
+    can_sends.extend(IQStopAndGoController.create_stop_and_go(self, self.packer, CC, CS, self.frame))
 
     new_actuators = actuators.as_builder()
     new_actuators.torque = self.apply_torque_last / self.p.STEER_MAX

iqdbc_repo/iqdbc/car/subaru/carstate.py

@@ -6,15 +6,15 @@ from iqdbc.car.interfaces import CarStateBase
 from iqdbc.car.subaru.values import DBC, CanBus, SubaruFlags
 from iqdbc.car import CanSignalRateCalculator
 
-from iqdbc.iqpilot.car.subaru.aol import AolCarState
-from iqdbc.iqpilot.car.subaru.stop_and_go import SnGCarState
+from iqdbc.lvbs.car.subaru.aol import AolCarState
+from iqdbc.lvbs.car.subaru.stop_and_go import IQStopAndGoState
 
 
-class CarState(CarStateBase, AolCarState, SnGCarState):
+class CarState(CarStateBase, AolCarState, IQStopAndGoState):
   def __init__(self, CP, CP_IQ):
     CarStateBase.__init__(self, CP, CP_IQ)
     AolCarState.__init__(self, CP, CP_IQ)
-    SnGCarState.__init__(self, CP, CP_IQ)
+    IQStopAndGoState.__init__(self, CP, CP_IQ)
     can_define = CANDefine(DBC[CP.carFingerprint][Bus.pt])
     self.shifter_values = can_define.dv["Transmission"]["Gear"]
 
@@ -144,7 +144,7 @@ class CarState(CarStateBase, AolCarState, SnGCarState):
       self.es_infotainment_msg = copy.copy(cp_cam.vl["ES_Infotainment"])
 
     AolCarState.update_aol(self, ret, can_parsers)
-    SnGCarState.update(self, ret, can_parsers)
+    IQStopAndGoState.update(self, ret, can_parsers)
 
     return ret, ret_iq
 

iqdbc_repo/iqdbc/car/tesla/carcontroller.py

@@ -7,7 +7,7 @@ from iqdbc.car.tesla.teslacan import TeslaCAN
 from iqdbc.car.tesla.values import CarControllerParams
 from iqdbc.car.vehicle_model import VehicleModel
 from openpilot.iqpilot.selfdrive.car.enhanced_stock_longitudinal_control import get_set_speed_kph_from_params
-from iqdbc.iqpilot.car.tesla.coop_steering import CoopSteeringCarController
+from iqdbc.lvbs.car.tesla.coop_steering import CoopSteeringCarController
 
 
 def get_safety_CP():

iqdbc_repo/iqdbc/car/tesla/carstate.py

@@ -7,7 +7,7 @@ from iqdbc.car.interfaces import CarStateBase
 from iqdbc.car.tesla.teslacan import get_steer_ctrl_type
 from iqdbc.car.tesla.values import DBC, CANBUS, GEAR_MAP, STEER_THRESHOLD, TeslaFlags
 
-from iqdbc.iqpilot.car.tesla.carstate_ext import CarStateExt
+from iqdbc.lvbs.car.tesla.carstate_ext import CarStateExt
 
 ButtonType = structs.CarState.ButtonEvent.Type
 

iqdbc_repo/iqdbc/car/tesla/interface.py

@@ -5,7 +5,7 @@ from iqdbc.car.tesla.carstate import CarState
 from iqdbc.car.tesla.values import TeslaSafetyFlags, TeslaFlags, CANBUS, CAR, DBC, FSD_14_FW, Ecu
 from iqdbc.car.tesla.radar_interface import RadarInterface, RADAR_START_ADDR
 
-from iqdbc.iqpilot.car.tesla.values import TeslaFlagsIQ, TeslaSafetyFlagsIQ
+from iqdbc.lvbs.car.tesla.values import TeslaFlagsIQ, TeslaSafetyFlagsIQ
 
 
 class CarInterface(CarInterfaceBase):

iqdbc_repo/iqdbc/car/toyota/carcontroller.py

@@ -13,8 +13,8 @@ from iqdbc.car.toyota.values import CAR, NO_STOP_TIMER_CAR, TSS2_CAR, \
                                         UNSUPPORTED_DSU_CAR
 from iqdbc.can import CANPacker
 
-from iqdbc.iqpilot.car.toyota.gas_interceptor import GasInterceptorCarController
-from iqdbc.iqpilot.car.toyota.values import ToyotaFlagsIQ
+from iqdbc.lvbs.car.toyota.gas_interceptor import GasInterceptorCarController
+from iqdbc.lvbs.car.toyota.values import ToyotaFlagsIQ
 
 Ecu = structs.CarParams.Ecu
 LongCtrlState = structs.CarControl.Actuators.LongControlState

iqdbc_repo/iqdbc/car/toyota/carstate.py

@@ -8,8 +8,8 @@ from iqdbc.car.interfaces import CarStateBase
 from iqdbc.car.toyota.values import ToyotaFlags, CAR, DBC, STEER_THRESHOLD, NO_STOP_TIMER_CAR, \
                                                   TSS2_CAR, RADAR_ACC_CAR, EPS_SCALE, UNSUPPORTED_DSU_CAR, \
                                                   SECOC_CAR
-from iqdbc.iqpilot.car.toyota.carstate_ext import CarStateExt
-from iqdbc.iqpilot.car.toyota.values import ToyotaFlagsIQ
+from iqdbc.lvbs.car.toyota.carstate_ext import CarStateExt
+from iqdbc.lvbs.car.toyota.values import ToyotaFlagsIQ
 
 ButtonType = structs.CarState.ButtonEvent.Type
 SteerControlType = structs.CarParams.SteerControlType

iqdbc_repo/iqdbc/car/toyota/fingerprints.py

@@ -2,8 +2,8 @@
 from iqdbc.car.structs import CarParams
 from iqdbc.car.toyota.values import CAR
 
-from iqdbc.iqpilot.car.fingerprints_ext import merge_fw_versions
-from iqdbc.iqpilot.car.toyota.fingerprints_ext import FW_VERSIONS_EXT
+from iqdbc.lvbs.car.fingerprints_ext import extend_fw_versions
+from iqdbc.lvbs.car.toyota.fingerprints_ext import FW_VERSIONS_EXT
 
 Ecu = CarParams.Ecu
 
@@ -1889,4 +1889,4 @@ FW_VERSIONS = {
   },
 }
 
-FW_VERSIONS = merge_fw_versions(FW_VERSIONS, FW_VERSIONS_EXT)
+FW_VERSIONS = extend_fw_versions(FW_VERSIONS, FW_VERSIONS_EXT)

iqdbc_repo/iqdbc/car/toyota/interface.py

@@ -7,7 +7,7 @@ from iqdbc.car.toyota.values import Ecu, CAR, DBC, ToyotaFlags, CarControllerPar
                                                   ToyotaSafetyFlags, UNSUPPORTED_DSU_CAR
 from iqdbc.car.disable_ecu import disable_ecu
 from iqdbc.car.interfaces import CarInterfaceBase
-from iqdbc.iqpilot.car.toyota.values import ToyotaFlagsIQ, ToyotaSafetyFlagsIQ
+from iqdbc.lvbs.car.toyota.values import ToyotaFlagsIQ, ToyotaSafetyFlagsIQ
 
 SteerControlType = structs.CarParams.SteerControlType
 

iqdbc_repo/iqdbc/car/toyota/tests/test_toyota_iq.py

@@ -1,7 +1,7 @@
 from iqdbc.car import gen_empty_fingerprint, structs
 from iqdbc.car.toyota.interface import CarInterface
 from iqdbc.car.toyota.values import CAR, ToyotaFlags
-from iqdbc.iqpilot.car.toyota.values import ToyotaFlagsIQ
+from iqdbc.lvbs.car.toyota.values import ToyotaFlagsIQ
 
 
 def test_forced_secoc_toyota_clears_dashcam_mode():

iqdbc_repo/iqdbc/lvbs/car/chrysler/aol.py

@@ -8,7 +8,7 @@ from collections import namedtuple
 from iqdbc.car import Bus, structs
 from iqdbc.car.chrysler.values import RAM_CARS
 
-from iqdbc.iqpilot.aol_base import AolCarStateBase
+from iqdbc.lvbs.aol_base import AolCarStateBase
 from iqdbc.can.parser import CANParser
 
 AolDataIQ = namedtuple("AolDataIQ",

iqdbc_repo/iqdbc/lvbs/car/chrysler/carcontroller_ext.py

@@ -4,7 +4,7 @@ Copyright © IQ.Lvbs, apart of Project Teal Lvbs, All Rights Reserved, licensed
 from iqdbc.car import structs
 from iqdbc.car.interfaces import CarStateBase
 from iqdbc.car.chrysler.values import RAM_DT
-from iqdbc.iqpilot.car.chrysler.values_ext import ChryslerFlagsIQ
+from iqdbc.lvbs.car.chrysler.values_ext import ChryslerFlagsIQ
 
 GearShifter = structs.CarState.GearShifter
 

iqdbc_repo/iqdbc/lvbs/car/chrysler/carstate_ext.py

@@ -8,7 +8,7 @@ from enum import StrEnum
 from iqdbc.car import Bus, structs
 from iqdbc.can.parser import CANParser
 from iqdbc.car.chrysler.values import RAM_HD
-from iqdbc.iqpilot.car.chrysler.values_ext import BUTTONS
+from iqdbc.lvbs.car.chrysler.values_ext import BUTTONS
 
 
 class CarStateExt:

iqdbc_repo/iqdbc/lvbs/car/fingerprints_ext.py

@@ -3,7 +3,7 @@ Copyright © IQ.Lvbs, apart of Project Teal Lvbs, All Rights Reserved, licensed
 """
 
 
-def merge_fw_versions(fw_versions, new_fw_versions):
+def extend_fw_versions(fw_versions, new_fw_versions):
   """
     Merge firmware versions by extending lists for matching ECUs,
     adding all entries regardless of duplicates.
@@ -22,7 +22,7 @@ def merge_fw_versions(fw_versions, new_fw_versions):
   return fw_versions
 
 
-def merge_fingerprints(fingerprints, new_fingerprints):
+def extend_fingerprints(fingerprints, new_fingerprints):
   """
     Merge fingerprints by extending lists for matching keys,
     adding all entries regardless of duplicates.

iqdbc_repo/iqdbc/lvbs/car/ford/aol.py

@@ -6,7 +6,7 @@ from enum import StrEnum
 
 from iqdbc.car import Bus,structs
 
-from iqdbc.iqpilot.aol_base import AolCarStateBase
+from iqdbc.lvbs.aol_base import AolCarStateBase
 from iqdbc.can.parser import CANParser
 
 

iqdbc_repo/iqdbc/lvbs/car/gm/carstate_ext.py

@@ -6,7 +6,7 @@ from enum import StrEnum
 from iqdbc.car import Bus, structs
 from iqdbc.car.common.conversions import Conversions as CV
 from iqdbc.can.parser import CANParser
-from iqdbc.iqpilot.car.gm.values_ext import GMFlagsIQ
+from iqdbc.lvbs.car.gm.values_ext import GMFlagsIQ
 
 
 class CarStateExt:

iqdbc_repo/iqdbc/lvbs/car/gm/interface_ext.py

@@ -7,7 +7,7 @@ from math import exp
 from iqdbc.car import structs
 from iqdbc.car.common.basedir import BASEDIR
 from iqdbc.car.gm.interface import CAR
-from iqdbc.iqpilot.car.interfaces import LatControlInputs, NanoFFModel, TorqueFromLateralAccelCallbackTypeTorqueSpace
+from iqdbc.lvbs.car.interfaces import LatControlInputs, NanoFFModel, TorqueFromLateralAccelCallbackTypeTorqueSpace
 
 NON_LINEAR_TORQUE_PARAMS = {
   CAR.CHEVROLET_BOLT_EUV: [2.6531724862969748, 1.0, 0.1919764879840985, 0.009054123646805178],

iqdbc_repo/iqdbc/lvbs/car/honda/carstate_ext.py

@@ -5,7 +5,7 @@ from enum import StrEnum
 
 from iqdbc.car import Bus, structs
 from iqdbc.can.parser import CANParser
-from iqdbc.iqpilot.car.honda.values_ext import HondaFlagsIQ
+from iqdbc.lvbs.car.honda.values_ext import HondaFlagsIQ
 
 
 class CarStateExt:

iqdbc_repo/iqdbc/lvbs/car/honda/gas_interceptor.py

@@ -6,7 +6,7 @@ import numpy as np
 
 from iqdbc.car import structs
 from iqdbc.car.can_definitions import CanData
-from iqdbc.iqpilot.car import create_gas_interceptor_command
+from iqdbc.lvbs.car import create_gas_interceptor_command
 
 
 class GasInterceptorCarController:

iqdbc_repo/iqdbc/lvbs/car/hyundai/aol.py

@@ -9,8 +9,8 @@ from iqdbc.car import Bus, DT_CTRL, structs
 from iqdbc.car.hyundai.values import CAR
 
 from iqdbc.car.hyundai.values import HyundaiFlags
-from iqdbc.iqpilot.car.hyundai.values import HyundaiFlagsIQ
-from iqdbc.iqpilot.aol_base import AolCarStateBase
+from iqdbc.lvbs.car.hyundai.values import HyundaiFlagsIQ
+from iqdbc.lvbs.aol_base import AolCarStateBase
 from iqdbc.can.parser import CANParser
 
 ButtonType = structs.CarState.ButtonEvent.Type

iqdbc_repo/iqdbc/lvbs/car/hyundai/carstate_ext.py

@@ -7,7 +7,7 @@ from enum import StrEnum
 from iqdbc.car import Bus, structs
 from iqdbc.can.parser import CANParser
 from iqdbc.car.hyundai.values import HyundaiFlags
-from iqdbc.iqpilot.car.hyundai.values import HyundaiFlagsIQ
+from iqdbc.lvbs.car.hyundai.values import HyundaiFlagsIQ
 
 
 class CarStateExt:

iqdbc_repo/iqdbc/lvbs/car/hyundai/escc.py

@@ -1,6 +1,6 @@
 from iqdbc.car import structs
 
-from iqdbc.iqpilot.car.hyundai.values import HyundaiFlagsIQ
+from iqdbc.lvbs.car.hyundai.values import HyundaiFlagsIQ
 
 ESCC_MSG = 0x2AB
 

iqdbc_repo/iqdbc/lvbs/car/hyundai/longitudinal/controller.py

@@ -8,8 +8,8 @@ from dataclasses import dataclass
 from iqdbc.car import structs, DT_CTRL
 from iqdbc.car.interfaces import CarStateBase
 from iqdbc.car.hyundai.values import CarControllerParams
-from iqdbc.iqpilot.car.hyundai.longitudinal.helpers import get_car_config, jerk_limited_integrator, ramp_update
-from iqdbc.iqpilot.car.hyundai.values import HyundaiFlagsIQ
+from iqdbc.lvbs.car.hyundai.longitudinal.helpers import get_car_config, jerk_limited_integrator, ramp_update
+from iqdbc.lvbs.car.hyundai.values import HyundaiFlagsIQ
 
 LongCtrlState = structs.CarControl.Actuators.LongControlState
 

iqdbc_repo/iqdbc/lvbs/car/hyundai/longitudinal/helpers.py

@@ -6,7 +6,7 @@ import numpy as np
 
 from iqdbc.car import structs, DT_CTRL, rate_limit
 from iqdbc.car.hyundai.values import HyundaiFlags
-from iqdbc.iqpilot.car.hyundai.longitudinal.config import CarTuningConfig, TUNING_CONFIGS, CAR_SPECIFIC_CONFIGS
+from iqdbc.lvbs.car.hyundai.longitudinal.config import CarTuningConfig, TUNING_CONFIGS, CAR_SPECIFIC_CONFIGS
 
 JERK_THRESHOLD = 0.1
 JERK_STEP = 0.1

iqdbc_repo/iqdbc/lvbs/car/hyundai/radar_interface_ext.py

@@ -3,7 +3,7 @@ from iqdbc.car import structs, Bus
 from iqdbc.car.hyundai.hyundaicanfd import CanBus
 from iqdbc.car.hyundai.values import DBC, HyundaiFlags
 
-from iqdbc.iqpilot.car.hyundai.escc import EsccRadarInterfaceBase
+from iqdbc.lvbs.car.hyundai.escc import EsccRadarInterfaceBase
 
 
 class RadarInterfaceExt(EsccRadarInterfaceBase):

iqdbc_repo/iqdbc/lvbs/car/hyundai/tests/test_escc_base.py

@@ -1,9 +1,9 @@
 import pytest
 from hypothesis import given, strategies as st, settings, HealthCheck
-from iqdbc.iqpilot.car.hyundai.escc import EnhancedSmartCruiseControl, ESCC_MSG
+from iqdbc.lvbs.car.hyundai.escc import EnhancedSmartCruiseControl, ESCC_MSG
 from iqdbc.car.hyundai.carstate import CarState
 from iqdbc.car import structs
-from iqdbc.iqpilot.car.hyundai.values import HyundaiFlagsIQ
+from iqdbc.lvbs.car.hyundai.values import HyundaiFlagsIQ
 
 
 @pytest.fixture

iqdbc_repo/iqdbc/lvbs/car/hyundai/tests/test_lead_data_car_controller.py

@@ -1,6 +1,6 @@
 from enum import IntFlag
 
-from iqdbc.iqpilot.car.hyundai.lead_data_ext import LeadDataCarController, CanLeadData, CanFdLeadData
+from iqdbc.lvbs.car.hyundai.lead_data_ext import LeadDataCarController, CanLeadData, CanFdLeadData
 from iqdbc.car import structs
 from iqdbc.car.hyundai.values import HyundaiFlags
 

iqdbc_repo/iqdbc/lvbs/car/hyundai/tests/test_radar_interface_ext.py

@@ -3,7 +3,7 @@ from parameterized import parameterized
 from iqdbc.car import CanData
 from iqdbc.car.car_helpers import interfaces
 from iqdbc.car.hyundai.values import CAR, HyundaiFlags
-from iqdbc.iqpilot.car.hyundai.escc import ESCC_MSG
+from iqdbc.lvbs.car.hyundai.escc import ESCC_MSG
 
 ESCC_CARS = [
   (CAR.HYUNDAI_ELANTRA_2021, ESCC_MSG),

iqdbc_repo/iqdbc/lvbs/car/hyundai/tests/test_tuning_controller.py

@@ -6,8 +6,8 @@ import unittest
 import numpy as np
 from unittest.mock import Mock
 
-from iqdbc.iqpilot.car.hyundai.longitudinal.controller import LongitudinalController, LongitudinalState
-from iqdbc.iqpilot.car.hyundai.values import HyundaiFlagsIQ
+from iqdbc.lvbs.car.hyundai.longitudinal.controller import LongitudinalController, LongitudinalState
+from iqdbc.lvbs.car.hyundai.values import HyundaiFlagsIQ
 from iqdbc.car import DT_CTRL, structs
 from iqdbc.car.interfaces import CarStateBase
 from iqdbc.car.hyundai.values import HyundaiFlags

iqdbc_repo/iqdbc/lvbs/car/interfaces.py

@@ -10,12 +10,12 @@ from iqdbc.car import structs
 from iqdbc.car.can_definitions import CanRecvCallable, CanSendCallable
 from iqdbc.car.hyundai.values import HyundaiFlags
 from iqdbc.car.subaru.values import SubaruFlags
-from iqdbc.iqpilot.car.hyundai.enable_radar_tracks import enable_radar_tracks as hyundai_enable_radar_tracks
-from iqdbc.iqpilot.car.hyundai.longitudinal.helpers import LongitudinalTuningType
-from iqdbc.iqpilot.car.hyundai.values import HyundaiFlagsIQ
-from iqdbc.iqpilot.car.subaru.values_ext import SubaruFlagsIQ, SubaruSafetyFlagsIQ
-from iqdbc.iqpilot.car.tesla.values import TeslaFlagsIQ
-from iqdbc.iqpilot.car.toyota.values import ToyotaFlagsIQ
+from iqdbc.lvbs.car.hyundai.enable_radar_tracks import enable_radar_tracks as hyundai_enable_radar_tracks
+from iqdbc.lvbs.car.hyundai.longitudinal.helpers import LongitudinalTuningType
+from iqdbc.lvbs.car.hyundai.values import HyundaiFlagsIQ
+from iqdbc.lvbs.car.subaru.values_ext import SubaruFlagsIQ, SubaruSafetyFlagsIQ
+from iqdbc.lvbs.car.tesla.values import TeslaFlagsIQ
+from iqdbc.lvbs.car.toyota.values import ToyotaFlagsIQ
 
 
 class LatControlInputs(NamedTuple):
@@ -71,7 +71,7 @@ class NanoFFModel:
     return pred
 
 
-def setup_interfaces(CI, CP: structs.CarParams, CP_IQ: structs.IQCarParams,
+def apply_iq_car_config(CI, CP: structs.CarParams, CP_IQ: structs.IQCarParams,
                      params_list: list[dict[str, str]] | None = None,
                      can_recv: CanRecvCallable | None = None, can_send: CanSendCallable | None = None) -> None:
   if params_list is None:

iqdbc_repo/iqdbc/lvbs/car/nissan/carstate_ext.py

@@ -6,7 +6,7 @@ from enum import StrEnum
 
 from iqdbc.car import Bus, structs
 from iqdbc.can.parser import CANParser
-from iqdbc.iqpilot.car.nissan.values import BUTTONS
+from iqdbc.lvbs.car.nissan.values import BUTTONS
 
 
 class CarStateExt:

iqdbc_repo/iqdbc/lvbs/car/platform_list.py

@@ -12,7 +12,7 @@ CAR_LIST_JSON_OUT = os.path.join(BASEDIR, "../", "iqpilot", "car", "car_list.jso
 
 def get_car_list() -> dict[str, dict[str, list[str] | str]]:
   collected_footnote = get_all_footnotes()
-  sorted_list: dict[str, dict[str, list[str] | str]] = build_sorted_car_list(PLATFORMS, collected_footnote)
+  sorted_list: dict[str, dict[str, list[str] | str]] = collect_car_docs(PLATFORMS, collected_footnote)
   return sorted_list
 
 
@@ -22,7 +22,7 @@ def _natural_sort_key(s):
   return [int(t) if t.isdigit() else t.lower() for t in re.split(r'(\d+)', normalized) if t]
 
 
-def build_sorted_car_list(platforms, footnotes) -> dict[str, dict[str, list[str] | str]]:
+def collect_car_docs(platforms, footnotes) -> dict[str, dict[str, list[str] | str]]:
   cars: dict[str, dict[str, list[str] | str]] = {}
   for model, platform in platforms.items():
     car_docs = platform.config.get_all_docs()

iqdbc_repo/iqdbc/lvbs/car/rivian/carstate_ext.py

@@ -8,7 +8,7 @@ from iqdbc.car import Bus, structs
 from iqdbc.can.parser import CANParser
 from iqdbc.car.common.conversions import Conversions as CV
 from iqdbc.car.rivian.values import DBC
-from iqdbc.iqpilot.car.rivian.values import RivianFlagsIQ
+from iqdbc.lvbs.car.rivian.values import RivianFlagsIQ
 
 ButtonType = structs.CarState.ButtonEvent.Type
 

iqdbc_repo/iqdbc/lvbs/car/subaru/aol.py

@@ -6,7 +6,7 @@ from enum import StrEnum
 from iqdbc.car import Bus, structs
 
 from iqdbc.car.subaru.values import SubaruFlags
-from iqdbc.iqpilot.aol_base import AolCarStateBase
+from iqdbc.lvbs.aol_base import AolCarStateBase
 from iqdbc.can.parser import CANParser
 
 ButtonType = structs.CarState.ButtonEvent.Type

iqdbc_repo/iqdbc/lvbs/car/subaru/stop_and_go.py

@@ -10,15 +10,15 @@ from iqdbc.car.can_definitions import CanData
 from iqdbc.car.interfaces import CarStateBase
 from iqdbc.car.subaru.values import SubaruFlags
 
-from iqdbc.iqpilot.car.subaru import subarucan_ext
-from iqdbc.iqpilot.car.subaru.values_ext import SubaruFlagsIQ
+from iqdbc.lvbs.car.subaru import subarucan_ext
+from iqdbc.lvbs.car.subaru.values_ext import SubaruFlagsIQ
 from iqdbc.can.parser import CANParser
 
 _SNG_ACC_MIN_DIST = 3
 _SNG_ACC_MAX_DIST = 4.5
 
 
-class SnGCarController:
+class IQStopAndGoController:
   def __init__(self, CP: structs.CarParams, CP_IQ: structs.IQCarParams):
     self.CP = CP
     self.CP_IQ = CP_IQ
@@ -104,7 +104,7 @@ class SnGCarController:
     return can_sends
 
 
-class SnGCarState:
+class IQStopAndGoState:
   def __init__(self, CP: structs.CarParams, CP_IQ: structs.IQCarParams):
     self.CP = CP
     self.CP_IQ = CP_IQ

iqdbc_repo/iqdbc/lvbs/car/tesla/carstate_ext.py

@@ -7,7 +7,7 @@ from iqdbc.car import Bus, create_button_events, structs
 from iqdbc.can.parser import CANParser
 from iqdbc.car.common.conversions import Conversions as CV
 from iqdbc.car.tesla.values import DBC, CANBUS
-from iqdbc.iqpilot.car.tesla.values import TeslaFlagsIQ
+from iqdbc.lvbs.car.tesla.values import TeslaFlagsIQ
 
 ButtonType = structs.CarState.ButtonEvent.Type