Skip to content

hwAvailable can return -1 if the serial port is NULL #2

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 1 commit into from
Feb 4, 2021
Merged

hwAvailable can return -1 if the serial port is NULL #2

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
18 changes: 9 additions & 9 deletions src/SparkFun_u-blox_SARA-R5_Arduino_Library.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,11 @@ boolean SARA_R5::bufferedPoll(void)
memset(saraResponseBacklog, 0, RXBuffSize);
}

if (hwAvailable() || backlogLen > 0) // If either new data is available, or backlog had data.
if (hwAvailable() > 0 || backlogLen > 0) // If either new data is available, or backlog had data.
{
while (micros() - timeIn < rxWindowUS && avail < RXBuffSize)
{
if (hwAvailable())
if (hwAvailable() > 0) //hwAvailable can return -1 if the serial port is NULL
{
c = readChar();
saraRXBuffer[avail++] = c;
Expand Down Expand Up @@ -198,11 +198,11 @@ boolean SARA_R5::poll(void)

memset(saraRXBuffer, 0, RXBuffSize);

if (hwAvailable())
if (hwAvailable() > 0) //hwAvailable can return -1 if the serial port is NULL
{
while (c != '\n')
{
if (hwAvailable())
if (hwAvailable() > 0) //hwAvailable can return -1 if the serial port is NULL
{
c = readChar();
saraRXBuffer[avail++] = c;
Expand Down Expand Up @@ -3239,7 +3239,7 @@ SARA_R5_error_t SARA_R5::waitForResponse(const char *expectedResponse, const cha

while ((!found) && ((timeIn + timeout) > millis()))
{
if (hwAvailable())
if (hwAvailable() > 0) //hwAvailable can return -1 if the serial port is NULL
{
char c = readChar();
if (_printDebug == true) _debugPort->print((String)c);
Expand Down Expand Up @@ -3305,7 +3305,7 @@ SARA_R5_error_t SARA_R5::sendCommandWithResponse(

while ((!found) && ((timeIn + commandTimeout) > millis()))
{
if (hwAvailable())
if (hwAvailable() > 0) //hwAvailable can return -1 if the serial port is NULL
{
char c = readChar();
if (_printDebug == true) _debugPort->print((String)c);
Expand Down Expand Up @@ -3352,11 +3352,11 @@ int SARA_R5::sendCommand(const char *command, boolean at)
int backlogIndex = strlen(saraResponseBacklog);

unsigned long timeIn = micros();
if (hwAvailable())
if (hwAvailable() > 0) //hwAvailable can return -1 if the serial port is NULL
{
while (micros()-timeIn < rxWindowUS && backlogIndex < RXBuffSize) //May need to escape on newline?
{
if (hwAvailable())
if (hwAvailable() > 0) //hwAvailable can return -1 if the serial port is NULL
{
char c = readChar();
saraResponseBacklog[backlogIndex++] = c;
Expand Down Expand Up @@ -3535,7 +3535,7 @@ int SARA_R5::readAvailable(char *inString)
if (_printDebug == true) _debugPort->println(inString);
}
#ifdef SARA_R5_SOFTWARE_SERIAL_ENABLED
if (_softSerial != NULL)
else if (_softSerial != NULL)
{
while (_softSerial->available())
{
Expand Down