diff --git a/libraries/AP_HAL/utility/Stream.h b/libraries/AP_HAL/utility/Stream.h index 288cac4e9d..105b704b2e 100644 --- a/libraries/AP_HAL/utility/Stream.h +++ b/libraries/AP_HAL/utility/Stream.h @@ -15,10 +15,9 @@ public: * FastSerial library. As far as concerns go, it belongs with available() */ virtual int16_t txspace() = 0; - /* return value for read() and peek() : + /* return value for read(): * -1 if nothing available, uint8_t value otherwise. */ virtual int16_t read() = 0; - virtual int16_t peek() = 0; }; diff --git a/libraries/AP_HAL_AVR/Console.cpp b/libraries/AP_HAL_AVR/Console.cpp index 0e1ac8b9f4..d42d24f73b 100644 --- a/libraries/AP_HAL_AVR/Console.cpp +++ b/libraries/AP_HAL_AVR/Console.cpp @@ -77,10 +77,6 @@ int16_t AVRConsoleDriver::read() { return _base_uart->read(); } -int16_t AVRConsoleDriver::peek() { - return _base_uart->peek(); -} - // Print method implementations ///////////////////////////////////////// size_t AVRConsoleDriver::write(uint8_t c) { diff --git a/libraries/AP_HAL_AVR/Console.h b/libraries/AP_HAL_AVR/Console.h index dbd43d5959..36ced05a6b 100644 --- a/libraries/AP_HAL_AVR/Console.h +++ b/libraries/AP_HAL_AVR/Console.h @@ -30,7 +30,6 @@ public: int16_t available(); int16_t txspace(); int16_t read(); - int16_t peek(); /* Implementations of Print virtual methods */ size_t write(uint8_t c); diff --git a/libraries/AP_HAL_AVR/UARTDriver.cpp b/libraries/AP_HAL_AVR/UARTDriver.cpp index 454fee9028..418a035571 100644 --- a/libraries/AP_HAL_AVR/UARTDriver.cpp +++ b/libraries/AP_HAL_AVR/UARTDriver.cpp @@ -150,16 +150,6 @@ int16_t AVRUARTDriver::read(void) { return (c); } -int16_t AVRUARTDriver::peek(void) { - - // if the head and tail are equal, the buffer is empty - if (!_open || (_rxBuffer->head == _rxBuffer->tail)) - return (-1); - - // pull character from tail - return (_rxBuffer->bytes[_rxBuffer->tail]); -} - void AVRUARTDriver::flush(void) { // don't reverse this or there may be problems if the RX interrupt // occurs after reading the value of _rxBuffer->head but before writing diff --git a/libraries/AP_HAL_AVR/UARTDriver.h b/libraries/AP_HAL_AVR/UARTDriver.h index d7741f4154..e19965ccab 100644 --- a/libraries/AP_HAL_AVR/UARTDriver.h +++ b/libraries/AP_HAL_AVR/UARTDriver.h @@ -55,7 +55,6 @@ public: int16_t available(); int16_t txspace(); int16_t read(); - int16_t peek(); /* Implementations of Print virtual methods */ size_t write(uint8_t c); diff --git a/libraries/AP_HAL_AVR_SITL/Console.cpp b/libraries/AP_HAL_AVR_SITL/Console.cpp index b563681c8d..119f3d51eb 100644 --- a/libraries/AP_HAL_AVR_SITL/Console.cpp +++ b/libraries/AP_HAL_AVR_SITL/Console.cpp @@ -95,11 +95,6 @@ int16_t SITLConsoleDriver::read() return _base_uart->read(); } -int16_t SITLConsoleDriver::peek() -{ - return _base_uart->peek(); -} - // Print method implementations ///////////////////////////////////////// size_t SITLConsoleDriver::write(uint8_t c) diff --git a/libraries/AP_HAL_AVR_SITL/Console.h b/libraries/AP_HAL_AVR_SITL/Console.h index 024db60078..aeb0b74439 100644 --- a/libraries/AP_HAL_AVR_SITL/Console.h +++ b/libraries/AP_HAL_AVR_SITL/Console.h @@ -32,7 +32,6 @@ public: int16_t available(); int16_t txspace(); int16_t read(); - int16_t peek(); /* Implementations of Print virtual methods */ size_t write(uint8_t c); diff --git a/libraries/AP_HAL_AVR_SITL/UARTDriver.cpp b/libraries/AP_HAL_AVR_SITL/UARTDriver.cpp index c2d729065c..f99bb2fe9b 100644 --- a/libraries/AP_HAL_AVR_SITL/UARTDriver.cpp +++ b/libraries/AP_HAL_AVR_SITL/UARTDriver.cpp @@ -139,11 +139,6 @@ int16_t SITLUARTDriver::read(void) return -1; } -int16_t SITLUARTDriver::peek(void) -{ - return -1; -} - void SITLUARTDriver::flush(void) { } diff --git a/libraries/AP_HAL_AVR_SITL/UARTDriver.h b/libraries/AP_HAL_AVR_SITL/UARTDriver.h index e379148c85..13e37d99af 100644 --- a/libraries/AP_HAL_AVR_SITL/UARTDriver.h +++ b/libraries/AP_HAL_AVR_SITL/UARTDriver.h @@ -53,7 +53,6 @@ public: int16_t available(); int16_t txspace(); int16_t read(); - int16_t peek(); /* Implementations of Print virtual methods */ size_t write(uint8_t c); diff --git a/libraries/AP_HAL_Empty/Console.cpp b/libraries/AP_HAL_Empty/Console.cpp index 4c10515c32..c0638e7123 100644 --- a/libraries/AP_HAL_Empty/Console.cpp +++ b/libraries/AP_HAL_Empty/Console.cpp @@ -66,10 +66,6 @@ int16_t EmptyConsoleDriver::read() { return _d->read(); } -int16_t EmptyConsoleDriver::peek() { - return _d->peek(); -} - size_t EmptyConsoleDriver::write(uint8_t c) { return _d->write(c); } diff --git a/libraries/AP_HAL_Empty/Console.h b/libraries/AP_HAL_Empty/Console.h index eb467f4418..ffddf5aa04 100644 --- a/libraries/AP_HAL_Empty/Console.h +++ b/libraries/AP_HAL_Empty/Console.h @@ -23,7 +23,6 @@ public: int16_t available(); int16_t txspace(); int16_t read(); - int16_t peek(); size_t write(uint8_t c); private: diff --git a/libraries/AP_HAL_Empty/UARTDriver.cpp b/libraries/AP_HAL_Empty/UARTDriver.cpp index cba12cb24a..956ad8af87 100644 --- a/libraries/AP_HAL_Empty/UARTDriver.cpp +++ b/libraries/AP_HAL_Empty/UARTDriver.cpp @@ -25,7 +25,6 @@ void EmptyUARTDriver::vprintf_P(const prog_char *pstr, va_list ap) {} int16_t EmptyUARTDriver::available() { return 0; } int16_t EmptyUARTDriver::txspace() { return 1; } int16_t EmptyUARTDriver::read() { return -1; } -int16_t EmptyUARTDriver::peek() { return -1; } /* Empty implementations of Print virtual methods */ size_t EmptyUARTDriver::write(uint8_t c) { return 0; } diff --git a/libraries/AP_HAL_Empty/UARTDriver.h b/libraries/AP_HAL_Empty/UARTDriver.h index abd67f257a..0787126fe9 100644 --- a/libraries/AP_HAL_Empty/UARTDriver.h +++ b/libraries/AP_HAL_Empty/UARTDriver.h @@ -29,7 +29,6 @@ public: int16_t available(); int16_t txspace(); int16_t read(); - int16_t peek(); /* Empty implementations of Print virtual methods */ size_t write(uint8_t c); diff --git a/libraries/AP_HAL_PX4/Console.cpp b/libraries/AP_HAL_PX4/Console.cpp index d57af5c846..8b2cbafc34 100644 --- a/libraries/AP_HAL_PX4/Console.cpp +++ b/libraries/AP_HAL_PX4/Console.cpp @@ -71,10 +71,6 @@ int16_t PX4ConsoleDriver::read() { return _uart->read(); } -int16_t PX4ConsoleDriver::peek() { - return _uart->peek(); -} - size_t PX4ConsoleDriver::write(uint8_t c) { return _uart->write(c); } diff --git a/libraries/AP_HAL_PX4/Console.h b/libraries/AP_HAL_PX4/Console.h index 979c462ff0..51170a1b71 100644 --- a/libraries/AP_HAL_PX4/Console.h +++ b/libraries/AP_HAL_PX4/Console.h @@ -24,7 +24,6 @@ public: int16_t available(); int16_t txspace(); int16_t read(); - int16_t peek(); size_t write(uint8_t c); diff --git a/libraries/AP_HAL_PX4/UARTDriver.cpp b/libraries/AP_HAL_PX4/UARTDriver.cpp index 43b7a4de09..835c0a3458 100644 --- a/libraries/AP_HAL_PX4/UARTDriver.cpp +++ b/libraries/AP_HAL_PX4/UARTDriver.cpp @@ -130,10 +130,6 @@ int16_t PX4UARTDriver::read() { return -1; } -int16_t PX4UARTDriver::peek() { - return -1; -} - /* PX4 implementations of Print virtual methods */ size_t PX4UARTDriver::write(uint8_t c) { if (!_initialised) { diff --git a/libraries/AP_HAL_PX4/UARTDriver.h b/libraries/AP_HAL_PX4/UARTDriver.h index d25bdc5b9b..d510412b62 100644 --- a/libraries/AP_HAL_PX4/UARTDriver.h +++ b/libraries/AP_HAL_PX4/UARTDriver.h @@ -29,7 +29,6 @@ public: int16_t available(); int16_t txspace(); int16_t read(); - int16_t peek(); /* PX4 implementations of Print virtual methods */ size_t write(uint8_t c); diff --git a/libraries/AP_HAL_SMACCM/Console.cpp b/libraries/AP_HAL_SMACCM/Console.cpp index 7528a67084..87e3796c30 100644 --- a/libraries/AP_HAL_SMACCM/Console.cpp +++ b/libraries/AP_HAL_SMACCM/Console.cpp @@ -125,15 +125,6 @@ int16_t SMACCMConsoleDriver::read() } } -int16_t SMACCMConsoleDriver::peek() -{ - if (_user_backend) { - return _rxbuf.peek(); - } else { - return _d->peek(); - } -} - size_t SMACCMConsoleDriver::write(uint8_t c) { if (_user_backend) { @@ -192,15 +183,6 @@ int16_t SMACCMConsoleDriver::Buffer::pop() return (int16_t) b; } -int16_t SMACCMConsoleDriver::Buffer::peek() -{ - if ( _tail == _head ) { - return -1; - } - uint8_t b = _bytes[_tail]; - return (int16_t) b; -} - uint16_t SMACCMConsoleDriver::Buffer::bytes_used() { return ((_head - _tail) & _mask); diff --git a/libraries/AP_HAL_SMACCM/Console.h b/libraries/AP_HAL_SMACCM/Console.h index 59d5263129..38137c32b0 100644 --- a/libraries/AP_HAL_SMACCM/Console.h +++ b/libraries/AP_HAL_SMACCM/Console.h @@ -32,7 +32,6 @@ public: int16_t available(); int16_t txspace(); int16_t read(); - int16_t peek(); size_t write(uint8_t c); private: @@ -44,7 +43,6 @@ private: bool allocate(uint16_t size); bool push(uint8_t b); int16_t pop(); - int16_t peek(); uint16_t bytes_free(); uint16_t bytes_used(); diff --git a/libraries/AP_HAL_SMACCM/UARTDriver.cpp b/libraries/AP_HAL_SMACCM/UARTDriver.cpp index 635e068c82..9513ad7a76 100644 --- a/libraries/AP_HAL_SMACCM/UARTDriver.cpp +++ b/libraries/AP_HAL_SMACCM/UARTDriver.cpp @@ -146,19 +146,6 @@ int16_t SMACCMUARTDriver::read() return (int16_t)c; } -int16_t SMACCMUARTDriver::peek() -{ - uint8_t c; - - if (m_dev == NULL) - return -1; - - if (!usart_peek(m_dev, &c)) - return -1; - - return (int16_t)c; -} - /* SMACCM implementations of Print virtual methods */ size_t SMACCMUARTDriver::write(uint8_t c) { diff --git a/libraries/AP_HAL_SMACCM/UARTDriver.h b/libraries/AP_HAL_SMACCM/UARTDriver.h index 8692583620..4f07e0bbee 100644 --- a/libraries/AP_HAL_SMACCM/UARTDriver.h +++ b/libraries/AP_HAL_SMACCM/UARTDriver.h @@ -36,7 +36,6 @@ public: int16_t available(); int16_t txspace(); int16_t read(); - int16_t peek(); /* SMACCM implementations of Print virtual methods */ size_t write(uint8_t c);