Skip to content

Commit a6aae0c

Browse files
committed
Small fixes
- address style warnings - tune console output at the end of the process
1 parent db84ce5 commit a6aae0c

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

Main.py

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ def run(self):
7777
try:
7878
esp.change_baud(self._config.baud)
7979
except NotImplementedInROMError:
80-
print("WARNING: ROM doesn't support changing baud rate. Keeping initial baud rate %d" % initial_baud)
80+
print("WARNING: ROM doesn't support changing baud rate. Keeping initial baud rate %d." %
81+
initial_baud)
8182

8283
args = Namespace()
8384
args.flash_size = "detect"
@@ -96,6 +97,8 @@ def run(self):
9697
if self._config.erase_before_flash:
9798
esptool.erase_flash(esp, args)
9899
esptool.write_flash(esp, args)
100+
# The last line printed by esptool is "Leaving..." -> some indication that the process is done is needed
101+
print("\nDone.")
99102
except SerialException as e:
100103
self._parent.report_error(e.strerror)
101104
raise e
@@ -219,12 +222,12 @@ def on_pick_file(event):
219222

220223
baud_boxsizer = wx.BoxSizer(wx.HORIZONTAL)
221224

222-
def add_baud_radio_button(sizer, idx, rate):
223-
style = wx.RB_GROUP if idx == 0 else 0
224-
radio_button = wx.RadioButton(panel, name="baud-%d" % rate, label="%d" % rate, style=style)
225-
radio_button.rate = rate
225+
def add_baud_radio_button(sizer, index, baud_rate):
226+
style = wx.RB_GROUP if index == 0 else 0
227+
radio_button = wx.RadioButton(panel, name="baud-%d" % baud_rate, label="%d" % baud_rate, style=style)
228+
radio_button.rate = baud_rate
226229
# sets default value
227-
radio_button.SetValue(rate == self._config.baud)
230+
radio_button.SetValue(baud_rate == self._config.baud)
228231
radio_button.Bind(wx.EVT_RADIOBUTTON, on_baud_changed)
229232
sizer.Add(radio_button)
230233
sizer.AddSpacer(10)
@@ -234,8 +237,8 @@ def add_baud_radio_button(sizer, idx, rate):
234237

235238
flashmode_boxsizer = wx.BoxSizer(wx.HORIZONTAL)
236239

237-
def add_flash_mode_radio_button(sizer, idx, mode, label):
238-
style = wx.RB_GROUP if idx == 0 else 0
240+
def add_flash_mode_radio_button(sizer, index, mode, label):
241+
style = wx.RB_GROUP if index == 0 else 0
239242
radio_button = wx.RadioButton(panel, name="mode-%s" % mode, label="%s" % label, style=style)
240243
radio_button.Bind(wx.EVT_RADIOBUTTON, on_mode_changed)
241244
radio_button.mode = mode
@@ -249,8 +252,8 @@ def add_flash_mode_radio_button(sizer, idx, mode, label):
249252

250253
erase_boxsizer = wx.BoxSizer(wx.HORIZONTAL)
251254

252-
def add_erase_radio_button(sizer, idx, erase_before_flash, label, value):
253-
style = wx.RB_GROUP if idx == 0 else 0
255+
def add_erase_radio_button(sizer, index, erase_before_flash, label, value):
256+
style = wx.RB_GROUP if index == 0 else 0
254257
radio_button = wx.RadioButton(panel, name="erase-%s" % erase_before_flash, label="%s" % label, style=style)
255258
radio_button.Bind(wx.EVT_RADIOBUTTON, on_erase_changed)
256259
radio_button.erase = erase_before_flash

0 commit comments

Comments
 (0)