Merge branch 'master' into tim16-pwm

# Conflicts:
#	CHANGELOG.md

CHANGELOG.md

@@ -7,11 +7,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
-### Added
-
-- PWM complementary output capability for TIM1 with new example to demonstrate
-- PWM output on complementary channels only for single channel timers (TIM16 + TIM17)
-
 ### Changed
 
 - Updated the `cast` dependency from 0.2 to 0.3
@@ -20,10 +15,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - Provide getters to serial status flags idle/txe/rxne/tc.
 - Provide ability to reset timer UIF interrupt flag
+- PWM complementary output capability for TIM1 with new example to demonstrate
+- PWM output on complementary channels only for single channel timers (TIM16 + TIM17)
 
 ### Fixed
 
 - Wrong mode when using PWM channel 2 of a two-channel timer
+- `adc_values` example conversion error
 
 ## [v0.18.0] - 2021-11-14
 

examples/adc_values.rs

@@ -79,7 +79,7 @@ fn SysTick() {
  if let Some(ref mut shared) = SHARED.borrow(cs).borrow_mut().deref_mut() {
  // Read temperature data from internal sensor using ADC
  let t = hal::adc::VTemp::read(&mut shared.adc, None);
- writeln!(shared.tx, "Temperature {}.{}C\r", t / 100, t % 100).ok();
+ writeln!(shared.tx, "Temperature {}.{}C\r", t / 10, t % 10).ok();
 
  // Read volatage reference data from internal sensor using ADC
  let t = hal::adc::VRef::read_vdda(&mut shared.adc);