Skip to content

Commit 67fbbc9

Browse files
authored
Merge pull request #5 from adafruit/develop
fix travis build for m4 and nrf5x
2 parents 427e98d + 949a81b commit 67fbbc9

File tree

3 files changed

+49
-7
lines changed

3 files changed

+49
-7
lines changed

.travis.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
language: c
2+
sudo: false
3+
cache:
4+
directories:
5+
- ~/arduino_ide
6+
- ~/.arduino15/packages/
7+
git:
8+
depth: false
9+
quiet: true
10+
env:
11+
global:
12+
- PRETTYNAME="Adafruit TinyUSB Library"
13+
#- DOXYFILE=$TRAVIS_BUILD_DIR/.doxyfile
14+
15+
addons:
16+
apt:
17+
packages:
18+
- python3
19+
- python3-pip
20+
- python3-setuptools
21+
22+
before_install:
23+
- wget -q https://raw.githubusercontent.com/adafruit/travis-ci-arduino/master/install.sh
24+
# add tinyusb option for m4
25+
- sed -i 's/\(m4:speed=120\)/\1,usbstack=tinyusb/g' install.sh
26+
- source install.sh
27+
28+
install:
29+
- arduino --install-library "Adafruit SPIFlash","Adafruit QSPI"
30+
- pip3 install --user adafruit-nrfutil
31+
32+
script:
33+
- build_m4_platforms
34+
- build_nrf5x_platforms
35+
36+
# Generate and deploy documentation
37+
after_success:
38+
- source <(curl -SLs https://raw.githubusercontent.com/adafruit/travis-ci-arduino/master/library_check.sh)
39+
#- source <(curl -SLs https://raw.githubusercontent.com/adafruit/travis-ci-arduino/master/doxy_gen_and_deploy.sh)

README.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
# Adafruit_TinyUSB_Arduino
2-
TinyUSB stack library for Arduino IDE. This library works with core platform that support TinyUSB stack, typically you will see folder `Adafruit_TinyUSB_Core` inside core folder. Support platform are:
1+
# Adafruit TinyUSB Library for Arduino
32

4-
- <https://github.com/adafruit/Adafruit_nRF52_Arduino>
5-
- <https://github.com/adafruit/ArduinoCore-samd> `TinyUSB` must be selected in `Tools->USB Stack`
3+
[![Build Status](https://travis-ci.com/adafruit/Adafruit_TinyUSB_Arduino.svg?branch=master)](https://travis-ci.com/adafruit/Adafruit_TinyUSB_Arduino)[![License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://opensource.org/licenses/MIT)
64

7-
In addition to CDC that provided by the core, this library provide platform-independent MSC, HID
5+
[TinyUSB](https://github.com/hathach/tinyusb) library for Arduino IDE. This library works with core platform that includes TinyUSB stack, typically you will see **Adafruit_TinyUSB_Core** inside core folder. Supported platform are:
86

9-
More document to write ...
7+
- [Adafruit_nRF52_Arduino](https://github.com/adafruit/Adafruit_nRF52_Arduino)
8+
- [Adafruit ArduinoCore-samd](https://github.com/adafruit/ArduinoCore-samd) **TinyUSB** must be selected in menu `Tools->USB Stack`
9+
10+
In addition to CDC that provided by the platform core, this library provide platform-independent MSC, HID
11+
12+
More document to write ...

src/Adafruit_USBD_MSC.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class Adafruit_USBD_MSC : Adafruit_USBD_Interface
5252
//------------- Single LUN API -------------//
5353
void setID(const char* vendor_id, const char* product_id, const char* product_rev)
5454
{
55-
setID(0, vendor_id, product_rev, product_rev);
55+
setID(0, vendor_id, product_id, product_rev);
5656
}
5757

5858
void setCapacity(uint32_t block_count, uint16_t block_size)

0 commit comments

Comments
 (0)