From b92a5ba18d074015e3fa28bb9c0fe1e84183a2de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nguy=E1=BB=85n=20Long=20V=C5=A9?=
<57937809+cuminhbecube@users.noreply.github.com>
Date: Tue, 31 May 2022 14:46:48 +0700
Subject: [PATCH 1/4] =?UTF-8?q?b=E1=BA=A3n=20s=E1=BB=ADa=201?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
thay đổi một số chỗ trong hiển thị và xóa bộ nhớ
---
STBootLib/STBootLib.csproj | 3 +-
STM32 Flash Loader.sln | 17 ++++---
STM32 Flash Loader/App.config | 6 +--
STM32 Flash Loader/MainForm.Designer.cs | 39 ++++++++--------
STM32 Flash Loader/MainForm.cs | 3 ++
.../Properties/Resources.Designer.cs | 45 ++++++++-----------
.../Properties/Settings.Designer.cs | 24 +++++-----
STM32 Flash Loader/STM32 Flash Loader.csproj | 31 ++++++++++++-
8 files changed, 98 insertions(+), 70 deletions(-)
diff --git a/STBootLib/STBootLib.csproj b/STBootLib/STBootLib.csproj
index 0ed7706..760ea88 100644
--- a/STBootLib/STBootLib.csproj
+++ b/STBootLib/STBootLib.csproj
@@ -9,8 +9,9 @@
Properties
STBootLib
STBootLib
- v4.5
+ v4.8
512
+
true
diff --git a/STM32 Flash Loader.sln b/STM32 Flash Loader.sln
index cecbd18..bc8c42d 100644
--- a/STM32 Flash Loader.sln
+++ b/STM32 Flash Loader.sln
@@ -1,9 +1,9 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2013 for Windows Desktop
-VisualStudioVersion = 12.0.21005.1
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32319.34
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "STM32 Flash Loader", "STM32 Flash Loader\STM32 Flash Loader.csproj", "{975D7D83-56AE-4A64-865E-BCD9096B05C7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "STM32 Flash Loader", "STM32 Flash Loader\STM32 Flash Loader.csproj", "{F2A80228-9234-4748-A61B-F26D3C1EC7FA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "STBootLib", "STBootLib\STBootLib.csproj", "{8EC66A52-5978-481D-A80D-D75CBC6DE918}"
EndProject
@@ -13,10 +13,10 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {975D7D83-56AE-4A64-865E-BCD9096B05C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {975D7D83-56AE-4A64-865E-BCD9096B05C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {975D7D83-56AE-4A64-865E-BCD9096B05C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {975D7D83-56AE-4A64-865E-BCD9096B05C7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F2A80228-9234-4748-A61B-F26D3C1EC7FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F2A80228-9234-4748-A61B-F26D3C1EC7FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F2A80228-9234-4748-A61B-F26D3C1EC7FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F2A80228-9234-4748-A61B-F26D3C1EC7FA}.Release|Any CPU.Build.0 = Release|Any CPU
{8EC66A52-5978-481D-A80D-D75CBC6DE918}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8EC66A52-5978-481D-A80D-D75CBC6DE918}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8EC66A52-5978-481D-A80D-D75CBC6DE918}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -25,4 +25,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {D97571A4-3B65-4B5B-8A41-15F2194B0516}
+ EndGlobalSection
EndGlobal
diff --git a/STM32 Flash Loader/App.config b/STM32 Flash Loader/App.config
index 8e15646..4bfa005 100644
--- a/STM32 Flash Loader/App.config
+++ b/STM32 Flash Loader/App.config
@@ -1,6 +1,6 @@
-
+
-
+
-
\ No newline at end of file
+
diff --git a/STM32 Flash Loader/MainForm.Designer.cs b/STM32 Flash Loader/MainForm.Designer.cs
index 0eaaa3e..d3246f4 100644
--- a/STM32 Flash Loader/MainForm.Designer.cs
+++ b/STM32 Flash Loader/MainForm.Designer.cs
@@ -37,10 +37,10 @@ private void InitializeComponent()
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.tsslStatus = new System.Windows.Forms.ToolStripStatusLabel();
this.groupBox3 = new System.Windows.Forms.GroupBox();
- this.bJump = new System.Windows.Forms.Button();
this.lProgress = new System.Windows.Forms.Label();
this.bWrite = new System.Windows.Forms.Button();
this.pbProgress = new System.Windows.Forms.ProgressBar();
+ this.bJump = new System.Windows.Forms.Button();
this.ofdOpen = new System.Windows.Forms.OpenFileDialog();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.cbPSize = new System.Windows.Forms.ComboBox();
@@ -128,7 +128,7 @@ private void InitializeComponent()
//
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.tsslStatus});
- this.statusStrip1.Location = new System.Drawing.Point(0, 310);
+ this.statusStrip1.Location = new System.Drawing.Point(0, 386);
this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Size = new System.Drawing.Size(315, 22);
this.statusStrip1.TabIndex = 2;
@@ -142,29 +142,16 @@ private void InitializeComponent()
//
// groupBox3
//
- this.groupBox3.Controls.Add(this.bJump);
this.groupBox3.Controls.Add(this.lProgress);
this.groupBox3.Controls.Add(this.bWrite);
this.groupBox3.Controls.Add(this.pbProgress);
this.groupBox3.Location = new System.Drawing.Point(12, 224);
this.groupBox3.Name = "groupBox3";
- this.groupBox3.Size = new System.Drawing.Size(293, 80);
+ this.groupBox3.Size = new System.Drawing.Size(293, 133);
this.groupBox3.TabIndex = 3;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "Actions";
//
- // bJump
- //
- this.bJump.Enabled = false;
- this.bJump.Location = new System.Drawing.Point(149, 48);
- this.bJump.Name = "bJump";
- this.bJump.Size = new System.Drawing.Size(133, 23);
- this.bJump.TabIndex = 3;
- this.bJump.Text = "Jump";
- this.ttToolTip.SetToolTip(this.bJump, "Uploads the firmware and jumps to it.");
- this.bJump.UseVisualStyleBackColor = true;
- this.bJump.Click += new System.EventHandler(this.bJump_Click);
- //
// lProgress
//
this.lProgress.AutoSize = true;
@@ -179,7 +166,7 @@ private void InitializeComponent()
this.bWrite.Enabled = false;
this.bWrite.Location = new System.Drawing.Point(9, 48);
this.bWrite.Name = "bWrite";
- this.bWrite.Size = new System.Drawing.Size(133, 23);
+ this.bWrite.Size = new System.Drawing.Size(242, 59);
this.bWrite.TabIndex = 0;
this.bWrite.Text = "Write Firmware && Jump";
this.ttToolTip.SetToolTip(this.bWrite, "Uploads the firmware and jumps to it.");
@@ -193,8 +180,21 @@ private void InitializeComponent()
this.pbProgress.Size = new System.Drawing.Size(242, 23);
this.pbProgress.TabIndex = 0;
//
+ // bJump
+ //
+ this.bJump.Enabled = false;
+ this.bJump.Location = new System.Drawing.Point(221, 53);
+ this.bJump.Name = "bJump";
+ this.bJump.Size = new System.Drawing.Size(57, 21);
+ this.bJump.TabIndex = 3;
+ this.bJump.Text = "Jump";
+ this.ttToolTip.SetToolTip(this.bJump, "Uploads the firmware and jumps to it.");
+ this.bJump.UseVisualStyleBackColor = true;
+ this.bJump.Click += new System.EventHandler(this.bJump_Click);
+ //
// groupBox4
//
+ this.groupBox4.Controls.Add(this.bJump);
this.groupBox4.Controls.Add(this.cbPSize);
this.groupBox4.Controls.Add(this.label5);
this.groupBox4.Controls.Add(this.cbxErase);
@@ -234,6 +234,8 @@ private void InitializeComponent()
// cbxErase
//
this.cbxErase.AutoSize = true;
+ this.cbxErase.Checked = true;
+ this.cbxErase.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbxErase.Location = new System.Drawing.Point(194, 22);
this.cbxErase.Name = "cbxErase";
this.cbxErase.Size = new System.Drawing.Size(86, 17);
@@ -250,6 +252,7 @@ private void InitializeComponent()
this.tbAddress.Size = new System.Drawing.Size(112, 20);
this.tbAddress.TabIndex = 0;
this.tbAddress.Text = "0x08000000";
+ this.tbAddress.TextChanged += new System.EventHandler(this.tbAddress_TextChanged);
this.tbAddress.Leave += new System.EventHandler(this.tbAddress_Leave);
//
// label4
@@ -309,7 +312,7 @@ private void InitializeComponent()
this.AcceptButton = this.bWrite;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(315, 332);
+ this.ClientSize = new System.Drawing.Size(315, 408);
this.Controls.Add(this.groupBox4);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.statusStrip1);
diff --git a/STM32 Flash Loader/MainForm.cs b/STM32 Flash Loader/MainForm.cs
index 8539872..d487025 100644
--- a/STM32 Flash Loader/MainForm.cs
+++ b/STM32 Flash Loader/MainForm.cs
@@ -296,6 +296,9 @@ private void cbPSize_SelectedIndexChanged(object sender, EventArgs e)
}
+ private void tbAddress_TextChanged(object sender, EventArgs e)
+ {
+ }
}
}
diff --git a/STM32 Flash Loader/Properties/Resources.Designer.cs b/STM32 Flash Loader/Properties/Resources.Designer.cs
index f3af9cf..366729a 100644
--- a/STM32 Flash Loader/Properties/Resources.Designer.cs
+++ b/STM32 Flash Loader/Properties/Resources.Designer.cs
@@ -1,17 +1,17 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.34209
+// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
//
//------------------------------------------------------------------------------
-namespace STM32_Flash_Loader.Properties
-{
-
-
+namespace STM32_Flash_Loader.Properties {
+ using System;
+
+
///
/// A strongly-typed resource class, for looking up localized strings, etc.
///
@@ -19,50 +19,43 @@ namespace STM32_Flash_Loader.Properties
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- internal class Resources
- {
-
+ internal class Resources {
+
private static global::System.Resources.ResourceManager resourceMan;
-
+
private static global::System.Globalization.CultureInfo resourceCulture;
-
+
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- internal Resources()
- {
+ internal Resources() {
}
-
+
///
/// Returns the cached ResourceManager instance used by this class.
///
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Resources.ResourceManager ResourceManager
- {
- get
- {
- if ((resourceMan == null)) {
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("STM32_Flash_Loader.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
-
+
///
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
///
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Globalization.CultureInfo Culture
- {
- get
- {
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
return resourceCulture;
}
- set
- {
+ set {
resourceCulture = value;
}
}
diff --git a/STM32 Flash Loader/Properties/Settings.Designer.cs b/STM32 Flash Loader/Properties/Settings.Designer.cs
index b89fc34..a18821d 100644
--- a/STM32 Flash Loader/Properties/Settings.Designer.cs
+++ b/STM32 Flash Loader/Properties/Settings.Designer.cs
@@ -1,28 +1,24 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.34209
+// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
//
//------------------------------------------------------------------------------
-namespace STM32_Flash_Loader.Properties
-{
-
-
+namespace STM32_Flash_Loader.Properties {
+
+
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
- internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
- {
-
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0")]
+ internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
- public static Settings Default
- {
- get
- {
+
+ public static Settings Default {
+ get {
return defaultInstance;
}
}
diff --git a/STM32 Flash Loader/STM32 Flash Loader.csproj b/STM32 Flash Loader/STM32 Flash Loader.csproj
index 3e040dd..d5151b2 100644
--- a/STM32 Flash Loader/STM32 Flash Loader.csproj
+++ b/STM32 Flash Loader/STM32 Flash Loader.csproj
@@ -9,8 +9,24 @@
Properties
STM32_Flash_Loader
STM32 Flash Loader
- v4.5
+ v4.8
512
+
+ publish\
+ true
+ Disk
+ false
+ Foreground
+ 7
+ Days
+ false
+ false
+ true
+ 0
+ 1.0.0.%2a
+ false
+ false
+ true
AnyCPU
@@ -66,6 +82,7 @@
True
Resources.resx
+ True
SettingsSingleFileGenerator
@@ -89,6 +106,18 @@
STBootLib
+
+
+ False
+ Microsoft .NET Framework 4.8 %28x86 and x64%29
+ true
+
+
+ False
+ .NET Framework 3.5 SP1
+ false
+
+