rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-26 20:54:22 +01:00
Code Issues Releases Activity

Merge pull request #3436 from henningpohl/fix_baudrates

Browse Source 
Adding accidentally removed serial baud rates back in
This commit is contained in:
Federico Fissore 2015-06-29 20:22:38 +02:00
commit eff3b6b5f3
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/processing/app/AbstractMonitor.java
View File

@ -40,6 +40,8 @@ public abstract class AbstractMonitor extends JFrame implements ActionListener {
private Timer updateTimer;
private BoardPort boardPort;
protected String[] serialRateStrings = {"300", "1200", "2400", "4800", "9600", "19200", "38400", "57600", "74880", "115200", "230400", "250000"};
public AbstractMonitor(BoardPort boardPort) {
super(boardPort.getLabel());

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

@ -109,11 +109,6 @@ public abstract class AbstractTextMonitor extends AbstractMonitor {
}
lineEndings.setMaximumSize(lineEndings.getMinimumSize());
String[] serialRateStrings = {
"300", "1200", "2400", "4800", "9600",
"19200", "38400", "57600", "115200", "230400", "250000"
};
serialRates = new JComboBox();
for (String rate : serialRateStrings) {
serialRates.addItem(rate + " " + _("baud"));

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

@ -163,11 +163,6 @@ public class SerialPlotter extends AbstractMonitor {
JPanel pane = new JPanel();
pane.setLayout(new BoxLayout(pane, BoxLayout.X_AXIS));
pane.setBorder(new EmptyBorder(4, 4, 4, 4));
String[] serialRateStrings = {
"300","1200","2400","4800","9600","14400",
"19200","28800","38400","57600","115200"
};
serialRates = new JComboBox();
for (int i = 0; i < serialRateStrings.length; i++)