[rp2040] uart, connector api

Author: andryblack

examples/rp_pico/logger/main.cpp

@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2011, Fabian Greif
+ * Copyright (c) 2013, Kevin Läufer
+ * Copyright (c) 2013-2017, Niklas Hauser
+ * Copyright (c) 2014, 2016, Sascha Schade
+ * Copyright (c) 2022, Andrey Kunistyn
+ *
+ * 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/.
+ */
+// ----------------------------------------------------------------------------
+
+#include <modm/board.hpp>
+#include <modm/debug/logger.hpp>
+#include <modm/processing/timer.hpp>
+#include <modm/processing/protothread.hpp>
+
+// ----------------------------------------------------------------------------
+// Set the log level
+#undef	MODM_LOG_LEVEL
+#define	MODM_LOG_LEVEL modm::log::INFO
+
+// Create an IODeviceWrapper around the Uart Peripheral we want to use
+modm::IODeviceWrapper< Uart0, modm::IOBuffer::BlockIfFull > loggerDevice;
+
+// Set all four logger streams to use the UART
+modm::log::Logger modm::log::debug(loggerDevice);
+modm::log::Logger modm::log::info(loggerDevice);
+modm::log::Logger modm::log::warning(loggerDevice);
+modm::log::Logger modm::log::error(loggerDevice);
+
+
+class BlinkThread : public modm::pt::Protothread
+{
+public:
+	BlinkThread()
+	{
+		timeout.restart(100ms);
+	}
+
+	bool
+	update()
+	{
+		PT_BEGIN();
+
+		while (true)
+		{
+			Board::LedGreen::reset();
+
+			PT_WAIT_UNTIL(timeout.isExpired());
+			timeout.restart(100ms);
+
+			Board::LedGreen::set();
+
+			PT_WAIT_UNTIL(timeout.isExpired()) ;
+			timeout.restart(900ms);
+
+			MODM_LOG_INFO << "Seconds since reboot: " << ++uptime << modm::endl;
+		}
+
+		PT_END();
+	}
+
+private:
+	modm::ShortTimeout timeout;
+	uint32_t uptime;
+};
+
+BlinkThread blinkThread;
+
+
+// ----------------------------------------------------------------------------
+int
+main()
+{
+	Board::initialize();
+
+	// initialize Uart0 for MODM_LOG_*
+	Uart0::connect<GpioOutput0::Tx>();
+	Uart0::initialize<Board::SystemClock, 115200_Bd>();
+
+	// Use the logging streams to print some messages.
+	// Change MODM_LOG_LEVEL above to enable or disable these messages
+	MODM_LOG_DEBUG   << "debug"   << modm::endl;
+	MODM_LOG_INFO    << "info"    << modm::endl;
+	MODM_LOG_WARNING << "warning" << modm::endl;
+	MODM_LOG_ERROR   << "error"   << modm::endl;
+
+
+	while (true)
+	{
+		blinkThread.update();
+	}
+
+	return 0;
+}

examples/rp_pico/logger/project.xml

@@ -0,0 +1,14 @@
+<library>
+  <extends>modm:rp-pico</extends>
+  <options>
+    <option name="modm:build:build.path">../../../build/rp_pico/logger</option>
+  </options>
+  <modules>
+    <module>modm:debug</module>
+    <module>modm:platform:gpio</module>
+    <module>modm:platform:uart:0</module>
+    <module>modm:processing:timer</module>
+    <module>modm:processing:protothread</module>
+    <module>modm:build:scons</module>
+  </modules>
+</library>

ext/modm-devices

@@ -33,6 +33,8 @@ struct SystemClock
 	static constexpr uint32_t UsbPLLMul = 40;
 	static constexpr uint32_t RefFrequency = 12_MHz;
 	static constexpr uint32_t UsbFrequency = 48_MHz;
+	static constexpr uint32_t SysFrequency = Frequency;
+	static constexpr uint32_t PeriFrequency = SysFrequency;
 
 	static bool inline
 	enable()

src/modm/board/rp_pico/board.hpp

@@ -13,10 +13,10 @@
 
 #include <stdint.h>
 #include <modm/platform/device.hpp>
+#include <modm/platform/core/resets.hpp>
 #include <modm/architecture/interface/delay.hpp>
 #include <hardware/structs/clocks.h>
 #include <hardware/structs/pll.h>
-#include <hardware/structs/resets.h>
 
 namespace modm::platform
 {
@@ -48,15 +48,6 @@ namespace modm::platform
 
 		static constexpr uint32_t BootFrequency = 125'000'000; // after bootloader
 
-		static inline void reset_block(uint32_t bits) {
-		    hw_set_bits(&resets_hw->reset, bits);
-		}
-		static inline void unreset_block_wait(uint32_t bits) {
-		    hw_clear_bits(&resets_hw->reset, bits);
-		    while (~resets_hw->reset_done & bits)
-		        __NOP();
-		}
-
 	public:
 		static inline void disableResus() {
 			clocks_hw->resus.ctrl = 0;
@@ -84,8 +75,8 @@ namespace modm::platform
 		        return;
 		    }
 		    uint32_t pll_reset = (Pll::Usb == pll_name) ? RESETS_RESET_PLL_USB_BITS : RESETS_RESET_PLL_SYS_BITS;
-		    reset_block(pll_reset);
-		    unreset_block_wait(pll_reset);
+		    Resets::reset(pll_reset);
+		    Resets::unresetWait(pll_reset);
 
 		    // Load VCO-related dividers before starting VCO
 		    pll->cs = refdiv;

src/modm/platform/clock/rp/clocks.hpp.in

@@ -46,6 +46,9 @@ def build(env):
     # H742/43: Prescaler not implemented in revY
     elif target.family == "h7" and target.name in ["42", "43", "50", "53"] and target.revision == "y":
         div = 1
+    # RP2040 external reference clock need additional configuration
+    elif target.platform == "rp":
+        div = 1
 
     env.substitutions = {
         "systick_frequency": env.get(":freertos:frequency", freq),

src/modm/platform/clock/systick/module.lb

@@ -33,7 +33,7 @@ def build(env):
     env.substitutions = {"target": target}
     env.outbasepath = "modm/src/modm/platform/core"
     # startup helper code
-    env.template("startup_platform.c.in")
+    env.template("startup_platform.cpp.in")
 
     # delay code that must be tuned for each family
     # (cycles per loop, setup cost in loops, max cpu frequency)
@@ -56,6 +56,7 @@ def build(env):
     env.template("../cortex/delay_ns.cpp.in", "delay_ns.cpp")
     env.template("../cortex/delay_ns.hpp.in", "delay_ns.hpp")
     env.template("../cortex/delay_impl.hpp.in", "delay_impl.hpp")
+    env.copy('resets.hpp')
 
 
 def post_build(env):

src/modm/platform/core/rp/module.lb

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2022, Andrey Kunitsyn
+ *
+ * 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 <modm/platform/device.hpp>
+#include <modm/architecture/interface/assert.hpp>
+#include <hardware/structs/resets.h>
+
+namespace modm::platform {
+
+struct Resets {
+	/// @todo use Peripherial enum
+	static inline void reset(uint32_t bits) {
+	    hw_set_bits(&resets_hw->reset, bits);
+	}
+	static inline void unresetWait(uint32_t bits) {
+	    hw_clear_bits(&resets_hw->reset, bits);
+	    while (~resets_hw->reset_done & bits)
+	        __NOP();
+	}
+};
+
+
+}

src/modm/platform/core/rp/resets.hpp

@@ -10,16 +10,8 @@
 // ----------------------------------------------------------------------------
 
 #include "../device.hpp"
+#include <modm/platform/core/resets.hpp>
 
-#include <hardware/structs/resets.h>
-static inline void reset_block(uint32_t bits) {
-    hw_set_bits(&resets_hw->reset, bits);
-}
-static inline void unreset_block_wait(uint32_t bits) {
-    hw_clear_bits(&resets_hw->reset, bits);
-    while (~resets_hw->reset_done & bits)
-        __NOP();
-}
 /**
  * This code should _only_ enable internal memories and nothing else.
  * Since this is the first code executed after a reset, you do not
@@ -30,15 +22,15 @@ static inline void unreset_block_wait(uint32_t bits) {
  * In that case, consider using inline assembly to manage stack access
  * manually, until the memory is enabled.
  */
-void
+extern "C" void
 __modm_initialize_platform(void)
 {
 
     // Reset all peripherals to put system into a known state,
     // - except for QSPI pads and the XIP IO bank, as this is fatal if running from flash
     // - and the PLLs, as this is fatal if clock muxing has not been reset on this boot
     // - and USB, syscfg, as this disturbs USB-to-SWD on core 1
-    reset_block(~(
+    modm::platform::Resets::reset(~(
             RESETS_RESET_IO_QSPI_BITS |
             RESETS_RESET_PADS_QSPI_BITS |
             RESETS_RESET_PLL_USB_BITS |
@@ -49,7 +41,7 @@ __modm_initialize_platform(void)
 
     // Remove reset from peripherals which are clocked only by clk_sys and
     // clk_ref. Other peripherals stay in reset until we've configured clocks.
-    unreset_block_wait(RESETS_RESET_BITS & ~(
+    modm::platform::Resets::unresetWait(RESETS_RESET_BITS & ~(
             RESETS_RESET_ADC_BITS |
             RESETS_RESET_RTC_BITS |
             RESETS_RESET_SPI0_BITS |