Merge pull request #36 from juribeparada/master

Simplifying STM32F4XX library definitions, some minor changes on Makefile

Globals.h

@@ -21,15 +21,6 @@
 
 #if defined(STM32F4XX) || defined(STM32F4)
 #include "stm32f4xx.h"
-#include "stm32f4xx_gpio.h"
-#include "stm32f4xx_rcc.h"
-#include "stm32f4xx_dac.h"
-#include "stm32f4xx_adc.h"
-#include "stm32f4xx_tim.h"
-#include "stm32f4xx_usart.h"
-#include "misc.h"
-#include <string.h>
-#include <stddef.h>
 #else
 #include <Arduino.h>
 #endif
@@ -42,11 +33,7 @@
 #error "Unknown processor type"
 #endif
 
-#if defined(STM32F4XX) || defined(STM32F4)
-#include "cmsis.h"
-#else
 #include <arm_math.h>
-#endif
 
 enum MMDVM_STATE {
   STATE_IDLE      = 0,

MMDVM_STM32F4xx.cogui

@@ -12,11 +12,12 @@
 <presentation id="org.eclipse.ui.presentations.WorkbenchPresentationFactory">
 <part id="0"/>
 <part id="1"/>
+<part id="2"/>
 </presentation>
 </folder>
 </info>
 </editorArea>
-<editor activePart="true" focus="true" id="org.eclipse.cdt.ui.editor.CEditor" name="SerialPort.cpp" partName="SerialPort.cpp" path="C:/Users/Andy/MMDVM/SerialPort.cpp" title="SerialPort.cpp" tooltip="C:/Users/Andy/MMDVM/SerialPort.cpp" workbook="DefaultEditorWorkbook">
+<editor id="org.eclipse.cdt.ui.editor.CEditor" name="SerialPort.cpp" partName="SerialPort.cpp" path="C:/Users/Andy/MMDVM/SerialPort.cpp" title="SerialPort.cpp" tooltip="C:/Users/Andy/MMDVM/SerialPort.cpp" workbook="DefaultEditorWorkbook">
 <input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/MMDVM_STM32F4xx/SerialPort.cpp"/>
 <editorState selectionHorizontalPixel="0" selectionLength="0" selectionOffset="11765" selectionTopPixel="15054"/>
 </editor>
@@ -24,6 +25,11 @@
 <input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/MMDVM_STM32F4xx/MMDVM.cpp"/>
 <editorState selectionHorizontalPixel="0" selectionLength="0" selectionOffset="1723" selectionTopPixel="0"/>
 </editor>
+<editor activePart="true" focus="true" id="org.coocox.builder.ui.editors.ConfigEditor" name="" partName="Configuration" title="Configuration" tooltip="" workbook="DefaultEditorWorkbook">
+<input factoryID="org.coocox.builder.ui.persistent.PersistentElementFactory">
+<org.coocox.builder.ui.editors.ConfigEditor horizontalPosition="0" subTagIndex="2" verticalPosition="260"/>
+</input>
+</editor>
 </editors>
 <views>
 <view id="org.eclipse.debug.ui.ExpressionView" partName="Expressions">
@@ -67,11 +73,8 @@
 <view id="org.eclipse.debug.ui.VariableView" partName="Variables">
 <viewState/>
 </view>
-<view id="org.coocox.component.ui.Help" partName="Help">
-<viewState/>
-</view>
 </views>
-<perspectives activePart="org.coocox.builder.ui.views.ProjectView" activePerspective="org.coocox.builder.perspective.CoBuilder">
+<perspectives activePart="org.coocox.builder.ui.editors.ConfigEditor" activePerspective="org.coocox.builder.perspective.CoBuilder">
 <perspective editorAreaTrimState="2" editorAreaVisible="1" fixed="0" version="0.016">
 <descriptor class="org.coocox.builder.ui.PerspectiveCoBuilder" id="org.coocox.builder.perspective.CoBuilder" label="CooCox CoBuilder"/>
 <alwaysOnActionSet id="org.coocox.component.ui.actionSet"/>
@@ -103,7 +106,6 @@
 <hide_toolbar_item_id id="org.eclipse.debug.ui.commands.TerminateAndRelaunch"/>
 <view id="org.coocox.component.ui.ComponentView"/>
 <view id="org.coocox.builder.ui.views.ProjectView"/>
-<view id="org.coocox.component.ui.Help"/>
 <view id="org.eclipse.ui.console.ConsoleView"/>
 <fastViewBars/>
 <layout>
@@ -137,15 +139,13 @@
 </folder>
 </info>
 <info folder="true" part="org.eclipse.ui.internal.ViewStack@1394448" ratio="0.71983916" ratioLeft="1074" ratioRight="418" relationship="2" relative="org.eclipse.ui.internal.ViewStack@460179">
-<folder activePageID="org.coocox.component.ui.Help" appearance="2" expanded="2">
+<folder appearance="2" expanded="2">
-<page content="org.coocox.component.ui.Help" label="Help"/>
+<page content="org.coocox.component.ui.Help" label="LabelNotFound"/>
 <page content="org.eclipse.debug.ui.BreakpointView" label="LabelNotFound"/>
 <page content="org.eclipse.ui.views.ContentOutline" label="LabelNotFound"/>
 <page content="org.coocox.coassistant.view.CoAssistantView" label="LabelNotFound"/>
 <page content="org.coocox.builder.ui.MoreExampleView" label="LabelNotFound"/>
-<presentation id="org.eclipse.ui.presentations.WorkbenchPresentationFactory">
+<presentation id="org.eclipse.ui.presentations.WorkbenchPresentationFactory"/>
-<part id="0"/>
-</presentation>
 </folder>
 </info>
 <info part="org.eclipse.ui.editorss" ratio="0.44900104" ratioLeft="427" ratioRight="524" relationship="4" relative="org.eclipse.ui.internal.ViewStack@460179"/>
@@ -266,7 +266,6 @@
 <editor factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.cdt.ui.editor.CEditor" path="/MMDVM_STM32F4xx/MMDVM.cpp"/>
 <editor factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.cdt.ui.editor.CEditor" path="/MMDVM_STM32F4xx/IO.cpp"/>
 <editor factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.cdt.ui.editor.CEditor" path="/MMDVM_STM32F4xx/cmsis_lib/source/stm32f4xx_gpio.c"/>
-<editor factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.cdt.ui.editor.CEditor" path="/MMDVM_STM32F4xx/cmsis_boot/stm32f4xx.h"/>
 <editor factoryID="org.coocox.builder.ui.persistent.PersistentElementFactory" id="org.coocox.builder.ui.editors.ConfigEditor">
 <org.coocox.builder.ui.editors.ConfigEditor/>
 </editor>
@@ -287,39 +286,29 @@
 <editor factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.cdt.ui.editor.CEditor" path="/MMDVM_STM32F4xx/SampleRB.cpp"/>
 <editor factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.cdt.ui.editor.CEditor" path="/MMDVM_STM32F4xx/SerialPort.cpp"/>
 <editor factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.cdt.ui.editor.CEditor" path="/MMDVM_STM32F4xx/SerialPort.cpp"/>
+<editor factoryID="org.coocox.builder.ui.persistent.PersistentElementFactory" id="org.coocox.builder.ui.editors.ConfigEditor">
+<org.coocox.builder.ui.editors.ConfigEditor horizontalPosition="0" subTagIndex="2" verticalPosition="260"/>
+</editor>
+<editor factoryID="org.eclipse.ui.ide.FileStoreEditorInputFactory" id="org.eclipse.ui.DefaultTextEditor" uri="file:/C:/Users/Andy/MMDVM/stm32f4xx_link.ld"/>
+<editor factoryID="org.eclipse.ui.ide.FileStoreEditorInputFactory" id="org.eclipse.ui.DefaultTextEditor" uri="file:/C:/Users/Andy/MMDVM/arm-gcc-link.ld"/>
 </editors>
-<item historyLabel="stm32f4xx_gpio.c" index="2">
+<item historyLabel="startup_stm32f4xx.c" index="4">
-<position info="not_deleted" x="15500" y="8"/>
-</item>
-<item historyLabel="startup_stm32f4xx.c" index="5">
 <position/>
 </item>
 <item historyLabel="stm32f4xx_gpio.c" index="2">
 <position info="not_deleted" x="3167" y="3"/>
 </item>
-<item historyLabel="startup_stm32f4xx.c" index="5">
+<item historyLabel="Configuration" index="3"/>
-<position/>
-</item>
-<item historyLabel="stm32f4xx.h" index="3">
-<position info="not_deleted" x="3575" y="0"/>
-</item>
-<item historyLabel="startup_stm32f4xx.c" index="5">
-<position/>
-</item>
-<item historyLabel="stm32f4xx_gpio.c" index="2">
-<position info="not_deleted" x="3167" y="3"/>
-</item>
-<item historyLabel="Configuration" index="4"/>
 <item historyLabel="IO.cpp" index="1">
 <position info="not_deleted" x="18872" y="0"/>
 </item>
-<item historyLabel="SampleRB.cpp" index="6">
+<item historyLabel="SampleRB.cpp" index="5">
 <position info="not_deleted" x="1740" y="6"/>
 </item>
 <item historyLabel="IO.cpp" index="1">
 <position info="not_deleted" x="18872" y="0"/>
 </item>
-<item historyLabel="Config.h" index="7">
+<item historyLabel="Config.h" index="6">
 <position info="not_deleted" x="0" y="0"/>
 </item>
 <item historyLabel="IO.cpp" index="1">
@@ -331,44 +320,44 @@
 <item historyLabel="IO.cpp" index="1">
 <position info="not_deleted" x="18872" y="0"/>
 </item>
-<item historyLabel="welcome" index="8"/>
+<item historyLabel="welcome" index="7"/>
-<item historyLabel="SerialPort.cpp" index="9">
+<item historyLabel="SerialPort.cpp" index="8">
 <position info="not_deleted" x="7996" y="13"/>
 </item>
-<item historyLabel="welcome" index="8"/>
+<item historyLabel="welcome" index="7"/>
-<item historyLabel="Repository" index="10"/>
+<item historyLabel="Repository" index="9"/>
-<item historyLabel="welcome" index="8"/>
+<item historyLabel="welcome" index="7"/>
 <item historyLabel="IO.cpp" index="1">
 <position info="not_deleted" x="0" y="0"/>
 </item>
-<item historyLabel="SampleRB.cpp" index="6">
+<item historyLabel="SampleRB.cpp" index="5">
 <position info="not_deleted" x="21" y="25"/>
 </item>
 <item historyLabel="IO.cpp" index="1">
 <position info="not_deleted" x="57" y="42"/>
 </item>
-<item historyLabel="SerialPort.cpp" index="9">
+<item historyLabel="SerialPort.cpp" index="8">
 <position info="not_deleted" x="63" y="0"/>
 </item>
-<item historyLabel="SampleRB.cpp" index="6">
+<item historyLabel="SampleRB.cpp" index="5">
 <position info="not_deleted" x="21" y="25"/>
 </item>
 <item historyLabel="IO.cpp" index="1">
 <position info="not_deleted" x="98" y="0"/>
 </item>
-<item historyLabel="SerialPort.cpp" index="9">
+<item historyLabel="SerialPort.cpp" index="8">
 <position info="not_deleted" x="63" y="0"/>
 </item>
-<item historyLabel="SampleRB.cpp" index="6">
+<item historyLabel="SampleRB.cpp" index="5">
 <position info="not_deleted" x="21" y="25"/>
 </item>
-<item historyLabel="SerialPort.cpp" index="9">
+<item historyLabel="SerialPort.cpp" index="8">
 <position info="not_deleted" x="63" y="0"/>
 </item>
-<item historyLabel="SampleRB.cpp" index="6">
+<item historyLabel="SampleRB.cpp" index="5">
 <position info="not_deleted" x="21" y="25"/>
 </item>
-<item historyLabel="SerialPort.cpp" index="9">
+<item historyLabel="SerialPort.cpp" index="8">
 <position info="not_deleted" x="11765" y="0"/>
 </item>
 <item historyLabel="IO.cpp" index="1">
@@ -380,54 +369,63 @@
 <item historyLabel="IO.cpp" index="1">
 <position info="not_deleted" x="18744" y="0"/>
 </item>
-<item historyLabel="startup_stm32f4xx.c" index="5">
+<item historyLabel="startup_stm32f4xx.c" index="4">
 <position info="not_deleted" x="0" y="0"/>
 </item>
 <item historyLabel="MMDVM.cpp" index="0">
 <position info="not_deleted" x="1723" y="0"/>
 </item>
-<item historyLabel="IO.cpp" index="11">
+<item historyLabel="IO.cpp" index="10">
 <position info="not_deleted" x="24195" y="0"/>
 </item>
-<item historyLabel="stm32f4xx_tim.c" index="12">
+<item historyLabel="stm32f4xx_tim.c" index="11">
 <position info="not_deleted" x="96682" y="0"/>
 </item>
-<item historyLabel="IO.cpp" index="11">
+<item historyLabel="IO.cpp" index="10">
 <position info="not_deleted" x="13933" y="0"/>
 </item>
-<item historyLabel="misc.h" index="13">
+<item historyLabel="misc.h" index="12">
 <position info="not_deleted" x="1609" y="0"/>
 </item>
-<item historyLabel="IO.cpp" index="11">
+<item historyLabel="IO.cpp" index="10">
 <position info="not_deleted" x="14419" y="12"/>
 </item>
-<item historyLabel="stm32f4xx_gpio.c" index="14">
+<item historyLabel="stm32f4xx_gpio.c" index="13">
 <position info="not_deleted" x="16650" y="0"/>
 </item>
-<item historyLabel="IO.cpp" index="11">
+<item historyLabel="IO.cpp" index="10">
 <position info="not_deleted" x="14419" y="12"/>
 </item>
-<item historyLabel="stm32f4xx_tim.c" index="12">
+<item historyLabel="stm32f4xx_tim.c" index="11">
 <position info="not_deleted" x="96682" y="0"/>
 </item>
-<item historyLabel="IO.cpp" index="11">
+<item historyLabel="IO.cpp" index="10">
 <position info="not_deleted" x="14419" y="12"/>
 </item>
-<item historyLabel="SampleRB.cpp" index="15">
+<item historyLabel="SampleRB.cpp" index="14">
 <position info="not_deleted" x="21" y="25"/>
 </item>
-<item historyLabel="IO.cpp" index="11">
+<item historyLabel="IO.cpp" index="10">
 <position info="not_deleted" x="14419" y="12"/>
 </item>
+<item historyLabel="SerialPort.cpp" index="15">
+<position info="not_deleted" x="11765" y="0"/>
+</item>
+<item historyLabel="IO.cpp" index="10">
+<position info="not_deleted" x="10073" y="0"/>
+</item>
 <item historyLabel="SerialPort.cpp" index="16">
 <position info="not_deleted" x="11765" y="0"/>
 </item>
-<item historyLabel="IO.cpp" index="11">
+<item historyLabel="Configuration" index="17"/>
-<position info="not_deleted" x="10073" y="0"/>
+<item historyLabel="stm32f4xx_link.ld" index="18">
+<position info="not_deleted" x="0" y="0"/>
 </item>
-<item active="true" historyLabel="SerialPort.cpp" index="17">
+<item historyLabel="Configuration" index="17"/>
-<position info="not_deleted" x="11765" y="0"/>
+<item historyLabel="arm-gcc-link.ld" index="19">
+<position info="not_deleted" x="0" y="0"/>
 </item>
+<item active="true" historyLabel="Configuration" index="17"/>
 </navigationHistory>
 <input factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/" type="8"/>
 </page>
@@ -435,6 +433,17 @@
 <actionBarAdvisor/>
 </window>
 <mruList>
+<file factoryID="org.eclipse.ui.ide.FileStoreEditorInputFactory" id="org.eclipse.ui.DefaultTextEditor" name="arm-gcc-link.ld" tooltip="C:\Users\Andy\MMDVM\arm-gcc-link.ld">
+<persistable uri="file:/C:/Users/Andy/MMDVM/arm-gcc-link.ld"/>
+</file>
+<file factoryID="org.eclipse.ui.ide.FileStoreEditorInputFactory" id="org.eclipse.ui.DefaultTextEditor" name="stm32f4xx_link.ld" tooltip="C:\Users\Andy\MMDVM\stm32f4xx_link.ld">
+<persistable uri="file:/C:/Users/Andy/MMDVM/stm32f4xx_link.ld"/>
+</file>
+<file factoryID="org.coocox.builder.ui.persistent.PersistentElementFactory" id="org.coocox.builder.ui.editors.ConfigEditor" name="" tooltip="">
+<persistable>
+<org.coocox.builder.ui.editors.ConfigEditor horizontalPosition="0" subTagIndex="2" verticalPosition="260"/>
+</persistable>
+</file>
 <file factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.cdt.ui.editor.CEditor" name="Globals.h" tooltip="MMDVM_STM32F4xx/Globals.h">
 <persistable path="/MMDVM_STM32F4xx/Globals.h"/>
 </file>
@@ -472,14 +481,5 @@
 <file factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.cdt.ui.editor.CEditor" name="MMDVM.cpp" tooltip="MMDVM_STM32F4xx/MMDVM.cpp">
 <persistable path="/MMDVM_STM32F4xx/MMDVM.cpp"/>
 </file>
-<file factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.cdt.ui.editor.CEditor" name="SerialPort.cpp" tooltip="MMDVM_STM32F4xx/SerialPort.cpp">
-<persistable path="/MMDVM_STM32F4xx/SerialPort.cpp"/>
-</file>
-<file factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.cdt.ui.editor.CEditor" name="SampleRB.cpp" tooltip="MMDVM_STM32F4xx/SampleRB.cpp">
-<persistable path="/MMDVM_STM32F4xx/SampleRB.cpp"/>
-</file>
-<file factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.cdt.ui.editor.CEditor" name="Config.h" tooltip="MMDVM_STM32F4xx/Config.h">
-<persistable path="/MMDVM_STM32F4xx/Config.h"/>
-</file>
 </mruList>
 </workbench>

MMDVM_STM32F4xx.comarker

@@ -16,8 +16,8 @@
 <attrib name="registered" value="true"/>
 <attrib name="path" value="/"/>
 <attrib name="org.eclipse.cdt.debug.core.sourceHandle" value="C:\Users\John\OneDrive\Dev\Nucleo_ARDOP\stm32f4xx_i2c.c"/>
-<attrib name="org.eclipse.debug.core.enabled" value="true"/>
 <attrib name="org.eclipse.cdt.debug.core.ignoreCount" value="0"/>
+<attrib name="org.eclipse.debug.core.enabled" value="true"/>
 </marker>
 </breakpoint>
 </breakpoints>

MMDVM_STM32F4xx.coproj

@@ -25,17 +25,14 @@
       <Link useDefault="0">
         <Option name="DiscardUnusedSection" value="0"/>
         <Option name="UserEditLinkder" value=""/>
-        <Option name="UseMemoryLayout" value="1"/>
+        <Option name="UseMemoryLayout" value="0"/>
-        <Option name="nostartfiles" value="0"/>
+        <Option name="nostartfiles" value="1"/>
         <Option name="LTO" value="0"/>
         <Option name="IsNewStartupCode" value="1"/>
-        <Option name="Library" value="Use base C Library"/>
+        <Option name="Library" value="Semihosting"/>
-        <Option name="UserEditLinker" value="-lstdc++; "/>
+        <Option name="UserEditLinker" value="-lstdc++"/>
         <LinkedLibraries>
-          <Libset dir="" libs="supc++"/>
+          <Libset dir="stm32f4xx_lib\cmsis\lib\gcc\" libs="arm_cortexm4lf_math"/>
-          <Libset dir="" libs="stdc++"/>
-          <Libset dir="" libs="nosys"/>
-          <Libset dir="" libs="arm_cortexm4lf_math"/>
         </LinkedLibraries>
         <MemoryAreas debugInFlashNotRAM="1">
           <Memory name="IROM1" type="ReadOnly" size="0x00100000" startValue="0x08000000"/>
@@ -43,7 +40,7 @@
           <Memory name="IROM2" type="ReadOnly" size="" startValue=""/>
           <Memory name="IRAM2" type="ReadWrite" size="0x00010000" startValue="0x10000000"/>
         </MemoryAreas>
-        <LocateLinkFile path="../../../coocox/coide/configuration/programdata/mmdvm_stm32f4xx/arm-gcc-link.ld" type="0"/>
+        <LocateLinkFile path="./stm32f4xx_link.ld" type="0"/>
       </Link>
       <Output>
         <Option name="OutputFileType" value="0"/>
@@ -91,96 +88,105 @@
     <Component id="524" name="MISC" path="" type="2"/>
   </Components>
   <Files>
-    <File name="SerialRB.h" path="SerialRB.h" type="1"/>
-    <File name="cmsis_lib/source/stm32f4xx_gpio.c" path="cmsis_lib/source/stm32f4xx_gpio.c" type="1"/>
     <File name="DMRIdleRX.h" path="DMRIdleRX.h" type="1"/>
-    <File name="cmsis_lib/source/stm32f4xx_usart.c" path="cmsis_lib/source/stm32f4xx_usart.c" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/stm32f4xx_dac.c" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/stm32f4xx_dac.c" type="1"/>
-    <File name="cmsis.h" path="cmsis.h" type="1"/>
-    <File name="DMRDefines.h" path="DMRDefines.h" type="1"/>
     <File name="DMRDMOTX.cpp" path="DMRDMOTX.cpp" type="1"/>
-    <File name="CalDMR.cpp" path="CalDMR.cpp" type="1"/>
     <File name="DMRRX.cpp" path="DMRRX.cpp" type="1"/>
-    <File name="SerialSTM.cpp" path="SerialSTM.cpp" type="1"/>
-    <File name="cmsis_lib/include/stm32f4xx_dac.h" path="cmsis_lib/include/stm32f4xx_dac.h" type="1"/>
-    <File name="cmsis_boot" path="" type="2"/>
-    <File name="cmsis_lib/include/stm32f4xx_usart.h" path="cmsis_lib/include/stm32f4xx_usart.h" type="1"/>
-    <File name="DStarDefines.h" path="DStarDefines.h" type="1"/>
-    <File name="DStarRX.h" path="DStarRX.h" type="1"/>
     <File name="YSFRX.cpp" path="YSFRX.cpp" type="1"/>
-    <File name="cmsis_boot/startup" path="" type="2"/>
+    <File name="STM32F4XX_Lib/Device/stm32f4xx.h" path="STM32F4XX_Lib/Device/stm32f4xx.h" type="1"/>
-    <File name="cmsis/core_cm4_simd.h" path="cmsis/core_cm4_simd.h" type="1"/>
-    <File name="cmsis_boot/stm32f4xx.h" path="cmsis_boot/stm32f4xx.h" type="1"/>
-    <File name="cmsis/core_cmFunc.h" path="cmsis/core_cmFunc.h" type="1"/>
     <File name="SampleRB.cpp" path="SampleRB.cpp" type="1"/>
     <File name="CalDStarTX.h" path="CalDStarTX.h" type="1"/>
-    <File name="cmsis/core_cm4.h" path="cmsis/core_cm4.h" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS/Include/core_cm4.h" path="STM32F4XX_Lib/CMSIS/Include/core_cm4.h" type="1"/>
-    <File name="Config.h" path="Config.h" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/stm32f4xx_tim.c" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/stm32f4xx_tim.c" type="1"/>
-    <File name="cmsis_lib/source/misc.c" path="cmsis_lib/source/misc.c" type="1"/>
     <File name="YSFRX.h" path="YSFRX.h" type="1"/>
-    <File name="DMRSlotType.cpp" path="DMRSlotType.cpp" type="1"/>
     <File name="DMRSlotRX.h" path="DMRSlotRX.h" type="1"/>
-    <File name="cmsis_lib/source/stm32f4xx_adc.c" path="cmsis_lib/source/stm32f4xx_adc.c" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS/Include" path="" type="2"/>
-    <File name="cmsis_lib/include/stm32f4xx_tim.h" path="cmsis_lib/include/stm32f4xx_tim.h" type="1"/>
-    <File name="syscalls/syscalls.c" path="syscalls/syscalls.c" type="1"/>
     <File name="IO.cpp" path="IO.cpp" type="1"/>
-    <File name="Globals.h" path="Globals.h" type="1"/>
     <File name="DMRDMORX.cpp" path="DMRDMORX.cpp" type="1"/>
-    <File name="cmsis_lib/source" path="" type="2"/>
     <File name="P25RX.h" path="P25RX.h" type="1"/>
-    <File name="CalDStarRX.cpp" path="CalDStarRX.cpp" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/misc.c" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/misc.c" type="1"/>
-    <File name="CalDStarRX.h" path="CalDStarRX.h" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS" path="" type="2"/>
-    <File name="IO.h" path="IO.h" type="1"/>
-    <File name="cmsis_boot/stm32f4xx_conf.h" path="cmsis_boot/stm32f4xx_conf.h" type="1"/>
-    <File name="Utils.cpp" path="Utils.cpp" type="1"/>
-    <File name="cmsis_boot/system_stm32f4xx.h" path="cmsis_boot/system_stm32f4xx.h" type="1"/>
-    <File name="cmsis_lib/source/stm32f4xx_dac.c" path="cmsis_lib/source/stm32f4xx_dac.c" type="1"/>
     <File name="SerialArduino.cpp" path="SerialArduino.cpp" type="1"/>
-    <File name="Utils.h" path="Utils.h" type="1"/>
     <File name="SerialPort.cpp" path="SerialPort.cpp" type="1"/>
-    <File name="cmsis_lib/include/stm32f4xx_rcc.h" path="cmsis_lib/include/stm32f4xx_rcc.h" type="1"/>
+    <File name="STM32F4XX_Lib/Device/stm32f4xx_conf.h" path="STM32F4XX_Lib/Device/stm32f4xx_conf.h" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/stm32f4xx_adc.c" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/stm32f4xx_adc.c" type="1"/>
     <File name="DStarTX.cpp" path="DStarTX.cpp" type="1"/>
-    <File name="cmsis_boot/startup/startup_stm32f4xx.c" path="cmsis_boot/startup/startup_stm32f4xx.c" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/stm32f4xx_usart.c" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/stm32f4xx_usart.c" type="1"/>
-    <File name="YSFDefines.h" path="YSFDefines.h" type="1"/>
-    <File name="cmsis_lib/source/stm32f4xx_rcc.c" path="cmsis_lib/source/stm32f4xx_rcc.c" type="1"/>
-    <File name="cmsis/core_cmInstr.h" path="cmsis/core_cmInstr.h" type="1"/>
-    <File name="DStarTX.h" path="DStarTX.h" type="1"/>
     <File name="SampleRB.h" path="SampleRB.h" type="1"/>
     <File name="YSFTX.h" path="YSFTX.h" type="1"/>
     <File name="DMRRX.h" path="DMRRX.h" type="1"/>
-    <File name="MMDVM.cpp" path="MMDVM.cpp" type="1"/>
     <File name="IOTeensy.cpp" path="IOTeensy.cpp" type="1"/>
+    <File name="MMDVM.cpp" path="MMDVM.cpp" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS/Include/core_cmSimd.h" path="STM32F4XX_Lib/CMSIS/Include/core_cmSimd.h" type="1"/>
     <File name="DMRDMORX.h" path="DMRDMORX.h" type="1"/>
-    <File name="cmsis_lib/include/stm32f4xx_adc.h" path="cmsis_lib/include/stm32f4xx_adc.h" type="1"/>
     <File name="SerialPort.h" path="SerialPort.h" type="1"/>
-    <File name="P25Defines.h" path="P25Defines.h" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_dac.h" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_dac.h" type="1"/>
-    <File name="cmsis_boot/system_stm32f4xx.c" path="cmsis_boot/system_stm32f4xx.c" type="1"/>
+    <File name="STM32F4XX_Lib/Device/system_stm32f4xx.h" path="STM32F4XX_Lib/Device/system_stm32f4xx.h" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS/Include/core_cmFunc.h" path="STM32F4XX_Lib/CMSIS/Include/core_cmFunc.h" type="1"/>
     <File name="CWIdTX.h" path="CWIdTX.h" type="1"/>
     <File name="CalDStarTX.cpp" path="CalDStarTX.cpp" type="1"/>
-    <File name="DMRSlotType.h" path="DMRSlotType.h" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source" path="" type="2"/>
-    <File name="Debug.h" path="Debug.h" type="1"/>
+    <File name="DMRDMOTX.h" path="DMRDMOTX.h" type="1"/>
-    <File name="RSSIRB.cpp" path="RSSIRB.cpp" type="1"/>
-    <File name="P25TX.h" path="P25TX.h" type="1"/>
     <File name="IODue.cpp" path="IODue.cpp" type="1"/>
     <File name="CalDMR.h" path="CalDMR.h" type="1"/>
-    <File name="DMRDMOTX.h" path="DMRDMOTX.h" type="1"/>
-    <File name="cmsis" path="" type="2"/>
-    <File name="cmsis_lib" path="" type="2"/>
     <File name="DMRTX.cpp" path="DMRTX.cpp" type="1"/>
     <File name="P25RX.cpp" path="P25RX.cpp" type="1"/>
-    <File name="cmsis_lib/source/stm32f4xx_tim.c" path="cmsis_lib/source/stm32f4xx_tim.c" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS/Lib/GCC" path="" type="2"/>
-    <File name="cmsis_lib/include/stm32f4xx_gpio.h" path="cmsis_lib/include/stm32f4xx_gpio.h" type="1"/>
+    <File name="STM32F4XX_Lib" path="" type="2"/>
+    <File name="STM32F4XX_Lib/CMSIS/Include/core_cmInstr.h" path="STM32F4XX_Lib/CMSIS/Include/core_cmInstr.h" type="1"/>
+    <File name="DMRTX.h" path="DMRTX.h" type="1"/>
+    <File name="STM32F4XX_Lib/Device/system_stm32f4xx.c" path="STM32F4XX_Lib/Device/system_stm32f4xx.c" type="1"/>
+    <File name="RSSIRB.h" path="RSSIRB.h" type="1"/>
+    <File name="STM32F4XX_Lib/Device/startup/startup_stm32f4xx.c" path="STM32F4XX_Lib/Device/startup/startup_stm32f4xx.c" type="1"/>
+    <File name="STM32F4XX_Lib/Device/startup" path="" type="2"/>
+    <File name="SerialRB.h" path="SerialRB.h" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_gpio.h" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_gpio.h" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver" path="" type="2"/>
+    <File name="DMRDefines.h" path="DMRDefines.h" type="1"/>
+    <File name="CalDMR.cpp" path="CalDMR.cpp" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_adc.h" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_adc.h" type="1"/>
+    <File name="SerialSTM.cpp" path="SerialSTM.cpp" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS/Lib/GCC/libarm_cortexM4lf_math.a" path="STM32F4XX_Lib/CMSIS/Lib/GCC/libarm_cortexM4lf_math.a" type="1"/>
+    <File name="DStarDefines.h" path="DStarDefines.h" type="1"/>
+    <File name="DStarRX.h" path="DStarRX.h" type="1"/>
+    <File name="Config.h" path="Config.h" type="1"/>
+    <File name="DMRSlotType.cpp" path="DMRSlotType.cpp" type="1"/>
+    <File name="Globals.h" path="Globals.h" type="1"/>
+    <File name="STM32F4XX_Lib/Device" path="" type="2"/>
+    <File name="CalDStarRX.cpp" path="CalDStarRX.cpp" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_tim.h" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_tim.h" type="1"/>
+    <File name="CalDStarRX.h" path="CalDStarRX.h" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include" path="" type="2"/>
+    <File name="IO.h" path="IO.h" type="1"/>
+    <File name="Utils.cpp" path="Utils.cpp" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS/.DS_Store" path="STM32F4XX_Lib/CMSIS/.DS_Store" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS/Lib/.DS_Store" path="STM32F4XX_Lib/CMSIS/Lib/.DS_Store" type="1"/>
+    <File name="Utils.h" path="Utils.h" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS/Lib" path="" type="2"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/.DS_Store" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/.DS_Store" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS/Include/.DS_Store" path="STM32F4XX_Lib/CMSIS/Include/.DS_Store" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS/Include/arm_math.h" path="STM32F4XX_Lib/CMSIS/Include/arm_math.h" type="1"/>
+    <File name="YSFDefines.h" path="YSFDefines.h" type="1"/>
+    <File name="DStarTX.h" path="DStarTX.h" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/stm32f4xx_rcc.c" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/stm32f4xx_rcc.c" type="1"/>
+    <File name="STM32F4XX_Lib/Device/.DS_Store" path="STM32F4XX_Lib/Device/.DS_Store" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_rcc.h" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_rcc.h" type="1"/>
+    <File name="P25Defines.h" path="P25Defines.h" type="1"/>
+    <File name="DMRSlotType.h" path="DMRSlotType.h" type="1"/>
+    <File name="Debug.h" path="Debug.h" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/misc.h" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/misc.h" type="1"/>
+    <File name="P25TX.h" path="P25TX.h" type="1"/>
+    <File name="RSSIRB.cpp" path="RSSIRB.cpp" type="1"/>
     <File name="DStarRX.cpp" path="DStarRX.cpp" type="1"/>
-    <File name="syscalls" path="" type="2"/>
-    <File name="cmsis_lib/include/misc.h" path="cmsis_lib/include/misc.h" type="1"/>
     <File name="DMRSlotRX.cpp" path="DMRSlotRX.cpp" type="1"/>
     <File name="IOSTM.cpp" path="IOSTM.cpp" type="1"/>
     <File name="P25TX.cpp" path="P25TX.cpp" type="1"/>
-    <File name="DMRTX.h" path="DMRTX.h" type="1"/>
     <File name="SerialRB.cpp" path="SerialRB.cpp" type="1"/>
-    <File name="cmsis_lib/include" path="" type="2"/>
     <File name="CWIdTX.cpp" path="CWIdTX.cpp" type="1"/>
     <File name="DMRIdleRX.cpp" path="DMRIdleRX.cpp" type="1"/>
-    <File name="RSSIRB.h" path="RSSIRB.h" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_usart.h" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_usart.h" type="1"/>
+    <File name="STM32F4XX_Lib/.DS_Store" path="STM32F4XX_Lib/.DS_Store" type="1"/>
     <File name="YSFTX.cpp" path="YSFTX.cpp" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/stm32f4xx_gpio.c" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/stm32f4xx_gpio.c" type="1"/>
   </Files>
 </Project>

Makefile

@@ -24,7 +24,7 @@ CXXSOURCES=$(shell find . -name '*.cpp')
 INC=$(shell find . -name '*.h' -exec dirname {} \; | uniq)
 INCLUDES=$(INC:%=-I%)
 # Find libraries
-INCLUDES_LIBS=libarm_cortexM4lf_math.a
+INCLUDES_LIBS=STM32F4XX_Lib/CMSIS/Lib/GCC/libarm_cortexM4lf_math.a
 LINK_LIBS=
 # Create object list
 OBJECTS=$(ASOURCES:%.s=%.o)
@@ -70,6 +70,7 @@ $(BINDIR)/$(BINHEX): $(BINDIR)/$(BINELF)
 	@echo "Objcopy from ELF to IHEX complete!\n"
 
 $(BINDIR)/$(BINELF): $(OBJECTS)
+	@mkdir -p $(@D)
 	$(CXX) $(OBJECTS) $(LDFLAGS) -o $@
 	@echo "Linking complete!\n"
 	$(SIZE) $(BINDIR)/$(BINELF)