aboutsummaryrefslogtreecommitdiff
path: root/embassy-stm32/src/adc
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2023-03-27 12:36:31 +0200
committerDario Nieuwenhuis <[email protected]>2023-03-27 12:36:31 +0200
commita33774ec5174d469639a63fe112907cd4e596fff (patch)
tree9a817268ef44a3861de6b5a1bbda549bd92aa01c /embassy-stm32/src/adc
parent8a3a7c65a89e27883a2ab7524162f26851c4c10a (diff)
Update stm32-metapac
Diffstat (limited to 'embassy-stm32/src/adc')
-rw-r--r--embassy-stm32/src/adc/sample_time.rs13
1 files changed, 4 insertions, 9 deletions
diff --git a/embassy-stm32/src/adc/sample_time.rs b/embassy-stm32/src/adc/sample_time.rs
index 60ba80048..bc5fb1d6f 100644
--- a/embassy-stm32/src/adc/sample_time.rs
+++ b/embassy-stm32/src/adc/sample_time.rs
@@ -1,5 +1,5 @@
1macro_rules! impl_sample_time { 1macro_rules! impl_sample_time {
2 ($default_doc:expr, $default:ident, $pac:ty, ($(($doc:expr, $variant:ident, $pac_variant:ident)),*)) => { 2 ($default_doc:expr, $default:ident, ($(($doc:expr, $variant:ident, $pac_variant:ident)),*)) => {
3 #[doc = concat!("ADC sample time\n\nThe default setting is ", $default_doc, " ADC clock cycles.")] 3 #[doc = concat!("ADC sample time\n\nThe default setting is ", $default_doc, " ADC clock cycles.")]
4 #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd)] 4 #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd)]
5 pub enum SampleTime { 5 pub enum SampleTime {
@@ -9,10 +9,10 @@ macro_rules! impl_sample_time {
9 )* 9 )*
10 } 10 }
11 11
12 impl From<SampleTime> for $pac { 12 impl From<SampleTime> for crate::pac::adc::vals::SampleTime {
13 fn from(sample_time: SampleTime) -> $pac { 13 fn from(sample_time: SampleTime) -> crate::pac::adc::vals::SampleTime {
14 match sample_time { 14 match sample_time {
15 $(SampleTime::$variant => <$pac>::$pac_variant),* 15 $(SampleTime::$variant => crate::pac::adc::vals::SampleTime::$pac_variant),*
16 } 16 }
17 } 17 }
18 } 18 }
@@ -29,7 +29,6 @@ macro_rules! impl_sample_time {
29impl_sample_time!( 29impl_sample_time!(
30 "1.5", 30 "1.5",
31 Cycles1_5, 31 Cycles1_5,
32 crate::pac::adc::vals::SampleTime,
33 ( 32 (
34 ("1.5", Cycles1_5, CYCLES1_5), 33 ("1.5", Cycles1_5, CYCLES1_5),
35 ("7.5", Cycles7_5, CYCLES7_5), 34 ("7.5", Cycles7_5, CYCLES7_5),
@@ -46,7 +45,6 @@ impl_sample_time!(
46impl_sample_time!( 45impl_sample_time!(
47 "3", 46 "3",
48 Cycles3, 47 Cycles3,
49 crate::pac::adc::vals::Smp,
50 ( 48 (
51 ("3", Cycles3, CYCLES3), 49 ("3", Cycles3, CYCLES3),
52 ("15", Cycles15, CYCLES15), 50 ("15", Cycles15, CYCLES15),
@@ -63,7 +61,6 @@ impl_sample_time!(
63impl_sample_time!( 61impl_sample_time!(
64 "2.5", 62 "2.5",
65 Cycles2_5, 63 Cycles2_5,
66 crate::pac::adc::vals::SampleTime,
67 ( 64 (
68 ("2.5", Cycles2_5, CYCLES2_5), 65 ("2.5", Cycles2_5, CYCLES2_5),
69 ("6.5", Cycles6_5, CYCLES6_5), 66 ("6.5", Cycles6_5, CYCLES6_5),
@@ -80,7 +77,6 @@ impl_sample_time!(
80impl_sample_time!( 77impl_sample_time!(
81 "1.5", 78 "1.5",
82 Cycles1_5, 79 Cycles1_5,
83 crate::pac::adc::vals::SampleTime,
84 ( 80 (
85 ("1.5", Cycles1_5, CYCLES1_5), 81 ("1.5", Cycles1_5, CYCLES1_5),
86 ("3.5", Cycles3_5, CYCLES3_5), 82 ("3.5", Cycles3_5, CYCLES3_5),
@@ -97,7 +93,6 @@ impl_sample_time!(
97impl_sample_time!( 93impl_sample_time!(
98 "1.5", 94 "1.5",
99 Cycles1_5, 95 Cycles1_5,
100 crate::pac::adc::vals::Smp,
101 ( 96 (
102 ("1.5", Cycles1_5, CYCLES1_5), 97 ("1.5", Cycles1_5, CYCLES1_5),
103 ("2.5", Cycles2_5, CYCLES2_5), 98 ("2.5", Cycles2_5, CYCLES2_5),