mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-28 06:33:34 +08:00
serial: add txSpaceAvailable function (#26069)
* serial: add txSpaceAvailable function * serial: txSpaceAvailable and bytesAvailable fixups
This commit is contained in:
@@ -74,6 +74,11 @@ ssize_t Serial::bytesAvailable()
|
|||||||
return _impl.bytesAvailable();
|
return _impl.bytesAvailable();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ssize_t Serial::txSpaceAvailable()
|
||||||
|
{
|
||||||
|
return _impl.txSpaceAvailable();
|
||||||
|
}
|
||||||
|
|
||||||
ssize_t Serial::read(uint8_t *buffer, size_t buffer_size)
|
ssize_t Serial::read(uint8_t *buffer, size_t buffer_size)
|
||||||
{
|
{
|
||||||
return _impl.read(buffer, buffer_size);
|
return _impl.read(buffer, buffer_size);
|
||||||
|
|||||||
@@ -62,6 +62,7 @@ public:
|
|||||||
bool close();
|
bool close();
|
||||||
|
|
||||||
ssize_t bytesAvailable();
|
ssize_t bytesAvailable();
|
||||||
|
ssize_t txSpaceAvailable();
|
||||||
ssize_t read(uint8_t *buffer, size_t buffer_size);
|
ssize_t read(uint8_t *buffer, size_t buffer_size);
|
||||||
ssize_t readAtLeast(uint8_t *buffer, size_t buffer_size, size_t character_count = 1, uint32_t timeout_ms = 0);
|
ssize_t readAtLeast(uint8_t *buffer, size_t buffer_size, size_t character_count = 1, uint32_t timeout_ms = 0);
|
||||||
|
|
||||||
|
|||||||
@@ -293,12 +293,36 @@ ssize_t SerialImpl::bytesAvailable()
|
|||||||
{
|
{
|
||||||
if (!_open) {
|
if (!_open) {
|
||||||
PX4_ERR("Device not open!");
|
PX4_ERR("Device not open!");
|
||||||
|
errno = EBADF;
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
ssize_t bytes_available = 0;
|
ssize_t bytes_available = 0;
|
||||||
int ret = ioctl(_serial_fd, FIONREAD, &bytes_available);
|
int ret = ioctl(_serial_fd, FIONREAD, &bytes_available);
|
||||||
return ret >= 0 ? bytes_available : 0;
|
|
||||||
|
if (ret < 0) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return bytes_available;
|
||||||
|
}
|
||||||
|
|
||||||
|
ssize_t SerialImpl::txSpaceAvailable()
|
||||||
|
{
|
||||||
|
if (!_open) {
|
||||||
|
PX4_ERR("Device not open!");
|
||||||
|
errno = EBADF;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
ssize_t space_available = 0;
|
||||||
|
int ret = ioctl(_serial_fd, FIONSPACE, &space_available);
|
||||||
|
|
||||||
|
if (ret < 0) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return space_available;
|
||||||
}
|
}
|
||||||
|
|
||||||
ssize_t SerialImpl::read(uint8_t *buffer, size_t buffer_size)
|
ssize_t SerialImpl::read(uint8_t *buffer, size_t buffer_size)
|
||||||
|
|||||||
@@ -60,6 +60,7 @@ public:
|
|||||||
bool close();
|
bool close();
|
||||||
|
|
||||||
ssize_t bytesAvailable();
|
ssize_t bytesAvailable();
|
||||||
|
ssize_t txSpaceAvailable();
|
||||||
ssize_t read(uint8_t *buffer, size_t buffer_size);
|
ssize_t read(uint8_t *buffer, size_t buffer_size);
|
||||||
ssize_t readAtLeast(uint8_t *buffer, size_t buffer_size, size_t character_count = 1, uint32_t timeout_us = 0);
|
ssize_t readAtLeast(uint8_t *buffer, size_t buffer_size, size_t character_count = 1, uint32_t timeout_us = 0);
|
||||||
|
|
||||||
|
|||||||
@@ -60,6 +60,7 @@ public:
|
|||||||
bool close();
|
bool close();
|
||||||
|
|
||||||
ssize_t bytesAvailable();
|
ssize_t bytesAvailable();
|
||||||
|
ssize_t txSpaceAvailable();
|
||||||
ssize_t read(uint8_t *buffer, size_t buffer_size);
|
ssize_t read(uint8_t *buffer, size_t buffer_size);
|
||||||
ssize_t readAtLeast(uint8_t *buffer, size_t buffer_size, size_t character_count = 1, uint32_t timeout_us = 0);
|
ssize_t readAtLeast(uint8_t *buffer, size_t buffer_size, size_t character_count = 1, uint32_t timeout_us = 0);
|
||||||
|
|
||||||
|
|||||||
@@ -281,12 +281,31 @@ ssize_t SerialImpl::bytesAvailable()
|
|||||||
{
|
{
|
||||||
if (!_open) {
|
if (!_open) {
|
||||||
PX4_ERR("Device not open!");
|
PX4_ERR("Device not open!");
|
||||||
|
errno = EBADF;
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
ssize_t bytes_available = 0;
|
ssize_t bytes_available = 0;
|
||||||
int ret = ioctl(_serial_fd, FIONREAD, &bytes_available);
|
int ret = ioctl(_serial_fd, FIONREAD, &bytes_available);
|
||||||
return ret >= 0 ? bytes_available : 0;
|
|
||||||
|
if (ret < 0) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return bytes_available;
|
||||||
|
}
|
||||||
|
|
||||||
|
ssize_t SerialImpl::txSpaceAvailable()
|
||||||
|
{
|
||||||
|
if (!_open) {
|
||||||
|
PX4_ERR("Device not open!");
|
||||||
|
errno = EBADF;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// POSIX/Linux doesn't have a direct equivalent to NuttX's FIONSPACE
|
||||||
|
errno = ENOSYS;
|
||||||
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
ssize_t SerialImpl::read(uint8_t *buffer, size_t buffer_size)
|
ssize_t SerialImpl::read(uint8_t *buffer, size_t buffer_size)
|
||||||
|
|||||||
@@ -59,6 +59,7 @@ public:
|
|||||||
bool close();
|
bool close();
|
||||||
|
|
||||||
ssize_t bytesAvailable();
|
ssize_t bytesAvailable();
|
||||||
|
ssize_t txSpaceAvailable();
|
||||||
ssize_t read(uint8_t *buffer, size_t buffer_size);
|
ssize_t read(uint8_t *buffer, size_t buffer_size);
|
||||||
ssize_t readAtLeast(uint8_t *buffer, size_t buffer_size, size_t character_count = 1, uint32_t timeout_us = 0);
|
ssize_t readAtLeast(uint8_t *buffer, size_t buffer_size, size_t character_count = 1, uint32_t timeout_us = 0);
|
||||||
|
|
||||||
|
|||||||
@@ -156,14 +156,33 @@ ssize_t SerialImpl::bytesAvailable()
|
|||||||
{
|
{
|
||||||
if (!_open) {
|
if (!_open) {
|
||||||
PX4_ERR("Device not open!");
|
PX4_ERR("Device not open!");
|
||||||
|
errno = EBADF;
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t rx_bytes = 0;
|
uint32_t rx_bytes = 0;
|
||||||
(void) fc_uart_rx_available(_serial_fd, &rx_bytes);
|
int ret = fc_uart_rx_available(_serial_fd, &rx_bytes);
|
||||||
|
|
||||||
|
if (ret < 0) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
return (ssize_t) rx_bytes;
|
return (ssize_t) rx_bytes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ssize_t SerialImpl::txSpaceAvailable()
|
||||||
|
{
|
||||||
|
if (!_open) {
|
||||||
|
PX4_ERR("Device not open!");
|
||||||
|
errno = EBADF;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// QURT doesn't have a direct equivalent to NuttX's FIONSPACE
|
||||||
|
errno = ENOSYS;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
ssize_t SerialImpl::read(uint8_t *buffer, size_t buffer_size)
|
ssize_t SerialImpl::read(uint8_t *buffer, size_t buffer_size)
|
||||||
{
|
{
|
||||||
if (!_open) {
|
if (!_open) {
|
||||||
|
|||||||
Reference in New Issue
Block a user