From 71f8bdb7c63acc381d71105bb950411029f4250f Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Mon, 03 Jun 2024 20:00:58 +0800
Subject: [PATCH] 测试远传
---
Soft/system_run_fun.c | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/Soft/system_run_fun.c b/Soft/system_run_fun.c
index f9eac63..83e5cea 100644
--- a/Soft/system_run_fun.c
+++ b/Soft/system_run_fun.c
@@ -11,6 +11,7 @@
#include "power_manage.h"
#include "pulse_and_alarm_line.h"
#include "valve_control.h"
+#include "linked_list.h"
RS485_START_REASON start_rs485_g = RS485_START_REASON_NONE;
@@ -34,6 +35,8 @@
Pulse_And_Alarm_Line_IO_Init();
RS485_read_data_GPIO_Init();
+
+ WRC_PWR_GPIO_Init(); //����Զ����Դ����IO
}
//����������������
@@ -69,10 +72,12 @@
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);
+// 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);
+// GPIO_EXTI_Init( ALKA_PWR_LOSE_PORT, ALKA_PWR_LOSE_PIN, EXTI_FALLING, ENABLE);
+
+ GPIO_EXTI_Init( LIMIT_TRIGGER_PORT, LIMIT_TRIGGER_PIN, EXTI_FALLING, ENABLE);
/*�������ж�����ѡ��,û���������ҿ���������*/
if(((flow_meter_para_g.broken_line_multiplex & BROKEN_LINE_MUTIPLEX_PULSE)!=BROKEN_LINE_MUTIPLEX_PULSE)&& \
@@ -146,14 +151,24 @@
{
//���ֹ���ģ����������IJ�����ʼ��
+ /*״̬�ֳ�ʼ*/
+ system_status_word_g.status_word.account_state = (system_function_ctrl_word_g.fun_ctrl_word.account_open == 1)?1:0;
+ system_status_word_g.status_word.valve_lock = (save_valve_para_g.valve_lock_state == VL_LOCK)?1:0;
+ system_status_word_g.status_word.virtual_billing = (system_function_ctrl_word_g.fun_ctrl_word.virtual_billing == 1)?1:0;
+ system_status_word_g.status_word.billing_type = system_function_ctrl_word_g.fun_ctrl_word.billing_type;
+ system_status_word_g.status_word.lcd_mode = system_function_ctrl_word_g.fun_ctrl_word.lcd_mode;
+
/****�ⲿRTC���ü�������ʼ��***********/
Set_Rtc_UpdataInterrupt(); //����RTCΪ���ж�
//��ȡ�ⲿRTCʱ�䣬
if(Get_Extern_Rtc_Time(&sys_clockBCD_g) ==FAIL)
{
//���ô�洢��ȡ��ʱ�����õ�RTC
- Set_Extern_Rtc_Time(save_realtime_data_g.record_time_BCD.year,save_realtime_data_g.record_time_BCD.month,save_realtime_data_g.record_time_BCD.day, \
- 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);
+ if(Set_Extern_Rtc_Time(save_realtime_data_g.record_time_BCD.year,save_realtime_data_g.record_time_BCD.month,save_realtime_data_g.record_time_BCD.day, \
+ 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) ==FAIL){
+ //�洢��ʱ�����������Ĭ��ֵ
+ Set_Extern_Rtc_Time(sys_clockBCD_g.year,sys_clockBCD_g.month,sys_clockBCD_g.day, 1,sys_clockBCD_g.hour,sys_clockBCD_g.min,sys_clockBCD_g.sec) ;
+ }
}
//�������г�ʼ��
@@ -201,9 +216,15 @@
start_rs485_g = RS485_START_REASON_RECORD;
- if(start_rs485_g != RS485_START_REASON_NONE){
+ //�ϱ�֮ǰ�����ɼ�
+ if(start_wrc_g != WRC_MEANS_NONE){
+ start_rs485_g = RS485_START_REASON_REPORT;
+ }
+
+ 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;
+ if(sys_fun_run_ctrl_p->rs485_ctrl_flag.running_flag ==RESET)
+ sys_fun_run_ctrl_p->rs485_ctrl_flag.start_flag = SET;
}
/*���ؿ��ƣ�����ͨ����������ָ��쳣�ȿ��ƣ���Ҫ����ʱֱ�ӵ���ValveCtrlOrder�������ɣ����ڴ˴�����*/
@@ -243,7 +264,7 @@
if(start_wrc_g != WRC_MEANS_NONE){
wrc_ctrl_para_g.wrc_start_flag = start_wrc_g;
start_wrc_g = WRC_MEANS_NONE;
- if(sys_fun_run_ctrl_p->wrc_ctrl_flag.start_flag == RESET){
+ if((sys_fun_run_ctrl_p->wrc_ctrl_flag.start_flag == RESET)&&(sys_fun_run_ctrl_p->wrc_ctrl_flag.running_flag == RESET )){
pwr_vol_g.alka_flag = AMS_WRC_BEFORE;
sys_fun_run_ctrl_p->wrc_ctrl_flag.start_flag = SET;
}
--
Gitblit v1.9.3