--- a/FirmwareUpdateDialog.py Wed Nov 22 11:18:59 2023 +0100
+++ b/FirmwareUpdateDialog.py Wed Nov 29 12:01:37 2023 +0100
@@ -29,9 +29,14 @@
This class is the dialog for firmware update parameters selection
- def __init__(self, parent):
+ def __init__(self, parent, version_string): wx.Dialog.__init__(self, parent=parent, title=_('Firmware Update'))
+ # display version string as static text + self.StaticVersionText = wx.StaticText(self, label=version_string) + self.StaticVersionTextBoxSizer = wx.StaticBoxSizer(wx.StaticBox(self, label=_('Platform:')), wx.VERTICAL) + self.StaticVersionTextBoxSizer.Add(self.StaticVersionText, flag=wx.EXPAND) # Widgets for the update image file selection
self.TextCtrltFirmwareUpdateImageFile = wx.TextCtrl(self)
self.ButtonFirmwareUpdateImageFile = wx.Button(label=_('Add image file'), parent=self)
@@ -75,9 +80,10 @@
self.SizerFirmwareUpdateChunks.Add(self.RadioBoxFirmwareUpdateTypeChunks, flag=wx.EXPAND|wx.RIGHT, border=20)
self.SizerFirmwareUpdateChunks.Add(self.SizerFirmwareUpdateSizeChunks, flag=wx.EXPAND)
- self.MainSizer = wx.FlexGridSizer(cols=1, rows=3)
+ self.MainSizer = wx.FlexGridSizer(cols=1, rows=4) self.MainSizer.AddGrowableCol(0)
self.MainSizer.AddGrowableRow(1)
+ self.MainSizer.AddSizer(self.StaticVersionTextBoxSizer, flag=wx.EXPAND|wx.LEFT|wx.TOP|wx.RIGHT, border=20) self.MainSizer.AddSizer(self.SizerFirmwareUpdateImageFileBoxSizer, flag=wx.EXPAND|wx.LEFT|wx.TOP|wx.RIGHT, border=20)
self.MainSizer.AddSizer(self.SizerFirmwareUpdateChunks, flag=wx.EXPAND|wx.LEFT|wx.TOP|wx.RIGHT, border=20)
self.MainSizer.AddSizer(self.ButtonSizer, flag=wx.ALIGN_RIGHT|wx.ALL, border=20)
--- a/LPCProjectController.py Wed Nov 22 11:18:59 2023 +0100
+++ b/LPCProjectController.py Wed Nov 29 12:01:37 2023 +0100
@@ -196,8 +196,10 @@
self.firmwareUpadateIsRunning = True
self.logger.write(_("Firmware update started\n"))
+ version_string = self._connector.GetVersions() # Launch the firmware selection dialog
- dialog = FirmwareUpdateDialog(self.AppFrame)
+ dialog = FirmwareUpdateDialog(self.AppFrame, version_string) answer = dialog.ShowModal()
imageFilePath = dialog.GetFirmwareImageFile()
updateType = dialog.GetFirmwareUpdateType()