diff options
| author | hathach <[email protected]> | 2021-03-10 17:10:49 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2021-03-10 17:10:49 +0700 |
| commit | 794083b647d1e591fcdba441da56b6f7646ae573 (patch) | |
| tree | 040c54a46afd2f347fc8a474b17d881de3280eb7 /tools | |
| parent | de1f36f2b02b00d8012748be304186e1eb78c728 (diff) | |
| parent | f9817da397d9e24801bb1b7e2b8ed0ddcef36d62 (diff) | |
Merge branch 'master' into edpt_ISO_xfer
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/build_esp32s2.py | 4 | ||||
| -rw-r--r-- | tools/build_family.py | 8 | ||||
| -rw-r--r-- | tools/usb_drivers/99-tinyusb.rules | 18 |
3 files changed, 6 insertions, 24 deletions
diff --git a/tools/build_esp32s2.py b/tools/build_esp32s2.py index 6580b6562..0ef05023c 100644 --- a/tools/build_esp32s2.py +++ b/tools/build_esp32s2.py @@ -27,8 +27,8 @@ def filter_with_input(mylist): # Build all examples if not specified all_examples = [] for entry in os.scandir("examples/device"): - # Only includes example with CMakeLists.txt for esp32s - if entry.is_dir() and os.path.exists(entry.path + "/sdkconfig.defaults"): + # Only includes example with CMakeLists.txt for esp32s, and skip board_test to speed up ci + if entry.is_dir() and os.path.exists(entry.path + "/sdkconfig.defaults") and entry.name != 'board_test': all_examples.append(entry.name) filter_with_input(all_examples) all_examples.sort() diff --git a/tools/build_family.py b/tools/build_family.py index 23a08c663..65d0e8fc2 100644 --- a/tools/build_family.py +++ b/tools/build_family.py @@ -98,12 +98,12 @@ def build_size(example, board): def skip_example(example, board): ex_dir = 'examples/' + example + # family CMake + board_mk = 'hw/bsp/{}/family.cmake'.format(family) + # family.mk - board_mk = 'hw/bsp/{}/family.mk'.format(family) - - # family.cmake if not os.path.exists(board_mk): - board_mk = 'hw/bsp/{}/family.cmake'.format(family) + board_mk = 'hw/bsp/{}/family.mk'.format(family) with open(board_mk) as mk: mk_contents = mk.read() diff --git a/tools/usb_drivers/99-tinyusb.rules b/tools/usb_drivers/99-tinyusb.rules deleted file mode 100644 index 334159f9a..000000000 --- a/tools/usb_drivers/99-tinyusb.rules +++ /dev/null @@ -1,18 +0,0 @@ -# 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" |