From 65062d0d5b21f838aa0043a15ce54cfab8d72c43 Mon Sep 17 00:00:00 2001
From: wujiazhi <1147861305@qq.com>
Date: Tue, 11 Jun 2024 14:23:53 +0800
Subject: [PATCH] 1.Fixed communication failure between MCU and wireless module 2.Fix the wrong judgment of alkaline lithium power
---
Function/OFF_CHIP_FLASH/off_chip_flash.h | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/Function/OFF_CHIP_FLASH/off_chip_flash.h b/Function/OFF_CHIP_FLASH/off_chip_flash.h
index 293bd55..80130ee 100644
--- a/Function/OFF_CHIP_FLASH/off_chip_flash.h
+++ b/Function/OFF_CHIP_FLASH/off_chip_flash.h
@@ -3,7 +3,7 @@
#include "define_all.h"
-#include "eeprom.h"
+#include "e2p.h"
/***************************�ⲿflash��������Ϣ����**********************************************/
#define OUT_FLASH_ALL_SIZE 0x400000// 4194304=32Mbits
#define OUT_FLASH_PAGE_SIZE 256// һҳΪ256�ֽڣ����������༭һҳ
@@ -28,32 +28,29 @@
// FlashƬѡ2
-#define FLASH_CS_PORT EEPROM_CS2_PORT
-#define FLASH_CS_PIN EEPROM_CS2_PIN
+#define FLASH_CS_PORT SPI0_CS_PORT
+#define FLASH_CS_PIN SPI0_CS2_PIN
-//#define FLASH_CS_LOW GPIO_ResetBits(FLASH_CS_PORT,FLASH_CS_PIN)//CS = 0
-//#define FLASH_CS_HIGH GPIO_SetBits(FLASH_CS_PORT,FLASH_CS_PIN) //CS = 1
+#define FLASH_CS_LOW GPIO_ResetBits(FLASH_CS_PORT,FLASH_CS_PIN)//CS = 0
+#define FLASH_CS_HIGH GPIO_SetBits(FLASH_CS_PORT,FLASH_CS_PIN) //CS = 1
-//#define FLASH_CS_ENABLE do{FLASH_CS_LOW;EEPROM_CS_HIGH;}while(0)
-//#define FLASH_CS_DISABLE do{FLASH_CS_HIGH;EEPROM_CS_HIGH;}while(0)
-
-#define FLASH_CS_ENABLE do{GPIO_ResetBits(FLASH_CS_PORT,FLASH_CS_PIN);GPIO_SetBits(EEPROM_CS1_PORT,EEPROM_CS1_PIN);}while(0)
-#define FLASH_CS_DISABLE do{GPIO_SetBits(FLASH_CS_PORT,FLASH_CS_PIN);GPIO_SetBits(EEPROM_CS1_PORT,EEPROM_CS1_PIN);}while(0)
+#define FLASH_CS_ENABLE do{FLASH_CS_LOW;E2P_CS1_H;}while(0)
+#define FLASH_CS_DISABLE do{FLASH_CS_HIGH;E2P_CS1_H;}while(0)
#define FLASH_ReadWriteByte(dat) SpiWriteAndRead(dat)
//#define FLASH_ioconfig() SPI2_ioconfig()
-uint8_t Flash_ReadSR(void);
-void FLASH_Write_SR(uint8_t sr);
+u8 Flash_ReadSR(void);
+void FLASH_Write_SR(u8 sr);
void FLASH_Write_Enable(void);
void FLASH_Write_Disable(void);
u16 Flash_ReadID(void);
void Out_Flash_MultipleRead(uint8* pBuffer,uint32 ReadAddr,uint16 NumByteToRead);
-void Flash_Write_Page(uint8_t* pBuffer,u32 WriteAddr,u16 NumByteToWrite);
+void Flash_Write_Page(u8* pBuffer,u32 WriteAddr,u16 NumByteToWrite);
uint8 Flash_data_read(uint32 ReadAddr);
//void Flash_Write_NoCheck(uint8* pBuffer,uint32 WriteAddr,uint16 NumByteToWrite);
-void Out_Flash_MultipleWrite(uint8_t* pBuffer,u32 WriteAddr,u16 NumByteToWrite);
+void Out_Flash_MultipleWrite(u8* pBuffer,u32 WriteAddr,u16 NumByteToWrite);
void Flash_Erase_Chip(void);
void Flash_OUT_Erase_Sector(u32 Dst_Addr);
--
Gitblit v1.9.3