temporary fixups

modm-io · Sep 10, 2019 · ace44da · ace44da
1 parent b1ba9ad
commit ace44da
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -70,7 +70,7 @@ git clone --recurse-submodules https://github.com/modm-io/modm.git
 
 ## Targets
 
-modm can generate code for <!--avrcount-->78<!--/avrcount--> AVR and <!--stmcount-->958<!--/stmcount-->
+modm can generate code for <!--avrcount-->78<!--/avrcount--> AVR and <!--stmcount-->1067<!--/stmcount-->
 STM32 devices, however, there are different levels of support and testing.
 
 <center>
@@ -139,11 +139,12 @@ documentation.
 <td align="center">NUCLEO-F446RE</td>
 <td align="center">NUCLEO-G071RB</td>
 </tr><tr>
+<td align="center">NUCLEO-G474RE</td>
 <td align="center">NUCLEO-L432KC</td>
 <td align="center">NUCLEO-L476RG</td>
 <td align="center">OLIMEXINO-STM32</td>
-<td align="center">STM32F030F4P6-DEMO</td>
 </tr><tr>
+<td align="center">STM32F030F4P6-DEMO</td>
 </tr>
 </table>
 <!--/bsptable-->

diff --git a/examples/nucleo_g474re/blink/blink/main.cpp → examples/nucleo_g474re/blink/main.cpp b/examples/nucleo_g474re/blink/blink/main.cpp → examples/nucleo_g474re/blink/main.cpp
diff --git a/...les/nucleo_g474re/blink/blink/project.xml → examples/nucleo_g474re/blink/project.xml b/...les/nucleo_g474re/blink/blink/project.xml → examples/nucleo_g474re/blink/project.xml
diff --git a/ext/st/device.hpp.in b/ext/st/device.hpp.in
@@ -29,6 +29,8 @@
 #include <{{ header }}>
 %% endfor
 
+#define HRTIM_TIM_TypeDef HRTIM_TypeDef
+
 /// @cond
 // This is a hack to make the *_Typedef's known to GDB, so that you can debug
 // the peripherals directly in GDB in any context.

diff --git a/src/modm/board/nucleo_g474re/board.hpp b/src/modm/board/nucleo_g474re/board.hpp
@@ -28,7 +28,8 @@ namespace Board
 // Dummy clock for devices
 struct SystemClock {
 	static constexpr uint32_t Frequency = 170_MHz;
-	static constexpr uint32_t Ahb       = Frequency;
+	static constexpr uint32_t Ahb1      = Frequency;
+	static constexpr uint32_t Ahb2      = Frequency;
 	static constexpr uint32_t Apb1      = Frequency;
 	static constexpr uint32_t Apb2      = Frequency;
 
@@ -43,7 +44,7 @@ struct SystemClock {
 	static constexpr uint32_t Adc       = Ahb2;
 	static constexpr uint32_t Adc1      = Adc;
 	static constexpr uint32_t Adc2      = Adc;
-	static constexpr uint32_t Adc2      = Adc;
+	static constexpr uint32_t Adc3      = Adc;
 	static constexpr uint32_t Adc4      = Adc;
 	static constexpr uint32_t Adc5      = Adc;
 	static constexpr uint32_t Dac       = Ahb2;

diff --git a/src/modm/platform/gpio/stm32/module.lb b/src/modm/platform/gpio/stm32/module.lb
@@ -237,7 +237,7 @@ def validate(env):
         all_peripherals.extend([get_driver(r) for r in driver["remap"]])
     bprops["all_peripherals"] = sorted(list(set(all_peripherals)))
     bprops["all_signals"] = sorted(list(set(s["name"] for s in all_signals.values())))
-    bprops["pf"] = "1" if device.identifier["family"] in ["l4", "g0"] else ""
+    bprops["pf"] = "1" if device.identifier["family"] in ["l4", "g0", "g4"] else ""
 
     # Check the max number of ADC instances
     max_adc_instance = max(map(int, device.get_driver("adc").get("instance", [1])))