From 3704359d78cb5368ee0158e55513416a726b0eeb Mon Sep 17 00:00:00 2001
From: Andy CA6JAU <juribeparada@gmail.com>
Date: Sun, 20 Nov 2016 14:42:07 -0300
Subject: [PATCH] Minor changes in Makefile and CooCox project files for new ST
 lib support

---
 MMDVM_STM32F4xx.cogui    | 23 +++++++++++------------
 MMDVM_STM32F4xx.comarker |  2 +-
 MMDVM_STM32F4xx.coproj   | 20 ++++++++++----------
 Makefile                 |  4 +++-
 4 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/MMDVM_STM32F4xx.cogui b/MMDVM_STM32F4xx.cogui
index 7834d26..65c5c84 100644
--- a/MMDVM_STM32F4xx.cogui
+++ b/MMDVM_STM32F4xx.cogui
@@ -27,7 +27,7 @@
 </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"/>
+<org.coocox.builder.ui.editors.ConfigEditor horizontalPosition="0" subTagIndex="1" verticalPosition="101"/>
 </input>
 </editor>
 </editors>
@@ -74,7 +74,7 @@
 <viewState/>
 </view>
 </views>
-<perspectives activePart="org.coocox.builder.ui.editors.ConfigEditor" activePerspective="org.coocox.builder.perspective.CoBuilder">
+<perspectives activePart="org.eclipse.ui.console.ConsoleView" 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"/>
@@ -287,14 +287,14 @@
 <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"/>
+<org.coocox.builder.ui.editors.ConfigEditor horizontalPosition="0" subTagIndex="1" verticalPosition="101"/>
 </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"/>
+<editor factoryID="org.coocox.builder.ui.persistent.PersistentElementFactory" id="org.coocox.builder.ui.editors.ConfigEditor">
+<org.coocox.builder.ui.editors.ConfigEditor horizontalPosition="0" subTagIndex="1" verticalPosition="101"/>
+</editor>
 </editors>
-<item historyLabel="startup_stm32f4xx.c" index="4">
-<position/>
-</item>
 <item historyLabel="stm32f4xx_gpio.c" index="2">
 <position info="not_deleted" x="3167" y="3"/>
 </item>
@@ -425,7 +425,8 @@
 <item historyLabel="arm-gcc-link.ld" index="19">
 <position info="not_deleted" x="0" y="0"/>
 </item>
-<item active="true" historyLabel="Configuration" index="17"/>
+<item historyLabel="Configuration" index="17"/>
+<item active="true" historyLabel="Configuration" index="20"/>
 </navigationHistory>
 <input factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/" type="8"/>
 </page>
@@ -439,11 +440,6 @@
 <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>
@@ -481,5 +477,8 @@
 <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="MMDVM.cpp" tooltip="MMDVM_STM32F4xx/MMDVM.cpp">
+<persistable path="/MMDVM_STM32F4xx/MMDVM.cpp"/>
+</file>
 </mruList>
 </workbench>
\ No newline at end of file
diff --git a/MMDVM_STM32F4xx.comarker b/MMDVM_STM32F4xx.comarker
index 22e5da1..b29d0e4 100644
--- a/MMDVM_STM32F4xx.comarker
+++ b/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.cdt.debug.core.ignoreCount" value="0"/>
 <attrib name="org.eclipse.debug.core.enabled" value="true"/>
+<attrib name="org.eclipse.cdt.debug.core.ignoreCount" value="0"/>
 </marker>
 </breakpoint>
 </breakpoints>
\ No newline at end of file
diff --git a/MMDVM_STM32F4xx.coproj b/MMDVM_STM32F4xx.coproj
index 95312cb..3038fa0 100644
--- a/MMDVM_STM32F4xx.coproj
+++ b/MMDVM_STM32F4xx.coproj
@@ -13,12 +13,12 @@
           <Includepath path="."/>
         </Includepaths>
         <DefinedSymbols>
-          <Define name="STM32F407VG"/>
           <Define name="STM32F4XX"/>
           <Define name="USE_STDPERIPH_DRIVER"/>
           <Define name="__ASSEMBLY__"/>
           <Define name="__FPU_USED"/>
           <Define name="SUPPORT_CPLUSPLUS"/>
+          <Define name="STM32F40_41xxx"/>
           <Define name="HSE_VALUE=8000000"/>
         </DefinedSymbols>
       </Compile>
@@ -97,9 +97,9 @@
     <File name="SampleRB.cpp" path="SampleRB.cpp" type="1"/>
     <File name="CalDStarTX.h" path="CalDStarTX.h" type="1"/>
     <File name="STM32F4XX_Lib/CMSIS/Include/core_cm4.h" path="STM32F4XX_Lib/CMSIS/Include/core_cm4.h" type="1"/>
+    <File name="DMRSlotRX.h" path="DMRSlotRX.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="YSFRX.h" path="YSFRX.h" type="1"/>
-    <File name="DMRSlotRX.h" path="DMRSlotRX.h" type="1"/>
     <File name="STM32F4XX_Lib/CMSIS/Include" path="" type="2"/>
     <File name="IO.cpp" path="IO.cpp" type="1"/>
     <File name="DMRDMORX.cpp" path="DMRDMORX.cpp" type="1"/>
@@ -115,29 +115,29 @@
     <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="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="IOTeensy.cpp" path="IOTeensy.cpp" type="1"/>
     <File name="DMRDMORX.h" path="DMRDMORX.h" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS/Include/core_cmSimd.h" path="STM32F4XX_Lib/CMSIS/Include/core_cmSimd.h" type="1"/>
     <File name="SerialPort.h" path="SerialPort.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="CWIdTX.h" path="CWIdTX.h" 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="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source" path="" type="2"/>
+    <File name="CalDMR.h" path="CalDMR.h" type="1"/>
     <File name="DMRDMOTX.h" path="DMRDMOTX.h" type="1"/>
     <File name="IODue.cpp" path="IODue.cpp" type="1"/>
-    <File name="CalDMR.h" path="CalDMR.h" type="1"/>
     <File name="DMRTX.cpp" path="DMRTX.cpp" type="1"/>
     <File name="P25RX.cpp" path="P25RX.cpp" type="1"/>
     <File name="STM32F4XX_Lib/CMSIS/Lib/GCC" path="" type="2"/>
     <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="DMRTX.h" path="DMRTX.h" type="1"/>
     <File name="STM32F4XX_Lib/Device/startup/startup_stm32f4xx.c" path="STM32F4XX_Lib/Device/startup/startup_stm32f4xx.c" type="1"/>
+    <File name="RSSIRB.h" path="RSSIRB.h" 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"/>
@@ -175,16 +175,16 @@
     <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="P25TX.h" path="P25TX.h" type="1"/>
     <File name="DStarRX.cpp" path="DStarRX.cpp" 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="SerialRB.cpp" path="SerialRB.cpp" type="1"/>
     <File name="CWIdTX.cpp" path="CWIdTX.cpp" type="1"/>
-    <File name="DMRIdleRX.cpp" path="DMRIdleRX.cpp" 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="DMRIdleRX.cpp" path="DMRIdleRX.cpp" 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"/>
diff --git a/Makefile b/Makefile
index d0fb1f5..890e2f0 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,9 @@ BINHEX=outp.hex
 MCFLAGS=-mcpu=cortex-m4 -mthumb -mlittle-endian \
 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb-interwork
 # COMPILE FLAGS
-DEFS=-DUSE_STDPERIPH_DRIVER -DSTM32F4XX -DSTM32F40_41xxx -DHSE_VALUE=12000000
+# Discovery board:
+DEFS=-DUSE_STDPERIPH_DRIVER -DSTM32F4XX -DSTM32F40_41xxx -DHSE_VALUE=8000000
+# Pi board:
 #DEFS=-DUSE_STDPERIPH_DRIVER -DSTM32F4XX -DSTM32F446xx -DHSE_VALUE=12000000
 CFLAGS=-c $(MCFLAGS) $(DEFS) $(INCLUDES)
 CXXFLAGS=-c $(MCFLAGS) $(DEFS) $(INCLUDES)