Skip to content

Commit 4e25b7c

Browse files
kevswimsluctius
authored andcommitted
Update stm32g4 PAC to 0.15.1
1 parent 3c55b87 commit 4e25b7c

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ version = "0.0.0"
1313

1414
[dependencies]
1515
nb = "0.1.1"
16-
stm32g4 = "0.14.0"
16+
stm32g4 = "0.15.1"
1717
paste = "1.0"
1818
bitflags = "1.2"
1919
vcell = "0.1"

src/fdcan.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1162,7 +1162,7 @@ where
11621162
pub fn error_counters(&self) -> ErrorCounters {
11631163
let can = self.registers();
11641164
let cel: u8 = can.ecr.read().cel().bits();
1165-
let rp: bool = can.ecr.read().rp().bits();
1165+
let rp: bool = can.ecr.read().rp().bit();
11661166
let rec: u8 = can.ecr.read().rec().bits();
11671167
let tec: u8 = can.ecr.read().tec().bits();
11681168

src/opamp.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,8 @@ macro_rules! opamps {
256256
.output()
257257
.opaintoen()
258258
.variant(match output {
259-
Some(_) => OPAINTOEN_A::OUTPUTPIN,
260-
None => OPAINTOEN_A::ADCCHANNEL,
259+
Some(_) => OPAINTOEN_A::OutputPin,
260+
None => OPAINTOEN_A::Adcchannel,
261261
})
262262
.opaen()
263263
.enabled()
@@ -324,8 +324,8 @@ macro_rules! opamps {
324324
.$inverting_mask()
325325
.opaintoen()
326326
.variant(match output {
327-
Some(_) => OPAINTOEN_A::OUTPUTPIN,
328-
None => OPAINTOEN_A::ADCCHANNEL,
327+
Some(_) => OPAINTOEN_A::OutputPin,
328+
None => OPAINTOEN_A::Adcchannel,
329329
})
330330
.opaen()
331331
.enabled()

src/pwm.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1526,7 +1526,7 @@ macro_rules! tim_pin_hal {
15261526

15271527
// Even though the field is 20 bits long for 16-bit counters, only 16 bits are
15281528
// valid, so we convert to the appropriate type.
1529-
tim.$ccrx.read().ccr().bits() as $typ
1529+
tim.$ccrx().read().ccr().bits() as $typ
15301530
}
15311531

15321532
fn get_max_duty(&self) -> Self::Duty {
@@ -1551,7 +1551,7 @@ macro_rules! tim_pin_hal {
15511551
fn set_duty(&mut self, duty: Self::Duty) {
15521552
let tim = unsafe { &*$TIMX::ptr() };
15531553

1554-
tim.$ccrx.write(|w| unsafe { w.ccr().bits(duty.into()) });
1554+
tim.$ccrx().write(|w| unsafe { w.ccr().bits(duty.into()) });
15551555
}
15561556
}
15571557

0 commit comments

Comments
 (0)