diff --git a/Host/MicroBoot.exe b/Host/MicroBoot.exe index 7b1f8785..61640065 100644 Binary files a/Host/MicroBoot.exe and b/Host/MicroBoot.exe differ diff --git a/Host/Source/MicroBoot/MicroBoot.lpi b/Host/Source/MicroBoot/MicroBoot.lpi index 7c54cebf..e64ed416 100644 --- a/Host/Source/MicroBoot/MicroBoot.lpi +++ b/Host/Source/MicroBoot/MicroBoot.lpi @@ -1,7 +1,7 @@ - + @@ -108,9 +108,10 @@ - - - + + + + diff --git a/Host/Source/MicroBoot/MicroBoot.lps b/Host/Source/MicroBoot/MicroBoot.lps index 637179c4..a792f7ee 100644 --- a/Host/Source/MicroBoot/MicroBoot.lps +++ b/Host/Source/MicroBoot/MicroBoot.lps @@ -1,7 +1,7 @@ - + @@ -21,10 +21,9 @@ - + - @@ -48,11 +47,10 @@ - + - @@ -73,12 +71,10 @@ - + - - @@ -96,12 +92,10 @@ - + - - @@ -110,12 +104,10 @@ - + - - @@ -126,7 +118,7 @@ - + @@ -149,7 +141,7 @@ - + @@ -157,14 +149,13 @@ - + - @@ -300,119 +291,15 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/Host/Source/MicroBoot/MicroBoot.res b/Host/Source/MicroBoot/MicroBoot.res index 9867ba3c..af2f8fc1 100644 Binary files a/Host/Source/MicroBoot/MicroBoot.res and b/Host/Source/MicroBoot/MicroBoot.res differ diff --git a/Host/Source/MicroBoot/mainunit.lfm b/Host/Source/MicroBoot/mainunit.lfm index 10b5c8aa..9cc42025 100644 --- a/Host/Source/MicroBoot/mainunit.lfm +++ b/Host/Source/MicroBoot/mainunit.lfm @@ -85,7 +85,7 @@ object MainForm: TMainForm OnCreate = FormCreate OnDestroy = FormDestroy Position = poScreenCenter - LCLVersion = '1.6.4.0' + LCLVersion = '2.0.12.0' object PnlBody: TPanel Left = 0 Height = 84 @@ -146,9 +146,10 @@ object MainForm: TMainForm end object LblFirmwareUpdateInfo: TLabel Left = 16 - Height = 17 + Height = 20 Top = 14 - Width = 135 + Width = 399 + AutoSize = False Caption = 'LblFirmwareUpdateInfo' ParentColor = False end @@ -199,9 +200,10 @@ object MainForm: TMainForm end object LblElapsedTime: TLabel Left = 16 - Height = 17 + Height = 20 Top = 14 - Width = 91 + Width = 306 + AutoSize = False Caption = 'LblElapsedTime' ParentColor = False end @@ -302,9 +304,10 @@ object MainForm: TMainForm end object LblProgramName: TLabel Left = 8 - Height = 17 + Height = 20 Top = 8 - Width = 64 + Width = 88 + AutoSize = False Caption = 'MicroBoot' Font.Style = [fsBold] ParentColor = False @@ -312,9 +315,10 @@ object MainForm: TMainForm end object LblProgramConfig: TLabel Left = 16 - Height = 17 + Height = 20 Top = 29 - Width = 106 + Width = 402 + AutoSize = False Caption = 'LblProgramConfig' ParentColor = False end @@ -322,12 +326,12 @@ object MainForm: TMainForm object OpenDialog: TOpenDialog Filter = ' Motorola S-record (*.s19;*.s28;*.s37;*.sx;*.srec;*.mot)|*.s19;*.s28;*.s37;*.sx;*.srec;*.mot|All files (*.*)|*.*' Options = [ofFileMustExist, ofEnableSizing, ofViewDetail] - left = 384 + Left = 384 end object TmrClose: TTimer Enabled = False Interval = 200 OnTimer = TmrCloseTimer - left = 312 + Left = 312 end end diff --git a/Host/Source/MicroBoot/miscellaneousdialog.lfm b/Host/Source/MicroBoot/miscellaneousdialog.lfm index 405ce39c..fc781d9f 100644 --- a/Host/Source/MicroBoot/miscellaneousdialog.lfm +++ b/Host/Source/MicroBoot/miscellaneousdialog.lfm @@ -1,19 +1,20 @@ object MiscellaneousForm: TMiscellaneousForm - Left = 1305 + Left = 536 Height = 308 - Top = 322 + Top = 356 Width = 407 Caption = 'Miscellaneous Settings' ClientHeight = 308 ClientWidth = 407 OnCreate = FormCreate OnDestroy = FormDestroy - LCLVersion = '1.6.2.0' + LCLVersion = '2.0.12.0' object LblLogging: TLabel Left = 8 - Height = 17 + Height = 20 Top = 8 - Width = 50 + Width = 68 + AutoSize = False Caption = 'Logging' Font.Style = [fsBold] ParentColor = False @@ -21,10 +22,11 @@ object MiscellaneousForm: TMiscellaneousForm end object CbxLogging: TCheckBox Left = 23 - Height = 23 + Height = 20 Hint = 'Check this box to generate a log-file during a firmware update' Top = 35 - Width = 128 + Width = 166 + AutoSize = False Caption = 'Enable file logging' OnChange = CbxLoggingChange ParentShowHint = False @@ -33,7 +35,7 @@ object MiscellaneousForm: TMiscellaneousForm end object EdtLogFile: TEdit Left = 48 - Height = 29 + Height = 23 Hint = 'Specify the name and location of the log-file to write to' Top = 93 Width = 256 @@ -53,9 +55,10 @@ object MiscellaneousForm: TMiscellaneousForm end object LblLogFile: TLabel Left = 48 - Height = 17 + Height = 20 Top = 69 - Width = 150 + Width = 258 + AutoSize = False Caption = 'Log-file name and location:' ParentColor = False end @@ -63,7 +66,7 @@ object MiscellaneousForm: TMiscellaneousForm Title = 'Log-file selection' DefaultExt = '.*.log' Filter = 'Log files (*.log)|*.log|All files (*.*)|*.*' - left = 340 - top = 32 + Left = 340 + Top = 32 end end diff --git a/Host/Source/MicroBoot/sessionxcpdialog.lfm b/Host/Source/MicroBoot/sessionxcpdialog.lfm index 3323c1f6..33e0fdd1 100644 --- a/Host/Source/MicroBoot/sessionxcpdialog.lfm +++ b/Host/Source/MicroBoot/sessionxcpdialog.lfm @@ -8,12 +8,13 @@ object SessionXcpForm: TSessionXcpForm ClientWidth = 407 OnCreate = FormCreate OnDestroy = FormDestroy - LCLVersion = '1.8.2.0' + LCLVersion = '2.0.12.0' object LblTimeouts: TLabel Left = 8 - Height = 16 + Height = 20 Top = 160 - Width = 59 + Width = 68 + AutoSize = False Caption = 'Timeouts' Font.Style = [fsBold] ParentColor = False @@ -21,15 +22,16 @@ object SessionXcpForm: TSessionXcpForm end object LblTimeoutT1: TLabel Left = 23 - Height = 16 + Height = 20 Top = 187 - Width = 47 + Width = 53 + AutoSize = False Caption = 'T1 (ms):' ParentColor = False end object EdtTimeoutT1: TEdit Left = 80 - Height = 28 + Height = 23 Hint = 'Command response timeout in milliseconds as a 16-bit value (Default = 1000 ms)' Top = 184 Width = 115 @@ -41,15 +43,16 @@ object SessionXcpForm: TSessionXcpForm end object LblTimeoutT3: TLabel Left = 23 - Height = 16 + Height = 20 Top = 227 - Width = 47 + Width = 50 + AutoSize = False Caption = 'T3 (ms):' ParentColor = False end object EdtTimeoutT3: TEdit Left = 80 - Height = 28 + Height = 23 Hint = 'Start programming timeout in milliseconds as a 16-bit value (Default = 2000 ms)' Top = 224 Width = 115 @@ -61,15 +64,16 @@ object SessionXcpForm: TSessionXcpForm end object LblTimeoutT4: TLabel Left = 23 - Height = 16 + Height = 20 Top = 267 - Width = 47 + Width = 51 + AutoSize = False Caption = 'T4 (ms):' ParentColor = False end object EdtTimeoutT4: TEdit Left = 80 - Height = 28 + Height = 23 Hint = 'Erase memory timeout in milliseconds as a 16-bit value (Default = 10000 ms)' Top = 264 Width = 115 @@ -81,15 +85,16 @@ object SessionXcpForm: TSessionXcpForm end object LblTimeoutT5: TLabel Left = 226 - Height = 16 + Height = 20 Top = 187 - Width = 47 + Width = 46 + AutoSize = False Caption = 'T5 (ms):' ParentColor = False end object EdtTimeoutT5: TEdit Left = 280 - Height = 28 + Height = 23 Hint = 'Program memory and target reset timeout in milliseconds as a 16-bit value (Default = 1000 ms)' Top = 184 Width = 115 @@ -101,15 +106,16 @@ object SessionXcpForm: TSessionXcpForm end object LblTimeoutT7: TLabel Left = 226 - Height = 16 + Height = 20 Top = 267 - Width = 47 + Width = 46 + AutoSize = False Caption = 'T7 (ms):' ParentColor = False end object EdtTimeoutT7: TEdit Left = 280 - Height = 28 + Height = 23 Hint = 'Busy wait timer timeout in milliseconds as a 16-bit value (Default = 2000 ms)' Top = 264 Width = 115 @@ -121,9 +127,10 @@ object SessionXcpForm: TSessionXcpForm end object LblConnection: TLabel Left = 8 - Height = 16 + Height = 20 Top = 8 - Width = 74 + Width = 80 + AutoSize = False Caption = 'Connection' Font.Style = [fsBold] ParentColor = False @@ -131,19 +138,20 @@ object SessionXcpForm: TSessionXcpForm end object LblConnectMode: TLabel Left = 23 - Height = 16 + Height = 20 Top = 38 - Width = 38 + Width = 49 + AutoSize = False Caption = 'Mode:' ParentColor = False end object CmbConnectMode: TComboBox Left = 80 - Height = 26 + Height = 23 Hint = 'Connection mode value sent in the XCP connect command as a 8-bit value (Default=0)' Top = 35 Width = 120 - ItemHeight = 0 + ItemHeight = 15 ItemIndex = 0 Items.Strings = ( '0' @@ -411,9 +419,10 @@ object SessionXcpForm: TSessionXcpForm end object LblSecurity: TLabel Left = 8 - Height = 16 + Height = 20 Top = 72 - Width = 54 + Width = 64 + AutoSize = False Caption = 'Security' Font.Style = [fsBold] ParentColor = False @@ -421,15 +430,16 @@ object SessionXcpForm: TSessionXcpForm end object LblSeedKey: TLabel Left = 23 - Height = 16 + Height = 20 Top = 96 - Width = 298 + Width = 369 + AutoSize = False Caption = 'Select your seed/key algorithm shared library file:' ParentColor = False end object EdtSeedKey: TEdit Left = 23 - Height = 28 + Height = 23 Hint = 'Seed/key algorithm shared library filename (Optional)' Top = 120 Width = 281 @@ -448,15 +458,16 @@ object SessionXcpForm: TSessionXcpForm end object LblTimeoutT6: TLabel Left = 224 - Height = 16 + Height = 20 Top = 227 - Width = 47 + Width = 50 + AutoSize = False Caption = 'T6 (ms):' ParentColor = False end object EdtTimeoutT6: TEdit Left = 280 - Height = 28 + Height = 23 Hint = 'Connect response timeout in milliseconds as a 16-bit value (Default = 50 ms)' Top = 224 Width = 115 @@ -469,7 +480,7 @@ object SessionXcpForm: TSessionXcpForm object OpenDialog: TOpenDialog Filter = 'Shared libraries (*.dll;*.so)|*.dll;*.so|All files (*.*)|*.*' Options = [ofFileMustExist, ofEnableSizing, ofViewDetail] - left = 344 - top = 31 + Left = 344 + Top = 31 end end diff --git a/Host/Source/MicroBoot/settingsdialog.lfm b/Host/Source/MicroBoot/settingsdialog.lfm index 45dcd72d..52118a61 100644 --- a/Host/Source/MicroBoot/settingsdialog.lfm +++ b/Host/Source/MicroBoot/settingsdialog.lfm @@ -13,7 +13,7 @@ object SettingsForm: TSettingsForm OnDestroy = FormDestroy OnKeyPress = FormKeyPress Position = poOwnerFormCenter - LCLVersion = '1.8.2.0' + LCLVersion = '2.0.12.0' object PnlFooter: TPanel Left = 0 Height = 46 @@ -82,37 +82,38 @@ object SettingsForm: TSettingsForm TabOrder = 0 object TabCommunicationInterface: TTabSheet Caption = 'Communication Interface' - ClientHeight = 364 - ClientWidth = 412 + ClientHeight = 367 + ClientWidth = 414 object PnlCommunicationTop: TPanel Left = 0 Height = 44 Top = 0 - Width = 412 + Width = 414 Align = alTop BevelOuter = bvNone Caption = 'PnlCommunicationTop' ClientHeight = 44 - ClientWidth = 412 + ClientWidth = 414 Color = clForm ParentColor = False TabOrder = 0 object LblInterface: TLabel Left = 8 - Height = 17 + Height = 20 Top = 11 - Width = 107 + Width = 112 + AutoSize = False Caption = 'Interface selection:' ParentColor = False end object CmbInterface: TComboBox Left = 120 - Height = 27 + Height = 23 Hint = 'Select the communication hardware interface to use during firmware updates' Top = 8 Width = 200 DropDownCount = 4 - ItemHeight = 0 + ItemHeight = 15 ItemIndex = 0 Items.Strings = ( 'XCP on RS232' @@ -130,9 +131,9 @@ object SettingsForm: TSettingsForm end object PnlCommunicationBody: TPanel Left = 0 - Height = 320 + Height = 323 Top = 44 - Width = 412 + Width = 414 Align = alClient BevelOuter = bvNone Caption = 'PnlCommunicationBody' @@ -143,27 +144,27 @@ object SettingsForm: TSettingsForm end object TabSessionProtocol: TTabSheet Caption = 'Session Protocol' - ClientHeight = 364 - ClientWidth = 412 + ClientHeight = 367 + ClientWidth = 414 object PnlSessionTop: TPanel Left = 0 Height = 44 Top = 0 - Width = 412 + Width = 414 Align = alTop BevelOuter = bvNone Caption = 'PnlSessionTop' ClientHeight = 44 - ClientWidth = 412 + ClientWidth = 414 TabOrder = 0 object CmbProtocol: TComboBox Left = 120 - Height = 31 + Height = 23 Hint = 'Select the communication protocol to use during firmware updates' Top = 8 Width = 200 DropDownCount = 4 - ItemHeight = 0 + ItemHeight = 15 Items.Strings = ( 'XCP version 1.0' ) @@ -175,18 +176,19 @@ object SettingsForm: TSettingsForm end object LblProtocol: TLabel Left = 8 - Height = 17 + Height = 20 Top = 11 - Width = 102 + Width = 112 + AutoSize = False Caption = 'Protocol selection:' ParentColor = False end end object PnlSessionBody: TPanel Left = 0 - Height = 320 + Height = 323 Top = 44 - Width = 412 + Width = 414 Align = alClient BevelOuter = bvNone Caption = 'PnlSessionBody' @@ -195,13 +197,13 @@ object SettingsForm: TSettingsForm end object TabMiscellaneous: TTabSheet Caption = 'Miscellaneous' - ClientHeight = 364 - ClientWidth = 412 + ClientHeight = 367 + ClientWidth = 414 object PnlMiscellaneousBody: TPanel Left = 0 - Height = 364 + Height = 367 Top = 0 - Width = 412 + Width = 414 Align = alClient BevelOuter = bvNone Caption = 'PnlMiscellaneousBody' diff --git a/Host/Source/MicroBoot/transportxcpcandialog.lfm b/Host/Source/MicroBoot/transportxcpcandialog.lfm index 97555323..8ab3af8e 100644 --- a/Host/Source/MicroBoot/transportxcpcandialog.lfm +++ b/Host/Source/MicroBoot/transportxcpcandialog.lfm @@ -1,19 +1,20 @@ object TransportXcpCanForm: TTransportXcpCanForm - Left = 1287 + Left = 550 Height = 308 - Top = 261 + Top = 357 Width = 407 Caption = 'XCP on CAN' ClientHeight = 308 ClientWidth = 407 OnCreate = FormCreate OnDestroy = FormDestroy - LCLVersion = '1.6.4.0' + LCLVersion = '2.0.12.0' object LblCommunication: TLabel Left = 8 - Height = 15 + Height = 20 Top = 8 - Width = 87 + Width = 106 + AutoSize = False Caption = 'Communication' Font.Style = [fsBold] ParentColor = False @@ -39,9 +40,10 @@ object TransportXcpCanForm: TTransportXcpCanForm end object LblDevice: TLabel Left = 24 - Height = 15 + Height = 20 Top = 38 - Width = 38 + Width = 88 + AutoSize = False Caption = 'Device:' ParentColor = False end @@ -77,9 +79,10 @@ object TransportXcpCanForm: TTransportXcpCanForm end object LblChannel: TLabel Left = 24 - Height = 15 + Height = 20 Top = 78 - Width = 47 + Width = 88 + AutoSize = False Caption = 'Channel:' ParentColor = False end @@ -108,17 +111,19 @@ object TransportXcpCanForm: TTransportXcpCanForm end object LblBaudrate: TLabel Left = 24 - Height = 15 + Height = 20 Top = 118 - Width = 50 + Width = 90 + AutoSize = False Caption = 'Baudrate:' ParentColor = False end object LblIdentifiers: TLabel Left = 8 - Height = 15 + Height = 20 Top = 160 - Width = 58 + Width = 106 + AutoSize = False Caption = 'Identifiers' Font.Style = [fsBold] ParentColor = False @@ -139,9 +144,10 @@ object TransportXcpCanForm: TTransportXcpCanForm end object LblTransmitId: TLabel Left = 24 - Height = 15 + Height = 20 Top = 190 - Width = 78 + Width = 88 + AutoSize = False Caption = 'Transmit (hex):' ParentColor = False end @@ -160,18 +166,20 @@ object TransportXcpCanForm: TTransportXcpCanForm end object LblReceiveId: TLabel Left = 24 - Height = 15 + Height = 20 Top = 230 - Width = 72 + Width = 89 + AutoSize = False Caption = 'Receive (hex):' ParentColor = False end object CbxExtended: TCheckBox Left = 120 - Height = 19 + Height = 20 Hint = 'Check if the CAN identifiers are 29-bit extended (Default = 11-bit standard)' Top = 267 - Width = 185 + Width = 224 + AutoSize = False Caption = '29-bit extended CAN identifiers' OnChange = CbxExtendedChange ParentShowHint = False diff --git a/Host/Source/MicroBoot/transportxcprs232dialog.lfm b/Host/Source/MicroBoot/transportxcprs232dialog.lfm index 39f88627..4d455aa0 100644 --- a/Host/Source/MicroBoot/transportxcprs232dialog.lfm +++ b/Host/Source/MicroBoot/transportxcprs232dialog.lfm @@ -1,19 +1,20 @@ object TransportXcpRs232Form: TTransportXcpRs232Form - Left = 1297 + Left = 558 Height = 308 - Top = 271 + Top = 310 Width = 407 Caption = 'XCP on RS232' ClientHeight = 308 ClientWidth = 407 OnCreate = FormCreate OnDestroy = FormDestroy - LCLVersion = '1.6.4.0' + LCLVersion = '2.0.12.0' object LlbCommunication: TLabel Left = 8 - Height = 15 + Height = 20 Top = 8 - Width = 87 + Width = 104 + AutoSize = False Caption = 'Communication' Font.Style = [fsBold] ParentColor = False @@ -33,9 +34,10 @@ object TransportXcpRs232Form: TTransportXcpRs232Form end object LblDevice: TLabel Left = 24 - Height = 15 + Height = 20 Top = 38 - Width = 38 + Width = 64 + AutoSize = False Caption = 'Device:' ParentColor = False end @@ -62,9 +64,10 @@ object TransportXcpRs232Form: TTransportXcpRs232Form end object LblBaudrate: TLabel Left = 24 - Height = 15 + Height = 20 Top = 78 - Width = 50 + Width = 66 + AutoSize = False Caption = 'Baudrate:' ParentColor = False end diff --git a/Host/Source/MicroBoot/transportxcptcpipdialog.lfm b/Host/Source/MicroBoot/transportxcptcpipdialog.lfm index 5b598d2c..77969165 100644 --- a/Host/Source/MicroBoot/transportxcptcpipdialog.lfm +++ b/Host/Source/MicroBoot/transportxcptcpipdialog.lfm @@ -1,19 +1,20 @@ object TransportXcpTcpIpForm: TTransportXcpTcpIpForm - Left = 1279 + Left = 578 Height = 308 - Top = 273 + Top = 343 Width = 407 Caption = 'XCP on TCP/IP' ClientHeight = 308 ClientWidth = 407 OnCreate = FormCreate OnDestroy = FormDestroy - LCLVersion = '1.6.2.0' + LCLVersion = '2.0.12.0' object LblCommunication: TLabel Left = 8 - Height = 17 + Height = 20 Top = 8 - Width = 96 + Width = 104 + AutoSize = False Caption = 'Communication' Font.Style = [fsBold] ParentColor = False @@ -21,7 +22,7 @@ object TransportXcpTcpIpForm: TTransportXcpTcpIpForm end object EdtAddress: TEdit Left = 88 - Height = 29 + Height = 23 Hint = 'The IP address or hostname of the target to connect to. For example 192.168.178.23 or mydevice.mydomain.com' Top = 35 Width = 288 @@ -32,7 +33,7 @@ object TransportXcpTcpIpForm: TTransportXcpTcpIpForm end object EdtPort: TEdit Left = 88 - Height = 29 + Height = 23 Hint = 'The TCP port number to use, as a 16-bit value (Default = 1000)' Top = 75 Width = 144 @@ -45,17 +46,19 @@ object TransportXcpTcpIpForm: TTransportXcpTcpIpForm end object LblAddress: TLabel Left = 24 - Height = 17 + Height = 20 Top = 38 - Width = 49 + Width = 56 + AutoSize = False Caption = 'Address:' ParentColor = False end object LblPort: TLabel Left = 24 - Height = 17 + Height = 20 Top = 78 - Width = 26 + Width = 57 + AutoSize = False Caption = 'Port:' ParentColor = False end diff --git a/Host/Source/MicroBoot/transportxcpusbdialog.lfm b/Host/Source/MicroBoot/transportxcpusbdialog.lfm index b8e4f5b1..377629a1 100644 --- a/Host/Source/MicroBoot/transportxcpusbdialog.lfm +++ b/Host/Source/MicroBoot/transportxcpusbdialog.lfm @@ -1,19 +1,20 @@ object TransportXcpUsbForm: TTransportXcpUsbForm - Left = 1285 + Left = 528 Height = 308 - Top = 253 + Top = 303 Width = 407 Caption = 'XCP on USB' ClientHeight = 308 ClientWidth = 407 OnCreate = FormCreate OnDestroy = FormDestroy - LCLVersion = '1.6.4.0' + LCLVersion = '2.0.12.0' object LblCommunication: TLabel Left = 8 - Height = 15 + Height = 20 Top = 8 - Width = 87 + Width = 112 + AutoSize = False Caption = 'Communication' Font.Style = [fsBold] ParentColor = False @@ -47,17 +48,19 @@ object TransportXcpUsbForm: TTransportXcpUsbForm end object LblVID: TLabel Left = 24 - Height = 15 + Height = 20 Top = 38 - Width = 83 + Width = 100 + AutoSize = False Caption = 'Vendor ID (hex):' ParentColor = False end object LblPID: TLabel Left = 24 - Height = 15 + Height = 20 Top = 78 - Width = 88 + Width = 97 + AutoSize = False Caption = 'Product ID (hex):' ParentColor = False end