Improve commands listing

This checks if all the commands are available on all the UARTS as it is
common for AT modem not to expose all the commands on all the UARTs.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

1 files changed, 46 insertions, 7 deletions

diff --git a/xmm.py b/xmm.py
index 6352b1f..6548639 100755
--- a/xmm.py
+++ b/xmm.py
@@ -25,8 +25,9 @@ EX_USAGE = 64
 
 def usage(progname):
     print("Usage:")
-    print("{} commands list # list available AT commands".format(progname))
-    print("{} commands help ".format(progname)
+    print("{} commands list        ".format(progname)
+          + "# list available AT commands")
+    print("{} commands help        ".format(progname)
           + "# list usage of available AT commands")
     sys.exit(EX_USAGE)
 
@@ -217,14 +218,52 @@ def get_ttys():
         sys.exit(0)
     return usb.get_ttys()
 
+
+def list_commands():
+    commands = {
+        'all' : [],
+    }
+
+    ttys = get_ttys()
+
+    assert(len(ttys) == 2)
+
+    for tty in ttys:
+        uart = UART(tty)
+        commands[tty] = uart.list_commands()
+        for command in commands[tty]:
+            if command not in commands['all']:
+                    commands['all'].append(command)
+
+    commands[ttys[0]].sort()
+    commands[ttys[1]].sort()
+    commands['all'].sort()
+
+    tty_specific_commands = False
+    for tty in ttys:
+        for command in commands['all']:
+            if command not in commands[tty]:
+                tty_specific_commands = True
+                break
+
+    if not tty_specific_commands:
+        print_header(ttys[0] + " and " + ttys[1])
+        for command in commands['all']:
+            print(command)
+    else:
+        print_header("All available commands:")
+        for command in commands['all']:
+            print(command)
+        for tty in ttys:
+            print_header(tty)
+            for command in commands['all']:
+                if command not in commands[tty]:
+                    print("- {}".format(command))
+
 if __name__ == '__main__':
     if len(sys.argv) == 3 and \
        sys.argv[1] == "commands" and sys.argv[2] == "list":
-        for tty in get_ttys():
-            print_header(tty)
-            uart = UART(tty)
-            for command in uart.list_commands():
-                print(command)
+        list_commands()
     elif len(sys.argv) == 3 and \
        sys.argv[1] == "commands" and sys.argv[2] == "help":
         for tty in get_ttys():