diff --git a/STM32Cube/.metadata/.ide.log b/STM32Cube/.metadata/.ide.log index 526121b..72ecd62 100644 --- a/STM32Cube/.metadata/.ide.log +++ b/STM32Cube/.metadata/.ide.log @@ -14301,3 +14301,164 @@ 2021-08-08 20:56:10,293 [INFO] I2sManager:179 - I2S Clock Value : 1.44E8 2021-08-08 20:56:10,293 [INFO] I2sManager:520 - AudioClock : 31914Divider : 70Odd : 1 2021-08-08 20:56:10,396 [INFO] OpenFileManager:333 - Restore cursor +2021-08-08 21:15:56,417 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,453 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,453 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,454 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,454 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,455 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,455 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,455 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,455 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,455 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,455 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,455 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,456 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,456 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,456 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,484 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,690 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,690 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,690 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,691 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,691 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,691 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,691 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,691 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,692 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,692 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,692 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,692 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,692 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,692 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:36,716 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:37,804 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:37,805 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:37,805 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:37,805 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:37,805 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:37,806 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:37,806 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:37,806 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:37,806 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:37,806 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:37,807 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:37,807 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:37,807 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:37,807 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:37,838 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:38,049 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:38,050 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:38,050 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:38,050 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:38,050 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:38,050 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:38,050 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:38,050 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:38,050 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:38,051 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:38,051 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:38,051 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:38,051 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:38,051 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:38,075 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:58,197 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:58,197 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:58,197 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:58,197 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:58,197 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:58,197 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:58,198 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:58,198 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:58,198 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:58,198 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:58,198 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:58,198 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:58,198 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:58,198 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:16:58,235 [INFO] ADCParametersView:103 - Rank 1 : false +2021-08-08 21:17:12,078 [INFO] DbMcusDocs:143 - JSON generation date=Mon Jun 07 10:53:21 CEST 2021 (1623056001) +2021-08-08 21:17:12,260 [INFO] DbMcusDocs:79 - Found 669 MCUs documents +2021-08-08 21:17:28,313 [INFO] NvicIntPanel:96 - NVIC parent = com.st.microxplorer.plugins.ip.nvic.MultiNvicIntPanel[,0,0,0x0,invalid,layout=javax.swing.BoxLayout,alignmentX=0.0,alignmentY=0.0,border=,flags=9,maximumSize=,minimumSize=,preferredSize=] +2021-08-08 21:17:57,608 [INFO] I2sManager:626 - 1.44E8 +2021-08-08 21:17:57,609 [INFO] I2sManager:179 - I2S Clock Value : 1.44E8 +2021-08-08 21:17:57,609 [INFO] I2sManager:520 - AudioClock : 31914Divider : 70Odd : 1 +2021-08-08 21:18:42,488 [INFO] Gpio:254 - dependency for GPIO [ADC1, I2S4, RCC, SDIO, SPI1, SYS, USART1, USB_OTG_FS] +2021-08-08 21:19:43,306 [INFO] UtilMem:74 - End SaveConfig() Used Memory: 373028928 Bytes (536870912) +2021-08-08 21:19:45,254 [INFO] UtilMem:74 - End SaveConfig() Used Memory: 407109696 Bytes (536870912) +2021-08-08 21:19:45,581 [INFO] UtilMem:74 - End SaveConfig() Used Memory: 424409152 Bytes (536870912) +2021-08-08 21:19:46,022 [INFO] BlockDiagram:2740 - set Specific Code input for plugin: SPI +2021-08-08 21:19:46,022 [INFO] BlockDiagram:2740 - set Specific Code input for plugin: USB_OTG_FS +2021-08-08 21:19:46,022 [INFO] BlockDiagram:2740 - set Specific Code input for plugin: NVIC +2021-08-08 21:19:46,022 [INFO] BlockDiagram:2740 - set Specific Code input for plugin: USART +2021-08-08 21:19:46,022 [INFO] BlockDiagram:2740 - set Specific Code input for plugin: SDIO +2021-08-08 21:19:46,022 [INFO] BlockDiagram:2740 - set Specific Code input for plugin: DMA +2021-08-08 21:19:46,022 [INFO] BlockDiagram:2740 - set Specific Code input for plugin: I2S +2021-08-08 21:19:46,022 [INFO] BlockDiagram:2740 - set Specific Code input for plugin: SYS +2021-08-08 21:19:46,023 [INFO] BlockDiagram:2740 - set Specific Code input for plugin: GPIO +2021-08-08 21:19:46,023 [INFO] BlockDiagram:2740 - set Specific Code input for plugin: ADC +2021-08-08 21:19:46,023 [INFO] BlockDiagram:2740 - set Specific Code input for plugin: RCC +2021-08-08 21:19:46,023 [INFO] BlockDiagram:2740 - set Specific Code input for plugin: FATFS +2021-08-08 21:19:46,024 [INFO] CodeGenerator:663 - code generatio: config db path: /Applications/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.common.mx_6.3.0.202107141111//db/ +2021-08-08 21:19:46,391 [INFO] CodeEngine:239 - oldGeneratedFile, /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/MXTmpFiles/license.tmp_save +2021-08-08 21:19:46,793 [INFO] CodeEngine:257 - Generated code: /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/MXTmpFiles/license.tmp +2021-08-08 21:19:46,848 [INFO] CodeEngine:239 - oldGeneratedFile, /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/MXTmpFiles/gpio.tmp_save +2021-08-08 21:19:46,970 [INFO] CodeEngine:257 - Generated code: /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/MXTmpFiles/gpio.tmp +2021-08-08 21:19:47,652 [WARN] IPConfigManager:2738 - Warning: the RefConfig PWREx_EnableUSBVoltageDetector is not available in your config.xml file +2021-08-08 21:19:47,721 [INFO] CodeEngine:239 - oldGeneratedFile, /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/MXTmpFiles/dma.tmp_save +2021-08-08 21:19:47,838 [INFO] CodeEngine:257 - Generated code: /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/MXTmpFiles/dma.tmp +2021-08-08 21:19:47,840 [INFO] CodeEngine:239 - oldGeneratedFile, /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/MXTmpFiles/dma_GV.tmp_save +2021-08-08 21:19:47,912 [INFO] CodeEngine:257 - Generated code: /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/MXTmpFiles/dma_GV.tmp +2021-08-08 21:19:47,929 [INFO] CodeEngine:239 - oldGeneratedFile, /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/MXTmpFiles/fatfs_HalInit.tmp_save +2021-08-08 21:19:47,991 [INFO] CodeEngine:257 - Generated code: /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/MXTmpFiles/fatfs_HalInit.tmp +2021-08-08 21:19:47,994 [INFO] CodeEngine:239 - oldGeneratedFile, /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/MXTmpFiles/fatfs_vars.tmp_save +2021-08-08 21:19:48,049 [INFO] CodeEngine:257 - Generated code: /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/MXTmpFiles/fatfs_vars.tmp +2021-08-08 21:19:48,051 [INFO] CodeEngine:239 - oldGeneratedFile, /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/MXTmpFiles/fatfs_ext_vars.tmp_save +2021-08-08 21:19:48,106 [INFO] CodeEngine:257 - Generated code: /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/MXTmpFiles/fatfs_ext_vars.tmp +2021-08-08 21:19:48,109 [INFO] CodeEngine:239 - oldGeneratedFile, /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/MXTmpFiles/fatfs_inc.tmp_save +2021-08-08 21:19:48,163 [INFO] CodeEngine:257 - Generated code: /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/MXTmpFiles/fatfs_inc.tmp +2021-08-08 21:19:48,165 [INFO] CodeEngine:239 - oldGeneratedFile, /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/FATFS/Target/ffconf.h_save +2021-08-08 21:19:48,251 [INFO] CodeEngine:257 - Generated code: /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/FATFS/Target/ffconf.h +2021-08-08 21:19:48,254 [INFO] CodeEngine:239 - oldGeneratedFile, /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/FATFS/Target/bsp_driver_sd.c_save +2021-08-08 21:19:48,323 [INFO] CodeEngine:257 - Generated code: /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/FATFS/Target/bsp_driver_sd.c +2021-08-08 21:19:48,326 [INFO] CodeEngine:239 - oldGeneratedFile, /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/FATFS/Target/bsp_driver_sd.h_save +2021-08-08 21:19:48,385 [INFO] CodeEngine:257 - Generated code: /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/FATFS/Target/bsp_driver_sd.h +2021-08-08 21:19:48,389 [INFO] CodeEngine:239 - oldGeneratedFile, /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/FATFS/Target/sd_diskio.h_save +2021-08-08 21:19:48,442 [INFO] CodeEngine:257 - Generated code: /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/FATFS/Target/sd_diskio.h +2021-08-08 21:19:48,445 [INFO] CodeEngine:239 - oldGeneratedFile, /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/FATFS/Target/sd_diskio.c_save +2021-08-08 21:19:48,526 [INFO] CodeEngine:257 - Generated code: /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/FATFS/Target/sd_diskio.c +2021-08-08 21:19:48,529 [INFO] CodeEngine:239 - oldGeneratedFile, /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/FATFS/App/fatfs.c_save +2021-08-08 21:19:48,587 [INFO] CodeEngine:257 - Generated code: /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/FATFS/App/fatfs.c +2021-08-08 21:19:48,589 [INFO] CodeEngine:239 - oldGeneratedFile, /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/FATFS/App/fatfs.h_save +2021-08-08 21:19:48,646 [INFO] CodeEngine:257 - Generated code: /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/FATFS/App/fatfs.h +2021-08-08 21:19:48,648 [INFO] CodeEngine:239 - oldGeneratedFile, /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/FATFS/Target/fatfs_platform.c_save +2021-08-08 21:19:48,700 [INFO] CodeEngine:257 - Generated code: /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/FATFS/Target/fatfs_platform.c +2021-08-08 21:19:48,703 [INFO] CodeEngine:239 - oldGeneratedFile, /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/FATFS/Target/fatfs_platform.h_save +2021-08-08 21:19:48,752 [INFO] CodeEngine:257 - Generated code: /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/FATFS/Target/fatfs_platform.h +2021-08-08 21:19:48,763 [INFO] CodeEngine:239 - oldGeneratedFile, /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/Core/Src/stm32f4xx_it.c_save +2021-08-08 21:19:48,878 [INFO] CodeEngine:257 - Generated code: /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/Core/Src/stm32f4xx_it.c +2021-08-08 21:19:48,882 [INFO] CodeEngine:239 - oldGeneratedFile, /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/Core/Inc/stm32f4xx_it.h_save +2021-08-08 21:19:48,952 [INFO] CodeEngine:257 - Generated code: /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/Core/Inc/stm32f4xx_it.h +2021-08-08 21:19:48,961 [INFO] CodeEngine:239 - oldGeneratedFile, /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/Core/Src/stm32f4xx_hal_msp.c_save +2021-08-08 21:19:49,145 [INFO] CodeEngine:257 - Generated code: /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/Core/Src/stm32f4xx_hal_msp.c +2021-08-08 21:19:49,148 [INFO] CodeEngine:239 - oldGeneratedFile, /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/MXTmpFiles/system.tmp_save +2021-08-08 21:19:49,207 [INFO] CodeEngine:257 - Generated code: /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/MXTmpFiles/system.tmp +2021-08-08 21:19:49,212 [INFO] CodeEngine:239 - oldGeneratedFile, /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/Core/Inc/stm32f4xx_hal_conf.h_save +2021-08-08 21:19:49,287 [INFO] CodeEngine:257 - Generated code: /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/Core/Inc/stm32f4xx_hal_conf.h +2021-08-08 21:19:49,331 [WARN] IPConfigManager:3148 - IP not found : USB_OTG +2021-08-08 21:19:49,332 [WARN] CodeGenerator:3268 - IP not found : null +2021-08-08 21:19:49,337 [INFO] CodeEngine:239 - oldGeneratedFile, /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/Core/Inc/main.h_save +2021-08-08 21:19:49,408 [INFO] CodeEngine:257 - Generated code: /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/Core/Inc/main.h +2021-08-08 21:19:49,411 [INFO] CodeEngine:239 - oldGeneratedFile, /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/Core/Src/main.c_save +2021-08-08 21:19:49,546 [INFO] CodeEngine:257 - Generated code: /Users/willemoldemans/Documents/PROJECTEN/leo_muziekdoos/STM32Cube/leo_muziekdoos/Core/Src/main.c +2021-08-08 21:19:50,215 [INFO] ProjectBuilder:2578 - Time for Copy HAL[1] : 153mS. +2021-08-08 21:19:50,222 [INFO] ProjectBuilder:3622 - Project Generator version: 3.14.1 +2021-08-08 21:19:50,674 [INFO] ConfigFileManager:1271 - The Die is : DIE431 +2021-08-08 21:19:50,732 [INFO] ApiDbMcu:468 - Load IP Config File for FREERTOS +2021-08-08 21:19:50,748 [INFO] ApiDbMcu:468 - Load IP Config File for LIBJPEG +2021-08-08 21:19:50,830 [INFO] ApiDbMcu:468 - Load IP Config File for MBEDTLS +2021-08-08 21:19:50,914 [INFO] ApiDbMcu:468 - Load IP Config File for USB_DEVICE +2021-08-08 21:19:50,930 [INFO] ApiDbMcu:468 - Load IP Config File for USB_HOST +2021-08-08 21:19:52,900 [INFO] ProjectBuilder:3789 - Time for Generating toolchain IDE Files: 2678mS. +2021-08-08 21:19:52,901 [INFO] ProjectBuilder:2457 - Time for Copy CMSIS : 0mS. +2021-08-08 21:19:52,903 [INFO] ProjectBuilder:2457 - Time for Copy CMSIS : 0mS. diff --git a/STM32Cube/.metadata/.plugins/org.eclipse.cdt.core/.log b/STM32Cube/.metadata/.plugins/org.eclipse.cdt.core/.log index 4e8730c..f5c48f4 100644 --- a/STM32Cube/.metadata/.plugins/org.eclipse.cdt.core/.log +++ b/STM32Cube/.metadata/.plugins/org.eclipse.cdt.core/.log @@ -1,2 +1,3 @@ *** SESSION Aug 01, 2021 19:00:44.889 ------------------------------------------ *** SESSION Aug 08, 2021 15:23:28.239 ------------------------------------------ +*** SESSION Aug 08, 2021 20:55:47.144 ------------------------------------------ diff --git a/STM32Cube/.metadata/.plugins/org.eclipse.cdt.core/leo_muziekdoos.1627837411078.pdom b/STM32Cube/.metadata/.plugins/org.eclipse.cdt.core/leo_muziekdoos.1627837411078.pdom index 39c3ac2..e3a84f8 100644 Binary files a/STM32Cube/.metadata/.plugins/org.eclipse.cdt.core/leo_muziekdoos.1627837411078.pdom and b/STM32Cube/.metadata/.plugins/org.eclipse.cdt.core/leo_muziekdoos.1627837411078.pdom differ diff --git a/STM32Cube/.metadata/.plugins/org.eclipse.core.resources/.root/2.tree b/STM32Cube/.metadata/.plugins/org.eclipse.core.resources/.root/3.tree similarity index 59% rename from STM32Cube/.metadata/.plugins/org.eclipse.core.resources/.root/2.tree rename to STM32Cube/.metadata/.plugins/org.eclipse.core.resources/.root/3.tree index b64c6ee..ddc8ed2 100644 Binary files a/STM32Cube/.metadata/.plugins/org.eclipse.core.resources/.root/2.tree and b/STM32Cube/.metadata/.plugins/org.eclipse.core.resources/.root/3.tree differ diff --git a/STM32Cube/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/STM32Cube/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources index 4174bd3..8a406ca 100644 Binary files a/STM32Cube/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources and b/STM32Cube/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources differ diff --git a/STM32Cube/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/STM32Cube/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi index 98f847a..8a824ce 100644 --- a/STM32Cube/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi +++ b/STM32Cube/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi @@ -1,8 +1,8 @@ - + activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration - + @@ -11,9 +11,9 @@ topLevel shellMaximized - - - + + + persp.actionSet:com.st.stm32cube.ide.mcu.informationcenter.actionSet3 persp.actionSet:org.eclipse.ui.cheatsheets.actionSet @@ -67,65 +67,65 @@ persp.viewSC:com.st.stm32cube.ide.mcu.buildanalyzer.view persp.viewSC:com.st.stm32cube.ide.mcu.stackanalyzer.stackanalyzer.view persp.viewSC:com.st.stm32cube.ide.mcu.sfrview - - - noFocus - + + + active + View categoryTag:General - + View categoryTag:C/C++ - + View categoryTag:General - - - - - + + + + + View categoryTag:General - + View categoryTag:General - + View categoryTag:Make - - - + + + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - - + + View categoryTag:C/C++ - + View categoryTag:C/C++ @@ -134,7 +134,7 @@ - + persp.actionSet:com.st.stm32cube.ide.mcu.informationcenter.actionSet3 persp.actionSet:org.eclipse.ui.cheatsheets.actionSet @@ -150,24 +150,24 @@ persp.actionSet:org.eclipse.debug.ui.launchActionSet persp.newWizSC:com.st.stm32cube.common.projectcreation.ui.stm32projectwizard persp.newWizSC:com.st.stm32cube.common.projectcreation.ui.stm32projectfromiocwizard - - - + + + View categoryTag:General - - - - - + + + + + General - + View categoryTag:Device Configuration Tool - + View categoryTag:General @@ -176,7 +176,7 @@ - + persp.actionSet:com.st.stm32cube.ide.mcu.informationcenter.actionSet3 persp.actionSet:org.eclipse.ui.cheatsheets.actionSet @@ -223,120 +223,120 @@ persp.viewSC:com.st.stm32cube.ide.mcu.livewatch.LiveExpressionsView persp.viewSC:com.st.stm32cube.ide.mcu.faultanalyzer.view persp.viewSC:com.st.stm32cube.ide.mcu.sfrview - - - + + + org.eclipse.e4.primaryNavigationStack - + View categoryTag:Debug - + View categoryTag:General - - + + View categoryTag:Debug - - - - + + + + org.eclipse.e4.secondaryNavigationStack - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + Debug - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug @@ -345,2065 +345,2055 @@ - - + + View categoryTag:Help - + View categoryTag:General - + View categoryTag:Help - + View categoryTag:Help - + View categoryTag:General - + ViewMenu menuContribution:menu - + - + View categoryTag:Help - - + + org.eclipse.e4.primaryDataStack EditorStack - active - noFocus - + Editor removeOnHide org.eclipse.cdt.ui.editor.CEditor - - + + Editor removeOnHide org.eclipse.cdt.ui.editor.CEditor - - - Editor - removeOnHide - com.st.stm32cube.common.mx.startCubeMx - active - - + View categoryTag:General - + active + activeOnClose + ViewMenu menuContribution:menu - + - + View categoryTag:C/C++ - + View categoryTag:General - + View categoryTag:General - + ViewMenu menuContribution:menu - + - + View categoryTag:General - + ViewMenu menuContribution:menu - + - + View categoryTag:General - + ViewMenu menuContribution:menu - + - + View categoryTag:General - + ViewMenu menuContribution:menu - + - + View categoryTag:General - + ViewMenu menuContribution:menu - + - + View categoryTag:General - + View categoryTag:Make - + ViewMenu menuContribution:menu - + - + View categoryTag:C/C++ - + ViewMenu menuContribution:menu - + - + View categoryTag:C/C++ - + ViewMenu menuContribution:menu - + - + View categoryTag:Device Configuration Tool - + View categoryTag:Debug - + ViewMenu menuContribution:menu - + - + View categoryTag:Debug - + ViewMenu menuContribution:menu - + - + View categoryTag:General - + View categoryTag:Debug - + ViewMenu menuContribution:menu - + - + View categoryTag:Debug - + ViewMenu menuContribution:menu - + - + View categoryTag:Debug - + ViewMenu menuContribution:menu - + - + View categoryTag:General - + View categoryTag:Debug - + View categoryTag:Debug - + ViewMenu menuContribution:menu - + - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + ViewMenu menuContribution:menu - + - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + ViewMenu menuContribution:menu - + - - + + toolbarSeparator - + - + Draggable - + - + toolbarSeparator - + - + Draggable - + toolbarSeparator - + - + Draggable - + Draggable - + Draggable - + Draggable - + toolbarSeparator - + - + Draggable - + - - Draggable - - + toolbarSeparator - + - + toolbarSeparator - + - + Draggable - + stretch SHOW_RESTORE_MENU - + Draggable HIDEABLE SHOW_RESTORE_MENU - - + + stretch - + Draggable - + Draggable - - + + TrimStack Draggable - + - - - - - - - - + + + + + + + + platform:cocoa - + platform:cocoa - - - - + + + + platform:cocoa - + platform:cocoa - - - - + + + + platform:cocoa - - - - - + + + + + - - + + platform:cocoa - + - + platform:cocoa - + - + platform:cocoa - + - + platform:cocoa - + platform:cocoa - + - + platform:cocoa - + - + platform:cocoa - + - + platform:cocoa - + - + platform:cocoa - + - + platform:cocoa - + - + platform:cocoa - + - - - - + + + + platform:cocoa - - - - - - - + + + + + + + platform:cocoa - + platform:cocoa - + platform:cocoa - + platform:cocoa - - - - - - - + + + + + + + platform:cocoa - + platform:cocoa - - - - - - - + + + + + + + platform:cocoa - + platform:cocoa - + platform:cocoa - + - - - - - - - - - - - + + + + + + + + + + + platform:cocoa - + platform:cocoa - - - - + + + + platform:cocoa - - + + platform:cocoa - + - - + + platform:cocoa - - - - + + + + - - + + platform:cocoa - + platform:cocoa - - + + platform:cocoa - - - - + + + + platform:cocoa - + platform:cocoa - + platform:cocoa - + platform:cocoa - + platform:cocoa - + platform:cocoa - + platform:cocoa - - - - - - - - - - - + + + + + + + + + + + platform:cocoa - - - + + + platform:cocoa - + platform:cocoa - - - - + + + + platform:cocoa - + platform:cocoa - + platform:cocoa - - - - - - - - + + + + + + + + - - - + + + platform:cocoa - - - - - - - - - - - + + + + + + + + + + + platform:cocoa - + platform:cocoa - + platform:cocoa - - + + platform:cocoa - + platform:cocoa - + platform:cocoa - - - + + + platform:cocoa - - - + + + platform:cocoa - + platform:cocoa - - + + platform:cocoa - + platform:cocoa - + platform:cocoa - + platform:cocoa - - + + platform:cocoa - - - + + + platform:cocoa - - - - - - - - - - + + + + + + + + + + platform:cocoa - - + + platform:cocoa - - - - - + + + + + platform:cocoa - - - + + + - - + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + platform:cocoa - + platform:cocoa - - - - + + + + - - - - - - - + + + + + + + - - - + + + - - + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + - - - - - - + + + + + + - - - - + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Editor removeOnHide - + View categoryTag:Device Configuration Tool - + View categoryTag:C/C++ - + View categoryTag:SWV - + View categoryTag:SWV - + View categoryTag:SWV - + View categoryTag:SWV - + View categoryTag:SWV - + View categoryTag:SWV - + View categoryTag:Debug - + View categoryTag:FreeRTOS - + View categoryTag:FreeRTOS - + View categoryTag:FreeRTOS - + View categoryTag:FreeRTOS - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:C/C++ - + View categoryTag:ThreadX - + View categoryTag:ThreadX - + View categoryTag:ThreadX - + View categoryTag:ThreadX - + View categoryTag:ThreadX - + View categoryTag:ThreadX - + View categoryTag:ThreadX - + View categoryTag:ThreadX - + View categoryTag:C/C++ - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Make - + View categoryTag:C/C++ - + View categoryTag:C/C++ - + View categoryTag:C/C++ - + View categoryTag:C/C++ - + View categoryTag:C/C++ - + View categoryTag:General - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Help - + View categoryTag:Connections - + View categoryTag:General - + View categoryTag:General - + View categoryTag:Version Control (Team) - + View categoryTag:Version Control (Team) - + View categoryTag:General - + View categoryTag:General - + View categoryTag:Help - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - - + + glue move_after:PerspectiveSpacer SHOW_RESTORE_MENU - + move_after:Spacer Glue HIDEABLE SHOW_RESTORE_MENU - + glue move_after:SearchField SHOW_RESTORE_MENU - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - - + + - - - - - + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/STM32Cube/leo_muziekdoos/Core/Inc/main.h b/STM32Cube/leo_muziekdoos/Core/Inc/main.h index 78c5393..594a245 100644 --- a/STM32Cube/leo_muziekdoos/Core/Inc/main.h +++ b/STM32Cube/leo_muziekdoos/Core/Inc/main.h @@ -58,6 +58,8 @@ void Error_Handler(void); /* USER CODE END EFP */ /* Private defines -----------------------------------------------------------*/ +#define HALL_IN_Pin GPIO_PIN_0 +#define HALL_IN_GPIO_Port GPIOA #define DAC_DATA_Pin GPIO_PIN_1 #define DAC_DATA_GPIO_Port GPIOA #define MEAS_VBATT_Pin GPIO_PIN_2 diff --git a/STM32Cube/leo_muziekdoos/Core/Inc/stm32f4xx_it.h b/STM32Cube/leo_muziekdoos/Core/Inc/stm32f4xx_it.h index 36f37a6..816ae9f 100644 --- a/STM32Cube/leo_muziekdoos/Core/Inc/stm32f4xx_it.h +++ b/STM32Cube/leo_muziekdoos/Core/Inc/stm32f4xx_it.h @@ -56,6 +56,8 @@ void SVC_Handler(void); void DebugMon_Handler(void); void PendSV_Handler(void); void SysTick_Handler(void); +void DMA2_Stream1_IRQHandler(void); +void DMA2_Stream3_IRQHandler(void); /* USER CODE BEGIN EFP */ /* USER CODE END EFP */ diff --git a/STM32Cube/leo_muziekdoos/Core/Src/main.c b/STM32Cube/leo_muziekdoos/Core/Src/main.c index 6523ab7..68651cd 100644 --- a/STM32Cube/leo_muziekdoos/Core/Src/main.c +++ b/STM32Cube/leo_muziekdoos/Core/Src/main.c @@ -44,8 +44,10 @@ ADC_HandleTypeDef hadc1; I2S_HandleTypeDef hi2s4; +DMA_HandleTypeDef hdma_spi4_tx; SD_HandleTypeDef hsd; +DMA_HandleTypeDef hdma_sdio; SPI_HandleTypeDef hspi1; @@ -65,6 +67,7 @@ static void MX_USART1_UART_Init(void); static void MX_I2S4_Init(void); static void MX_SPI1_Init(void); static void MX_USB_OTG_FS_HCD_Init(void); +static void MX_DMA_Init(void); static void MX_ADC1_Init(void); /* USER CODE BEGIN PFP */ @@ -109,6 +112,7 @@ int main(void) MX_I2S4_Init(); MX_SPI1_Init(); MX_USB_OTG_FS_HCD_Init(); + MX_DMA_Init(); MX_ADC1_Init(); /* USER CODE BEGIN 2 */ @@ -384,6 +388,25 @@ static void MX_USB_OTG_FS_HCD_Init(void) } +/** + * Enable DMA controller clock + */ +static void MX_DMA_Init(void) +{ + + /* DMA controller clock enable */ + __HAL_RCC_DMA2_CLK_ENABLE(); + + /* DMA interrupt init */ + /* DMA2_Stream1_IRQn interrupt configuration */ + HAL_NVIC_SetPriority(DMA2_Stream1_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(DMA2_Stream1_IRQn); + /* DMA2_Stream3_IRQn interrupt configuration */ + HAL_NVIC_SetPriority(DMA2_Stream3_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(DMA2_Stream3_IRQn); + +} + /** * @brief GPIO Initialization Function * @param None diff --git a/STM32Cube/leo_muziekdoos/Core/Src/stm32f4xx_hal_msp.c b/STM32Cube/leo_muziekdoos/Core/Src/stm32f4xx_hal_msp.c index 8c6fa3d..e2d4356 100644 --- a/STM32Cube/leo_muziekdoos/Core/Src/stm32f4xx_hal_msp.c +++ b/STM32Cube/leo_muziekdoos/Core/Src/stm32f4xx_hal_msp.c @@ -24,6 +24,9 @@ /* USER CODE BEGIN Includes */ /* USER CODE END Includes */ +extern DMA_HandleTypeDef hdma_spi4_tx; + +extern DMA_HandleTypeDef hdma_sdio; /* Private typedef -----------------------------------------------------------*/ /* USER CODE BEGIN TD */ @@ -96,10 +99,10 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef* hadc) __HAL_RCC_GPIOA_CLK_ENABLE(); /**ADC1 GPIO Configuration + PA0-WKUP ------> ADC1_IN0 PA2 ------> ADC1_IN2 - PA3 ------> ADC1_IN3 */ - GPIO_InitStruct.Pin = MEAS_VBATT_Pin|GPIO_PIN_3; + GPIO_InitStruct.Pin = HALL_IN_Pin|MEAS_VBATT_Pin; GPIO_InitStruct.Mode = GPIO_MODE_ANALOG; GPIO_InitStruct.Pull = GPIO_NOPULL; HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); @@ -128,10 +131,10 @@ void HAL_ADC_MspDeInit(ADC_HandleTypeDef* hadc) __HAL_RCC_ADC1_CLK_DISABLE(); /**ADC1 GPIO Configuration + PA0-WKUP ------> ADC1_IN0 PA2 ------> ADC1_IN2 - PA3 ------> ADC1_IN3 */ - HAL_GPIO_DeInit(GPIOA, MEAS_VBATT_Pin|GPIO_PIN_3); + HAL_GPIO_DeInit(GPIOA, HALL_IN_Pin|MEAS_VBATT_Pin); /* USER CODE BEGIN ADC1_MspDeInit 1 */ @@ -190,6 +193,25 @@ void HAL_I2S_MspInit(I2S_HandleTypeDef* hi2s) GPIO_InitStruct.Alternate = GPIO_AF6_SPI4; HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); + /* I2S4 DMA Init */ + /* SPI4_TX Init */ + hdma_spi4_tx.Instance = DMA2_Stream1; + hdma_spi4_tx.Init.Channel = DMA_CHANNEL_4; + hdma_spi4_tx.Init.Direction = DMA_MEMORY_TO_PERIPH; + hdma_spi4_tx.Init.PeriphInc = DMA_PINC_DISABLE; + hdma_spi4_tx.Init.MemInc = DMA_MINC_ENABLE; + hdma_spi4_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE; + hdma_spi4_tx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE; + hdma_spi4_tx.Init.Mode = DMA_CIRCULAR; + hdma_spi4_tx.Init.Priority = DMA_PRIORITY_LOW; + hdma_spi4_tx.Init.FIFOMode = DMA_FIFOMODE_DISABLE; + if (HAL_DMA_Init(&hdma_spi4_tx) != HAL_OK) + { + Error_Handler(); + } + + __HAL_LINKDMA(hi2s,hdmatx,hdma_spi4_tx); + /* USER CODE BEGIN SPI4_MspInit 1 */ /* USER CODE END SPI4_MspInit 1 */ @@ -222,6 +244,8 @@ void HAL_I2S_MspDeInit(I2S_HandleTypeDef* hi2s) HAL_GPIO_DeInit(GPIOB, DAC_LRCLK_Pin|DAC_CLK_Pin); + /* I2S4 DMA DeInit */ + HAL_DMA_DeInit(hi2s->hdmatx); /* USER CODE BEGIN SPI4_MspDeInit 1 */ /* USER CODE END SPI4_MspDeInit 1 */ @@ -270,6 +294,33 @@ void HAL_SD_MspInit(SD_HandleTypeDef* hsd) GPIO_InitStruct.Alternate = GPIO_AF12_SDIO; HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); + /* SDIO DMA Init */ + /* SDIO Init */ + hdma_sdio.Instance = DMA2_Stream3; + hdma_sdio.Init.Channel = DMA_CHANNEL_4; + hdma_sdio.Init.Direction = DMA_PERIPH_TO_MEMORY; + hdma_sdio.Init.PeriphInc = DMA_PINC_DISABLE; + hdma_sdio.Init.MemInc = DMA_MINC_ENABLE; + hdma_sdio.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD; + hdma_sdio.Init.MemDataAlignment = DMA_MDATAALIGN_WORD; + hdma_sdio.Init.Mode = DMA_PFCTRL; + hdma_sdio.Init.Priority = DMA_PRIORITY_LOW; + hdma_sdio.Init.FIFOMode = DMA_FIFOMODE_ENABLE; + hdma_sdio.Init.FIFOThreshold = DMA_FIFO_THRESHOLD_FULL; + hdma_sdio.Init.MemBurst = DMA_MBURST_INC4; + hdma_sdio.Init.PeriphBurst = DMA_PBURST_INC4; + if (HAL_DMA_Init(&hdma_sdio) != HAL_OK) + { + Error_Handler(); + } + + /* Several peripheral DMA handle pointers point to the same DMA handle. + Be aware that there is only one stream to perform all the requested DMAs. */ + /* Be sure to change transfer direction before calling + HAL_SD_ReadBlocks_DMA or HAL_SD_WriteBlocks_DMA. */ + __HAL_LINKDMA(hsd,hdmarx,hdma_sdio); + __HAL_LINKDMA(hsd,hdmatx,hdma_sdio); + /* USER CODE BEGIN SDIO_MspInit 1 */ /* USER CODE END SDIO_MspInit 1 */ @@ -305,6 +356,9 @@ void HAL_SD_MspDeInit(SD_HandleTypeDef* hsd) HAL_GPIO_DeInit(GPIOB, GPIO_PIN_15|GPIO_PIN_5|GPIO_PIN_7); + /* SDIO DMA DeInit */ + HAL_DMA_DeInit(hsd->hdmarx); + HAL_DMA_DeInit(hsd->hdmatx); /* USER CODE BEGIN SDIO_MspDeInit 1 */ /* USER CODE END SDIO_MspDeInit 1 */ @@ -409,25 +463,17 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) __HAL_RCC_USART1_CLK_ENABLE(); __HAL_RCC_GPIOA_CLK_ENABLE(); - __HAL_RCC_GPIOB_CLK_ENABLE(); /**USART1 GPIO Configuration PA10 ------> USART1_RX - PB6 ------> USART1_TX + PA15 ------> USART1_TX */ - GPIO_InitStruct.Pin = GPIO_PIN_10; + GPIO_InitStruct.Pin = GPIO_PIN_10|GPIO_PIN_15; GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH; GPIO_InitStruct.Alternate = GPIO_AF7_USART1; HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); - GPIO_InitStruct.Pin = GPIO_PIN_6; - GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; - GPIO_InitStruct.Pull = GPIO_NOPULL; - GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH; - GPIO_InitStruct.Alternate = GPIO_AF7_USART1; - HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); - /* USER CODE BEGIN USART1_MspInit 1 */ /* USER CODE END USART1_MspInit 1 */ @@ -453,11 +499,9 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) /**USART1 GPIO Configuration PA10 ------> USART1_RX - PB6 ------> USART1_TX + PA15 ------> USART1_TX */ - HAL_GPIO_DeInit(GPIOA, GPIO_PIN_10); - - HAL_GPIO_DeInit(GPIOB, GPIO_PIN_6); + HAL_GPIO_DeInit(GPIOA, GPIO_PIN_10|GPIO_PIN_15); /* USER CODE BEGIN USART1_MspDeInit 1 */ diff --git a/STM32Cube/leo_muziekdoos/Core/Src/stm32f4xx_it.c b/STM32Cube/leo_muziekdoos/Core/Src/stm32f4xx_it.c index c653d01..a132f7f 100644 --- a/STM32Cube/leo_muziekdoos/Core/Src/stm32f4xx_it.c +++ b/STM32Cube/leo_muziekdoos/Core/Src/stm32f4xx_it.c @@ -56,7 +56,8 @@ /* USER CODE END 0 */ /* External variables --------------------------------------------------------*/ - +extern DMA_HandleTypeDef hdma_spi4_tx; +extern DMA_HandleTypeDef hdma_sdio; /* USER CODE BEGIN EV */ /* USER CODE END EV */ @@ -199,6 +200,34 @@ void SysTick_Handler(void) /* please refer to the startup file (startup_stm32f4xx.s). */ /******************************************************************************/ +/** + * @brief This function handles DMA2 stream1 global interrupt. + */ +void DMA2_Stream1_IRQHandler(void) +{ + /* USER CODE BEGIN DMA2_Stream1_IRQn 0 */ + + /* USER CODE END DMA2_Stream1_IRQn 0 */ + HAL_DMA_IRQHandler(&hdma_spi4_tx); + /* USER CODE BEGIN DMA2_Stream1_IRQn 1 */ + + /* USER CODE END DMA2_Stream1_IRQn 1 */ +} + +/** + * @brief This function handles DMA2 stream3 global interrupt. + */ +void DMA2_Stream3_IRQHandler(void) +{ + /* USER CODE BEGIN DMA2_Stream3_IRQn 0 */ + + /* USER CODE END DMA2_Stream3_IRQn 0 */ + HAL_DMA_IRQHandler(&hdma_sdio); + /* USER CODE BEGIN DMA2_Stream3_IRQn 1 */ + + /* USER CODE END DMA2_Stream3_IRQn 1 */ +} + /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ diff --git a/STM32Cube/leo_muziekdoos/leo_muziekdoos.ioc b/STM32Cube/leo_muziekdoos/leo_muziekdoos.ioc index a521b0f..0bace9a 100644 --- a/STM32Cube/leo_muziekdoos/leo_muziekdoos.ioc +++ b/STM32Cube/leo_muziekdoos/leo_muziekdoos.ioc @@ -5,6 +5,32 @@ ADC1.NbrOfConversionFlag=1 ADC1.Rank-0\#ChannelRegularConversion=1 ADC1.SamplingTime-0\#ChannelRegularConversion=ADC_SAMPLETIME_3CYCLES ADC1.master=1 +Dma.Request0=SDIO +Dma.Request1=SPI4_TX +Dma.RequestsNb=2 +Dma.SDIO.0.Direction=DMA_PERIPH_TO_MEMORY +Dma.SDIO.0.FIFOMode=DMA_FIFOMODE_ENABLE +Dma.SDIO.0.FIFOThreshold=DMA_FIFO_THRESHOLD_FULL +Dma.SDIO.0.Instance=DMA2_Stream3 +Dma.SDIO.0.MemBurst=DMA_MBURST_INC4 +Dma.SDIO.0.MemDataAlignment=DMA_MDATAALIGN_WORD +Dma.SDIO.0.MemInc=DMA_MINC_ENABLE +Dma.SDIO.0.Mode=DMA_PFCTRL +Dma.SDIO.0.PeriphBurst=DMA_PBURST_INC4 +Dma.SDIO.0.PeriphDataAlignment=DMA_PDATAALIGN_WORD +Dma.SDIO.0.PeriphInc=DMA_PINC_DISABLE +Dma.SDIO.0.Priority=DMA_PRIORITY_LOW +Dma.SDIO.0.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority,FIFOMode,FIFOThreshold,MemBurst,PeriphBurst +Dma.SPI4_TX.1.Direction=DMA_MEMORY_TO_PERIPH +Dma.SPI4_TX.1.FIFOMode=DMA_FIFOMODE_DISABLE +Dma.SPI4_TX.1.Instance=DMA2_Stream1 +Dma.SPI4_TX.1.MemDataAlignment=DMA_MDATAALIGN_BYTE +Dma.SPI4_TX.1.MemInc=DMA_MINC_ENABLE +Dma.SPI4_TX.1.Mode=DMA_CIRCULAR +Dma.SPI4_TX.1.PeriphDataAlignment=DMA_PDATAALIGN_BYTE +Dma.SPI4_TX.1.PeriphInc=DMA_PINC_DISABLE +Dma.SPI4_TX.1.Priority=DMA_PRIORITY_LOW +Dma.SPI4_TX.1.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority,FIFOMode FATFS.BSP.number=1 FATFS.IPParameters=USE_DMA_CODE_SD FATFS.USE_DMA_CODE_SD=1 @@ -32,16 +58,17 @@ I2S4.VirtualMode=I2S_MODE_SLAVE KeepUserPlacement=false Mcu.Family=STM32F4 Mcu.IP0=ADC1 -Mcu.IP1=FATFS -Mcu.IP2=I2S4 -Mcu.IP3=NVIC -Mcu.IP4=RCC -Mcu.IP5=SDIO -Mcu.IP6=SPI1 -Mcu.IP7=SYS -Mcu.IP8=USART1 -Mcu.IP9=USB_OTG_FS -Mcu.IPNb=10 +Mcu.IP1=DMA +Mcu.IP10=USB_OTG_FS +Mcu.IP2=FATFS +Mcu.IP3=I2S4 +Mcu.IP4=NVIC +Mcu.IP5=RCC +Mcu.IP6=SDIO +Mcu.IP7=SPI1 +Mcu.IP8=SYS +Mcu.IP9=USART1 +Mcu.IPNb=11 Mcu.Name=STM32F411C(C-E)Ux Mcu.Package=UFQFPN48 Mcu.Pin0=PH0 - OSC_IN @@ -56,18 +83,18 @@ Mcu.Pin16=PA10 Mcu.Pin17=PA11 Mcu.Pin18=PA12 Mcu.Pin19=PA13 -Mcu.Pin2=PA1 +Mcu.Pin2=PA0-WKUP Mcu.Pin20=PA14 -Mcu.Pin21=PB3 -Mcu.Pin22=PB4 -Mcu.Pin23=PB5 -Mcu.Pin24=PB6 +Mcu.Pin21=PA15 +Mcu.Pin22=PB3 +Mcu.Pin23=PB4 +Mcu.Pin24=PB5 Mcu.Pin25=PB7 Mcu.Pin26=PB9 Mcu.Pin27=VP_FATFS_VS_SDIO Mcu.Pin28=VP_SYS_VS_Systick -Mcu.Pin3=PA2 -Mcu.Pin4=PA3 +Mcu.Pin3=PA1 +Mcu.Pin4=PA2 Mcu.Pin5=PA4 Mcu.Pin6=PA5 Mcu.Pin7=PA6 @@ -80,6 +107,8 @@ Mcu.UserName=STM32F411CEUx MxCube.Version=6.3.0 MxDb.Version=DB.6.0.30 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +NVIC.DMA2_Stream1_IRQn=true\:0\:0\:false\:false\:true\:false\:true +NVIC.DMA2_Stream3_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.ForceEnableDMAVector=true NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false @@ -90,6 +119,9 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.SysTick_IRQn=true\:15\:0\:false\:false\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false +PA0-WKUP.GPIOParameters=GPIO_Label +PA0-WKUP.GPIO_Label=HALL_IN +PA0-WKUP.Signal=ADCx_IN0 PA1.GPIOParameters=GPIO_Label PA1.GPIO_Label=DAC_DATA PA1.Mode=Half_Duplex_Slave @@ -112,10 +144,11 @@ PA14.GPIOParameters=GPIO_Label PA14.GPIO_Label=SWCLK PA14.Mode=Serial_Wire PA14.Signal=SYS_JTCK-SWCLK +PA15.Mode=Asynchronous +PA15.Signal=USART1_TX PA2.GPIOParameters=GPIO_Label PA2.GPIO_Label=MEAS_VBATT PA2.Signal=ADCx_IN2 -PA3.Signal=ADCx_IN3 PA4.Mode=NSS_Signal_Hard_Output PA4.Signal=SPI1_NSS PA5.Mode=Full_Duplex_Master @@ -154,8 +187,6 @@ PB4.Mode=Full_Duplex_Master PB4.Signal=SPI1_MISO PB5.Mode=SD_4_bits_Wide_bus PB5.Signal=SDIO_D3 -PB6.Mode=Asynchronous -PB6.Signal=USART1_TX PB7.Mode=SD_4_bits_Wide_bus PB7.Signal=SDIO_D0 PB9.GPIOParameters=GPIO_Label @@ -181,7 +212,7 @@ ProjectManager.FreePins=false ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x200 ProjectManager.KeepUserCode=true -ProjectManager.LastFirmware=true +ProjectManager.LastFirmware=false ProjectManager.LibraryCopy=1 ProjectManager.MainLocation=Core/Src ProjectManager.NoMain=false @@ -194,7 +225,7 @@ ProjectManager.StackSize=0x400 ProjectManager.TargetToolchain=STM32CubeIDE ProjectManager.ToolChainLocation= ProjectManager.UnderRoot=true -ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_SDIO_SD_Init-SDIO-false-HAL-true,4-MX_USART1_UART_Init-USART1-false-HAL-true,5-MX_FATFS_Init-FATFS-false-HAL-false,6-MX_I2S4_Init-I2S4-false-HAL-true,7-MX_SPI1_Init-SPI1-false-HAL-true,8-MX_USB_OTG_FS_HCD_Init-USB_OTG_FS-false-HAL-true,9-MX_ADC1_Init-ADC1-false-HAL-true +ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_SDIO_SD_Init-SDIO-false-HAL-true,4-MX_USART1_UART_Init-USART1-false-HAL-true,5-MX_FATFS_Init-FATFS-false-HAL-false,6-MX_I2S4_Init-I2S4-false-HAL-true,7-MX_SPI1_Init-SPI1-false-HAL-true,8-MX_USB_OTG_FS_HCD_Init-USB_OTG_FS-false-HAL-true,9-MX_DMA_Init-DMA-false-HAL-true,10-MX_ADC1_Init-ADC1-false-HAL-true RCC.48MHZClocksFreq_Value=48000000 RCC.AHBFreq_Value=16000000 RCC.APB1Freq_Value=16000000 @@ -225,10 +256,10 @@ RCC.VCOInputFreq_Value=2000000 RCC.VCOInputMFreq_Value=1500000 RCC.VCOOutputFreq_Value=144000000 RCC.VcooutputI2S=144000000 +SH.ADCx_IN0.0=ADC1_IN0,IN0 +SH.ADCx_IN0.ConfNb=1 SH.ADCx_IN2.0=ADC1_IN2,IN2 SH.ADCx_IN2.ConfNb=1 -SH.ADCx_IN3.0=ADC1_IN3,IN3 -SH.ADCx_IN3.ConfNb=1 SPI1.CalculateBaudRate=8.0 MBits/s SPI1.Direction=SPI_DIRECTION_2LINES SPI1.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate,VirtualNSS