Kaynağa Gözat

now only 8 midi commands possible for event

Willie 6 yıl önce
ebeveyn
işleme
52dc2fdd1f

+ 2 - 1
src/main/java/de/mcs/tools/midicontroller/ConvertJsonData2Hex.java

@@ -85,7 +85,7 @@ public class ConvertJsonData2Hex {
 				}
 				out.write(switchSettings);
 				for (int i = 0; i < 15; i++) {
-					byte[] data = getEmptyByteArray(33);
+					byte[] data = getEmptyByteArray(25);
 					if ((programData.getEvents() != null) && (programData.getEvents().length > i)) {
 						int eventTyp = 0;
 						EventData eventData = programData.getEvents()[i];
@@ -123,6 +123,7 @@ public class ConvertJsonData2Hex {
 									break;
 								case PC:
 									data[pos++] = (byte) dataData.getData1();
+									data[pos++] = (byte) 0;
 									break;
 								default:
 									break;

+ 212 - 181
src/main/resources/programdata.json

@@ -1,182 +1,213 @@
-{ "version" : 1,
-"programs" :
-[
-	{
-		
-		"name": "Rock",
-		"prgNumber": 100,
-		"internalMidi": 0,
-		"externalMidi": 1,
-		"buttons": [
-			{
-				"name": "EQ0",
-				"type": "SWITCH",
-				"color": 195
-			},
-			{
-				"name": "Drv0",
-				"type": "SWITCH",
-				"color": 204
-			},
-			{
-				"name": "Chr0",
-				"type": "MOMENTARY",
-				"color": 240
-			},
-			{
-				"type": "SWITCH"
-			},
-			{
-				"type": "SWITCH"
-			},
-			{
-				"type": "MOMENTARY"
-			}
-		],
-		"events": [
-			{
-				"type": "INTERNAL",
-				"event": "START",
-				"datas": [
-					{
-						"channel": "INTERNAL",
-						"type": "CC",
-						"data1": 8,
-						"data2": 1
-					},
-					{
-						"channel": "INTERNAL",
-						"type": "CC",
-						"data1": 9,
-						"data2": 2
-					},
-					{
-						"channel": "INTERNAL",
-						"type": "CC",
-						"data1": 11,
-						"data2": 3
-					}
-				]
-			},
-			{
-				"type": "BUTTON",
-				"value": 1,
-				"event": "CLICK",
-				"datas": [
-					{
-						"channel": "EXTERNAL",
-						"type": "CC",
-						"data1": 9,
-						"data2": 127
-					},
-					{
-						"channel": "EXTERNAL",
-						"type": "CC",
-						"data1": 11,
-						"data2": 0
-					}
-				]
-			},
-			{
-				"type": "BUTTON",
-				"value": 2,
-				"event": "PUSH",
-				"datas": [
-					{
-						"channel": "EXTERNAL",
-						"type": "CC",
-						"data1": 9,
-						"data2": 127
-					},
-					{
-						"channel": "EXTERNAL",
-						"type": "CC",
-						"data1": 11,
-						"data2": 0
-					}
-				]
-			},
-			{
-				"type": "BUTTON",
-				"value": 4,
-				"event": "CLICK",
-				"datas": [
-					{
-						"channel": "INTERNAL",
-						"type": "PC_PREV"
-					}
-				]
-			},
-			{
-				"type": "BUTTON",
-				"value": 5,
-				"event": "CLICK",
-				"datas": [
-					{
-						"channel": "INTERNAL",
-						"type": "PC_NEXT"
-					}
-				]
-			},
-			{
-				"type": "EXPRESSION",
-				"event": "VALUECHANGE",
-				"datas": [
-					{
-						"channel": "EXTERNAL",
-						"type": "CC",
-						"data1": 30,
-						"data2": 127
-					}
-				]
-			}
-		]
-	},
-	{
-		"name": "Pop",
-		"prgNumber": 0,
-		"internalMidi": 0,
-		"externalMidi": 1,
-		"buttons": [
-			{
-				"name": "EQ1",
-				"type": "SWITCH",
-				"color": 240
-			},
-			{
-				"name": "Drv1",
-				"type": "MOMENTARY",
-				"color": 195
-			},
-			{
-				"name": "Chr1",
-				"type": "SWITCH",
-				"color": 204
-			}
-		]
-	},
-	{
-		"name": "Soul",
-		"prgNumber": -1,
-		"internalMidi": 0,
-		"externalMidi": 1,
-		"buttons": [
-			{
-				"name": "EQ2",
-				"type": "MOMENTARY",
-				"color": 204
-			},
-			{
-				"name": "Drv2",
-				"type": "SWITCH",
-				"color": 240
-			},
-			{
-				"name": "Chr2",
-				"type": "SWITCH",
-				"color": 195
-			}
-		]
-	}
-]
+{
+	"version": 1,
+	"programs": 
+	[
+		{
+			"name": "Rock",
+			"prgNumber": 100,
+			"internalMidi": 0,
+			"externalMidi": 1,
+			"buttons": 
+			[
+				{
+					"name": "EQ0",
+					"type": "SWITCH",
+					"color": 195
+				},
+
+				{
+					"name": "Drv0",
+					"type": "SWITCH",
+					"color": 204
+				},
+
+				{
+					"name": "Chr0",
+					"type": "MOMENTARY",
+					"color": 240
+				},
+
+				{
+					"type": "SWITCH"
+				},
+
+				{
+					"type": "SWITCH"
+				},
+
+				{
+					"type": "MOMENTARY"
+				}
+			],
+
+			"events": 
+			[
+				{
+					"type": "INTERNAL",
+					"event": "START",
+					"datas": 
+					[
+						{
+							"channel": "INTERNAL",
+							"type": "CC",
+							"data1": 8,
+							"data2": 1
+						},
+
+						{
+							"channel": "INTERNAL",
+							"type": "CC",
+							"data1": 9,
+							"data2": 2
+						},
+
+						{
+							"channel": "INTERNAL",
+							"type": "CC",
+							"data1": 11,
+							"data2": 3
+						}
+					]
+				},
+
+				{
+					"type": "BUTTON",
+					"value": 1,
+					"event": "CLICK",
+					"datas": 
+					[
+						{
+							"channel": "EXTERNAL",
+							"type": "CC",
+							"data1": 9,
+							"data2": 127
+						},
+
+						{
+							"channel": "EXTERNAL",
+							"type": "CC",
+							"data1": 11,
+							"data2": 0
+						}
+					]
+				},
+
+				{
+					"type": "BUTTON",
+					"value": 2,
+					"event": "PUSH",
+					"datas": 
+					[
+						{
+							"channel": "EXTERNAL",
+							"type": "CC",
+							"data1": 9,
+							"data2": 127
+						},
+
+						{
+							"channel": "EXTERNAL",
+							"type": "CC",
+							"data1": 11,
+							"data2": 0
+						}
+					]
+				},
+
+				{
+					"type": "BUTTON",
+					"value": 4,
+					"event": "CLICK",
+					"datas": 
+					[
+						{
+							"channel": "INTERNAL",
+							"type": "PC_PREV"
+						}
+					]
+				},
+
+				{
+					"type": "BUTTON",
+					"value": 5,
+					"event": "CLICK",
+					"datas": 
+					[
+						{
+							"channel": "INTERNAL",
+							"type": "PC_NEXT"
+						}
+					]
+				},
+
+				{
+					"type": "EXPRESSION",
+					"event": "VALUECHANGE",
+					"datas": 
+					[
+						{
+							"channel": "EXTERNAL",
+							"type": "CC",
+							"data1": 30,
+							"data2": 127
+						}
+					]
+				}
+			]
+		},
+
+		{
+			"name": "Pop",
+			"prgNumber": 0,
+			"internalMidi": 0,
+			"externalMidi": 1,
+			"buttons": 
+			[
+				{
+					"name": "EQ1",
+					"type": "SWITCH",
+					"color": 240
+				},
+
+				{
+					"name": "Drv1",
+					"type": "MOMENTARY",
+					"color": 195
+				},
+
+				{
+					"name": "Chr1",
+					"type": "SWITCH",
+					"color": 204
+				}
+			]
+		},
+
+		{
+			"name": "Soul",
+			"prgNumber": -1,
+			"internalMidi": 0,
+			"externalMidi": 1,
+			"buttons": 
+			[
+				{
+					"name": "EQ2",
+					"type": "MOMENTARY",
+					"color": 204
+				},
+
+				{
+					"name": "Drv2",
+					"type": "SWITCH",
+					"color": 240
+				},
+
+				{
+					"name": "Chr2",
+					"type": "SWITCH",
+					"color": 195
+				}
+			]
+		}
+	]
 }