继续测试修改

jinlicong

2024-06-05 cf4d12fd8322cbb350dd3bc5af8c748e8790ac64

 Function/OFF_CHIP_FLASH/off_chip_flash.h

@@ -5,7 +5,7 @@
#include "define_all.h"
#include "eeprom.h"
/***************************ÍⲿflashÈÝÁ¿µÈÐÅÏ¢¶¨Òå**********************************************/
#define      OUT_FLASH_ALL_SIZE               0x400000// 4194304=32Mbits 
#define      OUT_FLASH_ALL_SIZE               0x400000//4*1024*1024=4194304MB=32Mbits 
#define      OUT_FLASH_PAGE_SIZE            256// Ò»Ò³Îª256×Ö½Ú£¬×î´ó¿ÉÁ¬Ðø±à¼­Ò»Ò³
#define      OUT_FLASH_SECTOR_SIZE         4096// Ò»¸öÉÈÇø4096×Ö½Ú£¬×îС²Á³ýµ¥Î»Îª1¸öÉÈÇø
// ÍⲿFLASH×Ô¶¨ÒåµÄ¿éÊýÁ¿
@@ -31,14 +31,17 @@
#define FLASH_CS_PORT       EEPROM_CS2_PORT
#define FLASH_CS_PIN          EEPROM_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            EEPROM_CS_2_LOW
#define  FLASH_CS_HIGH           EEPROM_CS_2_HIGH

//#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       EEPROM_CS_2_ENABLE
#define  FLASH_CS_DISABLE      EEPROM_CS_2_DISABLE

#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)

//¿ØÖÆʹÄÜ,flash²Ù×÷Ç°ºóµ÷ÓÃ
#define OUT_FLASH_CTRL_ENABLE      EEPROM_2_CTRL_ENABLE		
#define OUT_FLASH_CTRL_DISABLE      EEPROM_2_CTRL_DISABLE		


#define   FLASH_ReadWriteByte(dat)  SpiWriteAndRead(dat)
//#define FLASH_ioconfig()          SPI2_ioconfig()
@@ -49,10 +52,11 @@
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);
uint8 Flash_data_read(uint32 ReadAddr);
//void Flash_Write_NoCheck(uint8* pBuffer,uint32 WriteAddr,uint16 NumByteToWrite);
void Out_Flash_MultipleRead(uint8* pBuffer,uint32 ReadAddr,uint16 NumByteToRead);
void Out_Flash_MultipleWrite(uint8_t* pBuffer,u32 WriteAddr,u16 NumByteToWrite);

void Flash_Erase_Chip(void);
@@ -61,14 +65,14 @@
void Flash_PowerDown(void);
void Flash_WAKEUP(void);

float Flash_data_read_float(uint32 addr16);
void  Flash_data_write_float(uint32 addr16, float data) ;
double Flash_data_read_double(uint32 addr16) ;
void   Flash_data_write_double(uint32 addr16, double data) ;
u32  Flash_data_read_uint32(uint32 addr16) ;
void Flash_data_write_uint32(uint32 addr16, uint32 data) ;
u16  Flash_data_read_uint16(uint32 addr16) ;
void Flash_data_write_uint16(uint32 addr16, uint16 data) ;
//float Flash_data_read_float(uint32 addr16);
//void  Flash_data_write_float(uint32 addr16, float data) ;
//double Flash_data_read_double(uint32 addr16) ;
//void   Flash_data_write_double(uint32 addr16, double data) ;
//u32  Flash_data_read_uint32(uint32 addr16) ;
//void Flash_data_write_uint32(uint32 addr16, uint32 data) ;
//u16  Flash_data_read_uint16(uint32 addr16) ;
//void Flash_data_write_uint16(uint32 addr16, uint16 data) ;


void OUT_FLASH_test(void);