Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_ESP32: add and use a "bool read(c)" method to AP_HAL

Browse Source 
this is much less likely to not work vs the int16_t equivalent
This commit is contained in:
Peter Barker 2023-02-21 20:35:57 +11:00 committed by Peter Barker
parent d601d83b4b
commit ec40a9641b
6 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/AP_HAL_ESP32/UARTDriver.cpp
View File

@ -139,16 +139,15 @@ ssize_t IRAM_ATTR UARTDriver::read(uint8_t *buffer, uint16_t count)
return ret; return ret;
} }
int16_t IRAM_ATTR UARTDriver::read() bool IRAM_ATTR UARTDriver::read(uint8_t &byte)
{ {
if (!_initialized) { if (!_initialized) {
return -1; return false;
} }
uint8_t byte;
if (!_readbuf.read_byte(&byte)) { if (!_readbuf.read_byte(&byte)) {
return -1; return false;
} }
return byte; return true;
} }
void IRAM_ATTR UARTDriver::_timer_tick(void) void IRAM_ATTR UARTDriver::_timer_tick(void)

2
libraries/AP_HAL_ESP32/UARTDriver.h
View File

@ -61,7 +61,7 @@ public:
uint32_t txspace() override; uint32_t txspace() override;
ssize_t read(uint8_t *buffer, uint16_t count) override; ssize_t read(uint8_t *buffer, uint16_t count) override;
int16_t read() override; bool read(uint8_t &b) override WARN_IF_UNUSED;
//ssize_t read(uint8_t *buffer, uint16_t count) override; //ssize_t read(uint8_t *buffer, uint16_t count) override;
//int16_t read_locked(uint32_t key) override; //int16_t read_locked(uint32_t key) override;

9
libraries/AP_HAL_ESP32/WiFiDriver.cpp
View File

@ -103,16 +103,15 @@ uint32_t WiFiDriver::txspace()
return MAX(result, 0); return MAX(result, 0);
} }
int16_t WiFiDriver::read() bool WiFiDriver::read(uint8_t &byte)
{ {
if (_state != CONNECTED) { if (_state != CONNECTED) {
return -1; return false;
} }
uint8_t byte;
if (!_readbuf.read_byte(&byte)) { if (!_readbuf.read_byte(&byte)) {
return -1; return false;
} }
return byte; return true;
} }
bool WiFiDriver::start_listen() bool WiFiDriver::start_listen()

2
libraries/AP_HAL_ESP32/WiFiDriver.h
View File

@ -39,7 +39,7 @@ public:
uint32_t available() override; uint32_t available() override;
uint32_t txspace() override; uint32_t txspace() override;
int16_t read() override; bool read(uint8_t &c) override;
size_t write(uint8_t c) override; size_t write(uint8_t c) override;
size_t write(const uint8_t *buffer, size_t size) override; size_t write(const uint8_t *buffer, size_t size) override;

11
libraries/AP_HAL_ESP32/WiFiUdpDriver.cpp
View File

@ -101,19 +101,18 @@ uint32_t WiFiUdpDriver::txspace()
return MAX(result, 0); return MAX(result, 0);
} }
int16_t WiFiUdpDriver::read() bool WiFiUdpDriver::read(uint8_t &c)
{ {
if (!_read_mutex.take_nonblocking()) { if (!_read_mutex.take_nonblocking()) {
return 0; return false;
} }
uint8_t byte; if (!_readbuf.read_byte(&c)) {
if (!_readbuf.read_byte(&byte)) { return false;
return -1;
} }
_read_mutex.give(); _read_mutex.give();
return byte; return true;
} }
bool WiFiUdpDriver::start_listen() bool WiFiUdpDriver::start_listen()

2
libraries/AP_HAL_ESP32/WiFiUdpDriver.h
View File

@ -38,7 +38,7 @@ public:
uint32_t available() override; uint32_t available() override;
uint32_t txspace() override; uint32_t txspace() override;
int16_t read() override; bool read(uint8_t &c) override;
size_t write(uint8_t c) override; size_t write(uint8_t c) override;
size_t write(const uint8_t *buffer, size_t size) override; size_t write(const uint8_t *buffer, size_t size) override;