From ec1ec68ba7d175f39f5d4e066663cf29fa7c262a Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Tue, 14 May 2024 19:56:10 +0800
Subject: [PATCH] 开始增加脉冲、报警线处理
---
Soft/system_run_fun.c | 55 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/Soft/system_run_fun.c b/Soft/system_run_fun.c
index 0db5bde..55c4549 100644
--- a/Soft/system_run_fun.c
+++ b/Soft/system_run_fun.c
@@ -8,6 +8,8 @@
#include "key.h"
#include "lcd_io_api.h"
#include "wireless_remote_comm.h"
+#include "power_manage.h"
+#include "pulse_and_alarm_line.h"
RS485_START_REASON start_rs485_g = RS485_START_REASON_NONE;
WRC_START_MEANS start_wrc_g = WRC_MEANS_NONE;
@@ -15,29 +17,16 @@
void allGpioInit(void)
{
-// CMU_PERCLK_SetableEx(PADCLK, ENABLE); //PADʱ�ӣ�GPIO��ʹ�ܺ���
-//
-// InputtIO(UNCAP_DETECTION_PORT,UNCAP_DETECTION_PIN,IN_NORMAL);
-//
-
-// Lcd_GPIO_Init();
-// Measure_IO_Init();
-// KEY_IO_Init();
-// Valve_IO_Init();
-// ADC_LithIO_Init();
-// ADC_AlkaIO_Init();
-// Power_IO_Init();
-// Gprs_IO_Init();
-// E2p_IO_Init();
-//
-// SYS_BST_EN;
-
RTC_GPIO_Init();
Key_GPIO_Init();
Lcd_GPIO_Init();
+
+ Power_IO_Init();//��Դ���
+
+ Pulse_And_Alarm_Line_IO_Init();
}
@@ -58,7 +47,7 @@
//I0������
allGpioInit();
- //��λ���������ֱ�Ҫ���蹦�ܳ�ʼ������Ҫ�õ��ſ��������蹦������ѭ������֮ǰ���ü���
+ //��λ���������ֱ�Ҫ���蹦�ܳ�ʼ������Ҫ�õ��ſ��������蹦�ܿɲ�����������
// allPeripheralDriver();
SPI3_Init(); //EEP-SPI��ʼ��
}
@@ -76,8 +65,8 @@
GPIO_EXTI_Init( KEY3_PORT, KEY3_PIN, EXTI_FALLING, ENABLE);
GPIO_EXTI_Init( KEY4_PORT, KEY4_PIN, EXTI_FALLING, ENABLE);
-
-
+ GPIO_EXTI_Init( LITH_PWR_LOSE_PORT, LITH_PWR_LOSE_PIN, EXTI_FALLING, ENABLE);
+ GPIO_EXTI_Init( ALKA_PWR_LOSE_PORT, ALKA_PWR_LOSE_PIN, EXTI_FALLING, ENABLE);
/*NVIC�����*/
NVIC_DisableIRQ(GPIO_IRQn);
@@ -150,6 +139,17 @@
//�������г�ʼ��
ValveRunParaInit(equipment_basic_inf_g.valve_type);
+
+ //��Դ״̬���
+ PowerManagrInit();
+
+ //���״̬���
+
+ //��塢����״̬���
+
+ //�����ߡ������߳�ʼ
+
+
}
@@ -239,3 +239,18 @@
}
+
+
+
+//״̬�ִ���
+void SysStatusWordPro(void)
+{
+
+
+
+
+
+}
+
+
+
--
Gitblit v1.9.3