diff --git a/botterm/.vs/botterm/v16/.suo b/botterm/.vs/botterm/v16/.suo index f6a0c24..86739f8 100644 Binary files a/botterm/.vs/botterm/v16/.suo and b/botterm/.vs/botterm/v16/.suo differ diff --git a/botterm/botterm/BootloaderCommands.cs b/botterm/botterm/BootloaderCommands.cs index c32c9d1..c9a533f 100644 --- a/botterm/botterm/BootloaderCommands.cs +++ b/botterm/botterm/BootloaderCommands.cs @@ -12,10 +12,9 @@ namespace BootloaderGUI public const byte ERASE = 0x01; public const byte RECEIVE = 0x02; public const byte WRITE = 0x03; - public const byte VERIFY = 0x04; - public const byte JUMP = 0x05; - public const byte RESET = 0x06; - public const byte GO_TO_BOOT = 0x07; + public const byte JUMP = 0x04; + public const byte RESET = 0x05; + public const byte GO_TO_BOOT = 0x06; public const int PAGE_SIZE = 2048; public const int CAN_ID_BOOTLOADER = 0x123; diff --git a/botterm/botterm/LowLevelBoot.cs b/botterm/botterm/LowLevelBoot.cs index 7b66c82..c7f47ec 100644 --- a/botterm/botterm/LowLevelBoot.cs +++ b/botterm/botterm/LowLevelBoot.cs @@ -74,13 +74,12 @@ namespace BootloaderGUI top += numPage.Height + gap; btnErase = new Button() { Top = top, Left = left, Width = wBtn, Text = "ERASE Firmware" }; - btnReceive = new Button() { Top = top, Left = left + wBtn + gap, Width = wBtn, Text = "SEND Page" }; - Tab.Controls.AddRange(new Control[] { btnErase, btnReceive }); + Tab.Controls.AddRange(new Control[] { btnErase, }); top += hBtn + gap; + btnReceive = new Button() { Top = top, Left = left + wBtn + gap, Width = wBtn, Text = "SEND Page" }; btnWrite = new Button() { Top = top, Left = left, Width = wBtn, Text = "WRITE Page" }; - btnVerify = new Button() { Top = top, Left = left + wBtn + gap, Width = wBtn, Text = "VERIFY Firmware" }; - Tab.Controls.AddRange(new Control[] { btnWrite, btnVerify }); + Tab.Controls.AddRange(new Control[] { btnReceive, btnWrite }); top += hBtn + gap; btnJump = new Button() { Top = top, Left = left, Width = wBtn, Text = "JUMP to App" }; @@ -92,7 +91,6 @@ namespace BootloaderGUI btnErase.Click += (s, e) => sendCmdSync(BootloaderCommands.ERASE); btnReceive.Click += (s, e) => sendPage((int)numPage.Value); btnWrite.Click += (s, e) => sendCmdSync(BootloaderCommands.WRITE); - btnVerify.Click += (s, e) => sendCmdSync(BootloaderCommands.VERIFY); btnJump.Click += (s, e) => sendCmdSync(BootloaderCommands.JUMP); btnReset.Click += (s, e) => sendCmdSync(BootloaderCommands.RESET); btnGoBoot.Click += (s, e) => sendCmdSync(BootloaderCommands.GO_TO_BOOT); diff --git a/botterm/botterm/UserFriendlyBoot.cs b/botterm/botterm/UserFriendlyBoot.cs index b8e966c..a754e0d 100644 --- a/botterm/botterm/UserFriendlyBoot.cs +++ b/botterm/botterm/UserFriendlyBoot.cs @@ -110,14 +110,6 @@ namespace BootloaderGUI await Task.Delay(5); // небольшая пауза для UI } - UpdateStatus("Verifying..."); - await Task.Delay(5); // небольшая пауза для UI - if (!sendCmdSync(BootloaderCommands.VERIFY)) - { - UpdateStatus("Verify failed"); - return; - } - UpdateStatus("Jumping to app..."); await Task.Delay(5); // небольшая пауза для UI sendCmdSync(BootloaderCommands.JUMP); diff --git a/botterm/botterm/bin/Debug/botterm.exe b/botterm/botterm/bin/Debug/botterm.exe index 29cf30c..624d383 100644 Binary files a/botterm/botterm/bin/Debug/botterm.exe and b/botterm/botterm/bin/Debug/botterm.exe differ diff --git a/botterm/botterm/bin/Debug/botterm.pdb b/botterm/botterm/bin/Debug/botterm.pdb index 5902e85..0a493ce 100644 Binary files a/botterm/botterm/bin/Debug/botterm.pdb and b/botterm/botterm/bin/Debug/botterm.pdb differ diff --git a/botterm/botterm/obj/Debug/botterm.csproj.AssemblyReference.cache b/botterm/botterm/obj/Debug/botterm.csproj.AssemblyReference.cache index 1228a24..f5e894a 100644 Binary files a/botterm/botterm/obj/Debug/botterm.csproj.AssemblyReference.cache and b/botterm/botterm/obj/Debug/botterm.csproj.AssemblyReference.cache differ diff --git a/botterm/botterm/obj/Debug/botterm.exe b/botterm/botterm/obj/Debug/botterm.exe index 29cf30c..624d383 100644 Binary files a/botterm/botterm/obj/Debug/botterm.exe and b/botterm/botterm/obj/Debug/botterm.exe differ diff --git a/botterm/botterm/obj/Debug/botterm.pdb b/botterm/botterm/obj/Debug/botterm.pdb index 5902e85..0a493ce 100644 Binary files a/botterm/botterm/obj/Debug/botterm.pdb and b/botterm/botterm/obj/Debug/botterm.pdb differ