8000 Port #4645 to main by dhalbert · Pull Request #4654 · adafruit/circuitpython · GitHub
[go: up one dir, main page]
Skip to content

Port #4645 to main #4654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Apr 24, 2021
Merged

Port #4645 to main #4654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1ae6f36
clone repo before installing deps
microdev1 Apr 1, 2021
49b878d
Merge pull request #4529 from dhalbert/6.2.x-rearrange-ci-task
tannewt Apr 1, 2021
8a8deb4
Put mouse before gamepad due to MacOS being finicky
dhalbert Apr 4, 2021
7157693
Merge pull request #4558 from dhalbert/6.2.x-fix-hid-order
jepler Apr 5, 2021
b3ffb3a
Return bytes written from RP2040 UART.write()
dhalbert Apr 21, 2021
f1b5249
Fix esp32s2 uart.write() return value
dhalbert Apr 22, 2021
c931c84
new cache id to fix failing xtensa builds
dhalbert Apr 22, 2021
9d8545e
Merge pull request #4645 from dhalbert/rp2040-uart-write
dhalbert Apr 23, 2021
454e78f
merge #4645 from 6.2.x to main
dhalbert Apr 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments. 8000
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ jobs:
id: idf-cache
with:
path: ${{ github.workspace }}/.idf_tools
key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/esp32s2/esp-idf/HEAD') }}-20210415
key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/esp32s2/esp-idf/HEAD') }}-20210422
- name: Clone IDF submodules
run: |
(cd $IDF_PATH && git submodule update --init)
Expand Down
8000 7 changes: 4 additions & 3 deletions ports/esp32s2/common-hal/busio/UART.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,13 +291,14 @@ size_t common_hal_busio_uart_write(busio_uart_obj_t *self, const uint8_t *data,
mp_raise_ValueError(translate("No TX pin"));
}

while (len > 0) {
int count = uart_tx_chars(self->uart_num, (const char *)data, len);
size_t left_to_write = len;
while (left_to_write > 0) {
int count = uart_tx_chars(self->uart_num, (const char *)data, left_to_write);
if (count < 0) {
*errcode = MP_EAGAIN;
return MP_STREAM_ERROR;
}
len -= count;
left_to_write -= count;
data += count;
RUN_BACKGROUND_TASKS;
}
Expand Down
7 changes: 4 additions & 3 deletions ports/raspberrypi/common-hal/busio/UART.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,12 +191,13 @@ size_t common_hal_busio_uart_write(busio_uart_obj_t *self, const uint8_t *data,
mp_raise_ValueError(translate("No TX pin"));
}

while (len > 0) {
while (uart_is_writable(self->uart) && len > 0) {
size_t left_to_write = len;
while (left_to_write > 0) {
while (uart_is_writable(self->uart) && left_to_write > 0) {
// Write and advance.
uart_get_hw(self->uart)->dr = *data++;
// Decrease how many chars left to write.
len--;
left_to_write--;
}
RUN_BACKGROUND_TASKS;
}
Expand Down
0