fix: all warnings caused by esp32 port

Author: filipton

.github/workflows/rust_ci.yaml

@@ -20,19 +20,19 @@ jobs:
       matrix:
         action:
           - command: build
-            args: --no-default-features --features=esp32c3 --target=riscv32imc-unknown-none-elf --release
+            args: +nightly --no-default-features --features=esp32c3 --target=riscv32imc-unknown-none-elf --release
           - command: fmt
-            args: --all -- --check --color always
+            args: +nightly --all -- --check --color always
           - command: clippy
-            args: --no-default-features --features=esp32c3 --target=riscv32imc-unknown-none-elf --workspace -- -D warnings
+            args: +nightly --no-default-features --features=esp32c3 --target=riscv32imc-unknown-none-elf --workspace -- -D warnings
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@v1
         with:
           target: riscv32imc-unknown-none-elf
-          toolchain: stable
+          toolchain: nightly
           components: rust-src, rustfmt, clippy
       - name: Enable caching
         uses: Swatinem/rust-cache@v2

rust-toolchain.toml

@@ -1,3 +1,2 @@
 [toolchain]
 channel = "esp"
-

src/buttons.rs

@@ -3,7 +3,6 @@ use crate::{
     structs::DelegateResponsePacket,
     utils::buttons::{Button, ButtonTrigger, ButtonsHandler},
 };
-use adv_shift_registers::wrappers::ShifterValue;
 use alloc::string::ToString;
 use embassy_time::{Instant, Timer};
 use esp_hal::gpio::Input;
@@ -16,7 +15,7 @@ pub async fn buttons_task(
 
     #[cfg(feature = "esp32c3")] button_input: Input<'static>,
 
-    #[cfg(feature = "esp32c3")] button_reg: ShifterValue,
+    #[cfg(feature = "esp32c3")] button_reg: adv_shift_registers::wrappers::ShifterValue,
 
     #[cfg(feature = "esp32")] buttons: [Input<'static>; 4],
 ) {

src/lcd.rs

@@ -1,14 +1,9 @@
-use adv_shift_registers::wrappers::{ShifterPin, ShifterValue};
 use alloc::{rc::Rc, string::ToString};
 use embassy_sync::{blocking_mutex::raw::NoopRawMutex, signal::Signal};
 use embassy_time::{Delay, Duration, Instant, Timer};
-use embedded_hal::digital::OutputPin;
-use esp_hal::{i2c::master::I2c, Async, Blocking};
 use hd44780_driver::{
-    bus::{FourBitBus, FourBitBusPins, I2CBus},
     charset::{CharsetA02, CharsetWithFallback},
     memory_map::{MemoryMap1602, StandardMemoryMap},
-    setup::{DisplayOptions4Bit, DisplayOptionsI2C},
     DisplayMode, HD44780,
 };
 
@@ -21,11 +16,14 @@ use crate::{
     },
 };
 
+#[cfg(feature = "esp32c3")]
+use embedded_hal::digital::OutputPin;
+
 #[embassy_executor::task]
 pub async fn lcd_task(
-    #[cfg(feature = "esp32")] i2c: I2c<'static, Blocking>,
+    #[cfg(feature = "esp32")] i2c: esp_hal::i2c::master::I2c<'static, esp_hal::Blocking>,
 
-    #[cfg(feature = "esp32c3")] lcd_shifter: ShifterValue,
+    #[cfg(feature = "esp32c3")] lcd_shifter: adv_shift_registers::wrappers::ShifterValue,
 
     global_state: GlobalState,
     wifi_setup_sig: Rc<Signal<NoopRawMutex, ()>>,
@@ -42,8 +40,8 @@ pub async fn lcd_task(
         let d6_pin = lcd_shifter.get_pin_mut(5, false);
         let d7_pin = lcd_shifter.get_pin_mut(4, false);
 
-        DisplayOptions4Bit::new(MemoryMap1602::new())
-            .with_pins(FourBitBusPins {
+        hd44780_driver::setup::DisplayOptions4Bit::new(MemoryMap1602::new())
+            .with_pins(hd44780_driver::bus::FourBitBusPins {
                 rs: reg_sel_pin,
                 en: e_pin,
                 d4: d4_pin,
@@ -56,7 +54,7 @@ pub async fn lcd_task(
 
     #[cfg(feature = "esp32")]
     let mut options = {
-        DisplayOptionsI2C::new(MemoryMap1602::new())
+        hd44780_driver::setup::DisplayOptionsI2C::new(MemoryMap1602::new())
             .with_i2c_bus(i2c, 0x27)
             .with_charset(CharsetA02::QUESTION_FALLBACK)
     };
@@ -167,11 +165,22 @@ pub async fn lcd_task(
 }
 
 #[cfg(feature = "esp32")]
-type LcdType<C> = HD44780<I2CBus<I2c<'static, Blocking>>, StandardMemoryMap<16, 2>, C>;
+type LcdType<C> = HD44780<
+    hd44780_driver::bus::I2CBus<esp_hal::i2c::master::I2c<'static, esp_hal::Blocking>>,
+    StandardMemoryMap<16, 2>,
+    C,
+>;
 
 #[cfg(feature = "esp32c3")]
 type LcdType<C> = HD44780<
-    FourBitBus<ShifterPin, ShifterPin, ShifterPin, ShifterPin, ShifterPin, ShifterPin>,
+    hd44780_driver::bus::FourBitBus<
+        adv_shift_registers::wrappers::ShifterPin,
+        adv_shift_registers::wrappers::ShifterPin,
+        adv_shift_registers::wrappers::ShifterPin,
+        adv_shift_registers::wrappers::ShifterPin,
+        adv_shift_registers::wrappers::ShifterPin,
+        adv_shift_registers::wrappers::ShifterPin,
+    >,
     StandardMemoryMap<16, 2>,
     C,
 >;

src/main.rs

@@ -8,15 +8,13 @@ use core::str::FromStr;
 use embassy_executor::Spawner;
 use embassy_sync::signal::Signal;
 use embassy_time::Timer;
-use embedded_hal::digital::OutputPin;
 use esp_backtrace as _;
 use esp_hal::{
     gpio::{Input, Output},
-    i2c::master::I2c,
     prelude::*,
     timer::timg::TimerGroup,
 };
-use state::{get_ota_state, GlobalStateInner, Scene, OTA_STATE};
+use state::{get_ota_state, GlobalStateInner, Scene};
 use structs::ConnSettings;
 use translations::init_translations;
 use utils::{
@@ -165,21 +163,23 @@ async fn main(spawner: Spawner) {
     let lcd_shifter = adv_shift_reg.get_shifter_mut(1);
 
     #[cfg(feature = "esp32c3")]
-    let mut cs_pin = {
+    let cs_pin = {
+        use embedded_hal::digital::OutputPin;
+
         let mut cs_pin = adv_shift_reg.get_pin_mut(1, 0, true);
         _ = cs_pin.set_high();
         cs_pin
     };
 
     #[cfg(feature = "esp32")]
-    let mut cs_pin = Output::new(peripherals.GPIO5, esp_hal::gpio::Level::High);
+    let cs_pin = Output::new(peripherals.GPIO5, esp_hal::gpio::Level::High);
 
     init_translations();
     let global_state = Rc::new(GlobalStateInner::new(&nvs));
     let wifi_setup_sig = Rc::new(Signal::new());
 
     #[cfg(feature = "esp32")]
-    let mut i2c = I2c::new(
+    let i2c = esp_hal::i2c::master::I2c::new(
         peripherals.I2C0,
         esp_hal::i2c::master::Config {
             frequency: 100.kHz(),

src/rfid.rs

@@ -1,6 +1,5 @@
 use crate::state::{current_epoch, GlobalState};
 use crate::structs::{CardInfoResponsePacket, SolveConfirmPacket};
-use adv_shift_registers::wrappers::ShifterPin;
 use alloc::string::ToString;
 use embassy_time::{Duration, Timer};
 use esp_hal::prelude::*;
@@ -18,7 +17,7 @@ pub async fn rfid_task(
     miso: AnyPin,
     mosi: AnyPin,
     sck: AnyPin,
-    #[cfg(feature = "esp32c3")] cs_pin: ShifterPin,
+    #[cfg(feature = "esp32c3")] cs_pin: adv_shift_registers::wrappers::ShifterPin,
     #[cfg(feature = "esp32")] cs_pin: esp_hal::gpio::Output<'static>,
     spi: esp_hal::peripherals::SPI2,
     dma: DMA,

src/utils/buttons.rs

@@ -1,5 +1,4 @@
 use crate::{buttons::HandlersDerive, state::GlobalState};
-use adv_shift_registers::wrappers::ShifterValue;
 use alloc::vec::Vec;
 use embassy_time::{Instant, Timer};
 use esp_hal::gpio::Input;
@@ -62,14 +61,10 @@ impl ButtonsHandler {
         &mut self,
         state: &GlobalState,
 
-        #[cfg(feature = "esp32c3")]
-        button_input: &Input<'static>,
+        #[cfg(feature = "esp32c3")] button_input: &Input<'static>,
+        #[cfg(feature = "esp32c3")] button_reg: &adv_shift_registers::wrappers::ShifterValue,
 
-        #[cfg(feature = "esp32c3")]
-        button_reg: &ShifterValue,
-
-        #[cfg(feature = "esp32")]
-        buttons: &[Input<'static>]
+        #[cfg(feature = "esp32")] buttons: &[Input<'static>],
     ) {
         let mut debounce_time = esp_hal::time::now();
         let mut old_debounced = i32::MAX;

src/utils/logger.rs

@@ -1,7 +1,6 @@
-use alloc::{string::String, vec::Vec};
-use core::{borrow::BorrowMut, cell::OnceCell};
-
 use crate::state::get_ota_state;
+use alloc::{string::String, vec::Vec};
+use core::cell::OnceCell;
 
 pub const FILTER_MAX: log::LevelFilter = log::LevelFilter::Debug;
 pub static mut GLOBAL_LOGS: OnceCell<Vec<String>> = OnceCell::new();

src/utils/mod.rs

@@ -1,16 +1,22 @@
 pub mod arc;
 pub mod buttons;
 pub mod lcd_abstract;
+pub mod logger;
 pub mod signaled_mutex;
 pub mod stackmat;
-pub mod logger;
 
 pub fn set_brownout_detection(state: bool) {
     #[cfg(feature = "esp32c3")]
     unsafe {
         let rtc_cntl = &*esp32c3::RTC_CNTL::ptr();
         rtc_cntl.int_ena().modify(|_, w| w.brown_out().bit(state));
     }
+
+    #[cfg(feature = "esp32")]
+    unsafe {
+        let rtc_cntl = &*esp32::RTC_CNTL::ptr();
+        rtc_cntl.int_ena().modify(|_, w| w.brown_out().bit(state));
+    }
 }
 
 /// This function returns value with maximum of signed integer