fix(arduino): Remove bootloader offset

Author: lucasssvaz

pytest-embedded-arduino/pytest_embedded_arduino/app.py

@@ -14,7 +14,6 @@ class ArduinoApp(App):
         fqbn (str): Fully Qualified Board Name.
         target (str) : ESPxx chip.
         flash_settings (dict[str, str]): Flash settings for the target.
-        bootloader_offset (int): Bootloader offset.
         binary_file (str): Merged binary file path.
         elf_file (str): ELF file path.
     """
@@ -34,15 +33,13 @@ def __init__(
         self.fqbn = self._get_fqbn(self.binary_path)
         self.target = self.fqbn.split(':')[2]
         self.flash_settings = self._get_flash_settings()
-        self.bootloader_offset = self._get_bootloader_offset()
         self.binary_file = os.path.realpath(os.path.join(self.binary_path, self.sketch + '.ino.merged.bin'))
         self.elf_file = os.path.realpath(os.path.join(self.binary_path, self.sketch + '.ino.elf'))
 
         logging.debug(f'Sketch name: {self.sketch}')
         logging.debug(f'FQBN: {self.fqbn}')
         logging.debug(f'Target: {self.target}')
         logging.debug(f'Flash settings: {self.flash_settings}')
-        logging.debug(f'Bootloader offset: {self.bootloader_offset}')
         logging.debug(f'Binary file: {self.binary_file}')
         logging.debug(f'ELF file: {self.elf_file}')
 
@@ -72,17 +69,6 @@ def _get_fqbn(self, build_path: str) -> str:
         fqbn = options['fqbn']
         return fqbn
 
-    def _get_bootloader_offset(self) -> int:
-        """Get bootloader offset from flash_args file."""
-        flash_args_file = os.path.realpath(os.path.join(self.binary_path, 'flash_args'))
-        with open(flash_args_file) as f:
-            bootloader_offset = int(f.readlines()[1].split(' ')[0].strip(), 16)
-
-        if bootloader_offset is None:
-            raise ValueError(f'Bootloader offset not found in {flash_args_file}')
-
-        return bootloader_offset
-
     def _get_flash_settings(self) -> dict[str, str]:
         """Get flash settings from flash_args file."""
         flash_args_file = os.path.realpath(os.path.join(self.binary_path, 'flash_args'))

pytest-embedded-arduino/pytest_embedded_arduino/serial.py

@@ -54,7 +54,7 @@ def flash(self) -> None:
                     '--chip',
                     self.app.target,
                     'write-flash',
-                    hex(self.app.bootloader_offset),
+                    '0x0', # Merged binary is flashed at offset 0
                     self.app.binary_file,
                     *flash_settings,
                 ],