Skip to content
This repository was archived by the owner on Aug 9, 2022. It is now read-only.

Commit 78ebe3f

Browse files
arjanmelsarjanmels
committed
Updated examples
1 parent 7660890 commit 78ebe3f

File tree

7 files changed

+80
-33
lines changed

7 files changed

+80
-33
lines changed

‎examples/adc.rs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use esp32_hal::analog::adc::ADC;
1010
use esp32_hal::analog::config::{Adc1Config, Adc2Config, Attenuation};
1111
use esp32_hal::clock_control::sleep;
1212
use esp32_hal::dport::Split;
13-
use esp32_hal::serial::{config::Config, NoRx, NoTx, Serial};
13+
use esp32_hal::serial::{config::Config, Serial};
1414
use esp32_hal::target;
1515

1616
#[no_mangle]
@@ -38,10 +38,16 @@ fn main() -> ! {
3838
let (clkcntrl_config, mut watchdog) = clkcntrl.freeze().unwrap();
3939
watchdog.disable();
4040

41-
/* Setup serial connection */
42-
let serial = Serial::uart0(
41+
let gpios = dp.GPIO.split();
42+
43+
let serial: Serial<_, _, _> = Serial::new(
4344
dp.UART0,
44-
(NoTx, NoRx),
45+
esp32_hal::serial::Pins {
46+
tx: gpios.gpio1,
47+
rx: gpios.gpio3,
48+
cts: None,
49+
rts: None,
50+
},
4551
Config::default(),
4652
clkcntrl_config,
4753
&mut dport,
@@ -51,7 +57,6 @@ fn main() -> ! {
5157
let (mut tx, _rx) = serial.split();
5258

5359
/* Set ADC pins to analog mode */
54-
let gpios = dp.GPIO.split();
5560
let mut pin36 = gpios.gpio36.into_analog();
5661
let mut pin25 = gpios.gpio25.into_analog();
5762

‎examples/exception.rs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use esp32_hal::clock_control::{sleep, CPUSource::PLL, ClockControl};
1212
use esp32_hal::dport::Split;
1313
use esp32_hal::dprintln;
1414
use esp32_hal::interrupt::{clear_software_interrupt, Interrupt, Interrupt::*, InterruptLevel};
15-
use esp32_hal::serial::{config::Config, NoRx, NoTx, Serial};
15+
use esp32_hal::serial::{config::Config, Serial};
1616
use esp32_hal::target;
1717
use esp32_hal::Core::PRO;
1818

@@ -120,10 +120,16 @@ fn main() -> ! {
120120

121121
watchdog.start(20.s());
122122

123+
let gpios = dp.GPIO.split();
123124
// setup serial controller
124-
let mut uart0 = Serial::uart0(
125+
let mut uart0: Serial<_, _, _> = Serial::new(
125126
dp.UART0,
126-
(NoTx, NoRx),
127+
esp32_hal::serial::Pins {
128+
tx: gpios.gpio1,
129+
rx: gpios.gpio3,
130+
cts: None,
131+
rts: None,
132+
},
127133
Config::default(),
128134
clock_control_config,
129135
&mut dport,

‎examples/hall.rs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use esp32_hal::analog::adc::ADC;
1010
use esp32_hal::analog::config::{Adc1Config, Attenuation};
1111
use esp32_hal::clock_control::sleep;
1212
use esp32_hal::dport::Split;
13-
use esp32_hal::serial::{config::Config, NoRx, NoTx, Serial};
13+
use esp32_hal::serial::{config::Config, Serial};
1414
use esp32_hal::target;
1515

1616
#[no_mangle]
@@ -38,19 +38,25 @@ fn main() -> ! {
3838
let (clkcntrl_config, mut watchdog) = clkcntrl.freeze().unwrap();
3939
watchdog.disable();
4040

41-
/* Setup serial connection */
42-
let serial = Serial::uart0(
41+
let gpios = dp.GPIO.split();
42+
// setup serial controller
43+
let serial: Serial<_, _, _> = Serial::new(
4344
dp.UART0,
44-
(NoTx, NoRx),
45+
esp32_hal::serial::Pins {
46+
tx: gpios.gpio1,
47+
rx: gpios.gpio3,
48+
cts: None,
49+
rts: None,
50+
},
4551
Config::default(),
4652
clkcntrl_config,
4753
&mut dport,
4854
)
4955
.unwrap();
56+
5057
let (mut tx, _rx) = serial.split();
5158

5259
/* Set ADC pins to analog mode */
53-
let gpios = dp.GPIO.split();
5460
let mut pin36 = gpios.gpio36.into_analog();
5561
let mut pin39 = gpios.gpio39.into_analog();
5662

‎examples/multicore.rs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use esp32_hal::prelude::*;
99
use esp32_hal::clock_control::{CPUSource, ClockControl, ClockControlConfig};
1010
use esp32_hal::dport::Split;
1111
use esp32_hal::dprintln;
12-
use esp32_hal::serial::{config::Config, NoRx, NoTx, Serial};
12+
use esp32_hal::serial::{config::Config, Serial};
1313
use esp32_hal::target;
1414

1515
use xtensa_lx6::{get_stack_pointer, timer::get_cycle_count};
@@ -59,10 +59,16 @@ fn main() -> ! {
5959

6060
watchdog.start(3.s());
6161

62+
let gpios = dp.GPIO.split();
6263
// setup serial controller
63-
let mut uart0 = Serial::uart0(
64+
let mut uart0: Serial<_, _, _> = Serial::new(
6465
dp.UART0,
65-
(NoTx, NoRx),
66+
esp32_hal::serial::Pins {
67+
tx: gpios.gpio1,
68+
rx: gpios.gpio3,
69+
cts: None,
70+
rts: None,
71+
},
6672
Config::default(),
6773
clock_control_config,
6874
&mut dport,

‎examples/ram.rs

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use esp32_hal::prelude::*;
99
use esp32_hal::clock_control::{sleep, ClockControl};
1010
use esp32_hal::dport::Split;
1111
use esp32_hal::dprintln;
12-
use esp32_hal::serial::{config::Config, NoRx, NoTx, Serial};
12+
use esp32_hal::serial::{config::Config, Serial};
1313
use esp32_hal::target;
1414

1515
use xtensa_lx6::get_program_counter;
@@ -41,10 +41,16 @@ fn main() -> ! {
4141

4242
watchdog.start(15.s());
4343

44+
let gpios = dp.GPIO.split();
4445
// setup serial controller
45-
let mut uart0 = Serial::uart0(
46+
let mut uart0: Serial<_, _, _> = Serial::new(
4647
dp.UART0,
47-
(NoTx, NoRx),
48+
esp32_hal::serial::Pins {
49+
tx: gpios.gpio1,
50+
rx: gpios.gpio3,
51+
cts: None,
52+
rts: None,
53+
},
4854
Config::default(),
4955
clock_control_config,
5056
&mut dport,
@@ -66,7 +72,7 @@ fn main() -> ! {
6672
}
6773
}
6874

69-
fn attr_none_fn(uart: &mut esp32_hal::serial::Serial<target::UART0, (NoTx, NoRx)>) {
75+
fn attr_none_fn(uart: &mut dyn core::fmt::Write) {
7076
writeln!(
7177
uart,
7278
"{:<40}: {:08x?}",
@@ -77,7 +83,7 @@ fn attr_none_fn(uart: &mut esp32_hal::serial::Serial<target::UART0, (NoTx, NoRx)
7783
}
7884

7985
#[ram]
80-
fn attr_ram_fn(uart: &mut esp32_hal::serial::Serial<target::UART0, (NoTx, NoRx)>) {
86+
fn attr_ram_fn(uart: &mut dyn core::fmt::Write) {
8187
writeln!(
8288
uart,
8389
"{:<40}: {:08x?}",
@@ -88,7 +94,7 @@ fn attr_ram_fn(uart: &mut esp32_hal::serial::Serial<target::UART0, (NoTx, NoRx)>
8894
}
8995

9096
#[ram(rtc_slow)]
91-
fn attr_ram_fn_rtc_slow(uart: &mut esp32_hal::serial::Serial<target::UART0, (NoTx, NoRx)>) {
97+
fn attr_ram_fn_rtc_slow(uart: &mut dyn core::fmt::Write) {
9298
writeln!(
9399
uart,
94100
"{:<40}: {:08x?}",
@@ -99,7 +105,7 @@ fn attr_ram_fn_rtc_slow(uart: &mut esp32_hal::serial::Serial<target::UART0, (NoT
99105
}
100106

101107
#[ram(rtc_fast)]
102-
fn attr_ram_fn_rtc_fast(uart: &mut esp32_hal::serial::Serial<target::UART0, (NoTx, NoRx)>) {
108+
fn attr_ram_fn_rtc_fast(uart: &mut dyn core::fmt::Write) {
103109
writeln!(
104110
uart,
105111
"{:<40}: {:08x?}",
@@ -170,7 +176,7 @@ macro_rules! print_info {
170176
};
171177
}
172178

173-
fn ram_tests(uart: &mut esp32_hal::serial::Serial<target::UART0, (NoTx, NoRx)>) {
179+
fn ram_tests(uart: &mut dyn core::fmt::Write) {
174180
writeln!(uart).unwrap();
175181

176182
attr_none_fn(uart);
@@ -207,10 +213,10 @@ fn ram_tests(uart: &mut esp32_hal::serial::Serial<target::UART0, (NoTx, NoRx)>)
207213
}
208214

209215
#[cfg(not(feature = "external_ram"))]
210-
fn external_ram(_uart: &mut esp32_hal::serial::Serial<target::UART0, (NoTx, NoRx)>) {}
216+
fn external_ram(_uart: &mut dyn core::fmt::Write) {}
211217

212218
#[cfg(feature = "external_ram")]
213-
fn external_ram(uart: &mut esp32_hal::serial::Serial<target::UART0, (NoTx, NoRx)>) {
219+
fn external_ram(uart: &mut core::fmt::Write) {
214220
unsafe {
215221
print_info!(uart, ATTR_RAM_STATIC_EXTERNAL);
216222
print_info!(uart, ATTR_RAM_STATIC_EXTERNAL_BSS);

‎examples/rtccntl.rs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use esp32_hal::prelude::*;
99
use esp32_hal::clock_control::{sleep, CPUSource, ClockControl, ClockControlConfig};
1010
use esp32_hal::dport::Split;
1111
use esp32_hal::dprintln;
12-
use esp32_hal::serial::{config::Config, NoRx, NoTx, Serial};
12+
use esp32_hal::serial::{config::Config, Serial};
1313
use esp32_hal::target;
1414

1515
const BLINK_HZ: Hertz = Hertz(1);
@@ -53,16 +53,21 @@ fn main() -> ! {
5353

5454
watchdog.start(3.s());
5555

56+
let gpios = dp.GPIO.split();
5657
// setup serial controller
57-
let mut uart0 = Serial::uart0(
58+
let mut uart0: Serial<_, _, _> = Serial::new(
5859
dp.UART0,
59-
(NoTx, NoRx),
60+
esp32_hal::serial::Pins {
61+
tx: gpios.gpio1,
62+
rx: gpios.gpio3,
63+
cts: None,
64+
rts: None,
65+
},
6066
Config::default(),
6167
clock_control_config,
6268
&mut dport,
6369
)
6470
.unwrap();
65-
6671
uart0.change_baudrate(115200).unwrap();
6772

6873
// print startup message

‎examples/timer.rs

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use esp32_hal::{
99
dprintln,
1010
interrupt::{Interrupt, InterruptLevel},
1111
prelude::*,
12-
serial::{config::Config, NoRx, NoTx, Serial},
12+
serial::{config::Config, Serial},
1313
target,
1414
timer::{
1515
watchdog::{self, WatchDogResetDuration, WatchdogAction, WatchdogConfig},
@@ -81,8 +81,21 @@ fn main() -> ! {
8181
..Default::default()
8282
};
8383

84-
let serial =
85-
Serial::uart0(dp.UART0, (NoTx, NoRx), config, clkcntrl_config, &mut dport).unwrap();
84+
let gpios = dp.GPIO.split();
85+
// setup serial controller
86+
let serial: Serial<_, _, _> = Serial::new(
87+
dp.UART0,
88+
esp32_hal::serial::Pins {
89+
tx: gpios.gpio1,
90+
rx: gpios.gpio3,
91+
cts: None,
92+
rts: None,
93+
},
94+
config,
95+
clkcntrl_config,
96+
&mut dport,
97+
)
98+
.unwrap();
8699

87100
let (mut tx, _) = serial.split();
88101

0 commit comments

Comments
 (0)