Refs #1288. Corrected USB driver initialization in Nucleo-F429ZI demo bootloader.

git-svn-id: https://svn.code.sf.net/p/openblt/code/trunk@863 5dc33758-31d5-4daf-9ae8-b24bf3d40d73
This commit is contained in:
Frank Voorburg 2021-06-15 09:47:32 +00:00
parent 98741fd6a3
commit 729dcb753b
8 changed files with 1941 additions and 1945 deletions

View File

@ -87,10 +87,10 @@
</folderInfo>
<sourceEntries>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="App"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Core"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Drivers"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="Library"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Core"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="Loader"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Drivers"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="USB_DEVICE"/>
</sourceEntries>
</configuration>

View File

@ -9,18 +9,18 @@ CDefines=USE_FULL_LL_DRIVER;USE_HAL_DRIVER;STM32F429xx;USE_FULL_LL_DRIVER;USE_HA
[PreviousGenFiles]
AdvancedFolderStructure=true
HeaderFileListSize=4
HeaderFiles#0=C:/Work/software/OpenBLT_NucleoF429ZI/Target/Demo/ARMCM4_STM32F4_Nucleo_F429ZI_CubeIDE/Boot/Core/Inc/stm32f4xx_it.h
HeaderFiles#1=C:/Work/software/OpenBLT_NucleoF429ZI/Target/Demo/ARMCM4_STM32F4_Nucleo_F429ZI_CubeIDE/Boot/Core/Inc/stm32_assert.h
HeaderFiles#2=C:/Work/software/OpenBLT_NucleoF429ZI/Target/Demo/ARMCM4_STM32F4_Nucleo_F429ZI_CubeIDE/Boot/Core/Inc/stm32f4xx_hal_conf.h
HeaderFiles#3=C:/Work/software/OpenBLT_NucleoF429ZI/Target/Demo/ARMCM4_STM32F4_Nucleo_F429ZI_CubeIDE/Boot/Core/Inc/main.h
HeaderFiles#0=C:/Work/software/OpenBLT/Target/Demo/ARMCM4_STM32F4_Nucleo_F429ZI_CubeIDE/Boot/Core/Inc/stm32f4xx_it.h
HeaderFiles#1=C:/Work/software/OpenBLT/Target/Demo/ARMCM4_STM32F4_Nucleo_F429ZI_CubeIDE/Boot/Core/Inc/stm32_assert.h
HeaderFiles#2=C:/Work/software/OpenBLT/Target/Demo/ARMCM4_STM32F4_Nucleo_F429ZI_CubeIDE/Boot/Core/Inc/stm32f4xx_hal_conf.h
HeaderFiles#3=C:/Work/software/OpenBLT/Target/Demo/ARMCM4_STM32F4_Nucleo_F429ZI_CubeIDE/Boot/Core/Inc/main.h
HeaderFolderListSize=1
HeaderPath#0=C:/Work/software/OpenBLT_NucleoF429ZI/Target/Demo/ARMCM4_STM32F4_Nucleo_F429ZI_CubeIDE/Boot/Core/Inc
HeaderPath#0=C:/Work/software/OpenBLT/Target/Demo/ARMCM4_STM32F4_Nucleo_F429ZI_CubeIDE/Boot/Core/Inc
HeaderFiles=;
SourceFileListSize=3
SourceFiles#0=C:/Work/software/OpenBLT_NucleoF429ZI/Target/Demo/ARMCM4_STM32F4_Nucleo_F429ZI_CubeIDE/Boot/Core/Src/stm32f4xx_it.c
SourceFiles#1=C:/Work/software/OpenBLT_NucleoF429ZI/Target/Demo/ARMCM4_STM32F4_Nucleo_F429ZI_CubeIDE/Boot/Core/Src/stm32f4xx_hal_msp.c
SourceFiles#2=C:/Work/software/OpenBLT_NucleoF429ZI/Target/Demo/ARMCM4_STM32F4_Nucleo_F429ZI_CubeIDE/Boot/Core/Src/main.c
SourceFiles#0=C:/Work/software/OpenBLT/Target/Demo/ARMCM4_STM32F4_Nucleo_F429ZI_CubeIDE/Boot/Core/Src/stm32f4xx_it.c
SourceFiles#1=C:/Work/software/OpenBLT/Target/Demo/ARMCM4_STM32F4_Nucleo_F429ZI_CubeIDE/Boot/Core/Src/stm32f4xx_hal_msp.c
SourceFiles#2=C:/Work/software/OpenBLT/Target/Demo/ARMCM4_STM32F4_Nucleo_F429ZI_CubeIDE/Boot/Core/Src/main.c
SourceFolderListSize=1
SourcePath#0=C:/Work/software/OpenBLT_NucleoF429ZI/Target/Demo/ARMCM4_STM32F4_Nucleo_F429ZI_CubeIDE/Boot/Core/Src
SourcePath#0=C:/Work/software/OpenBLT/Target/Demo/ARMCM4_STM32F4_Nucleo_F429ZI_CubeIDE/Boot/Core/Src
SourceFiles=;

View File

@ -6,7 +6,7 @@
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-503832056116879660" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-528206389989344748" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
@ -18,7 +18,7 @@
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-503832056116879660" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-528206389989344748" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>

View File

@ -157,7 +157,7 @@ ProjectManager.StackSize=0x400
ProjectManager.TargetToolchain=STM32CubeIDE
ProjectManager.ToolChainLocation=
ProjectManager.UnderRoot=true
ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_USART3_UART_Init-USART3-false-LL-true,4-MX_ETH_Init-ETH-true-HAL-false,5-MX_CAN1_Init-CAN1-true-HAL-false,6-MX_USB_DEVICE_Init-USB_DEVICE-false-HAL-false
ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_USART3_UART_Init-USART3-false-LL-true,4-MX_ETH_Init-ETH-true-HAL-false,5-MX_CAN1_Init-CAN1-true-HAL-false,6-MX_USB_OTG_FS_PCD_Init-USB_OTG_FS-true-HAL-false
RCC.48MHZClocksFreq_Value=48000000
RCC.ADC12outputFreq_Value=72000000
RCC.ADC34outputFreq_Value=72000000

View File

@ -56,7 +56,7 @@ static void MX_GPIO_Init(void);
static void MX_USART3_UART_Init(void);
void MX_ETH_Init(void);
void MX_CAN1_Init(void);
static void MX_USB_OTG_FS_PCD_Init(void);
void MX_USB_OTG_FS_PCD_Init(void);
/* USER CODE BEGIN PFP */
/* USER CODE END PFP */
@ -95,7 +95,6 @@ int main(void)
/* Initialize all configured peripherals */
MX_GPIO_Init();
MX_USART3_UART_Init();
MX_USB_OTG_FS_PCD_Init();
/* USER CODE BEGIN 2 */
/* Initialize the bootloader application. */
AppInit();
@ -298,11 +297,13 @@ static void MX_USART3_UART_Init(void)
* @param None
* @retval None
*/
static void MX_USB_OTG_FS_PCD_Init(void)
void MX_USB_OTG_FS_PCD_Init(void)
{
/* USER CODE BEGIN USB_OTG_FS_Init 0 */
/* Note that this function is generated but not actually used. The bootloader handles
* the USB initialization.
*/
/* USER CODE END USB_OTG_FS_Init 0 */
/* USER CODE BEGIN USB_OTG_FS_Init 1 */

View File

@ -6,7 +6,7 @@
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-503832056116879660" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-528206389989344748" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
@ -18,7 +18,7 @@
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-503832056116879660" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-528206389989344748" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>