mirror of https://github.com/noisymime/Arduino.git
Fixed beginSerial() to take baud rates above 19200; adjusted Serial Monitor Baud Rate menu items accordingly.
This commit is contained in:
parent
211f76e86c
commit
55dc23e859
|
@ -657,7 +657,7 @@ public class Editor extends JFrame
|
||||||
JMenuItem rbMenuItem;
|
JMenuItem rbMenuItem;
|
||||||
JMenuItem cbMenuItem;
|
JMenuItem cbMenuItem;
|
||||||
SerialRateMenuListener srml = new SerialRateMenuListener();
|
SerialRateMenuListener srml = new SerialRateMenuListener();
|
||||||
// Enumeration portRates = {"9600","19200","38400","57600","115200"};
|
String[] portRates = {"9600","19200","38400","57600","115200"};
|
||||||
|
|
||||||
serialMenuListener = new SerialMenuListener();
|
serialMenuListener = new SerialMenuListener();
|
||||||
|
|
||||||
|
@ -701,23 +701,15 @@ public class Editor extends JFrame
|
||||||
//serialSubMenu.addSeparator();
|
//serialSubMenu.addSeparator();
|
||||||
ButtonGroup group = new ButtonGroup();
|
ButtonGroup group = new ButtonGroup();
|
||||||
|
|
||||||
int curr_rate = Preferences.getInteger("serial.debug_rate");
|
String curr_rate = Preferences.get("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);
|
|
||||||
|
|
||||||
|
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.add(serialRateSubMenu);
|
||||||
|
|
||||||
menu.addMenuListener(new MenuListener() {
|
menu.addMenuListener(new MenuListener() {
|
||||||
|
|
|
@ -176,7 +176,7 @@ void analogWrite(int pin, int val)
|
||||||
digitalWrite(pin, HIGH);
|
digitalWrite(pin, HIGH);
|
||||||
}
|
}
|
||||||
|
|
||||||
void beginSerial(int baud)
|
void beginSerial(long baud)
|
||||||
{
|
{
|
||||||
uartInit();
|
uartInit();
|
||||||
uartSetBaudRate(baud);
|
uartSetBaudRate(baud);
|
||||||
|
|
|
@ -66,7 +66,7 @@ int analogRead(int);
|
||||||
unsigned long millis(void);
|
unsigned long millis(void);
|
||||||
void setup(void);
|
void setup(void);
|
||||||
void loop(void);
|
void loop(void);
|
||||||
void beginSerial(int);
|
void beginSerial(long);
|
||||||
void serialWrite(unsigned char);
|
void serialWrite(unsigned char);
|
||||||
int serialAvailable();
|
int serialAvailable();
|
||||||
int serialRead();
|
int serialRead();
|
||||||
|
|
Loading…
Reference in New Issue