an.tsouchlos/commonsense-sw
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Make ble_gatt_server.rs work with the nRF552 DK

Browse Source
This commit is contained in:
Andreas Tsouchlos 2025-10-03 00:06:50 +02:00
parent c6bc560c59
commit 164bc16e88
2 changed files with 96 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -734,7 +734,7 @@ dependencies = [
"heapless", "heapless",
"nrf-softdevice-macro", "nrf-softdevice-macro",
"nrf-softdevice-s112", "nrf-softdevice-s112",
"nrf52810-pac", "nrf52832-pac",
"num_enum", "num_enum",
] ]

192
src/bin/ble_gatt_server.rs
View File

@ -61,102 +61,100 @@ async fn main(spawner: Spawner) {
let mut led = Output::new(p.P0_18, Level::Low, OutputDrive::Standard); let mut led = Output::new(p.P0_18, Level::Low, OutputDrive::Standard);
led.set_high(); led.set_high();
info!("Hello World!"); let config = nrf_softdevice::Config {
clock: Some(raw::nrf_clock_lf_cfg_t {
source: raw::NRF_CLOCK_LF_SRC_RC as u8,
rc_ctiv: 16,
rc_temp_ctiv: 2,
accuracy: raw::NRF_CLOCK_LF_ACCURACY_500_PPM as u8,
}),
conn_gap: Some(raw::ble_gap_conn_cfg_t {
conn_count: 1,
event_length: 24,
}),
conn_gatt: Some(raw::ble_gatt_conn_cfg_t { att_mtu: 256 }),
gatts_attr_tab_size: Some(raw::ble_gatts_cfg_attr_tab_size_t {
attr_tab_size: raw::BLE_GATTS_ATTR_TAB_SIZE_DEFAULT,
}),
gap_role_count: Some(raw::ble_gap_cfg_role_count_t {
adv_set_count: 1,
periph_role_count: 1,
// central_role_count: 3,
// central_sec_count: 0,
// _bitfield_1: raw::ble_gap_cfg_role_count_t::new_bitfield_1(0),
}),
gap_device_name: Some(raw::ble_gap_cfg_device_name_t {
p_value: b"HelloRust" as *const u8 as _,
current_len: 9,
max_len: 9,
write_perm: unsafe { mem::zeroed() },
_bitfield_1: raw::ble_gap_cfg_device_name_t::new_bitfield_1(
raw::BLE_GATTS_VLOC_STACK as u8,
),
}),
..Default::default()
};
// let config = nrf_softdevice::Config { let sd = Softdevice::enable(&config);
// clock: Some(raw::nrf_clock_lf_cfg_t { let server = unwrap!(Server::new(sd));
// source: raw::NRF_CLOCK_LF_SRC_RC as u8, unwrap!(spawner.spawn(softdevice_task(sd)));
// rc_ctiv: 16,
// rc_temp_ctiv: 2, static ADV_DATA: LegacyAdvertisementPayload = LegacyAdvertisementBuilder::new()
// accuracy: raw::NRF_CLOCK_LF_ACCURACY_500_PPM as u8, .flags(&[Flag::GeneralDiscovery, Flag::LE_Only])
// }), .services_16(ServiceList::Complete, &[ServiceUuid16::BATTERY])
// conn_gap: Some(raw::ble_gap_conn_cfg_t { .full_name("HelloRust")
// conn_count: 1, .build();
// event_length: 24,
// }), static SCAN_DATA: LegacyAdvertisementPayload = LegacyAdvertisementBuilder::new()
// conn_gatt: Some(raw::ble_gatt_conn_cfg_t { att_mtu: 256 }), .services_128(
// gatts_attr_tab_size: Some(raw::ble_gatts_cfg_attr_tab_size_t { ServiceList::Complete,
// attr_tab_size: raw::BLE_GATTS_ATTR_TAB_SIZE_DEFAULT, &[0x9e7312e0_2354_11eb_9f10_fbc30a62cf38_u128.to_le_bytes()],
// }), )
// gap_role_count: Some(raw::ble_gap_cfg_role_count_t { .build();
// adv_set_count: 1,
// periph_role_count: 1, loop {
// // central_role_count: 3, info!("Creating config");
// // central_sec_count: 0, let config = peripheral::Config::default();
// // _bitfield_1: raw::ble_gap_cfg_role_count_t::new_bitfield_1(0), info!("Creating adv object");
// }), let adv = peripheral::ConnectableAdvertisement::ScannableUndirected {
// gap_device_name: Some(raw::ble_gap_cfg_device_name_t { adv_data: &ADV_DATA,
// p_value: b"HelloRust" as *const u8 as _, scan_data: &SCAN_DATA,
// current_len: 9, };
// max_len: 9, info!("Starting advertising");
// write_perm: unsafe { mem::zeroed() }, let conn = unwrap!(peripheral::advertise_connectable(sd, adv, &config).await);
// _bitfield_1: raw::ble_gap_cfg_device_name_t::new_bitfield_1(
// raw::BLE_GATTS_VLOC_STACK as u8, info!("advertising done!");
// ),
// }), // Run the GATT server on the connection. This returns when the connection gets disconnected.
// ..Default::default() //
// }; // Event enums (ServerEvent's) are generated by nrf_softdevice::gatt_server
// // proc macro when applied to the Server struct above
// let sd = Softdevice::enable(&config); let e = gatt_server::run(&conn, &server, |e| match e {
// let server = unwrap!(Server::new(sd)); ServerEvent::Bas(e) => match e {
// unwrap!(spawner.spawn(softdevice_task(sd))); BatteryServiceEvent::BatteryLevelCccdWrite { notifications } => {
// info!("battery notifications: {}", notifications)
// static ADV_DATA: LegacyAdvertisementPayload = LegacyAdvertisementBuilder::new() }
// .flags(&[Flag::GeneralDiscovery, Flag::LE_Only]) },
// .services_16(ServiceList::Complete, &[ServiceUuid16::BATTERY]) ServerEvent::Foo(e) => match e {
// .full_name("HelloRust") FooServiceEvent::FooWrite(val) => {
// .build(); info!("wrote foo: {}", val);
// if let Err(e) = server.foo.foo_notify(&conn, &(val + 1)) {
// static SCAN_DATA: LegacyAdvertisementPayload = LegacyAdvertisementBuilder::new() info!("send notification error: {:?}", e);
// .services_128( }
// ServiceList::Complete, }
// &[0x9e7312e0_2354_11eb_9f10_fbc30a62cf38_u128.to_le_bytes()], FooServiceEvent::FooCccdWrite {
// ) indications,
// .build(); notifications,
// } => {
// loop { info!(
// info!("Creating config"); "foo indications: {}, notifications: {}",
// let config = peripheral::Config::default(); indications, notifications
// info!("Creating adv object"); )
// let adv = peripheral::ConnectableAdvertisement::ScannableUndirected { }
// adv_data: &ADV_DATA, },
// scan_data: &SCAN_DATA, })
// }; .await;
// info!("Starting advertising");
// let conn = unwrap!(peripheral::advertise_connectable(sd, adv, &config).await); info!("gatt_server run exited with error: {:?}", e);
// }
// info!("advertising done!");
//
// // Run the GATT server on the connection. This returns when the connection gets disconnected.
// //
// // Event enums (ServerEvent's) are generated by nrf_softdevice::gatt_server
// // proc macro when applied to the Server struct above
// let e = gatt_server::run(&conn, &server, |e| match e {
// ServerEvent::Bas(e) => match e {
// BatteryServiceEvent::BatteryLevelCccdWrite { notifications } => {
// info!("battery notifications: {}", notifications)
// }
// },
// ServerEvent::Foo(e) => match e {
// FooServiceEvent::FooWrite(val) => {
// info!("wrote foo: {}", val);
// if let Err(e) = server.foo.foo_notify(&conn, &(val + 1)) {
// info!("send notification error: {:?}", e);
// }
// }
// FooServiceEvent::FooCccdWrite {
// indications,
// notifications,
// } => {
// info!(
// "foo indications: {}, notifications: {}",
// indications, notifications
// )
// }
// },
// })
// .await;
//
// info!("gatt_server run exited with error: {:?}", e);
// }
} }