start switching to defmt

bootloader/Cargo.toml

@@ -7,16 +7,12 @@ edition = "2021"
 cortex-m = "0.7"
 cortex-m-rt = "0.7"
 embedded-hal = "1"
-panic-rtt-target = { version = "0.2" }
-panic-halt = { version = "1" }
-rtt-target = { version = "0.6" }
+defmt-rtt = "0.4"
+defmt = "1"
+panic-probe = { version = "1", features = ["defmt"] }
 crc = "3"
 static_assertions = "1"
 
 [dependencies.va416xx-hal]
 version = "0.5"
-features = ["va41630"]
-
-[features]
-default = []
-rtt-panic = []
+features = ["va41630", "defmt"]

bootloader/src/main.rs

@@ -7,11 +7,8 @@
 
 use cortex_m_rt::entry;
 use crc::{Crc, CRC_32_ISO_HDLC};
-#[cfg(not(feature = "rtt-panic"))]
-use panic_halt as _;
-#[cfg(feature = "rtt-panic")]
-use panic_rtt_target as _;
-use rtt_target::{rprintln, rtt_init_print};
+use defmt_rtt as _;
+use panic_probe as _;
 use va416xx_hal::{
     clock::{pll_setup_delay, ClkDivSel, ClkselSys},
     edac,
@@ -35,7 +32,7 @@ const DEBUG_PRINTOUTS: bool = true;
 const FLASH_SELF: bool = false;
 // Useful for debugging and see what the bootloader is doing. Enabled currently, because
 // the binary stays small enough.
-const RTT_PRINTOUT: bool = true;
+const DEFMT_PRINTOUTS: bool = true;
 
 // Important bootloader addresses and offsets, vector table information.
 
@@ -76,7 +73,7 @@ pub const RESET_VECTOR_OFFSET: u32 = 0x4;
 
 const CRC_ALGO: Crc<u32> = Crc::<u32>::new(&CRC_32_ISO_HDLC);
 
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, defmt::Format)]
 enum AppSel {
     A,
     B,
@@ -98,9 +95,8 @@ impl WdtInterface for OptWdt {
 
 #[entry]
 fn main() -> ! {
-    if RTT_PRINTOUT {
-        rtt_init_print!();
-        rprintln!("-- VA416xx bootloader --");
+    if DEFMT_PRINTOUTS {
+        defmt::println!("-- VA416xx bootloader --");
     }
     let mut dp = pac::Peripherals::take().unwrap();
     let cp = cortex_m::Peripherals::take().unwrap();
@@ -145,20 +141,20 @@ fn main() -> ! {
         nvm.write_data(0x0, &first_four_bytes);
         nvm.write_data(0x4, bootloader_data);
         if let Err(e) = nvm.verify_data(0x0, &first_four_bytes) {
-            if RTT_PRINTOUT {
-                rprintln!("verification of self-flash to NVM failed: {:?}", e);
+            if DEFMT_PRINTOUTS {
+                defmt::error!("verification of self-flash to NVM failed: {:?}", e);
             }
         }
         if let Err(e) = nvm.verify_data(0x4, bootloader_data) {
-            if RTT_PRINTOUT {
-                rprintln!("verification of self-flash to NVM failed: {:?}", e);
+            if DEFMT_PRINTOUTS {
+                defmt::error!("verification of self-flash to NVM failed: {:?}", e);
             }
         }
 
         nvm.write_data(BOOTLOADER_CRC_ADDR, &bootloader_crc.to_be_bytes());
         if let Err(e) = nvm.verify_data(BOOTLOADER_CRC_ADDR, &bootloader_crc.to_be_bytes()) {
-            if RTT_PRINTOUT {
-                rprintln!(
+            if DEFMT_PRINTOUTS {
+                defmt::error!(
                     "error: CRC verification for bootloader self-flash failed: {:?}",
                     e
                 );
@@ -174,8 +170,8 @@ fn main() -> ! {
     } else if check_app_crc(AppSel::B, &opt_wdt) {
         boot_app(AppSel::B, &cp)
     } else {
-        if DEBUG_PRINTOUTS && RTT_PRINTOUT {
-            rprintln!("both images corrupt! booting image A");
+        if DEBUG_PRINTOUTS && DEFMT_PRINTOUTS {
+            defmt::println!("both images corrupt! booting image A");
         }
         // TODO: Shift a CCSDS packet out to inform host/OBC about image corruption.
         // Both images seem to be corrupt. Boot default image A.
@@ -202,8 +198,8 @@ fn check_own_crc(wdt: &OptWdt, nvm: &Nvm, cp: &cortex_m::Peripherals) {
     let crc_calc = digest.finalize();
     wdt.feed();
     if crc_exp == 0x0000 || crc_exp == 0xffff {
-        if DEBUG_PRINTOUTS && RTT_PRINTOUT {
-            rprintln!("BL CRC blank - prog new CRC");
+        if DEBUG_PRINTOUTS && DEFMT_PRINTOUTS {
+            defmt::info!("BL CRC blank - prog new CRC");
         }
         // Blank CRC, write it to NVM.
         nvm.write_data(BOOTLOADER_CRC_ADDR, &crc_calc.to_be_bytes());
@@ -212,8 +208,8 @@ fn check_own_crc(wdt: &OptWdt, nvm: &Nvm, cp: &cortex_m::Peripherals) {
         // cortex_m::peripheral::SCB::sys_reset();
     } else if crc_exp != crc_calc {
         // Bootloader is corrupted. Try to run App A.
-        if DEBUG_PRINTOUTS && RTT_PRINTOUT {
-            rprintln!(
+        if DEBUG_PRINTOUTS && DEFMT_PRINTOUTS {
+            defmt::info!(
                 "bootloader CRC corrupt, read {} and expected {}. booting image A immediately",
                 crc_calc,
                 crc_exp
@@ -235,8 +231,8 @@ fn read_four_bytes_at_addr_zero(buf: &mut [u8; 4]) {
     }
 }
 fn check_app_crc(app_sel: AppSel, wdt: &OptWdt) -> bool {
-    if DEBUG_PRINTOUTS && RTT_PRINTOUT {
-        rprintln!("Checking image {:?}", app_sel);
+    if DEBUG_PRINTOUTS && DEFMT_PRINTOUTS {
+        defmt::info!("Checking image {:?}", app_sel);
     }
     if app_sel == AppSel::A {
         check_app_given_addr(APP_A_CRC_ADDR, APP_A_START_ADDR, APP_A_SIZE_ADDR, wdt)
@@ -255,8 +251,8 @@ fn check_app_given_addr(
     let image_size = unsafe { (image_size_addr as *const u32).read_unaligned().to_be() };
     // Sanity check.
     if image_size > APP_A_END_ADDR - APP_A_START_ADDR - 8 {
-        if RTT_PRINTOUT {
-            rprintln!("detected invalid app size {}", image_size);
+        if DEFMT_PRINTOUTS {
+            defmt::info!("detected invalid app size {}", image_size);
         }
         return false;
     }
@@ -272,8 +268,8 @@ fn check_app_given_addr(
 }
 
 fn boot_app(app_sel: AppSel, cp: &cortex_m::Peripherals) -> ! {
-    if DEBUG_PRINTOUTS && RTT_PRINTOUT {
-        rprintln!("booting app {:?}", app_sel);
+    if DEBUG_PRINTOUTS && DEFMT_PRINTOUTS {
+        defmt::info!("booting app {:?}", app_sel);
     }
     let clkgen = unsafe { pac::Clkgen::steal() };
     clkgen