Implemented printing of numbers

This commit is contained in:
BlackMark 2019-08-03 15:00:41 +02:00
parent 50e01c480d
commit 53b791cb05

140
uart.hpp
View File

@ -1,5 +1,7 @@
#pragma once #pragma once
#include <stdint.h>
#include "config.hpp" #include "config.hpp"
#include "hardware0.hpp" #include "hardware0.hpp"
#include "hardware1.hpp" #include "hardware1.hpp"
@ -12,6 +14,38 @@
namespace uart { namespace uart {
namespace detail {
template <typename T, T limit, size_t Base>
static constexpr size_t cntDigits()
{
T num = limit;
size_t cnt = 0;
if (num < 0) {
num = -num;
++cnt;
}
do {
num /= 10;
++cnt;
} while (num > 0);
return cnt;
}
template <typename T, size_t Base>
static constexpr size_t maxNumDigits()
{
T minDigits = cntDigits<T, util::NumericLimits<T>::min(), Base>();
T maxDigits = cntDigits<T, util::NumericLimits<T>::max(), Base>();
return (minDigits < maxDigits) ? maxDigits : minDigits;
}
} // namespace detail
template <class Driver> template <class Driver>
class Uart { class Uart {
public: public:
@ -70,6 +104,32 @@ class Uart {
txByte(ch); txByte(ch);
} }
template <typename T, size_t Base = 10>
static inline void txNumber(const T &val)
{
// static_assert(util::is_integral_v<T>, "Only supported on integral types");
constexpr size_t numDigits = detail::maxNumDigits<T, Base>();
typename Driver::data_t buffer[numDigits];
typename Driver::data_t *bufEnd = buffer + numDigits - 1;
T digits = val;
if (digits < 0) {
digits = -digits;
txByte('-');
}
do {
typename Driver::data_t lastDigit = digits % Base;
*bufEnd-- = '0' + lastDigit;
digits /= Base;
} while (digits > 0);
for (typename Driver::data_t *buf = bufEnd + 1; buf < buffer + numDigits; ++buf)
txByte(*buf);
}
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// Output stream overloads // Output stream overloads
@ -86,91 +146,91 @@ class Uart {
} }
template <typename... Ts> template <typename... Ts>
Uart &operator<<(char) Uart &operator<<(char) const
{ {
static_assert(util::always_false_v<Ts...>, "Not implemented"); static_assert(util::always_false_v<Ts...>, "Not implemented");
} }
template <typename... Ts> template <typename... Ts>
Uart &operator<<(unsigned char) Uart &operator<<(unsigned char) const
{ {
static_assert(util::always_false_v<Ts...>, "Not implemented"); static_assert(util::always_false_v<Ts...>, "Not implemented");
} }
template <typename... Ts> template <typename... Ts>
Uart &operator<<(short) Uart &operator<<(short) const
{ {
static_assert(util::always_false_v<Ts...>, "Not implemented"); static_assert(util::always_false_v<Ts...>, "Not implemented");
} }
template <typename... Ts> template <typename... Ts>
Uart &operator<<(unsigned short) Uart &operator<<(unsigned short) const
{
static_assert(util::always_false_v<Ts...>, "Not implemented");
}
Uart &operator<<(const int &val)
{
txNumber(val);
return *this;
}
template <typename... Ts>
Uart &operator<<(unsigned int) const
{ {
static_assert(util::always_false_v<Ts...>, "Not implemented"); static_assert(util::always_false_v<Ts...>, "Not implemented");
} }
template <typename... Ts> template <typename... Ts>
Uart &operator<<(int) Uart &operator<<(long) const
{ {
static_assert(util::always_false_v<Ts...>, "Not implemented"); static_assert(util::always_false_v<Ts...>, "Not implemented");
} }
template <typename... Ts> template <typename... Ts>
Uart &operator<<(unsigned int) Uart &operator<<(unsigned long) const
{ {
static_assert(util::always_false_v<Ts...>, "Not implemented"); static_assert(util::always_false_v<Ts...>, "Not implemented");
} }
template <typename... Ts> template <typename... Ts>
Uart &operator<<(long) Uart &operator<<(long long) const
{ {
static_assert(util::always_false_v<Ts...>, "Not implemented"); static_assert(util::always_false_v<Ts...>, "Not implemented");
} }
template <typename... Ts> template <typename... Ts>
Uart &operator<<(unsigned long) Uart &operator<<(unsigned long long) const
{ {
static_assert(util::always_false_v<Ts...>, "Not implemented"); static_assert(util::always_false_v<Ts...>, "Not implemented");
} }
template <typename... Ts> template <typename... Ts>
Uart &operator<<(long long) Uart &operator<<(float) const
{ {
static_assert(util::always_false_v<Ts...>, "Not implemented"); static_assert(util::always_false_v<Ts...>, "Not implemented");
} }
template <typename... Ts> template <typename... Ts>
Uart &operator<<(unsigned long long) Uart &operator<<(double) const
{ {
static_assert(util::always_false_v<Ts...>, "Not implemented"); static_assert(util::always_false_v<Ts...>, "Not implemented");
} }
template <typename... Ts> template <typename... Ts>
Uart &operator<<(float) Uart &operator<<(long double) const
{ {
static_assert(util::always_false_v<Ts...>, "Not implemented"); static_assert(util::always_false_v<Ts...>, "Not implemented");
} }
template <typename... Ts> template <typename... Ts>
Uart &operator<<(double) Uart &operator<<(bool) const
{ {
static_assert(util::always_false_v<Ts...>, "Not implemented"); static_assert(util::always_false_v<Ts...>, "Not implemented");
} }
template <typename... Ts> template <typename... Ts>
Uart &operator<<(long double) Uart &operator<<(const void *) const
{
static_assert(util::always_false_v<Ts...>, "Not implemented");
}
template <typename... Ts>
Uart &operator<<(bool)
{
static_assert(util::always_false_v<Ts...>, "Not implemented");
}
template <typename... Ts>
Uart &operator<<(const void *)
{ {
static_assert(util::always_false_v<Ts...>, "Not implemented"); static_assert(util::always_false_v<Ts...>, "Not implemented");
} }
@ -179,91 +239,91 @@ class Uart {
// Input stream overloads // Input stream overloads
template <typename... Ts> template <typename... Ts>
Uart &operator>>(char &) Uart &operator>>(char &) const
{ {
static_assert(util::always_false_v<Ts...>, "Not implemented"); static_assert(util::always_false_v<Ts...>, "Not implemented");
} }
template <typename... Ts> template <typename... Ts>
Uart &operator>>(unsigned char &) Uart &operator>>(unsigned char &) const
{ {
static_assert(util::always_false_v<Ts...>, "Not implemented"); static_assert(util::always_false_v<Ts...>, "Not implemented");
} }
template <typename... Ts> template <typename... Ts>
Uart &operator>>(short &) Uart &operator>>(short &) const
{ {
static_assert(util::always_false_v<Ts...>, "Not implemented"); static_assert(util::always_false_v<Ts...>, "Not implemented");
} }
template <typename... Ts> template <typename... Ts>
Uart &operator>>(unsigned short &) Uart &operator>>(unsigned short &) const
{ {
static_assert(util::always_false_v<Ts...>, "Not implemented"); static_assert(util::always_false_v<Ts...>, "Not implemented");
} }
template <typename... Ts> template <typename... Ts>
Uart &operator>>(int &) Uart &operator>>(int &) const
{ {
static_assert(util::always_false_v<Ts...>, "Not implemented"); static_assert(util::always_false_v<Ts...>, "Not implemented");
} }
template <typename... Ts> template <typename... Ts>
Uart &operator>>(unsigned int &) Uart &operator>>(unsigned int &) const
{ {
static_assert(util::always_false_v<Ts...>, "Not implemented"); static_assert(util::always_false_v<Ts...>, "Not implemented");
} }
template <typename... Ts> template <typename... Ts>
Uart &operator>>(long &) Uart &operator>>(long &) const
{ {
static_assert(util::always_false_v<Ts...>, "Not implemented"); static_assert(util::always_false_v<Ts...>, "Not implemented");
} }
template <typename... Ts> template <typename... Ts>
Uart &operator>>(unsigned long &) Uart &operator>>(unsigned long &) const
{ {
static_assert(util::always_false_v<Ts...>, "Not implemented"); static_assert(util::always_false_v<Ts...>, "Not implemented");
} }
template <typename... Ts> template <typename... Ts>
Uart &operator>>(long long &) Uart &operator>>(long long &) const
{ {
static_assert(util::always_false_v<Ts...>, "Not implemented"); static_assert(util::always_false_v<Ts...>, "Not implemented");
} }
template <typename... Ts> template <typename... Ts>
Uart &operator>>(unsigned long long &) Uart &operator>>(unsigned long long &) const
{ {
static_assert(util::always_false_v<Ts...>, "Not implemented"); static_assert(util::always_false_v<Ts...>, "Not implemented");
} }
template <typename... Ts> template <typename... Ts>
Uart &operator>>(float &) Uart &operator>>(float &) const
{ {
static_assert(util::always_false_v<Ts...>, "Not implemented"); static_assert(util::always_false_v<Ts...>, "Not implemented");
} }
template <typename... Ts> template <typename... Ts>
Uart &operator>>(double &) Uart &operator>>(double &) const
{ {
static_assert(util::always_false_v<Ts...>, "Not implemented"); static_assert(util::always_false_v<Ts...>, "Not implemented");
} }
template <typename... Ts> template <typename... Ts>
Uart &operator>>(long double &) Uart &operator>>(long double &) const
{ {
static_assert(util::always_false_v<Ts...>, "Not implemented"); static_assert(util::always_false_v<Ts...>, "Not implemented");
} }
template <typename... Ts> template <typename... Ts>
Uart &operator>>(bool &) Uart &operator>>(bool &) const
{ {
static_assert(util::always_false_v<Ts...>, "Not implemented"); static_assert(util::always_false_v<Ts...>, "Not implemented");
} }
template <typename... Ts> template <typename... Ts>
Uart &operator>>(const void *&) Uart &operator>>(const void *&) const
{ {
static_assert(util::always_false_v<Ts...>, "Not implemented"); static_assert(util::always_false_v<Ts...>, "Not implemented");
} }