Skip to content

fix: Add ArmFailSafe to IP Commissioning Path #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tom-code merged 1 commit into from
May 23, 2026
Merged

fix: Add ArmFailSafe to IP Commissioning Path #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions src/commission.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const CMD_OPERATIONAL_CSRREQUEST: u32 = 0x4;
//const CMD_OPERATIONAL_CERTCHAIN_REQUEST: u32 = 0x2;

const CLUSTER_GENERAL_COMMISSIONING: u32 = 0x30;
#[cfg(feature = "ble")]
const CMD_GENERAL_COMMISSIONING_ARMFAILSAFE: u32 = 0;
//const CMD_GENERAL_COMMISSIONING_SETREGULATORYCONFIG: u32 = 2;
const CMD_GENERAL_COMMISSIONING_COMMISSIONINGCOMPLETE: u32 = 4;
Expand Down Expand Up @@ -287,18 +286,19 @@ pub(crate) async fn commission(
let mut retrctx = retransmit::RetrContext::new(connection, session);
let base: u16 = rand::random();

let csrd = send_csr(&mut retrctx, base).await?;
arm_failsafe(&mut retrctx, 60, base).await?;

let csrd = send_csr(&mut retrctx, base.wrapping_add(1)).await?;

push_ca_cert(&mut retrctx, cm, base.wrapping_add(1)).await?;
push_ca_cert(&mut retrctx, cm, base.wrapping_add(2)).await?;

push_device_cert(&mut retrctx, cm, csrd, node_id, controller_id, fabric, base.wrapping_add(2)).await?;
push_device_cert(&mut retrctx, cm, csrd, node_id, controller_id, fabric, base.wrapping_add(3)).await?;

let ses = commissioning_complete(connection, cm, node_id, controller_id, fabric).await?;

Ok(ses)
}

#[cfg(feature = "ble")]
async fn arm_failsafe(
retrctx: &mut retransmit::RetrContext<'_>,
timeout_secs: u16,
Expand Down
Loading