Skip to content

Commit a81a513

Browse files
committed
Merge branch 'master' into tim16-pwm
# Conflicts: # CHANGELOG.md
2 parents 76fa66f + eed06fb commit a81a513

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

CHANGELOG.md

+3-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
77

88
## [Unreleased]
99

10-
### Added
11-
12-
- PWM complementary output capability for TIM1 with new example to demonstrate
13-
- PWM output on complementary channels only for single channel timers (TIM16 + TIM17)
14-
1510
### Changed
1611

1712
- Updated the `cast` dependency from 0.2 to 0.3
@@ -20,10 +15,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
2015

2116
- Provide getters to serial status flags idle/txe/rxne/tc.
2217
- Provide ability to reset timer UIF interrupt flag
18+
- PWM complementary output capability for TIM1 with new example to demonstrate
19+
- PWM output on complementary channels only for single channel timers (TIM16 + TIM17)
2320

2421
### Fixed
2522

2623
- Wrong mode when using PWM channel 2 of a two-channel timer
24+
- `adc_values` example conversion error
2725

2826
## [v0.18.0] - 2021-11-14
2927

examples/adc_values.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ fn SysTick() {
7979
if let Some(ref mut shared) = SHARED.borrow(cs).borrow_mut().deref_mut() {
8080
// Read temperature data from internal sensor using ADC
8181
let t = hal::adc::VTemp::read(&mut shared.adc, None);
82-
writeln!(shared.tx, "Temperature {}.{}C\r", t / 100, t % 100).ok();
82+
writeln!(shared.tx, "Temperature {}.{}C\r", t / 10, t % 10).ok();
8383

8484
// Read volatage reference data from internal sensor using ADC
8585
let t = hal::adc::VRef::read_vdda(&mut shared.adc);

0 commit comments

Comments
 (0)