From 1360095f8d64cf607d333d2fc7fd1dcd81d1bd7b Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Fri, 24 May 2024 16:35:10 +0800
Subject: [PATCH] 修改报警相关处理
---
Soft/system_general_para.h | 95 +++++++++++++++++++++++++++++++++--------------
1 files changed, 67 insertions(+), 28 deletions(-)
diff --git a/Soft/system_general_para.h b/Soft/system_general_para.h
index 77f3ac1..8d1579d 100644
--- a/Soft/system_general_para.h
+++ b/Soft/system_general_para.h
@@ -1,6 +1,7 @@
#ifndef _SYSTEM_GENERAL_PARA_H
#define _SYSTEM_GENERAL_PARA_H
#include "define_all.h"
+#include "extern_rtc.h"
/**************************************************
*��Ҫ����һЩͨ�õĺ���������
@@ -38,9 +39,6 @@
DN40_TYPE,
} CALIBER_TYPE; // �ھ�
-
-
-
typedef enum
{
EM_NONE = 0U,
@@ -50,15 +48,50 @@
EM_SIFRCT, //��������Զ�������ն�
} EQUIPMENT_TYPE; // �����ͺ�
-
-
-
-//�������ʹ�С��
typedef enum
{
LITTLE_ENDIAN = 0U,
BIG_ENDIAN
-} BIG_OR_LITTLE_ENDIAN; // ����״̬����
+} BIG_OR_LITTLE_ENDIAN; //�������ʹ�С��
+
+typedef enum
+{
+ FLOW_METER_CONN_NONE = 0U,
+ FLOW_METER_CONN_PULSE,
+ FLOW_METER_CONN_RS485,
+ FLOW_METER_CONN_RS485_AND_PULSE
+} FLOW_METER_CONN_TYPE; //���������ӷ�ʽ
+
+typedef enum
+{
+ BAUDRATE_1200 = 0U,
+ BAUDRATE_2400 ,
+ BAUDRATE_4800 ,
+ BAUDRATE_9600 ,
+ BAUDRATE_19200 ,
+ BAUDRATE_38400 ,
+ BAUDRATE_56000 ,
+ BAUDRATE_57600 ,
+ BAUDRATE_115200
+} BAUDRATE_CODE; //������
+
+typedef enum
+{
+ PARITY_NONE = 0U,
+ PARITY_ODD ,
+ PARITY_EVEN ,
+
+} PARITY_BIT; //������
+
+typedef enum
+{
+ RS485_START_REASON_NONE = 0U, //����������Ҫִ��
+ RS485_START_REASON_KEY , //����
+ RS485_START_REASON_TIMING, //��ʱ
+ RS485_START_REASON_REPORT, //�ϱ���Ҫ
+ RS485_START_REASON_RECORD, //�����¼��Ҫ���������ϱ���������
+
+} RS485_START_REASON; //485����ԭ��
/*****************ͨ�ýṹ�����******************************/
@@ -71,7 +104,7 @@
typedef struct
{
- DELAY_SEC_TYPE_T gprs_timeout_para; // GPRS��ʱʱ��
+ DELAY_SEC_TYPE_T wrc_timeout_para; // GPRS��ʱʱ��
DELAY_SEC_TYPE_T sys_active_time; // ϵͳ����ʱ��
DELAY_SEC_TYPE_T sys_restart_delay_time;// ϵͳ�������ӳ�ʱ��
DELAY_SEC_TYPE_T UC_active_time; // ��λ������ʱ��
@@ -79,8 +112,20 @@
+typedef struct
+{
+ __IO FlagStatus start_flag; // ����������־
+ __IO FlagStatus running_flag; // ���������б�־
+} FUN_START_CTRL_T; // ��ʱʱ�����ͽṹ��
+typedef struct
+{
+ FUN_START_CTRL_T rs485_ctrl_flag;
+ FUN_START_CTRL_T wrc_ctrl_flag;
+ FUN_START_CTRL_T valve_ctrl_flag;
+
+} FUN_START_CTRL_PARA_T; // ��ʱʱ�����ͽṹ��
/*****************ͨ�ú�******************************/
@@ -88,6 +133,9 @@
#define DECIMAL_2_BCD(__DECIMAL__) ((__DECIMAL__ / 16) * 10 + __DECIMAL__ % 16)
+
+/*ÿ��0��*/
+#define DAILY_ZERO ((&sys_clockBCD_g)->hour == 0 && (&sys_clockBCD_g)->min == 0 && (&sys_clockBCD_g)->sec == 0 ? SET : RESET)
// ��С��ת��
#define BSWAP_16(x) ((x & 0x00ff) << 8) | \
@@ -114,7 +162,7 @@
// ϵͳͨ���ӳ�ʱ������
-#define __SYS_DELAY_SEC_TIME_SET_(__HANDLE__, __NUMBER__) ((&sys_delay_sec_para_g)->__HANDLE__.delay_time = __NUMBER__)
+#define __SYS_DELAY_SEC_TIME_SET_(__HANDLE__, __NUMBER__) do{(&sys_delay_sec_para_g)->__HANDLE__.delay_time = __NUMBER__;__SYS_DELAY_SEC_FLAG_CLEAR_(__HANDLE__);}while(0);
// ϵͳͨ���ӳ�ʱ���ȡ
#define __SYS_DELAY_SEC_TIME_GET_(__HANDLE__) ((&sys_delay_sec_para_g)->__HANDLE__.delay_time)
@@ -125,16 +173,6 @@
#define __SYS_DELAY_SEC_FLAG_SET_(__HANDLE__) ((&sys_delay_sec_para_g)->__HANDLE__.delay_flag = SET)
// ϵͳͨ���ӳٱ�־λ���
#define __SYS_DELAY_SEC_FLAG_CLEAR_(__HANDLE__) ((&sys_delay_sec_para_g)->__HANDLE__.delay_flag = RESET)
-
-
-
-
-
-
-
-
-
-
@@ -156,18 +194,13 @@
-
-
-
-
-
//extern uint8_t read_data_buf_A_l[200];
//extern uint8_t read_data_buf_B_l[200];
//extern uint8_t read_data_buf_C_l[200];
extern __IO FlagStatus sys_run_period; // ϵͳ��������
-extern SYS_DELAY_SEC_PARA_T sys_delay_sec_para_g;
-
+extern SYS_DELAY_SEC_PARA_T sys_delay_sec_para_g; //ϵͳ��ʱ����
+extern FUN_START_CTRL_PARA_T sys_fun_run_ctrl_g; //ϵͳ�������п���
@@ -177,7 +210,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������������
@@ -185,5 +218,11 @@
//unsigned char HEX2BCD(unsigned char hex_data) ; //HEX??BCD???
void dou26Byte( double data, unsigned char *array );
+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);
+
+int Datecmp(const uint8_t *pDate1, const uint8_t *pDate2);
+
#endif
--
Gitblit v1.9.3