RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

sys/arduino: Extended Serial.print() / println()

Browse Source 
- Serial.print() and Serial.println() have been extended to support:
    - unsigned int
    - long
    - unsigned long
- The SerialFormat BIN has been implemented
- Serial.println(void) has been added
This commit is contained in:
Marian Buschsieweke 2019-08-29 13:29:38 +02:00
parent b83c7dd61d
commit d4aeca7469
No known key found for this signature in database
GPG Key ID: 61F64C6599B1539F
2 changed files with 303 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

186
sys/arduino/include/serialport.hpp
View File

@ -48,6 +48,8 @@ private:
uart_t dev;
char rx_mem[SERIAL_RX_BUFSIZE];
ringbuffer_t rx_buf;
template<typename T> size_t _println(T val);
template<typename T> size_t _println(T val, SerialFormat format);
public:
/**
@ -125,6 +127,93 @@ public:
*/
size_t print(int val, SerialFormat format);
/**
* @brief Prints data to the serial port as human-readable ASCII text
*
* Prints data to the serial port as human-readable ASCII text. This command
* can take many forms. Numbers are printed using an ASCII character for
* each digit. Floats are similarly printed as ASCII digits, defaulting to
* two decimal places. Bytes are sent as a single character. Characters and
* strings are sent as is.
*
* Copied from https://www.arduino.cc/en/Serial/Print
*
* @param[in] val the value to print
*
* @return the number of bytes written, reading that number is optional
*/
size_t print(unsigned int val);
/**
* @brief Prints data to the serial port as human-readable ASCII text
*
* @see print()
*
* @param[in] val the value to print
* @param[in] format specifies the number base
*
* @return the number of bytes written, reading that number is optional
*/
size_t print(unsigned int val, SerialFormat format);
/**
* @brief Prints data to the serial port as human-readable ASCII text
*
* Prints data to the serial port as human-readable ASCII text. This command
* can take many forms. Numbers are printed using an ASCII character for
* each digit. Floats are similarly printed as ASCII digits, defaulting to
* two decimal places. Bytes are sent as a single character. Characters and
* strings are sent as is.
*
* Copied from https://www.arduino.cc/en/Serial/Print
*
* @param[in] val the value to print
*
* @return the number of bytes written, reading that number is optional
*/
size_t print(long val);
/**
* @brief Prints data to the serial port as human-readable ASCII text
*
* @see print()
*
* @param[in] val the value to print
* @param[in] format specifies the number base
*
* @return the number of bytes written, reading that number is optional
*/
size_t print(long val, SerialFormat format);
/**
* @brief Prints data to the serial port as human-readable ASCII text
*
* Prints data to the serial port as human-readable ASCII text. This command
* can take many forms. Numbers are printed using an ASCII character for
* each digit. Floats are similarly printed as ASCII digits, defaulting to
* two decimal places. Bytes are sent as a single character. Characters and
* strings are sent as is.
*
* Copied from https://www.arduino.cc/en/Serial/Print
*
* @param[in] val the value to print
*
* @return the number of bytes written, reading that number is optional
*/
size_t print(unsigned long val);
/**
* @brief Prints data to the serial port as human-readable ASCII text
*
* @see print()
*
* @param[in] val the value to print
* @param[in] format specifies the number base
*
* @return the number of bytes written, reading that number is optional
*/
size_t print(unsigned long val, SerialFormat format);
/**
* @brief Prints data to the serial port as human-readable ASCII text
*
@ -197,6 +286,93 @@ public:
*/
size_t println(int val, SerialFormat format);
/**
* @brief Prints data to the serial port as human-readable ASCII text
* followed by a carriage return character (ASCII 13, or "\r") and
* a newline character (ASCII 10, or "\n")
*
* This command takes the same forms as @ref print().
*
* Copied from https://www.arduino.cc/en/Serial/Println
*
* @param[in] val the value to print
*
* @return the number of bytes written, reading that number is optional
*/
size_t println(unsigned int val);
/**
* @brief Prints data to the serial port as human-readable ASCII text
* followed by a carriage return character (ASCII 13, or "\r") and
* a newline character (ASCII 10, or "\n")
*
* @see println()
*
* @param[in] val the value to print
* @param[in] format specifies the number base
*
* @return the number of bytes written, reading that number is optional
*/
size_t println(unsigned int val, SerialFormat format);
/**
* @brief Prints data to the serial port as human-readable ASCII text
* followed by a carriage return character (ASCII 13, or "\r") and
* a newline character (ASCII 10, or "\n")
*
* This command takes the same forms as @ref print().
*
* Copied from https://www.arduino.cc/en/Serial/Println
*
* @param[in] val the value to print
*
* @return the number of bytes written, reading that number is optional
*/
size_t println(long val);
/**
* @brief Prints data to the serial port as human-readable ASCII text
* followed by a carriage return character (ASCII 13, or "\r") and
* a newline character (ASCII 10, or "\n")
*
* @see println()
*
* @param[in] val the value to print
* @param[in] format specifies the number base
*
* @return the number of bytes written, reading that number is optional
*/
size_t println(long val, SerialFormat format);
/**
* @brief Prints data to the serial port as human-readable ASCII text
* followed by a carriage return character (ASCII 13, or "\r") and
* a newline character (ASCII 10, or "\n")
*
* This command takes the same forms as @ref print().
*
* Copied from https://www.arduino.cc/en/Serial/Println
*
* @param[in] val the value to print
*
* @return the number of bytes written, reading that number is optional
*/
size_t println(unsigned long val);
/**
* @brief Prints data to the serial port as human-readable ASCII text
* followed by a carriage return character (ASCII 13, or "\r") and
* a newline character (ASCII 10, or "\n")
*
* @see println()
*
* @param[in] val the value to print
* @param[in] format specifies the number base
*
* @return the number of bytes written, reading that number is optional
*/
size_t println(unsigned long val, SerialFormat format);
/**
* @brief Prints data to the serial port as human-readable ASCII text
* followed by a carriage return character (ASCII 13, or "\r") and
@ -250,6 +426,16 @@ public:
*/
size_t println(const char *val);
/**
* @brief Prints a carriage return character (ASCII 13, or "\r") and
* a newline character (ASCII 10, or "\n")
*
* @see println()
*
* @return the number of bytes written, reading that number is optional
*/
size_t println(void);
/**
* @brief Reads incoming serial data
*

137
sys/arduino/serialport.cpp
View File

@ -57,25 +57,81 @@ void SerialPort::end(void)
size_t SerialPort::print(int val)
{
return print(val, DEC);
return print((long)val, DEC);
}
size_t SerialPort::print(int val, SerialFormat format)
{
if (format == DEC) {
return print((long)val, format);
}
/* Propagation to long of negative number changes binary representation.
* This cast should add leading zeros to the binary representation, that
* will be skipped by print(unsigned long, SerialFormat)
*/
return print((unsigned long)((unsigned)val), format);
}
size_t SerialPort::print(unsigned int val)
{
return print((unsigned long)val, DEC);
}
size_t SerialPort::print(unsigned int val, SerialFormat format)
{
return print((unsigned long)val, format);
}
size_t SerialPort::print(long val)
{
return print(val, DEC);
}
size_t SerialPort::print(long val, SerialFormat format)
{
if (format == DEC) {
char buf[64];
size_t len;
len = sprintf(buf, "%li", val);
write(buf, len);
return len;
}
return print((unsigned long)val, format);
}
size_t SerialPort::print(unsigned long val)
{
return print(val, DEC);
}
size_t SerialPort::print(unsigned long val, SerialFormat format)
{
char buf[64];
size_t len;
switch (format) {
case BIN:
/* TODO */
return 0;
len = 0;
{
static const unsigned long mask = 1UL << (8 * sizeof(unsigned long) - 1);
unsigned pos = 0;
while (!(val & (mask >> pos))) {
pos ++;
}
for (; pos < 8 * sizeof(unsigned long); pos++) {
buf[len++] = (val & (mask >> pos)) ? '1' : '0';
}
}
break;
case OCT:
len = sprintf(buf, "%o", (unsigned)val);
len = sprintf(buf, "%lo", val);
break;
case DEC:
len = sprintf(buf, "%i", val);
len = sprintf(buf, "%lu", val);
break;
case HEX:
len = sprintf(buf, "%x", (unsigned)val);
len = sprintf(buf, "%lx", val);
break;
default:
return 0;
@ -107,46 +163,87 @@ size_t SerialPort::print(const char *val)
return (size_t)write(val);
}
size_t SerialPort::println(int val)
template<typename T> size_t SerialPort::_println(T val)
{
size_t res = print(val);
write("\r\n");
return (res + 2);
return res + 2;
}
template<typename T> size_t SerialPort::_println(T val, SerialFormat format)
{
size_t res = print(val, format);
write("\r\n");
return res + 2;
}
size_t SerialPort::println(int val)
{
return _println<int>(val);
}
size_t SerialPort::println(int val, SerialFormat format)
{
size_t res = print(val, format);
write("\r\n");
return (res + 2);
return _println<int>(val, format);
}
size_t SerialPort::println(unsigned int val)
{
return _println<unsigned int>(val);
}
size_t SerialPort::println(unsigned int val, SerialFormat format)
{
return _println<unsigned int>(val, format);
}
size_t SerialPort::println(long val)
{
return _println<long>(val);
}
size_t SerialPort::println(long val, SerialFormat format)
{
return _println<long>(val, format);
}
size_t SerialPort::println(unsigned long val)
{
return _println<unsigned long>(val);
}
size_t SerialPort::println(unsigned long val, SerialFormat format)
{
return _println<unsigned long>(val, format);
}
size_t SerialPort::println(float val)
{
size_t res = print(val);
write("\r\n");
return (res + 2);
return _println<float>(val);
}
size_t SerialPort::println(float val, int format)
{
/* cannot use template here, second parameter differs in type */
size_t res = print(val, format);
write("\r\n");
return (res + 2);
return res + 2;
}
size_t SerialPort::println(char val)
{
size_t res = print(val);
write("\r\n");
return (res + 2);
return _println<char>(val);
}
size_t SerialPort::println(const char *val)
{
size_t res = print(val);
return _println<const char *>(val);
}
size_t SerialPort::println(void)
{
write("\r\n");
return (res + 2);
return 2;
}
int SerialPort::read(void)