Skip to content
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

Merge to upsatream update #1

Merged
merged 6 commits into from
Oct 18, 2020
Merged

Merge to upsatream update #1

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
359f7a8
Fixed return value bug in TwoWire::write
mikljohansson Oct 10, 2020
9b077cb
Set default I2C frequency to 400kHz, same as Arduino boards use
mikljohansson Oct 10, 2020
7c7ec50
Return number of received bytes from TwoWire::requestFrom(), like Ard…
mikljohansson Oct 11, 2020
763c23d
Refacted TwoWire::begin() to reduce duplicated code with TwoWire::set…
mikljohansson Oct 11, 2020
78f7bb1
Flush buffers on every I2C transaction, in case the user hasn't consu…
mikljohansson Oct 11, 2020
dead5bc
Merge pull request #95 from mikljohansson/fix_twowire_compat
Neutree Oct 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fixed return value bug in TwoWire::write
  • Loading branch information
@mikljohansson
mikljohansson committed Oct 10, 2020
commit 359f7a89f20aeae0d1c35836cb90ed5ced1bea68
5 changes: 3 additions & 2 deletions libraries/Wire/src/Wire.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,16 +279,17 @@ TwoWire::requestFrom(uint16_t address, uint8_t size, bool sendStop) //请求数
size_t
TwoWire::write(uint8_t data) //写到txbuff
{
if(transmitting) {
if(transmitting && !i2c_tx_buff->isFull()) {
i2c_tx_buff->store_char(data);
return 1;
}
return 0;
}

size_t
TwoWire::write(const uint8_t *data, int quantity)
{
for(size_t i = 0; i < quantity; ++i) {
for(size_t i = 0; i < quantity; i++) {
if(!write(data[i])) {
return i;
}
Expand Down