stm-firmware/Makefile

@@ -33,9 +33,9 @@ INCLUDEPATH += -Ishellmatta/api
 # DEFINES += -DSHELLMATTA_STRIP_PRINTF
 
 # RCC Manager
-CFILES += stm-periph/clock-enable-manager.c
+CFILES += clock-enable-manager.c
 
-CFILES += stm-periph/uart.c stm-periph/dma-ring-buffer.c
+CFILES += uart/uart.c uart/dma-ring-buffer.c
 
 CFILES += digio.c
 
@@ -98,7 +98,7 @@ mrproper: clean
 	rm -f $(target).pro
 
 clean:
-	rm -f $(target).elf $(target).bin $(target).hex $(OBJ) $(ASOBJ) $(mapfile).map $(CFILES:%.c=$(OBJDIR)/%.c.d) $(ASFILES:%.S=$(OBJDIR)/%.S.d)
+	rm -f $(target).elf $(target).bin $(target).hex $(OBJ) $(ASOBJ) $(mapfile).map
 qtproject:
 	echo -e "TEMPLATE = app\nCONFIG -= console app_bundle qt" > $(target).pro
 	echo -e "SOURCES += $(CFILES) $(ASFILES)" >> $(target).pro

stm-firmware/main.c

@@ -17,7 +17,7 @@
 #include <reflow-controller/digio.h>
 #include <stm-periph/stm32-gpio-macros.h>
 #include <stm-periph/clock-enable-manager.h>
-#include <stm-periph/uart.h>
+#include <stm-periph/uart/uart.h>
 
 static void setup_nvic_priorities()
 {

stm-firmware/shell.c

@@ -1,5 +1,5 @@
 #include <reflow-controller/shell.h>
-#include <stm-periph/uart.h>
+#include <stm-periph/uart/uart.h>
 #include <string.h>
 #include <reflow-controller/adc-meas.h>
 #include <reflow-controller/digio.h>

stm-firmware/syscalls.c

@@ -1,4 +1,4 @@
-#include <stm-periph/uart.h>
+#include <stm-periph/uart/uart.h>
 
 char* _sbrk(int incr) {
             extern char heap_low;    // Defined by the linker

stm-firmware/uart/dma-ring-buffer.c

@@ -1,4 +1,4 @@
-#include <stm-periph/dma-ring-buffer.h>
+#include <stm-periph/uart/dma-ring-buffer.h>
 #include <stm-periph/clock-enable-manager.h>
 #include <stdbool.h>
 #include <string.h>

stm-firmware/uart/uart.c

@@ -8,11 +8,11 @@
 //PA2 => TX
 //PA3 => RX
 //Alternate Function 7
-#include <stm-periph/uart.h>
+#include <stm-periph/uart/uart.h>
 #include <stm32/stm32f4xx.h>
 #include <stm-periph/clock-enable-manager.h>
 #include <stm-periph/stm32-gpio-macros.h>
-#include <stm-periph/dma-ring-buffer.h>
+#include <stm-periph/uart/dma-ring-buffer.h>
 #include <string.h>
 
 static struct dma_ring_buffer_to_mem ring_buff_rx;