djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3587 from adafruit/6.0.x 

Merge in two fixes from 6.0.x
This commit is contained in:
Jeff Epler 2020-10-21 20:12:20 -05:00 committed by GitHub
parent 50e90088a2 1921143838
commit fa4c4c2c10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -131,7 +131,7 @@ jobs:
run: echo "$GITHUB_CONTEXT"
- name: Install dependencies
run: |
brew install gettext awscli
brew install gettext
echo >>$GITHUB_PATH /usr/local/opt/gettext/bin
- name: Versions
run: |

2
ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.h
View File

@ -9,7 +9,7 @@
// These are pins not to reset.
// QSPI Data pins, PA23 is NeoPixel
#define MICROPY_PORT_A (PORT_PA08 | PORT_PA09 | PORT_PA10 | PORT_PA11 | PA23)
#define MICROPY_PORT_A (PORT_PA08 | PORT_PA09 | PORT_PA10 | PORT_PA11 | PORT_PA23)
// QSPI CS, QSPI SCK
#define MICROPY_PORT_B (PORT_PB10 | PORT_PB11)
#define MICROPY_PORT_C (0)