From 4490c68ee330cc5a76715471592af40bbcd046cd Mon Sep 17 00:00:00 2001 From: dario Date: Fri, 9 Feb 2024 14:33:05 +0100 Subject: [PATCH] First sta-Core rework to work for Arduino --- include/sta/bus/can/filter.hpp | 7 ++++++- include/sta/bus/can/headers.hpp | 7 ++++++- include/sta/bus/can/id.hpp | 7 ++++++- include/sta/bus/can/iter.hpp | 7 ++++++- include/sta/bus/i2c/i2c.hpp | 3 --- include/sta/bus/interface.hpp | 10 ++++++++-- include/sta/bus/spi/device.hpp | 3 --- include/sta/bus/spi/settings.hpp | 7 ++++++- include/sta/bus/spi/spi.hpp | 4 ---- include/sta/config.hpp | 3 ++- include/sta/debug/printing/printable.hpp | 11 ++++++++--- include/sta/debug/printing/printable_uart.hpp | 10 ++++++++-- include/sta/devices/arduino/gpio_pin.hpp | 3 ++- include/sta/printf.hpp | 6 +++++- src/bus/spi/spi.cpp | 8 +++++++- src/debug/printing/printable.cpp | 16 +++++++++++----- src/debug/printing/printable_printf.cpp | 7 ++++++- src/debug/printing/printable_uart.cpp | 9 +++++++-- src/devices/stm32/bus/i2c.cpp | 3 ++- 19 files changed, 96 insertions(+), 35 deletions(-) diff --git a/include/sta/bus/can/filter.hpp b/include/sta/bus/can/filter.hpp index 1499eea..2ec0121 100644 --- a/include/sta/bus/can/filter.hpp +++ b/include/sta/bus/can/filter.hpp @@ -7,7 +7,12 @@ #include -#include +#include +#ifdef STA_PLATFORM_ARDUINO +# include +#else +# include +#endif // STA_PLATFORM_ARDUINO namespace sta diff --git a/include/sta/bus/can/headers.hpp b/include/sta/bus/can/headers.hpp index 0214434..3d9b111 100644 --- a/include/sta/bus/can/headers.hpp +++ b/include/sta/bus/can/headers.hpp @@ -7,7 +7,12 @@ #include -#include +#include +#ifdef STA_PLATFORM_ARDUINO +# include +#else +# include +#endif // STA_PLATFORM_ARDUINO namespace sta diff --git a/include/sta/bus/can/id.hpp b/include/sta/bus/can/id.hpp index a832998..712042d 100644 --- a/include/sta/bus/can/id.hpp +++ b/include/sta/bus/can/id.hpp @@ -5,7 +5,12 @@ #ifndef STA_CORE_CAN_ID_HPP #define STA_CORE_CAN_ID_HPP -#include +#include +#ifdef STA_PLATFORM_ARDUINO +# include +#else +# include +#endif // STA_PLATFORM_ARDUINO namespace sta diff --git a/include/sta/bus/can/iter.hpp b/include/sta/bus/can/iter.hpp index 519a929..d499b1b 100644 --- a/include/sta/bus/can/iter.hpp +++ b/include/sta/bus/can/iter.hpp @@ -5,7 +5,12 @@ #ifndef STA_CORE_CAN_ITER_HPP #define STA_CORE_CAN_ITER_HPP -#include +#include +#ifdef STA_PLATFORM_ARDUINO +# include +#else +# include +#endif // STA_PLATFORM_ARDUINO namespace sta diff --git a/include/sta/bus/i2c/i2c.hpp b/include/sta/bus/i2c/i2c.hpp index e9896fc..f575708 100644 --- a/include/sta/bus/i2c/i2c.hpp +++ b/include/sta/bus/i2c/i2c.hpp @@ -4,9 +4,6 @@ #include #include -#include -#include - namespace sta { /** diff --git a/include/sta/bus/interface.hpp b/include/sta/bus/interface.hpp index 6b0f357..f7c5f8d 100644 --- a/include/sta/bus/interface.hpp +++ b/include/sta/bus/interface.hpp @@ -3,8 +3,14 @@ #include -#include -#include +#include +#ifdef STA_PLATFORM_ARDUINO +# include +# include +#else +# include +# include +#endif // STA_PLATFORM_ARDUINO namespace sta { diff --git a/include/sta/bus/spi/device.hpp b/include/sta/bus/spi/device.hpp index b2a0ddc..e8e9327 100644 --- a/include/sta/bus/spi/device.hpp +++ b/include/sta/bus/spi/device.hpp @@ -9,9 +9,6 @@ #include #include -#include -#include - namespace sta { diff --git a/include/sta/bus/spi/settings.hpp b/include/sta/bus/spi/settings.hpp index dea4618..f9ef566 100644 --- a/include/sta/bus/spi/settings.hpp +++ b/include/sta/bus/spi/settings.hpp @@ -11,7 +11,12 @@ * @brief SPI interface. */ -#include +#include +#ifdef STA_PLATFORM_ARDUINO +# include +#else +# include +#endif // STA_PLATFORM_ARDUINO namespace sta { diff --git a/include/sta/bus/spi/spi.hpp b/include/sta/bus/spi/spi.hpp index 2d0dc14..1949117 100644 --- a/include/sta/bus/spi/spi.hpp +++ b/include/sta/bus/spi/spi.hpp @@ -9,10 +9,6 @@ #include #include -#include -#include - - namespace sta { /** diff --git a/include/sta/config.hpp b/include/sta/config.hpp index 1e53727..ee160b7 100644 --- a/include/sta/config.hpp +++ b/include/sta/config.hpp @@ -1,3 +1,4 @@ #include -#define STA_PRINTF_USE_STDLIB \ No newline at end of file +#define STA_PRINTF_USE_STDLIB +#define STA_STDLIB_DISABLE \ No newline at end of file diff --git a/include/sta/debug/printing/printable.hpp b/include/sta/debug/printing/printable.hpp index 531522f..bcf3e36 100644 --- a/include/sta/debug/printing/printable.hpp +++ b/include/sta/debug/printing/printable.hpp @@ -5,9 +5,14 @@ #ifndef STA_CORE_PRINTABLE_HPP #define STA_CORE_PRINTABLE_HPP -#include -#include - +#include +#ifdef STA_PLATFORM_ARDUINO +# include +# include +#else +# include +# include +#endif namespace sta { diff --git a/include/sta/debug/printing/printable_uart.hpp b/include/sta/debug/printing/printable_uart.hpp index 93f92c5..d6ea375 100644 --- a/include/sta/debug/printing/printable_uart.hpp +++ b/include/sta/debug/printing/printable_uart.hpp @@ -8,8 +8,14 @@ #include #include -#include -#include +#include +#ifdef STA_PLATFORM_ARDUINO +# include +# include +#else +# include +# include +#endif // STA_PLATFORM_ARDUINO namespace sta diff --git a/include/sta/devices/arduino/gpio_pin.hpp b/include/sta/devices/arduino/gpio_pin.hpp index 11feae1..239ec93 100644 --- a/include/sta/devices/arduino/gpio_pin.hpp +++ b/include/sta/devices/arduino/gpio_pin.hpp @@ -11,7 +11,8 @@ #if defined(STA_PLATFORM_ARDUINO) || defined(DOXYGEN) #include -#include + +#include namespace sta { diff --git a/include/sta/printf.hpp b/include/sta/printf.hpp index c738424..520fd74 100644 --- a/include/sta/printf.hpp +++ b/include/sta/printf.hpp @@ -17,7 +17,11 @@ #ifdef STA_PRINTF_USE_STDLIB -# include +# ifdef STA_PLATFORM_ARDUINO +# include +# else +# include +# endif // STA_PLATFORM_ARDUINO #endif // STA_PRINTF_USE_STDLIB #ifdef STA_PRINTF_USE_MPALAND # include diff --git a/src/bus/spi/spi.cpp b/src/bus/spi/spi.cpp index 012bcf3..62d636b 100644 --- a/src/bus/spi/spi.cpp +++ b/src/bus/spi/spi.cpp @@ -1,6 +1,12 @@ #include -#include +#include +#ifdef STA_PLATFORM_ARDUINO +# include +#else +# include +#endif // STA_PLATFORM_ARDUINO + namespace sta { diff --git a/src/debug/printing/printable.cpp b/src/debug/printing/printable.cpp index a3206bb..af54a75 100644 --- a/src/debug/printing/printable.cpp +++ b/src/debug/printing/printable.cpp @@ -1,10 +1,16 @@ #include -#include -#include -#include -#include -#include +#ifdef STA_PLATFORM_ARDUINO +# include +# include +# include +# include +#else +# include +# include +# include +# include +#endif // STA_PLATFORM_ARDUINO #include #include diff --git a/src/debug/printing/printable_printf.cpp b/src/debug/printing/printable_printf.cpp index 07357f5..48408fd 100644 --- a/src/debug/printing/printable_printf.cpp +++ b/src/debug/printing/printable_printf.cpp @@ -1,7 +1,12 @@ #include #include -#include +#include +#ifdef STA_PLATFORM_ARDUINO +# include +#else +# include +#endif // STA_PLATFORM_ARDUINO namespace sta { diff --git a/src/debug/printing/printable_uart.cpp b/src/debug/printing/printable_uart.cpp index 76a63f8..14dcb4b 100644 --- a/src/debug/printing/printable_uart.cpp +++ b/src/debug/printing/printable_uart.cpp @@ -3,8 +3,13 @@ #include #include -#include -#include +#ifdef STA_PLATFORM_ARDUINO +# include +# include +#else +# include +# include +#endif // STA_PLATFORM_ARDUINO namespace sta diff --git a/src/devices/stm32/bus/i2c.cpp b/src/devices/stm32/bus/i2c.cpp index 29ba02d..f96bbe5 100644 --- a/src/devices/stm32/bus/i2c.cpp +++ b/src/devices/stm32/bus/i2c.cpp @@ -1,10 +1,11 @@ #include #include -#include #ifdef STA_STM32_I2C_ENABLED +#include + namespace sta { STM32I2C::STM32I2C(I2C_HandleTypeDef * handle, Mutex * mutex)