Skip to content

Commit 8bb39d8

Browse files
authored
Fix Error with LC XL mk3 (#118)
* Launchkontrol Mk3 cleanup Debug Output stuff
1 parent b32792a commit 8bb39d8

5 files changed

Lines changed: 5 additions & 32 deletions

File tree

src/main/java/com/bitwig/extensions/controllers/novation/launchcontrolxlmk3/LaunchControlMidiProcessor.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class LaunchControlMidiProcessor {
4848
public LaunchControlMidiProcessor(final ControllerHost host,
4949
final AbstractLaunchControlExtensionDefinition definition) {
5050
final String productId = definition.isXlVersion() ? "15" : "16";
51-
LaunchControlMk3Extension.println(" IS XL = %s", definition.isXlVersion());
51+
host.println(" IS XL = " + definition.isXlVersion());
5252
LAUNCH_CONFIRM_CODE = LAUNCH_CONFIRM_CODE.formatted(productId);
5353
NOVATION_HEADER = "F0 00 20 29 02 %s ".formatted(productId);
5454
COLOR_SYSEX[5] = (byte) (definition.isXlVersion() ? 0x15 : 0x16);
@@ -127,7 +127,7 @@ private void handleMidiIn(final int status, final int data1, final int data2) {
127127
this.modeListeners.forEach(listener -> listener.accept(mode));
128128
}
129129
}
130-
LaunchControlMk3Extension.println(" MIDI %02X %02X %02X", status, data1, data2);
130+
//host.println(" MIDI %02X %02X %02X".formatted(status, data1, data2));
131131
}
132132

133133
public void sendRgb(final int index, final RgbColor color) {
@@ -152,18 +152,18 @@ public void addStartListener(final Runnable startAction) {
152152

153153
private void handleSysEx(final String data) {
154154
if (!data.endsWith("f7")) {
155-
LaunchControlMk3Extension.println("Illegal Sysex Received : %s", data);
155+
host.println("Illegal Sysex Received : " + data);
156156
return;
157157
}
158158
if (data.startsWith(DEVICE_RESPONSE_HEADER)) {
159159
final String[] values = extractValues(data, DEVICE_RESPONSE_HEADER.length(), 8);
160-
LaunchControlMk3Extension.println("Device response : %s", Arrays.toString(values));
160+
host.println("Device response : " + Arrays.toString(values));
161161
startMidi();
162162
} else {
163163
if (data.startsWith(LAUNCH_CONFIRM_CODE)) {
164164
hwUpdater.run();
165165
} else {
166-
LaunchControlMk3Extension.println(" SYSEX %s", data);
166+
host.println(" SYSEX " + data);
167167
}
168168
}
169169
}

src/main/java/com/bitwig/extensions/controllers/novation/launchcontrolxlmk3/LaunchControlMk3Extension.java

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,38 +17,18 @@
1717

1818
public class LaunchControlMk3Extension extends ControllerExtension {
1919

20-
private static ControllerHost debugHost;
21-
private static final DateTimeFormatter DF = DateTimeFormatter.ofPattern("hh:mm:ss SSS");
2220

2321
private final AbstractLaunchControlExtensionDefinition definition;
2422
private HardwareSurface surface;
2523
private Context diContext;
2624

27-
public static void println(final String format, final Object... args) {
28-
if (debugHost != null) {
29-
final LocalDateTime now = LocalDateTime.now();
30-
debugHost.println(now.format(DF) + " > " + String.format(format, args));
31-
}
32-
}
33-
34-
public static void showCallLocation(final String message) {
35-
println("MSG: %s", message);
36-
for (final StackTraceElement element : Thread.currentThread().getStackTrace()) {
37-
final String s = element.toString();
38-
if (s.startsWith("com.bitwig.extensions") && !s.contains("showCallLocation")) {
39-
println(" | %s ", s.replace("com.bitwig.extensions.controllers.novation.launchcontrolxlmk3", ""));
40-
}
41-
}
42-
}
43-
4425
public LaunchControlMk3Extension(final AbstractLaunchControlExtensionDefinition definition,
4526
final ControllerHost host) {
4627
super(definition, host);
4728
this.definition = definition;
4829
}
4930

5031
public void init() {
51-
debugHost = getHost();
5232
diContext = new Context(this, Set.of(definition.isXlVersion() ? "XLModel" : "LCModel"));
5333
diContext.registerService(AbstractLaunchControlExtensionDefinition.class, definition);
5434
surface = diContext.getService(HardwareSurface.class);
@@ -60,10 +40,6 @@ public void init() {
6040
mixerLayer.setSpecOverlay(specControl);
6141
}
6242
diContext.activate();
63-
final Layers layers = diContext.getService(Layers.class);
64-
for (final Layer l : layers.getLayers()) {
65-
LaunchControlMk3Extension.println(" > " + l.getName());
66-
}
6743
}
6844

6945
@Override

src/main/java/com/bitwig/extensions/controllers/novation/launchcontrolxlmk3/bindings/SegmentDisplayBinding.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ private boolean isBlocked() {
3535
private void handleNameUpdate(final String name) {
3636
this.name = name;
3737
if (isActive() && !isBlocked()) {
38-
LaunchControlMk3Extension.println(" NAME UPDATE " + name);
3938
getTarget().show2LinesBuffered(title, name);
4039
}
4140
}

src/main/java/com/bitwig/extensions/controllers/novation/launchcontrolxlmk3/layer/LcMixerLayer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ public LcMixerLayer(final Layers layers, final LaunchControlMidiProcessor midiPr
5858
final LaunchViewControl viewControl, final LaunchControlXlHwElements hwElements,
5959
final DisplayControl displayControl, final TransportHandler transportHandler, final ButtonLayers buttonLayers) {
6060
super(layers, midiProcessor, host, viewControl, hwElements, displayControl, transportHandler, buttonLayers);
61-
LaunchControlMk3Extension.println(" LC MIXER LAYER");
6261
panLayer = new Layer(layers, "PAN");
6362
sendLayer = new Layer(layers, "SEND");
6463

src/main/java/com/bitwig/extensions/controllers/novation/launchcontrolxlmk3/layer/XlMixerLayer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ public XlMixerLayer(final Layers layers, final LaunchControlXlHwElements hwEleme
5858
final LaunchControlMidiProcessor midiProcessor, final ControllerHost host,
5959
final TransportHandler transportHandler, final ButtonLayers buttonLayers) {
6060
super(layers, midiProcessor, host, viewControl, hwElements, displayControl, transportHandler, buttonLayers);
61-
LaunchControlMk3Extension.println(" XL MIXER LAYER");
6261

6362
final TrackBank trackBank = viewControl.getTrackBank();
6463
for (int i = 0; i < 8; i++) {

0 commit comments

Comments
 (0)