From 65062d0d5b21f838aa0043a15ce54cfab8d72c43 Mon Sep 17 00:00:00 2001 From: wujiazhi <1147861305@qq.com> Date: Tue, 11 Jun 2024 14:23:53 +0800 Subject: [PATCH] 1.Fixed communication failure between MCU and wireless module 2.Fix the wrong judgment of alkaline lithium power --- HARDWARE/DELAY/delay.h | 77 +++++++++++++------------------------- 1 files changed, 26 insertions(+), 51 deletions(-) diff --git a/HARDWARE/DELAY/delay.h b/HARDWARE/DELAY/delay.h index f2318c1..dbc92d9 100644 --- a/HARDWARE/DELAY/delay.h +++ b/HARDWARE/DELAY/delay.h @@ -1,57 +1,32 @@ -#ifndef __DELAY_H -#define __DELAY_H -#include "sys.h" -////////////////////////////////////////////////////////////////////////////////// +#ifndef _DELAY_H_ +#define _DELAY_H_ +#include "fm33a0xxev_cmu.h" -//******************************************************************************** -//V1.2��˵�� -//�������ж��е��ó�����ѭ���Ĵ��� -//��ֹ��ʱ��ȷ,����do while�ṹ! +//�δ�ʱ��ʱ��Դ���� +#define SYSTICK_CLOCK_SOURCE_SCLK 0xFFFFFF3F +#define SYSTICK_CLOCK_SOURCE_LSCLK 0xFFFFFF7F +#define SYSTICK_CLOCK_SOURCE_RFU 0xFFFFFFBF +#define SYSTICK_CLOCK_SOURCE_SYSCLK 0xFFFFFFFF -//V1.3��˵�� -//�����˶�UCOSII��ʱ��֧��. -//���ʹ��ucosII,delay_init���Զ�����SYSTICK��ֵ,ʹ֮��ucos��TICKS_PER_SEC��Ӧ. -//delay_ms��delay_usҲ���������ucos�ĸ���. -//delay_us������ucos��ʹ��,����ȷ�Ⱥܸ�,����Ҫ����û��ռ�ö���Ķ�ʱ��. -//delay_ms��ucos��,���Ե���OSTimeDly����,��δ����ucosʱ,������delay_usʵ��,�Ӷ�ȷ��ʱ -//����������ʼ������,��������ucos֮��delay_ms������ʱ�ij���,ѡ��OSTimeDlyʵ�ֻ���delay_usʵ��. +#define SYSTICK_CLOCK_SOURCE_U_SCLK 0x00000000 +#define SYSTICK_CLOCK_SOURCE_U_LSCLK 0x00000040 +#define SYSTICK_CLOCK_SOURCE_U_RFU 0x00000080 +#define SYSTICK_CLOCK_SOURCE_U_SYSCLK 0x000000C0 -//V1.4��˵�� 20110929 -//����ʹ��ucos,����ucosδ������ʱ��,delay_ms���ж�����Ӧ��bug. -//V1.5��˵�� 20120902 -//��delay_us����ucos��������ֹ����ucos���delay_us��ִ�У����ܵ��µ���ʱ���� -////////////////////////////////////////////////////////////////////////////////// -void Delay_init(void); -void delay_ms(u16 nms); -void delay_us(u32 nus); +#define SYSCLOCK_U /* 8000000 //*/ 12000000 + +typedef int (*ConditionHook)(void); + +void delay_init(uint32_t sysclkfre); +void delay_ms(uint32_t ms); +void delay_us(uint32_t us); + + + + + + + #endif - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- Gitblit v1.9.3