From dda837b94840ceac9397105a74a02093f4c99648 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Wed, 12 Jan 2022 22:20:37 +0100 Subject: [PATCH] Improved autoinstall --- rnodeconf/rnodeconf.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/rnodeconf/rnodeconf.py b/rnodeconf/rnodeconf.py index ed8ad0f..ac64346 100755 --- a/rnodeconf/rnodeconf.py +++ b/rnodeconf/rnodeconf.py @@ -1192,10 +1192,19 @@ def main(): if args.port: if args.flash: from subprocess import call + + if fw_filename == None: + fw_filename = "rnode_firmware.hex" + + if args.platform == None: + args.platform = ROM.PLATFORM_AVR + if args.autoinstall: fw_src = "./update/" else: - fw_src = "./firmware/" + import shutil + shutil.copy("./firmware/"+fw_filename, "./update/"+fw_filename) + fw_src = "./update/" if os.path.isfile(fw_src+fw_filename): try: @@ -1441,8 +1450,10 @@ def main(): RNS.log("No changes are being made.") exit() else: - RNS.log("Clearing old EEPROM, this will take about 15 seconds...") - rnode.wipe_eeprom() + if args.autoinstall: + RNS.log("Clearing old EEPROM, this will take about 15 seconds...") + rnode.wipe_eeprom() + if rnode.platform == ROM.PLATFORM_ESP32: RNS.log("Waiting for ESP32 reset...") time.sleep(6)