Skip to content

Adds HardwareSerial::setRxTimeout() #6397

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 18 commits into from
Mar 28, 2022
Merged

Adds HardwareSerial::setRxTimeout() #6397

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
af0dabe
Adds HardwareSerial::onReceiveTimeout()
gonzabrusco Mar 8, 2022
ffe0882
Merge branch 'master' into uart_onreceive_timeout
SuGlider Mar 10, 2022
fa717e7
Fixed typo
gonzabrusco Mar 14, 2022
22c5c71
Merge branch 'master' into uart_onreceive_timeout
SuGlider Mar 17, 2022
fbc0734
Merge branch 'espressif:master' into uart_onreceive_timeout
gonzabrusco Mar 21, 2022
951ad87
Changes requested
gonzabrusco Mar 21, 2022
8db2400
Fix eventQueueReset
gonzabrusco Mar 21, 2022
1aff6b1
Changed _onReceiveTimeout to _rxTimeout for consistency
gonzabrusco Mar 21, 2022
42fe78f
Uniform uart_set_rx_timeout condition
gonzabrusco Mar 22, 2022
83ff56d
test _uart not NULL in eventQueueReset()
SuGlider Mar 22, 2022
be50818
revert last commit - no need for it
SuGlider Mar 22, 2022
281ae37
Merge branch 'master' into uart_onreceive_timeout
SuGlider Mar 24, 2022
807d750
adds onReceive() parameter
SuGlider Mar 24, 2022
d5de62c
Adds onReceive() parameter for timeout only
SuGlider Mar 24, 2022
c1b08e8
Adds back setRxTimeout()
SuGlider Mar 25, 2022
20ecdae
Adds setRxTimeout()
SuGlider Mar 25, 2022
5574fc4
Merge branch 'master' into uart_onreceive_timeout
SuGlider Mar 28, 2022
e67d1d2
CI Syntax error - "," missing
SuGlider Mar 28, 2022
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
Prev Previous commit
Next Next commit
Merge branch 'master' into uart_onreceive_timeout
  • Loading branch information
@SuGlider
SuGlider authored Mar 28, 2022
commit 5574fc408992d9cdb09b0315ec696f07e8b2a366
11 changes: 6 additions & 5 deletions cores/esp32/HardwareSerial.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,14 @@ void serialEventRun(void)

HardwareSerial::HardwareSerial(int uart_nr) :
_uart_nr(uart_nr),
_uart(NULL),
_rxBufferSize(256),
_onReceiveCB(NULL),
_onReceiveTimeout(true),
_rxTimeout(10),
_uart(NULL),
_rxBufferSize(256),
_txBufferSize(0),
_onReceiveCB(NULL),
_onReceiveErrorCB(NULL),
_eventTask(NULL)
_onReceiveTimeout(true),
_rxTimeout(10),
#if !CONFIG_DISABLE_HAL_LOCKS
,_lock(NULL)
#endif
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.