added some methods for the Midi Fighter 64

Author: FMMT666

README.md

@@ -23,7 +23,7 @@ Did we mention [Python 3][18] yet?
 
 First [Mk3][21] and [X][22] Launchpad code snippets running now (4/2020).
 
-Now with a bit of Midi Fighter 64 support (8/2020).
+Now with a bit of [Midi Fighter 64][23] support (8/2020).
 
 
 ---
@@ -53,7 +53,7 @@ What's hot, what's not?
 
     Dicer              - class "Dicer()"            LEDs and buttons
 
-    Midi Fighter 64    - class "MidiFighter64"      EXPERIMENTAL; only raw buttons
+    Midi Fighter 64    - class "MidiFighter64"      EXPERIMENTAL; LEDs and buttons; growing
 
 
 Please notice that the class "LaunchpadMk3()" was renamed to "LaunchpadMiniMk3()" in 5/2020.  
@@ -87,6 +87,7 @@ Successfully tested with Ubuntu 18.04-LTS+. Requires compiling your own PyGame t
     - changed ListAll() method to optionally accept a string to query specific devices only
     - added a general midi_events.py demo file for better debugging
     - added a class for the Midi Fighter 64, only (raw) buttons so far
+    - added MF64 LedCtrlRaw(), ButtonStateXY(), LedAllOn()
 
 ### CHANGES 2020/05/XX:
 
@@ -1100,12 +1101,22 @@ Functions requiring a color code have a "...ByCode" naming style.
 
 ### LED functions
 
-    TODO
+    LedCtrlRaw()
+    LedAllOn()
 
 
 ### Button functions
 
     ButtonStateRaw()
+    ButtonStateXY()
+
+
+### Color codes
+
+The Midi Fighter 64 only supports a color table.  
+There is no possibility to control the RGB LEDs individually.yle.
+
+![RGB color palette](/images/mf64_colorcodes.png)
 
 
 
@@ -2211,14 +2222,48 @@ Functions requiring a color code have a "...ByCode" naming style.
 ### ButtonStateRaw()
 
     Returns the state of the buttons in RAW mode.
+    See table with button and LED numbers at the end of this document.
 
       PARAMS:
       RETURN: [ ]                        An empty list if no event occured, otherwise...
               [ <button>, <value> ]      ... a list with two fields:
-                                         <button> is the RAW button number (see tables at end of doc)
+                                         <button> is the RAW button number
+                                         <value>  >0 = pressed; 0 = released
+
+
+### ButtonStateXY()
+
+    Returns the state of the buttons in X/Y mode.
+    See table with coordinates at the end of this document.
+
+      PARAMS:
+      RETURN: [ ]                        An empty list if no event occured, otherwise...
+              [ <x> , <y>, <value> ]     ... a list with three fields:
+                                         <x>      0..7; x coordinate of button
+                                         <y>      0..7; y coordinate of button
                                          <value>  >0 = pressed; 0 = released
 
 
+### LedCtrlRaw( <button>, <colorcode> )
+
+    Controls an LED via its number <button> and <colorcode>.
+    See table with button number at the end of this document.
+    Color codes are somewhere above (see image).
+
+      PARAMS: <button>      36..99; number of the LED to control
+              <colorcode>   0..127; color code
+      RETURN:
+
+
+### LedAllOn( <colorcode> )
+
+    Quickly sets all LEDs to white or a given <colorcode>.
+    Notice that it is not (yet) possible to turn the LEDs off.
+    The Midi Fighter's color table does not include "black" or off.
+
+      PARAMS: <colorcode>   0..127; color code
+      RETURN:
+
 
 
 ---
@@ -2673,7 +2718,7 @@ The mode keys return:
 
 
 ---
-## (TODO) Button codes, Midi Fighter 64
+## (TODO) Led and Button codes, Midi Fighter 64
 
 ### RAW Mode
 
@@ -2746,4 +2791,4 @@ FMMT666(ASkr)
 [20]: https://github.com/FMMT666/launchpad.py/issues/38#issuecomment-519698406
 [21]: https://twitter.com/FMMT666/status/1242950069923520519
 [22]: https://twitter.com/FMMT666/status/1242978460454326272
-
+[23]: https://twitter.com/FMMT666/status/1298372859383906305

examples/.gitignore

@@ -10,3 +10,4 @@
 !launchpad_pressure.py
 !midi_events.py
 !buttons_raw.py
+!buttons_xy.py

examples/buttons_xy.py

@@ -0,0 +1,101 @@
+#!/usr/bin/env python
+#
+# Quick button test.
+# Works with these Launchpads: Mk1, Mk2, Mini Mk3, S/Mini, Pro
+# And these:                   Midi Figther 64
+# 
+#
+# FMMT666(ASkr) 7/2013..8/2020
+# www.askrprojects.net
+#
+
+import sys
+import time
+
+
+try:
+	import launchpad_py as launchpad
+except ImportError:
+	try:
+		import launchpad
+	except ImportError:
+		sys.exit("error loading launchpad.py")
+
+
+def main():
+
+	mode = None
+
+	if launchpad.LaunchpadPro().Check( 0 ):
+		lp = launchpad.LaunchpadPro()
+		if lp.Open( 0 ):
+			print("Launchpad Pro")
+			mode = "Pro"
+	
+	elif launchpad.LaunchpadMiniMk3().Check( 1 ):
+		lp = launchpad.LaunchpadMiniMk3()
+		if lp.Open( 1 ):
+			print("Launchpad Mini Mk3")
+			mode = "Pro"
+
+	elif launchpad.LaunchpadLPX().Check( 1 ):
+		lp = launchpad.LaunchpadLPX()
+		if lp.Open( 1 ):
+			print("Launchpad X")
+			mode = "Pro"
+			
+	elif launchpad.LaunchpadMk2().Check( 0 ):
+		lp = launchpad.LaunchpadMk2()
+		if lp.Open( 0 ):
+			print("Launchpad Mk2")
+			mode = "Mk2"
+
+	# elif launchpad.LaunchControlXL().Check( 0 ):
+	# 	lp = launchpad.LaunchControlXL()
+	# 	if lp.Open( 0 ):
+	# 		print("Launch Control XL")
+	# 		mode = "XL"
+			
+	# elif launchpad.LaunchKeyMini().Check( 0 ):
+	# 	lp = launchpad.LaunchKeyMini()
+	# 	if lp.Open( 0 ):
+	# 		print("LaunchKey (Mini)")
+	# 		mode = "LKM"
+
+	elif launchpad.Dicer().Check( 0 ):
+		lp = launchpad.Dicer()
+		if lp.Open( 0 ):
+			print("Dicer")
+			mode = "Dcr"
+
+	elif launchpad.MidiFighter64().Check( 0 ):
+		lp = launchpad.MidiFighter64()
+		if lp.Open( 0 ):
+			print("Midi Fighter 64")
+			mode = "F64"
+
+	else:
+		if lp.Open():
+			print("Launchpad Mk1/S/Mini")
+			mode = "Mk1"
+
+	if mode is None:
+		print("Did not find any Launchpads, meh...")
+		return
+
+    print("QUIT: That's on the TODO list. For now, just hit CTRL-C ...")
+
+	while True:
+		buts = lp.ButtonStateXY()
+		if buts != []:
+			print( buts[0], buts[1], buts[2])
+
+	print("bye ...")
+
+	lp.Reset() # turn all LEDs off
+	lp.Close() # close the Launchpad (will quit with an error due to a PyGame bug)
+
+	
+if __name__ == '__main__':
+	main()
+

examples/launchpad_pro.py

@@ -37,7 +37,7 @@ def main():
 	print( " - PyGame " + str( pygame.ver ) )
 
 	# create an instance
-	lp = launchpad.LaunchpadPro();
+	lp = launchpad.LaunchpadPro()
 
 	# open the first Launchpad Pro
 	if lp.Open( 0, "pad pro" ):

images/mf64_colorcodes.png

@@ -2742,7 +2742,7 @@ def ButtonStateRaw( self, returnPressure = False ):
 class MidiFighter64( LaunchpadBase ):
 
 	#         
-	# BUTTON NUMBERS IN RAW MODE
+	# LED AND BUTTON NUMBERS IN RAW MODE
 	#         
 	#        +---+---+---+---+---+---+---+---+
 	#        | 64|   |   | 67| 96|   |   | 99|
@@ -2805,6 +2805,29 @@ def Check( self, number = 0, name = "Fighter 64" ):
 		return super( MidiFighter64, self ).Check( number = number, name = name )
 
 
+	#-------------------------------------------------------------------------------------
+	#-- Controls a grid LED by its <number> and a <color>.
+	#--  <number> 36..99
+	#--  <color>   0..127 from color table
+	#-------------------------------------------------------------------------------------
+	def LedCtrlRaw( self, number, color ):
+
+		if number < 36 or number > 99:
+			return
+		if color  < 0  or color  > 127:
+			return
+
+		self.midi.RawWrite( 146, number, color )
+
+
+	#-------------------------------------------------------------------------------------
+	#-- Sets all LEDs to the same color, specified by <color>.
+	#-- If color is omitted, the LEDs are set to white (code 3)
+	#-------------------------------------------------------------------------------------
+	def LedAllOn( self, color = 3 ):
+		for i in range(64):
+			self.LedCtrlRaw( i+36, color )
+
 
 	#-------------------------------------------------------------------------------------
 	#-- Returns the raw value of the last button change (pressed/unpressed) as a list
@@ -2851,29 +2874,39 @@ def ButtonStateRaw( self ):
 	#-- <velocity> the state of the button.
 	#--   >0 = button pressed; 0 = button released
 	#-------------------------------------------------------------------------------------
-	# TODO
-	# def ButtonStateXY( self ):
-	# 	if self.midi.ReadCheck():
-	# 		a = self.midi.ReadRaw()
+	def ButtonStateXY( self ):
+		if self.midi.ReadCheck():
+			a = self.midi.ReadRaw()
 
-	# 		# Mhh, I guess it's about time to think about adding MIDI channels, isn't it?
-	# 		# But for now, we just check ch 2 and 3:
-	# 		if a[0][0][0] == 145 or a[0][0][0] == 146:
-	# 			return [ a[0][0][1], a[0][0][2] ]
-	# 		else:
-	# 			if a[0][0][0] == 130 or a[0][0][0] == 129:
-	# 				return [ a[0][0][1], 0 ]
-	# 			else:
-	# 				return []
-	# 	else:
-	# 		return []
+			# whatever that is, does not belong here...
+			if a[0][0][1] < 36 or a[0][0][1] > 99:
+				return []
+
+			x = (a[0][0][1] - 36) % 4
+			if a[0][0][1] >= 68:
+				x += 4
+			y = 7 - ( (a[0][0][1] - 36) % 32 ) // 4
+
+			if a[0][0][0] == 145 or a[0][0][0] == 146:
+				return [ x, y, a[0][0][2] ]
+			else:
+				if a[0][0][0] == 130 or a[0][0][0] == 129:
+					return [ x, y, 0 ]
+				else:
+					return []
+		else:
+			return []
 
 
 	#-------------------------------------------------------------------------------------
 	#-- Reset the Midi Fighter
-	#-- Turn off all LEDs
+	#-- Well, at least turn off all its LEDs
 	#-------------------------------------------------------------------------------------
-	# TODO
 	def Reset( self ):
+		# TODO
+		# Nope, there's not color code for "off".
+		# Brightness can be set via channel 4, though it's not clear
+		# if that helps us here, as the manual files this under "animation settings".
+		# Also, setting the brightness to 0/off might cause additional trouble.
+		# self.LedAllOn( 0 ) 
 		pass
-