fix(os-name)!: use the newly introduced constant

ROMemories · Dec 12, 2024 · 6a46c99 · 6a46c99
1 parent fa874ae
commit 6a46c99
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/usb-keyboard/src/main.rs b/examples/usb-keyboard/src/main.rs
@@ -33,7 +33,7 @@ const HID_WRITER_BUFFER_SIZE: usize = 8;
 #[ariel_os::config(usb)]
 const USB_CONFIG: ariel_os::reexports::embassy_usb::Config = {
     let mut config = ariel_os::reexports::embassy_usb::Config::new(0xc0de, 0xcafe);
-    config.manufacturer = Some("Ariel OS");
+    config.manufacturer = Some(ariel_os::buildinfo::OS_NAME);
     config.product = Some("HID keyboard example");
     config.serial_number = Some("12345678");
     config.max_power = 100;

diff --git a/examples/usb-serial/src/main.rs b/examples/usb-serial/src/main.rs
@@ -19,7 +19,7 @@ const MAX_FULL_SPEED_PACKET_SIZE: u8 = 64;
 #[ariel_os::config(usb)]
 const USB_CONFIG: ariel_os::reexports::embassy_usb::Config = {
     let mut config = ariel_os::reexports::embassy_usb::Config::new(0xc0de, 0xcafe);
-    config.manufacturer = Some("Ariel OS");
+    config.manufacturer = Some(ariel_os::buildinfo::OS_NAME);
     config.product = Some("USB serial example");
     config.serial_number = Some("12345678");
     config.max_power = 100;

diff --git a/src/ariel-os-embassy/Cargo.toml b/src/ariel-os-embassy/Cargo.toml
@@ -28,6 +28,7 @@ embassy-usb = { workspace = true, optional = true }
 embedded-hal = { workspace = true }
 embedded-hal-async = { workspace = true }
 
+ariel-os-buildinfo = { workspace = true }
 ariel-os-embassy-common = { workspace = true }
 ariel-os-hal = { path = "../ariel-os-hal" }
 ariel-os-threads = { path = "../ariel-os-threads", optional = true }

diff --git a/src/ariel-os-embassy/src/usb.rs b/src/ariel-os-embassy/src/usb.rs
@@ -45,7 +45,7 @@ pub(crate) fn config() -> embassy_usb::Config<'static> {
     {
         // Create embassy-usb Config
         let mut config = embassy_usb::Config::new(0xc0de, 0xcafe);
-        config.manufacturer = Some("Embassy");
+        config.manufacturer = Some(ariel_os_buildinfo::OS_NAME);
         config.product = Some("USB-Ethernet example");
         config.serial_number = Some("12345678");
         config.max_power = 100;