summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Shawcroft <scott@tannewt.org>2018-02-26 15:26:09 -0800
committerGitHub <noreply@github.com>2018-02-26 15:26:09 -0800
commit6723c44d5a11f22393293c9255380a520cbc0659 (patch)
tree1aa4214ccd5c5618723dc763b9b93f9e49c97d34
parent6daf4bd222af9d98eff31769e2b9f2fb475a9899 (diff)
parent83635f22c448063656bd5f36be34c0af40ceb9d6 (diff)
Merge pull request #645 from dhalbert/3.0_itsy_express
consistently brand Itsy Bitsy M0 as 'Express'; update travis
-rw-r--r--.travis.yml2
-rw-r--r--ports/atmel-samd/boards/itsybitsy_m0_express/board.c (renamed from ports/atmel-samd/boards/itsybitsy_m0/board.c)0
-rw-r--r--ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.h (renamed from ports/atmel-samd/boards/itsybitsy_m0/mpconfigboard.h)2
-rw-r--r--ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk (renamed from ports/atmel-samd/boards/itsybitsy_m0/mpconfigboard.mk)0
-rw-r--r--ports/atmel-samd/boards/itsybitsy_m0_express/pins.c (renamed from ports/atmel-samd/boards/itsybitsy_m0/pins.c)0
5 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 77aea6e2b..75cf13969 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,8 +11,10 @@ env:
- TRAVIS_BOARD=feather_m0_rfm69
- TRAVIS_BOARD=feather_m0_rfm9x
- TRAVIS_BOARD=feather_m0_express
+ - TRAVIS_BOARD=itsybitsy_m0_express
- TRAVIS_BOARD=metro_m0_express
- TRAVIS_BOARD=metro_m4_express
+ - TRAVIS_BOARD=metro_m4_express_revb
- TRAVIS_BOARD=trinket_m0
- TRAVIS_BOARD=gemma_m0
- TRAVIS_BOARD=feather52
diff --git a/ports/atmel-samd/boards/itsybitsy_m0/board.c b/ports/atmel-samd/boards/itsybitsy_m0_express/board.c
index d7e856d61..d7e856d61 100644
--- a/ports/atmel-samd/boards/itsybitsy_m0/board.c
+++ b/ports/atmel-samd/boards/itsybitsy_m0_express/board.c
diff --git a/ports/atmel-samd/boards/itsybitsy_m0/mpconfigboard.h b/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.h
index 15a992221..82c5bbc61 100644
--- a/ports/atmel-samd/boards/itsybitsy_m0/mpconfigboard.h
+++ b/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.h
@@ -1,4 +1,4 @@
-#define MICROPY_HW_BOARD_NAME "Adafruit ItsyBitsy M0"
+#define MICROPY_HW_BOARD_NAME "Adafruit ItsyBitsy M0 Express"
#define MICROPY_HW_MCU_NAME "samd21g18"
#define CIRCUITPY_BITBANG_APA102
diff --git a/ports/atmel-samd/boards/itsybitsy_m0/mpconfigboard.mk b/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk
index 0fb0e38ed..0fb0e38ed 100644
--- a/ports/atmel-samd/boards/itsybitsy_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk
diff --git a/ports/atmel-samd/boards/itsybitsy_m0/pins.c b/ports/atmel-samd/boards/itsybitsy_m0_express/pins.c
index b70bb6a76..b70bb6a76 100644
--- a/ports/atmel-samd/boards/itsybitsy_m0/pins.c
+++ b/ports/atmel-samd/boards/itsybitsy_m0_express/pins.c