added XY pressure events for the X

Author: FMMT666

README.md

@@ -94,6 +94,8 @@ Successfully tested with Ubuntu 18.04-LTS+. Requires compiling your own PyGame t
     - added Pro Mk3 ButtonStateXY() pressure events
     - added demo file "launchpad_pressure_xy()" for new XY pressure events (Pro Mk3, so far)
     - fixed MF64 minor init flaw
+    - added X ButtonStateXY() pressure events
+    - updated pressure xy demo file for X and also fixed an error for the Pro Mk3
 
 
 ### CHANGES 2020/08/XX:

examples/launchpad_pressure_xy.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 #
 # Quick demo of the new, optional "pressure events" for supported Launchpads.
-# Works with: Pro Mk3
+# Works with: Pro Mk3, X
 # 
 #
 # FMMT666(ASkr) 7/2013..9/2020
@@ -31,10 +31,10 @@ def main():
 	# 	lp = launchpad.LaunchpadPro()
 	# 	if lp.Open( 0 ):
 	# 		mode = "pro"
-	# elif launchpad.LaunchpadLPX().Check ( 1 ):
-	# 	lp = launchpad.LaunchpadLPX()
-	# 	if lp.Open( 1 ):
-	# 		mode = "lpx"
+	elif launchpad.LaunchpadLPX().Check ( 1 ):
+		lp = launchpad.LaunchpadLPX()
+		if lp.Open( 1 ):
+			mode = "lpx"
 
 	if mode is None:
 		print("no compatible Launchpad found ...")	
@@ -60,7 +60,7 @@ def main():
 				if mode == "pro" or mode == "promk3":
 					print(" PRESSURE: " + str(events[2]) )
 				else:
-					print(" PRESSURE: " + str(events[0]-255) + " " + str(events[1]) )
+					print(" PRESSURE: " + str(events[0]-255) + " " + str(events[1]-255) + " " + str(events[2]) )
 
 			else:
 				# the standard button events
@@ -69,7 +69,7 @@ def main():
 				else:
 					print(" RELEASED: ", end='')
 				# TODO
-				print( str(events[0]) + " " + str(events[2]) )
+				print( str(events[0]) + " " + str(events[1]) + " " + str(events[2]) )
 
 
 if __name__ == '__main__':

launchpad_py/launchpad.py

@@ -2760,7 +2760,7 @@ def ButtonStateRaw( self, returnPressure = False ):
 	#-- Compatibility would require checking via "== True" and not "is True".
 	#-------------------------------------------------------------------------------------
 	# Overrides "LaunchpadPro" method
-	def ButtonStateXY( self, mode = "classic" ):
+	def ButtonStateXY( self, mode = "classic", returnPressure = False ):
 		if self.midi.ReadCheck():
 			a = self.midi.ReadRaw()
 
@@ -2770,22 +2770,28 @@ def ButtonStateXY( self, mode = "classic" ):
 			# very long lags...
 			# 8/2020: Copied from the Pro.
 			# Try to mitigate that a bit (yep, seems to work fine!)
-			while a[0][0][0] == 160:
-				a = self.midi.ReadRaw()
-				if a == []:
-					return []
+			# 9/2020: now also _with_ pressure :)
+			if returnPressure == False:
+				while a[0][0][0] == 160:
+					a = self.midi.ReadRaw()
+					if a == []:
+						return []
 
-			if a[0][0][0] == 144 or a[0][0][0] == 176:
+			if a[0][0][0] == 144 or a[0][0][0] == 176 or a[0][0][0] == 160:
 
 				if mode.lower() != "pro":
 					x = (a[0][0][1] - 1) % 10
 				else:
 					x = a[0][0][1] % 10
 				y = ( 99 - a[0][0][1] ) // 10
-			
-				return [ x, y, a[0][0][2] ]
+
+				# now with pressure events (9/2020)
+				if a[0][0][0] == 160 and returnPressure == True:
+					return [ x+255, y+255, a[0][0][2] ]
+				else:
+					return [ x, y, a[0][0][2] ]
 			else:
-				return []
+					return []
 		else:
 			return []