WIP

inc/f4ll/console_handler.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include <f4ll/initialized_singleton.h>
+#include <f4ll/output_stream.h>
 #include <f4ll/ringbuffer.h>
 #include <f4ll/usart_core.h>
 
@@ -15,7 +16,7 @@
 
 namespace f4ll {
 
-class console_handler : public usart_core, public initialized_singleton<console_handler>
+class console_handler : public initialized_singleton<console_handler>, public usart_core, public ioutput_stream
 {
     friend class initialized_singleton<console_handler>;
 
@@ -41,7 +42,7 @@ private:
 
     void setup_receive(void);
 
-    // LL_UsartCore pure virtual function implementations
+    // usart_core pure virtual function implementations
     void receiver_idle(void) override;
     void transmission_complete(void) override;
     void framing_error(void) override;
@@ -53,6 +54,24 @@ private:
     void tx_dma_half_transfer(void) override;
     void tx_dma_error(dma_helper::dma_error_type reason) override;
 
+    // ioutput_stream interface implementations
+    ioutput_stream &operator<<(ioutput_stream::format fmt) override;
+    ioutput_stream &operator<<(char const *str) override;
+    ioutput_stream &operator<<(char chr) override;
+    ioutput_stream &operator<<(uint8_t byte) override;
+    ioutput_stream &operator<<(uint16_t ui16) override;
+    ioutput_stream &operator<<(int16_t i16) override;
+    ioutput_stream &operator<<(uint32_t ui32) override;
+    ioutput_stream &operator<<(int32_t i32) override;
+
+    // iotput_stream-related member variables
+    ioutput_stream::format m_fmt = ioutput_stream::format::dec;
+
+    // iotput_stream-related helper functions
+    template <typename T> void print_unsigned(T input);
+    template <typename T> void print_signed(T input);
+
+    //
     ringbuffer_ext m_tx_buffer;
     size_type m_bytes_sent = 0;
 

src/console_handler.cpp

@@ -5,6 +5,7 @@
  *      Author: abody
  */
 
+#include "f4ll/output_stream.h"
 #include <f4ll/console_handler.h>
 #include <f4ll/str_util.h>
 
@@ -130,4 +131,89 @@ void console_handler::print(char const *s)
     flush();
 }
 
+ioutput_stream &console_handler::operator<<(ioutput_stream::format const fmt)
+{
+    m_fmt = fmt;
+    return *this;
+}
+
+ioutput_stream &console_handler::operator<<(char const *str)
+{
+    print(str);
+    return *this;
+}
+
+ioutput_stream &console_handler::operator<<(char chr)
+{
+    m_tx_buffer.put(reinterpret_cast<uint8_t const *>(&chr), 1);
+    flush();
+    return *this;
+}
+
+ioutput_stream &console_handler::operator<<(uint8_t byte)
+{
+    print_unsigned(byte);
+    return *this;
+}
+
+ioutput_stream &console_handler::operator<<(uint16_t ui16)
+{
+    return *this;
+}
+
+ioutput_stream &console_handler::operator<<(int16_t i16)
+{
+    return *this;
+}
+
+ioutput_stream &console_handler::operator<<(uint32_t ui32)
+{
+    return *this;
+}
+
+ioutput_stream &console_handler::operator<<(int32_t i32)
+{
+    return *this;
+}
+
+template <typename T> void console_handler::print_unsigned(T input)
+{
+    static constexpr uint32_t const divisors[4] = {100, 10000, 10000000, 1000000000};
+    T divisor = static_cast<T>(divisors[sizeof(T) - 1]);
+
+    if (m_fmt != ioutput_stream::format::dec) {
+        append("0x");
+    }
+    if (!input) {
+        append("0");
+        flush();
+        return;
+    }
+
+    T res;
+    uint8_t cres;
+
+    if (m_fmt == ioutput_stream::format::dec) {
+        while (divisor) {
+            res = input / divisor;
+            if (res) {
+                cres = static_cast<uint8_t>(res + '0');
+                m_tx_buffer.put(&cres, 1);
+                input -= res * divisor;
+            }
+            divisor /= 10;
+        }
+    }
+}
+
+template <typename T> void console_handler::print_signed(T input)
+{
+    if (m_fmt == ioutput_stream::format::dec) {
+        append("-");
+        print_unsigned(-input);
+    } else {
+        print_unsigned(input);
+    }
+}
+
 } /* namespace f4ll */