"fix-microphone-volume-control-use-respeaker-helper"

reachy_mini_ha_voice/reachy_controller.py

@@ -121,25 +121,21 @@ class ReachyController:
 
     def get_microphone_volume(self) -> float:
         """Get microphone volume (0-100) using local SDK audio interface."""
-        if not self.is_available:
-            return 50.0  # Default if not available
+        respeaker = self._get_respeaker()
+        if respeaker is None:
+            return getattr(self, '_microphone_volume', 50.0)
 
         try:
-            # Use Reachy Mini's local audio interface (like get_DoA)
-            audio = self.reachy.media.audio
-            if audio is not None and audio._respeaker is not None:
-                # AUDIO_MGR_MIC_GAIN returns gain in dB (typically 0-15 dB)
-                gain_db = audio._respeaker.read("AUDIO_MGR_MIC_GAIN")
-                if gain_db is not None:
-                    # Convert dB gain to 0-100 percentage
-                    # Assuming 0 dB = 0%, 15 dB = 100%
-                    volume = min(100.0, max(0.0, (gain_db[0] / 15.0) * 100.0))
-                    logger.debug(f"Microphone gain: {gain_db[0]:.2f} dB -> {volume:.0f}%")
-                    return volume
+            # Try APMGR_MICGAIN first (0-31 range)
+            result = respeaker.read("APMGR_MICGAIN")
+            if result is not None:
+                # Convert 0-31 to 0-100%
+                self._microphone_volume = (result[0] / 31.0) * 100.0
+                return self._microphone_volume
         except Exception as e:
-            logger.debug(f"Could not get microphone volume from SDK: {e}")
+            logger.debug(f"Could not get microphone volume: {e}")
 
-        return 50.0  # Default fallback
+        return getattr(self, '_microphone_volume', 50.0)
 
     def set_microphone_volume(self, volume: float) -> None:
         """
@@ -149,21 +145,20 @@ class ReachyController:
             volume: Volume level 0-100
         """
         volume = max(0.0, min(100.0, volume))
+        self._microphone_volume = volume
+
+        respeaker = self._get_respeaker()
+        if respeaker is None:
+            logger.warning("Cannot set microphone volume: ReSpeaker not available")
+            return
 
-        if self.is_available:
-            try:
-                # Use Reachy Mini's local audio interface (like get_DoA)
-                audio = self.reachy.media.audio
-                if audio is not None and audio._respeaker is not None:
-                    # Convert 0-100% to dB gain (0-15 dB range)
-                    gain_db = (volume / 100.0) * 15.0
-                    audio._respeaker.write("AUDIO_MGR_MIC_GAIN", [gain_db])
-                    logger.info(f"Microphone volume set to {volume}% (gain: {gain_db:.2f} dB)")
-                    return
-            except Exception as e:
-                logger.error(f"Failed to set microphone volume: {e}")
-        else:
-            logger.warning("Cannot set microphone volume: robot not available")
+        try:
+            # Convert 0-100% to 0-31 range for APMGR_MICGAIN
+            gain = int((volume / 100.0) * 31.0)
+            respeaker.write("APMGR_MICGAIN", [gain])
+            logger.info(f"Microphone volume set to {volume}% (gain: {gain})")
+        except Exception as e:
+            logger.error(f"Failed to set microphone volume: {e}")
 
     # ========== Phase 2: Motor Control ==========