Enable STM32 extended I2c on many targets

examples/stm32f072_discovery/tmp102/main.cpp

@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2014, Sascha Schade
+ * Copyright (c) 2014-2017, 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/.
+ */
+// ----------------------------------------------------------------------------
+
+#include <modm/board.hpp>
+
+#include <modm/processing/timer.hpp>
+#include <modm/processing/protothread.hpp>
+#include <modm/driver/temperature/tmp102.hpp>
+
+#include <modm/io/iostream.hpp>
+
+modm::IODeviceWrapper< Usart1, modm::IOBuffer::BlockIfFull > device;
+modm::IOStream stream(device);
+
+typedef I2cMaster1 MyI2cMaster;
+
+
+class ThreadOne : public modm::pt::Protothread
+{
+public:
+	ThreadOne()
+	:	temp(temperatureData, 0x48)
+	{
+	}
+
+	bool
+	update()
+	{
+		temp.update();
+
+		PT_BEGIN();
+
+		// ping the device until it responds
+		while(true)
+		{
+			// we wait until the task started
+			if (PT_CALL(temp.ping()))
+				break;
+			// otherwise, try again in 100ms
+			this->timeout.restart(100);
+			PT_WAIT_UNTIL(this->timeout.isExpired());
+		}
+
+
+		PT_CALL(temp.setUpdateRate(200));
+		PT_CALL(temp.enableExtendedMode());
+
+		PT_CALL(temp.configureAlertMode(
+				modm::tmp102::ThermostatMode::Comparator,
+				modm::tmp102::AlertPolarity::ActiveLow,
+				modm::tmp102::FaultQueue::Faults6));
+		PT_CALL(temp.setLowerLimit(28.f));
+		PT_CALL(temp.setUpperLimit(30.f));
+
+		while (true)
+		{
+			{
+				PT_CALL(temp.readComparatorMode(result));
+				float temperature = temperatureData.getTemperature();
+				uint8_t tI = (int) temperature;
+				uint16_t tP = (temperature - tI) * 10000;
+				stream << "T= " << tI << ".";
+				if (tP == 0)
+				{
+					stream << "0000 C";
+				}
+				else if (tP == 625)
+				{
+					stream << "0" << tP << " C";
+				}
+				else
+				{
+					stream << tP << " C";
+				}
+				stream << modm::endl;
+				if (result) stream << "Heat me up!" << modm::endl;
+			}
+			this->timeout.restart(200);
+			PT_WAIT_UNTIL(this->timeout.isExpired());
+			Board::LedDown::toggle();
+		}
+
+		PT_END();
+	}
+
+private:
+	bool result;
+	modm::ShortTimeout timeout;
+	modm::tmp102::Data temperatureData;
+	modm::Tmp102<MyI2cMaster> temp;
+};
+
+ThreadOne one;
+
+// ----------------------------------------------------------------------------
+int
+main()
+{
+	Board::initialize();
+
+	Usart1::connect<GpioA9::Tx>();
+	Usart1::initialize<Board::systemClock, 115'200>();
+
+	MyI2cMaster::connect<GpioB7::Sda, GpioB8::Scl>();
+	MyI2cMaster::initialize<Board::systemClock, 400'000>();
+
+	stream << "\n\nRESTART\n\n";
+
+	while (1)
+	{
+		one.update();
+		Board::LedUp::toggle();
+	}
+
+	return 0;
+}

examples/stm32f072_discovery/tmp102/project.xml

@@ -0,0 +1,15 @@
+<library>
+  <extends>modm:board:disco-f072rb</extends>
+  <options>
+    <option name=":build:build.path">../../../build/stm32f072_discovery/tmp102</option>
+  </options>
+  <modules>
+    <module>:driver:tmp102</module>
+    <module>:io</module>
+    <module>:platform:gpio</module>
+    <module>:platform:i2c:1</module>
+    <module>:platform:uart:1</module>
+    <module>:processing:protothread</module>
+    <module>:build:scons</module>
+  </modules>
+</library>

examples/stm32f746g_discovery/tmp102/main.cpp

@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2014, Sascha Schade
+ * Copyright (c) 2014-2017, 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/.
+ */
+// ----------------------------------------------------------------------------
+
+#include <modm/board.hpp>
+
+#include <modm/processing/timer.hpp>
+#include <modm/processing/protothread.hpp>
+#include <modm/driver/temperature/tmp102.hpp>
+
+typedef I2cMaster1 MyI2cMaster;
+
+
+class ThreadOne : public modm::pt::Protothread
+{
+public:
+	ThreadOne()
+	:	temp(temperatureData, 0x48)
+	{
+	}
+
+	bool
+	update()
+	{
+		temp.update();
+
+		PT_BEGIN();
+
+		// ping the device until it responds
+		while(true)
+		{
+			// we wait until the task started
+			if (PT_CALL(temp.ping()))
+				break;
+			// otherwise, try again in 100ms
+			this->timeout.restart(100);
+			PT_WAIT_UNTIL(this->timeout.isExpired());
+		}
+
+
+		PT_CALL(temp.setUpdateRate(200));
+		PT_CALL(temp.enableExtendedMode());
+
+		PT_CALL(temp.configureAlertMode(
+				modm::tmp102::ThermostatMode::Comparator,
+				modm::tmp102::AlertPolarity::ActiveLow,
+				modm::tmp102::FaultQueue::Faults6));
+		PT_CALL(temp.setLowerLimit(28.f));
+		PT_CALL(temp.setUpperLimit(30.f));
+
+		while (true)
+		{
+			{
+				PT_CALL(temp.readComparatorMode(result));
+				float temperature = temperatureData.getTemperature();
+				uint8_t tI = (int) temperature;
+				uint16_t tP = (temperature - tI) * 10000;
+				MODM_LOG_INFO << "T= " << tI << ".";
+				if (tP == 0)
+				{
+					MODM_LOG_INFO << "0000 C";
+				}
+				else if (tP == 625)
+				{
+					MODM_LOG_INFO << "0" << tP << " C";
+				}
+				else
+				{
+					MODM_LOG_INFO << tP << " C";
+				}
+				if (result) { MODM_LOG_INFO << " Heat me up!"; }
+				MODM_LOG_INFO << modm::endl;
+			}
+			this->timeout.restart(200);
+			PT_WAIT_UNTIL(this->timeout.isExpired());
+			Board::LedD13::toggle();
+		}
+
+		PT_END();
+	}
+
+private:
+	bool result;
+	modm::ShortTimeout timeout;
+	modm::tmp102::Data temperatureData;
+	modm::Tmp102<MyI2cMaster> temp;
+};
+
+ThreadOne one;
+
+// ----------------------------------------------------------------------------
+int
+main()
+{
+	Board::initialize();
+	Board::LedD13::setOutput(modm::Gpio::Low);
+
+	MyI2cMaster::connect<Board::D14::Sda, Board::D15::Scl>();
+	MyI2cMaster::initialize<Board::systemClock, 400'000>();
+
+	MODM_LOG_INFO << "\n\nRESTART\n\n";
+
+	while (1)
+	{
+		one.update();
+	}
+
+	return 0;
+}

examples/stm32f746g_discovery/tmp102/project.xml

@@ -0,0 +1,13 @@
+<library>
+  <extends>modm:board:disco-f746ng</extends>
+  <options>
+    <option name=":build:build.path">../../../build/stm32f746g_discovery/tmp102</option>
+  </options>
+  <modules>
+    <module>:driver:tmp102</module>
+    <module>:io</module>
+    <module>:platform:i2c:1</module>
+    <module>:processing:protothread</module>
+    <module>:build:scons</module>
+  </modules>
+</library>

src/modm/board/disco_f072rb/board.hpp

@@ -32,9 +32,32 @@ namespace Board
 struct systemClock
 {
 	static constexpr int Frequency = MHz48;
-	static constexpr int Usart1 = Frequency;
-	static constexpr int Can = Frequency;
-	static constexpr int Spi2 = Frequency;
+	static constexpr uint32_t Ahb = Frequency;
+	static constexpr uint32_t Apb = Frequency;
+
+	static constexpr uint32_t Adc   = Apb;
+	static constexpr uint32_t Can   = Apb;
+
+	static constexpr uint32_t Spi1   = Apb;
+	static constexpr uint32_t Spi2   = Apb;
+
+	static constexpr uint32_t Usart1 = Apb;
+	static constexpr uint32_t Usart2 = Apb;
+	static constexpr uint32_t Usart3 = Apb;
+	static constexpr uint32_t Usart4 = Apb;
+
+	static constexpr uint32_t I2c1   = Apb;
+	static constexpr uint32_t I2c2   = Apb;
+
+	static constexpr uint32_t Timer1  = Apb;
+	static constexpr uint32_t Timer2  = Apb;
+	static constexpr uint32_t Timer3  = Apb;
+	static constexpr uint32_t Timer6  = Apb;
+	static constexpr uint32_t Timer7  = Apb;
+	static constexpr uint32_t Timer14 = Apb;
+	static constexpr uint32_t Timer15 = Apb;
+	static constexpr uint32_t Timer16 = Apb;
+	static constexpr uint32_t Timer17 = Apb;
 
 	static bool inline
 	enable()

src/modm/board/disco_f303vc/board.hpp

@@ -149,9 +149,7 @@ using Int2 = GpioInputE5;	// MEMS_INT4 [LSM303DLHC_INT2]: GPXTI5
 using Scl = GpioB6;	// I2C1_SCL [LSM303DLHC_SCL]: I2C1_SCL
 using Sda = GpioB7;	// I2C1_SDA [LSM303DLHC_SDA]: I2C1_SDA
 
-// Hardware I2C not yet implemented for F3!
-//using I2cMaster = I2cMaster1;
-using I2cMaster = BitBangI2cMaster<Scl, Sda>;
+using I2cMaster = I2cMaster1;
 using Accelerometer = modm::Lsm303a< I2cMaster >;
 }
 
@@ -225,7 +223,7 @@ initializeLsm3()
 	lsm3::Drdy::enableExternalInterrupt();
 //	lsm3::Drdy::enableExternalInterruptVector(12);
 
-	lsm3::I2cMaster::connect<lsm3::Scl::BitBang, lsm3::Sda::BitBang>();
+	lsm3::I2cMaster::connect<lsm3::Scl::Scl, lsm3::Sda::Sda>();
 	lsm3::I2cMaster::initialize<systemClock, 400000>();
 }
 

src/modm/board/disco_f303vc/module.lb

@@ -31,7 +31,7 @@ def prepare(module, options):
         ":platform:clock",
         ":platform:core",
         ":platform:gpio",
-        ":platform:i2c.bitbang",
+        ":platform:i2c:1",
         ":platform:spi:1")
     return True
 

src/modm/board/disco_f746ng/board.hpp

@@ -110,6 +110,31 @@ using LedD13 = GpioOutputI1;	// User LED 1 (Arduino D13)
 
 using Leds = SoftwareGpioPort< LedD13 >;
 
+// Arduino footprint
+using A0 = GpioA0;
+using A1 = GpioF10;
+using A2 = GpioF9;
+using A3 = GpioF8;
+using A4 = GpioF7;
+using A5 = GpioF6;
+
+using D0  = GpioC7;
+using D1  = GpioC6;
+using D2  = GpioG6;
+using D3  = GpioB4;
+using D4  = GpioG7;
+using D5  = GpioA8;
+using D6  = GpioH6;
+using D7  = GpioI3;
+using D8  = GpioI2;
+using D9  = GpioA15;
+using D10 = GpioI0;
+using D11 = GpioB15;
+using D12 = GpioB14;
+using D13 = GpioI1;
+using D14 = GpioB9;
+using D15 = GpioB8;
+
 
 namespace stlink
 {

src/modm/platform/adc/stm32f3/adc.hpp.in

@@ -96,7 +96,7 @@ public:
 		SynchronousPrescaler4 = {{ adc_ccr }}_CKMODE_1 | {{ adc_ccr }}_CKMODE_0,
 	};
 
-%% if target["family"] in ["l4"]
+%% if clock_mux
 	// ADCs clock source selection
 	enum class ClockSource : uint32_t
 	{
@@ -235,7 +235,7 @@ public:
 	 */
 	static inline void
 	initialize(	const ClockMode clk = ClockMode::DoNotChange,
-%% if target["family"] in ["l4"]
+%% if clock_mux
 				const ClockSource clk_src = ClockSource::SystemClock,
 %% endif
 				const Prescaler pre = Prescaler::Disabled,