Restructure include hierarchy

stm-firmware/Makefile

@@ -3,7 +3,7 @@
 #Compiler:	arm-none-eabi
 #####################################################################################
 #Add Files and Folders below#########################################################
-CFILES 	= main.c syscalls.c cmsis_boot/system_stm32f4xx.c systick.c
+CFILES 	= main.c syscalls.c setup/system_stm32f4xx.c systick.c
 ASFILES = boot/startup_stm32f4xx.S
 INCLUDEPATH = -Icmsis -Iinclude
 

stm-firmware/adc-meas.c

@@ -1,9 +1,9 @@
-#include <adc-meas.h>
-#include <stm32f4xx.h>
-#include <core_cm4.h>
-#include <stm32-gpio-macros.h>
+#include <reflow-controller/adc-meas.h>
+#include <stm32/stm32f4xx.h>
+#include <cmsis/core_cm4.h>
+#include <stm-periph/stm32-gpio-macros.h>
 #include <stdlib.h>
-#include <clock-enable-manager.h>
+#include <stm-periph/clock-enable-manager.h>
 
 static float pt1000_offset;
 static float pt1000_sens_dev;

stm-firmware/clock-enable-manager.c

@@ -1,4 +1,4 @@
-#include <clock-enable-manager.h>
+#include <stm-periph/clock-enable-manager.h>
 #include <helper-macros/helper-macros.h>
 #include <stdlib.h>
 

stm-firmware/digio.c

@@ -1,7 +1,7 @@
-#include <digio.h>
-#include <stm32f4xx.h>
-#include <clock-enable-manager.h>
-#include <stm32-gpio-macros.h>
+#include <reflow-controller/digio.h>
+#include <stm32/stm32f4xx.h>
+#include <stm-periph/clock-enable-manager.h>
+#include <stm-periph/stm32-gpio-macros.h>
 #include <helper-macros/helper-macros.h>
 
 static const uint8_t digio_pins[] = {DIGIO_PINS};

stm-firmware/include/cmsis/core_cm4.h

@@ -151,9 +151,9 @@
 #endif
 
 #include <stdint.h>                      /* standard types definitions                      */
-#include <core_cmInstr.h>                /* Core Instruction Access                         */
-#include <core_cmFunc.h>                 /* Core Function Access                            */
-#include <core_cm4_simd.h>               /* Compiler specific SIMD Intrinsics               */
+#include <cmsis/core_cmInstr.h>                /* Core Instruction Access                         */
+#include <cmsis/core_cmFunc.h>                 /* Core Function Access                            */
+#include <cmsis/core_cm4_simd.h>               /* Compiler specific SIMD Intrinsics               */
 
 #endif /* __CORE_CM4_H_GENERIC */
 

stm-firmware/include/reflow-controller/adc-meas.h

@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <stm32f4xx.h>
+#include <stm32/stm32f4xx.h>
 /**
  * @brief Moving average filter coefficient for PT1000 measurement
  */

stm-firmware/include/stm-periph/clock-enable-manager.h

@@ -2,7 +2,7 @@
 #define __CLOCK_ENABLE_MANAGER_H__
 
 #include <stdint.h>
-#include <stm32-gpio-macros.h>
+#include <stm-periph/stm32-gpio-macros.h>
 
 /**
  * @brief The RCC Enable Manager uses static memory with a fixed maximum

stm-firmware/include/stm-periph/uart/dma-ring-buffer.h

@@ -2,7 +2,7 @@
 #define __DMA_RING_BUFFER_H__
 
 #include <stdbool.h>
-#include <stm32f4xx.h>
+#include <stm32/stm32f4xx.h>
 #include <stddef.h>
 
 struct dma_ring_buffer_to_mem {

stm-firmware/include/stm32/stm32f407xx.h

@@ -181,8 +181,8 @@ typedef enum
   * @}
   */
 
-#include "core_cm4.h"             /* Cortex-M4 processor and core peripherals */
-#include "system_stm32f4xx.h"
+#include <cmsis/core_cm4.h>             /* Cortex-M4 processor and core peripherals */
+#include <setup/system_stm32f4xx.h>
 #include <stdint.h>
 
 /** @addtogroup Peripheral_registers_structures

stm-firmware/main.c

@@ -4,18 +4,20 @@
  *  Created on: Apr 25, 2015
  *      Author: mari
  */
-#include <stm32f4xx.h>
-#include <systick.h>
-//#include <arm_math.h>
-#include <stm32-gpio-macros.h>
-#include <system_stm32f4xx.h>
+
 #include <stdlib.h>
 #include <string.h>
-#include <adc-meas.h>
-#include <clock-enable-manager.h>
-#include <uart/uart.h>
-#include <shell.h>
-#include <digio.h>
+/* #include <arm_math.h> */
+#include <stm32/stm32f4xx.h>
+#include <cmsis/core_cm4.h>
+#include <setup/system_stm32f4xx.h>
+#include <reflow-controller/systick.h>
+#include <reflow-controller/adc-meas.h>
+#include <reflow-controller/shell.h>
+#include <reflow-controller/digio.h>
+#include <stm-periph/stm32-gpio-macros.h>
+#include <stm-periph/clock-enable-manager.h>
+#include <stm-periph/uart/uart.h>
 
 static void setup_nvic_priorities()
 {
@@ -25,6 +27,7 @@ static void setup_nvic_priorities()
 	/* Setup Priorities */
 	NVIC_SetPriority(ADC_IRQn, 2);
 	NVIC_SetPriority(DMA2_Stream0_IRQn, 1);
+	NVIC_SetPriority(DMA2_Stream7_IRQn, 3);
 }
 
 static float pt1000_value;

stm-firmware/setup/system_stm32f4xx.c

@@ -114,7 +114,7 @@
   * @{
   */
 
-#include "stm32f4xx.h"
+#include <stm32/stm32f4xx.h>
 
 /**
   * @}

stm-firmware/shell.c

@@ -1,11 +1,11 @@
-#include <shell.h>
-#include <uart/uart.h>
+#include <reflow-controller/shell.h>
+#include <stm-periph/uart/uart.h>
 #include <string.h>
-#include <adc-meas.h>
-#include <digio.h>
+#include <reflow-controller/adc-meas.h>
+#include <reflow-controller/digio.h>
 #include <stdlib.h>
 #include <helper-macros/helper-macros.h>
-#include <systick.h>
+#include <reflow-controller/systick.h>
 
 #ifndef GIT_VER
 #define GIT_VER "VERSION NOT SET"

stm-firmware/syscalls.c

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

stm-firmware/systick.c

@@ -1,6 +1,6 @@
-#include <systick.h>
-#include <stm32f4xx.h>
-#include <core_cm4.h>
+#include <reflow-controller/systick.h>
+#include <stm32/stm32f4xx.h>
+#include <cmsis/core_cm4.h>
 
 volatile uint32_t wait_tick_ms;
 volatile uint64_t global_tick_ms;

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

@@ -1,5 +1,5 @@
-#include <uart/dma-ring-buffer.h>
-#include <clock-enable-manager.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 <uart/uart.h>
-#include <stm32f4xx.h>
-#include <clock-enable-manager.h>
-#include <stm32-gpio-macros.h>
-#include <uart/dma-ring-buffer.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/uart/dma-ring-buffer.h>
 #include <string.h>
 
 static struct dma_ring_buffer_to_mem ring_buff_rx;