Merge pull request electro-smith#78 from andrewikenberry/daisysp_dirs

moved all module files to their own dir
hyrfilm · Nov 24, 2019 · 2be7a15 · 2be7a15
2 parents 1fbd73a + f3d9c07
commit 2be7a15
Show file tree

Hide file tree

Showing 34 changed files with 95 additions and 83 deletions.
diff --git a/daisysp/Makefile b/daisysp/Makefile
@@ -1,5 +1,6 @@
 TARGET = libdaisysp
 
+MODULE_DIR = modules
 MODULES = \
 adenv \
 crossfade \
@@ -43,7 +44,7 @@ BUILD_DIR = build
 ######################################
 
 # C sources
-C_SOURCES += $(addsuffix .c, $(MODULES))
+C_SOURCES += $(addsuffix .c, $(MODULE_DIR)/$(MODULES))
 
 #######################################
 # binaries

diff --git a/daisysp/daisysp-Debug.vgdbsettings b/daisysp/daisysp-Debug.vgdbsettings
@@ -8,7 +8,6 @@
       <LocalDirForAbsolutePaths>$(ToolchainDir)</LocalDirForAbsolutePaths>
     </CustomSourceDirectories>
     <MainSourceDirectory>$(ProjectDir)</MainSourceDirectory>
-    <ExportAdvancedBuildVariables>false</ExportAdvancedBuildVariables>
     <EmbeddedProfileFile>stm32.xml</EmbeddedProfileFile>
   </Project>
   <Build xsi:type="com.visualgdb.build.msbuild">
@@ -18,40 +17,12 @@
       </Version>
     </ToolchainID>
     <ProjectFile>daisysp.vcxproj</ProjectFile>
-    <ParallelJobCount>0</ParallelJobCount>
+    <RemoteBuildEnvironment>
+      <Records />
+    </RemoteBuildEnvironment>
+    <ParallelJobCount>1</ParallelJobCount>
     <SuppressDirectoryChangeMessages>true</SuppressDirectoryChangeMessages>
   </Build>
-  <CustomBuild>
-    <PreSyncActions />
-    <PreBuildActions />
-    <PostBuildActions />
-    <PreCleanActions />
-    <PostCleanActions />
-  </CustomBuild>
-  <CustomDebug>
-    <PreDebugActions />
-    <PostDebugActions />
-    <DebugStopActions />
-    <BreakMode>Default</BreakMode>
-  </CustomDebug>
-  <CustomShortcuts>
-    <Shortcuts />
-    <ShowMessageAfterExecuting>true</ShowMessageAfterExecuting>
-  </CustomShortcuts>
-  <UserDefinedVariables />
-  <CodeSense>
-    <Enabled>Unknown</Enabled>
-    <ExtraSettings>
-      <HideErrorsInSystemHeaders>true</HideErrorsInSystemHeaders>
-      <SupportLightweightReferenceAnalysis>true</SupportLightweightReferenceAnalysis>
-      <CheckForClangFormatFiles>true</CheckForClangFormatFiles>
-      <FormattingEngine xsi:nil="true" />
-    </ExtraSettings>
-    <CodeAnalyzerSettings>
-      <Enabled>false</Enabled>
-    </CodeAnalyzerSettings>
-  </CodeSense>
-  <BuildContextDirectory>VisualGDB\VisualGDBCache</BuildContextDirectory>
   <Debug xsi:type="com.visualgdb.debug.embedded">
     <AdditionalStartupCommands />
     <AdditionalGDBSettings>
@@ -109,16 +80,44 @@
     </DebugMethod>
     <AutoDetectRTOS>true</AutoDetectRTOS>
     <SemihostingSupport>Auto</SemihostingSupport>
-    <SemihostingPollingDelay>0</SemihostingPollingDelay>
     <StepIntoEntryPoint>false</StepIntoEntryPoint>
     <ReloadFirmwareOnReset>false</ReloadFirmwareOnReset>
     <ValidateEndOfStackAddress>true</ValidateEndOfStackAddress>
     <StopAtEntryPoint>false</StopAtEntryPoint>
-    <EnableVirtualHalts>false</EnableVirtualHalts>
+    <CheckInterfaceDrivers>true</CheckInterfaceDrivers>
     <DynamicAnalysisSettings />
     <EndOfStackSymbol>_estack</EndOfStackSymbol>
     <TimestampProviderTicksPerSecond>0</TimestampProviderTicksPerSecond>
-    <KeepConsoleAfterExit>false</KeepConsoleAfterExit>
-    <CheckInterfaceDrivers>true</CheckInterfaceDrivers>
   </Debug>
-</VisualGDBProjectSettings2>
+  <CustomBuild>
+    <PreSyncActions />
+    <PreBuildActions />
+    <PostBuildActions />
+    <PreCleanActions />
+    <PostCleanActions />
+  </CustomBuild>
+  <CustomDebug>
+    <PreDebugActions />
+    <PostDebugActions />
+    <DebugStopActions />
+    <BreakMode>Default</BreakMode>
+  </CustomDebug>
+  <CustomShortcuts>
+    <Shortcuts />
+    <ShowMessageAfterExecuting>true</ShowMessageAfterExecuting>
+  </CustomShortcuts>
+  <UserDefinedVariables />
+  <ImportedPropertySheets />
+  <CodeSense>
+    <Enabled>Unknown</Enabled>
+    <ExtraSettings>
+      <HideErrorsInSystemHeaders>true</HideErrorsInSystemHeaders>
+      <SupportLightweightReferenceAnalysis>true</SupportLightweightReferenceAnalysis>
+    </ExtraSettings>
+    <CodeAnalyzerSettings>
+      <Enabled>false</Enabled>
+    </CodeAnalyzerSettings>
+  </CodeSense>
+  <BuildContextDirectory>VisualGDB\VisualGDBCache</BuildContextDirectory>
+  <ProgramArgumentsSuggestions />
+</VisualGDBProjectSettings2>
diff --git a/daisysp/daisysp.h b/daisysp/daisysp.h
@@ -30,20 +30,20 @@ typedef struct {
 
 // Listed in Alphabetical Order
 // Each of the below has/should have an example project.
-#include "adenv.h"
-#include "crossfade.h"
-#include "dcblock.h"
-#include "decimator.h"
-#include "delay_line.h"
-#include "line.h"
-#include "nlfilt.h"
-#include "metro.h"
-#include "oscillator.h"
-#include "phasor.h"
-#include "port.h"
-#include "reverbsc.h"
-#include "svf.h"
-#include "whitenoise.h"
+#include "modules/adenv.h"
+#include "modules/crossfade.h"
+#include "modules/dcblock.h"
+#include "modules/decimator.h"
+#include "modules/delay_line.h"
+#include "modules/line.h"
+#include "modules/nlfilt.h"
+#include "modules/metro.h"
+#include "modules/oscillator.h"
+#include "modules/phasor.h"
+#include "modules/port.h"
+#include "modules/reverbsc.h"
+#include "modules/svf.h"
+#include "modules/whitenoise.h"
 
 #ifdef __cplusplus
 }

diff --git a/daisysp/daisysp.vcxproj b/daisysp/daisysp.vcxproj
@@ -33,12 +33,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
     <GNUConfigurationType>Debug</GNUConfigurationType>
     <ToolchainID>com.sysprogs.gnuarm.arm-eabi</ToolchainID>
-    <ToolchainVersion>8.3.1/8.0/r1</ToolchainVersion>
+    <ToolchainVersion>4.9.3/7.8/r1</ToolchainVersion>
     <GNUTargetType>StaticLibrary</GNUTargetType>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
     <ToolchainID>com.sysprogs.gnuarm.arm-eabi</ToolchainID>
-    <ToolchainVersion>8.3.1/8.0/r1</ToolchainVersion>
+    <ToolchainVersion>4.9.3/7.8/r1</ToolchainVersion>
     <GNUTargetType>StaticLibrary</GNUTargetType>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
@@ -49,28 +49,38 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
     <ClCompile>
       <InlineFunctions>true</InlineFunctions>
+      <AdditionalIncludeDirectories>modules;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>DEBUG=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
+    <Link>
+      <AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
+      <LibrarySearchDirectories>;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
+      <AdditionalLibraryNames>;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
+      <LinkerScript />
+    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
     <ClCompile>
       <InlineFunctions>true</InlineFunctions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="adenv.h" />
     <ClInclude Include="daisysp.h" />
-    <ClInclude Include="dcblock.h" />
-    <ClInclude Include="decimator.h" />
-    <ClInclude Include="delay_line.h" />
-    <ClInclude Include="dsy_pstream.h" />
-    <ClInclude Include="line.h" />
-    <ClInclude Include="metro.h" />
-    <ClInclude Include="nlfilt.h" />
-    <ClInclude Include="whitenoise.h" />
-    <ClInclude Include="oscillator.h" />
-    <ClInclude Include="phasor.h" />
-    <ClInclude Include="reverbsc.h" />
-    <ClInclude Include="svf.h" />
+    <ClInclude Include="modules\adenv.h" />
+    <ClInclude Include="modules\crossfade.h" />
+    <ClInclude Include="modules\dcblock.h" />
+    <ClInclude Include="modules\decimator.h" />
+    <ClInclude Include="modules\delay_line.h" />
+    <ClInclude Include="modules\dsy_pstream.h" />
+    <ClInclude Include="modules\line.h" />
+    <ClInclude Include="modules\metro.h" />
+    <ClInclude Include="modules\nlfilt.h" />
+    <ClInclude Include="modules\oscillator.h" />
+    <ClInclude Include="modules\phasor.h" />
+    <ClInclude Include="modules\port.h" />
+    <ClInclude Include="modules\reverbsc.h" />
+    <ClInclude Include="modules\svf.h" />
+    <ClInclude Include="modules\whitenoise.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
@@ -81,17 +91,19 @@
     <None Include="stm32.xml" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="adenv.c" />
-    <ClCompile Include="dcblock.c" />
-    <ClCompile Include="decimator.c" />
-    <ClCompile Include="delay_line.c" />
-    <ClCompile Include="line.c" />
-    <ClCompile Include="metro.c" />
-    <ClCompile Include="nlfilt.c" />
-    <ClCompile Include="whitenoise.c" />
-    <ClCompile Include="oscillator.c" />
-    <ClCompile Include="phasor.c" />
-    <ClCompile Include="reverbsc.c" />
-    <ClCompile Include="svf.c" />
+    <ClCompile Include="modules\adenv.c" />
+    <ClCompile Include="modules\crossfade.c" />
+    <ClCompile Include="modules\dcblock.c" />
+    <ClCompile Include="modules\decimator.c" />
+    <ClCompile Include="modules\delay_line.c" />
+    <ClCompile Include="modules\line.c" />
+    <ClCompile Include="modules\metro.c" />
+    <ClCompile Include="modules\nlfilt.c" />
+    <ClCompile Include="modules\oscillator.c" />
+    <ClCompile Include="modules\phasor.c" />
+    <ClCompile Include="modules\port.c" />
+    <ClCompile Include="modules\reverbsc.c" />
+    <ClCompile Include="modules\svf.c" />
+    <ClCompile Include="modules\whitenoise.c" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/daisysp/adenv.c → daisysp/modules/adenv.c b/daisysp/adenv.c → daisysp/modules/adenv.c
diff --git a/daisysp/adenv.h → daisysp/modules/adenv.h b/daisysp/adenv.h → daisysp/modules/adenv.h
diff --git a/daisysp/crossfade.c → daisysp/modules/crossfade.c b/daisysp/crossfade.c → daisysp/modules/crossfade.c
diff --git a/daisysp/crossfade.h → daisysp/modules/crossfade.h b/daisysp/crossfade.h → daisysp/modules/crossfade.h
diff --git a/daisysp/dcblock.c → daisysp/modules/dcblock.c b/daisysp/dcblock.c → daisysp/modules/dcblock.c
diff --git a/daisysp/dcblock.h → daisysp/modules/dcblock.h b/daisysp/dcblock.h → daisysp/modules/dcblock.h
diff --git a/daisysp/decimator.c → daisysp/modules/decimator.c b/daisysp/decimator.c → daisysp/modules/decimator.c
diff --git a/daisysp/decimator.h → daisysp/modules/decimator.h b/daisysp/decimator.h → daisysp/modules/decimator.h
diff --git a/daisysp/delay_line.c → daisysp/modules/delay_line.c b/daisysp/delay_line.c → daisysp/modules/delay_line.c
diff --git a/daisysp/delay_line.h → daisysp/modules/delay_line.h b/daisysp/delay_line.h → daisysp/modules/delay_line.h
diff --git a/daisysp/dsy_pstream.h → daisysp/modules/dsy_pstream.h b/daisysp/dsy_pstream.h → daisysp/modules/dsy_pstream.h
diff --git a/daisysp/line.c → daisysp/modules/line.c b/daisysp/line.c → daisysp/modules/line.c
diff --git a/daisysp/line.h → daisysp/modules/line.h b/daisysp/line.h → daisysp/modules/line.h
diff --git a/daisysp/metro.c → daisysp/modules/metro.c b/daisysp/metro.c → daisysp/modules/metro.c
diff --git a/daisysp/metro.h → daisysp/modules/metro.h b/daisysp/metro.h → daisysp/modules/metro.h
diff --git a/daisysp/nlfilt.c → daisysp/modules/nlfilt.c b/daisysp/nlfilt.c → daisysp/modules/nlfilt.c
diff --git a/daisysp/nlfilt.h → daisysp/modules/nlfilt.h b/daisysp/nlfilt.h → daisysp/modules/nlfilt.h
diff --git a/daisysp/oscillator.c → daisysp/modules/oscillator.c b/daisysp/oscillator.c → daisysp/modules/oscillator.c
diff --git a/daisysp/oscillator.h → daisysp/modules/oscillator.h b/daisysp/oscillator.h → daisysp/modules/oscillator.h
diff --git a/daisysp/phasor.c → daisysp/modules/phasor.c b/daisysp/phasor.c → daisysp/modules/phasor.c
diff --git a/daisysp/phasor.h → daisysp/modules/phasor.h b/daisysp/phasor.h → daisysp/modules/phasor.h
diff --git a/daisysp/port.c → daisysp/modules/port.c b/daisysp/port.c → daisysp/modules/port.c
diff --git a/daisysp/port.h → daisysp/modules/port.h b/daisysp/port.h → daisysp/modules/port.h
diff --git a/daisysp/reverbsc.c → daisysp/modules/reverbsc.c b/daisysp/reverbsc.c → daisysp/modules/reverbsc.c
diff --git a/daisysp/reverbsc.h → daisysp/modules/reverbsc.h b/daisysp/reverbsc.h → daisysp/modules/reverbsc.h
diff --git a/daisysp/svf.c → daisysp/modules/svf.c b/daisysp/svf.c → daisysp/modules/svf.c
diff --git a/daisysp/svf.h → daisysp/modules/svf.h b/daisysp/svf.h → daisysp/modules/svf.h
diff --git a/daisysp/whitenoise.c → daisysp/modules/whitenoise.c b/daisysp/whitenoise.c → daisysp/modules/whitenoise.c
diff --git a/daisysp/whitenoise.h → daisysp/modules/whitenoise.h b/daisysp/whitenoise.h → daisysp/modules/whitenoise.h
diff --git a/daisysp/stm32.xml b/daisysp/stm32.xml
@@ -2,8 +2,8 @@
 <EmbeddedProfile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <ToolchainID>com.sysprogs.gnuarm.arm-eabi</ToolchainID>
   <ToolchainVersion>
-    <GCC>8.3.1</GCC>
-    <GDB>8.0</GDB>
+    <GCC>4.9.3</GCC>
+    <GDB>7.8</GDB>
     <Revision>1</Revision>
   </ToolchainVersion>
   <BspID>com.sysprogs.arm.stm32</BspID>