From 9ad3f2769cf72aedad656bfa7c7b3fb278de01ee Mon Sep 17 00:00:00 2001
From: Yorick de Wid <yorickdewid@users.noreply.github.com>
Date: Fri, 12 Apr 2024 15:03:32 +0200
Subject: [PATCH] Refactor EEPROM driver to improve usability

---
 vecraft/src/eeprom.rs | 52 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 43 insertions(+), 9 deletions(-)

diff --git a/vecraft/src/eeprom.rs b/vecraft/src/eeprom.rs
index 2938672..791069b 100644
--- a/vecraft/src/eeprom.rs
+++ b/vecraft/src/eeprom.rs
@@ -2,9 +2,9 @@ use stm32h7xx_hal::prelude::*;
 use stm32h7xx_hal::{device::I2C1, i2c::I2c};
 
 const EEPROM_I2C_ADDRESS: u8 = 0x50; // 0b0101_0000
-pub const EEPROM_SIZE: u16 = 64_000;
-pub const EEPROM_PAGE_SIZE: u16 = 128;
-pub const EEPROM_PAGE_COUNT: u16 = EEPROM_SIZE / EEPROM_PAGE_SIZE;
+const _EEPROM_SIZE: usize = 64_000;
+const EEPROM_PAGE_SIZE: usize = 128;
+const _EEPROM_PAGE_COUNT: usize = _EEPROM_SIZE / EEPROM_PAGE_SIZE;
 
 /// EEPROM driver
 ///
@@ -18,22 +18,56 @@ impl Eeprom {
         Self { i2c }
     }
 
+    pub fn write_page(&mut self, page: usize, buffer: &[u8]) {
+        let offset = (page * EEPROM_PAGE_SIZE) as u16;
+        self.write_wait(offset, buffer);
+    }
+
+    pub fn read_page(&mut self, page: usize, buffer: &mut [u8]) {
+        let offset = (page * EEPROM_PAGE_SIZE) as u16;
+        self.read_wait(offset, buffer);
+    }
+
     pub fn write(&mut self, address: u16, buffer: &[u8]) -> Result<(), stm32h7xx_hal::i2c::Error> {
-        let mut i2c_buffer = [0; 80];
-        i2c_buffer[0] = (address & 0xFF) as u8;
-        i2c_buffer[1] = (address >> 8) as u8;
-        i2c_buffer[2..buffer.len() + 2].copy_from_slice(buffer);
+        let mut i2c_buffer = [0; EEPROM_PAGE_SIZE + 2];
+
+        let page_boundary = EEPROM_PAGE_SIZE - (address as usize % EEPROM_PAGE_SIZE);
+        let buffer_len = buffer.len().min(page_boundary);
+
+        i2c_buffer[0..2].copy_from_slice(&address.to_be_bytes());
+        i2c_buffer[2..buffer_len + 2].copy_from_slice(buffer);
 
         self.i2c
             .write(EEPROM_I2C_ADDRESS, &i2c_buffer[..buffer.len() + 2])
     }
 
+    pub fn write_wait(&mut self, address: u16, buffer: &[u8]) {
+        for _ in 0..100 {
+            if self.write(address, buffer).is_ok() {
+                break;
+            }
+        }
+    }
+
     pub fn read(
         &mut self,
         address: u16,
         buffer: &mut [u8],
     ) -> Result<(), stm32h7xx_hal::i2c::Error> {
-        self.i2c
-            .write_read(EEPROM_I2C_ADDRESS, &address.to_le_bytes(), buffer)
+        let buffer_len = buffer.len().min(EEPROM_PAGE_SIZE);
+
+        self.i2c.write_read(
+            EEPROM_I2C_ADDRESS,
+            &address.to_be_bytes(),
+            &mut buffer[..buffer_len],
+        )
+    }
+
+    pub fn read_wait(&mut self, address: u16, buffer: &mut [u8]) {
+        for _ in 0..100 {
+            if self.read(address, buffer).is_ok() {
+                break;
+            }
+        }
     }
 }