Skip to content

Allow config changes and clear in disabled serial monitor and plotter #9873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 23, 2020
Merged

Allow config changes and clear in disabled serial monitor and plotter #9873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions app/src/processing/app/AbstractTextMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,14 +190,9 @@ protected void onEnableWindow(boolean enable) {
textArea.setBackground(new Color(238, 238, 238));
}
textArea.invalidate();
clearButton.setEnabled(enable);
scrollPane.setEnabled(enable);
textField.setEnabled(enable);
sendButton.setEnabled(enable);
autoscrollBox.setEnabled(enable);
addTimeStampBox.setEnabled(enable);
lineEndings.setEnabled(enable);
serialRates.setEnabled(enable);
}

public void onSendCommand(ActionListener listener) {
Expand Down
18 changes: 10 additions & 8 deletions app/src/processing/app/SerialMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,16 @@ public SerialMonitor(BoardPort port) {
String rateString = wholeString.substring(0, wholeString.indexOf(' '));
serialRate = Integer.parseInt(rateString);
PreferencesData.set("serial.debug_rate", rateString);
try {
close();
Thread.sleep(100); // Wait for serial port to properly close
open();
} catch (InterruptedException e) {
// noop
} catch (Exception e) {
System.err.println(e);
if (serial != null) {
try {
close();
Thread.sleep(100); // Wait for serial port to properly close
open();
} catch (InterruptedException e) {
// noop
} catch (Exception e) {
System.err.println(e);
}
}
});

Expand Down
16 changes: 8 additions & 8 deletions app/src/processing/app/SerialPlotter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,12 +242,14 @@ public SerialPlotter(BoardPort port) {
String rateString = wholeString.substring(0, wholeString.indexOf(' '));
serialRate = Integer.parseInt(rateString);
PreferencesData.set("serial.debug_rate", rateString);
try {
close();
Thread.sleep(100); // Wait for serial port to properly close
open();
} catch (Exception e) {
// ignore
if (serial != null) {
try {
close();
Thread.sleep(100); // Wait for serial port to properly close
open();
} catch (Exception e) {
// ignore
}
}
});

Expand Down Expand Up @@ -379,10 +381,8 @@ public void appyPreferences() {
}

protected void onEnableWindow(boolean enable) {
serialRates.setEnabled(enable);
textField.setEnabled(enable);
sendButton.setEnabled(enable);
lineEndings.setEnabled(enable);
}

private void onSerialRateChange(ActionListener listener) {
Expand Down