Merge branch 'master' of https://github.com/kliment/Printrun

2011-11-12 07:44:39 -06:00 · 2011-11-12 07:44:39 -06:00 · 8f459fd712
parent 59400675fb b83cddb991
commit 8f459fd712
1 changed files with 1 additions and 1 deletions
--- a/pronterface.py
+++ b/pronterface.py
@ -379,7 +379,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
        uts.Add(self.serialport)
        uts.Add(wx.StaticText(self.panel,-1,"@",pos=(250,5)),wx.RIGHT,5)
        self.baud = wx.ComboBox(self.panel, -1,
-                choices=["2400", "9600", "19200", "38400", "57600", "115200"],
+                choices=["2400", "9600", "19200", "38400", "57600", "115200", "250000"],
                style=wx.CB_DROPDOWN|wx.CB_SORT|wx.CB_READONLY, size=(110,30),pos=(275,0))
        try:
            self.baud.SetValue("115200")