From 6442caa3e456d7549899e8a6f8022f30f42b6058 Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Fri, 14 Oct 2022 01:31:44 +0300 Subject: [PATCH] Revert "fbt - fix flash usb without resources " This reverts commit ce173fd44c1dd5d7dc8b072fb91a073d78150061. --- scripts/update.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/scripts/update.py b/scripts/update.py index 1ff818c46..6be1dce06 100755 --- a/scripts/update.py +++ b/scripts/update.py @@ -80,7 +80,6 @@ class Main(App): stage_basename = "updater.bin" # used to be basename(self.args.stage) dfu_basename = "firmware.dfu" # used to be basename(self.args.dfu) radiobin_basename = "radio.bin" # used to be basename(self.args.radiobin) - radiobin_basename_arg = basename(self.args.radiobin) resources_basename = "" radio_version = 0 @@ -116,7 +115,7 @@ class Main(App): if self.args.dfu: dfu_size = os.stat(self.args.dfu).st_size shutil.copyfile(self.args.dfu, join(self.args.directory, dfu_basename)) - if radiobin_basename_arg: + if radiobin_basename: shutil.copyfile( self.args.radiobin, join(self.args.directory, radiobin_basename) ) @@ -156,13 +155,10 @@ class Main(App): file.writeComment("little-endian hex!") file.writeKey("Loader CRC", self.int2ffhex(self.crc(self.args.stage))) file.writeKey("Firmware", dfu_basename) - if radiobin_basename_arg: - file.writeKey("Radio", radiobin_basename) - else: - file.writeKey("Radio", "") + file.writeKey("Radio", radiobin_basename or "") file.writeKey("Radio address", self.int2ffhex(radio_addr)) file.writeKey("Radio version", self.int2ffhex(radio_version, 12)) - if radiobin_basename_arg: + if radiobin_basename: file.writeKey("Radio CRC", self.int2ffhex(self.crc(self.args.radiobin))) else: file.writeKey("Radio CRC", self.int2ffhex(0))