Skip to content

fix: compile BLE split DFU #4

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

Open
colonelpanic8 wants to merge 1 commit into
base: deps/trouble-not-subscribed
Choose a base branch
from
Open

fix: compile BLE split DFU #4

Show file tree
Hide file tree
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
42 changes: 36 additions & 6 deletions rmk/src/split/ble/central.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,21 @@ pub(crate) static CENTRAL_SLEEP: Signal<crate::RawMutex, bool> = Signal::new();
/// Gatt service used in split central to send split message to peripheral
#[gatt_service(uuid = "4dd5fbaa-18e5-4b07-bf0a-353698659946")]
struct SplitBleCentralService {
#[characteristic(uuid = "0e6313e3-bd0b-45c2-8d2e-37a2e8128bc3", read, notify)]
#[characteristic(
uuid = "0e6313e3-bd0b-45c2-8d2e-37a2e8128bc3",
read,
notify,
value = [0; SPLIT_MESSAGE_MAX_SIZE]
)]
message_to_central: [u8; SPLIT_MESSAGE_MAX_SIZE],

#[characteristic(uuid = "4b3514fb-cae4-4d38-a097-3a2a3d1c3b9c", write_without_response, read, notify)]
#[characteristic(
uuid = "4b3514fb-cae4-4d38-a097-3a2a3d1c3b9c",
write_without_response,
read,
notify,
value = [0; SPLIT_MESSAGE_MAX_SIZE]
)]
message_to_peripheral: [u8; SPLIT_MESSAGE_MAX_SIZE],
}

Expand Down Expand Up @@ -174,6 +185,7 @@ pub(crate) async fn run_ble_peripheral_manager<
peri_id: usize,
addrs: &RefCell<VecView<Option<[u8; 6]>>>,
stack: &'b Stack<'s, C, DefaultPacketPool>,
#[cfg(feature = "dfu_split")] policy: crate::split::driver::UpdatePolicy,
) {
trace!("SPLIT_MESSAGE_MAX_SIZE: {}", SPLIT_MESSAGE_MAX_SIZE);

Expand Down Expand Up @@ -230,8 +242,14 @@ pub(crate) async fn run_ble_peripheral_manager<
connected: true,
});

if let Err(e) =
run_central_manager_task::<_, _, ROW, COL, ROW_OFFSET, COL_OFFSET>(peri_id, stack, &conn).await
if let Err(e) = run_central_manager_task::<_, _, ROW, COL, ROW_OFFSET, COL_OFFSET>(
peri_id,
stack,
&conn,
#[cfg(feature = "dfu_split")]
policy,
)
.await
{
#[cfg(feature = "defmt")]
let e = defmt::Debug2Format(&e);
Expand Down Expand Up @@ -279,6 +297,7 @@ async fn run_central_manager_task<
id: usize,
stack: &'b Stack<'s, C, P>,
conn: &Connection<'b, P>,
#[cfg(feature = "dfu_split")] policy: crate::split::driver::UpdatePolicy,
) -> Result<(), BleHostError<C::Error>> {
let client = GattClient::<C, P, 10>::new(stack, conn).await?;

Expand All @@ -290,7 +309,12 @@ async fn run_central_manager_task<

match select3(
ble_central_task(&client, conn),
run_peripheral_manager::<_, _, ROW, COL, ROW_OFFSET, COL_OFFSET>(id, &client),
run_peripheral_manager::<_, _, ROW, COL, ROW_OFFSET, COL_OFFSET>(
id,
&client,
#[cfg(feature = "dfu_split")]
policy,
),
sleep_manager_task(stack, conn),
)
.await
Expand Down Expand Up @@ -332,6 +356,7 @@ async fn run_peripheral_manager<
>(
id: usize,
client: &GattClient<'a, C, P, 10>,
#[cfg(feature = "dfu_split")] policy: crate::split::driver::UpdatePolicy,
) -> Result<(), BleHostError<C::Error>> {
let services = client
.services_by_uuid(&Uuid::new_long([
Expand Down Expand Up @@ -364,7 +389,12 @@ async fn run_peripheral_manager<
info!("Subscribing notifications");
let listener = client.subscribe(&message_to_central, false).await?;
let split_ble_driver = BleSplitCentralDriver::new(listener, message_to_peripheral, client);
let peripheral_manager = PeripheralManager::<ROW, COL, ROW_OFFSET, COL_OFFSET, _>::new(split_ble_driver, id);
let peripheral_manager = PeripheralManager::<ROW, COL, ROW_OFFSET, COL_OFFSET, _>::new(
split_ble_driver,
id,
#[cfg(feature = "dfu_split")]
policy,
);
peripheral_manager.run().await;
info!("Peripheral manager stopped");
};
Expand Down
16 changes: 14 additions & 2 deletions rmk/src/split/ble/peripheral.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,22 @@ use crate::state::update_status;
/// Gatt service used in split peripheral to send split message to central
#[gatt_service(uuid = "4dd5fbaa-18e5-4b07-bf0a-353698659946")]
pub(crate) struct SplitBleService {
#[characteristic(uuid = "0e6313e3-bd0b-45c2-8d2e-37a2e8128bc3", read, notify, indicate)]
#[characteristic(
uuid = "0e6313e3-bd0b-45c2-8d2e-37a2e8128bc3",
read,
notify,
indicate,
value = [0; SPLIT_MESSAGE_MAX_SIZE]
)]
pub(crate) message_to_central: [u8; SPLIT_MESSAGE_MAX_SIZE],

#[characteristic(uuid = "4b3514fb-cae4-4d38-a097-3a2a3d1c3b9c", write_without_response, read, notify)]
#[characteristic(
uuid = "4b3514fb-cae4-4d38-a097-3a2a3d1c3b9c",
write_without_response,
read,
notify,
value = [0; SPLIT_MESSAGE_MAX_SIZE]
)]
pub(crate) message_to_peripheral: [u8; SPLIT_MESSAGE_MAX_SIZE],
}

Expand Down
9 changes: 8 additions & 1 deletion rmk/src/split/central.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,14 @@ pub async fn run_peripheral_manager<
#[cfg(feature = "_ble")]
{
use crate::split::ble::central::run_ble_peripheral_manager;
run_ble_peripheral_manager::<C, ROW, COL, ROW_OFFSET, COL_OFFSET>(id, addr, stack).await;
run_ble_peripheral_manager::<C, ROW, COL, ROW_OFFSET, COL_OFFSET>(
id,
addr,
stack,
#[cfg(feature = "dfu_split")]
policy,
)
.await;
};

#[cfg(not(feature = "_ble"))]
Expand Down