Move CONF_SKIP_BOOTLOADER into ZNP.connect

Author: puddly

zigpy_znp/api.py

@@ -155,13 +155,13 @@ def set_application(self, app):
     def _port_path(self) -> str:
         return self._config[conf.CONF_DEVICE][conf.CONF_DEVICE_PATH]
 
-    async def connect(self, *, test_port=True, skip_bootloader=False) -> None:
+    async def connect(self, *, test_port=True) -> None:
         assert self._uart is None
 
         try:
             self._uart = await uart.connect(self._config[conf.CONF_DEVICE], self)
 
-            if skip_bootloader:
+            if self._config[conf.CONF_ZNP_CONFIG][conf.CONF_SKIP_BOOTLOADER]:
                 LOGGER.debug("Sending first UART byte to the bootloader")
                 self._uart._transport_write(bytes([c.ubl.BootloaderRunMode.FORCE_RUN]))
 

zigpy_znp/zigbee/application.py

@@ -303,9 +303,7 @@ async def startup(self, auto_form=False):
         znp = ZNP(self.config)
         znp.set_application(self)
         self._bind_callbacks(znp)
-        await znp.connect(
-            skip_bootloader=self.config[conf.CONF_ZNP_CONFIG][conf.CONF_SKIP_BOOTLOADER]
-        )
+        await znp.connect()
 
         self._znp = znp