chore(deck): unity vdf actions naming convention

DiscreteTom · Jun 22, 2024 · acd00db · acd00db
1 parent a56e3d0
commit acd00db
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 33 deletions.
diff --git a/deck/src/input/xbox.rs b/deck/src/input/xbox.rs
@@ -36,24 +36,24 @@ impl XBoxControls {
     Ok(Self {
       handle: check_handle(input.get_action_set_handle("XBoxControls"))?,
 
-      btn_up: InputDigitalAction::new(input, "btn_up")?,
-      btn_down: InputDigitalAction::new(input, "btn_down")?,
-      btn_left: InputDigitalAction::new(input, "btn_left")?,
-      btn_right: InputDigitalAction::new(input, "btn_right")?,
-      btn_start: InputDigitalAction::new(input, "btn_start")?,
-      btn_back: InputDigitalAction::new(input, "btn_back")?,
-      btn_l_thumb: InputDigitalAction::new(input, "btn_l_thumb")?,
-      btn_r_thumb: InputDigitalAction::new(input, "btn_r_thumb")?,
-      btn_lb: InputDigitalAction::new(input, "btn_lb")?,
-      btn_rb: InputDigitalAction::new(input, "btn_rb")?,
-      btn_a: InputDigitalAction::new(input, "btn_a")?,
-      btn_b: InputDigitalAction::new(input, "btn_b")?,
-      btn_x: InputDigitalAction::new(input, "btn_x")?,
-      btn_y: InputDigitalAction::new(input, "btn_y")?,
+      btn_up: InputDigitalAction::new(input, "BtnUp")?,
+      btn_down: InputDigitalAction::new(input, "BtnDown")?,
+      btn_left: InputDigitalAction::new(input, "BtnLeft")?,
+      btn_right: InputDigitalAction::new(input, "BtnRight")?,
+      btn_start: InputDigitalAction::new(input, "BtnStart")?,
+      btn_back: InputDigitalAction::new(input, "BtnBack")?,
+      btn_l_thumb: InputDigitalAction::new(input, "BtnLeftThumb")?,
+      btn_r_thumb: InputDigitalAction::new(input, "BtnRightThumb")?,
+      btn_lb: InputDigitalAction::new(input, "BtnLB")?,
+      btn_rb: InputDigitalAction::new(input, "BtnRB")?,
+      btn_a: InputDigitalAction::new(input, "BtnA")?,
+      btn_b: InputDigitalAction::new(input, "BtnB")?,
+      btn_x: InputDigitalAction::new(input, "BtnX")?,
+      btn_y: InputDigitalAction::new(input, "BtnY")?,
 
-      lt: InputAnalogAction::new(input, "left_trigger")?,
-      rt: InputAnalogAction::new(input, "right_trigger")?,
-      l_move: InputAnalogAction::new(input, "LeftMove")?, // TODO: unify name convention?
+      lt: InputAnalogAction::new(input, "LeftTrigger")?,
+      rt: InputAnalogAction::new(input, "RightTrigger")?,
+      l_move: InputAnalogAction::new(input, "LeftMove")?,
       l_mouse: InputAnalogAction::new(input, "LeftMouse")?,
       r_move: InputAnalogAction::new(input, "RightMove")?,
       r_mouse: InputAnalogAction::new(input, "RightMouse")?,

diff --git a/deck/stickdeck.vdf b/deck/stickdeck.vdf
@@ -7,25 +7,25 @@
       "title"     "#Set_XBoxControls"
       "Button"
       {
-        "btn_up"          "#Action_BtnUp"
-        "btn_down"        "#Action_BtnDown"
-        "btn_left"        "#Action_BtnLeft"
-        "btn_right"       "#Action_BtnRight"
-        "btn_start"       "#Action_BtnStart"
-        "btn_back"        "#Action_BtnBack"
-        "btn_l_thumb"     "#Action_BtnLeftThumb"
-        "btn_r_thumb"     "#Action_BtnRightThumb"
-        "btn_lb"          "#Action_BtnLB"
-        "btn_rb"          "#Action_BtnRB"
-        "btn_a"           "#Action_BtnA"
-        "btn_b"           "#Action_BtnB"
-        "btn_x"           "#Action_BtnX"
-        "btn_y"           "#Action_BtnY"
+        "BtnUp"             "#Action_BtnUp"
+        "BtnDown"           "#Action_BtnDown"
+        "BtnLeft"           "#Action_BtnLeft"
+        "BtnRight"          "#Action_BtnRight"
+        "BtnStart"          "#Action_BtnStart"
+        "BtnBack"           "#Action_BtnBack"
+        "BtnLeftThumb"      "#Action_BtnLeftThumb"
+        "BtnRightThumb"     "#Action_BtnRightThumb"
+        "BtnLB"             "#Action_BtnLB"
+        "BtnRB"             "#Action_BtnRB"
+        "BtnA"              "#Action_BtnA"
+        "BtnB"              "#Action_BtnB"
+        "BtnX"              "#Action_BtnX"
+        "BtnY"              "#Action_BtnY"
       }
       "AnalogTrigger"
       {
-        "left_trigger"      "#Action_LT"
-        "right_trigger"     "#Action_RT"
+        "LeftTrigger"     "#Action_LT"
+        "RightTrigger"    "#Action_RT"
       }
       "StickPadGyro"
       {