-
Notifications
You must be signed in to change notification settings - Fork 225
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add integration with bt-hci crate (#1971)
* Add integration with bt-hci crate Implementing traits from bt-hci allows the BleConnector to be used with the Trouble BLE stack. * use packed based read interface * Improve example to allow another connection after disconnect * update trouble version * Workaround for spurious command complete events * fix formatting * ignore notify errors in example * fix clippy warnings * remove async feature from hal dependency * remove deprecated feature from example * Adopt to api changes * Api fix for esp32 * Set rust-version of esp-wifi * bump MSRV to 1.77 for CI and esp-hal * Add changelog entry
- Loading branch information
Showing
8 changed files
with
234 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,157 @@ | ||
| //! Embassy BLE Example using Trouble | ||
| //! | ||
| //! - starts Bluetooth advertising | ||
| //! - offers a GATT service providing a battery percentage reading | ||
| //! - automatically notifies subscribers every second | ||
| //! | ||
| //% FEATURES: embassy embassy-generic-timers esp-wifi esp-wifi/async esp-wifi/ble | ||
| //% CHIPS: esp32 esp32s3 esp32c2 esp32c3 esp32c6 esp32h2 | ||
|
|
||
| #![no_std] | ||
| #![no_main] | ||
|
|
||
| use bt_hci::controller::ExternalController; | ||
| use embassy_executor::Spawner; | ||
| use embassy_futures::join::join3; | ||
| use embassy_sync::blocking_mutex::raw::NoopRawMutex; | ||
| use embassy_time::{Duration, Timer}; | ||
| use esp_backtrace as _; | ||
| use esp_hal::{prelude::*, timer::timg::TimerGroup}; | ||
| use esp_wifi::ble::controller::asynch::BleConnector; | ||
| use log::*; | ||
| use static_cell::StaticCell; | ||
| use trouble_host::{ | ||
| advertise::{AdStructure, Advertisement, BR_EDR_NOT_SUPPORTED, LE_GENERAL_DISCOVERABLE}, | ||
| attribute::{AttributeTable, CharacteristicProp, Service, Uuid}, | ||
| Address, | ||
| BleHost, | ||
| BleHostResources, | ||
| PacketQos, | ||
| }; | ||
|
|
||
| #[esp_hal_embassy::main] | ||
| async fn main(_s: Spawner) { | ||
| esp_println::logger::init_logger_from_env(); | ||
| let peripherals = esp_hal::init({ | ||
| let mut config = esp_hal::Config::default(); | ||
| config.cpu_clock = CpuClock::max(); | ||
| config | ||
| }); | ||
| let timg0 = TimerGroup::new(peripherals.TIMG0); | ||
|
|
||
| let init = esp_wifi::initialize( | ||
| esp_wifi::EspWifiInitFor::Ble, | ||
| timg0.timer0, | ||
| esp_hal::rng::Rng::new(peripherals.RNG), | ||
| peripherals.RADIO_CLK, | ||
| ) | ||
| .unwrap(); | ||
|
|
||
| #[cfg(feature = "esp32")] | ||
| { | ||
| let timg1 = TimerGroup::new(peripherals.TIMG1); | ||
| esp_hal_embassy::init(timg1.timer0); | ||
| } | ||
|
|
||
| #[cfg(not(feature = "esp32"))] | ||
| { | ||
| let systimer = esp_hal::timer::systimer::SystemTimer::new(peripherals.SYSTIMER) | ||
| .split::<esp_hal::timer::systimer::Target>(); | ||
| esp_hal_embassy::init(systimer.alarm0); | ||
| } | ||
|
|
||
| let mut bluetooth = peripherals.BT; | ||
| let connector = BleConnector::new(&init, &mut bluetooth); | ||
| let controller: ExternalController<_, 20> = ExternalController::new(connector); | ||
|
|
||
| static HOST_RESOURCES: StaticCell<BleHostResources<8, 8, 256>> = StaticCell::new(); | ||
| let host_resources = HOST_RESOURCES.init(BleHostResources::new(PacketQos::None)); | ||
|
|
||
| let mut ble: BleHost<'_, _> = BleHost::new(controller, host_resources); | ||
|
|
||
| ble.set_random_address(Address::random([0xff, 0x9f, 0x1a, 0x05, 0xe4, 0xff])); | ||
| let mut table: AttributeTable<'_, NoopRawMutex, 10> = AttributeTable::new(); | ||
|
|
||
| let id = b"Trouble ESP32"; | ||
| let appearance = [0x80, 0x07]; | ||
| let mut bat_level = [0; 1]; | ||
| // Generic Access Service (mandatory) | ||
| let mut svc = table.add_service(Service::new(0x1800)); | ||
| let _ = svc.add_characteristic_ro(0x2a00, id); | ||
| let _ = svc.add_characteristic_ro(0x2a01, &appearance[..]); | ||
| svc.build(); | ||
|
|
||
| // Generic attribute service (mandatory) | ||
| table.add_service(Service::new(0x1801)); | ||
|
|
||
| // Battery service | ||
| let bat_level_handle = table.add_service(Service::new(0x180f)).add_characteristic( | ||
| 0x2a19, | ||
| &[CharacteristicProp::Read, CharacteristicProp::Notify], | ||
| &mut bat_level, | ||
| ); | ||
|
|
||
| let mut adv_data = [0; 31]; | ||
| AdStructure::encode_slice( | ||
| &[ | ||
| AdStructure::Flags(LE_GENERAL_DISCOVERABLE | BR_EDR_NOT_SUPPORTED), | ||
| AdStructure::ServiceUuids16(&[Uuid::Uuid16([0x0f, 0x18])]), | ||
| AdStructure::CompleteLocalName(b"Trouble ESP32"), | ||
| ], | ||
| &mut adv_data[..], | ||
| ) | ||
| .unwrap(); | ||
|
|
||
| let server = ble.gatt_server::<NoopRawMutex, 10, 256>(&table); | ||
|
|
||
| info!("Starting advertising and GATT service"); | ||
| // Run all 3 tasks in a join. They can also be separate embassy tasks. | ||
| let _ = join3( | ||
| // Runs the BLE host task | ||
| ble.run(), | ||
| // Processing events from GATT server (if an attribute was written) | ||
| async { | ||
| loop { | ||
| match server.next().await { | ||
| Ok(_event) => { | ||
| info!("Gatt event!"); | ||
| } | ||
| Err(e) => { | ||
| warn!("Error processing GATT events: {:?}", e); | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| // Advertise our presence to the world. | ||
| async { | ||
| loop { | ||
| let mut advertiser = ble | ||
| .advertise( | ||
| &Default::default(), | ||
| Advertisement::ConnectableScannableUndirected { | ||
| adv_data: &adv_data[..], | ||
| scan_data: &[], | ||
| }, | ||
| ) | ||
| .await | ||
| .unwrap(); | ||
| let conn = advertiser.accept().await.unwrap(); | ||
| // Keep connection alive and notify with value change | ||
| let mut tick: u8 = 0; | ||
| loop { | ||
| if !conn.is_connected() { | ||
| break; | ||
| } | ||
| Timer::after(Duration::from_secs(1)).await; | ||
| tick = tick.wrapping_add(1); | ||
| server | ||
| .notify(&ble, bat_level_handle, &conn, &[tick]) | ||
| .await | ||
| .ok(); | ||
| } | ||
| } | ||
| }, | ||
| ) | ||
| .await; | ||
| } |