Fix incorrect FSK datarate multiplication.

The HAL and Protobuf messages already contain the bitrate per second.
chirpstack · Nov 27, 2024 · 1d29728 · 1d29728
1 parent 8084cbd
commit 1d29728
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/chirpstack-concentratord-sx1301/src/wrapper/mod.rs b/chirpstack-concentratord-sx1301/src/wrapper/mod.rs
@@ -103,7 +103,7 @@ pub fn uplink_to_proto(
             tx_info.modulation = Some(gw::Modulation {
                 parameters: Some(gw::modulation::Parameters::Fsk(gw::FskModulationInfo {
                     datarate: match packet.datarate {
-                        hal::DataRate::FSK(v) => v * 1000,
+                        hal::DataRate::FSK(v) => v,
                         _ => return Err(anyhow!("unexpected datarate")),
                     },
                     ..Default::default()
@@ -345,7 +345,7 @@ pub fn downlink_to_tx_info_proto(packet: &hal::TxPacket) -> Result<gw::DownlinkT
             tx_info.modulation = Some(gw::Modulation {
                 parameters: Some(gw::modulation::Parameters::Fsk(gw::FskModulationInfo {
                     datarate: match packet.datarate {
-                        hal::DataRate::FSK(v) => v * 1000,
+                        hal::DataRate::FSK(v) => v,
                         _ => return Err(anyhow!("unexpected datarate")),
                     },
                     ..Default::default()

diff --git a/chirpstack-concentratord-sx1302/src/wrapper/mod.rs b/chirpstack-concentratord-sx1302/src/wrapper/mod.rs
@@ -116,7 +116,7 @@ pub fn uplink_to_proto(
                     hal::Modulation::FSK => {
                         Some(gw::modulation::Parameters::Fsk(gw::FskModulationInfo {
                             datarate: match packet.datarate {
-                                hal::DataRate::FSK(v) => v * 1000,
+                                hal::DataRate::FSK(v) => v,
                                 _ => return Err(anyhow!("unexpected datarate")),
                             },
                             ..Default::default()
@@ -333,7 +333,7 @@ pub fn downlink_to_tx_info_proto(packet: &hal::TxPacket) -> Result<gw::DownlinkT
                 hal::Modulation::FSK => {
                     Some(gw::modulation::Parameters::Fsk(gw::FskModulationInfo {
                         datarate: match packet.datarate {
-                            hal::DataRate::FSK(v) => v * 1000,
+                            hal::DataRate::FSK(v) => v,
                             _ => return Err(anyhow!("unexpected datarate")),
                         },
                         ..Default::default()