update implementation of vibrate on press

Author: joshuatam

src/hhd/controller/physical/evdev.py

@@ -327,6 +327,7 @@ def open(self) -> Sequence[int]:
                 self.fd = self.dev.fd
                 self.started = True
                 self.effect_id = -1
+                self.effect_on_press_id = -1
                 self.queue = []
             except Exception as e:
                 # Prevent leftover rules in case of error
@@ -365,7 +366,7 @@ def consume(self, events: Sequence[Event]):
 
         for ev in events:
             match ev["type"]:
-                case "rumble" | "vibrate_on_press":
+                case "rumble":
                     if not self.supports_vibration:
                         continue
 
@@ -384,7 +385,7 @@ def consume(self, events: Sequence[Event]):
                                 int(ev["weak_magnitude"] * 0xFFFF), 0xFFFF
                             ),
                         )
-                        duration_ms = 10000 if ev["type"] == "rumble" else 1
+                        duration_ms = 10000
 
                         effect = ff.Effect(
                             getattr(ecodes, "FF_RUMBLE"),
@@ -397,6 +398,38 @@ def consume(self, events: Sequence[Event]):
                         self.effect_id = self.dev.upload_effect(effect)
                         self.dev.write(getattr(ecodes, "EV_FF"), self.effect_id, 1)
 
+                case "vibrate_on_press":
+                    if not self.supports_vibration:
+                        continue
+
+                    # Erase old effect
+                    if self.effect_on_press_id != -1:
+                        self.dev.erase_effect(self.effect_on_press_id)
+                        self.effect_on_press_id = -1
+
+                    if ev["magnitude"] > 0:
+                        magnitude = min(
+                            int(ev["magnitude"] * 0xFFFF), 0xFFFF
+                        )
+
+                        rumble = ff.Rumble(
+                            strong_magnitude=magnitude,
+                            weak_magnitude=magnitude,
+                        )
+
+                        duration_ms = 80
+
+                        effect = ff.Effect(
+                            getattr(ecodes, "FF_RUMBLE"),
+                            -1,
+                            0,
+                            ff.Trigger(0, 0),
+                            ff.Replay(duration_ms, 0),
+                            ff.EffectType(ff_rumble_effect=rumble),
+                        )
+                        self.effect_on_press_id = self.dev.upload_effect(effect)
+                        self.dev.write(getattr(ecodes, "EV_FF"), self.effect_on_press_id, 1)
+
     def produce(self, fds: Sequence[int]) -> Sequence[Event]:
         out: list[Event] = []
         curr = time.time()
@@ -431,13 +464,13 @@ def produce(self, fds: Sequence[int]) -> Sequence[Event]:
         while can_read(self.fd):
             for e in self.dev.read():
                 if self.vibrate_on_press > 0:
-                    vibration_delay = 0.001
-                    self.queue.append(({
-                        "type": "vibrate_on_press",
-                        "code": "main",
-                        "strong_magnitude": self.vibrate_on_press,
-                        "weak_magnitude": self.vibrate_on_press,
-                    }, curr + vibration_delay))
+                    out.append(
+                        {
+                            "type": "vibrate_on_press",
+                            "code": "main",
+                            "magnitude": self.vibrate_on_press,
+                        }
+                    )
 
                 if e.type == B("EV_KEY"):
                     if e.code == B("KEY_LEFTMETA"):