ExternalVendorCode/chirpstack
1
0
Fork 0
mirror of https://github.com/chirpstack/chirpstack.git synced 2024-12-21 14:07:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix sending channel-mask twice for US915 (like).

Browse Source
This commit is contained in:
Orne Brocaar 2023-07-03 12:27:26 +01:00
parent 258e103f22
commit 4031c5cb95
2 changed files with 44 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
chirpstack/src/uplink/join.rs
View File

@ -791,35 +791,48 @@ impl JoinRequest {
device_profile.reset_session_to_boot_params(&mut ds);
if let Some(CFList::Channels(channels)) =
region_conf.get_cf_list(device_profile.mac_version)
{
for f in channels.iter().cloned() {
if f == 0 {
continue;
match region_conf.get_cf_list(device_profile.mac_version) {
Some(CFList::Channels(channels)) => {
for f in channels.iter().cloned() {
if f == 0 {
continue;
}
let i = region_conf
.get_uplink_channel_index(f, true)
.context("Unknown cf_list frequency")?;
ds.enabled_uplink_channel_indices.push(i as u32);
// add extra channel to extra uplink channels, so that we can
// keep track on frequency and data-rate changes
let c = region_conf
.get_uplink_channel(i)
.context("Get uplink channel error")?;
ds.extra_uplink_channels.insert(
i as u32,
internal::DeviceSessionChannel {
frequency: c.frequency,
min_dr: c.min_dr as u32,
max_dr: c.max_dr as u32,
},
);
}
let i = region_conf
.get_uplink_channel_index(f, true)
.context("Unknown cf_list frequency")?;
ds.enabled_uplink_channel_indices.push(i as u32);
// add extra channel to extra uplink channels, so that we can
// keep track on frequency and data-rate changes
let c = region_conf
.get_uplink_channel(i)
.context("Get uplink channel error")?;
ds.extra_uplink_channels.insert(
i as u32,
internal::DeviceSessionChannel {
frequency: c.frequency,
min_dr: c.min_dr as u32,
max_dr: c.max_dr as u32,
},
);
}
Some(CFList::ChannelMask(masks)) => {
ds.enabled_uplink_channel_indices = vec![];
for (block_i, block) in masks.iter().enumerate() {
for (channel_i, enabled) in block.into_iter().enumerate() {
if enabled {
ds.enabled_uplink_channel_indices
.push((channel_i + (block_i * 16)) as u32);
}
}
}
}
None => {}
}
device_session::save(&ds)

4
lrwn/src/cflist.rs
View File

@ -141,6 +141,10 @@ impl CFListChannelMasks {
Ok(b)
}
pub fn iter(&self) -> std::slice::Iter<'_, ChMask> {
self.0.iter()
}
}
/// ChMask encodes the channels usable for uplink access. 0 = channel 1,