sirmrak/linux-voice-assistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement MQTT for Advanced LVA Controls

Browse Source 
Refactored for Full Configurability: The controller has been re-architected to remove all hard-coded effects and colors.

Central Configuration: It now uses a central configs dictionary to store the effect, color, and brightness settings for each voice assistant state (idle, listening, etc.).

Dynamic State Management: Subscribes to new set_<state>_effect and set_<state>_color events from the event bus to update its configuration in real-time.

Applies Custom Effects: The main voice event handlers (voice_stt_start, voice_stt_end, etc.) have been simplified to look up the user's chosen configuration and apply it.

New Animations: Implements a full suite of animations (Slow/Medium/Fast Pulse, Slow/Medium/Fast Blink, Spin) to be used by the effect selectors.
This commit is contained in:
imonlinux
2025-10-12 12:56:26 -07:00
committed by GitHub
parent 824ac111ff
commit 53b8fc4da9
1 changed files with 137 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
linux_voice_assistant/led_controller.py
+137 -78
View File
@@ -9,121 +9,180 @@ from .event_bus import EventHandler, subscribe
_LOGGER = logging.getLogger(__name__)
# Constants for ReSpeaker 2-Mic Hat
NUM_LEDS = 3
# Default Colors
_OFF = (0, 0, 0)
_BLUE = (0, 0, 255)
_YELLOW = (255, 255, 0)
_GREEN = (0, 255, 0)
_DIM_RED = (50, 0, 0)
_ORANGE = (255, 165, 0)
_PURPLE = (128, 0, 255)
class LedController(EventHandler):
def __init__(
self,
state,
interface: str = "spi",
clock_pin: int = 13,
data_pin: int = 12,
):
def __init__(self, state, interface: str = "spi", clock_pin: int = 13, data_pin: int = 12, num_leds: int = 3):
super().__init__(state)
self.loop = state.loop
self.num_leds = num_leds
self.current_task = None
self._is_ready = False
# --- Central Configuration Dictionary ---
self.configs = {
"idle": {"effect": "off", "color": _PURPLE, "brightness": 0.5},
"listening": {"effect": "medium_pulse", "color": _BLUE, "brightness": 0.5},
"thinking": {"effect": "spin", "color": _YELLOW, "brightness": 0.8},
"responding": {"effect": "medium_pulse", "color": _GREEN, "brightness": 0.5},
"error": {"effect": "fast_blink", "color": _ORANGE, "brightness": 1.0},
}
try:
if interface == "gpio":
_LOGGER.debug(f"Initializing LEDs on GPIO data={data_pin}, clock={clock_pin}")
# Dynamically get GPIO pin objects from the board library
data_pin_obj = getattr(board, f"D{data_pin}")
clock_pin_obj = getattr(board, f"D{clock_pin}")
self.leds = adafruit_dotstar.DotStar(
clock_pin_obj, data_pin_obj, NUM_LEDS, brightness=0.5, auto_write=False
)
else: # Default to SPI
_LOGGER.debug("Initializing LEDs on hardware SPI")
self.leds = adafruit_dotstar.DotStar(
board.SCLK, board.MOSI, NUM_LEDS, brightness=0.5, auto_write=False
)
self.leds = adafruit_dotstar.DotStar(clock_pin_obj, data_pin_obj, self.num_leds, auto_write=False)
else:
self.leds = adafruit_dotstar.DotStar(board.SCLK, board.MOSI, self.num_leds, auto_write=False)
self._is_ready = True
_LOGGER.info(f"LED Controller initialized using {interface} interface.")
# Signal that the system is ready
self.run_action("blink", _GREEN, 2)
self.leds.brightness = self.configs["idle"]["brightness"]
_LOGGER.info(f"LED Controller initialized for {self.num_leds} LEDs using {interface} interface.")
self.run_action("startup_sequence")
except Exception:
_LOGGER.exception("Failed to initialize LED controller. LEDs will be disabled.")
def run_action(self, action_method_name: str, *args: Any) -> None:
if not self._is_ready:
return
if self.current_task and not self.current_task.done():
self.current_task.cancel()
if not self._is_ready: return
if self.current_task and not self.current_task.done(): self.current_task.cancel()
coro = getattr(self, action_method_name)(*args)
self.current_task = asyncio.run_coroutine_threadsafe(coro, self.loop)
async def color(self, rgb: Tuple[int, int, int]):
if not self._is_ready:
return
self.leds.fill(rgb)
self.leds.show()
def _apply_state_effect(self, state_name: str):
config = self.configs.get(state_name, self.configs["idle"])
_LOGGER.debug(f"Applying effect for state '{state_name}': {config['effect']}")
self.leds.brightness = config["brightness"]
self.run_action(config["effect"], config["color"])
config["state_name"] = state_name
self.state.event_bus.publish("publish_state_to_mqtt", config)
async def blink(self, color, count=3):
for _ in range(count):
await self.color(color)
await asyncio.sleep(0.2)
await self.color(_OFF)
await asyncio.sleep(0.2)
async def pulse(self, color: Tuple[int, int, int], speed: float = 0.015):
# --- Animations ---
async def startup_sequence(self): await self.blink(_GREEN, 1)
async def off(self, color): self.leds.fill(_OFF); self.leds.show()
async def solid(self, color: Tuple[int, int, int]): self.leds.fill(color); self.leds.show()
async def blink(self, color, count=3): await self.medium_blink(color)
async def _base_pulse(self, color: Tuple[int, int, int], speed: float):
try:
r, g, b = color
while True:
# Fade in
for i in range(0, 101, 5):
brightness = i / 100.0
await self.color((int(r * brightness), int(g * brightness), int(b * brightness)))
await asyncio.sleep(speed)
# Fade out
for i in range(100, -1, -5):
brightness = i / 100.0
await self.color((int(r * brightness), int(g * brightness), int(b * brightness)))
await asyncio.sleep(speed)
except asyncio.CancelledError:
await self.color(_OFF)
for i in range(0, 101, 10):
mod = i / 100.0; self.leds.fill((int(r*mod), int(g*mod), int(b*mod))); self.leds.show(); await asyncio.sleep(speed)
for i in range(100, -1, -10):
mod = i / 100.0; self.leds.fill((int(r*mod), int(g*mod), int(b*mod))); self.leds.show(); await asyncio.sleep(speed)
except asyncio.CancelledError: self.leds.fill(_OFF); self.leds.show()
async def slow_pulse(self, color): await self._base_pulse(color, 0.05)
async def medium_pulse(self, color): await self._base_pulse(color, 0.02)
async def fast_pulse(self, color): await self._base_pulse(color, 0.008)
async def _base_blink(self, color: Tuple[int, int, int], speed: float):
try:
while True:
self.leds.fill(color); self.leds.show(); await asyncio.sleep(speed)
self.leds.fill(_OFF); self.leds.show(); await asyncio.sleep(speed)
except asyncio.CancelledError: self.leds.fill(_OFF); self.leds.show()
async def slow_blink(self, color): await self._base_blink(color, 1.0)
async def medium_blink(self, color): await self._base_blink(color, 0.5)
async def fast_blink(self, color): await self._base_blink(color, 0.1)
async def spin(self, color: Tuple[int, int, int], speed: float = 0.1):
try:
i = 0
while True:
self.leds.fill(_OFF); self.leds[i % self.num_leds] = color; self.leds.show(); i += 1; await asyncio.sleep(speed)
except asyncio.CancelledError: self.leds.fill(_OFF); self.leds.show()
# --- Voice Event Subscribers ---
@subscribe
def ha_connected(self, data: dict):
_LOGGER.debug("HA Connected, setting idle LED state.")
self.voice_run_end(data)
def ha_connected(self, data: dict): self._apply_state_effect("idle")
@subscribe
def voice_wakeword(self, data: dict): self._apply_state_effect("listening")
@subscribe
def voice_stt_start(self, data: dict): self._apply_state_effect("listening")
@subscribe
def voice_vad_start(self, data: dict): pass
@subscribe
def voice_stt_end(self, data: dict): self._apply_state_effect("thinking")
@subscribe
def voice_tts_start(self, data: dict): self._apply_state_effect("responding")
@subscribe
def voice_error(self, data: dict): self._apply_state_effect("error")
@subscribe
def voice_run_end(self, data: dict): self._apply_state_effect("idle")
@subscribe
def mic_muted(self, data: dict): self.run_action("solid", _DIM_RED)
@subscribe
def mic_unmuted(self, data: dict): self._apply_state_effect("idle")
@subscribe
def voice_wakeword(self, data: dict):
_LOGGER.debug("LED Event: voice_wakeword")
self.run_action("pulse", _BLUE)
# --- MQTT Config Subscribers ---
def _update_config(self, state_name: str, data: dict, apply: bool):
config = self.configs[state_name]
changed = False
new_effect = data.get("effect")
if new_effect is not None and config["effect"] != new_effect:
config["effect"] = new_effect
changed = True
new_color = data.get("color")
if new_color is not None:
new_color_tuple = (new_color.get("r"), new_color.get("g"), new_color.get("b"))
if config["color"] != new_color_tuple:
config["color"] = new_color_tuple
changed = True
new_brightness = data.get("brightness")
if new_brightness is not None:
new_brightness_float = new_brightness / 255.0
if config["brightness"] != new_brightness_float:
config["brightness"] = new_brightness_float
changed = True
if not changed:
return
is_retained = data.get("retained", False)
if apply and not is_retained:
self._apply_state_effect(state_name)
elif is_retained:
if state_name == "idle": self._apply_state_effect("idle")
elif not apply:
# Config was updated for a non-active state, just publish it back
config["state_name"] = state_name
self.state.event_bus.publish("publish_state_to_mqtt", config)
@subscribe
def voice_stt_start(self, data: dict):
_LOGGER.debug("LED Event: voice_stt_start (listening)")
self.run_action("pulse", _BLUE)
def set_idle_effect(self, data: dict): self._update_config("idle", data, True)
@subscribe
def voice_vad_start(self, data: dict):
_LOGGER.debug("LED Event: voice_vad_start (user speaking)")
# Do nothing, allow the blue pulse to continue
pass
def set_idle_color(self, data: dict): self._update_config("idle", data, self.configs["idle"]["effect"] != "off")
@subscribe
def voice_stt_end(self, data: dict):
_LOGGER.debug("LED Event: voice_stt_end (processing)")
self.run_action("pulse", _YELLOW)
def set_listening_effect(self, data: dict): self._update_config("listening", data, False)
@subscribe
def voice_tts_start(self, data: dict):
_LOGGER.debug("LED Event: voice_tts_start (assistant speaking)")
self.run_action("pulse", _GREEN)
def set_listening_color(self, data: dict): self._update_config("listening", data, False)
@subscribe
def voice_run_end(self, data: dict):
_LOGGER.debug("LED Event: voice_run_end")
self.run_action("color", _OFF)
def set_thinking_effect(self, data: dict): self._update_config("thinking", data, False)
@subscribe
def set_thinking_color(self, data: dict): self._update_config("thinking", data, False)
@subscribe
def set_responding_effect(self, data: dict): self._update_config("responding", data, False)
@subscribe
def set_responding_color(self, data: dict): self._update_config("responding", data, False)
@subscribe
def set_error_effect(self, data: dict): self._update_config("error", data, False)
@subscribe
def set_error_color(self, data: dict): self._update_config("error", data, False)
@subscribe
def set_num_leds(self, data: dict):
num_leds = data.get("num_leds")
if (num_leds is not None) and (self.num_leds != num_leds):
_LOGGER.info("Number of LEDs changed to %d. Please restart for change to take effect.", num_leds)