Skip to content

Commit 2be7a15

Browse files
stephenhensleystephenhensley
authored
Merge pull request electro-smith#78 from andrewikenberry/daisysp_dirs
moved all module files to their own dir
2 parents 1fbd73a + f3d9c07 commit 2be7a15

34 files changed

+95
-83
lines changed

‎daisysp/Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
TARGET = libdaisysp
22

3+
MODULE_DIR = modules
34
MODULES = \
45
adenv \
56
crossfade \
@@ -43,7 +44,7 @@ BUILD_DIR = build
4344
######################################
4445

4546
# C sources
46-
C_SOURCES += $(addsuffix .c, $(MODULES))
47+
C_SOURCES += $(addsuffix .c, $(MODULE_DIR)/$(MODULES))
4748

4849
#######################################
4950
# binaries

‎daisysp/daisysp-Debug.vgdbsettings‎

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<LocalDirForAbsolutePaths>$(ToolchainDir)</LocalDirForAbsolutePaths>
99
</CustomSourceDirectories>
1010
<MainSourceDirectory>$(ProjectDir)</MainSourceDirectory>
11-
<ExportAdvancedBuildVariables>false</ExportAdvancedBuildVariables>
1211
<EmbeddedProfileFile>stm32.xml</EmbeddedProfileFile>
1312
</Project>
1413
<Build xsi:type="com.visualgdb.build.msbuild">
@@ -18,40 +17,12 @@
1817
</Version>
1918
</ToolchainID>
2019
<ProjectFile>daisysp.vcxproj</ProjectFile>
21-
<ParallelJobCount>0</ParallelJobCount>
20+
<RemoteBuildEnvironment>
21+
<Records />
22+
</RemoteBuildEnvironment>
23+
<ParallelJobCount>1</ParallelJobCount>
2224
<SuppressDirectoryChangeMessages>true</SuppressDirectoryChangeMessages>
2325
</Build>
24-
<CustomBuild>
25-
<PreSyncActions />
26-
<PreBuildActions />
27-
<PostBuildActions />
28-
<PreCleanActions />
29-
<PostCleanActions />
30-
</CustomBuild>
31-
<CustomDebug>
32-
<PreDebugActions />
33-
<PostDebugActions />
34-
<DebugStopActions />
35-
<BreakMode>Default</BreakMode>
36-
</CustomDebug>
37-
<CustomShortcuts>
38-
<Shortcuts />
39-
<ShowMessageAfterExecuting>true</ShowMessageAfterExecuting>
40-
</CustomShortcuts>
41-
<UserDefinedVariables />
42-
<CodeSense>
43-
<Enabled>Unknown</Enabled>
44-
<ExtraSettings>
45-
<HideErrorsInSystemHeaders>true</HideErrorsInSystemHeaders>
46-
<SupportLightweightReferenceAnalysis>true</SupportLightweightReferenceAnalysis>
47-
<CheckForClangFormatFiles>true</CheckForClangFormatFiles>
48-
<FormattingEngine xsi:nil="true" />
49-
</ExtraSettings>
50-
<CodeAnalyzerSettings>
51-
<Enabled>false</Enabled>
52-
</CodeAnalyzerSettings>
53-
</CodeSense>
54-
<BuildContextDirectory>VisualGDB\VisualGDBCache</BuildContextDirectory>
5526
<Debug xsi:type="com.visualgdb.debug.embedded">
5627
<AdditionalStartupCommands />
5728
<AdditionalGDBSettings>
@@ -109,16 +80,44 @@
10980
</DebugMethod>
11081
<AutoDetectRTOS>true</AutoDetectRTOS>
11182
<SemihostingSupport>Auto</SemihostingSupport>
112-
<SemihostingPollingDelay>0</SemihostingPollingDelay>
11383
<StepIntoEntryPoint>false</StepIntoEntryPoint>
11484
<ReloadFirmwareOnReset>false</ReloadFirmwareOnReset>
11585
<ValidateEndOfStackAddress>true</ValidateEndOfStackAddress>
11686
<StopAtEntryPoint>false</StopAtEntryPoint>
117-
<EnableVirtualHalts>false</EnableVirtualHalts>
87+
<CheckInterfaceDrivers>true</CheckInterfaceDrivers>
11888
<DynamicAnalysisSettings />
11989
<EndOfStackSymbol>_estack</EndOfStackSymbol>
12090
<TimestampProviderTicksPerSecond>0</TimestampProviderTicksPerSecond>
121-
<KeepConsoleAfterExit>false</KeepConsoleAfterExit>
122-
<CheckInterfaceDrivers>true</CheckInterfaceDrivers>
12391
</Debug>
124-
</VisualGDBProjectSettings2>
92+
<CustomBuild>
93+
<PreSyncActions />
94+
<PreBuildActions />
95+
<PostBuildActions />
96+
<PreCleanActions />
97+
<PostCleanActions />
98+
</CustomBuild>
99+
<CustomDebug>
100+
<PreDebugActions />
101+
<PostDebugActions />
102+
<DebugStopActions />
103+
<BreakMode>Default</BreakMode>
104+
</CustomDebug>
105+
<CustomShortcuts>
106+
<Shortcuts />
107+
<ShowMessageAfterExecuting>true</ShowMessageAfterExecuting>
108+
</CustomShortcuts>
109+
<UserDefinedVariables />
110+
<ImportedPropertySheets />
111+
<CodeSense>
112+
<Enabled>Unknown</Enabled>
113+
<ExtraSettings>
114+
<HideErrorsInSystemHeaders>true</HideErrorsInSystemHeaders>
115+
<SupportLightweightReferenceAnalysis>true</SupportLightweightReferenceAnalysis>
116+
</ExtraSettings>
117+
<CodeAnalyzerSettings>
118+
<Enabled>false</Enabled>
119+
</CodeAnalyzerSettings>
120+
</CodeSense>
121+
<BuildContextDirectory>VisualGDB\VisualGDBCache</BuildContextDirectory>
122+
<ProgramArgumentsSuggestions />
123+
</VisualGDBProjectSettings2>

‎daisysp/daisysp.h‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,20 @@ typedef struct {
3030

3131
// Listed in Alphabetical Order
3232
// Each of the below has/should have an example project.
33-
#include "adenv.h"
34-
#include "crossfade.h"
35-
#include "dcblock.h"
36-
#include "decimator.h"
37-
#include "delay_line.h"
38-
#include "line.h"
39-
#include "nlfilt.h"
40-
#include "metro.h"
41-
#include "oscillator.h"
42-
#include "phasor.h"
43-
#include "port.h"
44-
#include "reverbsc.h"
45-
#include "svf.h"
46-
#include "whitenoise.h"
33+
#include "modules/adenv.h"
34+
#include "modules/crossfade.h"
35+
#include "modules/dcblock.h"
36+
#include "modules/decimator.h"
37+
#include "modules/delay_line.h"
38+
#include "modules/line.h"
39+
#include "modules/nlfilt.h"
40+
#include "modules/metro.h"
41+
#include "modules/oscillator.h"
42+
#include "modules/phasor.h"
43+
#include "modules/port.h"
44+
#include "modules/reverbsc.h"
45+
#include "modules/svf.h"
46+
#include "modules/whitenoise.h"
4747

4848
#ifdef __cplusplus
4949
}

‎daisysp/daisysp.vcxproj‎

Lines changed: 40 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
3434
<GNUConfigurationType>Debug</GNUConfigurationType>
3535
<ToolchainID>com.sysprogs.gnuarm.arm-eabi</ToolchainID>
36-
<ToolchainVersion>8.3.1/8.0/r1</ToolchainVersion>
36+
<ToolchainVersion>4.9.3/7.8/r1</ToolchainVersion>
3737
<GNUTargetType>StaticLibrary</GNUTargetType>
3838
</PropertyGroup>
3939
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
4040
<ToolchainID>com.sysprogs.gnuarm.arm-eabi</ToolchainID>
41-
<ToolchainVersion>8.3.1/8.0/r1</ToolchainVersion>
41+
<ToolchainVersion>4.9.3/7.8/r1</ToolchainVersion>
4242
<GNUTargetType>StaticLibrary</GNUTargetType>
4343
</PropertyGroup>
4444
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
@@ -49,28 +49,38 @@
4949
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
5050
<ClCompile>
5151
<InlineFunctions>true</InlineFunctions>
52+
<AdditionalIncludeDirectories>modules;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
53+
<PreprocessorDefinitions>DEBUG=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
5254
</ClCompile>
55+
<Link>
56+
<AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
57+
<LibrarySearchDirectories>;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
58+
<AdditionalLibraryNames>;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
59+
<LinkerScript />
60+
</Link>
5361
</ItemDefinitionGroup>
5462
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
5563
<ClCompile>
5664
<InlineFunctions>true</InlineFunctions>
5765
</ClCompile>
5866
</ItemDefinitionGroup>
5967
<ItemGroup>
60-
<ClInclude Include="adenv.h" />
6168
<ClInclude Include="daisysp.h" />
62-
<ClInclude Include="dcblock.h" />
63-
<ClInclude Include="decimator.h" />
64-
<ClInclude Include="delay_line.h" />
65-
<ClInclude Include="dsy_pstream.h" />
66-
<ClInclude Include="line.h" />
67-
<ClInclude Include="metro.h" />
68-
<ClInclude Include="nlfilt.h" />
69-
<ClInclude Include="whitenoise.h" />
70-
<ClInclude Include="oscillator.h" />
71-
<ClInclude Include="phasor.h" />
72-
<ClInclude Include="reverbsc.h" />
73-
<ClInclude Include="svf.h" />
69+
<ClInclude Include="modules\adenv.h" />
70+
<ClInclude Include="modules\crossfade.h" />
71+
<ClInclude Include="modules\dcblock.h" />
72+
<ClInclude Include="modules\decimator.h" />
73+
<ClInclude Include="modules\delay_line.h" />
74+
<ClInclude Include="modules\dsy_pstream.h" />
75+
<ClInclude Include="modules\line.h" />
76+
<ClInclude Include="modules\metro.h" />
77+
<ClInclude Include="modules\nlfilt.h" />
78+
<ClInclude Include="modules\oscillator.h" />
79+
<ClInclude Include="modules\phasor.h" />
80+
<ClInclude Include="modules\port.h" />
81+
<ClInclude Include="modules\reverbsc.h" />
82+
<ClInclude Include="modules\svf.h" />
83+
<ClInclude Include="modules\whitenoise.h" />
7484
</ItemGroup>
7585
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
7686
<ImportGroup Label="ExtensionTargets">
@@ -81,17 +91,19 @@
8191
<None Include="stm32.xml" />
8292
</ItemGroup>
8393
<ItemGroup>
84-
<ClCompile Include="adenv.c" />
85-
<ClCompile Include="dcblock.c" />
86-
<ClCompile Include="decimator.c" />
87-
<ClCompile Include="delay_line.c" />
88-
<ClCompile Include="line.c" />
89-
<ClCompile Include="metro.c" />
90-
<ClCompile Include="nlfilt.c" />
91-
<ClCompile Include="whitenoise.c" />
92-
<ClCompile Include="oscillator.c" />
93-
<ClCompile Include="phasor.c" />
94-
<ClCompile Include="reverbsc.c" />
95-
<ClCompile Include="svf.c" />
94+
<ClCompile Include="modules\adenv.c" />
95+
<ClCompile Include="modules\crossfade.c" />
96+
<ClCompile Include="modules\dcblock.c" />
97+
<ClCompile Include="modules\decimator.c" />
98+
<ClCompile Include="modules\delay_line.c" />
99+
<ClCompile Include="modules\line.c" />
100+
<ClCompile Include="modules\metro.c" />
101+
<ClCompile Include="modules\nlfilt.c" />
102+
<ClCompile Include="modules\oscillator.c" />
103+
<ClCompile Include="modules\phasor.c" />
104+
<ClCompile Include="modules\port.c" />
105+
<ClCompile Include="modules\reverbsc.c" />
106+
<ClCompile Include="modules\svf.c" />
107+
<ClCompile Include="modules\whitenoise.c" />
96108
</ItemGroup>
97-
</Project>
109+
</Project>

daisysp/adenv.c renamed to daisysp/modules/adenv.c

File renamed without changes.

daisysp/adenv.h renamed to daisysp/modules/adenv.h

File renamed without changes.

daisysp/crossfade.c renamed to daisysp/modules/crossfade.c

File renamed without changes.

daisysp/crossfade.h renamed to daisysp/modules/crossfade.h

File renamed without changes.

daisysp/dcblock.c renamed to daisysp/modules/dcblock.c

File renamed without changes.

daisysp/dcblock.h renamed to daisysp/modules/dcblock.h

File renamed without changes.

0 commit comments

Comments
 (0)