Skip to content

Match function prototypes from TwoWire #29

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

Closed
ahnolds wants to merge 2 commits into from
Closed

Match function prototypes from TwoWire #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68103fc
Match function prototypes from TwoWire
ahnolds Apr 16, 2020
8ec4b34
Update functions to match prototypes
ahnolds Apr 16, 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
33 changes: 33 additions & 0 deletions SoftwareWire.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,17 @@ uint8_t SoftwareWire::endTransmission(boolean sendStop)
return(_transmission); // return the transmission status that was set during writing address and data
}

//
uint8_t SoftwareWire::endTransmission(uint8_t sendStop)
{
return endTransmission((boolean) sendStop);
}

//
uint8_t SoftwareWire::endTransmission()
{
return endTransmission(true);
}

//
// The requestFrom() read the data from the I2C bus and stores it in a buffer.
Expand Down Expand Up @@ -292,13 +303,35 @@ uint8_t SoftwareWire::requestFrom(uint8_t address, uint8_t size, boolean sendSto
return( n);
}

//
uint8_t SoftwareWire::requestFrom(uint8_t address, uint8_t size)
{
return requestFrom(address, size, true)
}

//
uint8_t SoftwareWire::requestFrom(uint8_t address, uint8_t size, uint8_t sendStop)
{
return requestFrom(address, size, (boolean) sendStop)
}

//
uint8_t SoftwareWire::requestFrom(int address, int size, boolean sendStop)
{
return requestFrom( (uint8_t) address, (uint8_t) size, sendStop);
}

//
uint8_t SoftwareWire::requestFrom(int address, int size)
{
return requestFrom(address, size, true)
}

//
uint8_t SoftwareWire::requestFrom(int address, int size, uint8_t sendStop)
{
return requestFrom(address, size, (boolean) sendStop)
}

// must be called in:
// slave tx event callback
Expand Down
12 changes: 9 additions & 3 deletions SoftwareWire.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,15 @@ class SoftwareWire : public TwoWire
void setClock(uint32_t clock);
void beginTransmission(uint8_t address);
void beginTransmission(int address);
uint8_t endTransmission(boolean sendStop = true);
uint8_t requestFrom(uint8_t address, uint8_t size, boolean sendStop = true);
uint8_t requestFrom(int address, int size, boolean sendStop = true);
uint8_t endTransmission(boolean sendStop);
uint8_t endTransmission(uint8_t sendStop) override;
uint8_t endTransmission() override;
uint8_t requestFrom(uint8_t address, uint8_t size, boolean sendStop);
uint8_t requestFrom(uint8_t, uint8_t) override;
uint8_t requestFrom(uint8_t, uint8_t, uint8_t) override;
uint8_t requestFrom(int address, int size, boolean sendStop);
uint8_t requestFrom(int, int) override;
uint8_t requestFrom(int, int, int) override;
size_t write(uint8_t data) override;
size_t write(const uint8_t *data, size_t quantity) override;
int available(void) override;
Expand Down