Skip to content

Fix eeprom write and erase #494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rahix merged 2 commits into from
Jan 20, 2024
Merged

Fix eeprom write and erase #494

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92fe46c
Revert "eeprom: Add workaround for #406"
Eggtosch Jan 19, 2024
5f0ef1a
eeprom: Do not clear eecr register when starting eeprom operation
Eggtosch Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 22 additions & 10 deletions avr-hal-generic/src/eeprom.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,7 @@ where
#[inline]
pub fn erase_byte(&mut self, offset: u16) {
assert!(offset < Self::CAPACITY);
// Write 0xff here because the erase function is borked.
// See also: https://github.com/Rahix/avr-hal/issues/406
self.p.raw_write_byte(offset, 0xff)
self.p.raw_erase_byte(offset)
}

pub fn read(&self, offset: u16, buf: &mut [u8]) -> Result<(), OutOfBoundsError> {
Expand Down Expand Up @@ -181,12 +179,26 @@ macro_rules! impl_eeprom_common {

// Check if any bits are changed to '1' in the new value.
if (diff_mask & data) != 0 {
self.eedr.write(|w| w.bits(data)); // Set EEPROM data register.
{
let $periph_ewmode_var = &self;
$set_erasewrite_mode
// Now we know that _some_ bits need to be erased to '1'.

// Check if any bits in the new value are '0'.
if data != 0xff {
// Now we know that some bits need to be programmed to '0' also.
self.eedr.write(|w| w.bits(data)); // Set EEPROM data register.

{
let $periph_ewmode_var = &self;
$set_erasewrite_mode
}
self.eecr.modify(|_, w| w.eepe().set_bit()); // Start Erase+Write operation.
} else {
// Now we know that all bits should be erased.
{
let $periph_emode_var = &self;
$set_erase_mode
}
self.eecr.modify(|_, w| w.eepe().set_bit()); // Start Erase-only operation.
}
self.eecr.write(|w| w.eepe().set_bit()); // Start Erase+Write operation.
}
//Now we know that _no_ bits need to be erased to '1'.
else {
Expand All @@ -198,7 +210,7 @@ macro_rules! impl_eeprom_common {
let $periph_wmode_var = &self;
$set_write_mode
}
self.eecr.write(|w| w.eepe().set_bit()); // Start Write-only operation.
self.eecr.modify(|_, w| w.eepe().set_bit()); // Start Write-only operation.
}
}
}
Expand All @@ -217,7 +229,7 @@ macro_rules! impl_eeprom_common {
$set_erase_mode
}
// Start Erase-only operation.
self.eecr.write(|w| w.eepe().set_bit());
self.eecr.modify(|_, w| w.eepe().set_bit());
}
}
}
Expand Down