From e61d1595ebb1fa76b499cddec2df4bd66ec92b97 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Mon, 20 May 2024 20:02:47 +0800
Subject: [PATCH] 继续完善
---
Soft/system_run_fun.c | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/Soft/system_run_fun.c b/Soft/system_run_fun.c
index 29f4cda..d8c997b 100644
--- a/Soft/system_run_fun.c
+++ b/Soft/system_run_fun.c
@@ -2,7 +2,7 @@
#include "system_eep_mem_manage.h"
#include "system_mem_para.h"
#include "eeprom.h"
-#include "mbcrc.h"
+#include "mbcrc1.h"
#include "gpio.h"
#include "extern_rtc.h"
#include "key.h"
@@ -19,7 +19,8 @@
void allGpioInit(void)
{
-
+ E2P_Ctrl_Gpio_Init();
+
RTC_GPIO_Init();
Key_GPIO_Init();
@@ -99,6 +100,7 @@
SYSTEM_EEP_IDENTIFICATION_T sys_eep_id_B_l={0};
uint8_t eep_none_flag = 1; //0����գ���0����ǿ�
+ EEPROM_CTRL_ENABLE;
//��ȡ������ʼ�����ñ�ʶ
//�����ʶ��ʶ�������洢��Ҫȫ��д��Ĭ��ֵ
//�����ʶʶ��ɹ��������в���������ֱ�ӴӴ洢�����ȡ
@@ -133,6 +135,8 @@
//��ȡϵͳ������ʶ
//���������ʶ��ʶ�����С�ڲ���ʱ�䣬����Ҫ������
allParaPatchPro();
+
+ EEPROM_CTRL_DISABLE;
}
@@ -205,6 +209,7 @@
/*���ؿ��ƣ�����ͨ����������ָ��쳣�ȿ��ƣ���Ҫ����ʱֱ�ӵ���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++){
@@ -228,8 +233,12 @@
if(start_wrc_g != WRC_MEANS_NONE){
+
start_wrc_g = WRC_MEANS_NONE;
- sys_fun_run_ctrl_p->wrc_ctrl_flag.start_flag = SET;
+ if(sys_fun_run_ctrl_p->wrc_ctrl_flag.start_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