ALPAKA/sta-core
1
0
Fork 0
mirror of https://git.intern.spaceteamaachen.de/ALPAKA/sta-core.git synced 2025-08-05 18:21:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resolved conflicts in Printable classes

Browse Source
This commit is contained in:
dario
2024-02-09 14:35:47 +01:00
parent 4490c68ee3
commit 63c8d06525
5 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/sta/config.hpp
View File

@@ -1,4 +1,5 @@
#include <sta/devices/arduino/mcu/common.hpp>
#define STA_PRINTF_USE_STDLIB
#define STA_STDLIB_DISABLE
#define STA_STDLIB_DISABLE
#define STA_DEBUGGING_ENABLED

2
include/sta/debug/debug.hpp
View File

@@ -8,7 +8,7 @@
namespace sta
{
extern Printable * Debug;
extern BasePrintable * Debug;
} // namespace sta

18
include/sta/debug/printing/printable.hpp
View File

@@ -23,9 +23,9 @@ namespace sta
*/
enum class IntegerBase
{
DEC, /**< Decimal */
BIN, /**< Binary */
HEX /**< Hexadecimal */
BASE_DEC, /**< Decimal */
BASE_BIN, /**< Binary */
BASE_HEX /**< Hexadecimal */
};
/**
@@ -69,7 +69,7 @@ namespace sta
* @param num 8-bit unsigned integer
* @param base Integer base
*/
void print(uint8_t num, IntegerBase base = IntegerBase::DEC);
void print(uint8_t num, IntegerBase base = IntegerBase::BASE_DEC);
/**
* @brief Print integer in selected base.
@@ -77,7 +77,7 @@ namespace sta
* @param num 16-bit unsigned integer
* @param base Integer base
*/
void print(uint16_t num, IntegerBase base = IntegerBase::DEC);
void print(uint16_t num, IntegerBase base = IntegerBase::BASE_DEC);
/**
* @brief Print integer in selected base.
@@ -85,7 +85,7 @@ namespace sta
* @param num 32-bit unsigned integer
* @param base Integer base
*/
void print(uint32_t num, IntegerBase base = IntegerBase::DEC);
void print(uint32_t num, IntegerBase base = IntegerBase::BASE_DEC);
/**
* @brief Print c-string.
@@ -134,7 +134,7 @@ namespace sta
* @param num 8-bit unsigned integer
* @param base Integer base
*/
void println(uint8_t num, IntegerBase base = IntegerBase::DEC);
void println(uint8_t num, IntegerBase base = IntegerBase::BASE_DEC);
/**
* @brief Print integer in selected base followed by a new-line.
@@ -142,7 +142,7 @@ namespace sta
* @param num 16-bit unsigned integer
* @param base Integer base
*/
void println(uint16_t num, IntegerBase base = IntegerBase::DEC);
void println(uint16_t num, IntegerBase base = IntegerBase::BASE_DEC);
/**
* @brief Print integer in selected base followed by a new-line.
@@ -150,7 +150,7 @@ namespace sta
* @param num 32-bit unsigned integer
* @param base Integer base
*/
void println(uint32_t num, IntegerBase base = IntegerBase::DEC);
void println(uint32_t num, IntegerBase base = IntegerBase::BASE_DEC);
/**
* @brief Print c-string followed by a new-line.

2
include/sta/debug/printing/printable_uart.hpp
View File

@@ -25,7 +25,7 @@ namespace sta
*
* @ingroup sta_core
*/
class PrintableUART : public Printable
class PrintableUART : public BasePrintable
{
public:
/**