Skip to content

Arduino API extension: Stream::to() #171

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
d-a-v wants to merge 6 commits into from
Closed

Arduino API extension: Stream::to() #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dbdb588
Arduino API extension: Stream::read(buffer) imported from Arduino's C…
d-a-v Aug 3, 2020
25bf37f
Merge branch 'master' into streamTo
d-a-v Sep 21, 2020
5ba1e68
Merge branch 'master' into streamTo
d-a-v Nov 19, 2020
34dac63
Merge branch 'master' into streamTo
d-a-v Dec 22, 2020
320f033
Merge branch 'master' into streamTo
d-a-v Jan 1, 2021
a174c00
Merge branch 'master' into streamTo
d-a-v Jan 19, 2021
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
5 changes: 3 additions & 2 deletions src/SoftwareSerial.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,10 @@ int SoftwareSerial::read() {
return val;
}

size_t SoftwareSerial::read(uint8_t* buffer, size_t size) {

streamInt SoftwareSerial::read(uint8_t* buffer, size_t size) {
if (!m_rxValid) { return 0; }
size_t avail;
streamInt avail;
if (0 == (avail = m_buffer->pop_n(buffer, size))) {
rxBits();
avail = m_buffer->pop_n(buffer, size);
Expand Down
10 changes: 8 additions & 2 deletions src/SoftwareSerial.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@ enum SoftwareSerialConfig {
SWSERIAL_8S2,
};

#if STREAM_READ_RETURNS_INT // stream:to*()
using streamInt = int;
#else
using streamInt = size_t;
#endif

/// This class is compatible with the corresponding AVR one, however,
/// the constructor takes no arguments, for compatibility with the
/// HardwareSerial class.
Expand Down Expand Up @@ -156,9 +162,9 @@ class SoftwareSerial : public Stream {
return (0x9669 >> byte) & 1;
}
/// The read(buffer, size) functions are non-blocking, the same as readBytes but without timeout
size_t read(uint8_t* buffer, size_t size);
streamInt read(uint8_t* buffer, size_t size);
/// The read(buffer, size) functions are non-blocking, the same as readBytes but without timeout
size_t read(char* buffer, size_t size) {
streamInt read(char* buffer, size_t size) {
return read(reinterpret_cast<uint8_t*>(buffer), size);
}
/// @returns The number of bytes read into buffer, up to size. Times out if the limit set through
Expand Down