From 7427509c338b24110741fa9b698fd0fb3da12056 Mon Sep 17 00:00:00 2001 From: Cyril Fougeray Date: Wed, 16 Oct 2024 12:14:51 +0200 Subject: [PATCH] orb-ui: increased volume to ask for wifi "please show wifi qr code" spoken loudly. --- orb-ui/src/engine/diamond.rs | 5 +++++ orb-ui/src/engine/pearl.rs | 5 +++++ orb-ui/src/sound/mod.rs | 7 +++++++ 3 files changed, 17 insertions(+) diff --git a/orb-ui/src/engine/diamond.rs b/orb-ui/src/engine/diamond.rs index d605ddea..a6b4e39c 100644 --- a/orb-ui/src/engine/diamond.rs +++ b/orb-ui/src/engine/diamond.rs @@ -345,10 +345,15 @@ impl EventHandler for Runner { } QrScanSchema::Wifi => { self.operator_idle.no_wlan(); + + // temporarily increase the volume to ask wifi qr code + let master_volume = self.sound.volume(); + self.sound.set_master_volume(40); self.sound.queue( sound::Type::Voice(sound::Voice::ShowWifiHotspotQrCode), Duration::ZERO, )?; + self.sound.set_master_volume(master_volume); } QrScanSchema::User => { self.operator_signup_phase.user_qr_code_ok(); diff --git a/orb-ui/src/engine/pearl.rs b/orb-ui/src/engine/pearl.rs index afe42234..3d2de066 100644 --- a/orb-ui/src/engine/pearl.rs +++ b/orb-ui/src/engine/pearl.rs @@ -291,10 +291,15 @@ impl EventHandler for Runner { } QrScanSchema::Wifi => { self.operator_idle.no_wlan(); + + // temporarily increase the volume to ask wifi qr code + let master_volume = self.sound.volume(); + self.sound.set_master_volume(30); self.sound.queue( sound::Type::Voice(sound::Voice::ShowWifiHotspotQrCode), Duration::ZERO, )?; + self.sound.set_master_volume(master_volume); } QrScanSchema::User => { self.operator_signup_phase.user_qr_code_ok(); diff --git a/orb-ui/src/sound/mod.rs b/orb-ui/src/sound/mod.rs index 764cf385..5ae4273c 100644 --- a/orb-ui/src/sound/mod.rs +++ b/orb-ui/src/sound/mod.rs @@ -33,6 +33,9 @@ pub trait Player: fmt::Debug + Send { /// Returns a new handler to the shared queue. fn clone(&self) -> Box; + /// Returns the master volume [0, 100]. + fn volume(&self) -> u64; + /// Sets the master volume. fn set_master_volume(&mut self, level: u64); @@ -262,6 +265,10 @@ impl Player for Jetson { }) } + fn volume(&self) -> u64 { + (self.volume * 100.0) as u64 + } + fn set_master_volume(&mut self, level: u64) { self.volume = level as f64 / 100.0; }