From 9f3647f3a37116fb11c95340bebcc24941c2ea0a Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 1 Jun 2021 00:44:33 +0800 Subject: [PATCH] have audio off by default on power-on to save power --- services/codec/src/lib.rs | 5 +++++ services/shellchat/src/cmds/audio.rs | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/services/codec/src/lib.rs b/services/codec/src/lib.rs index b7a94bbb2..2d21db342 100644 --- a/services/codec/src/lib.rs +++ b/services/codec/src/lib.rs @@ -43,6 +43,11 @@ impl Codec { Message::new_scalar(Opcode::Setup8kStereo.to_usize().unwrap(), 0, 0, 0, 0) ).map(|_| ()) } + pub fn power_off(&mut self) -> Result<(), xous::Error> { + send_message(self.conn, + Message::new_scalar(Opcode::PowerOff.to_usize().unwrap(), 0, 0, 0, 0) + ).map(|_| ()) + } pub fn free_frames(&mut self) -> Result<(usize, usize), xous::Error> { let response = send_message(self.conn, diff --git a/services/shellchat/src/cmds/audio.rs b/services/shellchat/src/cmds/audio.rs index 1a8a480fa..e8dafd251 100644 --- a/services/shellchat/src/cmds/audio.rs +++ b/services/shellchat/src/cmds/audio.rs @@ -39,7 +39,7 @@ impl Audio { xous::MemoryFlags::R, ).expect("couldn't map in the audio sample"); - let mut codec = codec::Codec::new(xns).unwrap(); + let codec = codec::Codec::new(xns).unwrap(); let samples: *const [u8; 16] = unsafe{sample.as_ptr().add(20)} as *const [u8; 16]; let mut raw_header: [u8; 16] = [0; 16]; for i in 0..16 { @@ -52,9 +52,6 @@ impl Audio { xous::MemoryFlags::R | xous::MemoryFlags::W, ).expect("couldn't allocate record buffer"); - log::trace!("setting up codec hardware parameters"); - codec.setup_8k_stream().expect("couldn't set the CODEC to expected defaults"); - let audio = Audio { codec, sample, @@ -88,6 +85,10 @@ impl<'a> ShellCmdApi<'a> for Audio { if let Some(sub_cmd) = tokens.next() { match sub_cmd { "play" => { + log::trace!("setting up codec hardware parameters"); + self.codec.setup_8k_stream().expect("couldn't set the CODEC to expected defaults"); + env.ticktimer.sleep_ms(50).unwrap(); + if self.callback_id.is_none() { let cb_id = env.register_handler(String::<256>::from_str(self.verb())); log::trace!("hooking frame callback with ID {}", cb_id); @@ -114,6 +115,7 @@ impl<'a> ShellCmdApi<'a> for Audio { self.framecount = 0; self.play_ptr_bytes = 0; self.rec_ptr_words = 0; + self.codec.power_off().unwrap(); } "fromrec" => { self.play_or_rec_n = false; @@ -207,6 +209,7 @@ impl<'a> ShellCmdApi<'a> for Audio { self.framecount = 0; self.play_ptr_bytes = 0; self.rec_ptr_words = 0; + self.codec.power_off().unwrap(); } else { // we will get extra callbacks as the pipe clears return Ok(None)