fix haldex bins maybe

Author: bri3d

VW_Flash.py

@@ -5,6 +5,7 @@
 import sys
 from os import path
 
+from lib import haldex_binfile
 from lib.extract_flash import extract_flash_from_frf
 from lib.constants import (
     BlockData,
@@ -210,12 +211,15 @@
 if args.dsg:
     flash_utils = dsg_flash_utils
 
-if args.haldex:
-    flash_utils = haldex_flash_utils
-
 if args.dq381:
     flash_utils = dq381_flash_utils
 
+if args.haldex:
+    flash_utils = haldex_flash_utils
+    binfile_handler = haldex_binfile.HaldexBinFileHandler(flash_info)
+else:
+    binfile_handler = binfile.BinFileHandler(flash_info)
+
 if args.interface == "USBISOTP":
     if args.usb_name is None:
         logger.error(
@@ -255,8 +259,8 @@ def input_blocks_from_frf(frf_path: str) -> dict[str, BlockData]:
     input_blocks = input_blocks_from_frf(args.frf)
 
 if args.input_bin:
-    input_blocks = binfile.blocks_from_bin(args.input_bin, flash_info, args.haldex)
-    logger.info(binfile.input_block_info(input_blocks, flash_info))
+    input_blocks = binfile_handler.blocks_from_bin(args.input_bin)
+    logger.info(binfile_handler.input_block_info(input_blocks))
 
 # build the dict that's used to proces the blocks
 #  'filename' : BlockData (block_number, binary_data)
@@ -273,8 +277,8 @@ def callback_function(t, flasher_step, flasher_status, flasher_progress):
     t.set_description(flasher_status, refresh=True)
 
 
-def flash_bin(flash_info: FlashInfo, input_blocks: dict[str, BlockData], is_dsg=False):
-    logger.info(binfile.input_block_info(input_blocks, flash_info))
+def flash_bin(flash_info: FlashInfo, input_blocks: dict[str, BlockData]):
+    logger.info(binfile_handler.input_block_info(input_blocks))
 
     t = tqdm.tqdm(
         total=100,
@@ -326,7 +330,7 @@ def wrap_callback_function(flasher_step, flasher_status, flasher_progress):
     )
 
     if args.output_bin:
-        outfile_data = binfile.bin_from_blocks(output_blocks, flash_info)
+        outfile_data = binfile_handler.bin_from_blocks(output_blocks)
         Path(args.output_bin).write_bytes(outfile_data)
     else:
         for filename in output_blocks:
@@ -353,7 +357,7 @@ def wrap_callback_function(flasher_step, flasher_status, flasher_progress):
     for did in ecuInfo:
         logger.debug(did + " - " + ecuInfo[did])
 
-    logger.info(binfile.input_block_info(input_blocks, flash_info))
+    logger.info(binfile_handler.input_block_info(input_blocks))
 
     cal_flash_blocks = {}
 

VW_Flash_GUI.py

@@ -12,7 +12,7 @@
 from zipfile import ZipFile
 from datetime import datetime
 
-from lib import extract_flash
+from lib import extract_flash, haldex_binfile
 from lib import binfile
 from lib import flash_uds
 from lib import simos_flash_utils
@@ -232,6 +232,7 @@ def __init__(self, parent):
         # Create a drop down menu
 
         self.flash_info = simos18.s18_flash_info
+        self.binfile_handler = binfile.BinFileHandler(self.flash_info)
         available_modules = [
             "Simos 18.1/6",
             "Simos 18.10",
@@ -325,6 +326,10 @@ def on_module_changed(self, event):
             dq381.dsg_flash_info,
             haldex4motion.haldex_flash_info,
         ][module_number]
+        if self.flash_info == haldex4motion.haldex_flash_info:
+            self.binfile_handler = haldex_binfile.HaldexBinFileHandler(self.flash_info)
+        else:
+            self.binfile_handler = binfile.BinFileHandler(self.flash_info)
 
     def on_get_info(self, event):
         (interface, interface_path) = split_interface_name(self.options["interface"])
@@ -435,10 +440,8 @@ def flash_bin_file(self, selected_file, patch_cboot=False):
                 )
             self.flash_bin(get_info=False, should_patch_cboot=patch_cboot)
         elif len(input_bytes) == self.flash_info.binfile_size:
-            self.input_blocks = binfile.blocks_from_bin(
+            self.input_blocks = self.binfile_handler.blocks_from_bin(
                 self.row_obj_dict[selected_file],
-                self.flash_info,
-                module_selection_is_haldex(self.module_choice.GetSelection()),
             )
             self.flash_bin(get_info=False, should_patch_cboot=patch_cboot)
         else:
@@ -477,8 +480,8 @@ def flash_cal(self, selected_file: str):
             )
             if module_selection_is_dq250(self.module_choice.GetSelection()):
                 self.feedback_text.AppendText("Extracting Driver from full binary...\n")
-            input_blocks = binfile.blocks_from_bin(
-                self.row_obj_dict[selected_file], self.flash_info
+            input_blocks = self.binfile_handler.blocks_from_bin(
+                self.row_obj_dict[selected_file]
             )
             # Filter to only CAL block.
             self.input_blocks = {
@@ -647,12 +650,12 @@ def prepare_file(self, selected_file, output_dir):
             + "\n"
         )
 
-        input_blocks = binfile.blocks_from_bin(selected_file, self.flash_info)
+        input_blocks = self.binfile_handler.blocks_from_bin(selected_file)
         output_blocks = flash_utils.checksum_and_patch_blocks(
             self.flash_info, input_blocks, should_patch_cboot=should_patch_cboot
         )
         output_file = Path(output_dir, "PATCHED_" + Path(selected_file).name)
-        outfile_data = binfile.bin_from_blocks(output_blocks, self.flash_info)
+        outfile_data = self.binfile_handler.bin_from_blocks(output_blocks)
         output_file.write_bytes(outfile_data)
 
         self.feedback_text.AppendText(
@@ -674,7 +677,7 @@ def flash_bin(self, get_info=True, should_patch_cboot=False):
 
         self.feedback_text.AppendText(
             "Starting to flash the following software components : \n"
-            + binfile.input_block_info(self.input_blocks, self.flash_info)
+            + self.binfile_handler.input_block_info(self.input_blocks)
             + "\n"
         )
 
@@ -1034,7 +1037,11 @@ def try_extract_frf(self, frf_data: bytes):
     def extract_frf_task(self, frf_path: str, output_path: str, callback):
         frf_name = str.removesuffix(frf_path, ".frf")
         [output_blocks, flash_info] = self.try_extract_frf(Path(frf_path).read_bytes())
-        outfile_data = binfile.bin_from_blocks(output_blocks, flash_info)
+        if flash_info == haldex4motion.haldex_flash_info:
+            bin_handler = haldex_binfile.HaldexBinFileHandler(flash_info)
+        else:
+            bin_handler = binfile.BinFileHandler(flash_info)
+        outfile_data = bin_handler.bin_from_blocks(output_blocks)
         callback(50)
         Path(output_path, Path(frf_name).name + ".bin").write_bytes(outfile_data)