From 6ea1a42391f86e72f53042a966dae970a3fd77cb Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Fri, 17 May 2024 17:18:57 +0800
Subject: [PATCH] 阀门控制进一步完善

---
 Function/E2P/EEPROM.h |   32 ++++++++++++++++++++++++++------
 1 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/Function/E2P/EEPROM.h b/Function/E2P/EEPROM.h
index 90239ed..bcd29dc 100644
--- a/Function/E2P/EEPROM.h
+++ b/Function/E2P/EEPROM.h
@@ -55,12 +55,16 @@
 
 /***********************EEP �����������**************************************/
 #define EEPROM_PWR_PORT               GPIOC
-#define EEPROM_PWR_PIN                GPIO_Pin_6
+#define EEPROM_PWR_PIN                GPIO_Pin_11
 
 #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_WP_PORT               	GPIOC
+#define EEPROM_WP_PIN                	GPIO_Pin_10
 
 
 #define  EEPROM_CS_1      0
@@ -69,13 +73,27 @@
 #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		GPIO_ResetBits(EEPROM_CS1_PORT,EEPROM_CS1_PIN)
+#define  EEPROM_CS_HIGH		GPIO_SetBits(EEPROM_CS1_PORT,EEPROM_CS1_PIN)
 
-#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)
+#define  EEPROM_CS_ENABLE       do{EEPROM_CS_LOW;EEPROM_CS_2_HIGH;}while(0)
+#define  EEPROM_CS_DISABLE      do{EEPROM_CS_HIGH;EEPROM_CS_2_HIGH;}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
-#define  EEPROM_CS_2_HIGH     GPIO_SetBits(FRAM_CS2_GROUP,FRAM_CS2_NUM)  //CS_2 = 1
+
+#define  EEPROM_CS_2_LOW             GPIO_ResetBits(EEPROM_CS2_PORT,EEPROM_CS2_PIN)
+#define  EEPROM_CS_2_HIGH            GPIO_SetBits(EEPROM_CS2_PORT,EEPROM_CS2_PIN)  
+
+#define  EEPROM_CS_2_ENABLE      do{EEPROM_CS_2_LOW;EEPROM_CS_HIGH;}while(0)
+#define  EEPROM_CS_2_DISABLE     do{EEPROM_CS_HIGH;EEPROM_CS_2_HIGH;}while(0)
+
+
+//����ʹ�ܣ�E2P����ǰ�����
+#define  EEPROM_CTRL_ENABLE		do{E2P_Ctrl_Gpio_Init();E2P_PWR_ON;EEPROM_CS_ENABLE;}while(0)
+#define  EEPROM_CTRL_DISABLE		do{E2P_Ctrl_Gpio_Init();}while(0)
+
+#define  EEPROM_2_CTRL_ENABLE		do{E2P_Ctrl_Gpio_Init();E2P_PWR_ON;EEPROM_CS_2_ENABLE;}while(0)
+#define  EEPROM_2_CTRL_DISABLE		do{E2P_Ctrl_Gpio_Init();}while(0)
+
 
 #define	FM_ReadWriteByte(dat) SpiWriteAndRead(dat)
 #define EEPROM_ioconfig()    SPI3_ioconfig()
@@ -108,5 +126,7 @@
 
 void EEPROM_CS_2_test(void);
 
+void E2P_Ctrl_Gpio_Init(void);
+
 #endif
 

--
Gitblit v1.9.3