From 5ac1d0febb8de5e91ce2463baea68ddac3f66091 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Thu, 16 May 2024 20:00:17 +0800
Subject: [PATCH] 完善脉冲计费和485采集处理
---
Soft/system_general_para.h | 19 +++----------------
1 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/Soft/system_general_para.h b/Soft/system_general_para.h
index 1d48356..014e027 100644
--- a/Soft/system_general_para.h
+++ b/Soft/system_general_para.h
@@ -178,16 +178,6 @@
-
-
-
-
-
-
-
-
-
-
//��־���в���
typedef struct log_sizhu_run_t
{
@@ -196,11 +186,6 @@
uint32_t log_addr_begin;
}LOG_SIZHU_RUN_T;
-
-
-
-
-
@@ -222,7 +207,7 @@
-int mem_cmp_aray( const void * cs, const void * ct, u32 count );
+//int mem_cmp_aray( const void * cs, const void * ct, u32 count );
uint8_t TwoTimeCompara(uint8_t* TimeBCD1, uint8_t* TimeBCD2);//6�ֽ�BCDʱ���뵱ǰʱ��Ƚϣ���ǰʱ���0����ȷ���1����ǰʱ��С����2�� ���⣬������ʱ���ʽ��ЧҲ����0������������
@@ -232,5 +217,7 @@
FlagStatus IntervalTriggerHandle(sClockBCD sys_clockBCD_in,uint16_t IntervalTime,uint8_t IntervalFirstTimeBCD[2]);
+FlagStatus IO_JitterEliminationCheck(GPIO_Type* GPIOx, uint32_t GPIO_Pin,uint16_t delay_time_ms,BitAction bit_status);
+
#endif
--
Gitblit v1.9.3