更新systick配置，更新USB HS说明

Staok · Dec 14, 2020 · 46dc1b6 · 46dc1b6
1 parent 3784a1c
commit 46dc1b6
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 36 deletions.
diff --git 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
@@ -387,19 +387,34 @@ APIʹ
 			����׼��汾�Ŀ��ȫ����"UM1021 STM32F105/7xx, STM32F2xx and STM32F4xx USB On-The-Go host and device library"��
 		STM32F4xx/STM32F2xx�� USB IP �˾�Ϊ OTG��VBUS���Կ��ƣ����Լ�⣩��STM32F103��USB����OTG����ֻ��USB Device��
 		STM32F4xx/STM32F2xx�� USB HOST �� USB Device ��ΪFS��HS��ǰ�����12Mbps���Դ�PHY��ȫ�����ţ�DM DP ID������ʡ�� SOF��������Ƶ������
-													   ������Ҫͨ��ULPI�ӿ������ⲿUSB PHYоƬ��ȫ�����ţ�8������+4�������ߣ���
-		STM32F4x9��HS��Ƕ��PHY������HS����ѡ��ʹ����Ƕ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_PHY�����PHY��FS�ģ���֪���᲻��Ӱ���ٶȣ�
+			������Ҫͨ��ULPI�ӿ������ⲿUSB PHYоƬ��ȫ�����ţ�8�����ݣ�D0~D7��+4�������ߣ�CLK��NXT��DIR��������
+		STM32F4x9��HS����ʹ��FS��PHY��USE_EMBEDDED_PHY: if the USB OTG HS Core is to be used in Full speed mode����������STM32F4xxһ��
 
 		USB��Ĵ����ص������У������豸����ʱ����ϢĬ�϶��Ӵ���1��ӡ����ͨ�� FaultASSERT() ���� printf_uart() �������д�ӡ
 
 		USB Device �� HOST ѡ��
 			�� 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�������ٷ����̣��Ķ��Ĳ��ࣺ
+			���ڲ�֧����ǶUSB PHY��F4x7ϵ�У�
+				���Ӻ꣺USE_USB_OTG_HS ,USE_ULPI_PHY
+				usb_bsp.c �ļ��ڸĶ�����ʼ��ULPI�ӿڣ�û��DM DP�ȵ��£�����ʼ��AHB1��HS��HS_ULPI������ʱ�ӣ�
+					��ʼ����ʹ�� OTG_HS_IRQn��OTG_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 PHY��F4x9ϵ�У�
+				ͨ��ULPI�ӿ�ʹ���ⲿPHYоƬ��
+					���Ӻ꣺USE_USB_OTG_HS ,USE_ULPI_PHY
+					������ʱ�ٿ�...
+				ʹ����ǶPHY����ʹ��FS��PHY�������ٶ������FS��12Mbps��
+					���Ӻ꣺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 �ĳ�ʼ��*/