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

Merge remote-tracking branch 'adafruit/master' into ringbuf-fixes

Browse Source
This commit is contained in:
Dan Halbert 2020-05-04 20:37:32 -04:00
commit 0105acb231
3 changed files with 3156 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -329,9 +329,14 @@ jobs:
gcc --version gcc --version
riscv64-unknown-elf-gcc --version riscv64-unknown-elf-gcc --version
python3 --version python3 --version
- uses: actions/checkout@v1 - uses: actions/checkout@v2
with: with:
submodules: true submodules: true
fetch-depth: 0
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
- run: git submodule sync
- run: git submodule foreach git remote -v
- run: git submodule foreach git fetch --recurse-submodules=no origin +refs/tags/*:refs/tags/*
- name: mpy-cross - name: mpy-cross
run: make -C mpy-cross -j2 run: make -C mpy-cross -j2
- name: build - name: build

3145
locale/sv.po Normal file
View File

File diff suppressed because it is too large Load Diff

9
supervisor/shared/external_flash/external_flash.c
View File

@ -218,11 +218,12 @@ void supervisor_flash_init(void) {
do { do {
spi_flash_read_command(CMD_READ_STATUS, read_status_response, 1); spi_flash_read_command(CMD_READ_STATUS, read_status_response, 1);
} while ((read_status_response[0] & 0x1) != 0); } while ((read_status_response[0] & 0x1) != 0);
// The suspended write/erase bit should be low. if (!flash_device->single_status_byte) {
do { // The suspended write/erase bit should be low.
do {
spi_flash_read_command(CMD_READ_STATUS2, read_status_response, 1); spi_flash_read_command(CMD_READ_STATUS2, read_status_response, 1);
} while ((read_status_response[0] & 0x80) != 0); } while ((read_status_response[0] & 0x80) != 0);
}
spi_flash_command(CMD_ENABLE_RESET); spi_flash_command(CMD_ENABLE_RESET);
spi_flash_command(CMD_RESET); spi_flash_command(CMD_RESET);