diff --git a/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/impl/MapParser.java b/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/impl/MapParser.java
index 6d1b566562a30be79efcd3ee1f1f6c1112a18f30..47619aaa58b99b520c692502ba98bf1c6fced0ea 100644
--- a/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/impl/MapParser.java
+++ b/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/impl/MapParser.java
@@ -12,6 +12,13 @@ public class MapParser {
public static Map<String, String> load(URL resource) throws IOException {
Map<String, String> items = new HashMap<>();
for (String line : IOUtils.readURL(resource).split("\n")) {
+ line = line.trim();
+
+ // Comment
+ if (line.startsWith("%")) {
+ continue;
+ }
+
String[] split = line.split("=");
if (split.length == 2) {
String color = split[0];
diff --git a/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/mk2/LaunchPadMK2.java b/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/mk2/LaunchPadMK2.java
index c9c37cf7b18c20a8052f90743f9028426ec0384a..1238b9ee32cfbd6cb1143cda030e161ed85f34c4 100644
--- a/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/mk2/LaunchPadMK2.java
+++ b/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/mk2/LaunchPadMK2.java
@@ -108,12 +108,12 @@ public class LaunchPadMK2 extends MidiDeviceImpl implements DeviceColorAssociato
@Override
public DisplayableFeedbackColor getDefaultEventColor() {
- return LaunchPadMK2Color.C5;
+ return LaunchPadMK2Color.C1_2;
}
@Override
public DisplayableFeedbackColor getDefaultStandardColor() {
- return LaunchPadMK2Color.C36;
+ return LaunchPadMK2Color.C5_2;
}
@Override
diff --git a/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/mk2/LaunchPadMK2Color.java b/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/mk2/LaunchPadMK2Color.java
index 4611129d713c1b69696d7311fb9be349e9f09f95..750da844cbfb607017bacd3f4c45d335d8f4b3d3 100644
--- a/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/mk2/LaunchPadMK2Color.java
+++ b/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/mk2/LaunchPadMK2Color.java
@@ -5,62 +5,118 @@ import javafx.scene.paint.Color;
public enum LaunchPadMK2Color implements DisplayableFeedbackColor {
- C0(0, Color.rgb(0, 0, 0)), // BLACK
- C2(2, Color.rgb(125, 125, 125)), // GRAY
- C3(3, Color.rgb(255, 255, 255)), // WHITE
- C4(4, Color.rgb(255, 74, 76)), // RED
- C5(5, Color.rgb(255, 0, 24)), // RED
- C6(6, Color.rgb(93, 1, 3)), // DARK_RED
- C8(8, Color.rgb(254, 188, 112)), // LIGHT_ORANGE
- C9(9, Color.rgb(255, 83, 35)), // ORANGE
- C10(10, Color.rgb(92, 28, 6)), // BROWN
- C11(11, Color.rgb(255, 189, 112)), // ORANGE ! DARK
- C12(12, Color.rgb(253, 252, 91)), // YELLOW
- C13(13, Color.rgb(253, 252, 85)), // YELLOW
- C14(14, Color.rgb(88, 88, 24)), // YELLOW
- C16(16, Color.rgb(117, 253, 92)), // LIGHT_GREEN
- C17(17, Color.rgb(117, 253, 92)), // LIGHT_GREEN
- C21(21, Color.rgb(0, 253, 81)), // LIGHT_GREEN
- C25(25, Color.rgb(0, 253, 81)), // LIGHT_GREEN
- C28(28, Color.rgb(0, 253, 143)), // LIGHT GREEN
- C32(32, Color.rgb(0, 252, 184)), // TURQUOISESingle
- C36(36, Color.rgb(36, 194, 250)), // LIGHT_BLUE
- C37(37, Color.rgb(0, 169, 249)), // LIGHT_BLUE
- C40(40, Color.rgb(60, 137, 248)), // BLUE
- C41(41, Color.rgb(0, 87, 246)), // BLUE
- C45(45, Color.rgb(7, 32, 245)), // BLUE
- C52(52, Color.rgb(255, 78, 247)), // PURPLE
- C53(53, Color.rgb(255, 23, 246)), // PINK
- C56(56, Color.rgb(255, 76, 131)), // PINK
- C57(57, Color.rgb(255, 0, 83)), // PINK
- C58(58, Color.rgb(93, 1, 27)), // PINK
- C59(59, Color.rgb(34, 0, 16)), // PINK
- C60(60, Color.rgb(255, 12, 25)), // RED
- C61(61, Color.rgb(159, 52, 18)), // ORANGE !
- C67(67, Color.rgb(7, 32, 245)), // BLUE !
- C72(72, Color.rgb(255, 0, 24)), // RED
- C76(76, Color.rgb(0, 136, 40)), // GREEN
- C78(78, Color.rgb(0, 169, 249)), // LIGHT_BLUE
- C79(79, Color.rgb(5, 44, 245)), // BLUE
- C90(90, Color.rgb(0, 252, 207)), // TURQUOISE
- C81(81, Color.rgb(123, 31, 245)), // PURPLE
- C82(82, Color.rgb(185, 24, 123)), // PURPLE
- C84(84, Color.rgb(255, 71, 32)), // ORANGE !
- C88(88, Color.rgb(0, 253, 81)), // GREEN !
- C92(92, Color.rgb(37, 81, 194)), // BLUE
- C96(96, Color.rgb(255, 189, 112)), // ORANGE
- C106(106, Color.rgb(176, 0, 12)), // RED
- C107(107, Color.rgb(230, 79, 61)), // RED
- C116(116, Color.rgb(142, 102, 247)), // PURPLE
- C119(119, Color.rgb(221, 252, 252)), // WHITE
- C120(120, Color.rgb(168, 2, 12)); // RED
+ // White
+ C0_1(1, Color.rgb(255, 255, 255), LightMode.LOW),
+ C0_2(2, Color.rgb(255, 255, 255), LightMode.NORMAL),
+ C0_3(3, Color.rgb(255, 255, 255), LightMode.HIGH),
+
+ // RED
+ C1_1(4, Color.rgb(255, 0, 0), LightMode.HIGH),
+ C1_2(5, Color.rgb(255, 0, 0), LightMode.NORMAL),
+ C1_3(6, Color.rgb(255, 0, 0), LightMode.MIDDLE),
+ C1_4(7, Color.rgb(255, 0, 0), LightMode.LOW),
+
+ // Orange
+ C2_1(8, Color.rgb(255, 127, 0), LightMode.HIGH),
+ C2_2(9, Color.rgb(255, 127, 0), LightMode.NORMAL),
+ C2_3(10, Color.rgb(255, 127, 0), LightMode.MIDDLE),
+ C2_4(11, Color.rgb(255, 127, 0), LightMode.LOW),
+
+ // LIME
+ C3_1(12, Color.rgb(235, 255, 39), LightMode.HIGH),
+ C3_2(13, Color.rgb(235, 255, 39), LightMode.NORMAL),
+ C3_3(14, Color.rgb(235, 255, 39), LightMode.MIDDLE),
+ C3_4(15, Color.rgb(235, 255, 39), LightMode.LOW),
+
+ // LIGHT GREEN
+ C4_1(16, Color.rgb(123, 255, 66), LightMode.HIGH),
+ C4_2(17, Color.rgb(123, 255, 66), LightMode.NORMAL),
+ C4_3(18, Color.rgb(123, 255, 66), LightMode.MIDDLE),
+ C4_4(19, Color.rgb(123, 255, 66), LightMode.LOW),
+
+ // GREEN
+ C5_1(20, Color.rgb(0, 255, 0), LightMode.HIGH),
+ C5_2(21, Color.rgb(0, 255, 0), LightMode.NORMAL),
+ C5_3(22, Color.rgb(0, 255, 0), LightMode.MIDDLE),
+ C5_4(23, Color.rgb(0, 255, 0), LightMode.LOW),
+
+ // GREEN
+ C6_1(24, Color.rgb(62, 255, 112), LightMode.HIGH),
+ C6_2(25, Color.rgb(62, 255, 112), LightMode.NORMAL),
+ C6_3(26, Color.rgb(62, 255, 112), LightMode.MIDDLE),
+ C6_4(27, Color.rgb(62, 255, 112), LightMode.LOW),
+
+ // TURKEY
+ C7_1(28, Color.rgb(62, 255, 112), LightMode.HIGH),
+ C7_2(29, Color.rgb(62, 255, 112), LightMode.NORMAL),
+ C7_3(30, Color.rgb(62, 255, 112), LightMode.MIDDLE),
+ C7_4(31, Color.rgb(62, 255, 112), LightMode.LOW),
+
+ // TURKEY
+ C8_1(32, Color.rgb(101, 255, 196), LightMode.HIGH),
+ C8_2(33, Color.rgb(101, 255, 196), LightMode.NORMAL),
+ C8_3(34, Color.rgb(101, 255, 196), LightMode.MIDDLE),
+ C8_4(35, Color.rgb(101, 255, 196), LightMode.LOW),
+
+ // LIGHT BLUE
+ C9_1(36, Color.rgb(91, 255, 253), LightMode.HIGH),
+ C9_2(37, Color.rgb(91, 255, 253), LightMode.NORMAL),
+ C9_3(38, Color.rgb(91, 255, 253), LightMode.MIDDLE),
+ C9_4(39, Color.rgb(91, 255, 253), LightMode.LOW),
+
+ // BLUE
+ C10_1(40, Color.rgb(69, 169, 255), LightMode.HIGH),
+ C10_2(41, Color.rgb(69, 169, 255), LightMode.NORMAL),
+ C10_3(42, Color.rgb(69, 169, 255), LightMode.MIDDLE),
+ C10_4(43, Color.rgb(69, 169, 255), LightMode.LOW),
+
+ // DARK BLUE
+ C11_1(44, Color.rgb(30, 67, 255), LightMode.HIGH),
+ C11_2(45, Color.rgb(30, 67, 255), LightMode.NORMAL),
+ C11_3(46, Color.rgb(30, 67, 255), LightMode.MIDDLE),
+ C11_4(47, Color.rgb(30, 67, 255), LightMode.LOW),
+
+ // PURPLE
+ C12_1(48, Color.rgb(125, 73, 255), LightMode.HIGH),
+ C12_2(49, Color.rgb(125, 73, 255), LightMode.NORMAL),
+ C12_3(50, Color.rgb(125, 73, 255), LightMode.MIDDLE),
+ C12_4(51, Color.rgb(125, 73, 255), LightMode.LOW),
+
+ // VIOLET
+ C13_1(52, Color.rgb(254, 85, 255), LightMode.HIGH),
+ C13_2(53, Color.rgb(254, 85, 255), LightMode.NORMAL),
+ C13_3(54, Color.rgb(254, 85, 255), LightMode.MIDDLE),
+ C13_4(55, Color.rgb(254, 85, 255), LightMode.LOW),
+
+ // VIOLET
+ C14_1(56, Color.rgb(255, 75, 191), LightMode.HIGH),
+ C14_2(57, Color.rgb(255, 75, 191), LightMode.NORMAL),
+ C14_3(58, Color.rgb(255, 75, 191), LightMode.MIDDLE),
+ C14_4(59, Color.rgb(255, 75, 191), LightMode.LOW),
+
+ // BROWN
+ C15_1(60, Color.rgb(255, 100, 69), LightMode.HIGH),
+ C15_2(61, Color.rgb(255, 100, 69), LightMode.NORMAL),
+ C15_3(62, Color.rgb(255, 100, 69), LightMode.MIDDLE),
+ C15_4(63, Color.rgb(255, 100, 69), LightMode.LOW),
+
+ ;
+
+ public enum LightMode {
+ LOW,
+ MIDDLE,
+ NORMAL,
+ HIGH
+ }
private int midi;
private Color color;
+ private LightMode lightMode;
- LaunchPadMK2Color(int midi, Color color) {
+ LaunchPadMK2Color(int midi, Color color, LightMode lightMode) {
this.midi = midi;
this.color = color;
+ this.lightMode = lightMode;
}
@Override
diff --git a/PlayWallPluginLaunchpad/src/main/resources/launchpad_mk2.map b/PlayWallPluginLaunchpad/src/main/resources/launchpad_mk2.map
index f29e22ce294b0084e431542a728cd78ead39fb6c..123cd14be222a66c3b66857dbdb99f9c9140a5b9 100644
--- a/PlayWallPluginLaunchpad/src/main/resources/launchpad_mk2.map
+++ b/PlayWallPluginLaunchpad/src/main/resources/launchpad_mk2.map
@@ -1,39 +1,57 @@
-0xef9a9aff=C107
-0xef5350ff=C4
-0xe53935ff=C72
-
-0xd92349ff=C5
-0xc92349ff=C72
-0xa90329ff=C72
-
-0xf48fb1ff=C59
-0xec407aff=C58
-0xd81b60ff=C57
-
-0xce93d8ff=C52
-0xab47bcff=C82
-0x8e24aaff=C53
-
-0x80deeaff=C36
-0x26c6daff=C37
-0x00acc1ff=C78
-
-0x90caf9ff=C41
-0x42a5f5ff=C79
-0x1e88e5ff=C67
-
-0xc5e1a5ff=C88
-0x9ccc65ff=C25
-0x7cb342ff=C21
-
-0xfff59dff=C12
-0xffee58ff=C14
-0xfdd835ff=C13
-
-0xffcc80ff=C11
-0xffa726ff=C61
-0xfb8c00ff=C84
-
-0xeeeeeeff=C119
-0xccccccff=C119
-0x555555ff=C2
\ No newline at end of file
+% RED
+0xef9a9aff=C1_2
+0xef5350ff=C1_2
+0xe53935ff=C1_2
+
+% DARK_RED
+0xD92349ff=C1_2
+0xC92349ff=C1_2
+0xA90329ff=C1_2
+
+% PINK
+0xf48fb1ff=C14_2
+0xec407aff=C14_2
+0xd81b60ff=C14_2
+
+% PURPLE
+0xce93d8ff=C12_2
+0xab47bcff=C12_2
+0x8e24aaff=C12_2
+
+% LIGHT_BLUE
+0x80deeaff=C10_2
+0x26c6daff=C10_2
+0x00acc1ff=C10_2
+
+% BLUE
+0x90caf9ff=C11_2
+0x42a5f5ff=C11_2
+0x1e88e5ff=C11_2
+
+% LIGHT_GREEN
+0xc5e1a5ff=C5_2
+0x9ccc65ff=C5_2
+0x7cb342ff=C5_2
+
+% LIME
+0xe6ee9cff=C4_2
+0xd4e157ff=C4_2
+0xc0ca33ff=C4_2
+
+% YELLOW
+0xfff59dff=C3_2
+0xffee58ff=C3_2
+0xfdd835ff=C3_2
+
+% ORANGE
+0xffcc80ff=C3_2
+0xffa726ff=C3_2
+0xfb8c00ff=C3_2
+
+% GRAY
+0xeeeeeeff=C0_3
+0xccccccff=C0_3
+0xaaaaaaff=C0_3
+0x888888ff=C0_2
+0x666666ff=C0_2
+0x444444ff=C0_2
\ No newline at end of file