From bc1d09501ee927259d264b1b82508ca3935da336 Mon Sep 17 00:00:00 2001 From: wu58430 Date: Wed, 10 Jan 2024 16:44:32 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D2*2Mb=20Eerpom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- driver/eeprom.c | 50 +++++++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/driver/eeprom.c b/driver/eeprom.c index 4c7e327..3b16c82 100644 --- a/driver/eeprom.c +++ b/driver/eeprom.c @@ -20,45 +20,55 @@ #include "driver/eeprom.h" #include "driver/i2c.h" #include "driver/system.h" -uint8_t WRITE_SIZE=0; + +uint8_t WRITE_SIZE = 0; + void EEPROM_ReadBuffer(uint32_t Address, void *pBuffer, uint8_t Size) { - if(Size==0)return; + if (Size == 0)return; - I2C_Start(); - uint8_t P0 = (Address / 0x10000) << 1; + I2C_Start(); + uint8_t IIC_ADD = 0xA0 | ((Address / 0x10000) << 1); +#ifdef ENABLE_EEPROM_4M - I2C_Write(0xA0|P0); + if (Address >= 0x20000) + {IIC_ADD = 0xA8 | (((Address - 0x20000) / 0x10000) << 1); +Address-=0x20000; - I2C_Write((Address >> 8) & 0xFF); - I2C_Write((Address >> 0) & 0xFF); + } +#endif + I2C_Write(IIC_ADD); + I2C_Write((Address >> 8) & 0xFF); + I2C_Write((Address >> 0) & 0xFF); - I2C_Start(); + I2C_Start(); - I2C_Write((0xA0|P0)+1); + I2C_Write(IIC_ADD + 1); - I2C_ReadBuffer(pBuffer, Size); + I2C_ReadBuffer(pBuffer, Size); - I2C_Stop(); + I2C_Stop(); } -void EEPROM_WriteBuffer(uint32_t Address, const void *pBuffer,uint8_t WRITE_SIZE) { - if (pBuffer == NULL ) +void EEPROM_WriteBuffer(uint32_t Address, const void *pBuffer, uint8_t WRITE_SIZE) { + if (pBuffer == NULL) return; uint8_t buffer[128]; EEPROM_ReadBuffer(Address, buffer, WRITE_SIZE); if (memcmp(pBuffer, buffer, WRITE_SIZE) != 0) { - uint8_t P0 = (Address / 0x10000) << 1; + uint8_t IIC_ADD=0xA0 | ((Address / 0x10000) << 1); I2C_Start(); - if(Address<0x10000) I2C_Write(0xA0); - else I2C_Write(0xA0 | P0); - - I2C_Write((Address >> 8) & 0xFF); - I2C_Write((Address >> 0) & 0xFF); +#ifdef ENABLE_EEPROM_4M + if(Address>=0x20000) + IIC_ADD = 0xA8 | (((Address - 0x20000) / 0x10000) << 1); +#endif + I2C_Write(IIC_ADD); + I2C_Write(((Address>=0x20000?Address:Address-0x20000) >> 8) & 0xFF); + I2C_Write(((Address>=0x20000?Address:Address-0x20000) >> 0) & 0xFF); I2C_WriteBuffer(pBuffer, WRITE_SIZE); I2C_Stop(); } - SYSTEM_DelayMs(11); + SYSTEM_DelayMs(8); }