|
|
@@ -97,7 +97,7 @@ public class ConvertJsonData2Hex {
|
|
|
eventTyp = 0x70;
|
|
|
break;
|
|
|
case BUTTON:
|
|
|
- eventTyp = 0x10 * (eventData.getValue() + 1);
|
|
|
+ eventTyp = 0x10 * (eventData.getValue());
|
|
|
break;
|
|
|
default:
|
|
|
break;
|
|
|
@@ -107,7 +107,14 @@ public class ConvertJsonData2Hex {
|
|
|
DataData[] datas = eventData.getDatas();
|
|
|
int pos = 1;
|
|
|
for (DataData dataData : datas) {
|
|
|
- data[pos++] = dataData.getType().getByte();
|
|
|
+ int dataType = dataData.getType().getByte();
|
|
|
+ if (DataData.CHANNEL.INTERNAL.equals(dataData.getChannel())) {
|
|
|
+ dataType = dataType + programData.getInternalMidi();
|
|
|
+ }
|
|
|
+ if (DataData.CHANNEL.EXTERNAL.equals(dataData.getChannel())) {
|
|
|
+ dataType = dataType + programData.getExternalMidi();
|
|
|
+ }
|
|
|
+ data[pos++] = (byte) dataType;
|
|
|
if ((pos + 1) < data.length) { // mindestens 2 noch
|
|
|
// platz
|
|
|
switch (dataData.getType()) {
|
