hardware: get sound input device

krkeegan · Nov 28, 2022 · 50f594f · 50f594f
1 parent 9301d6a
commit 50f594f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/system/hardware/base.py b/system/hardware/base.py
@@ -43,6 +43,10 @@ def get_device_type(self):
   def get_sound_card_online(self):
     pass
 
+  @abstractmethod
+  def get_sound_input_device(self):
+    pass
+
   @abstractmethod
   def get_imei(self, slot) -> str:
     pass

diff --git a/system/hardware/pc/hardware.py b/system/hardware/pc/hardware.py
@@ -17,6 +17,9 @@ def get_device_type(self):
   def get_sound_card_online(self):
     return True
 
+  def get_sound_input_device(self):
+    return None
+
   def reboot(self, reason=None):
     print("REBOOT!")
 

diff --git a/system/hardware/tici/hardware.py b/system/hardware/tici/hardware.py
@@ -96,6 +96,9 @@ def get_sound_card_online(self):
     return (os.path.isfile('/proc/asound/card0/state') and
             open('/proc/asound/card0/state').read().strip() == 'ONLINE')
 
+  def get_sound_input_device(self):
+    return "(hw:0,0)"
+
   def reboot(self, reason=None):
     subprocess.check_output(["sudo", "reboot"])
 

diff --git a/system/micd.py b/system/micd.py
@@ -4,6 +4,7 @@
 
 from cereal import messaging
 from common.realtime import Ratekeeper
+from system.hardware import HARDWARE
 
 
 class Mic:
@@ -23,8 +24,11 @@ def update(self):
   def calculate_volume(self, indata, frames, time, status):
     self.noise_level = np.linalg.norm(indata)
 
-  def micd_thread(self):
-    with sd.InputStream(callback=self.calculate_volume):
+  def micd_thread(self, device=None):
+    if device is None:
+      device = HARDWARE.get_sound_input_device()
+
+    with sd.InputStream(callback=self.calculate_volume, device=device):
       while True:
         self.update()