Userman/NaxGCC-FW
1
0
Fork 0
forked from NaxdyOrg/NaxGCC-FW
Code Pull requests Activity

chore(config): streamline flash interactions

Browse source
This commit is contained in:
Naxdy 2024-04-03 17:21:10 +02:00
parent 8073328405
commit ac1d6e08a2
Signed by untrusted user: Naxdy
GPG key ID: CC15075846BCE91B
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/config.rs
View file

@ -554,7 +554,7 @@ impl ControllerConfig {
pub fn from_flash_memory( pub fn from_flash_memory(
mut flash: &mut Flash<'static, FLASH, Async, FLASH_SIZE>, mut flash: &mut Flash<'static, FLASH, Async, FLASH_SIZE>,
) -> Result<Self, embassy_rp::flash::Error> { ) -> Result<Self, embassy_rp::flash::Error> {
let mut controller_config_packed: <ControllerConfig as packed_struct::PackedStruct>::ByteArray = [0u8; 659]; // ControllerConfig byte size let mut controller_config_packed: <ControllerConfig as packed_struct::PackedStruct>::ByteArray = ControllerConfig::default().pack().unwrap();
let r = flash.blocking_read(ADDR_OFFSET, &mut controller_config_packed); let r = flash.blocking_read(ADDR_OFFSET, &mut controller_config_packed);
@ -569,23 +569,21 @@ impl ControllerConfig {
Ok(cfg) => match cfg { Ok(cfg) => match cfg {
a if a.config_revision == CONTROLLER_CONFIG_REVISION => { a if a.config_revision == CONTROLLER_CONFIG_REVISION => {
info!("Controller config loaded from flash: {}", a); info!("Controller config loaded from flash: {}", a);
Ok(a) return Ok(a);
} }
a => { a => {
warn!("Outdated controller config detected ({:02X}), or controller config was never present, using default.", a.config_revision); warn!("Outdated controller config detected ({:02X}), or controller config was never present, using default.", a.config_revision);
let cfg = ControllerConfig::default();
info!("Going to save default controller config.");
cfg.write_to_flash(&mut flash)?;
Ok(cfg)
} }
}, },
Err(_) => { Err(_) => {
let cfg = ControllerConfig::default(); warn!("Controller config corrupted or flash uninitialized, using default.");
info!("Going to save default controller config.");
cfg.write_to_flash(&mut flash)?;
Ok(cfg)
} }
} };
let cfg = ControllerConfig::default();
info!("Going to save default controller config.");
cfg.write_to_flash(&mut flash)?;
Ok(cfg)
} }
pub fn write_to_flash( pub fn write_to_flash(