V1.1.3 - Massive Fixes for J2534 commands
This commit is contained in:
parent
33edbb3138
commit
a7c466e7d8
|
@ -679,7 +679,29 @@ public class Class_DefinitionMaker
|
||||||
public ushort processorRevision;
|
public ushort processorRevision;
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool Extract()
|
private int AllBytesContains(byte[] AllBytesCheck, byte[] CheckArray)
|
||||||
|
{
|
||||||
|
for (int i = 0; i < AllBytesCheck.Length; i++)
|
||||||
|
{
|
||||||
|
int Index2 = 0;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
while (AllBytesCheck[i + Index2] == CheckArray[Index2])
|
||||||
|
{
|
||||||
|
Index2++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
if (Index2 >= CheckArray.Length) return i;
|
||||||
|
}
|
||||||
|
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool Extract(string ExtractMode)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -737,27 +759,42 @@ public class Class_DefinitionMaker
|
||||||
proc_min_address_l = (long)proc_min_address;
|
proc_min_address_l = (long)proc_min_address;
|
||||||
proc_max_address_l = (long)proc_max_address;
|
proc_max_address_l = (long)proc_max_address;
|
||||||
|
|
||||||
ExtractMemoryBlock();
|
ExtractMemoryBlock(ExtractMode);
|
||||||
//ReloadDump = ReloadDumpFile();
|
//ReloadDump = ReloadDumpFile();
|
||||||
ReloadDump = File.ReadAllText(ThisEndPath + "DumpHex" + ExtractedBlockDone);
|
//ReloadDump = File.ReadAllText(ThisEndPath + "DumpHex" + ExtractedBlockDone);
|
||||||
|
|
||||||
//5B446566696E6974696F6E5D ->[Definition]
|
//5B446566696E6974696F6E5D ->[Definition]
|
||||||
if (ReloadDump.Contains("[Definition]"))
|
if (ExtractMode == "Definition")
|
||||||
{
|
{
|
||||||
//GForm_Main_0.method_1("Found Definition in DumpHex" + ExtractedBlockDone);
|
ReloadDump = File.ReadAllText(ThisEndPath + "DumpHex" + ExtractedBlockDone);
|
||||||
Console.WriteLine("Found Definition in DumpHex" + ExtractedBlockDone);
|
if (ReloadDump.Contains("[Definition]"))
|
||||||
|
{
|
||||||
|
//GForm_Main_0.method_1("Found Definition in DumpHex" + ExtractedBlockDone);
|
||||||
|
Console.WriteLine("Found Definition in DumpHex" + ExtractedBlockDone);
|
||||||
|
|
||||||
CurrentExtractedDumps++;
|
CurrentExtractedDumps++;
|
||||||
string DumpedDefinition = ReloadDump.Substring(ReloadDump.IndexOf("[Definition]"));
|
string DumpedDefinition = ReloadDump.Substring(ReloadDump.IndexOf("[Definition]"));
|
||||||
DumpedDefinition = DumpedDefinition.Substring(0, DumpedDefinition.LastIndexOf("ConditionalEnableValue=") + 24);
|
DumpedDefinition = DumpedDefinition.Substring(0, DumpedDefinition.LastIndexOf("ConditionalEnableValue=") + 24);
|
||||||
|
|
||||||
DumpedDefinition = DumpedDefinition.Replace("..", "\n");
|
DumpedDefinition = DumpedDefinition.Replace("..", "\n");
|
||||||
|
|
||||||
|
|
||||||
string SaveDefPath = ThisEndPath + "ExtractedDefinition" + (CurrentExtractedDumps-1).ToString() + ".txt";
|
string SaveDefPath = ThisEndPath + "ExtractedDefinition" + (CurrentExtractedDumps - 1).ToString() + ".txt";
|
||||||
GForm_Main_0.method_1("Extracted Definitions file created: " + SaveDefPath);
|
GForm_Main_0.method_1("Extracted Definitions file created: " + SaveDefPath);
|
||||||
File.Create(SaveDefPath).Dispose();
|
File.Create(SaveDefPath).Dispose();
|
||||||
File.WriteAllText(SaveDefPath, DumpedDefinition);
|
File.WriteAllText(SaveDefPath, DumpedDefinition);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (ExtractMode == "Bin")
|
||||||
|
{
|
||||||
|
byte[] AllBytesArray = File.ReadAllBytes(ThisEndPath + "DumpHex" + ExtractedBlockDone);
|
||||||
|
byte[] CheckBytes = new byte[] { 0xD0, 0x02, 0x40, 0x0B, 0x00, 0x09, 0xAF, 0xFE, 0x00, 0x09, 0x00, 0x00, 0x00 };
|
||||||
|
//D0 02 40 0B 00 09 AF FE 00 09 00 00 00
|
||||||
|
|
||||||
|
if (AllBytesContains(AllBytesArray, CheckBytes) != -1)
|
||||||
|
{
|
||||||
|
Console.WriteLine("Found Bin in DumpHex" + ExtractedBlockDone);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -765,17 +802,17 @@ public class Class_DefinitionMaker
|
||||||
ExtractedBlockDone++;
|
ExtractedBlockDone++;
|
||||||
}
|
}
|
||||||
|
|
||||||
RemovePastDump();
|
//RemovePastDump();
|
||||||
GForm_Main_0.ResetProgressBar();
|
GForm_Main_0.ResetProgressBar();
|
||||||
|
|
||||||
if (CurrentExtractedDumps == 1)
|
if (CurrentExtractedDumps == 1)
|
||||||
{
|
{
|
||||||
GForm_Main_0.method_1("No definitions found loaded in memory\nTry saving your calibration in FlashProManager with small changes and retry this feature");
|
GForm_Main_0.method_1("No " + ExtractMode + " found loaded in memory" + Environment.NewLine + "Try saving your calibration in FlashProManager with small changes and retry this feature");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
GForm_Main_0.method_1((CurrentExtractedDumps - 1) + " definitions found!");
|
GForm_Main_0.method_1((CurrentExtractedDumps - 1) + " " + ExtractMode + " found!");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -783,7 +820,7 @@ public class Class_DefinitionMaker
|
||||||
catch (Exception message)
|
catch (Exception message)
|
||||||
{
|
{
|
||||||
GForm_Main_0.ResetProgressBar();
|
GForm_Main_0.ResetProgressBar();
|
||||||
GForm_Main_0.method_1("Cannot extract! Error:\n" + message);
|
GForm_Main_0.method_1("Cannot extract! Error:" + Environment.NewLine + message);
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -813,7 +850,7 @@ public class Class_DefinitionMaker
|
||||||
return ReloadDump;
|
return ReloadDump;
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
void ExtractMemoryBlock()
|
void ExtractMemoryBlock(string ExtractMode)
|
||||||
{
|
{
|
||||||
int bytesRead = 0;
|
int bytesRead = 0;
|
||||||
IntPtr processHandle = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_WM_READ, false, process.Id);
|
IntPtr processHandle = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_WM_READ, false, process.Id);
|
||||||
|
@ -833,8 +870,8 @@ public class Class_DefinitionMaker
|
||||||
|
|
||||||
for (int i = 0; i < mem_basic_info.RegionSize; i++)
|
for (int i = 0; i < mem_basic_info.RegionSize; i++)
|
||||||
{
|
{
|
||||||
//sw.WriteLine(buffer[i].ToString("X2"));
|
if (ExtractMode == "Bin") sw2.Write(buffer[i].ToString("X2") + " ");
|
||||||
sw2.Write((char)buffer[i]);
|
else sw2.Write((char)buffer[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -844,6 +881,22 @@ public class Class_DefinitionMaker
|
||||||
|
|
||||||
//sw.Close();
|
//sw.Close();
|
||||||
sw2.Close();
|
sw2.Close();
|
||||||
|
|
||||||
|
if (ExtractMode == "Bin")
|
||||||
|
{
|
||||||
|
byte[] AllBytesChar = File.ReadAllBytes(ThisEndPath + "DumpHex" + ExtractedBlockDone);
|
||||||
|
byte[] AllReturnBytes = new byte[AllBytesChar.Length / 3];
|
||||||
|
for (int i = 0; i < AllReturnBytes.Length; i++)
|
||||||
|
{
|
||||||
|
char char1 = (char) AllBytesChar[(i * 3)];
|
||||||
|
char char2 = (char) AllBytesChar[(i * 3) + 1];
|
||||||
|
string ByteHex = char1.ToString() + char2.ToString();
|
||||||
|
|
||||||
|
AllReturnBytes[i] = (byte) int.Parse(ByteHex, System.Globalization.NumberStyles.HexNumber);
|
||||||
|
}
|
||||||
|
|
||||||
|
File.WriteAllBytes(ThisEndPath + "DumpHex" + ExtractedBlockDone, AllReturnBytes);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//##########################################################################################################################
|
//##########################################################################################################################
|
||||||
|
|
129
Editortable.cs
129
Editortable.cs
|
@ -54,6 +54,11 @@ public class Editortable : DarkForm
|
||||||
private ToolStripMenuItem removeBootloaderInbinToolStripMenuItem;
|
private ToolStripMenuItem removeBootloaderInbinToolStripMenuItem;
|
||||||
private ToolStripSeparator toolStripSeparator3;
|
private ToolStripSeparator toolStripSeparator3;
|
||||||
private ToolStripMenuItem generateDefinitionFileFromExtractedDefinitionToolStripMenuItem;
|
private ToolStripMenuItem generateDefinitionFileFromExtractedDefinitionToolStripMenuItem;
|
||||||
|
private ToolStripSeparator toolStripSeparator4;
|
||||||
|
private ToolStripMenuItem extractbinFileFromFPMToolStripMenuItem;
|
||||||
|
private ToolStripMenuItem convertrwdTobinToolStripMenuItem;
|
||||||
|
private ToolStripMenuItem convertbinTorwdToolStripMenuItem;
|
||||||
|
private ToolStripMenuItem openOBD2ScanToolToolStripMenuItem;
|
||||||
private ToolStripMenuItem decreaseSelectionToolStripMenuItem;
|
private ToolStripMenuItem decreaseSelectionToolStripMenuItem;
|
||||||
|
|
||||||
internal Editortable(ref GForm_Main GForm_Main_1)
|
internal Editortable(ref GForm_Main GForm_Main_1)
|
||||||
|
@ -128,18 +133,23 @@ public class Editortable : DarkForm
|
||||||
this.increaseSelectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.increaseSelectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.decreaseSelectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.decreaseSelectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.toolStripDropDownButton3 = new System.Windows.Forms.ToolStripDropDownButton();
|
this.toolStripDropDownButton3 = new System.Windows.Forms.ToolStripDropDownButton();
|
||||||
|
this.removeBootloaderInbinToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
|
||||||
this.developpersToolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.developpersToolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.generateDefinitionsFilesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.generateDefinitionsFilesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.getDifferencesInAllFirmwaresFilesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.getDifferencesInAllFirmwaresFilesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.extractAllBootloadersumByteFromAllFirmwaresFilesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.extractAllBootloadersumByteFromAllFirmwaresFilesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
|
||||||
this.extractDefinitionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.extractDefinitionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
this.extractbinFileFromFPMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
this.generateDefinitionFileFromExtractedDefinitionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||||
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
||||||
this.darkTextBox_0 = new DarkUI.Controls.DarkTextBox();
|
this.darkTextBox_0 = new DarkUI.Controls.DarkTextBox();
|
||||||
this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
|
this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
|
||||||
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
|
this.convertrwdTobinToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.removeBootloaderInbinToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.convertbinTorwdToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.generateDefinitionFileFromExtractedDefinitionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.openOBD2ScanToolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.groupBox1.SuspendLayout();
|
this.groupBox1.SuspendLayout();
|
||||||
((System.ComponentModel.ISupportInitialize)(this.dataGridView_0)).BeginInit();
|
((System.ComponentModel.ISupportInitialize)(this.dataGridView_0)).BeginInit();
|
||||||
this.darkToolStrip1.SuspendLayout();
|
this.darkToolStrip1.SuspendLayout();
|
||||||
|
@ -389,6 +399,9 @@ public class Editortable : DarkForm
|
||||||
this.toolStripDropDownButton3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(63)))), ((int)(((byte)(65)))));
|
this.toolStripDropDownButton3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(63)))), ((int)(((byte)(65)))));
|
||||||
this.toolStripDropDownButton3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
|
this.toolStripDropDownButton3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
|
||||||
this.toolStripDropDownButton3.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
this.toolStripDropDownButton3.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||||
|
this.openOBD2ScanToolToolStripMenuItem,
|
||||||
|
this.convertrwdTobinToolStripMenuItem,
|
||||||
|
this.convertbinTorwdToolStripMenuItem,
|
||||||
this.removeBootloaderInbinToolStripMenuItem,
|
this.removeBootloaderInbinToolStripMenuItem,
|
||||||
this.toolStripSeparator3,
|
this.toolStripSeparator3,
|
||||||
this.developpersToolsToolStripMenuItem});
|
this.developpersToolsToolStripMenuItem});
|
||||||
|
@ -399,6 +412,23 @@ public class Editortable : DarkForm
|
||||||
this.toolStripDropDownButton3.Size = new System.Drawing.Size(47, 25);
|
this.toolStripDropDownButton3.Size = new System.Drawing.Size(47, 25);
|
||||||
this.toolStripDropDownButton3.Text = "Tools";
|
this.toolStripDropDownButton3.Text = "Tools";
|
||||||
//
|
//
|
||||||
|
// removeBootloaderInbinToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.removeBootloaderInbinToolStripMenuItem.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(63)))), ((int)(((byte)(65)))));
|
||||||
|
this.removeBootloaderInbinToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
|
||||||
|
this.removeBootloaderInbinToolStripMenuItem.Name = "removeBootloaderInbinToolStripMenuItem";
|
||||||
|
this.removeBootloaderInbinToolStripMenuItem.Size = new System.Drawing.Size(214, 22);
|
||||||
|
this.removeBootloaderInbinToolStripMenuItem.Text = "Remove Bootloader in .bin";
|
||||||
|
this.removeBootloaderInbinToolStripMenuItem.Click += new System.EventHandler(this.removeBootloaderInbinToolStripMenuItem_Click);
|
||||||
|
//
|
||||||
|
// toolStripSeparator3
|
||||||
|
//
|
||||||
|
this.toolStripSeparator3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(63)))), ((int)(((byte)(65)))));
|
||||||
|
this.toolStripSeparator3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
|
||||||
|
this.toolStripSeparator3.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1);
|
||||||
|
this.toolStripSeparator3.Name = "toolStripSeparator3";
|
||||||
|
this.toolStripSeparator3.Size = new System.Drawing.Size(211, 6);
|
||||||
|
//
|
||||||
// developpersToolsToolStripMenuItem
|
// developpersToolsToolStripMenuItem
|
||||||
//
|
//
|
||||||
this.developpersToolsToolStripMenuItem.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(63)))), ((int)(((byte)(65)))));
|
this.developpersToolsToolStripMenuItem.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(63)))), ((int)(((byte)(65)))));
|
||||||
|
@ -406,7 +436,9 @@ public class Editortable : DarkForm
|
||||||
this.generateDefinitionsFilesToolStripMenuItem,
|
this.generateDefinitionsFilesToolStripMenuItem,
|
||||||
this.getDifferencesInAllFirmwaresFilesToolStripMenuItem,
|
this.getDifferencesInAllFirmwaresFilesToolStripMenuItem,
|
||||||
this.extractAllBootloadersumByteFromAllFirmwaresFilesToolStripMenuItem,
|
this.extractAllBootloadersumByteFromAllFirmwaresFilesToolStripMenuItem,
|
||||||
|
this.toolStripSeparator4,
|
||||||
this.extractDefinitionToolStripMenuItem,
|
this.extractDefinitionToolStripMenuItem,
|
||||||
|
this.extractbinFileFromFPMToolStripMenuItem,
|
||||||
this.generateDefinitionFileFromExtractedDefinitionToolStripMenuItem});
|
this.generateDefinitionFileFromExtractedDefinitionToolStripMenuItem});
|
||||||
this.developpersToolsToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
|
this.developpersToolsToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
|
||||||
this.developpersToolsToolStripMenuItem.Name = "developpersToolsToolStripMenuItem";
|
this.developpersToolsToolStripMenuItem.Name = "developpersToolsToolStripMenuItem";
|
||||||
|
@ -440,15 +472,41 @@ public class Editortable : DarkForm
|
||||||
this.extractAllBootloadersumByteFromAllFirmwaresFilesToolStripMenuItem.Text = "Extract all bootloader \'sum\' byte from all firmwares files";
|
this.extractAllBootloadersumByteFromAllFirmwaresFilesToolStripMenuItem.Text = "Extract all bootloader \'sum\' byte from all firmwares files";
|
||||||
this.extractAllBootloadersumByteFromAllFirmwaresFilesToolStripMenuItem.Click += new System.EventHandler(this.extractAllBootloadersumByteFromAllFirmwaresFilesToolStripMenuItem_Click);
|
this.extractAllBootloadersumByteFromAllFirmwaresFilesToolStripMenuItem.Click += new System.EventHandler(this.extractAllBootloadersumByteFromAllFirmwaresFilesToolStripMenuItem_Click);
|
||||||
//
|
//
|
||||||
|
// toolStripSeparator4
|
||||||
|
//
|
||||||
|
this.toolStripSeparator4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(63)))), ((int)(((byte)(65)))));
|
||||||
|
this.toolStripSeparator4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
|
||||||
|
this.toolStripSeparator4.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1);
|
||||||
|
this.toolStripSeparator4.Name = "toolStripSeparator4";
|
||||||
|
this.toolStripSeparator4.Size = new System.Drawing.Size(364, 6);
|
||||||
|
//
|
||||||
// extractDefinitionToolStripMenuItem
|
// extractDefinitionToolStripMenuItem
|
||||||
//
|
//
|
||||||
this.extractDefinitionToolStripMenuItem.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(63)))), ((int)(((byte)(65)))));
|
this.extractDefinitionToolStripMenuItem.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(63)))), ((int)(((byte)(65)))));
|
||||||
this.extractDefinitionToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
|
this.extractDefinitionToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
|
||||||
this.extractDefinitionToolStripMenuItem.Name = "extractDefinitionToolStripMenuItem";
|
this.extractDefinitionToolStripMenuItem.Name = "extractDefinitionToolStripMenuItem";
|
||||||
this.extractDefinitionToolStripMenuItem.Size = new System.Drawing.Size(367, 22);
|
this.extractDefinitionToolStripMenuItem.Size = new System.Drawing.Size(367, 22);
|
||||||
this.extractDefinitionToolStripMenuItem.Text = "Extract Definition file";
|
this.extractDefinitionToolStripMenuItem.Text = "Extract Definition file from FPM";
|
||||||
this.extractDefinitionToolStripMenuItem.Click += new System.EventHandler(this.extractDefinitionToolStripMenuItem_Click);
|
this.extractDefinitionToolStripMenuItem.Click += new System.EventHandler(this.extractDefinitionToolStripMenuItem_Click);
|
||||||
//
|
//
|
||||||
|
// extractbinFileFromFPMToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.extractbinFileFromFPMToolStripMenuItem.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(63)))), ((int)(((byte)(65)))));
|
||||||
|
this.extractbinFileFromFPMToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
|
||||||
|
this.extractbinFileFromFPMToolStripMenuItem.Name = "extractbinFileFromFPMToolStripMenuItem";
|
||||||
|
this.extractbinFileFromFPMToolStripMenuItem.Size = new System.Drawing.Size(367, 22);
|
||||||
|
this.extractbinFileFromFPMToolStripMenuItem.Text = "Extract .bin file from FPM";
|
||||||
|
this.extractbinFileFromFPMToolStripMenuItem.Click += new System.EventHandler(this.extractbinFileFromFPMToolStripMenuItem_Click);
|
||||||
|
//
|
||||||
|
// generateDefinitionFileFromExtractedDefinitionToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.generateDefinitionFileFromExtractedDefinitionToolStripMenuItem.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(63)))), ((int)(((byte)(65)))));
|
||||||
|
this.generateDefinitionFileFromExtractedDefinitionToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
|
||||||
|
this.generateDefinitionFileFromExtractedDefinitionToolStripMenuItem.Name = "generateDefinitionFileFromExtractedDefinitionToolStripMenuItem";
|
||||||
|
this.generateDefinitionFileFromExtractedDefinitionToolStripMenuItem.Size = new System.Drawing.Size(367, 22);
|
||||||
|
this.generateDefinitionFileFromExtractedDefinitionToolStripMenuItem.Text = "Generate Definition file from Extracted Definition";
|
||||||
|
this.generateDefinitionFileFromExtractedDefinitionToolStripMenuItem.Click += new System.EventHandler(this.generateDefinitionFileFromExtractedDefinitionToolStripMenuItem_Click);
|
||||||
|
//
|
||||||
// splitContainer1
|
// splitContainer1
|
||||||
//
|
//
|
||||||
this.splitContainer1.BackColor = System.Drawing.SystemColors.ControlDark;
|
this.splitContainer1.BackColor = System.Drawing.SystemColors.ControlDark;
|
||||||
|
@ -495,31 +553,32 @@ public class Editortable : DarkForm
|
||||||
this.darkTextBox_0.TabIndex = 56;
|
this.darkTextBox_0.TabIndex = 56;
|
||||||
this.darkTextBox_0.Text = "Honda CANBUS Tools";
|
this.darkTextBox_0.Text = "Honda CANBUS Tools";
|
||||||
//
|
//
|
||||||
// toolStripSeparator3
|
// convertrwdTobinToolStripMenuItem
|
||||||
//
|
//
|
||||||
this.toolStripSeparator3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(63)))), ((int)(((byte)(65)))));
|
this.convertrwdTobinToolStripMenuItem.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(63)))), ((int)(((byte)(65)))));
|
||||||
this.toolStripSeparator3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
|
this.convertrwdTobinToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
|
||||||
this.toolStripSeparator3.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1);
|
this.convertrwdTobinToolStripMenuItem.Name = "convertrwdTobinToolStripMenuItem";
|
||||||
this.toolStripSeparator3.Name = "toolStripSeparator3";
|
this.convertrwdTobinToolStripMenuItem.Size = new System.Drawing.Size(214, 22);
|
||||||
this.toolStripSeparator3.Size = new System.Drawing.Size(211, 6);
|
this.convertrwdTobinToolStripMenuItem.Text = "Convert .rwd to .bin";
|
||||||
|
this.convertrwdTobinToolStripMenuItem.Click += new System.EventHandler(this.convertrwdTobinToolStripMenuItem_Click);
|
||||||
//
|
//
|
||||||
// removeBootloaderInbinToolStripMenuItem
|
// convertbinTorwdToolStripMenuItem
|
||||||
//
|
//
|
||||||
this.removeBootloaderInbinToolStripMenuItem.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(63)))), ((int)(((byte)(65)))));
|
this.convertbinTorwdToolStripMenuItem.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(63)))), ((int)(((byte)(65)))));
|
||||||
this.removeBootloaderInbinToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
|
this.convertbinTorwdToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
|
||||||
this.removeBootloaderInbinToolStripMenuItem.Name = "removeBootloaderInbinToolStripMenuItem";
|
this.convertbinTorwdToolStripMenuItem.Name = "convertbinTorwdToolStripMenuItem";
|
||||||
this.removeBootloaderInbinToolStripMenuItem.Size = new System.Drawing.Size(214, 22);
|
this.convertbinTorwdToolStripMenuItem.Size = new System.Drawing.Size(214, 22);
|
||||||
this.removeBootloaderInbinToolStripMenuItem.Text = "Remove Bootloader in .bin";
|
this.convertbinTorwdToolStripMenuItem.Text = "Convert .bin to .rwd";
|
||||||
this.removeBootloaderInbinToolStripMenuItem.Click += new System.EventHandler(this.removeBootloaderInbinToolStripMenuItem_Click);
|
this.convertbinTorwdToolStripMenuItem.Click += new System.EventHandler(this.convertbinTorwdToolStripMenuItem_Click);
|
||||||
//
|
//
|
||||||
// generateDefinitionFileFromExtractedDefinitionToolStripMenuItem
|
// openOBD2ScanToolToolStripMenuItem
|
||||||
//
|
//
|
||||||
this.generateDefinitionFileFromExtractedDefinitionToolStripMenuItem.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(63)))), ((int)(((byte)(65)))));
|
this.openOBD2ScanToolToolStripMenuItem.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(63)))), ((int)(((byte)(65)))));
|
||||||
this.generateDefinitionFileFromExtractedDefinitionToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
|
this.openOBD2ScanToolToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
|
||||||
this.generateDefinitionFileFromExtractedDefinitionToolStripMenuItem.Name = "generateDefinitionFileFromExtractedDefinitionToolStripMenuItem";
|
this.openOBD2ScanToolToolStripMenuItem.Name = "openOBD2ScanToolToolStripMenuItem";
|
||||||
this.generateDefinitionFileFromExtractedDefinitionToolStripMenuItem.Size = new System.Drawing.Size(367, 22);
|
this.openOBD2ScanToolToolStripMenuItem.Size = new System.Drawing.Size(214, 22);
|
||||||
this.generateDefinitionFileFromExtractedDefinitionToolStripMenuItem.Text = "Generate Definition file from Extracted Definition";
|
this.openOBD2ScanToolToolStripMenuItem.Text = "Open OBD2 Scan Tool";
|
||||||
this.generateDefinitionFileFromExtractedDefinitionToolStripMenuItem.Click += new System.EventHandler(this.generateDefinitionFileFromExtractedDefinitionToolStripMenuItem_Click);
|
this.openOBD2ScanToolToolStripMenuItem.Click += new System.EventHandler(this.openOBD2ScanToolToolStripMenuItem_Click);
|
||||||
//
|
//
|
||||||
// Editortable
|
// Editortable
|
||||||
//
|
//
|
||||||
|
@ -1151,7 +1210,7 @@ public class Editortable : DarkForm
|
||||||
|
|
||||||
private void extractDefinitionToolStripMenuItem_Click(object sender, EventArgs e)
|
private void extractDefinitionToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
GForm_Main_0.Class_DefinitionMaker_0.Extract();
|
GForm_Main_0.Class_DefinitionMaker_0.Extract("Definition");
|
||||||
if (GForm_Main_0.Class_DefinitionMaker_0.CurrentExtractedDumps > 1) GForm_Main_0.Class_DefinitionMaker_0.CreateExtractedDefinition();
|
if (GForm_Main_0.Class_DefinitionMaker_0.CurrentExtractedDumps > 1) GForm_Main_0.Class_DefinitionMaker_0.CreateExtractedDefinition();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1312,5 +1371,25 @@ public class Editortable : DarkForm
|
||||||
GForm_Main_0.Class_DefinitionMaker_0.CurrentExtractedDumps = 2;
|
GForm_Main_0.Class_DefinitionMaker_0.CurrentExtractedDumps = 2;
|
||||||
GForm_Main_0.Class_DefinitionMaker_0.CreateExtractedDefinition();
|
GForm_Main_0.Class_DefinitionMaker_0.CreateExtractedDefinition();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void extractbinFileFromFPMToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
GForm_Main_0.Class_DefinitionMaker_0.Extract("Bin");
|
||||||
|
}
|
||||||
|
|
||||||
|
private void convertrwdTobinToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
GForm_Main_0.darkButton2_Click_1(sender, e);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void convertbinTorwdToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
GForm_Main_0.darkButton3_Click_1(sender, e);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void openOBD2ScanToolToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
GForm_Main_0.darkButton5_Click(sender, e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
769
GForm_Main.cs
769
GForm_Main.cs
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Loading…
Reference in New Issue