Change firmware to use C++ main

AdaptiveBrightnessFirmware/Inc/adc.h

@@ -24,7 +24,7 @@
 #endif
 
 /* Includes ------------------------------------------------------------------*/
-#include "main.h"
+#include "init.h"
 
 /* USER CODE BEGIN Includes */
 

AdaptiveBrightnessFirmware/Inc/gpio.h

@@ -25,7 +25,7 @@
 #endif
 
 /* Includes ------------------------------------------------------------------*/
-#include "main.h"
+#include "init.h"
 
 /* USER CODE BEGIN Includes */
 

AdaptiveBrightnessFirmware/Inc/init.h

@@ -1,8 +1,8 @@
 /* USER CODE BEGIN Header */
 /**
   ******************************************************************************
-  * @file           : main.h
+  * @file           : init.h
-  * @brief          : Header for main.c file.
+  * @brief          : Header for init.c file.
   *                   This file contains the common defines of the application.
   ******************************************************************************
   * @attention
@@ -20,8 +20,8 @@
 /* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MAIN_H
+#ifndef __INIT_H
-#define __MAIN_H
+#define __INIT_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -52,6 +52,7 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 void Error_Handler(void);
+void init(void);
 
 /* USER CODE BEGIN EFP */
 
@@ -80,6 +81,6 @@ void Error_Handler(void);
 }
 #endif
 
-#endif /* __MAIN_H */
+#endif /* __INIT_H */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

AdaptiveBrightnessFirmware/Inc/usbd_conf.h

@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "main.h"
+#include "init.h"
 #include "stm32f0xx.h"
 #include "stm32f0xx_hal.h"
 

AdaptiveBrightnessFirmware/Makefile

@@ -1,5 +1,6 @@
 ##########################################################################################################################
 # File automatically-generated by tool: [projectgenerator] version: [3.7.1] date: [Sun Jun 28 13:32:11 CEST 2020]
+# and modified by hand
 ##########################################################################################################################
 
 # ------------------------------------------------
@@ -36,7 +37,7 @@ BUILD_DIR = build
 ######################################
 # C sources
 C_SOURCES =  \
-Src/main.c \
+Src/init.c \
 Src/gpio.c \
 Src/adc.c \
 Src/usb_device.c \
@@ -71,6 +72,10 @@ Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ctlreq.c \
 Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ioreq.c \
 Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Src/usbd_cdc.c
 
+# C++ sources
+CXX_SOURCES = \
+Src/main.cpp
+
 # ASM sources
 ASM_SOURCES =  \
 startup_stm32f042x6.s
@@ -84,11 +89,13 @@ PREFIX = arm-none-eabi-
 # either it can be added to the PATH environment variable.
 ifdef GCC_PATH
 CC  = $(GCC_PATH)/$(PREFIX)gcc
+CXX = $(GCC_PATH)/$(PREFIX)g++
 AS  = $(GCC_PATH)/$(PREFIX)gcc -x assembler-with-cpp
 CP  = $(GCC_PATH)/$(PREFIX)objcopy
 SZ  = $(GCC_PATH)/$(PREFIX)size
 else
 CC  = $(PREFIX)gcc
+CXX = $(PREFIX)g++
 AS  = $(PREFIX)gcc -x assembler-with-cpp
 CP  = $(PREFIX)objcopy
 SZ  = $(PREFIX)size
@@ -120,6 +127,11 @@ C_DEFS =  \
 -DUSE_HAL_DRIVER \
 -DSTM32F042x6
 
+# C++ defines
+CXX_DEFS =  \
+-DUSE_HAL_DRIVER \
+-DSTM32F042x6
+
 
 # AS includes
 AS_INCLUDES =
@@ -135,19 +147,34 @@ C_INCLUDES =  \
 -IDrivers/CMSIS/Include \
 -IDrivers/CMSIS/Include
 
+# C++ includes
+CXX_INCLUDES =  \
+-IInc \
+-IDrivers/STM32F0xx_HAL_Driver/Inc \
+-IDrivers/STM32F0xx_HAL_Driver/Inc/Legacy \
+-IMiddlewares/ST/STM32_USB_Device_Library/Core/Inc \
+-IMiddlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc \
+-IDrivers/CMSIS/Device/ST/STM32F0xx/Include \
+-IDrivers/CMSIS/Include \
+-IDrivers/CMSIS/Include
+
 
 # compile gcc flags
 ASFLAGS = $(MCU) $(AS_DEFS) $(AS_INCLUDES) $(OPT) -Wall -fdata-sections -ffunction-sections
 
 CFLAGS = $(MCU) $(C_DEFS) $(C_INCLUDES) $(OPT) -Wall -fdata-sections -ffunction-sections
 
+CXXFLAGS = $(MCU) $(CXX_DEFS) $(CXX_INCLUDES) $(OPT) -Wall -Wextra -pedantic -std=c++17 -fdata-sections -ffunction-sections
+
 ifeq ($(DEBUG), 1)
 CFLAGS += -g -gdwarf-2
+CXXFLAGS += -g -gdwarf-2
 endif
 
 
 # Generate dependency information
 CFLAGS += -MMD -MP -MF"$(@:%.o=%.d)"
+CXXFLAGS += -MMD -MP -MF"$(@:%.o=%.d)"
 
 
 #######################################
@@ -159,7 +186,7 @@ LDSCRIPT = STM32F042K6Tx_FLASH.ld
 # libraries
 LIBS = -lc -lm -lnosys
 LIBDIR =
-LDFLAGS = $(MCU) -specs=nano.specs -T$(LDSCRIPT) $(LIBDIR) $(LIBS) -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref -Wl,--gc-sections
+LDFLAGS = $(MCU) -specs=nosys.specs -specs=nano.specs -T$(LDSCRIPT) $(LIBDIR) $(LIBS) -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref -Wl,--gc-sections
 
 # default action: build all
 all: $(BUILD_DIR)/$(TARGET).elf $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).bin
@@ -171,6 +198,9 @@ all: $(BUILD_DIR)/$(TARGET).elf $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET
 # list of objects
 OBJECTS = $(addprefix $(BUILD_DIR)/,$(notdir $(C_SOURCES:.c=.o)))
 vpath %.c $(sort $(dir $(C_SOURCES)))
+# list of C++ program objects
+OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(CXX_SOURCES:.cpp=.o)))
+vpath %.cpp $(sort $(dir $(CXX_SOURCES)))
 # list of ASM program objects
 OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(ASM_SOURCES:.s=.o)))
 vpath %.s $(sort $(dir $(ASM_SOURCES)))
@@ -178,11 +208,14 @@ vpath %.s $(sort $(dir $(ASM_SOURCES)))
 $(BUILD_DIR)/%.o: %.c Makefile | $(BUILD_DIR)
 	$(CC) -c $(CFLAGS) -Wa,-a,-ad,-alms=$(BUILD_DIR)/$(notdir $(<:.c=.lst)) $< -o $@
 
+$(BUILD_DIR)/%.o: %.cpp Makefile | $(BUILD_DIR)
+	$(CXX) -c $(CXXFLAGS) -Wa,-a,-ad,-alms=$(BUILD_DIR)/$(notdir $(<:.cpp=.lst)) $< -o $@
+
 $(BUILD_DIR)/%.o: %.s Makefile | $(BUILD_DIR)
 	$(AS) -c $(CFLAGS) $< -o $@
 
 $(BUILD_DIR)/$(TARGET).elf: $(OBJECTS) Makefile
-	$(CC) $(OBJECTS) $(LDFLAGS) -o $@
+	$(CXX) $(OBJECTS) $(LDFLAGS) -o $@
 	$(SZ) $@
 
 $(BUILD_DIR)/%.hex: $(BUILD_DIR)/%.elf | $(BUILD_DIR)

AdaptiveBrightnessFirmware/Src/init.c

@@ -1,8 +1,8 @@
 /* USER CODE BEGIN Header */
 /**
   ******************************************************************************
-  * @file           : main.c
+  * @file           : init.c
-  * @brief          : Main program body
+  * @brief          : Init program body
   ******************************************************************************
   * @attention
   *
@@ -19,7 +19,7 @@
 /* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "main.h"
+#include "init.h"
 #include "adc.h"
 #include "usb_device.h"
 #include "gpio.h"
@@ -64,7 +64,7 @@ void SystemClock_Config(void);
   * @brief  The application entry point.
   * @retval int
   */
-int main(void)
+void init(void)
 {
   /* USER CODE BEGIN 1 */
 
@@ -93,16 +93,6 @@ int main(void)
   /* USER CODE BEGIN 2 */
 
   /* USER CODE END 2 */
-
-  /* Infinite loop */
-  /* USER CODE BEGIN WHILE */
-  while (1)
-  {
-    /* USER CODE END WHILE */
-
-    /* USER CODE BEGIN 3 */
-  }
-  /* USER CODE END 3 */
 }
 
 /**

AdaptiveBrightnessFirmware/Src/main.cpp

@@ -0,0 +1,13 @@
+#include <cstdint>
+
+#include "init.h"
+
+int main()
+{
+    init();
+
+    while(true) {
+    }
+
+    return 0;
+}

AdaptiveBrightnessFirmware/Src/stm32f0xx_hal_msp.c

@@ -20,7 +20,7 @@
 /* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "main.h"
+#include "init.h"
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */

AdaptiveBrightnessFirmware/Src/stm32f0xx_it.c

@@ -19,7 +19,7 @@
 /* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "main.h"
+#include "init.h"
 #include "stm32f0xx_it.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */