From e8b18a46a498c61599182f4a2859a9fd91ad9bb9 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Wed, 27 Feb 2019 19:51:09 +1100 Subject: [PATCH] Tools: uploader.py: break out a modemmanager_check --- Tools/scripts/uploader.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Tools/scripts/uploader.py b/Tools/scripts/uploader.py index f24a04ba34..70c1081d75 100755 --- a/Tools/scripts/uploader.py +++ b/Tools/scripts/uploader.py @@ -642,6 +642,14 @@ def ports_to_try(args): return portlist +def modemmanager_check(): + if os.path.exists("/usr/sbin/ModemManager"): + print(""" +========================================================================================================== +WARNING: You should uninstall ModemManager as it conflicts with any non-modem serial device (like Pixhawk) +========================================================================================================== +""") + def main(): # Parse commandline arguments @@ -657,10 +665,7 @@ def main(): args = parser.parse_args() # warn people about ModemManager which interferes badly with Pixhawk - if os.path.exists("/usr/sbin/ModemManager"): - print("==========================================================================================================") - print("WARNING: You should uninstall ModemManager as it conflicts with any non-modem serial device (like Pixhawk)") - print("==========================================================================================================") + modemmanager_check() # Load the firmware file fw = firmware(args.firmware)