improved code structure

src/main.rs

@@ -2,123 +2,40 @@
 #![no_main]
 
 use embassy_executor::Spawner;
-use embassy_rp::{
-    bind_interrupts, gpio,
-    i2c::{self, I2c},
-    peripherals::{self, USB},
-    spi::{self, Spi},
-    usb::Driver,
-};
 use embassy_time::Timer;
-use embedded_graphics::prelude::DrawTargetExt;
-use embedded_hal_bus::spi::ExclusiveDevice;
-use gpio::{Level, Output};
-use log::{error, info};
-use mipidsi::{
-    Builder,
-    interface::SpiInterface,
-    models::ST7789,
-    options::{Orientation, Rotation},
-};
-use mmc56x3::MMC56X3;
+use embedded_graphics::draw_target::DrawTargetExt;
+use log::error;
 
 use crate::display::CoMoDisplay;
 
 mod display;
-
-#[panic_handler]
-fn panic(_info: &core::panic::PanicInfo) -> ! {
-    // TODO: How to log panic? 
-    loop {}
-}
-
-bind_interrupts!(struct Irqs {
-    USBCTRL_IRQ => embassy_rp::usb::InterruptHandler<USB>;
-    I2C1_IRQ => i2c::InterruptHandler<peripherals::I2C1>;
-});
-
-#[embassy_executor::task]
-async fn logger_task(driver: Driver<'static, USB>) {
-    embassy_usb_logger::run!(1024, log::LevelFilter::Info, driver);
-}
+mod init;
 
 #[embassy_executor::main]
 async fn main(spawner: Spawner) {
-    let p = embassy_rp::init(Default::default());
+    let p = init::hardware_init();
+    init::logger::init_logger(spawner, p.USB);
 
-    let driver = Driver::new(p.USB, Irqs);
-    spawner.must_spawn(logger_task(driver));
+    let Ok(mag) = init::i2c_sensor::init_sensor(p.I2C1, p.PIN_14, p.PIN_15).await else {
+        error!("Failed to init sensor");
 
-    let mut spi_cfg = spi::Config::default();
-    spi_cfg.frequency = 62_500_000;
+        init::reboot().await;
+        return;
+    };
 
-    let inner = p.SPI0;
-    let clk = p.PIN_6;
-    let mosi = p.PIN_7;
-    let cs = p.PIN_5;
-    let dc = p.PIN_9;
-    let rst = p.PIN_10;
+    let Ok(mut display) =
+        init::spi_display::init_display(p.SPI0, p.PIN_6, p.PIN_7, p.PIN_5, p.PIN_9, p.PIN_10).await
+    else {
+        error!("Failed to init display");
 
-    let spi = Spi::new_blocking_txonly(inner, clk, mosi, spi_cfg);
-    let cs_display = Output::new(cs, Level::Low);
-    let dc_display = Output::new(dc, Level::Low);
-    let mut rst_display = Output::new(rst, Level::Low);
-
-    rst_display.set_low();
-    Timer::after_millis(10).await;
-    rst_display.set_high();
-    Timer::after_millis(120).await;
-
-    let spi_dev = ExclusiveDevice::new_no_delay(spi, cs_display).unwrap();
-
-    let mut buffer = [0u8; 512];
-    let di = SpiInterface::new(spi_dev, dc_display, &mut buffer);
-
-    let mut display = Builder::new(ST7789, di)
-        .display_size(240, 320)
-        .orientation(Orientation::new().rotate(Rotation::Deg90))
-        .init(&mut embassy_time::Delay)
-        .unwrap();
+        init::reboot().await;
+        return;
+    };
 
     let mut como_display = CoMoDisplay::new(display.color_converted());
 
-    let _ = como_display.draw();
+    como_display.draw();
 
-    let i2c_sda = p.PIN_14;
-    let i2c_scl = p.PIN_15;
-
-    let i2c = I2c::new_async(p.I2C1, i2c_scl, i2c_sda, Irqs, i2c::Config::default());
-
-    let mut device = MMC56X3::new(i2c, embassy_time::Delay);
-
-    if let Err(e) = device.init().await {
-        error!("Failed to init {:?}", e);
-        reboot().await;
-    };
-
-    if let Err(e) = device.set_data_rate(mmc56x3::DataRate::Max1000Hz).await {
-        error!("Failed to set data rate {:?}", e);
-        reboot().await;
-    }
-
-    if let Err(e) = device.set_continuous_mode(true).await {
-        error!("Failed to set_continuous_mode {:?}", e);
-        reboot().await;
-    }
-    for _ in 0..30 {
-        Timer::after_secs(1).await;
-
-        match device.read_messurement().await {
-            Ok(d) => info!("Got: {:?}", d),
-            Err(e) => error!("Error: {:?}", e),
-        }
-    }
-
-    reboot().await;
-}
-
-async fn reboot() {
-    info!("Doing cold boot");
-    Timer::after_secs(1).await;
-    embassy_rp::rom_data::reset_to_usb_boot(0, 0);
+    Timer::after_secs(5).await;
+    init::reboot().await;
 }