Migra o template para CPP

CMakeLists.txt

@@ -22,7 +22,7 @@ set(CMAKE_C_STANDARD 11)
 set(CMAKE_BUILD_TYPE Debug)
 
 # Cube file name without .ioc extension
-project(stm32_project_template C ASM)
+project(stm32_project_template C CXX ASM)
 
 # Set the board version to an empty string if your board doesn't have a version
 set(BOARD_VERSION "")
@@ -125,12 +125,12 @@ set(TEST_INCLUDE_DIRECTORIES
 ## Input files
 ###############################################################################
 
-file(GLOB_RECURSE C_SOURCES CONFIGURE_DEPENDS "src/*.c")
-file(GLOB_RECURSE C_HEADERS CONFIGURE_DEPENDS "inc/*.h")
+file(GLOB_RECURSE C_SOURCES CONFIGURE_DEPENDS "src/*.cpp")
+file(GLOB_RECURSE C_HEADERS CONFIGURE_DEPENDS "inc/*.hpp")
 
-file(GLOB_RECURSE TESTS_SOURCES CONFIGURE_DEPENDS "tests/src/*.c")
-file(GLOB_RECURSE TESTS_HEADERS CONFIGURE_DEPENDS "tests/inc/*.h")
-file(GLOB_RECURSE TESTS_BIN CONFIGURE_DEPENDS "tests/bin/*.c")
+file(GLOB_RECURSE TESTS_SOURCES CONFIGURE_DEPENDS "tests/src/*.cpp")
+file(GLOB_RECURSE TESTS_HEADERS CONFIGURE_DEPENDS "tests/inc/*.hpp")
+file(GLOB_RECURSE TESTS_BIN CONFIGURE_DEPENDS "tests/bin/*.cpp")
 
 file(GLOB_RECURSE CUBE_SOURCES CONFIGURE_DEPENDS "cube/Src/*.c")
 
@@ -184,12 +184,12 @@ targets_generate_helpme_target()
 ## Generate test executables
 ###############################################################################
 
-# Since each test has its own main function, we don't need the main.c from the project
-list(REMOVE_ITEM C_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/main.c)
+# Since each test has its own main function, we don't need the main.cpp from the project
+list(REMOVE_ITEM C_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/main.cpp)
 
 foreach(TEST_FILE ${TESTS_BIN})
 
-    # If TEST_FILE contains /dir1/dir2/file.c, TEST_NAME will be 'file'
+    # If TEST_FILE contains /dir1/dir2/file.cpp, TEST_NAME will be 'file'
     get_filename_component(TEST_NAME ${TEST_FILE} NAME_WLE)
 
     add_executable(${TEST_NAME} EXCLUDE_FROM_ALL

README.md

@@ -70,7 +70,7 @@ Para isso é necessário mudar o nome do projeto, o qual deve ter o mesmo do arq
 
 ```c
 # Cube file name without .ioc extension
-project(stm32_project_template C ASM)
+project(stm32_project_template C CXX ASM)
 ```
 
 > Os argumentos `C` e `ASM` estão relacionados ao tipo de linguagem que o projeto utiliza (C e Assembly).

cube/stm32_project_template.ioc

@@ -32,8 +32,8 @@ Mcu.PinsNb=14
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32F303RETx
-MxCube.Version=6.9.0
-MxDb.Version=DB.6.0.90
+MxCube.Version=6.9.1
+MxDb.Version=DB.6.0.91
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false\:false
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false\:false
 NVIC.ForceEnableDMAVector=true

inc/mcu.hpp

@@ -0,0 +1,48 @@
+/**
+ * @file mcu.hpp
+ *
+ * @brief MCU related
+ */
+
+#ifndef __MCU_H__
+#define __MCU_H__
+
+#include <stdint.h>
+
+/*****************************************
+ * Public Function Prototypes
+ *****************************************/
+
+extern "C"
+{
+    /**
+     * @brief Initializes System Clock.
+     * @note  Defined by cube.
+     */
+    void SystemClock_Config(void);
+}
+
+namespace hal
+{
+    class mcu
+    {
+    public:
+        /**
+         * @brief Initializes MCU and some peripherals.
+         */
+        static void init(void);
+
+        /**
+         * @brief Put the MCU to sleep.
+         *
+         * @param ms  Sleep time in milliseconds
+         */
+        static void sleep(uint32_t ms);
+
+        /**
+         * @brief Toggles LED.
+         */
+        static void led_toggle(void);
+    };
+};
+#endif // __MCU_H__

src/main.c → src/main.cpp

@@ -1,26 +1,28 @@
 /**
- * @file main.c
+ * @file main.cpp
  *
  * @brief Main function
  */
 
-#include "mcu.h"
+#include "mcu.hpp"
 
 /*****************************************
  * Private Constant Definitions
  *****************************************/
 
-#define LED_TOGGLE_DELAY_MS 1500
+static constexpr uint16_t led_toggle_delay_ms = 1500;
 
 /*****************************************
  * Main Function
  *****************************************/
 
-int main(void) {
-    mcu_init();
+int main(void)
+{
+    hal::mcu::init();
 
-    for (;;) {
-        led_toggle();
-        mcu_sleep(LED_TOGGLE_DELAY_MS);
+    for (;;)
+    {
+        hal::mcu::led_toggle();
+        hal::mcu::sleep(led_toggle_delay_ms);
     }
 }

src/mcu.c → src/mcu.cpp

@@ -1,12 +1,12 @@
 /**
- * @file mcu.c
+ * @file mcu.cpp
  *
  * @brief MCU related
  */
 
 #include <stdint.h>
 
-#include "mcu.h"
+#include "mcu.hpp"
 
 #include "gpio.h"
 #include "main.h"
@@ -15,18 +15,21 @@
  * Public Function Body Definitions
  *****************************************/
 
-void mcu_init(void) {
+void hal::mcu::init(void)
+{
     HAL_Init();
 
     SystemClock_Config();
 
     MX_GPIO_Init();
 }
 
-void mcu_sleep(uint32_t ms) {
+void hal::mcu::sleep(uint32_t ms)
+{
     HAL_Delay(ms);
 }
 
-void led_toggle(void) {
+void hal::mcu::led_toggle(void)
+{
     HAL_GPIO_TogglePin(GPIOA, GPIO_PIN_5);
 }

tests/bin/test_main.c → tests/bin/test_main.cpp

@@ -1,15 +1,17 @@
 /**
- * @file test_main.c
+ * @file test_main.cpp
  *
  * @brief Main function for tests.
  */
 
 #include <stdio.h>
-#include "tests_core.h"
+#include "test_core.hpp"
 
-int main(void) {
+int main(void)
+{
     test_core_init();
 
-    for (;;) {
+    for (;;)
+    {
     }
 }

tests/inc/test_core.h → tests/inc/test_core.hpp

@@ -1,5 +1,5 @@
 /**
- * @file test_core.h
+ * @file test_core.hpp
  *
  * @brief Core functions to the test
  *

tests/src/test_core.c → tests/src/test_core.cpp

@@ -1,5 +1,5 @@
 /**
- * @file test_core.c
+ * @file test_core.cpp
  *
  * @brief Core functions to the test
  *
@@ -9,13 +9,14 @@
  *
  */
 
-#include "test_core.h"
-#include "mcu.h"
+#include "test_core.hpp"
+#include "mcu.hpp"
 
 /*****************************************
  * Public Functions Bodies Definitions
  *****************************************/
 
-void test_core_init(void) {
-    mcu_init();
+void test_core_init(void)
+{
+    hal::mcu::init();
 }