Skip to content

Commit 7bb20ba

Browse files
stephenhensleystephenhensley
committed
updated libraries to latest, updated relevant examples, and resolved _some/most_ intellisense issues in VSCode.
1 parent 259ed82 commit 7bb20ba

13 files changed

Lines changed: 658 additions & 79 deletions

File tree

‎.vscode/c_cpp_properties.json‎

Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,42 @@
33
{
44
"name": "Daisy",
55
"includePath": [
6-
"${workspaceFolder}/libdaisy/src",
7-
"${workspaceFolder}/libdaisy/src/sys",
8-
"${workspaceFolder}/libdaisy/src/usbd",
9-
"${workspaceFolder}/libdaisy/Drivers/CMSIS/Include",
10-
"${workspaceFolder}/libdaisy/Drivers/CMSIS/Device/ST/STM32H7xx/Include",
11-
"${workspaceFolder}/libdaisy/Drivers/STM32H7xx_HAL_Driver/Inc",
12-
"${workspaceFolder}/libdaisy/Drivers/STM32H7xx_HAL_Driver/Inc/Legacy",
13-
"${workspaceFolder}/libdaisy/Middlewares/ST/STM32_USB_Device_Library/Core/Inc",
14-
"${workspaceFolder}/libdaisy/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc",
15-
"${workspaceFolder}/libdaisy/Middlewares/Third_Party/FatFs/src",
16-
"${workspaceFolder}/libdaisy",
17-
"d:/work/programming/dsp/Eigen/eigen-3.3.8",
18-
"${workspaceFolder}/libdaisy/Drivers/CMSIS/DSP/Include",
19-
"${workspaceFolder}/DaisySP",
20-
"${workspaceFolder}/DaisySP/examples/fastconv",
21-
"${workspaceFolder}/libdaisy/src/hid",
22-
"D:/WORK/PROGRAMMING/DSP/_DAISY/DAISYEXAMPLES/DAISYSP/EXAMPLES/FASTCONV",
23-
"${workspaceFolder}/DaisySP/tests/fastconv",
24-
"${workspaceFolder}/DaisySP/tests/util",
25-
"${workspaceFolder}/DaisySP/modules",
6+
"${workspaceFolder}/libDaisy",
7+
"${workspaceFolder}/libDaisy/src",
8+
"${workspaceFolder}/libDaisy/src/sys",
9+
"${workspaceFolder}/libDaisy/src/usbd",
10+
"${workspaceFolder}/libDaisy/src/usbh",
11+
"${workspaceFolder}/libDaisy/Drivers/CMSIS_5/CMSIS/Core/Include",
12+
"${workspaceFolder}/libDaisy/Drivers/CMSIS-DSP/Include",
13+
"${workspaceFolder}/libDaisy/Drivers/CMSIS-Device/ST/STM32H7xx/Include",
14+
"${workspaceFolder}/libDaisy/Drivers/STM32H7xx_HAL_Driver/Inc",
15+
"${workspaceFolder}/libDaisy/Drivers/STM32H7xx_HAL_Driver/Inc/Legacy",
16+
"${workspaceFolder}/libDaisy/Middlewares/ST/STM32_USB_Device_Library/Core/Inc",
17+
"${workspaceFolder}/libDaisy/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc",
18+
"${workspaceFolder}/libDaisy/Middlewares/Patched/ST/STM32_USB_Device_Library/Class/CDC/Inc",
19+
"${workspaceFolder}/libDaisy/Middlewares/ST/STM32_USB_Host_Library/Core/Inc",
20+
"${workspaceFolder}/libDaisy/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Inc",
21+
"${workspaceFolder}/libDaisy/Middlewares/ST/STM32_USB_Host_Library/Class/MIDI/Inc",
22+
"${workspaceFolder}/libDaisy/Middlewares/Third_Party/FatFs/src",
2623
"${workspaceFolder}/DaisySP/Source",
27-
"${workspaceFolder}/DaisySP/tests/util"
24+
"${workspaceFolder}/DaisySP/Source/Control",
25+
"${workspaceFolder}/DaisySP/Source/Drums",
26+
"${workspaceFolder}/DaisySP/Source/Dynamics",
27+
"${workspaceFolder}/DaisySP/Source/Effects",
28+
"${workspaceFolder}/DaisySP/Source/Filters",
29+
"${workspaceFolder}/DaisySP/Source/Noise",
30+
"${workspaceFolder}/DaisySP/Source/PhysicalModeling",
31+
"${workspaceFolder}/DaisySP/Source/Sampling",
32+
"${workspaceFolder}/DaisySP/Source/Synthesis",
33+
"${workspaceFolder}/DaisySP/Source/Utility",
34+
"${workspaceFolder}/DaisySP/DaisySP-LGPL/Source",
35+
"${workspaceFolder}/DaisySP/DaisySP-LGPL/Source/Control",
36+
"${workspaceFolder}/DaisySP/DaisySP-LGPL/Source/Dynamics",
37+
"${workspaceFolder}/DaisySP/DaisySP-LGPL/Source/Effects",
38+
"${workspaceFolder}/DaisySP/DaisySP-LGPL/Source/Filters",
39+
"${workspaceFolder}/DaisySP/DaisySP-LGPL/Source/PhysicalModeling",
40+
"${workspaceFolder}/DaisySP/DaisySP-LGPL/Source/Synthesis",
41+
"${workspaceFolder}/DaisySP/DaisySP-LGPL/Source/Utility"
2842
],
2943
"defines": [
3044
"CORE_CM7",
@@ -36,7 +50,6 @@
3650
"USE_HAL_DRIVER",
3751
"USE_FULL_LL_DRIVER"
3852
],
39-
"windowsSdkVersion": "",
4053
"compilerPath": "C:\\Program Files (x86)\\GNU Arm Embedded Toolchain\\9 2020-q2-update\\bin\\arm-none-eabi-g++.exe",
4154
"cStandard": "gnu11",
4255
"cppStandard": "gnu++14",

‎DaisySP‎

‎libDaisy‎

Submodule libDaisy updated 902 files

‎patch/Nimbus/Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Project Name
22
TARGET = Nimbus
33

4+
APP_TYPE=BOOT_SRAM
5+
LDSCRIPT=sram_linker.lds
6+
47
# Sources
58
CPP_SOURCES += \
69
Nimbus.cpp \

‎patch/Nimbus/sram_linker.lds‎

Lines changed: 269 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,269 @@
1+
/* Generated by LinkerScriptGenerator [http://visualgdb.com/tools/LinkerScriptGenerator]
2+
* Target: STM32H750IB
3+
* The file is provided under the BSD license.
4+
*/
5+
6+
ENTRY(Reset_Handler)
7+
8+
MEMORY
9+
{
10+
FLASH (RX) : ORIGIN = 0x08000000, LENGTH = 128K
11+
DTCMRAM (RW) : ORIGIN = 0x20000000, LENGTH = 128K
12+
SRAM_EXEC (RX): ORIGIN = 0x24000000, LENGTH = 200K
13+
SRAM (RW) : ORIGIN = 0x24000000 + 200K, LENGTH = 512K - 200K
14+
RAM_D2 (RW) : ORIGIN = 0x30000000, LENGTH = 32K
15+
RAM_D2CACHE (RW) : ORIGIN = 0x30000000 + 32K, LENGTH = 288K - 32K
16+
RAM_D3 (RW) : ORIGIN = 0x38000000, LENGTH = 64K
17+
ITCMRAM (RW) : ORIGIN = 0x00000000, LENGTH = 64K
18+
SDRAM (RW) : ORIGIN = 0xc0000000, LENGTH = 64M
19+
QSPIFLASH (RW) : ORIGIN = 0x90000000, LENGTH = 8M
20+
}
21+
22+
_estack = 0x20020000;
23+
24+
SECTIONS
25+
{
26+
.isr_vector :
27+
{
28+
. = ALIGN(4);
29+
KEEP(*(.isr_vector))
30+
. = ALIGN(4);
31+
} > SRAM_EXEC
32+
33+
.text :
34+
{
35+
. = ALIGN(4);
36+
_stext = .;
37+
38+
*(.text)
39+
*(.text*)
40+
*(.rodata)
41+
*(.rodata*)
42+
*(.glue_7)
43+
*(.glue_7t)
44+
KEEP(*(.init))
45+
KEEP(*(.fini))
46+
. = ALIGN(4);
47+
_etext = .;
48+
49+
} > SRAM_EXEC
50+
51+
.ARM.extab :
52+
{
53+
. = ALIGN(4);
54+
*(.ARM.extab)
55+
*(.gnu.linkonce.armextab.*)
56+
. = ALIGN(4);
57+
} > SRAM_EXEC
58+
59+
.exidx :
60+
{
61+
. = ALIGN(4);
62+
PROVIDE(__exidx_start = .);
63+
*(.ARM.exidx*)
64+
. = ALIGN(4);
65+
PROVIDE(__exidx_end = .);
66+
} > SRAM_EXEC
67+
68+
.ARM.attributes :
69+
{
70+
*(.ARM.attributes)
71+
} > SRAM_EXEC
72+
73+
.preinit_array :
74+
{
75+
PROVIDE(__preinit_array_start = .);
76+
KEEP(*(.preinit_array*))
77+
PROVIDE(__preinit_array_end = .);
78+
} > SRAM_EXEC
79+
80+
.init_array :
81+
{
82+
PROVIDE(__init_array_start = .);
83+
KEEP(*(SORT(.init_array.*)))
84+
KEEP(*(.init_array*))
85+
PROVIDE(__init_array_end = .);
86+
} > SRAM_EXEC
87+
88+
.fini_array :
89+
{
90+
PROVIDE(__fini_array_start = .);
91+
KEEP(*(.fini_array*))
92+
KEEP(*(SORT(.fini_array.*)))
93+
PROVIDE(__fini_array_end = .);
94+
} > SRAM_EXEC
95+
96+
97+
.itcmram_bss (NOLOAD):
98+
{
99+
. = ALIGN(4);
100+
_sitcmbssram = .;
101+
PROVIDE(__itcmbss_start__ = _sitcmbssram);
102+
*(.itcmbssram)
103+
*(.itcmbssram*)
104+
. = ALIGN(4);
105+
_eitcmbssram = .;
106+
PROVIDE(__itcmbss_end__ = _eitcmbssram);
107+
} > ITCMRAM
108+
109+
110+
.data :
111+
{
112+
. = ALIGN(4);
113+
_sdata = .;
114+
115+
PROVIDE(__data_start__ = _sdata);
116+
*(.data)
117+
*(.data*)
118+
. = ALIGN(4);
119+
_edata = .;
120+
121+
PROVIDE(__data_end__ = _edata);
122+
} > SRAM AT > SRAM_EXEC
123+
124+
_sidata = LOADADDR(.data);
125+
126+
.bss (NOLOAD) :
127+
{
128+
. = ALIGN(4);
129+
_sbss = .;
130+
131+
PROVIDE(__bss_start__ = _sbss);
132+
*(.bss)
133+
*(.bss*)
134+
*(COMMON)
135+
. = ALIGN(4);
136+
_ebss = .;
137+
138+
PROVIDE(__bss_end__ = _ebss);
139+
} > SRAM
140+
141+
PROVIDE(end = .);
142+
143+
.dtcmram_bss (NOLOAD) :
144+
{
145+
. = ALIGN(4);
146+
_sdtcmram_bss = .;
147+
148+
PROVIDE(__dtcmram_bss_start__ = _sdtcmram_bss);
149+
*(.dtcmram_bss)
150+
*(.dtcmram_bss*)
151+
. = ALIGN(4);
152+
_edtcmram_bss = .;
153+
154+
PROVIDE(__dtcmram_bss_end__ = _edtcmram_bss);
155+
} > DTCMRAM
156+
157+
.sram1_bss (NOLOAD) :
158+
{
159+
. = ALIGN(4);
160+
_ssram1_bss = .;
161+
162+
PROVIDE(__sram1_bss_start__ = _sram1_bss);
163+
*(.sram1_bss)
164+
*(.sram1_bss*)
165+
. = ALIGN(4);
166+
_esram1_bss = .;
167+
168+
PROVIDE(__sram1_bss_end__ = _esram1_bss);
169+
} > RAM_D2
170+
171+
.d2_bss (NOLOAD) :
172+
{
173+
. = ALIGN(4);
174+
_sd2_bss = .;
175+
176+
PROVIDE(__d2_bss_start__ = _d2_bss);
177+
*(.d2_bss)
178+
*(.d2_bss*)
179+
. = ALIGN(4);
180+
_ed2_bss = .;
181+
182+
PROVIDE(__d2_bss_end__ = _ed2_bss);
183+
} > RAM_D2CACHE
184+
185+
186+
.sdram_bss (NOLOAD) :
187+
{
188+
. = ALIGN(4);
189+
_ssdram_bss = .;
190+
191+
PROVIDE(__sdram_bss_start = _ssdram_bss);
192+
*(.sdram_bss)
193+
*(.sdram_bss*)
194+
. = ALIGN(4);
195+
_esdram_bss = .;
196+
197+
PROVIDE(__sdram_bss_end = _esdram_bss);
198+
} > SDRAM
199+
200+
201+
.qspiflash_text :
202+
{
203+
. = ALIGN(4);
204+
_sqspiflash_text = .;
205+
206+
PROVIDE(__qspiflash_text_start = _sqspiflash_text);
207+
*(.qspiflash_text)
208+
*(.qspiflash_text*)
209+
. = ALIGN(4);
210+
_eqspiflash_text = .;
211+
212+
PROVIDE(__qspiflash_text_end = _eqspiflash_text);
213+
} > QSPIFLASH
214+
215+
.qspiflash_data :
216+
{
217+
. = ALIGN(4);
218+
_sqspiflash_data = .;
219+
220+
PROVIDE(__qspiflash_data_start = _sqspiflash_data);
221+
*(.qspiflash_data)
222+
*(.qspiflash_data*)
223+
. = ALIGN(4);
224+
_eqspiflash_data = .;
225+
226+
PROVIDE(__qspiflash_data_end = _eqspiflash_data);
227+
} > QSPIFLASH
228+
229+
.qspiflash_bss (NOLOAD) :
230+
{
231+
. = ALIGN(4);
232+
_sqspiflash_bss = .;
233+
234+
PROVIDE(__qspiflash_bss_start = _sqspiflash_bss);
235+
*(.qspiflash_bss)
236+
*(.qspiflash_bss*)
237+
. = ALIGN(4);
238+
_eqspiflash_bss = .;
239+
240+
PROVIDE(__qspiflash_bss_end = _eqspiflash_bss);
241+
} > QSPIFLASH
242+
243+
.heap (NOLOAD) :
244+
{
245+
. = ALIGN(4);
246+
PROVIDE(__heap_start__ = .);
247+
KEEP(*(.heap))
248+
. = ALIGN(4);
249+
PROVIDE(__heap_end__ = .);
250+
} > SRAM
251+
252+
.reserved_for_stack (NOLOAD) :
253+
{
254+
. = ALIGN(4);
255+
PROVIDE(__reserved_for_stack_start__ = .);
256+
KEEP(*(.reserved_for_stack))
257+
. = ALIGN(4);
258+
PROVIDE(__reserved_for_stack_end__ = .);
259+
} > SRAM
260+
261+
DISCARD :
262+
{
263+
libc.a ( * )
264+
libm.a ( * )
265+
libgcc.a ( * )
266+
}
267+
268+
}
269+

‎patch/Sequencer/Sequencer.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ void UpdateOutputs()
120120
round((values[stepNumber] / 12.f) * 819.2f));
121121
patch.seed.dac.WriteValue(DacHandle::Channel::TWO,
122122
round((values[stepNumber] / 12.f) * 819.2f));
123-
124-
dsy_gpio_write(&patch.gate_output, trigOut);
123+
patch.gate_output.Write(trigOut);
125124
trigOut = false;
126125
}

‎patch/Torus/Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Project Name
22
TARGET = torus
33

4+
APP_TYPE=BOOT_SRAM
5+
LDSCRIPT=sram_linker.lds
6+
47
# Library Locations
58
LIBDAISY_DIR = ../../libDaisy
69
STMLIB_DIR = ../../stmlib

0 commit comments

Comments
 (0)