Fix more errors with different feature set

Author: usbalbin

examples/hello.rs

@@ -5,17 +5,18 @@
 
 extern crate cortex_m;
 extern crate cortex_m_rt as rt;
-extern crate panic_semihosting;
 extern crate stm32g4xx_hal as hal;
 
-use cortex_m_semihosting::hprintln;
 use rt::entry;
 
-use defmt_rtt as _;
+#[macro_use]
+mod utils;
+
+use utils::logger::println;
 
 #[entry]
 fn main() -> ! {
-    hprintln!("Hello, STM32G4!").unwrap();
+    let _ = println!("Hello, STM32G4!");
 
     #[allow(clippy::empty_loop)]
     loop {}

examples/panic.rs

@@ -1,14 +1,14 @@
 #![no_main]
 #![no_std]
 
-use defmt_rtt as _;
-
-use panic_probe as _;
-
 use stm32g4 as _;
 
-use defmt::Format;
+#[macro_use]
+mod utils;
+
+use utils::logger;
 
+#[cfg(feature = "defmt")]
 #[defmt::panic_handler]
 fn panic() -> ! {
     cortex_m::asm::udf()
@@ -22,8 +22,7 @@ pub fn exit() -> ! {
 
 #[cortex_m_rt::entry]
 fn main() -> ! {
-    defmt::info!("main");
+    logger::info!("main");
 
     panic!("Something bad");
-    // defmt::panic!()
 }

examples/utils/logger.rs

@@ -38,6 +38,7 @@ cfg_if::cfg_if! {
             };
         }
 
+        #[allow(dead_code)]
         pub fn init() {
             cortex_m_log::log::init(&LOGGER).unwrap();
         }
@@ -48,6 +49,7 @@ cfg_if::cfg_if! {
         use panic_probe as _;
         pub use defmt::Logger;
 
+        #[allow(dead_code)]
         pub fn init() {}
     }
     else if #[cfg(all(feature = "log-rtt", not(feature = "defmt")))] {
@@ -72,12 +74,15 @@ cfg_if::cfg_if! {
             };
         }
 
+        #[allow(dead_code)]
         pub fn init() {
             cortex_m_log::log::init(&LOGGER).unwrap();
         }
     }
     else {
         use panic_halt as _;
+
+        #[allow(dead_code)]
         pub fn init() {}
     }
 }