From 9d9f9dc034765aa4b1c5bd2d0aa4cd24e4110055 Mon Sep 17 00:00:00 2001
From: lonkaars <loek@pipeframe.xyz>
Date: Sun, 25 Sep 2022 15:21:12 +0200
Subject: c++ to c for stm32 firmware

---
 stm32f091/main.c   | 21 +++++++++++++++++++++
 stm32f091/main.cpp | 21 ---------------------
 stm32f091/makefile | 14 +++++++-------
 3 files changed, 28 insertions(+), 28 deletions(-)
 create mode 100644 stm32f091/main.c
 delete mode 100644 stm32f091/main.cpp

(limited to 'stm32f091')

diff --git a/stm32f091/main.c b/stm32f091/main.c
new file mode 100644
index 0000000..180240e
--- /dev/null
+++ b/stm32f091/main.c
@@ -0,0 +1,21 @@
+#include <stm32f0xx.h>
+#include <stdint.h>
+
+#define PORT GPIOA
+#define PIN 5
+
+int main() {
+	RCC->AHBENR |= RCC_AHBENR_GPIOAEN | RCC_AHBENR_GPIOBEN;
+
+	PORT->MODER &= ~(0b11 << (PIN * 2));
+	PORT->MODER |= (0b01 << (PIN * 2));
+
+	uint8_t led = 1;
+
+	while (1) {
+		PORT->ODR &= ~(1 << PIN);
+		PORT->ODR |= (led << PIN);
+		led ^= 1;
+		for (unsigned long i = 0; i < 50000; i++) asm("nop");
+	}
+}
diff --git a/stm32f091/main.cpp b/stm32f091/main.cpp
deleted file mode 100644
index 180240e..0000000
--- a/stm32f091/main.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stm32f0xx.h>
-#include <stdint.h>
-
-#define PORT GPIOA
-#define PIN 5
-
-int main() {
-	RCC->AHBENR |= RCC_AHBENR_GPIOAEN | RCC_AHBENR_GPIOBEN;
-
-	PORT->MODER &= ~(0b11 << (PIN * 2));
-	PORT->MODER |= (0b01 << (PIN * 2));
-
-	uint8_t led = 1;
-
-	while (1) {
-		PORT->ODR &= ~(1 << PIN);
-		PORT->ODR |= (led << PIN);
-		led ^= 1;
-		for (unsigned long i = 0; i < 50000; i++) asm("nop");
-	}
-}
diff --git a/stm32f091/makefile b/stm32f091/makefile
index c187df7..5f5371d 100644
--- a/stm32f091/makefile
+++ b/stm32f091/makefile
@@ -1,5 +1,5 @@
-CC = arm-none-eabi-g++
-LD = arm-none-eabi-g++
+CC = arm-none-eabi-gcc
+LD = arm-none-eabi-gcc
 OC = arm-none-eabi-objcopy
 RM = rm -f
 
@@ -9,7 +9,7 @@ SHARED_FLAGS += -g
 SHARED_FLAGS += -D STM32F091xC
 SHARED_FLAGS += -Wall
 SHARED_FLAGS += -Wextra
-SHARED_FLAGS += -Wno-register
+# SHARED_FLAGS += -Wno-register
 SHARED_FLAGS += -Wa,--defsym,CALL_ARM_SYSTEM_INIT=1
 SHARED_FLAGS += -I./lib/STM32-base-STM32Cube/CMSIS/ARM/inc
 SHARED_FLAGS += -I./lib/STM32-base-STM32Cube/CMSIS/STM32F0xx/inc
@@ -20,8 +20,8 @@ SHARED_FLAGS += -mlittle-endian
 SHARED_FLAGS += -mthumb
 SHARED_FLAGS += -masm-syntax-unified
 SHARED_FLAGS += -specs=nosys.specs
-SHARED_FLAGS += -fno-threadsafe-statics
-SHARED_FLAGS += -fno-rtti
+# SHARED_FLAGS += -fno-threadsafe-statics
+# SHARED_FLAGS += -fno-rtti
 SHARED_FLAGS += -fno-exceptions
 SHARED_FLAGS += -fno-unwind-tables
 SHARED_FLAGS += -Wl,-L./lib/STM32-base/linker,-T./lib/STM32-base/linker/STM32F0xx/STM32F091xC.ld
@@ -32,7 +32,7 @@ CFLAGS += $(SHARED_FLAGS)
 LFLAGS += $(SHARED_FLAGS)
 AFLAGS += $(SHARED_FLAGS)
 
-OBJS += $(patsubst %.cpp,%.o, $(wildcard *.cpp))
+OBJS += $(patsubst %.c,%.o, $(wildcard *.c))
 OBJS += ./lib/STM32-base/startup/STM32F0xx/STM32F091xC.o
 OBJS += ./lib/STM32-base-STM32Cube/CMSIS/STM32F0xx/src/system_stm32f0xx.o
 
@@ -47,7 +47,7 @@ $(TARGET).bin: $(TARGET).elf
 %.o: %.c
 	$(CC) -c $(CFLAGS) $< -o $@
 
-%.o: %.cpp
+%.o: %.c
 	$(CC) -c $(CFLAGS) $< -o $@
 
 $(TARGET).elf: $(OBJS)
-- 
cgit v1.2.3