From dfddaf6583f8d54c96701e2c52d9224ed9e8a9b0 Mon Sep 17 00:00:00 2001 From: Josh Davidson Date: Tue, 28 Dec 2021 18:31:49 -0500 Subject: [PATCH] Nand: Fix CPU key text box not updating under all foundKey situations --- J-Runner/MainForm.Designer.cs | 30 ++++++++++++++---------------- J-Runner/MainForm.cs | 3 ++- J-Runner/MainForm.resx | 2 +- J-Runner/Resources/Build.txt | 2 +- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/J-Runner/MainForm.Designer.cs b/J-Runner/MainForm.Designer.cs index ad6b235..126a243 100644 --- a/J-Runner/MainForm.Designer.cs +++ b/J-Runner/MainForm.Designer.cs @@ -241,8 +241,6 @@ private void InitializeComponent() this.txtConsole.Size = new System.Drawing.Size(462, 253); this.txtConsole.TabIndex = 11; this.txtConsole.TabStop = false; - this.toolTip1.SetToolTip(this.txtConsole, "The log window: This displays everything that is going on in JRunner!\r\nDouble cli" + - "ck to save the log file to text file."); this.txtConsole.DoubleClick += new System.EventHandler(this.txtConsole_DoubleClick); // // txtCPUKey @@ -779,33 +777,33 @@ private void InitializeComponent() // powerOnToolStripMenuItem // this.powerOnToolStripMenuItem.Name = "powerOnToolStripMenuItem"; - this.powerOnToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.powerOnToolStripMenuItem.Size = new System.Drawing.Size(166, 22); this.powerOnToolStripMenuItem.Text = "Power On"; this.powerOnToolStripMenuItem.Click += new System.EventHandler(this.powerOnToolStripMenuItem_Click); // // shutdownToolStripMenuItem // this.shutdownToolStripMenuItem.Name = "shutdownToolStripMenuItem"; - this.shutdownToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.shutdownToolStripMenuItem.Size = new System.Drawing.Size(166, 22); this.shutdownToolStripMenuItem.Text = "Shut Down"; this.shutdownToolStripMenuItem.Click += new System.EventHandler(this.shutdownToolStripMenuItem_Click); // // bootloaderModeToolStripMenuItem // this.bootloaderModeToolStripMenuItem.Name = "bootloaderModeToolStripMenuItem"; - this.bootloaderModeToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.bootloaderModeToolStripMenuItem.Size = new System.Drawing.Size(166, 22); this.bootloaderModeToolStripMenuItem.Text = "Bootloader Mode"; this.bootloaderModeToolStripMenuItem.Click += new System.EventHandler(this.bootloaderModeToolStripMenuItem_Click); // // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(177, 6); + this.toolStripMenuItem2.Size = new System.Drawing.Size(163, 6); // // logPostToolStripMenuItem // this.logPostToolStripMenuItem.Name = "logPostToolStripMenuItem"; - this.logPostToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.logPostToolStripMenuItem.Size = new System.Drawing.Size(166, 22); this.logPostToolStripMenuItem.Text = "Monitor POST"; this.logPostToolStripMenuItem.Click += new System.EventHandler(this.logPostToolStripMenuItem_Click); // @@ -828,52 +826,52 @@ private void InitializeComponent() // powerOnToolStripMenuItem1 // this.powerOnToolStripMenuItem1.Name = "powerOnToolStripMenuItem1"; - this.powerOnToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); + this.powerOnToolStripMenuItem1.Size = new System.Drawing.Size(169, 22); this.powerOnToolStripMenuItem1.Text = "Power On"; this.powerOnToolStripMenuItem1.Click += new System.EventHandler(this.powerOnToolStripMenuItem1_Click); // // powerOffToolStripMenuItem // this.powerOffToolStripMenuItem.Name = "powerOffToolStripMenuItem"; - this.powerOffToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.powerOffToolStripMenuItem.Size = new System.Drawing.Size(169, 22); this.powerOffToolStripMenuItem.Text = "Shut Down"; this.powerOffToolStripMenuItem.Click += new System.EventHandler(this.powerOffToolStripMenuItem_Click); // // toggleNANDToolStripMenuItem // this.toggleNANDToolStripMenuItem.Name = "toggleNANDToolStripMenuItem"; - this.toggleNANDToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.toggleNANDToolStripMenuItem.Size = new System.Drawing.Size(169, 22); this.toggleNANDToolStripMenuItem.Text = "Toggle NAND"; this.toggleNANDToolStripMenuItem.Click += new System.EventHandler(this.toggleNANDToolStripMenuItem_Click); // // toolStripMenuItem7 // this.toolStripMenuItem7.Name = "toolStripMenuItem7"; - this.toolStripMenuItem7.Size = new System.Drawing.Size(177, 6); + this.toolStripMenuItem7.Size = new System.Drawing.Size(166, 6); // // connectToUARTToolStripMenuItem // this.connectToUARTToolStripMenuItem.Name = "connectToUARTToolStripMenuItem"; - this.connectToUARTToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.connectToUARTToolStripMenuItem.Size = new System.Drawing.Size(169, 22); this.connectToUARTToolStripMenuItem.Text = "Connect To UART"; this.connectToUARTToolStripMenuItem.Click += new System.EventHandler(this.connectToUARTToolStripMenuItem_Click); // // getInvalidBlocksToolStripMenuItem // this.getInvalidBlocksToolStripMenuItem.Name = "getInvalidBlocksToolStripMenuItem"; - this.getInvalidBlocksToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.getInvalidBlocksToolStripMenuItem.Size = new System.Drawing.Size(169, 22); this.getInvalidBlocksToolStripMenuItem.Text = "Get Invalid Blocks"; this.getInvalidBlocksToolStripMenuItem.Click += new System.EventHandler(this.getInvalidBlocksToolStripMenuItem_Click); // // toolStripMenuItem6 // this.toolStripMenuItem6.Name = "toolStripMenuItem6"; - this.toolStripMenuItem6.Size = new System.Drawing.Size(177, 6); + this.toolStripMenuItem6.Size = new System.Drawing.Size(166, 6); // // updateFwToolStripMenuItem // this.updateFwToolStripMenuItem.Name = "updateFwToolStripMenuItem"; - this.updateFwToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.updateFwToolStripMenuItem.Size = new System.Drawing.Size(169, 22); this.updateFwToolStripMenuItem.Text = "Update DemoN…"; this.updateFwToolStripMenuItem.Click += new System.EventHandler(this.updateFwToolStripMenuItem_Click); // @@ -1086,7 +1084,7 @@ private void InitializeComponent() // mtxUsbModeToolStripMenuItem // this.mtxUsbModeToolStripMenuItem.Name = "mtxUsbModeToolStripMenuItem"; - this.mtxUsbModeToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.mtxUsbModeToolStripMenuItem.Size = new System.Drawing.Size(157, 22); this.mtxUsbModeToolStripMenuItem.Text = "MTX USB Mode"; this.mtxUsbModeToolStripMenuItem.Click += new System.EventHandler(this.mtxUsbModeToolStripMenuItem_Click); // diff --git a/J-Runner/MainForm.cs b/J-Runner/MainForm.cs index 68af7fa..27e8503 100644 --- a/J-Runner/MainForm.cs +++ b/J-Runner/MainForm.cs @@ -371,7 +371,7 @@ private void printstartuptext(bool firsttime = false) { Console.WriteLine("========================================================================="); Console.WriteLine("J-Runner with Extras"); - Console.WriteLine("Session: {0:F}", DateTime.Now.ToString("ddd MM/dd/yyyy H:mm:ss")); + Console.WriteLine("Session: {0:F}", DateTime.Now.ToString("MM/dd/yyyy H:mm:ss")); if (variables.version.Contains("Beta")) Console.WriteLine("Version: {0}", variables.build); else Console.WriteLine("Version: {0}", variables.version); if (Upd.checkSuccess) @@ -1997,6 +1997,7 @@ void nandinit() } catch (NullReferenceException ex) { Console.WriteLine(ex.ToString()); } } + else txtCPUKey.Text = variables.cpkey; Console.WriteLine("Initializing {0}, please wait...", Path.GetFileName(variables.filename1)); nandInfo.change_tab(); diff --git a/J-Runner/MainForm.resx b/J-Runner/MainForm.resx index d013640..08a4edf 100644 --- a/J-Runner/MainForm.resx +++ b/J-Runner/MainForm.resx @@ -139,7 +139,7 @@ VjQ14ihxWNV0yhcyHquctzhr5Spr9slfGMzpKymu0xpFDEuIIwERCqoooQwbEdp1Uiwk6Vzq4B9x/Qly KeQqgZFjARVokF0/+B/8nq2Vn57ykoIS0P3iOB9jQGAXaNQc5/vYcRongP8ZuNJb/kodmP0kvdbSwkfA wDZwcd3SlD3gcgcYejJkU3YlPy0hnwfez+ibssDgLdC35s2teY7TByBNs1q+AQ4OgfECZa93eHdv+9z+ - vOPOD9IPfFFyq7y0usQAAAAJcEhZcwAACxAAAAsQAa0jvXUAAAAHdElNRQflDAYBGhzPKF7vAAAA1klE + vOPOD9IPfFFyq7y0usQAAAAJcEhZcwAACw8AAAsPAZL5A6UAAAAHdElNRQflDAYBGhzPKF7vAAAA1klE QVQ4T3WSIQ4CQRAET/MJXoBC43gLno8gSDBIgsSiMASDwBEUik+goWthL7t9s51UcpntnruZ2y7QRKzF Q3z+8EyNs6ZGYiNyqAUevJUoXEQUiMBbNfE3X8XCOInSQyaJucoDeIqtcRfuSzthOX5wFFNjL9xHttp2 5iaWxlm4j+ygCMw7Nw4i8obFnXCtROStRniLmWhpLF4i+9MIvsRWEw9DWmL0G71JFIb+akdXODdphfuL diff --git a/J-Runner/Resources/Build.txt b/J-Runner/Resources/Build.txt index e297b28..072ad22 100644 --- a/J-Runner/Resources/Build.txt +++ b/J-Runner/Resources/Build.txt @@ -1 +1 @@ -12-28-2021 22:35:49 +12-28-2021 23:27:44