Merge branch 'next'

Electronicks · May 28, 2021 · cdcc3c7 · cdcc3c7
2 parents c907d7c + a3fb475
commit cdcc3c7
Show file tree

Hide file tree

Showing 4 changed files with 184 additions and 156 deletions.
diff --git a/JoyShockMapper/include/JoyShockMapper.h b/JoyShockMapper/include/JoyShockMapper.h
@@ -105,12 +105,6 @@ enum class ButtonID
 	LEAN_LEFT,
 	LEAN_RIGHT,
 	MIC,
-	TOUCH,   // Touch anywhere on the touchpad
-	ZLF,     // = FIRST_ANALOG_TRIGGER
-	CAPTURE, // Full press of touchpad touch + press
-	// insert more analog triggers here
-	ZRF,  // =  LAST_ANALOG_TRIGGER
-
 	LUP,
 	LDOWN,
 	LLEFT,
@@ -126,16 +120,22 @@ enum class ButtonID
 	MLEFT,
 	MRIGHT,
 	MRING,
+	TOUCH,   // Touch anywhere on the touchpad
+	ZLF,     // = FIRST_ANALOG_TRIGGER
+	CAPTURE, // Full press of touchpad touch + press
+	// insert more analog triggers here
+	ZRF,  // =  LAST_ANALOG_TRIGGER
 
-	SIZE, // Not a button
-
-	// Virtual buttons configured on the touchpad. The number of buttons vary dynamically, but they each need a different ID
-	TUP, // FIRST_TOUCH_BUTTON
+	TUP,
 	TDOWN,
 	TLEFT,
 	TRIGHT,
 	TRING,
-	T1,
+
+	SIZE, // Not a button
+
+	// Virtual buttons configured on the touchpad. The number of buttons vary dynamically, but they each need a different ID
+	T1,  // FIRST_TOUCH_BUTTON
 	T2,
 	T3,
 	T4,

diff --git a/JoyShockMapper/src/ButtonHelp.cpp b/JoyShockMapper/src/ButtonHelp.cpp
@@ -46,4 +46,9 @@ const map<ButtonID, string> buttonHelpMap{
 	{ ButtonID::MIC, "PS5 microphone button" },
 	{ ButtonID::ZLF, "Full pull binding of left trigger, only on controllers with analog triggers" },
 	{ ButtonID::ZRF, "Full pull binding of right trigger, only on controllers with analog triggers" },
+	{ ButtonID::TUP, "Touch stick tilted forward" },
+	{ ButtonID::TDOWN, "Touch stick tilted back" },
+	{ ButtonID::TLEFT, "Touch stick tilted left" },
+	{ ButtonID::TRIGHT, "Touch stick tilted right" },
+	{ ButtonID::TRING, "Touch ring binding, either inner or outer." },
 };