Miscellaneous fixes

docs/src/guide/installation.md

@@ -196,7 +196,7 @@ brew link --force avr-gcc@13
 To compile modm *for x86_64 macOS* you need to install these tools too:
 
 ```sh
-brew install boost gcc
+brew install boost gcc@13
 ```
 
 

src/modm/architecture/interface/clock.hpp

@@ -95,35 +95,3 @@ using PreciseClock = chrono::micro_clock;
 using namespace ::std::chrono_literals;
 
 }	// namespace modm
-
-#if MODM_HAS_IOSTREAM
-#include <modm/io/iostream.hpp>
-
-namespace modm
-{
-
-/// @ingroup modm_architecture_clock
-template<class C, class D>
-modm::IOStream&
-operator << (modm::IOStream& s, const std::chrono::time_point<C, D>& m)
-{
-	s << m.time_since_epoch();
-	return s;
-}
-
-/// @ingroup modm_architecture_clock
-template<class T, class R>
-modm::IOStream&
-operator << (modm::IOStream& s, const std::chrono::duration<T, R>& m)
-{
-	s << m.count();
-	if constexpr (std::is_same_v<R, std::nano>)  s << "ns";
-	if constexpr (std::is_same_v<R, std::micro>) s << "us";
-	if constexpr (std::is_same_v<R, std::milli>) s << "ms";
-	if constexpr (std::is_same_v<R, std::ratio<60>>) s << "min";
-	if constexpr (std::is_same_v<R, std::ratio<3600>>) s << 'h';
-	return s;
-}
-
-} // modm namespace
-#endif

src/modm/io/iostream.hpp.in

@@ -25,11 +25,13 @@
 #include <inttypes.h>
 #include <type_traits>
 #include <climits>
+#include <chrono>
+#include <string_view>
 
 #include "iodevice.hpp"
 #include "iodevice_wrapper.hpp" // convenience
 
-%% if using_printf
+%% if options.with_printf
 /// @cond
 extern "C"
 {
@@ -214,6 +216,13 @@ public:
 	operator << (const char* s)
 	{ device->write(s); return *this; }
 
+	inline IOStream&
+	operator << (const std::string_view sv)
+	{
+		for (const auto c : sv) device->write(c);
+		return *this;
+	}
+
 	/// write the hex value of a pointer
 	inline IOStream&
 	operator << (const void* p)
@@ -290,7 +299,7 @@ private:
 private:
 	IODevice* const	device;
 	Mode mode = Mode::Ascii;
-%% if using_printf
+%% if options.with_printf
 	static void out_char(char c, void* arg)
 	{ if (c) reinterpret_cast<modm::IOStream*>(arg)->write(c); }
 	printf_output_gadget_t output_gadget{out_char, this, NULL, 0, INT_MAX};
@@ -363,4 +372,6 @@ white(IOStream& ios);
 
 }	// namespace modm
 
+#include "iostream_chrono.hpp"
+
 #endif // MODM_IOSTREAM_HPP

src/modm/io/iostream_chrono.hpp.in

@@ -0,0 +1,208 @@
+/*
+ * Copyright (c) 2024 Niklas Hauser
+ *
+ * This file is part of the modm project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+// ----------------------------------------------------------------------------
+
+#pragma once
+
+#include <chrono>
+#include <ctime>
+%% if options.with_printf
+#include <inttypes.h>
+%% endif
+
+namespace modm
+{
+
+/// @ingroup modm_io
+/// @{
+
+%% if not is_avr
+inline modm::IOStream&
+operator << (modm::IOStream& s, const std::chrono::year year)
+{
+%% if options.with_printf
+	return s.printf("%04" PRIi16, int16_t(int(year)));
+%% else
+	return s << int(year);
+%% endif
+}
+
+inline modm::IOStream&
+operator << (modm::IOStream& s, const std::chrono::month month)
+{
+	static constexpr std::string_view map = "???JanFebMarAprMayJunJulAugSepOctNovDec";
+	return s << map.substr((unsigned(month) <= 12 ? unsigned(month) : 0u) * 3, 3);
+}
+
+inline modm::IOStream&
+operator << (modm::IOStream& s, const std::chrono::day day)
+{
+%% if options.with_printf
+	return s.printf("%02" PRIu8, uint8_t(unsigned(day)));
+%% else
+	return s << unsigned(day);
+%% endif
+}
+
+inline modm::IOStream&
+operator << (modm::IOStream& s, const std::chrono::weekday wd)
+{
+	static constexpr std::string_view map = "SunMonTueWedThuFriSat???";
+	return s << map.substr((wd.c_encoding() < 7u ? wd.c_encoding() : 7u) * 3, 3);
+}
+
+inline modm::IOStream&
+operator << (modm::IOStream& s, const std::chrono::weekday_indexed wdi)
+{
+	s << wdi.weekday();
+	const auto index = wdi.index();
+	if (1 <= index and index <= 5) return s << '[' << index << ']';
+	return s << "[?]";
+}
+
+inline modm::IOStream&
+operator << (modm::IOStream& s, const std::chrono::weekday_last wdl)
+{
+	return s << wdl.weekday() << "[last]";
+}
+
+inline modm::IOStream&
+operator << (modm::IOStream& s, const std::chrono::month_day md)
+{
+	return s << md.month() << '/' << md.day();
+}
+
+inline modm::IOStream&
+operator << (modm::IOStream& s, const std::chrono::month_day_last mdl)
+{
+	return s << mdl.month() << "/last";
+}
+
+inline modm::IOStream&
+operator << (modm::IOStream& s, const std::chrono::month_weekday mwd)
+{
+	return s << mwd.month() << '/' << mwd.weekday_indexed();
+}
+
+inline modm::IOStream&
+operator << (modm::IOStream& s, const std::chrono::month_weekday_last mwdl)
+{
+	return s << mwdl.month() << '/' << mwdl.weekday_last();
+}
+
+inline modm::IOStream&
+operator << (modm::IOStream& s, const std::chrono::year_month ym)
+{
+	return s << ym.year() << '/' << ym.month();
+}
+
+inline modm::IOStream&
+operator << (modm::IOStream& s, const std::chrono::year_month_day& ymd)
+{
+%% if options.with_printf
+	return s.printf("%04" PRIi16 "-%02" PRIu8 "-%02" PRIu8,
+		int16_t(int(ymd.year())), uint8_t(unsigned(ymd.month())), uint8_t(unsigned(ymd.day())));
+%% else
+	return s << ymd.year() << '-' << unsigned(ymd.month()) << '-' << ymd.day();
+%% endif
+}
+
+inline modm::IOStream&
+operator << (modm::IOStream& s, const std::chrono::year_month_day_last& ymdl)
+{
+	return s << ymdl.year() << '/' << ymdl.month_day_last();
+}
+
+inline modm::IOStream&
+operator << (modm::IOStream& s, const std::chrono::year_month_weekday& ymwd)
+{
+	return s << ymwd.year() << '/' << ymwd.month() << '/' << ymwd.weekday_indexed();
+}
+
+inline modm::IOStream&
+operator << (modm::IOStream& s, const std::chrono::year_month_weekday_last& ymwdl)
+{
+	return s << ymwdl.year() << '/' << ymwdl.month() << '/' << ymwdl.weekday_last();
+}
+
+template< class Duration >
+modm::IOStream&
+operator << (modm::IOStream& s, const std::chrono::hh_mm_ss<Duration>& hms)
+{
+%% if options.with_printf
+	s.printf("%02" PRIu8 ":%02" PRIu8 ":%02" PRIu8 ".%03" PRIu16,
+			 uint8_t(hms.hours().count()), uint8_t(hms.minutes().count()), uint8_t(hms.seconds().count()),
+			 uint16_t(std::chrono::duration_cast<std::chrono::milliseconds>(hms.subseconds()).count()));
+%% else
+	s << uint8_t(hms.hours().count()) << ':' << uint8_t(hms.minutes().count()) << ':' << uint8_t(hms.seconds().count());
+	s << '.' << uint16_t(std::chrono::duration_cast<std::chrono::milliseconds>(hms.subseconds()).count());
+%% endif
+	return s;
+}
+%% endif
+
+template< class Rep, class Period >
+inline modm::IOStream&
+operator << (modm::IOStream& s, const std::chrono::duration<Rep, Period>& d)
+{
+	s << d.count();
+
+	if constexpr (std::is_same_v<typename Period::type, std::atto>)			s << "as";
+	if constexpr (std::is_same_v<typename Period::type, std::femto>)		s << "fs";
+	if constexpr (std::is_same_v<typename Period::type, std::pico>)			s << "ps";
+	if constexpr (std::is_same_v<typename Period::type, std::nano>)			s << "ns";
+	if constexpr (std::is_same_v<typename Period::type, std::micro>)		s << "us";
+	if constexpr (std::is_same_v<typename Period::type, std::milli>)		s << "ms";
+	if constexpr (std::is_same_v<typename Period::type, std::centi>)		s << "cs";
+	if constexpr (std::is_same_v<typename Period::type, std::deci>)			s << "ds";
+	if constexpr (std::is_same_v<typename Period::type, std::ratio<1>>)		s << 's';
+	if constexpr (std::is_same_v<typename Period::type, std::deca>)			s << "as";
+	if constexpr (std::is_same_v<typename Period::type, std::hecto>)		s << "hs";
+	if constexpr (std::is_same_v<typename Period::type, std::kilo>)			s << "ks";
+	if constexpr (std::is_same_v<typename Period::type, std::mega>)			s << "Ms";
+	if constexpr (std::is_same_v<typename Period::type, std::giga>)			s << "Gs";
+	if constexpr (std::is_same_v<typename Period::type, std::tera>)			s << "Ts";
+	if constexpr (std::is_same_v<typename Period::type, std::peta>)			s << "Ps";
+	if constexpr (std::is_same_v<typename Period::type, std::exa>)			s << "Es";
+
+	if constexpr (std::is_same_v<typename Period::type, std::ratio<60>>)	s << "min";
+	if constexpr (std::is_same_v<typename Period::type, std::ratio<3600>>)	s << 'h';
+	if constexpr (std::is_same_v<typename Period::type, std::ratio<86400>>)	s << 'd';
+
+	return s;
+}
+
+template< class Clock, class Duration >
+modm::IOStream&
+operator << (modm::IOStream& s, const std::chrono::time_point<Clock, Duration>& tp)
+{
+	return s << tp.time_since_epoch();
+}
+
+inline modm::IOStream&
+operator << (modm::IOStream& s, const std::tm& tm)
+{
+%% if options.with_printf
+	s.printf("%04" PRIu16 "-%02" PRIu8 "-%02" PRIu8 " %02" PRIu8 ":%02" PRIu8 ":%02" PRIu8,
+			 uint16_t(tm.tm_year + 1900u), uint8_t(tm.tm_mon), uint8_t(tm.tm_mday),
+			 uint8_t(tm.tm_hour), uint8_t(tm.tm_min), uint8_t(tm.tm_sec));
+%% else
+	s << (tm.tm_year + 1900u) << '-' << tm.tm_mon << '-' << tm.tm_mday << ' ';
+	s << tm.tm_hour << ':' << tm.tm_min << ':' << tm.tm_sec;
+%% endif
+	return s;
+}
+
+/// @}
+
+}
+
+
+

src/modm/io/iostream_printf.cpp.in

@@ -22,7 +22,7 @@
 #include <cmath>
 #include "iostream.hpp"
 
-%% if using_printf
+%% if options.with_printf
 #include <printf/printf.h>
 #include <printf/printf_config.h>
 
@@ -76,7 +76,7 @@ IOStream::vprintf(const char *fmt, va_list ap)
 void
 IOStream::writeInteger(int16_t value)
 {
-%% if using_printf
+%% if options.with_printf
 	print_integer(&output_gadget, uint16_t(value < 0 ? -value : value),
 	              value < 0, 10, 0, 0, FLAGS_SHORT);
 %% else
@@ -90,7 +90,7 @@ IOStream::writeInteger(int16_t value)
 void
 IOStream::writeInteger(uint16_t value)
 {
-%% if using_printf
+%% if options.with_printf
 	print_integer(&output_gadget, value, false, 10, 0, 0, FLAGS_SHORT);
 %% else
 	// hard coded for 32'768
@@ -103,7 +103,7 @@ IOStream::writeInteger(uint16_t value)
 void
 IOStream::writeInteger(int32_t value)
 {
-%% if using_printf
+%% if options.with_printf
 	print_integer(&output_gadget, uint32_t(value < 0 ? -value : value),
 	              value < 0, 10, 0, 0, FLAGS_LONG);
 %% else
@@ -117,7 +117,7 @@ IOStream::writeInteger(int32_t value)
 void
 IOStream::writeInteger(uint32_t value)
 {
-%% if using_printf
+%% if options.with_printf
 	print_integer(&output_gadget, value, false, 10, 0, 0, FLAGS_LONG);
 %% else
 	// hard coded for 4294967295
@@ -146,7 +146,7 @@ IOStream::writeInteger(uint64_t value)
 void
 IOStream::writeDouble(const double& value)
 {
-%% if using_printf
+%% if options.with_printf
 	print_floating_point(&output_gadget, value, 0, 0, 0, true);
 %% else
 	if(!std::isfinite(value)) {

src/modm/io/module.lb

@@ -41,16 +41,20 @@ def prepare(module, options):
 
 def build(env):
     core = env[":target"].get_driver("core")["type"]
+    target = env[":target"].identifier
     env.substitutions = {
-        "is_hosted": env[":target"].identifier.platform == "hosted",
-        "family": env[":target"].identifier.family,
+        "is_hosted": target.platform == "hosted",
+        "is_avr": target.platform == "avr",
+        "family": target.family,
         "core": core,
-        "using_printf": env.has_module(":printf"),
     }
     env.outbasepath = "modm/src/modm/io"
-    env.copy(".", ignore=env.ignore_files("io.hpp", "iostream_printf.cpp.in", "iostream.hpp.in"))
+    env.copy("iodevice.hpp")
+    env.copy("iodevice_wrapper.hpp")
     env.template("iostream_printf.cpp.in")
     env.template("iostream.hpp.in")
+    env.template("iostream_chrono.hpp.in")
+    env.copy("iostream.cpp")
 
     env.outbasepath = "modm/src/modm"
     env.copy("io.hpp")

src/modm/platform/core/cortex/startup.c.in

@@ -101,13 +101,13 @@ void __modm_startup(void)
 %#
 %% if with_icache
 	// Enable instruction cache
-	SCB_InvalidateICache();
 	SCB_EnableICache();
+	SCB_InvalidateICache();
 %% endif
 %% if with_dcache
 	// Enable data cache with default WBWA policy
-	SCB_CleanInvalidateDCache();
 	SCB_EnableDCache();
+	SCB_CleanInvalidateDCache();
 %% endif
 %#
 %% if core != "cortex-m0"