LPC176x SPI / I2C PersistentStore (#17651)

Marlin/src/HAL/shared/eeprom_i2c.cpp

@@ -35,44 +35,50 @@
 #include "../HAL.h"
 #include <Wire.h>
 
+#ifndef EEPROM_WRITE_DELAY
+  #define EEPROM_WRITE_DELAY    5
+#endif
+
 // ------------------------
 // Private Variables
 // ------------------------
 
-static constexpr uint8_t eeprom_device_address = I2C_ADDRESS(0x50);
+#ifndef EEPROM_DEVICE_ADDRESS
+  #define EEPROM_DEVICE_ADDRESS  0x50
+#endif
+
+static constexpr uint8_t eeprom_device_address = I2C_ADDRESS(EEPROM_DEVICE_ADDRESS);
 
 // ------------------------
 // Public functions
 // ------------------------
 
-static void eeprom_init() {
-  Wire.begin();
-}
+static void eeprom_init() { Wire.begin(); }
 
 void eeprom_write_byte(uint8_t *pos, unsigned char value) {
-  unsigned eeprom_address = (unsigned) pos;
-
-  eeprom_init();
+  const unsigned eeprom_address = (unsigned)pos;
 
   Wire.beginTransmission(eeprom_device_address);
-  Wire.write((int)(eeprom_address >> 8));   // MSB
-  Wire.write((int)(eeprom_address & 0xFF)); // LSB
+  Wire.write(int(eeprom_address >> 8));   // MSB
+  Wire.write(int(eeprom_address & 0xFF)); // LSB
   Wire.write(value);
   Wire.endTransmission();
 
   // wait for write cycle to complete
   // this could be done more efficiently with "acknowledge polling"
-  delay(5);
+  delay(EEPROM_WRITE_DELAY);
 }
 
 // WARNING: address is a page address, 6-bit end will wrap around
 // also, data can be maximum of about 30 bytes, because the Wire library has a buffer of 32 bytes
-void eeprom_update_block(const void *pos, void* eeprom_address, size_t n) {
+void eeprom_update_block(const void *pos, void *__dst, size_t n) {
+  const unsigned eeprom_address = (unsigned)__dst;
+
   eeprom_init();
 
   Wire.beginTransmission(eeprom_device_address);
-  Wire.write((int)((unsigned)eeprom_address >> 8));   // MSB
-  Wire.write((int)((unsigned)eeprom_address & 0xFF)); // LSB
+  Wire.write(int(eeprom_address >> 8));   // MSB
+  Wire.write(int(eeprom_address & 0xFF)); // LSB
   Wire.endTransmission();
 
   uint8_t *ptr = (uint8_t*)pos;
@@ -83,37 +89,37 @@ void eeprom_update_block(const void *pos, void* eeprom_address, size_t n) {
 
   if (flag) {
     Wire.beginTransmission(eeprom_device_address);
-    Wire.write((int)((unsigned)eeprom_address >> 8));   // MSB
-    Wire.write((int)((unsigned)eeprom_address & 0xFF)); // LSB
+    Wire.write(int(eeprom_address >> 8));   // MSB
+    Wire.write(int(eeprom_address & 0xFF)); // LSB
     Wire.write((uint8_t*)pos, n);
     Wire.endTransmission();
 
     // wait for write cycle to complete
     // this could be done more efficiently with "acknowledge polling"
-    delay(5);
+    delay(EEPROM_WRITE_DELAY);
   }
 }
 
 uint8_t eeprom_read_byte(uint8_t *pos) {
-  unsigned eeprom_address = (unsigned)pos;
-
-  eeprom_init();
+  const unsigned eeprom_address = (unsigned)pos;
 
   Wire.beginTransmission(eeprom_device_address);
-  Wire.write((int)(eeprom_address >> 8));   // MSB
-  Wire.write((int)(eeprom_address & 0xFF)); // LSB
+  Wire.write(int(eeprom_address >> 8));   // MSB
+  Wire.write(int(eeprom_address & 0xFF)); // LSB
   Wire.endTransmission();
   Wire.requestFrom(eeprom_device_address, (byte)1);
   return Wire.available() ? Wire.read() : 0xFF;
 }
 
 // Don't read more than 30..32 bytes at a time!
-void eeprom_read_block(void* pos, const void* eeprom_address, size_t n) {
+void eeprom_read_block(void* pos, const void *__dst, size_t n) {
+  const unsigned eeprom_address = (unsigned)__dst;
+
   eeprom_init();
 
   Wire.beginTransmission(eeprom_device_address);
-  Wire.write((int)((unsigned)eeprom_address >> 8));   // MSB
-  Wire.write((int)((unsigned)eeprom_address & 0xFF)); // LSB
+  Wire.write(int(eeprom_address >> 8));   // MSB
+  Wire.write(int(eeprom_address & 0xFF)); // LSB
   Wire.endTransmission();
   Wire.requestFrom(eeprom_device_address, (byte)n);
   for (byte c = 0; c < n; c++ )

Marlin/src/HAL/shared/eeprom_spi.cpp

@@ -35,6 +35,10 @@
 #define CMD_READ  2   // WRITE
 #define CMD_WRITE 2   // WRITE
 
+#ifndef EEPROM_WRITE_DELAY
+  #define EEPROM_WRITE_DELAY    7
+#endif
+
 uint8_t eeprom_read_byte(uint8_t* pos) {
   uint8_t v;
   uint8_t eeprom_temp[3];
@@ -90,7 +94,7 @@ void eeprom_write_byte(uint8_t* pos, uint8_t value) {
 
   spiSend(SPI_CHAN_EEPROM1, value);
   WRITE(SPI_EEPROM1_CS, HIGH);
-  delay(7);   // wait for page write to complete
+  delay(EEPROM_WRITE_DELAY);   // wait for page write to complete
 }
 
 void eeprom_update_block(const void* src, void* eeprom_address, size_t n) {
@@ -112,7 +116,7 @@ void eeprom_update_block(const void* src, void* eeprom_address, size_t n) {
 
   spiSend(SPI_CHAN_EEPROM1, (const uint8_t*)src, n);
   WRITE(SPI_EEPROM1_CS, HIGH);
-  delay(7);   // wait for page write to complete
+  delay(EEPROM_WRITE_DELAY);   // wait for page write to complete
 }
 
 #endif // SPI_EEPROM