Merge pull request #140 from jose-acevedoflores/jose/lang_id_optional

Make LangID optional on get_string()
rust-embedded-community · Feb 26, 2024 · ac36070 · ac36070
2 parents 0ca8f09 + 55aecdd
commit ac36070
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/class.rs b/src/class.rs
@@ -43,7 +43,8 @@ pub trait UsbClass<B: UsbBus> {
     ///
     /// * `index` - A string index allocated earlier with
     ///   [`UsbAllocator`](crate::bus::UsbBusAllocator).
-    /// * `lang_id` - The language ID for the string to retrieve.
+    /// * `lang_id` - The language ID for the string to retrieve. If the requested lang_id is not
+    ///   valid it will default to EN_US.
     fn get_string(&self, index: StringIndex, lang_id: LangID) -> Option<&str> {
         let _ = (index, lang_id);
         None

diff --git a/src/device.rs b/src/device.rs
@@ -567,11 +567,10 @@ impl<B: UsbBus> UsbDevice<'_, B> {
                         Err(_err) => {
                             #[cfg(feature = "defmt")]
                             defmt::warn!(
-                                "Receive unknown LANGID {:#06X}, reject the request",
+                                "Receive unknown LANGID {:#06X}, default to EN_US",
                                 _err.number
                             );
-                            xfer.reject().ok();
-                            return;
+                            LangID::EN_US
                         }
 
                         Ok(req_lang_id) => req_lang_id,