@ -367,7 +367,6 @@ VOLKSWAGEN_RX_OFFSET = 0x6a
SPARE_PART_FW_PATTERN = re . compile ( b ' \xf1 \x87 (?P<gateway>[0-9][0-9A-Z] {2} )(?P<unknown>[0-9][0-9A-Z][0-9])(?P<unknown2>[0-9A-Z] {2} [0-9])([A-Z0-9]| ) ' )
SPARE_PART_FW_PATTERN = re . compile ( b ' \xf1 \x87 (?P<gateway>[0-9][0-9A-Z] {2} )(?P<unknown>[0-9][0-9A-Z][0-9])(?P<unknown2>[0-9A-Z] {2} [0-9])([A-Z0-9]| ) ' )
FW_QUERY_CONFIG = FwQueryConfig (
FW_QUERY_CONFIG = FwQueryConfig (
# TODO: add back whitelists after we gather enough data
requests = [ request for bus , obd_multiplexing in [ ( 1 , True ) , ( 1 , False ) , ( 0 , False ) ] for request in [
requests = [ request for bus , obd_multiplexing in [ ( 1 , True ) , ( 1 , False ) , ( 0 , False ) ] for request in [
Request (
Request (
[ VOLKSWAGEN_VERSION_REQUEST_MULTI ] ,
[ VOLKSWAGEN_VERSION_REQUEST_MULTI ] ,
@ -375,7 +374,6 @@ FW_QUERY_CONFIG = FwQueryConfig(
whitelist_ecus = [ Ecu . srs , Ecu . eps , Ecu . fwdRadar , Ecu . fwdCamera ] ,
whitelist_ecus = [ Ecu . srs , Ecu . eps , Ecu . fwdRadar , Ecu . fwdCamera ] ,
rx_offset = VOLKSWAGEN_RX_OFFSET ,
rx_offset = VOLKSWAGEN_RX_OFFSET ,
bus = bus ,
bus = bus ,
logging = ( bus != 1 or not obd_multiplexing ) ,
obd_multiplexing = obd_multiplexing ,
obd_multiplexing = obd_multiplexing ,
) ,
) ,
Request (
Request (
@ -383,10 +381,10 @@ FW_QUERY_CONFIG = FwQueryConfig(
[ VOLKSWAGEN_VERSION_RESPONSE ] ,
[ VOLKSWAGEN_VERSION_RESPONSE ] ,
whitelist_ecus = [ Ecu . engine , Ecu . transmission ] ,
whitelist_ecus = [ Ecu . engine , Ecu . transmission ] ,
bus = bus ,
bus = bus ,
logging = ( bus != 1 or not obd_multiplexing ) ,
obd_multiplexing = obd_multiplexing ,
obd_multiplexing = obd_multiplexing ,
) ,
) ,
] ] ,
] ] ,
non_essential_ecus = { Ecu . eps : list ( CAR ) } ,
extra_ecus = [ ( Ecu . fwdCamera , 0x74f , None ) ] ,
extra_ecus = [ ( Ecu . fwdCamera , 0x74f , None ) ] ,
)
)