From 64cf4a779ef5c16c79bbbee27370169dc8d69499 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Mon, 06 May 2024 20:08:30 +0800
Subject: [PATCH] 继续开发
---
Soft/system_run_fun.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 105 insertions(+), 8 deletions(-)
diff --git a/Soft/system_run_fun.c b/Soft/system_run_fun.c
index eb3d0b4..0db5bde 100644
--- a/Soft/system_run_fun.c
+++ b/Soft/system_run_fun.c
@@ -5,11 +5,12 @@
#include "mbcrc.h"
#include "gpio.h"
#include "extern_rtc.h"
+#include "key.h"
+#include "lcd_io_api.h"
+#include "wireless_remote_comm.h"
-
-
-
-
+RS485_START_REASON start_rs485_g = RS485_START_REASON_NONE;
+WRC_START_MEANS start_wrc_g = WRC_MEANS_NONE;
void allGpioInit(void)
@@ -20,7 +21,7 @@
// InputtIO(UNCAP_DETECTION_PORT,UNCAP_DETECTION_PIN,IN_NORMAL);
//
-// Lcd_IO_Init();
+// Lcd_GPIO_Init();
// Measure_IO_Init();
// KEY_IO_Init();
// Valve_IO_Init();
@@ -34,6 +35,9 @@
RTC_GPIO_Init();
+ Key_GPIO_Init();
+
+ Lcd_GPIO_Init();
}
@@ -56,7 +60,7 @@
//��λ���������ֱ�Ҫ���蹦�ܳ�ʼ������Ҫ�õ��ſ��������蹦������ѭ������֮ǰ���ü���
// allPeripheralDriver();
- //SPI��ʼ��
+ SPI3_Init(); //EEP-SPI��ʼ��
}
@@ -67,6 +71,13 @@
CMU_OPCCR1_EXTICKE_Setable(ENABLE); //EXTI����ʱ��ʹ��
GPIO_EXTI_Init( EXT_RTC_INT_PORT, EXT_RTC_INT_PIN, EXTI_FALLING, ENABLE);
+ GPIO_EXTI_Init( KEY1_PORT, KEY1_PIN, EXTI_FALLING, ENABLE);
+ GPIO_EXTI_Init( KEY2_PORT, KEY2_PIN, EXTI_FALLING, ENABLE);
+ GPIO_EXTI_Init( KEY3_PORT, KEY3_PIN, EXTI_FALLING, ENABLE);
+ GPIO_EXTI_Init( KEY4_PORT, KEY4_PIN, EXTI_FALLING, ENABLE);
+
+
+
/*NVIC�����*/
NVIC_DisableIRQ(GPIO_IRQn);
@@ -137,8 +148,94 @@
1,save_realtime_data_g.record_time_BCD.hour,save_realtime_data_g.record_time_BCD.min,save_realtime_data_g.record_time_BCD.sec);
}
-
+ //�������г�ʼ��
+ ValveRunParaInit(equipment_basic_inf_g.valve_type);
}
-
\ No newline at end of file
+
+
+void sysRunFunCtrlPro(FUN_START_CTRL_PARA_T * sys_fun_run_ctrl_p,sClockBCD sys_clockBCD_in)
+{
+ uint8_t first_time[2] = {0,0};
+ uint16_t IntervalTime;
+
+ /*rs485�ɼ��������ƣ� ��������ʱ���쳣��������¼�洢�����*/
+
+ /*Сʱ���졢��*/
+ if((sys_clockBCD_in.min == 0)&&(sys_clockBCD_in.sec == 0)) //Сʱ��¼�洢��
+ start_rs485_g = RS485_START_REASON_RECORD;
+
+ if((sys_clockBCD_in.hour == 0)&&(sys_clockBCD_in.min == 0)&&(sys_clockBCD_in.sec == 0))//���¼�洢��
+ start_rs485_g = RS485_START_REASON_RECORD;
+
+ if((sys_clockBCD_in.day == 1)&&(sys_clockBCD_in.hour == 0)&&(sys_clockBCD_in.min == 0)&&(sys_clockBCD_in.sec == 0))//�¼�¼�洢��
+ start_rs485_g = RS485_START_REASON_RECORD;
+
+
+ if(__SYS_STATUS_BYTES_GET(power_state) == SET)
+ IntervalTime = wrc_para_sizhu_g.ext_power_data_interval;
+ else
+ IntervalTime = wrc_para_sizhu_g.bat_power_data_interval;
+
+ if(IntervalTriggerHandle(sys_clockBCD_in,IntervalTime,first_time)==SET)
+ start_rs485_g = RS485_START_REASON_RECORD;
+
+
+ if(start_rs485_g != RS485_START_REASON_NONE){
+ start_rs485_g = RS485_START_REASON_NONE;
+ sys_fun_run_ctrl_p->rs485_ctrl_flag.start_flag = SET;
+ }
+
+ /*���ؿ��ƣ�����ͨ����������ָ��쳣�ȿ��ƣ���Ҫ����ʱֱ�ӵ���ValveCtrlOrder�������ɣ����ڴ˴�����*/
+
+
+ /*Զ��ͨѶ�������ƣ���������������ڡ��쳣������*/
+ if((wrc_para_sizhu_g.time_start_type&WRC_TIME_START_INTERVAL)==WRC_TIME_START_INTERVAL){
+ for(uint16_t count_i=0;count_i<wrc_para_sizhu_g.timing_send_num;count_i++){
+ if(count_i>=12)
+ break; //ʱ���������12���������˳�
+
+ if((sys_clockBCD_in.hour==wrc_para_sizhu_g.timing_send_time_BCD[count_i][0])&&(sys_clockBCD_in.min==wrc_para_sizhu_g.timing_send_time_BCD[count_i][1])&&(sys_clockBCD_in.sec==0))
+ start_wrc_g = WRC_MEANS_RTC_TIMING;
+ }
+ }
+
+ if((wrc_para_sizhu_g.time_start_type&WRC_TIME_START_TIMING)==WRC_TIME_START_TIMING){
+ if(__SYS_STATUS_BYTES_GET(power_state) == SET)
+ IntervalTime = wrc_para_sizhu_g.ext_power_send_interval;
+ else
+ IntervalTime = wrc_para_sizhu_g.bat_power_send_interval;
+
+ if(IntervalTriggerHandle(sys_clockBCD_in,IntervalTime,wrc_para_sizhu_g.send_first_time_BCD)==SET)
+ start_wrc_g = WRC_MEANS_RTC_INTERVAL;
+ }
+
+
+ if(start_wrc_g != WRC_MEANS_NONE){
+ start_wrc_g = WRC_MEANS_NONE;
+ sys_fun_run_ctrl_p->wrc_ctrl_flag.start_flag = SET;
+ }
+
+}
+
+
+//ϵͳ�������в�����״̬������RESET�����������
+FlagStatus SysKeepRunningStatusGet(FUN_START_CTRL_PARA_T sys_fun_run_ctrl_in)
+{
+ if(__SYS_STATUS_BYTES_GET(power_state) == SET) //���״̬�¿��Բ�����
+ return SET;
+
+ if(sys_fun_run_ctrl_in.rs485_ctrl_flag.running_flag ==SET)
+ return SET;
+
+// if(sys_fun_run_ctrl_in.valve_ctrl_flag.running_flag ==SET) //�������������
+// return SET;
+
+ if(sys_fun_run_ctrl_in.wrc_ctrl_flag.running_flag ==SET)
+ return SET;
+
+ return RESET;
+
+
+}
--
Gitblit v1.9.3