Merge pull request #295 from hathach/develop

add webserver into ci build

21 files changed, 77 insertions, 41 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 729222512..54d4babac 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,8 +24,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        example: ['board_test', 'cdc_dual_ports', 'cdc_msc', 'dfu_rt', 'hid_composite', 
-                  'hid_generic_inout', 'midi_test', 'msc_dual_lun', 'usbtmc', 'webusb_serial']
+        example: ['board_test', 'cdc_dual_ports', 'cdc_msc', 'dfu_rt', 'hid_composite', 'hid_generic_inout', 
+                  'midi_test', 'msc_dual_lun', 'net_lwip_webserver', 'usbtmc', 'webusb_serial']
     steps:
     - name: Setup Python
       uses: actions/setup-python@v1
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index e1d5db693..6c83ef9c0 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -25,9 +25,11 @@
   * Board support for STM32F070RB Nucleo, STM32F303 Discovery
 
 * **[Peter Lawrence](https://github.com/majbthrd)**
-  * Nuvoton NUC 121, 125, 126 device driver port
-  * Board support for NuTiny NUC121s, NUC125s, NUC126V
-  * Complete multiple class interfaces & add cdc_dual_ports example 
+  * Nuvoton NUC 120, 121, 125, 126, 505 device driver port
+  * USBNET RNDIS, CDC-ECM, CDC-EEM class driver
+  * Added `net_lwip_webserver` example for demonstration of usbnet with lwip
+  * Board support for NuTiny NUC120, NUC121s, NUC125s, NUC126V, NUC505
+  * Complete multiple class interfaces & add cdc_dual_ports example
   
 * **[Scott Shawcroft](https://github.com/tannewt)**
   * SAMD21 and SAMD51 device driver port
diff --git a/README.md b/README.md
index 7ab55f781..211dcc50a 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ The stack supports the following MCUs:
 - **Sony:** CXD56
 - **ST:** STM32 series: L0, F0, F1, F2, F3, F4, F7, H7 (device only)
 - **[ValentyUSB](https://github.com/im-tomu/valentyusb)** eptri
-- **Nuvoton:** NUC121/NUC125, NUC126, NUC505
+- **Nuvoton:** NUC120, NUC121/NUC125, NUC126, NUC505
 
 [Here is the list of supported Boards](docs/boards.md) that can be used with provided examples.
 
@@ -50,6 +50,7 @@ Supports multiple device configurations by dynamically changing usb descriptors.
 - Human Interface Device (HID): Generic (In & Out), Keyboard, Mouse, Gamepad etc ...
 - Mass Storage Class (MSC): with multiple LUNs
 - Musical Instrument Digital Interface (MIDI)
+- Network with RNDIS, CDC-ECM, CDC-EEM (work in progress)
 - Vendor-specific class support with generic In & Out endpoints. Can be used with MS OS 2.0 compatible descriptor to load winUSB driver without INF file.
 - [WebUSB](https://github.com/WICG/webusb) with vendor-specific class
 
diff --git a/docs/boards.md b/docs/boards.md
index d56e39bd0..9667f6944 100644
--- a/docs/boards.md
+++ b/docs/boards.md
@@ -33,6 +33,7 @@ This code base already had supported for a handful of following boards (sorted a
 
 ### Nuvoton
 
+- NuTiny SDK NUC120
 - [NuTiny NUC121S](https://direct.nuvoton.com/en/nutiny-nuc121s)
 - [NuTiny NUC125S](https://direct.nuvoton.com/en/nutiny-nuc125s)
 - [NuTiny NUC126V](https://direct.nuvoton.com/en/nutiny-nuc126v)
diff --git a/examples/device/net_lwip_webserver/.skip.MCU_LPC11UXX b/examples/device/net_lwip_webserver/.skip.MCU_LPC11UXX
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/examples/device/net_lwip_webserver/.skip.MCU_LPC11UXX
diff --git a/examples/device/net_lwip_webserver/.skip.MCU_LPC13XX b/examples/device/net_lwip_webserver/.skip.MCU_LPC13XX
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/examples/device/net_lwip_webserver/.skip.MCU_LPC13XX
diff --git a/examples/device/net_lwip_webserver/.skip.MCU_NUC121 b/examples/device/net_lwip_webserver/.skip.MCU_NUC121
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/examples/device/net_lwip_webserver/.skip.MCU_NUC121
diff --git a/examples/device/net_lwip_webserver/.skip.MCU_STM32L0 b/examples/device/net_lwip_webserver/.skip.MCU_STM32L0
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/examples/device/net_lwip_webserver/.skip.MCU_STM32L0
diff --git a/examples/device/lwip_webserver/Makefile b/examples/device/net_lwip_webserver/Makefile
index a153c30be..a153c30be 100644
--- a/examples/device/lwip_webserver/Makefile
+++ b/examples/device/net_lwip_webserver/Makefile
diff --git a/examples/device/lwip_webserver/src/arch/cc.h b/examples/device/net_lwip_webserver/src/arch/cc.h
index 56a0cacf7..56a0cacf7 100644
--- a/examples/device/lwip_webserver/src/arch/cc.h
+++ b/examples/device/net_lwip_webserver/src/arch/cc.h
diff --git a/examples/device/lwip_webserver/src/lwipopts.h b/examples/device/net_lwip_webserver/src/lwipopts.h
index 23319592d..23319592d 100644
--- a/examples/device/lwip_webserver/src/lwipopts.h
+++ b/examples/device/net_lwip_webserver/src/lwipopts.h
diff --git a/examples/device/lwip_webserver/src/main.c b/examples/device/net_lwip_webserver/src/main.c
index c193aeb0f..c193aeb0f 100644
--- a/examples/device/lwip_webserver/src/main.c
+++ b/examples/device/net_lwip_webserver/src/main.c
diff --git a/examples/device/lwip_webserver/src/tusb_config.h b/examples/device/net_lwip_webserver/src/tusb_config.h
index 329fc80b9..329fc80b9 100644
--- a/examples/device/lwip_webserver/src/tusb_config.h
+++ b/examples/device/net_lwip_webserver/src/tusb_config.h
diff --git a/examples/device/lwip_webserver/src/usb_descriptors.c b/examples/device/net_lwip_webserver/src/usb_descriptors.c
index 26f8aeba6..26f8aeba6 100644
--- a/examples/device/lwip_webserver/src/usb_descriptors.c
+++ b/examples/device/net_lwip_webserver/src/usb_descriptors.c
diff --git a/examples/device/lwip_webserver/src/usb_descriptors.h b/examples/device/net_lwip_webserver/src/usb_descriptors.h
index 280570831..280570831 100644
--- a/examples/device/lwip_webserver/src/usb_descriptors.h
+++ b/examples/device/net_lwip_webserver/src/usb_descriptors.h
diff --git a/hw/bsp/samg55xplained/samg55xplained.c b/hw/bsp/samg55xplained/samg55xplained.c
index a5e145734..66a3d137f 100644
--- a/hw/bsp/samg55xplained/samg55xplained.c
+++ b/hw/bsp/samg55xplained/samg55xplained.c
@@ -24,13 +24,14 @@
  */
 
 #include "sam.h"
+#include "bsp/board.h"
+
 #include "peripheral_clk_config.h"
 #include "hal/include/hal_init.h"
 #include "hal/include/hpl_usart_sync.h"
 #include "hpl/pmc/hpl_pmc.h"
 #include "hal/include/hal_gpio.h"
 
-#include "bsp/board.h"
 
 //--------------------------------------------------------------------+
 // MACRO TYPEDEF CONSTANT ENUM DECLARATION
diff --git a/hw/bsp/spresense/board.mk b/hw/bsp/spresense/board.mk
index 2e88cf994..c6b5ce12a 100644
--- a/hw/bsp/spresense/board.mk
+++ b/hw/bsp/spresense/board.mk
@@ -1,5 +1,4 @@
 CFLAGS += \
-	-DCONFIG_WCHAR_BUILTIN \
 	-DCONFIG_HAVE_DOUBLE \
 	-Dmain=spresense_main \
 	-pipe \
@@ -14,6 +13,9 @@ CFLAGS += \
 	-fomit-frame-pointer \
 	-DCFG_TUSB_MCU=OPT_MCU_CXD56 \
 
+# lwip/src/core/raw.c:334:43: error: declaration of 'recv' shadows a global declaration
+CFLAGS += -Wno-error=shadow
+ 
 SPRESENSE_SDK = $(TOP)/hw/mcu/sony/cxd56/spresense-exported-sdk
 
 INC += \
diff --git a/hw/bsp/stm32f070rbnucleo/stm32F070rbtx_flash.ld b/hw/bsp/stm32f070rbnucleo/stm32F070rbtx_flash.ld
index 7ae8e5960..59e18f375 100644
--- a/hw/bsp/stm32f070rbnucleo/stm32F070rbtx_flash.ld
+++ b/hw/bsp/stm32f070rbnucleo/stm32F070rbtx_flash.ld
@@ -55,8 +55,8 @@ ENTRY(Reset_Handler)
 /* Highest address of the user mode stack */
 _estack = 0x20004000;	/* end of "RAM" Ram type memory */
 
-_Min_Heap_Size = 0x400;	/* required amount of heap  */
-_Min_Stack_Size = 0x600;	/* required amount of stack */
+_Min_Heap_Size = 0x200;	/* required amount of heap  */
+_Min_Stack_Size = 0x400;	/* required amount of stack */
 
 /* Memories definition */
 MEMORY
diff --git a/src/class/net/net_device.h b/src/class/net/net_device.h
index fee54163f..71483364d 100644
--- a/src/class/net/net_device.h
+++ b/src/class/net/net_device.h
@@ -31,6 +31,8 @@
 #include "common/tusb_common.h"
 #include "device/usbd.h"
 #include "class/cdc/cdc.h"
+
+// TODO should not include external files
 #include "lwip/pbuf.h"
 #include "netif/ethernet.h"
 
diff --git a/tools/build_all.py b/tools/build_all.py
index 97294a9a3..4f3e28747 100644
--- a/tools/build_all.py
+++ b/tools/build_all.py
@@ -1,18 +1,18 @@
 import os
-import shutil
+import glob
 import sys
 import subprocess
 import time
 
 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 = []
-
-# build all example if input not existed
 if len(sys.argv) > 1:
     all_examples.append(sys.argv[1])
 else:
@@ -22,11 +22,17 @@ else:
 
     # TODO update freeRTOS example to work with all boards (only nrf52840 now)
     all_examples.remove("cdc_msc_hid_freertos")
+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):
@@ -35,29 +41,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
+
+    return 0
 
-build_format = '| {:30} | {:30} | {:9} '
-build_separator = '-' * 87
+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 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
+
+            build_duration = time.monotonic() - start_time
+            print(build_format.format(example, board, success, "{:.2f}".format(build_duration), flash_size, sram_size))
 
-        print((build_format + '| {:.2f}s |').format(example, board, success, build_duration))
-        if build_result.returncode != 0:
-            print(build_result.stdout.decode("utf-8"))
+            if build_result.returncode != 0:
+                print(build_result.stdout.decode("utf-8"))
 
 # FreeRTOS example
 # example = 'cdc_msc_hid_freertos'
@@ -66,7 +103,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