Skip to content

Commit 42e0234

Browse files
fix(examples/esp32): update to new esp-hal version
1 parent 2460920 commit 42e0234

File tree

3 files changed

+24
-15
lines changed

3 files changed

+24
-15
lines changed

examples/esp32/examples/person_detect.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33

44
use esp_println::println;
55
use hal::clock::CpuClock;
6-
use hal::{clock::ClockControl, peripherals::Peripherals, prelude::*, timer::TimerGroup, Rtc};
6+
use hal::{
7+
clock::ClockControl, peripherals::Peripherals, prelude::*, rtc_cntl::Rtc,
8+
system::SystemControl, timer::timg::TimerGroup,
9+
};
710
use microflow::buffer::Buffer2D;
811
use microflow::model;
912

@@ -34,13 +37,13 @@ fn print_prediction(prediction: Buffer2D<f32, 1, 2>) {
3437
#[entry]
3538
fn main() -> ! {
3639
let peripherals = Peripherals::take();
37-
let system = peripherals.SYSTEM.split();
40+
let system = SystemControl::new(peripherals.SYSTEM);
3841
let clocks = ClockControl::configure(system.clock_control, CpuClock::Clock240MHz).freeze();
3942

40-
let mut rtc = Rtc::new(peripherals.LPWR);
41-
let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks);
43+
let mut rtc = Rtc::new(peripherals.LPWR, None);
44+
let timer_group0 = TimerGroup::new_async(peripherals.TIMG0, &clocks);
4245
let mut wdt0 = timer_group0.wdt;
43-
let timer_group1 = TimerGroup::new(peripherals.TIMG1, &clocks);
46+
let timer_group1 = TimerGroup::new_async(peripherals.TIMG1, &clocks);
4447
let mut wdt1 = timer_group1.wdt;
4548

4649
rtc.rwdt.disable();

examples/esp32/examples/sine.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
#![no_main]
33

44
use esp_println::println;
5-
use hal::{clock::ClockControl, peripherals::Peripherals, prelude::*, timer::TimerGroup, Rtc};
5+
use hal::{
6+
clock::ClockControl, peripherals::Peripherals, prelude::*, rtc_cntl::Rtc,
7+
system::SystemControl, timer::timg::TimerGroup,
8+
};
69
use libm::sinf;
710
use microflow::model;
811
use nalgebra::matrix;
@@ -15,13 +18,13 @@ struct Sine;
1518
#[entry]
1619
fn main() -> ! {
1720
let peripherals = Peripherals::take();
18-
let system = peripherals.SYSTEM.split();
21+
let system = SystemControl::new(peripherals.SYSTEM);
1922
let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
2023

21-
let mut rtc = Rtc::new(peripherals.LPWR);
22-
let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks);
24+
let mut rtc = Rtc::new(peripherals.LPWR, None);
25+
let timer_group0 = TimerGroup::new_async(peripherals.TIMG0, &clocks);
2326
let mut wdt0 = timer_group0.wdt;
24-
let timer_group1 = TimerGroup::new(peripherals.TIMG1, &clocks);
27+
let timer_group1 = TimerGroup::new_async(peripherals.TIMG1, &clocks);
2528
let mut wdt1 = timer_group1.wdt;
2629

2730
rtc.rwdt.disable();

examples/esp32/examples/speech.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33

44
use esp_println::println;
55
use hal::clock::CpuClock;
6-
use hal::{clock::ClockControl, peripherals::Peripherals, prelude::*, timer::TimerGroup, Rtc};
6+
use hal::{
7+
clock::ClockControl, peripherals::Peripherals, prelude::*, rtc_cntl::Rtc,
8+
system::SystemControl, timer::timg::TimerGroup,
9+
};
710
use microflow::buffer::Buffer2D;
811
use microflow::model;
912

@@ -38,13 +41,13 @@ fn print_prediction(prediction: Buffer2D<f32, 1, 4>) {
3841
#[entry]
3942
fn main() -> ! {
4043
let peripherals = Peripherals::take();
41-
let system = peripherals.SYSTEM.split();
44+
let system = SystemControl::new(peripherals.SYSTEM);
4245
let clocks = ClockControl::configure(system.clock_control, CpuClock::Clock240MHz).freeze();
4346

44-
let mut rtc = Rtc::new(peripherals.LPWR);
45-
let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks);
47+
let mut rtc = Rtc::new(peripherals.LPWR, None);
48+
let timer_group0 = TimerGroup::new_async(peripherals.TIMG0, &clocks);
4649
let mut wdt0 = timer_group0.wdt;
47-
let timer_group1 = TimerGroup::new(peripherals.TIMG1, &clocks);
50+
let timer_group1 = TimerGroup::new_async(peripherals.TIMG1, &clocks);
4851
let mut wdt1 = timer_group1.wdt;
4952

5053
rtc.rwdt.disable();

0 commit comments

Comments
 (0)