From ec67c88b21d3f7d64b775388b36b8875ef7adb9e Mon Sep 17 00:00:00 2001 From: Federico Fissore Date: Wed, 13 Feb 2013 10:29:52 +0100 Subject: [PATCH] Removed useless baud rates from serial monitor --- app/src/processing/app/Preferences.java | 9 +++++++++ app/src/processing/app/SerialMonitor.java | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/src/processing/app/Preferences.java b/app/src/processing/app/Preferences.java index babc91cbb..0546ba827 100644 --- a/app/src/processing/app/Preferences.java +++ b/app/src/processing/app/Preferences.java @@ -302,6 +302,15 @@ public class Preferences { // other things that have to be set explicitly for the defaults setColor("run.window.bgcolor", SystemColor.control); + + fixPreferences(); + } + + private static void fixPreferences() { + String baud = get("serial.debug_rate"); + if ("14400".equals(baud) || "28800".equals(baud)) { + set("serial.debug_rate", "9600"); + } } diff --git a/app/src/processing/app/SerialMonitor.java b/app/src/processing/app/SerialMonitor.java index 58adff44e..c6967e895 100644 --- a/app/src/processing/app/SerialMonitor.java +++ b/app/src/processing/app/SerialMonitor.java @@ -121,8 +121,8 @@ public class SerialMonitor extends JFrame implements MessageConsumer { lineEndings.setMaximumSize(lineEndings.getMinimumSize()); String[] serialRateStrings = { - "300","1200","2400","4800","9600","14400", - "19200","28800","38400","57600","115200" + "300","1200","2400","4800","9600", + "19200","38400","57600","115200" }; serialRates = new JComboBox();