From 46dc1b6e738ca129d533b1b54dd8c14f2ad5c1d5 Mon Sep 17 00:00:00 2001 From: staok Date: Mon, 14 Dec 2020 11:44:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0systick=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=96=B0USB=20HS=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CONFIG/PeriphConfigCore.c | 25 +++++---- .../Docs/docs.bin | 27 +++++++-- ...2F4DSP_HAL_freeRTOS_Framework.uvguix.staok | 56 ++++++++++++------- 3 files changed, 72 insertions(+), 36 deletions(-) diff --git a/STM32F4DSP_HAL_freeRTOS_Framework/CONFIG/PeriphConfigCore.c b/STM32F4DSP_HAL_freeRTOS_Framework/CONFIG/PeriphConfigCore.c index c3921d6..f2d4fc1 100644 --- a/STM32F4DSP_HAL_freeRTOS_Framework/CONFIG/PeriphConfigCore.c +++ b/STM32F4DSP_HAL_freeRTOS_Framework/CONFIG/PeriphConfigCore.c @@ -428,17 +428,20 @@ u8 Stm32_Clock_Init(void) // #endif /*systick 统一设置成1ms中断*/ - u32 reload; - HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);//SysTick频率为HCLK - reload = SystemCoreClock/1000000; //每秒钟的计数次数 单位为M - reload *= (1000000/1000); //设定溢出时间,1KHz - - SysTick->CTRL|=SysTick_CTRL_TICKINT_Msk; //开启SYSTICK中断 - SysTick->LOAD=reload; //每1/1000秒中断一次 - SysTick->CTRL|=SysTick_CTRL_ENABLE_Msk; //开启SYSTICK - - HAL_NVIC_SetPriority(SysTick_IRQn, 1, 0); - HAL_NVIC_EnableIRQ(SysTick_IRQn); +// u32 reload; +// HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);//SysTick频率为HCLK +// reload = SystemCoreClock/1000000; //每秒钟的计数次数 单位为M +// reload *= (1000000/1000); //设定溢出时间,1KHz +// +// SysTick->CTRL|=SysTick_CTRL_TICKINT_Msk; //开启SYSTICK中断 +// SysTick->LOAD = (uint32_t)(reload - 1UL); //每1/1000秒中断一次 +// SysTick->CTRL|=SysTick_CTRL_ENABLE_Msk; //开启SYSTICK +// +// HAL_NVIC_SetPriority(SysTick_IRQn, 1, 0); +// HAL_NVIC_EnableIRQ(SysTick_IRQn); + + /*systick 统一设置成1ms中断,一句话配置*/ + HAL_SYSTICK_Config(SystemCoreClock / 1000); return HAL_OK; } diff --git a/STM32F4DSP_HAL_freeRTOS_Framework/Docs/docs.bin b/STM32F4DSP_HAL_freeRTOS_Framework/Docs/docs.bin index 82c0055..d5ee819 100644 --- a/STM32F4DSP_HAL_freeRTOS_Framework/Docs/docs.bin +++ b/STM32F4DSP_HAL_freeRTOS_Framework/Docs/docs.bin @@ -387,12 +387,8 @@ APIʹ ׼汾Ŀȫ"UM1021 STM32F105/7xx, STM32F2xx and STM32F4xx USB On-The-Go host and device library" STM32F4xx/STM32F2xx USB IP ˾Ϊ OTGVBUSԿƣԼ⣩STM32F103USBOTGֻUSB Device STM32F4xx/STM32F2xx USB HOST USB Device ΪFSHSǰ12MbpsԴPHYȫţDM DP IDʡ SOFƵ - ҪͨULPIӿⲿUSB PHYоƬȫţ8+4ߣ - STM32F4x9HSǶPHYHSѡʹǶPHY,STM32F4xxһ - - ģĬʹFSҪHSҲѣʼULPIӿںʱӣUSE_USB_OTG_HS滻USE_USB_OTG_FS궨ȣοٷ - HSʹⲿPHYĺ궨壺USE_USB_OTG_HS ,USE_EMBEDDED_PHY - HSʹڲPHYĺ궨壺USE_USB_OTG_HS,USE_ULPI_PHYPHYFSģ֪᲻Ӱٶȣ + ҪͨULPIӿⲿUSB PHYоƬȫţ8ݣD0~D7+4ߣCLKNXTDIR + STM32F4x9HSʹFSPHYUSE_EMBEDDED_PHY: if the USB OTG HS Core is to be used in Full speed modeSTM32F4xxһ USBĴصУ豸ʱϢĬ϶Ӵ1ӡͨ FaultASSERT() printf_uart() дӡ @@ -400,6 +396,25 @@ APIʹ Select Target ѡ USB Device USB HOST USB Class ѡ usbd_usr.c usbh_usr.c е sys_USBD_use_for_ sys_USBH_use_for_ ѡ + + ҪUSB HS裨480Mbpsٷ̣ĶIJࣺ + ڲ֧ǶUSB PHYF4x7ϵУ + Ӻ꣺USE_USB_OTG_HS ,USE_ULPI_PHY + usb_bsp.c ļڸĶʼULPIӿڣûDM DPȵ£ʼAHB1HSHS_ULPIʱӣ + ʼʹ OTG_HS_IRQnOTG_HS_EP1_OUT_IRQn OTG_HS_EP1_IN_IRQnж + usb_desc.c ļûиĶ + usb_usr.c ļûиĶ + stm32xxx_it.c ļڸĶ OTG_HS_IRQHandler() OTG_HS_EP1_IN_IRQHandler() OTG_HS_EP1_OUT_IRQHandler() жϺ + usb_conf.h ļöԱȹٷĵһǷһ + ֧ǶUSB PHYF4x9ϵУ + ͨULPIӿʹⲿPHYоƬ + Ӻ꣺USE_USB_OTG_HS ,USE_ULPI_PHY + ʱٿ... + ʹǶPHYʹFSPHYٶFS12Mbps + Ӻ꣺USE_USB_OTG_HS ,USE_EMBEDDED_PHY + USE_EMBEDDED_PHY: if the USB OTG HS Core is to be used in Full speed mode + ʱٿ... + ʼ̣Ѿӵʼˣ /*STM32 USB ijʼ*/ diff --git a/STM32F4DSP_HAL_freeRTOS_Framework/USER/STM32F4DSP_HAL_freeRTOS_Framework.uvguix.staok b/STM32F4DSP_HAL_freeRTOS_Framework/USER/STM32F4DSP_HAL_freeRTOS_Framework.uvguix.staok index 598cc4f..13babf6 100644 --- a/STM32F4DSP_HAL_freeRTOS_Framework/USER/STM32F4DSP_HAL_freeRTOS_Framework.uvguix.staok +++ b/STM32F4DSP_HAL_freeRTOS_Framework/USER/STM32F4DSP_HAL_freeRTOS_Framework.uvguix.staok @@ -89,8 +89,8 @@ 2 3 - -32000 - -32000 + -1 + -1 -1 @@ -106,8 +106,8 @@ 0 - 1579 - 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000A00000000000000010000006C453A5CB5E7D7D326B1E0B3CC20D1A7CFB05C333246312048414C2052544F53BBF2C2E3BBFA20C4A3B0E55C53544D333246344453505F48414C5F6672656552544F535F4672616D65776F726B20646F696E675C434F4E4649475C506572697068436F6E666967436F72652E680000000012506572697068436F6E666967436F72652E6800000000C5D4F200FFFFFFFF6C453A5CB5E7D7D326B1E0B3CC20D1A7CFB05C333246312048414C2052544F53BBF2C2E3BBFA20C4A3B0E55C53544D333246344453505F48414C5F6672656552544F535F4672616D65776F726B20646F696E675C434F4E4649475C506572697068436F6E666967436F72652E630000000012506572697068436F6E666967436F72652E6300000000FFDC7800FFFFFFFF6D453A5CB5E7D7D326B1E0B3CC20D1A7CFB05C333246312048414C2052544F53BBF2C2E3BBFA20C4A3B0E55C53544D333246344453505F48414C5F6672656552544F535F4672616D65776F726B20646F696E675C555345525C555345525C4672656552544F53436F6E6669672E6800000000104672656552544F53436F6E6669672E6800000000BECEA100FFFFFFFF74453A5CB5E7D7D326B1E0B3CC20D1A7CFB05C333246312048414C2052544F53BBF2C2E3BBFA20C4A3B0E55C53544D333246344453505F48414C5F6672656552544F535F4672616D65776F726B20646F696E675C555345525C555345525C42617265436F6E6669675C42617265436F6E6669672E63000000000C42617265436F6E6669672E6300000000F0A0A100FFFFFFFF76453A5CB5E7D7D326B1E0B3CC20D1A7CFB05C333246312048414C2052544F53BBF2C2E3BBFA20C4A3B0E55C53544D333246344453505F48414C5F6672656552544F535F4672616D65776F726B20646F696E675C5468697264506172745C4C5749505C6C7769705F757365725C6C7769706F7074732E68000000000A6C7769706F7074732E6800000000BCA8E100FFFFFFFF60453A5CB5E7D7D326B1E0B3CC20D1A7CFB05C333246312048414C2052544F53BBF2C2E3BBFA20C4A3B0E55C53544D333246344453505F48414C5F6672656552544F535F4672616D65776F726B20646F696E675C446F63735C646F63732E62696E0000000008646F63732E62696E000000009CC1B600FFFFFFFF6A453A5CB5E7D7D326B1E0B3CC20D1A7CFB05C333246312048414C2052544F53BBF2C2E3BBFA20C4A3B0E55C53544D333246344453505F48414C5F6672656552544F535F4672616D65776F726B20646F696E675C4D6964646C65735C6D616C6C6F635C6D616C6C6F632E6800000000086D616C6C6F632E6800000000F7B88600FFFFFFFF68453A5CB5E7D7D326B1E0B3CC20D1A7CFB05C333246312048414C2052544F53BBF2C2E3BBFA20C4A3B0E55C53544D333246344453505F48414C5F6672656552544F535F4672616D65776F726B20646F696E675C434F4E4649475C506572697068436F6E6669672E63000000000E506572697068436F6E6669672E6300000000D9ADC200FFFFFFFF6E453A5CB5E7D7D326B1E0B3CC20D1A7CFB05C333246312048414C2052544F53BBF2C2E3BBFA20C4A3B0E55C53544D333246344453505F48414C5F6672656552544F535F4672616D65776F726B20646F696E675C48414C5C496E635C73746D3332663478785F68616C5F63616E2E68000000001373746D3332663478785F68616C5F63616E2E6800000000A5C2D700FFFFFFFF6E453A5CB5E7D7D326B1E0B3CC20D1A7CFB05C333246312048414C2052544F53BBF2C2E3BBFA20C4A3B0E55C53544D333246344453505F48414C5F6672656552544F535F4672616D65776F726B20646F696E675C48414C5C5372635C73746D3332663478785F68616C5F63616E2E63000000001373746D3332663478785F68616C5F63616E2E6300000000B3A6BE00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000002601000066000000800700004A030000 + 1858 + 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000C0000000B000000010000006C453A5CB5E7D7D326B1E0B3CC20D1A7CFB05C333246312048414C2052544F53BBF2C2E3BBFA20C4A3B0E55C53544D333246344453505F48414C5F6672656552544F535F4672616D65776F726B20646F696E675C434F4E4649475C506572697068436F6E666967436F72652E680000000012506572697068436F6E666967436F72652E6800000000C5D4F200FFFFFFFF6C453A5CB5E7D7D326B1E0B3CC20D1A7CFB05C333246312048414C2052544F53BBF2C2E3BBFA20C4A3B0E55C53544D333246344453505F48414C5F6672656552544F535F4672616D65776F726B20646F696E675C434F4E4649475C506572697068436F6E666967436F72652E630000000012506572697068436F6E666967436F72652E6300000000FFDC7800FFFFFFFF6D453A5CB5E7D7D326B1E0B3CC20D1A7CFB05C333246312048414C2052544F53BBF2C2E3BBFA20C4A3B0E55C53544D333246344453505F48414C5F6672656552544F535F4672616D65776F726B20646F696E675C555345525C555345525C4672656552544F53436F6E6669672E6800000000104672656552544F53436F6E6669672E6800000000BECEA100FFFFFFFF74453A5CB5E7D7D326B1E0B3CC20D1A7CFB05C333246312048414C2052544F53BBF2C2E3BBFA20C4A3B0E55C53544D333246344453505F48414C5F6672656552544F535F4672616D65776F726B20646F696E675C555345525C555345525C42617265436F6E6669675C42617265436F6E6669672E63000000000C42617265436F6E6669672E6300000000F0A0A100FFFFFFFF76453A5CB5E7D7D326B1E0B3CC20D1A7CFB05C333246312048414C2052544F53BBF2C2E3BBFA20C4A3B0E55C53544D333246344453505F48414C5F6672656552544F535F4672616D65776F726B20646F696E675C5468697264506172745C4C5749505C6C7769705F757365725C6C7769706F7074732E68000000000A6C7769706F7074732E6800000000BCA8E100FFFFFFFF60453A5CB5E7D7D326B1E0B3CC20D1A7CFB05C333246312048414C2052544F53BBF2C2E3BBFA20C4A3B0E55C53544D333246344453505F48414C5F6672656552544F535F4672616D65776F726B20646F696E675C446F63735C646F63732E62696E0000000008646F63732E62696E000000009CC1B600FFFFFFFF6A453A5CB5E7D7D326B1E0B3CC20D1A7CFB05C333246312048414C2052544F53BBF2C2E3BBFA20C4A3B0E55C53544D333246344453505F48414C5F6672656552544F535F4672616D65776F726B20646F696E675C4D6964646C65735C6D616C6C6F635C6D616C6C6F632E6800000000086D616C6C6F632E6800000000F7B88600FFFFFFFF68453A5CB5E7D7D326B1E0B3CC20D1A7CFB05C333246312048414C2052544F53BBF2C2E3BBFA20C4A3B0E55C53544D333246344453505F48414C5F6672656552544F535F4672616D65776F726B20646F696E675C434F4E4649475C506572697068436F6E6669672E63000000000E506572697068436F6E6669672E6300000000D9ADC200FFFFFFFF6E453A5CB5E7D7D326B1E0B3CC20D1A7CFB05C333246312048414C2052544F53BBF2C2E3BBFA20C4A3B0E55C53544D333246344453505F48414C5F6672656552544F535F4672616D65776F726B20646F696E675C48414C5C496E635C73746D3332663478785F68616C5F63616E2E68000000001373746D3332663478785F68616C5F63616E2E6800000000A5C2D700FFFFFFFF6E453A5CB5E7D7D326B1E0B3CC20D1A7CFB05C333246312048414C2052544F53BBF2C2E3BBFA20C4A3B0E55C53544D333246344453505F48414C5F6672656552544F535F4672616D65776F726B20646F696E675C48414C5C5372635C73746D3332663478785F68616C5F63616E2E63000000001373746D3332663478785F68616C5F63616E2E6300000000B3A6BE00FFFFFFFF71453A5CB5E7D7D326B1E0B3CC20D1A7CFB05C333246312048414C2052544F53BBF2C2E3BBFA20C4A3B0E55C53544D333246344453505F48414C5F6672656552544F535F4672616D65776F726B20646F696E675C48414C5C5372635C73746D3332663478785F68616C5F636F727465782E63000000001673746D3332663478785F68616C5F636F727465782E6300000000F6FA7D00FFFFFFFF62453A5CB5E7D7D326B1E0B3CC20D1A7CFB05C333246312048414C2052544F53BBF2C2E3BBFA20C4A3B0E55C53544D333246344453505F48414C5F6672656552544F535F4672616D65776F726B20646F696E675C434F52455C636F72655F636D342E68000000000A636F72655F636D342E6800000000F6FA7D00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000002601000066000000800700004A030000 @@ -1801,8 +1801,8 @@ 59392 File - 2683 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE80300000000000000000000000000000000000000000000000100000001000000960000000200205000000000044E564943960000000000000014001043414E315F526563656976655F4D73670231331043414E315F73657445786365707449644648414C5F43414E5F446561637469766174654E6F74696669636174696F6E282643414E315F48616E646C65722C43414E5F49545F54585F4D41494C424F585F454D505459293B1F43414E5F72656D6F74655F7472616E736D697373696F6E5F726571756573741343414E5F6964656E7469666965725F747970650343414E001043414E5F54785F4D61696C626F786573065374617475732148414C5F43414E5F52784669666F304D736750656E64696E6743616C6C6261636B1343414E315F5258305F49525148616E646C65720D48414C5F43414E5F53746172741143414E5F46696C746572547970654465661446696C7465724649464F41737369676E6D656E741543414E5F66696C7465725F61637469766174696F6E0F43414E5F66696C7465725F4649464F1043414E5F66696C7465725F7363616C650F43414E5F66696C7465725F6D6F6465124175746F52657472616E736D697373696F6E0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000400160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65B9030000 + 2440 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000001043414E315F526563656976655F4D7367960000000000000008000E5379735469636B5F436F6E6669671043414E315F526563656976655F4D73670231331043414E315F73657445786365707449644648414C5F43414E5F446561637469766174654E6F74696669636174696F6E282643414E315F48616E646C65722C43414E5F49545F54585F4D41494C424F585F454D505459293B1F43414E5F72656D6F74655F7472616E736D697373696F6E5F726571756573741343414E5F6964656E7469666965725F747970650343414E0000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65B9030000 1423 @@ -1818,7 +1818,7 @@ Build 1005 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000005464C4153489600000000000000040005464C415348085573652055534244085573652055534248045352414D000000000000000000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000002001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000005464C4153489600000000000000040005464C415348085573652055534244085573652055534248045352414D000000000000000000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -1834,7 +1834,7 @@ Debug 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3599,23 +3599,23 @@ 0 100 - 0 + 11 ..\CONFIG\PeriphConfigCore.h - 63 + 50 150 - 163 + 164 1 357,381,388,401,441,466,470,477,486,491,499,502,531,543,555,561,569,585,609,619,648,660,678,694 0 ..\CONFIG\PeriphConfigCore.c - 4 - 98 - 110 + 47 + 368 + 444 1 - 278,322,340,452,614,701,1018,1066,1170,1220,1662,1684,1700,1743,1863,1897,1928,1940,1947,1955,1987 + 278,322,455,617,704,1021,1069,1173,1223,1665,1687,1703,1746,1866,1900,1931,1943,1950,1958,1990 0 @@ -3629,7 +3629,7 @@ .\USER\BareConfig\BareConfig.c - 34 + 40 31 32 1 @@ -3647,9 +3647,9 @@ ..\Docs\docs.bin - 43 + 16 1146 - 1159 + 1160 0 0 @@ -3666,7 +3666,7 @@ ..\CONFIG\PeriphConfig.c 0 - 242 + 238 253 1 254,597,693,790,1011,1586,1618,1653,1775,2018,2125,2227,2297,2406 @@ -3690,6 +3690,24 @@ 0 + + ..\HAL\Src\stm32f4xx_hal_cortex.c + 58 + 42 + 43 + 1 + + 0 + + + ..\CORE\core_cm4.h + 3 + 2008 + 2021 + 1 + + 0 +