STUSB4500: fix NVM programming

The last NVM sector was erased but not programmed.
This caused malfunctions.

Author: surban

openemc-firmware/src/main.rs

@@ -546,18 +546,31 @@ mod app {
         // Initialize power supplies.
         let stusb4500 = match ThisBoard::STUSB4500_I2C_ADDR {
             Some(addr) => {
-                // Verify and possibily reprogram NVM.
+                // Verify and possibily reprogram NVM of STUSB4500.
+                let mut reprogrammed = false;
                 if let Some(data) = ThisBoard::STUSB4500_NVM {
                     let i2c2 = defmt::unwrap!(i2c2.as_mut());
                     match StUsb4500Nvm::new(addr, i2c2).and_then(|mut nvm| nvm.ensure_nvm(&data)) {
-                        Ok(true) => defmt::info!("STUSB4500 NVM has been reprogrammed"),
+                        Ok(true) => {
+                            defmt::info!("STUSB4500 NVM has been reprogrammed");
+                            reprogrammed = true;
+                        }
                         Ok(false) => defmt::info!("STUSB4500 NVM has been verified"),
                         Err(err) => defmt::warn!("STUSB4500 NVM programming failed: {:?}", err),
                     }
                 }
 
+                // Initialize STUSB4500.
+                let mut stusb4500 =
+                    StUsb4500::new(addr, &ThisBoard::USB_INITIAL_PDO, ThisBoard::USB_MAXIMUM_VOLTAGE);
+
+                if reprogrammed {
+                    defmt::info!("Forcing STUSB4500 pin reset");
+                    stusb4500.reset();
+                }
+
                 defmt::unwrap!(stusb4500_periodic::spawn_after(1u64.secs()));
-                Some(StUsb4500::new(addr, &ThisBoard::USB_INITIAL_PDO, ThisBoard::USB_MAXIMUM_VOLTAGE))
+                Some(stusb4500)
             }
             None => None,
         };

openemc-firmware/src/supply/stusb4500/nvm.rs

@@ -40,11 +40,11 @@ where
     /// Mask of programmable bits within NVM.
     #[rustfmt::skip]
     pub const NVM_PROGRAMABLE: [u8; 40] = [
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x30, 0x20, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xC0 - 0xC7
+        0x30, 0x20, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xC8 - 0xCF
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD0 - 0xD7
+        0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, // 0xD8 - 0xDF
+        0xC0, 0xFF, 0xFF, 0xFF, 0x6F, 0x00, 0x18, 0x00, // 0xE0 - 0xE7
     ];
 
     /// Read I2C register(s).
@@ -158,7 +158,7 @@ where
         defmt::debug!("reading NVM");
 
         let mut buf = [0; 40];
-        for sector in 0..4 {
+        for sector in 0..=4 {
             buf[(sector * 8)..((sector + 1) * 8)].copy_from_slice(&self.read_nvm_sector(sector)?);
         }
 
@@ -214,7 +214,7 @@ where
 
         self.erase_nvm()?;
 
-        for sector in 0..4 {
+        for sector in 0..=4 {
             self.write_nvm_sector(sector, &defmt::unwrap!(data[(sector * 8)..((sector + 1) * 8)].try_into()))?;
         }