Merge pull request #187 from embassy-rs/fix-178

Make example panic if advertise fails

examples/apps/src/ble_bas_peripheral.rs

@@ -74,7 +74,11 @@ where
                     // then return to advertising state.
                     select(connection_task, counter_task).await;
                 }
-                Err(_) => info!("[adv] error"),
+                Err(e) => {
+                    #[cfg(feature = "defmt")]
+                    let e = defmt::Debug2Format(&e);
+                    panic!("[adv] error: {:?}", e);
+                }
             }
         }
     };
@@ -142,13 +146,6 @@ async fn advertise<'a, C: Controller>(
     name: &'a str,
     peripheral: &mut Peripheral<'a, C>,
 ) -> Result<Connection<'a>, BleHostError<C::Error>> {
-    let name = if name.len() > 22 {
-        let truncated_name = &name[..22];
-        info!("Name truncated to {}", truncated_name);
-        truncated_name
-    } else {
-        name
-    };
     let mut advertiser_data = [0; 31];
     AdStructure::encode_slice(
         &[

host/src/advertise.rs

@@ -502,3 +502,22 @@ impl<'d> Iterator for AdStructureIter<'d> {
         Some(self.read())
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn adv_name_truncate() {
+        let mut adv_data = [0; 31];
+        assert!(AdStructure::encode_slice(
+            &[
+                AdStructure::Flags(LE_GENERAL_DISCOVERABLE | BR_EDR_NOT_SUPPORTED),
+                AdStructure::ServiceUuids16(&[Uuid::Uuid16([0x0f, 0x18])]),
+                AdStructure::CompleteLocalName(b"12345678901234567890123"),
+            ],
+            &mut adv_data[..],
+        )
+        .is_err());
+    }
+}