Skip to content

Commit

Permalink
Merge pull request #174 from eupn/fix-typos
Browse files Browse the repository at this point in the history
Fix typos
  • Loading branch information
therealprof authored Jan 21, 2020
2 parents b7060db + b272535 commit bbb7513
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Add methods `stop`, `release` and `clear_update_interrupt_flag` to `Timer` (`clear_update_interrupt_flag` does not apply to `Timer<SYST>`)
- Add timer interrupt example using RTFM
- Implement IndependentWatchdog for the IWDG peripheral
- Remove all PWM channel configurations except 'all the channels for default remapping' configuratons
- Remove all PWM channel configurations except 'all the channels for default remapping' configurations
- Update PWM documentation: clarify custom selection of channels
- Add PWM example for custom selection of channels

Expand Down
2 changes: 1 addition & 1 deletion examples/blinky.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//! This assumes that a LED is connected to pc13 as is the case on the blue pill board.
//!
//! Note: Without additional hardware, PC13 should not be used to drive an LED, see page 5.1.2 of
//! the reference manaual for an explanation. This is not an issue on the blue pill.
//! the reference manual for an explanation. This is not an issue on the blue pill.
#![deny(unsafe_code)]
#![no_std]
Expand Down
2 changes: 1 addition & 1 deletion examples/blinky_rtc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//! This assumes that a LED is connected to pc13 as is the case on the blue pill board.
//!
//! Note: Without additional hardware, PC13 should not be used to drive a LED, see
//! section 5.1.2 of the reference manaual for an explanation.
//! section 5.1.2 of the reference manual for an explanation.
//! This is not an issue on the blue pill.
#![deny(unsafe_code)]
Expand Down
2 changes: 1 addition & 1 deletion examples/led.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//! If compiled for the stm32f100, this assumes that an active high LED is connected to pc9
//!
//! Note: Without additional hardware, PC13 should not be used to drive a LED, see
//! section 5.1.2 of the reference manaual for an explanation.
//! section 5.1.2 of the reference manual for an explanation.
//! This is not an issue on the blue pill.
#![deny(unsafe_code)]
Expand Down
2 changes: 1 addition & 1 deletion examples/timer-interrupt-rtfm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//! This assumes that a LED is connected to pc13 as is the case on the blue pill board.
//!
//! Note: Without additional hardware, PC13 should not be used to drive an LED, see page 5.1.2 of
//! the reference manaual for an explanation. This is not an issue on the blue pill.
//! the reference manual for an explanation. This is not an issue on the blue pill.
#![no_std]
#![no_main]
Expand Down
2 changes: 1 addition & 1 deletion src/backup_domain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use crate::pac::BKP;

/**
The existence of this struct indicates that writing to the the backup
domain has been enabled. It is aquired by calling `constrain` on `rcc::Rcc::BKP`
domain has been enabled. It is acquired by calling `constrain` on `rcc::Rcc::BKP`
*/
pub struct BackupDomain {
pub(crate) _regs: BKP,
Expand Down
2 changes: 1 addition & 1 deletion src/serial.rs
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ trait UsartReadWrite: Deref<Target=crate::stm32::usart1::RegisterBlock> {
};

if let Some(err) = err {
// Some error occured. In order to clear that error flag, you have to
// Some error occurred. In order to clear that error flag, you have to
// do a read from the sr register followed by a read from the dr
// register
// NOTE(read_volatile) see `write_volatile` below
Expand Down
6 changes: 3 additions & 3 deletions src/time.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ impl Into<KiloHertz> for MegaHertz {
}
}

/// A monotonic nondecreasing timer
/// A monotonic non-decreasing timer
#[derive(Clone, Copy)]
pub struct MonoTimer {
frequency: Hertz,
Expand All @@ -93,7 +93,7 @@ impl MonoTimer {
pub fn new(mut dwt: DWT, clocks: Clocks) -> Self {
dwt.enable_cycle_counter();

// now the CYCCNT counter can't be stopped or resetted
// now the CYCCNT counter can't be stopped or reset
drop(dwt);

MonoTimer {
Expand All @@ -114,7 +114,7 @@ impl MonoTimer {
}
}

/// A measurement of a monotonically nondecreasing clock
/// A measurement of a monotonically non-decreasing clock
#[derive(Clone, Copy)]
pub struct Instant {
now: u32,
Expand Down
2 changes: 1 addition & 1 deletion src/timer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ impl CountDownTimer<SYST> {
let ticks = u64(reload_value - SYST::get_current());

// It is safe to make this cast since the maximum ticks is (2^24 - 1) and the minimum sysclk
// is 4Mhz, which gives a maximum period of ~4.2 seconds which is < (2^32 - 1) microsenconds
// is 4Mhz, which gives a maximum period of ~4.2 seconds which is < (2^32 - 1) microseconds
u32(1_000_000 * ticks / timer_clock).unwrap()
}

Expand Down

0 comments on commit bbb7513

Please sign in to comment.