prev/next buttons working

espmusicmouse/host_driver/host_driver.py

@@ -29,7 +29,7 @@ class TouchButton(Enum):
     RIGHT_EAR = 3
 
 
-outgoing_msg_map = {
+led_ring_effect_to_message_id = {
     EffectStaticConfig: 0,
     EffectAlexaSwipeConfig: 1,
     EffectCircularConfig: 2,
@@ -37,6 +37,12 @@ outgoing_msg_map = {
     EffectSwipeAndChange: 4,
 }
 
+mouse_led_effect_to_message_id = {
+    EffectStaticConfig: 5,
+    EffectCircularConfig: 6,
+    EffectRandomTwoColorInterpolationConfig: 7
+}
+
 
 class RfidTokenRead:
     def __init__(self, id: bytes):
@@ -72,11 +78,33 @@ class TouchButtonRelease:
         return "Released " + repr(self.touch_button)
 
 
+class ButtonEvent:
+    button_name = {1: 'left', 2: 'right', 3: 'rotary'}
+    event_name = {
+        0: 'pressed',
+        1: 'released',
+        2: 'clicked',
+        3: 'double_clicked',
+        4: 'long_pressed',
+        5: 'repeat_pressed',
+        6: 'long_released'
+    }
+
+    def __init__(self, msg_content: bytes):
+        button_nr, event_nr = struct.unpack("<BB", msg_content)
+        self.button = self.button_name[button_nr]
+        self.event = self.event_name[event_nr]
+
+    def __repr__(self) -> str:
+        return f"Button {self.button} {self.event}"
+
+
 incomingMsgMap = {
     0: RfidTokenRead,
     1: RotaryEncoderEvent,
     2: TouchButtonPress,
     3: TouchButtonRelease,
+    4: ButtonEvent,
 }
 
 
@@ -92,10 +120,16 @@ class MusicMouseProtocol(asyncio.Protocol):
         self.transport = transport
         self.in_buff = bytes()
 
-    def send_message(self, message):
-        msg_content = message.as_bytes()
-        header = struct.pack("<IBH", MAGIC_TOKEN_HOST_TO_FW, outgoing_msg_map[type(message)],
-                             len(msg_content))
+    def led_ring_effect(self, effect_cfg):
+        msg_content = effect_cfg.as_bytes()
+        header = struct.pack("<IBH", MAGIC_TOKEN_HOST_TO_FW,
+                             led_ring_effect_to_message_id[type(effect_cfg)], len(msg_content))
+        self.transport.write(header + msg_content)
+
+    def mouse_led_effect(self, effect_cfg):
+        msg_content = effect_cfg.as_bytes()
+        header = struct.pack("<IBH", MAGIC_TOKEN_HOST_TO_FW,
+                             mouse_led_effect_to_message_id[type(effect_cfg)], len(msg_content))
         self.transport.write(header + msg_content)
 
     def data_received(self, data):

espmusicmouse/host_driver/main.py

@@ -3,7 +3,7 @@ import serial_asyncio
 from led_cmds import (ColorRGBW, ColorHSV, EffectStaticConfig,
                       EffectRandomTwoColorInterpolationConfig, EffectAlexaSwipeConfig,
                       EffectSwipeAndChange)
-from host_driver import MusicMouseProtocol, RfidTokenRead, RotaryEncoderEvent
+from host_driver import MusicMouseProtocol, RfidTokenRead, RotaryEncoderEvent, ButtonEvent
 from player import AudioPlayer
 from glob import glob
 import os
@@ -22,7 +22,7 @@ rfid_token_map = {
 }
 
 playlists = {
-    fig: audio_player.create_playlist(glob(os.path.join(MUSIC_FOLDER, fig, "*.mp3")))
+    fig: audio_player.create_playlist(sorted(glob(os.path.join(MUSIC_FOLDER, fig, "*.mp3"))))
     for fig in rfid_token_map.values()
 }
 
@@ -36,16 +36,17 @@ mouse_leds = {
 
 def set_mouse_leds(protocol, position: str, color: ColorRGBW):
     start, end = mouse_leds[position]
-    protocol.send_message(EffectStaticConfig(color, start, end))
+    protocol.led_ring_effect(EffectStaticConfig(color, start, end))
 
 
 def on_music_end_callback(protocol):
     eff = EffectAlexaSwipeConfig()
     eff.forward = False
-    protocol.send_message(eff)
+    protocol.led_ring_effect(eff)
+    protocol.mouse_led_effect(EffectStaticConfig(ColorRGBW(0, 0, 0, 0)))
 
 
-def on_firmware_msg(protocol, message):
+def on_firmware_msg(protocol: MusicMouseProtocol, message):
     print("Got message", message)
     if isinstance(message, RfidTokenRead) and message.id == bytes.fromhex("0000000000"):
         if audio_player.is_playing():
@@ -53,7 +54,8 @@ def on_firmware_msg(protocol, message):
             eff.forward = False
         else:
             eff = EffectStaticConfig(ColorRGBW(0, 0, 0, 0))
-        protocol.send_message(eff)
+        protocol.led_ring_effect(eff)
+        protocol.mouse_led_effect(EffectStaticConfig(ColorRGBW(0, 0, 0, 0)))
         audio_player.pause()
     elif isinstance(message, RfidTokenRead) and message.id in rfid_token_map:
         eff = EffectSwipeAndChange()
@@ -66,7 +68,8 @@ def on_firmware_msg(protocol, message):
             eff.swipe.swipe_speed = 180
             eff.swipe.bell_curve_width_in_leds = 6
 
-        protocol.send_message(eff)
+        protocol.led_ring_effect(eff)
+        protocol.mouse_led_effect(EffectStaticConfig(ColorRGBW(0, 0, 1, 0)))
         print(figure)
         if figure in playlists:
             audio_player.set_playlist(playlists[figure])
@@ -77,6 +80,11 @@ def on_firmware_msg(protocol, message):
                 audio_player.change_volume(2)
             elif message.direction == 1:
                 audio_player.change_volume(-2)
+    elif isinstance(message, ButtonEvent):
+        if message.button == "left" and message.event == "pressed":
+            audio_player.previous()
+        elif message.button == "right" and message.event == "pressed":
+            audio_player.next()
 
 
 loop = asyncio.get_event_loop()