Skip to content

#240 Made Wire receiveFrom stopMaster() optional #459

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

#240 Made Wire receiveFrom stopMaster() optional #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions pic32/libraries/Wire/Wire.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ void TwoWire::begin(int address)
begin((uint8_t)address);
}

uint8_t TwoWire::requestFrom(uint8_t address, uint8_t quantity)
uint8_t TwoWire::requestFrom(uint8_t address, uint8_t quantity, bool sendstop)
{
DTWI::I2C_STATUS i2cStatus = di2c.getStatus();

Expand All @@ -201,14 +201,16 @@ uint8_t TwoWire::requestFrom(uint8_t address, uint8_t quantity)
i2cStatus = di2c.getStatus();
} while(i2cStatus.fMyBus && !i2cStatus.fNacking);

while(!di2c.stopMaster());
if (sendstop) {
while(!di2c.stopMaster());
}

return(di2c.available());
}

uint8_t TwoWire::requestFrom(int address, int quantity)
uint8_t TwoWire::requestFrom(int address, int quantity, bool sendstop)
{
return requestFrom((uint8_t)address, (uint8_t)quantity);
return requestFrom((uint8_t)address, (uint8_t)quantity, sendstop);
}

void TwoWire::beginTransmission(uint8_t address)
Expand Down
4 changes: 2 additions & 2 deletions pic32/libraries/Wire/Wire.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ class TwoWire
void beginTransmission(int);
uint8_t endTransmission(void);
uint8_t endTransmission(uint8_t);
uint8_t requestFrom(uint8_t, uint8_t);
uint8_t requestFrom(int, int);
uint8_t requestFrom(uint8_t, uint8_t, bool=true);
uint8_t requestFrom(int, int, bool=true);
void __attribute__((deprecated("Use write() instead"))) send(uint8_t);
void __attribute__((deprecated("Use write() instead"))) send(uint8_t*, uint8_t);
void __attribute__((deprecated("Use write() instead"))) send(int);
Expand Down