Commit ad21eefe authored by Keegi's avatar Keegi

Merge remote branch 'kliment/master' into experimental

parents 9a7baf64 5cd0e23e
...@@ -411,7 +411,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole): ...@@ -411,7 +411,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
uts.Add(wx.StaticText(self.panel,-1,"@",pos=(250,5)),wx.RIGHT,5) uts.Add(wx.StaticText(self.panel,-1,"@",pos=(250,5)),wx.RIGHT,5)
self.baud = wx.ComboBox(self.panel, -1, self.baud = wx.ComboBox(self.panel, -1,
choices=["2400", "9600", "19200", "38400", "57600", "115200", "250000"], choices=["2400", "9600", "19200", "38400", "57600", "115200", "250000"],
style=wx.CB_DROPDOWN|wx.CB_SORT|wx.CB_READONLY, size=(110,30),pos=(275,0)) style=wx.CB_DROPDOWN|wx.CB_READONLY, size=(110,30),pos=(275,0))
try: try:
self.baud.SetValue("115200") self.baud.SetValue("115200")
self.baud.SetValue(str(self.settings.baudrate)) self.baud.SetValue(str(self.settings.baudrate))
......
...@@ -10,7 +10,7 @@ def sign(n): ...@@ -10,7 +10,7 @@ def sign(n):
else: return 0 else: return 0
class ZButtons(BufferedCanvas): class ZButtons(BufferedCanvas):
button_ydistances = [7, 30, 55, 83, 112] button_ydistances = [7, 30, 55, 83] # ,112
center = (30, 118) center = (30, 118)
label_overlay_positions = { label_overlay_positions = {
0: (1, 18, 11), 0: (1, 18, 11),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment