From 5ac1d0febb8de5e91ce2463baea68ddac3f66091 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Thu, 16 May 2024 20:00:17 +0800
Subject: [PATCH] 完善脉冲计费和485采集处理
---
Function/E2P/EEPROM.h | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/Function/E2P/EEPROM.h b/Function/E2P/EEPROM.h
index eac005b..90239ed 100644
--- a/Function/E2P/EEPROM.h
+++ b/Function/E2P/EEPROM.h
@@ -53,19 +53,25 @@
#define EEPROM_PHYS_START_ADDR 0 //EEP��ʼ��ַ
#define EEPROM_PHYS_END_ADDR (EEPROM_PHYS_SIZE - 1) //EEP������ַ
-/***********************EEP ������Ϣ����**************************************/
+/***********************EEP �����������**************************************/
+#define EEPROM_PWR_PORT GPIOC
+#define EEPROM_PWR_PIN GPIO_Pin_6
-
+#define EEPROM_CS1_PORT GPIOC
+#define EEPROM_CS1_PIN GPIO_Pin_6
+#define EEPROM_CS2_PORT GPIOC
+#define EEPROM_CS2_PIN GPIO_Pin_14
#define EEPROM_CS_1 0
#define EEPROM_CS_2 1
-#define E2P_PWR_ON // GPIO_ResetBits(E2P_PWR_PORT,E2P_PWR_PIN)
-#define E2P_PWR_OFF // GPIO_SetBits(E2P_PWR_PORT,E2P_PWR_PIN)
+#define E2P_PWR_ON GPIO_ResetBits(EEPROM_PWR_PORT,EEPROM_PWR_PIN) ///jlc ��Դ�Ƿ�ɿػ�û����
+#define E2P_PWR_OFF GPIO_SetBits(EEPROM_PWR_PORT,EEPROM_PWR_PIN)
-#define EEPROM_CS_LOW // {if(Fram_cs_flag!=1){GPIO_ResetBits(FRAM_CS_GROUP,FRAM_CS_NUM);GPIO_SetBits(FRAM_CS2_GROUP,FRAM_CS2_NUM);}else{EEPROM_CS_2_LOW}}//CS = 0
-#define EEPROM_CS_HIGH // {GPIO_SetBits(FRAM_CS_GROUP,FRAM_CS_NUM);GPIO_SetBits(FRAM_CS2_GROUP,FRAM_CS2_NUM);}//CS = 1
+
+#define EEPROM_CS_LOW do{GPIO_ResetBits(EEPROM_CS1_PORT,EEPROM_CS1_PIN);GPIO_SetBits(EEPROM_CS2_PORT,EEPROM_CS2_PIN);}while(0)
+#define EEPROM_CS_HIGH do{GPIO_SetBits(EEPROM_CS1_PORT,EEPROM_CS1_PIN);GPIO_SetBits(EEPROM_CS2_PORT,EEPROM_CS2_PIN);}while(0)
///ע�⣬ǧ��Ҫ���ж��ж�дEEPROM������ж�֮ǰ���ڲ���EEPROM�������ж��ж�дEEPROM������ܳ�����
#define EEPROM_CS_2_LOW {GPIO_ResetBits(FRAM_CS2_GROUP,FRAM_CS2_NUM);GPIO_SetBits(FRAM_CS_GROUP,FRAM_CS_NUM);}//CS_2 = 0
--
Gitblit v1.9.3