Skip to content

Adding accidentally removed serial baud rates back in #3436

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
Jun 29, 2015
Merged

Adding accidentally removed serial baud rates back in #3436

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
2 changes: 2 additions & 0 deletions app/src/processing/app/AbstractMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
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 @@ -109,11 +109,6 @@ public void actionPerformed(ActionEvent event) {
}
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"));
Expand Down
5 changes: 0 additions & 5 deletions app/src/processing/app/SerialPlotter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,6 @@ protected void onCreateWindow(Container mainPane) {
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++)
Expand Down