Merge branch 'master' into cr1901-msp430f5529

4 files changed, 80 insertions, 43 deletions

diff --git a/tools/build_all.py b/tools/build_all.py
index b20785049..08964bb76 100644
--- a/tools/build_all.py
+++ b/tools/build_all.py
@@ -1,31 +1,35 @@
 import os
-import shutil
+import glob
 import sys
 import subprocess
 import time
 
-travis = False
-if "TRAVIS" in os.environ and os.environ["TRAVIS"] == "true":
-    travis = True
-
 success_count = 0
 fail_count = 0
+skip_count = 0
 exit_status = 0
 
 total_time = time.monotonic()
 
+# 1st Argument is Example, build all examples if not existed
 all_examples = []
-for entry in os.scandir("examples/device"):
-    if entry.is_dir():
-        all_examples.append(entry.name)
-
-# TODO update freeRTOS example to work with all boards (only nrf52840 now)
-all_examples.remove("cdc_msc_hid_freertos")
+if len(sys.argv) > 1:
+    all_examples.append(sys.argv[1])
+else:
+    for entry in os.scandir("examples/device"):
+        if entry.is_dir():
+            all_examples.append(entry.name)
+all_examples.sort()
 
+# 2nd Argument is Board, build all boards if not existed
 all_boards = []
-for entry in os.scandir("hw/bsp"):
-    if entry.is_dir():
-        all_boards.append(entry.name)
+if len(sys.argv) > 2:
+    all_boards.append(sys.argv[2])
+else:
+    for entry in os.scandir("hw/bsp"):
+        if entry.is_dir():
+            all_boards.append(entry.name)
+all_boards.sort()
 
 
 def build_example(example, board):
@@ -34,35 +38,60 @@ def build_example(example, board):
     return subprocess.run("make -j 4 -C examples/device/{} BOARD={} all".format(example, board), shell=True,
                           stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
 
+def build_size(example, board):
+    elf_file = 'examples/device/{}/_build/build-{}/{}-firmware.elf'.format(example, board, board)
+    size_output = subprocess.run('size {}'.format(elf_file), shell=True, stdout=subprocess.PIPE).stdout.decode("utf-8")
+    size_list = size_output.split('\n')[1].split('\t')
+    flash_size = int(size_list[0])
+    sram_size = int(size_list[1]) + int(size_list[2])
+    return (flash_size, sram_size)
+
+def skip_example(example, board):
+    ex_dir = 'examples/device/' + example
+    board_mk = 'hw/bsp/{}/board.mk'.format(board)
+    for skip_file in glob.iglob(ex_dir + '/.skip.MCU_*'):
+        mcu_cflag = '-DCFG_TUSB_MCU=OPT_' + os.path.basename(skip_file).split('.')[2]
+        with open(board_mk) as mk:
+            if mcu_cflag in mk.read():
+                return 1
 
-build_format = '| {:30} | {:30} | {:9} '
-build_separator = '-' * 87
+    return 0
+
+build_format = '| {:20} | {:30} | {:9} | {:5} | {:6} | {:6} |'
+build_separator = '-' * 95
 print(build_separator)
-print((build_format + '| {:5} |').format('Example', 'Board', 'Result', 'Time'))
+print(build_format.format('Example', 'Board', 'Result', 'Time', 'Flash', 'SRAM'))
+
 for example in all_examples:
     print(build_separator)
     for board in all_boards:
         start_time = time.monotonic()
-        build_result = build_example(example, board)
-        build_duration = time.monotonic() - start_time
 
-        if build_result.returncode == 0:
-            success = "\033[32msucceeded\033[0m"
-            success_count += 1
+        flash_size = "-"
+        sram_size = "-"
+
+        # Check if board is skipped
+        if skip_example(example, board):
+            success = "\033[33mskipped\033[0m  "
+            skip_count += 1
+            print(build_format.format(example, board, success, '-', flash_size, sram_size))
         else:
-            exit_status = build_result.returncode
-            success = "\033[31mfailed\033[0m   "
-            fail_count += 1
+            build_result = build_example(example, board)
 
-        if travis:
-            print('travis_fold:start:build-{}-{}\\r'.format(example, board))
+            if build_result.returncode == 0:
+                success = "\033[32msucceeded\033[0m"
+                success_count += 1
+                (flash_size, sram_size) = build_size(example, board)
+            else:
+                exit_status = build_result.returncode
+                success = "\033[31mfailed\033[0m   "
+                fail_count += 1
 
-        print((build_format + '| {:.2f}s |').format(example, board, success, build_duration))
-        if build_result.returncode != 0:
-            print(build_result.stdout.decode("utf-8"))
+            build_duration = time.monotonic() - start_time
+            print(build_format.format(example, board, success, "{:.2f}".format(build_duration), flash_size, sram_size))
 
-        if travis:
-            print('travis_fold:end:build-{}-{}\\r'.format(example, board))
+            if build_result.returncode != 0:
+                print(build_result.stdout.decode("utf-8"))
 
 # FreeRTOS example
 # example = 'cdc_msc_hid_freertos'
@@ -71,7 +100,7 @@ for example in all_examples:
 
 total_time = time.monotonic() - total_time
 print(build_separator)
-print("Build Sumamary: {} \033[32msucceeded\033[0m, {} \033[31mfailed\033[0m and took {:.2f}s".format(success_count, fail_count, total_time))
+print("Build Sumamary: {} \033[32msucceeded\033[0m, {} \033[31mfailed\033[0m, {} \033[33mskipped\033[0m and took {:.2f}s".format(success_count, fail_count, skip_count, total_time))
 print(build_separator)
 
 sys.exit(exit_status)
diff --git a/tools/build_success.sh b/tools/build_success.sh
deleted file mode 100644
index df725bdce..000000000
--- a/tools/build_success.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-# Trigger mynewt-tinyusb-example repo each push
-curl -s -X POST \
-   -H "Content-Type: application/json" \
-   -H "Accept: application/json" \
-   -H "Travis-API-Version: 3" \
-   -H "Authorization: token $TRAVIS_TOKEN" \
-   -d '{ "request": { "branch":"master" }}' \
-   https://api.travis-ci.com/repo/hathach%2Fmynewt-tinyusb-example/requests
\ No newline at end of file
diff --git a/tools/usb_drivers/99-tinyusb.rules b/tools/usb_drivers/99-tinyusb.rules
new file mode 100644
index 000000000..334159f9a
--- /dev/null
+++ b/tools/usb_drivers/99-tinyusb.rules
@@ -0,0 +1,18 @@
+# Copy this file to the location of your distribution's udev rules, for example on Ubuntu:
+#   sudo cp 99-tinyusb.rules /etc/udev/rules.d/
+# Then reload udev configuration by executing:
+#   sudo udevadm control --reload-rules
+#   sudo udevadm trigger
+
+# Check SUBSYSTEM
+SUBSYSTEMS=="hidraw", KERNEL=="hidraw*", MODE="0666", GROUP="dialout"
+
+# Rule applies to all TinyUSB example
+ATTRS{idVendor}=="cafe", MODE="0666", GROUP="dialout"
+
+# Rule to blacklist TinyUSB example from being manipulated by ModemManager.
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="cafe", ENV{ID_MM_DEVICE_IGNORE}="1"
+
+# Xplained Pro SamG55 Device
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2111", MODE="0666", GROUP="users", ENV{ID_MM_DEVICE_IGNORE}="1"
+SUBSYSTEMS=="tty", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2111", MODE="0666", GROUP="users", ENV{ID_MM_DEVICE_IGNORE}="1"
diff --git a/tools/windows_cdc_driver/tusb_usbser.inf b/tools/usb_drivers/tinyusb_win_usbser.inf
index e7f7a9b22..e7f7a9b22 100644
--- a/tools/windows_cdc_driver/tusb_usbser.inf
+++ b/tools/usb_drivers/tinyusb_win_usbser.inf