Merge branch 'master' into Note-Repeater

hdavid · Apr 1, 2017 · 1c02585 · 1c02585
2 parents 4545217 + 668c3a4
commit 1c02585
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Launchpad.py b/Launchpad.py
@@ -107,10 +107,9 @@ def init(self):
 			for control in self.controls:
 				if isinstance(control, ConfigurableButtonElement):
 					control.add_value_listener(self._button_value)
-
-
-			self.set_highlighting_session_component(self._selector.session_component())
+
 			self._suppress_session_highlight = False
+			self.set_highlighting_session_component(self._selector.session_component())
 			# due to our 2 stage init, we need to rebuild midi map 
 			self.request_rebuild_midi_map()
 			# and request update 

diff --git a/SkinMK2.py b/SkinMK2.py
@@ -97,6 +97,12 @@ class Sends:
 		class SendsSlider:
 			On = Rgb.MINT
 			Off = Rgb.BLACK
+		class SendsSlider_1:
+			On = Rgb.MINT
+			Off = Rgb.BLACK
+		class SendsSlider_2:
+			On = Rgb.MINT
+			Off = Rgb.BLACK
 
 	class Sends:#not used yet on legacy launchpad
 		A = Rgb.BLUE