esp32_hal example code updated

Author: thecodechemist99

src/main.rs

@@ -1,95 +1,50 @@
 #![no_std]
 #![no_main]
 
-use panic_halt as _;
 {% if mcu == "esp32" -%}
-use esp32_hal::target;
-use hal::prelude::*;
-use xtensa_lx::timer::delay;
-use esp32_hal as hal;
-
-/// The default clock source is the onboard crystal
-/// In most cases 40mhz (but can be as low as 2mhz depending on the board)
-const CORE_HZ: u32 = 40_000_000;
-
-const WDT_WKEY_VALUE: u32 = 0x50D83AA1;
+use esp32_hal::{clock::ClockControl, pac::Peripherals, prelude::*, timer::TimerGroup, Delay, Rtc, IO};
+use esp_backtrace as _;
 {% else -%}
 use esp8266_hal::{ prelude::*, target::Peripherals };
+use panic_halt as _;
 {% endif %}
 
 #[xtensa_lx_rt::entry]
 fn main() -> ! {
+    let peripherals = Peripherals::take().unwrap();
     {% if mcu == "esp32" -%}
-    let dp = target::Peripherals::take().expect("Failed to obtain Peripherals");
-
-    let mut rtccntl = dp.RTCCNTL;
-    let mut timg0 = dp.TIMG0;
-    let mut timg1 = dp.TIMG1;
-
-    // (https://github.com/espressif/openocd-esp32/blob/97ba3a6bb9eaa898d91df923bbedddfeaaaf28c9/src/target/esp32.c#L431)
-    // openocd disables the wdt's on halt
-    // we will do it manually on startup
-    disable_timg_wdts(&mut timg0, &mut timg1);
-    disable_rtc_wdt(&mut rtccntl);    
+    let system = peripherals.DPORT.split();
+    let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
+    let pins = IO::new(peripherals.GPIO, peripherals.IO_MUX).pins;
+    let mut delay = Delay::new(&clocks);
+
+    // Disable the RTC and TIMG watchdog timers
+    let mut rtc = Rtc::new(peripherals.RTC_CNTL);
+    let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks);
+    let mut wdt0 = timer_group0.wdt;
+    let timer_group1 = TimerGroup::new(peripherals.TIMG1, &clocks);
+    let mut wdt1 = timer_group1.wdt;
+    
+    rtc.rwdt.disable();
+    wdt0.disable();
+    wdt1.disable();
     {% else -%}
-    let dp = Peripherals::take().unwrap();
+    let pins = peripherals.GPIO.split();
     {% endif %}
 
-    let pins = dp.GPIO.split();
     let mut led = pins.gpio2.into_push_pull_output();
+    led.set_high().unwrap();
 
     {% if mcu == "esp8266" -%}
-    let (mut timer1, _) = dp.TIMER.timers();
+    let (mut timer1, _) = peripherals.TIMER.timers();
     {% endif %}
 
     loop {
-        led.set_high().unwrap();
+        led.toggle().unwrap();
         {% if mcu == "esp32" -%}
-        delay(CORE_HZ);
-        {% else -%}
-        timer1.delay_ms(500);
-        {% endif %}
-        led.set_low().unwrap();
-        {% if mcu == "esp32" -%}
-        delay(CORE_HZ);
+        delay.delay_ms(500u32);
         {% else -%}
         timer1.delay_ms(500);
         {% endif %}
     }
 }
-
-{% if mcu == "esp32" -%}
-fn disable_rtc_wdt(rtccntl: &mut target::RTCCNTL) {
-    /* Disables the RTCWDT */
-    rtccntl
-        .wdtwprotect
-        .write(|w| unsafe { w.bits(WDT_WKEY_VALUE) });
-    rtccntl.wdtconfig0.modify(|_, w| unsafe {
-        w.wdt_stg0()
-            .bits(0x0)
-            .wdt_stg1()
-            .bits(0x0)
-            .wdt_stg2()
-            .bits(0x0)
-            .wdt_stg3()
-            .bits(0x0)
-            .wdt_flashboot_mod_en()
-            .clear_bit()
-            .wdt_en()
-            .clear_bit()
-    });
-    rtccntl.wdtwprotect.write(|w| unsafe { w.bits(0x0) });
-}
-
-fn disable_timg_wdts(timg0: &mut target::TIMG0, timg1: &mut target::TIMG1) {
-    timg0
-        .wdtwprotect
-        .write(|w| unsafe { w.bits(WDT_WKEY_VALUE) });
-    timg1
-        .wdtwprotect
-        .write(|w| unsafe { w.bits(WDT_WKEY_VALUE) });
-
-    timg0.wdtconfig0.write(|w| unsafe { w.bits(0x0) });
-    timg1.wdtconfig0.write(|w| unsafe { w.bits(0x0) });
-}
-{% endif %}