Skip to content

Commit 55dc23e

Browse files
committed
Fixed beginSerial() to take baud rates above 19200; adjusted Serial Monitor Baud Rate menu items accordingly.
1 parent 211f76e commit 55dc23e

File tree

3 files changed

+11
-19
lines changed

3 files changed

+11
-19
lines changed

app/Editor.java

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ protected JMenu buildToolsMenu() {
657657
JMenuItem rbMenuItem;
658658
JMenuItem cbMenuItem;
659659
SerialRateMenuListener srml = new SerialRateMenuListener();
660-
// Enumeration portRates = {"9600","19200","38400","57600","115200"};
660+
String[] portRates = {"9600","19200","38400","57600","115200"};
661661

662662
serialMenuListener = new SerialMenuListener();
663663

@@ -701,23 +701,15 @@ public void actionPerformed(ActionEvent e) {
701701
//serialSubMenu.addSeparator();
702702
ButtonGroup group = new ButtonGroup();
703703

704-
int curr_rate = Preferences.getInteger("serial.debug_rate");
705-
706-
rbMenuItem = new JCheckBoxMenuItem("9600", 9600 == curr_rate);
707-
rbMenuItem.addActionListener(srml);
708-
group.add(rbMenuItem);
709-
serialRateSubMenu.add(rbMenuItem);
710-
711-
rbMenuItem = new JCheckBoxMenuItem("19200", 19200 == curr_rate);
712-
rbMenuItem.addActionListener(srml);
713-
group.add(rbMenuItem);
714-
serialRateSubMenu.add(rbMenuItem);
715-
716-
rbMenuItem = new JCheckBoxMenuItem("115200", 115200 == curr_rate);
717-
rbMenuItem.addActionListener(srml);
718-
group.add(rbMenuItem);
719-
serialRateSubMenu.add(rbMenuItem);
704+
String curr_rate = Preferences.get("serial.debug_rate");
720705

706+
for (int i = 0; i < portRates.length; i++) {
707+
rbMenuItem = new JCheckBoxMenuItem(portRates[i], portRates[i].equals(curr_rate));
708+
rbMenuItem.addActionListener(srml);
709+
group.add(rbMenuItem);
710+
serialRateSubMenu.add(rbMenuItem);
711+
}
712+
721713
menu.add(serialRateSubMenu);
722714

723715
menu.addMenuListener(new MenuListener() {

targets/arduino/wiring.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ void analogWrite(int pin, int val)
176176
digitalWrite(pin, HIGH);
177177
}
178178

179-
void beginSerial(int baud)
179+
void beginSerial(long baud)
180180
{
181181
uartInit();
182182
uartSetBaudRate(baud);

targets/arduino/wiring.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ int analogRead(int);
6666
unsigned long millis(void);
6767
void setup(void);
6868
void loop(void);
69-
void beginSerial(int);
69+
void beginSerial(long);
7070
void serialWrite(unsigned char);
7171
int serialAvailable();
7272
int serialRead();

0 commit comments

Comments
 (0)