rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-21 10:52:14 +01:00
Code Issues Releases Activity

Merge pull request #9873 from matthijskooijman/allow-serial-change-when-disabled

Browse Source 
Allow config changes and clear in disabled serial monitor and plotter
This commit is contained in:
Martino Facchin 2020-03-23 12:12:56 +01:00 committed by GitHub
commit 85a3b385eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/processing/app/AbstractTextMonitor.java
View File

@ -190,14 +190,9 @@ public abstract class AbstractTextMonitor extends AbstractMonitor {
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) {

18
app/src/processing/app/SerialMonitor.java
View File

@ -48,14 +48,16 @@ public class SerialMonitor extends AbstractTextMonitor {
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);
}
}
});

16
app/src/processing/app/SerialPlotter.java
View File

@ -242,12 +242,14 @@ public class SerialPlotter extends AbstractMonitor {
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
}
}
});
@ -379,10 +381,8 @@ public class SerialPlotter extends AbstractMonitor {
}
protected void onEnableWindow(boolean enable) {
serialRates.setEnabled(enable);
textField.setEnabled(enable);
sendButton.setEnabled(enable);
lineEndings.setEnabled(enable);
}
private void onSerialRateChange(ActionListener listener) {