ExternalVendorCode/chirpstack
1
0
Fork 0
mirror of https://github.com/chirpstack/chirpstack.git synced 2024-12-23 15:02:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make it possible to use DeviceModeInd for LW 1.0.x devices.

Browse Source 
This change makes it possible to use the DeviceModeInd mac-command to
switch between Class-A / C for LoRaWAN 1.0.x devices. In such a case the
Supports Class-C would be disabled for LoRaWAN 1.0.x devices, meaning
that on OTAA the device is marked as Class-A. If the device then sends a
DeviceModeInd mac-command, this will cause the to be marked as
Class-C, event.

This was (unintentionally) possible in v3, but this part of the Class-B
beacon locked code would prevent to make the same work in v4.
This commit is contained in:
Orne Brocaar 2023-07-26 12:01:52 +01:00
parent 7ff12f5ae7
commit afc196095d
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
chirpstack/src/uplink/data.rs
View File

@ -131,7 +131,7 @@ impl Data {
ctx.log_uplink_frame_set().await?; ctx.log_uplink_frame_set().await?;
ctx.set_adr()?; ctx.set_adr()?;
ctx.set_uplink_data_rate().await?; ctx.set_uplink_data_rate().await?;
ctx.set_enabled_class().await?; ctx.handle_class_b_beacon_locked().await?;
ctx.log_uplink_meta().await?; ctx.log_uplink_meta().await?;
ctx.reset_channels_on_adr_ack_req()?; ctx.reset_channels_on_adr_ack_req()?;
ctx.handle_mac_commands().await?; ctx.handle_mac_commands().await?;
@ -195,7 +195,7 @@ impl Data {
ctx.decrypt_frm_payload()?; ctx.decrypt_frm_payload()?;
ctx.set_adr()?; ctx.set_adr()?;
ctx.set_uplink_data_rate_relayed().await?; ctx.set_uplink_data_rate_relayed().await?;
ctx.set_enabled_class().await?; ctx.handle_class_b_beacon_locked().await?;
ctx.reset_channels_on_adr_ack_req()?; ctx.reset_channels_on_adr_ack_req()?;
ctx.handle_mac_commands().await?; ctx.handle_mac_commands().await?;
ctx.append_meta_data_to_uplink_history_relayed()?; ctx.append_meta_data_to_uplink_history_relayed()?;
@ -704,27 +704,26 @@ impl Data {
Ok(()) Ok(())
} }
async fn set_enabled_class(&mut self) -> Result<()> { async fn handle_class_b_beacon_locked(&mut self) -> Result<()> {
trace!("Set enabled class"); trace!("Handle Class-B beacon locked");
let dev = self.device.as_mut().unwrap(); let dev = self.device.as_mut().unwrap();
let dp = self.device_profile.as_ref().unwrap(); let dp = self.device_profile.as_ref().unwrap();
let mut mode = match dp.supports_class_c { let mut enabled_class = dev.enabled_class;
true => DeviceClass::C,
false => DeviceClass::A,
};
if let lrwn::Payload::MACPayload(pl) = &self.phy_payload.payload { if dp.supports_class_b {
let locked = pl.fhdr.f_ctrl.class_b; if let lrwn::Payload::MACPayload(pl) = &self.phy_payload.payload {
mode = match locked { let locked = pl.fhdr.f_ctrl.class_b;
true => DeviceClass::B, enabled_class = match locked {
false => mode, true => DeviceClass::B,
}; false => DeviceClass::A,
};
}
} }
// Update if the enabled class has changed. // Update if the enabled class has changed.
if dev.enabled_class != mode { if dev.enabled_class != enabled_class {
*dev = device::set_enabled_class(&dev.dev_eui, mode).await?; *dev = device::set_enabled_class(&dev.dev_eui, enabled_class).await?;
} }
Ok(()) Ok(())