From 6e3f1f560d618b37ee1a47fa2b0f682b70c3ef1c Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Wed, 19 Jun 2024 17:25:45 +0800
Subject: [PATCH] 增加OTA协议
---
Soft/system_run_fun.c | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/Soft/system_run_fun.c b/Soft/system_run_fun.c
index 83e5cea..1fda93f 100644
--- a/Soft/system_run_fun.c
+++ b/Soft/system_run_fun.c
@@ -12,6 +12,7 @@
#include "pulse_and_alarm_line.h"
#include "valve_control.h"
#include "linked_list.h"
+#include "sizhu_history_record.h"
RS485_START_REASON start_rs485_g = RS485_START_REASON_NONE;
@@ -69,9 +70,10 @@
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( 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( LITH_PWR_LOSE_PORT, LITH_PWR_LOSE_PIN, EXTI_FALLING, ENABLE);
@@ -104,8 +106,14 @@
SYSTEM_EEP_IDENTIFICATION_T sys_eep_id_A_l={0};
SYSTEM_EEP_IDENTIFICATION_T sys_eep_id_B_l={0};
uint8_t eep_none_flag = 1; //0����գ���0����ǿ�
+ uint8_t buf_test[10];
+
+ //?�������
+// EEPROM_test();
+
EEPROM_CTRL_ENABLE;
+
//��ȡ������ʼ�����ñ�ʶ
//�����ʶ��ʶ�������洢��Ҫȫ��д��Ĭ��ֵ
//�����ʶʶ��ɹ��������в���������ֱ�ӴӴ洢�����ȡ
@@ -174,10 +182,8 @@
//�������г�ʼ��
ValveRunParaInit(equipment_basic_inf_g.valve_type);
- //��Դ״̬���
+ //��Դ״̬��⡢���״̬���
PowerManagrInit();
-
- //���״̬���
//��塢����״̬���
@@ -196,6 +202,10 @@
/*rs485�ɼ��������ƣ� ��������ʱ���쳣��������¼�洢�����*/
+ if(start_rs485_g == RS485_START_REASON_KEY){ //������������Ҫ�洢һ��������������ϱ�
+ interval_report_record_flag =SET;
+ }
+
/*Сʱ���졢��*/
if((sys_clockBCD_in.min == 0)&&(sys_clockBCD_in.sec == 0)) //Сʱ��¼�洢��
start_rs485_g = RS485_START_REASON_RECORD;
--
Gitblit v1.9.3