Commit 85a3b38

authored

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

Allow config changes and clear in disabled serial monitor and plotter

2 parents 558ddd3 + ffa8720 commit 85a3b38Copy full SHA for 85a3b38

File tree

+18

-21

lines changed

+18

-21

lines changed

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -190,14 +190,9 @@ protected void onEnableWindow(boolean enable) {`
`190`	`190`	`textArea.setBackground(new Color(238, 238, 238));`
`191`	`191`	`}`
`192`	`192`	`textArea.invalidate();`
`193`		`- clearButton.setEnabled(enable);`
`194`	`193`	`scrollPane.setEnabled(enable);`
`195`	`194`	`textField.setEnabled(enable);`
`196`	`195`	`sendButton.setEnabled(enable);`
`197`		`- autoscrollBox.setEnabled(enable);`
`198`		`- addTimeStampBox.setEnabled(enable);`
`199`		`- lineEndings.setEnabled(enable);`
`200`		`- serialRates.setEnabled(enable);`
`201`	`196`	`}`
`202`	`197`
`203`	`198`	`public void onSendCommand(ActionListener listener) {`

Lines changed: 10 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,14 +48,16 @@ public SerialMonitor(BoardPort port) {`
`48`	`48`	`String rateString = wholeString.substring(0, wholeString.indexOf(' '));`
`49`	`49`	`serialRate = Integer.parseInt(rateString);`
`50`	`50`	`PreferencesData.set("serial.debug_rate", rateString);`
`51`		`- try {`
`52`		`- close();`
`53`		`- Thread.sleep(100); // Wait for serial port to properly close`
`54`		`- open();`
`55`		`- } catch (InterruptedException e) {`
`56`		`- // noop`
`57`		`- } catch (Exception e) {`
`58`		`- System.err.println(e);`
	`51`	`+ if (serial != null) {`
	`52`	`+ try {`
	`53`	`+ close();`
	`54`	`+ Thread.sleep(100); // Wait for serial port to properly close`
	`55`	`+ open();`
	`56`	`+ } catch (InterruptedException e) {`
	`57`	`+ // noop`
	`58`	`+ } catch (Exception e) {`
	`59`	`+ System.err.println(e);`
	`60`	`+ }`
`59`	`61`	`}`
`60`	`62`	`});`
`61`	`63`

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -242,12 +242,14 @@ public SerialPlotter(BoardPort port) {`
`242`	`242`	`String rateString = wholeString.substring(0, wholeString.indexOf(' '));`
`243`	`243`	`serialRate = Integer.parseInt(rateString);`
`244`	`244`	`PreferencesData.set("serial.debug_rate", rateString);`
`245`		`- try {`
`246`		`- close();`
`247`		`- Thread.sleep(100); // Wait for serial port to properly close`
`248`		`- open();`
`249`		`- } catch (Exception e) {`
`250`		`- // ignore`
	`245`	`+ if (serial != null) {`
	`246`	`+ try {`
	`247`	`+ close();`
	`248`	`+ Thread.sleep(100); // Wait for serial port to properly close`
	`249`	`+ open();`
	`250`	`+ } catch (Exception e) {`
	`251`	`+ // ignore`
	`252`	`+ }`
`251`	`253`	`}`
`252`	`254`	`});`
`253`	`255`
`@@ -379,10 +381,8 @@ public void appyPreferences() {`
`379`	`381`	`}`
`380`	`382`
`381`	`383`	`protected void onEnableWindow(boolean enable) {`
`382`		`- serialRates.setEnabled(enable);`
`383`	`384`	`textField.setEnabled(enable);`
`384`	`385`	`sendButton.setEnabled(enable);`
`385`		`- lineEndings.setEnabled(enable);`
`386`	`386`	`}`
`387`	`387`
`388`	`388`	`private void onSerialRateChange(ActionListener listener) {`

Comments

(0)