Skip to content

Commit 24706bc

Browse files
committed
Rename SampelTime variants to CamelCase
1 parent 7bb9700 commit 24706bc

File tree

2 files changed

+28
-26
lines changed

2 files changed

+28
-26
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
108108
- All non-camel-case types are chaged to be consistently camel-case types.
109109
Types which do not follow these rules are re-exported types by `stm32f3` for
110110
example. ([#266])
111+
- Adc's `SampleTime` type has been reworked and is now a consistent wrapper around
112+
the underlying types for `stm32f3`'s `SMP9_A` and `SMP18_A` type. ([#266])
111113

112114
## [v0.7.0] - 2021-06-18
113115

src/adc.rs

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -53,56 +53,56 @@ pub struct Adc<ADC> {
5353
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
5454
pub enum SampleTime {
5555
/// 1.5 ADC clock cycles
56-
T_1,
56+
Cycles1C5,
5757
/// 2.5 ADC clock cycles
58-
T_2,
58+
Cycles2C5,
5959
/// 4.5 ADC clock cycles
60-
T_4,
60+
Cycles4C5,
6161
/// 7.5 ADC clock cycles
62-
T_7,
62+
Cycles7C5,
6363
/// 19.5 ADC clock cycles
64-
T_19,
64+
Cycles19C5,
6565
/// 61.5 ADC clock cycles
66-
T_61,
66+
Cycles61C5,
6767
/// 181.5 ADC clock cycles
68-
T_181,
68+
Cycles181C5,
6969
/// 601.5 ADC clock cycles
70-
T_601,
70+
Cycles601C5,
7171
}
7272

7373
impl Default for SampleTime {
74-
/// T_1 is also the reset value.
74+
/// [`SampelTime::Cycles1C5`] is also the reset value.
7575
fn default() -> Self {
76-
SampleTime::T_1
76+
SampleTime::Cycles1C5
7777
}
7878
}
7979

8080
impl From<SampleTime> for SMP9_A {
8181
fn from(t: SampleTime) -> Self {
8282
match t {
83-
SampleTime::T_1 => Self::CYCLES1_5,
84-
SampleTime::T_2 => Self::CYCLES2_5,
85-
SampleTime::T_4 => Self::CYCLES4_5,
86-
SampleTime::T_7 => Self::CYCLES7_5,
87-
SampleTime::T_19 => Self::CYCLES19_5,
88-
SampleTime::T_61 => Self::CYCLES61_5,
89-
SampleTime::T_181 => Self::CYCLES181_5,
90-
SampleTime::T_601 => Self::CYCLES601_5,
83+
SampleTime::Cycles1C5 => Self::CYCLES1_5,
84+
SampleTime::Cycles2C5 => Self::CYCLES2_5,
85+
SampleTime::Cycles4C5 => Self::CYCLES4_5,
86+
SampleTime::Cycles7C5 => Self::CYCLES7_5,
87+
SampleTime::Cycles19C5 => Self::CYCLES19_5,
88+
SampleTime::Cycles61C5 => Self::CYCLES61_5,
89+
SampleTime::Cycles181C5 => Self::CYCLES181_5,
90+
SampleTime::Cycles601C5 => Self::CYCLES601_5,
9191
}
9292
}
9393
}
9494

9595
impl From<SampleTime> for SMP18_A {
9696
fn from(t: SampleTime) -> Self {
9797
match t {
98-
SampleTime::T_1 => Self::CYCLES1_5,
99-
SampleTime::T_2 => Self::CYCLES2_5,
100-
SampleTime::T_4 => Self::CYCLES4_5,
101-
SampleTime::T_7 => Self::CYCLES7_5,
102-
SampleTime::T_19 => Self::CYCLES19_5,
103-
SampleTime::T_61 => Self::CYCLES61_5,
104-
SampleTime::T_181 => Self::CYCLES181_5,
105-
SampleTime::T_601 => Self::CYCLES601_5,
98+
SampleTime::Cycles1C5 => Self::CYCLES1_5,
99+
SampleTime::Cycles2C5 => Self::CYCLES2_5,
100+
SampleTime::Cycles4C5 => Self::CYCLES4_5,
101+
SampleTime::Cycles7C5 => Self::CYCLES7_5,
102+
SampleTime::Cycles19C5 => Self::CYCLES19_5,
103+
SampleTime::Cycles61C5 => Self::CYCLES61_5,
104+
SampleTime::Cycles181C5 => Self::CYCLES181_5,
105+
SampleTime::Cycles601C5 => Self::CYCLES601_5,
106106
}
107107
}
108108
}

0 commit comments

Comments
 (0)