Recover from init fail

src/bin/main.rs

@@ -64,32 +64,40 @@ async fn main(spawner: Spawner) {
     let timg0 = TimerGroup::new(peripherals.TIMG0);
     esp_rtos::start(timg0.timer0, sw_interrupt.software_interrupt0);
 
-    let (primary, mut secondaries) = spi_bus::DisplayPinConfiguration {
-        spi_peripheral: peripherals.SPI2,
-        sck: peripherals.GPIO36,
-        mosi: peripherals.GPIO35,
-        miso: peripherals.GPIO37,
-        cs_primary: peripherals.GPIO11,
-        cs_secondary_1: peripherals.GPIO13,
-        cs_secondary_2: peripherals.GPIO14,
-        cs_secondary_3: peripherals.GPIO21,
-        reset_primary: peripherals.GPIO10,
-        reset_secondary: peripherals.GPIO47,
-        dc_pin: peripherals.GPIO12,
-    }
-    .build();
+    let (primary, mut secondaries) = retry(
+        5,
+        spi_bus::DisplayPinConfiguration {
+            spi_peripheral: peripherals.SPI2,
+            sck: peripherals.GPIO36,
+            mosi: peripherals.GPIO35,
+            miso: peripherals.GPIO37,
+            cs_primary: peripherals.GPIO11,
+            cs_secondary_1: peripherals.GPIO13,
+            cs_secondary_2: peripherals.GPIO14,
+            cs_secondary_3: peripherals.GPIO21,
+            reset_primary: peripherals.GPIO10,
+            reset_secondary: peripherals.GPIO47,
+            dc_pin: peripherals.GPIO12,
+        },
+        spi_bus::DisplayPinConfiguration::build,
+    );
 
     // Initialize the shared I2C bus using the refactored i2c_bus module.
     let shared_i2c = {
-        let config = I2cBusPinConfiguration {
+        use alloc::boxed::Box;
+        let bus = retry(5, I2cBusPinConfiguration {
             i2c_peripheral: peripherals.I2C0,
             scl: peripherals.GPIO18,
             sda: peripherals.GPIO17,
-        };
-        config.build()
+        }, I2cBusPinConfiguration::build);
+        Box::leak(Box::new(bus))
     };
 
-    let mut lcd: TertiaryDisplay = TertiaryDisplayPinConfiguration { i2c: shared_i2c }.build();
+    let mut lcd: TertiaryDisplay = retry(
+        5,
+        TertiaryDisplayPinConfiguration { i2c: shared_i2c },
+        TertiaryDisplayPinConfiguration::build,
+    );
     lcd.load_charset(EXAMPLE).unwrap();
     let h = EXAMPLE[HEART];
     let e = EXAMPLE[EMPTY];
@@ -140,6 +148,7 @@ async fn main(spawner: Spawner) {
     log::info!("Setup complete, entering main loop");
     spawner.spawn(navigation::run(inputs, outputs).expect("run task failed"));
     spawner.spawn(background_tasks::nfc_scanner(nfc_driver).expect("nfc scanner task failed"));
+    core::future::pending::<()>().await
 }
 
 fn display_shit(oled: &mut SecondaryDisplay<'static>, text: &str) {
@@ -151,3 +160,17 @@ fn display_shit(oled: &mut SecondaryDisplay<'static>, text: &str) {
         .unwrap();
     oled.flush().unwrap();
 }
+
+fn retry<T, U, F: FnMut(T) -> Result<U, T>>(repetitions: u32, input: T, mut action: F) -> U {
+    let mut initial_state = input;
+    for iteration in 0..repetitions {
+        log::debug!("Trying to initialize. Retries: {iteration}");
+
+        match action(initial_state) {
+            Ok(success) => return success,
+            Err(recovered_input) => initial_state = recovered_input,
+        }
+    }
+
+    panic!("Init failed after {repetitions} retries.")
+}