Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions hal/src/subghz/mod_params.rs
Original file line number Diff line number Diff line change
Expand Up @@ -213,15 +213,14 @@ impl FskBitrate {
/// ```
pub const fn from_bps(bps: u32) -> Self {
const MAX: u32 = 0x00FF_FFFF;
if bps == 0 {
let bits: u32 = match (32u32 * 32_000_000).checked_div(bps) {
Some(bits) => bits,
None => MAX,
};
if bits > MAX {
Self { bits: MAX }
} else {
let bits: u32 = 32 * 32_000_000 / bps;
if bits > MAX {
Self { bits: MAX }
} else {
Self { bits }
}
Self { bits }
}
}

Expand Down Expand Up @@ -258,10 +257,9 @@ impl FskBitrate {
/// assert_eq!(BITRATE.as_bps(), BITS_PER_SEC);
/// ```
pub const fn as_bps(&self) -> u32 {
if self.bits == 0 {
0
} else {
32 * 32_000_000 / self.bits
match (32u32 * 32_000_000).checked_div(self.bits) {
Some(bps) => bps,
None => 0,
}
}

Expand Down