summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHa Thach <[email protected]>2020-01-09 22:12:00 +0700
committerGitHub <[email protected]>2020-01-09 22:12:00 +0700
commite685aa9c5e551e00bd05332d092b019cad692b67 (patch)
treed33ab9e5fcc2bd9047dd0b44fb432e272ce784e4
parent99f76eaaaaceea1adcf010b6ab29246f5a32b08a (diff)
parent84bbe54e171c92efb669ccb9a4960e406c8afa17 (diff)
Merge pull request #262 from hathach/develop
follow up to #261
-rw-r--r--.github/workflows/build.yml1
-rw-r--r--.github/workflows/trigger.yml14
-rw-r--r--.travis.yml.bck (renamed from .travis.yml)0
-rw-r--r--README.md2
-rw-r--r--docs/boards.md1
-rw-r--r--hw/bsp/teensy_40/board.mk7
-rw-r--r--hw/bsp/teensy_40/teensy40.c3
-rw-r--r--tools/build_all.py10
8 files changed, 23 insertions, 15 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6e71351a9..4fc11f3dd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -52,3 +52,4 @@ jobs:
- name: Build
run: python3 tools/build_all.py ${{ matrix.example }}
+
diff --git a/.github/workflows/trigger.yml b/.github/workflows/trigger.yml
new file mode 100644
index 000000000..a7ef1341d
--- /dev/null
+++ b/.github/workflows/trigger.yml
@@ -0,0 +1,14 @@
+name: Trigger Repos
+
+on:
+ push:
+ branches: master
+
+jobs:
+ trigger:
+ runs-on: ubuntu-latest
+ steps:
+ - name: mynewt-tinyusb-example
+ shell: bash
+ run: |
+ curl -X POST -H "Authorization: token ${{ secrets.GH_REPO_TOKEN }}" -H "Accept: application/vnd.github.everest-preview+json" -H "Content-Type: application/json" --data '{"event_type": "rebuild"}' https://api.github.com/repos/hathach/mynewt-tinyusb-example/dispatches
diff --git a/.travis.yml b/.travis.yml.bck
index 2413e4225..2413e4225 100644
--- a/.travis.yml
+++ b/.travis.yml.bck
diff --git a/README.md b/README.md
index b85b60025..eabf924b7 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
![tinyUSB_240x100](https://user-images.githubusercontent.com/249515/62646655-f9393200-b978-11e9-9c53-484862f15503.png)
-[![Build Status](https://github.com/hathach/tinyusb/workflows/Build/badge.svg)](https://travis-ci.org/hathach/tinyusb) [![License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://opensource.org/licenses/MIT) [![Coverity](https://img.shields.io/coverity/scan/458.svg)](https://scan.coverity.com/projects/tinyusb)
+[![Build Status](https://github.com/hathach/tinyusb/workflows/Build/badge.svg)](https://github.com/hathach/tinyusb/actions) [![License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://opensource.org/licenses/MIT) [![Coverity](https://img.shields.io/coverity/scan/458.svg)](https://scan.coverity.com/projects/tinyusb)
TinyUSB is an open-source cross-platform USB Host/Device stack for embedded system, designed to be memory-safe with no dynamic allocation and thread-safe with all interrupt events are deferred then handled in the non-ISR task function.
diff --git a/docs/boards.md b/docs/boards.md
index 399278e52..c052552be 100644
--- a/docs/boards.md
+++ b/docs/boards.md
@@ -40,6 +40,7 @@ This code base already had supported for a handful of following boards (sorted a
- [MIMX RT1050 Evaluation Kit](https://www.nxp.com/design/development-boards/i.mx-evaluation-and-development-boards/i.mx-rt1050-evaluation-kit:MIMXRT1050-EVK)
- [MIMX RT1060 Evaluation Kit](https://www.nxp.com/design/development-boards/i.mx-evaluation-and-development-boards/mimxrt1060-evk-i.mx-rt1060-evaluation-kit:MIMXRT1060-EVK)
- [MIMX RT1064 Evaluation Kit](https://www.nxp.com/design/development-boards/i.mx-evaluation-and-development-boards/mimxrt1064-evk-i.mx-rt1064-evaluation-kit:MIMXRT1064-EVK)
+- [Teensy 4.0 Development Board](https://www.pjrc.com/store/teensy40.html)
### NXP LPC
diff --git a/hw/bsp/teensy_40/board.mk b/hw/bsp/teensy_40/board.mk
index 4bfc48bbf..955603e3b 100644
--- a/hw/bsp/teensy_40/board.mk
+++ b/hw/bsp/teensy_40/board.mk
@@ -48,6 +48,7 @@ FREERTOS_PORT = ARM_CM7
JLINK_DEVICE = MIMXRT1062xxx6A
JLINK_IF = swd
-# flash by copying bin file to DAP Mass Storage
-flash: $(BUILD)/$(BOARD)-firmware.bin
- cp $< /media/$(USER)/RT1060-EVK/
+# flash by using teensy_loader_cli https://github.com/PaulStoffregen/teensy_loader_cli
+# Make sure it is in your PATH
+flash: $(BUILD)/$(BOARD)-firmware.hex
+ teensy_loader_cli --mcu=imxrt1062 -v -w $<
diff --git a/hw/bsp/teensy_40/teensy40.c b/hw/bsp/teensy_40/teensy40.c
index 9c905dbbb..7c2bee539 100644
--- a/hw/bsp/teensy_40/teensy40.c
+++ b/hw/bsp/teensy_40/teensy40.c
@@ -78,7 +78,8 @@ void board_init(void)
// Button
IOMUXC_SetPinMux( BUTTON_PINMUX, 0U);
- gpio_pin_config_t button_config = { kGPIO_DigitalInput, 0, kGPIO_IntRisingEdge, };
+ IOMUXC_SetPinConfig(BUTTON_PINMUX, 0x01B0A0U);
+ gpio_pin_config_t button_config = { kGPIO_DigitalInput, 0, kGPIO_NoIntmode };
GPIO_PinInit(BUTTON_PORT, BUTTON_PIN, &button_config);
// UART
diff --git a/tools/build_all.py b/tools/build_all.py
index 2ea898f45..97294a9a3 100644
--- a/tools/build_all.py
+++ b/tools/build_all.py
@@ -4,10 +4,6 @@ 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
exit_status = 0
@@ -59,16 +55,10 @@ for example in all_examples:
success = "\033[31mfailed\033[0m "
fail_count += 1
- if travis:
- print('travis_fold:start:build-{}-{}\\r'.format(example, board))
-
print((build_format + '| {:.2f}s |').format(example, board, success, build_duration))
if build_result.returncode != 0:
print(build_result.stdout.decode("utf-8"))
- if travis:
- print('travis_fold:end:build-{}-{}\\r'.format(example, board))
-
# FreeRTOS example
# example = 'cdc_msc_hid_freertos'
# board = 'pca10056'