Tmp: map dials to volume + screen brightness

Signed-off-by: Luke Jones <[email protected]>

Author: flukejones

Diff for: rootfs/usr/share/inputplumber/profiles/default.yaml

@@ -53,32 +53,28 @@ mapping:
                   name: LeftStickDial
                   direction: counter-clockwise
       target_events:
-          - mouse:
-                button: "WheelLeft"
+          - keyboard: KeyVolumeDown
     - name: Left Dial Clockwise
       source_event:
           gamepad:
               dial:
                   name: LeftStickDial
                   direction: clockwise
       target_events:
-          - mouse:
-                button: "WheelRight"
+          - keyboard: KeyVolumeUp
     - name: Right Dial Counter-clockwise
       source_event:
           gamepad:
               dial:
                   name: RightStickDial
                   direction: counter-clockwise
       target_events:
-          - mouse:
-                button: "WheelUp"
+          - keyboard: KeyBrightnessDown
     - name: Right Dial Clockwise
       source_event:
           gamepad:
               dial:
                   name: RightStickDial
                   direction: clockwise
       target_events:
-          - mouse:
-                button: "WheelDown"
+          - keyboard: KeyBrightnessUp

Diff for: rootfs/usr/share/inputplumber/schema/device_profile_v1.json

@@ -133,6 +133,8 @@
             "KeyGrave",
             "KeyLeftShift",
             "KeyBackslash",
+            "KeyBrightnessDown",
+            "KeyBrightnessUp",
             "KeyZ",
             "KeyX",
             "KeyC",

Diff for: src/input/capability.rs

@@ -688,6 +688,8 @@ pub enum Keyboard {
     KeyBack,
     KeyBackslash,
     KeyBackspace,
+    KeyBrightnessDown,
+    KeyBrightnessUp,
     KeyC,
     KeyCalc,
     KeyCapslock,
@@ -855,6 +857,8 @@ impl fmt::Display for Keyboard {
             Keyboard::KeyBack => write!(f, "KeyBack"),
             Keyboard::KeyBackslash => write!(f, "KeyBackslash"),
             Keyboard::KeyBackspace => write!(f, "KeyBackspace"),
+            Keyboard::KeyBrightnessDown => write!(f, "KeyBrightnessDown"),
+            Keyboard::KeyBrightnessUp => write!(f, "KeyBrightnessUp"),
             Keyboard::KeyC => write!(f, "KeyC"),
             Keyboard::KeyCalc => write!(f, "KeyCalc"),
             Keyboard::KeyCapslock => write!(f, "KeyCapslock"),
@@ -1026,6 +1030,8 @@ impl FromStr for Keyboard {
             "KeyBack" => Ok(Keyboard::KeyBack),
             "KeyBackslash" => Ok(Keyboard::KeyBackslash),
             "KeyBackspace" => Ok(Keyboard::KeyBackspace),
+            "KeyBrightnessDown" => Ok(Keyboard::KeyBrightnessDown),
+            "KeyBrightnessUp" => Ok(Keyboard::KeyBrightnessUp),
             "KeyC" => Ok(Keyboard::KeyC),
             "KeyCalc" => Ok(Keyboard::KeyCalc),
             "KeyCapslock" => Ok(Keyboard::KeyCapslock),

Diff for: src/input/event/dbus.rs

@@ -249,6 +249,8 @@ fn actions_from_capability(capability: Capability) -> Vec<Action> {
             Keyboard::KeyMinus => vec![Action::None],
             Keyboard::KeyEqual => vec![Action::None],
             Keyboard::KeyBackspace => vec![Action::Back],
+            Keyboard::KeyBrightnessDown => vec![Action::None],
+            Keyboard::KeyBrightnessUp => vec![Action::None],
             Keyboard::KeyTab => vec![Action::None],
             Keyboard::KeyQ => vec![Action::None],
             Keyboard::KeyW => vec![Action::None],

Diff for: src/input/event/evdev.rs

@@ -210,8 +210,8 @@ impl EvdevEvent {
                 KeyCode::KEY_BATTERY => Capability::NotImplemented,
                 KeyCode::KEY_BLUETOOTH => Capability::NotImplemented,
                 KeyCode::KEY_BOOKMARKS => Capability::NotImplemented,
-                KeyCode::KEY_BRIGHTNESSDOWN => Capability::NotImplemented,
-                KeyCode::KEY_BRIGHTNESSUP => Capability::NotImplemented,
+                KeyCode::KEY_BRIGHTNESSDOWN => Capability::Keyboard(Keyboard::KeyBrightnessDown),
+                KeyCode::KEY_BRIGHTNESSUP => Capability::Keyboard(Keyboard::KeyBrightnessUp),
                 KeyCode::KEY_BRIGHTNESS_AUTO => Capability::NotImplemented,
                 KeyCode::KEY_BRIGHTNESS_CYCLE => Capability::NotImplemented,
                 KeyCode::KEY_C => Capability::Keyboard(Keyboard::KeyC),
@@ -721,6 +721,8 @@ fn event_codes_from_capability(capability: Capability) -> Vec<u16> {
             Keyboard::KeyBack => vec![KeyCode::KEY_BACK.0],
             Keyboard::KeyBackslash => vec![KeyCode::KEY_BACKSLASH.0],
             Keyboard::KeyBackspace => vec![KeyCode::KEY_BACKSPACE.0],
+            Keyboard::KeyBrightnessDown => vec![KeyCode::KEY_BRIGHTNESSDOWN.0],
+            Keyboard::KeyBrightnessUp => vec![KeyCode::KEY_BRIGHTNESSUP.0],
             Keyboard::KeyC => vec![KeyCode::KEY_C.0],
             Keyboard::KeyCalc => vec![KeyCode::KEY_CALC.0],
             Keyboard::KeyCapslock => vec![KeyCode::KEY_CAPSLOCK.0],

Diff for: src/input/event/native.rs

@@ -77,7 +77,6 @@ impl NativeEvent {
     }
 
     pub fn from_evdev_raw(event: EvdevEvent, hat_state: Option<i32>) -> NativeEvent {
-        dbg!(&event);
         // If this is a Dpad input, figure out with button this event is for
         let capability = if let Some(old_state) = hat_state {
             let axis = AbsoluteAxisCode(event.as_input_event().code());

Diff for: src/input/target/unified_gamepad.rs

@@ -803,6 +803,8 @@ impl From<Capability> for InputCapability {
                 Keyboard::KeyBack => Self::KeyboardKeyBack,
                 Keyboard::KeyBackslash => Self::KeyboardKeyBackslash,
                 Keyboard::KeyBackspace => Self::KeyboardKeyBackspace,
+                Keyboard::KeyBrightnessDown => Self::KeyboardKeyBrightnessDown,
+                Keyboard::KeyBrightnessUp => Self::KeyboardKeyBrightnessUp,
                 Keyboard::KeyC => Self::KeyboardKeyC,
                 Keyboard::KeyCalc => Self::KeyboardKeyCalc,
                 Keyboard::KeyCapslock => Self::KeyboardKeyCapsLock,