Merge branch 'indygriffiths-add-consumer-keys'

pqrs-org · Dec 15, 2024 · fc8c5fa · fc8c5fa
2 parents 347a6ec + 8a567d4
commit fc8c5fa
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 0 deletions.
diff --git a/src/apps/SettingsWindow/Resources/simple_modifications.json b/src/apps/SettingsWindow/Resources/simple_modifications.json
@@ -1018,6 +1018,51 @@
             }
         ]
     },
+    {
+        "not_to": true,
+        "label": "stop",
+        "data": [
+            {
+                "consumer_key_code": "stop"
+            }
+        ]
+    },
+    {
+        "not_to": true,
+        "label": "bass_boost",
+        "data": [
+            {
+                "consumer_key_code": "bass_boost"
+            }
+        ]
+    },
+    {
+        "not_to": true,
+        "label": "loudness",
+        "data": [
+            {
+                "consumer_key_code": "loudness"
+            }
+        ]
+    },
+    {
+        "not_to": true,
+        "label": "bass_increment",
+        "data": [
+            {
+                "consumer_key_code": "bass_increment"
+            }
+        ]
+    },
+    {
+        "not_to": true,
+        "label": "bass_decrement",
+        "data": [
+            {
+                "consumer_key_code": "bass_decrement"
+            }
+        ]
+    },
     {
         "category": "Keypad keys"
     },
@@ -2837,6 +2882,11 @@
     {
         "category": "Generic GUI application control keys"
     },
+    {
+        "not_to": true,
+        "label": "ac_search",
+        "data": [{ "consumer_key_code": "ac_search" }]
+    },
     {
         "not_to": true,
         "label": "ac_home",

diff --git a/src/share/types/momentary_switch_event_details/consumer_key_code.hpp b/src/share/types/momentary_switch_event_details/consumer_key_code.hpp
@@ -44,12 +44,17 @@ constexpr std::pair<const mapbox::eternal::string, const pqrs::hid::usage::value
     {"rewind", pqrs::hid::usage::consumer::rewind},
     {"scan_next_track", pqrs::hid::usage::consumer::scan_next_track},
     {"scan_previous_track", pqrs::hid::usage::consumer::scan_previous_track},
+    {"stop", pqrs::hid::usage::consumer::stop},
     {"eject", pqrs::hid::usage::consumer::eject},
     {"play_or_pause", pqrs::hid::usage::consumer::play_or_pause},
     {"voice_command", pqrs::hid::usage::consumer::voice_command},
     {"mute", pqrs::hid::usage::consumer::mute},
+    {"bass_boost", pqrs::hid::usage::consumer::bass_boost},
+    {"loudness", pqrs::hid::usage::consumer::loudness},
     {"volume_increment", pqrs::hid::usage::consumer::volume_increment},
     {"volume_decrement", pqrs::hid::usage::consumer::volume_decrement},
+    {"bass_increment", pqrs::hid::usage::consumer::bass_increment},
+    {"bass_decrement", pqrs::hid::usage::consumer::bass_decrement},
 
     // Application launch buttons
     {"al_consumer_control_configuration", pqrs::hid::usage::consumer::al_consumer_control_configuration},
@@ -126,6 +131,7 @@ constexpr std::pair<const mapbox::eternal::string, const pqrs::hid::usage::value
     {"al_contextaware_desktop_assistant", pqrs::hid::usage::consumer::al_contextaware_desktop_assistant},
 
     // Generic gui application controls
+    {"ac_search", pqrs::hid::usage::consumer::ac_search},
     {"ac_home", pqrs::hid::usage::consumer::ac_home},
     {"ac_back", pqrs::hid::usage::consumer::ac_back},
     {"ac_forward", pqrs::hid::usage::consumer::ac_forward},