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

Fixed beginSerial() to take baud rates above 19200; adjusted Serial Monitor Baud Rate menu items accordingly.

Browse Source
This commit is contained in:
David A. Mellis 2006-01-16 09:55:09 +00:00
parent 211f76e86c
commit 55dc23e859
3 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/Editor.java
View File

@ -657,7 +657,7 @@ public class Editor extends JFrame
JMenuItem rbMenuItem;
JMenuItem cbMenuItem;
SerialRateMenuListener srml = new SerialRateMenuListener();
// Enumeration portRates = {"9600","19200","38400","57600","115200"};
String[] portRates = {"9600","19200","38400","57600","115200"};
serialMenuListener = new SerialMenuListener();
@ -701,23 +701,15 @@ public class Editor extends JFrame
//serialSubMenu.addSeparator();
ButtonGroup group = new ButtonGroup();
int curr_rate = Preferences.getInteger("serial.debug_rate");
rbMenuItem = new JCheckBoxMenuItem("9600", 9600 == curr_rate);
rbMenuItem.addActionListener(srml);
group.add(rbMenuItem);
serialRateSubMenu.add(rbMenuItem);
rbMenuItem = new JCheckBoxMenuItem("19200", 19200 == curr_rate);
rbMenuItem.addActionListener(srml);
group.add(rbMenuItem);
serialRateSubMenu.add(rbMenuItem);
rbMenuItem = new JCheckBoxMenuItem("115200", 115200 == curr_rate);
rbMenuItem.addActionListener(srml);
group.add(rbMenuItem);
serialRateSubMenu.add(rbMenuItem);
String curr_rate = Preferences.get("serial.debug_rate");
for (int i = 0; i < portRates.length; i++) {
rbMenuItem = new JCheckBoxMenuItem(portRates[i], portRates[i].equals(curr_rate));
rbMenuItem.addActionListener(srml);
group.add(rbMenuItem);
serialRateSubMenu.add(rbMenuItem);
}
menu.add(serialRateSubMenu);
menu.addMenuListener(new MenuListener() {

2
targets/arduino/wiring.c
View File

@ -176,7 +176,7 @@ void analogWrite(int pin, int val)
digitalWrite(pin, HIGH);
}
void beginSerial(int baud)
void beginSerial(long baud)
{
uartInit();
uartSetBaudRate(baud);

2
targets/arduino/wiring.h
View File

@ -66,7 +66,7 @@ int analogRead(int);
unsigned long millis(void);
void setup(void);
void loop(void);
void beginSerial(int);
void beginSerial(long);
void serialWrite(unsigned char);
int serialAvailable();
int serialRead();