Skip to content

Commit 6c1f4bb

Browse files
committed
Reset branch
1 parent 940daa8 commit 6c1f4bb

File tree

7 files changed

+61
-89
lines changed

7 files changed

+61
-89
lines changed

GenOpCodes/My Project/AssemblyInfo.vb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Imports System.Runtime.InteropServices
3131
' by using the '*' as shown below:
3232
' <Assembly: AssemblyVersion("1.0.*")>
3333

34-
<Assembly: AssemblyVersion("2024.1.26.1251")>
35-
<Assembly: AssemblyFileVersion("2024.1.26.1251")>
34+
<Assembly: AssemblyVersion("2024.1.22.1247")>
35+
<Assembly: AssemblyFileVersion("2024.1.22.1247")>
3636

37-
<assembly: AssemblyInformationalVersion("2024.1.26")>
37+
<assembly: AssemblyInformationalVersion("2024.1.22")>

RunTests/My Project/AssemblyInfo.vb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Imports System.Runtime.InteropServices
3131
' by using the '*' as shown below:
3232
' <Assembly: AssemblyVersion("1.0.*")>
3333

34-
<Assembly: AssemblyVersion("2024.1.26.1630")>
35-
<Assembly: AssemblyFileVersion("2024.1.26.1630")>
34+
<Assembly: AssemblyVersion("2024.1.22.1626")>
35+
<Assembly: AssemblyFileVersion("2024.1.22.1626")>
3636

37-
<assembly: AssemblyInformationalVersion("2024.1.26")>
37+
<assembly: AssemblyInformationalVersion("2024.1.22")>

x8086NetEmuConsole/My Project/AssemblyInfo.vb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Imports System.Runtime.InteropServices
3131
' by using the '*' as shown below:
3232
' <Assembly: AssemblyVersion("1.0.*")>
3333

34-
<Assembly: AssemblyVersion("2024.1.26.1768")>
35-
<Assembly: AssemblyFileVersion("2024.1.26.1763")>
34+
<Assembly: AssemblyVersion("2024.1.22.1764")>
35+
<Assembly: AssemblyFileVersion("2024.1.22.1759")>
3636

37-
<assembly: AssemblyInformationalVersion("2024.1.26")>
37+
<assembly: AssemblyInformationalVersion("2024.1.22")>

x8086NetEmuWinForms/FormEmulator.Designer.vb

Lines changed: 43 additions & 60 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

x8086NetEmuWinForms/FormEmulator.vb

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ Public Class FormEmulator
5252
Me.BackColor = Color.Black
5353

5454
'RunChecks()
55-
SetupCPUClockLabels()
5655

5756
' New settings that are recommend to be turned on
5857
INT13EmulationToolStripMenuItem.Checked = True
@@ -682,8 +681,7 @@ Public Class FormEmulator
682681

683682
Private Sub SetSimulationMultiplierFromMenu(sender As Object, e As EventArgs) Handles ToolStripMenuItemSpeed25.Click, ToolStripMenuItemSpeed50.Click,
684683
ToolStripMenuItemSpeed100.Click, ToolStripMenuItemSpeed150.Click,
685-
ToolStripMenuItemSpeed200.Click, ToolStripMenuItemSpeed500.Click,
686-
ToolStripMenuItemSpeed1000.Click
684+
ToolStripMenuItemSpeed200.Click
687685
Dim speedText As String = CType(sender, ToolStripMenuItem).Text
688686
Dim speedPercentage As Integer = Integer.Parse(speedText.Replace("%", ""))
689687

@@ -705,18 +703,9 @@ Public Class FormEmulator
705703
MHz1908ToolStripMenuItem.Click, MHz3816ToolStripMenuItem.Click,
706704
MHz4770ToolStripMenuItem4.Click
707705

708-
Dim speedValue As Double = CType(sender, ToolStripMenuItem).Tag
709-
SetCPUClockSpeed(speedValue)
710-
End Sub
711-
712-
Private Sub SetupCPUClockLabels()
713-
Dim mult() As Integer = {1, 2, 4, 8, 10}
714-
For i As Integer = 0 To 4
715-
With CPUClockToolStripMenuItem.DropDownItems(i)
716-
.Text = $"{mult(i) * X8086.BASECLOCK / X8086.MHz:N2} MHz"
717-
.Tag = mult(i) * X8086.BASECLOCK
718-
End With
719-
Next
706+
Dim speedText As String = CType(sender, ToolStripMenuItem).Text
707+
Dim speedValue As Double = Double.Parse(speedText.Replace(" MHz", ""))
708+
SetCPUClockSpeed(speedValue * X8086.MHz)
720709
End Sub
721710

722711
Private Sub ExitToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ExitToolStripMenuItem.Click
@@ -813,7 +802,7 @@ Public Class FormEmulator
813802
If mi.Text.StartsWith("Custom") Then
814803

815804
Else
816-
mi.Checked = (ddi.Tag = value)
805+
mi.Checked = (ddi.Text = clockSpeedText)
817806
End If
818807
End If
819808
Next

x8086NetEmuWinForms/My Project/AssemblyInfo.vb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Imports System.Runtime.InteropServices
3131
' by using the '*' as shown below:
3232
' <Assembly: AssemblyVersion("1.0.*")>
3333

34-
<Assembly: AssemblyVersion("2024.1.26.8639")>
35-
<Assembly: AssemblyFileVersion("2024.1.26.8637")>
34+
<Assembly: AssemblyVersion("2024.1.22.8635")>
35+
<Assembly: AssemblyFileVersion("2024.1.22.8633")>
3636

37-
<assembly: AssemblyInformationalVersion("2024.1.26")>
37+
<assembly: AssemblyInformationalVersion("2024.1.22")>

x8086NetEmuWinForms/x8086NetEmuWinForms.vbproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@
341341
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
342342
<ProjectExtensions>
343343
<VisualStudio>
344-
<UserProperties BuildVersion_DetectChanges="False" BuildVersion_BuildVersioningStyle="None.None.Increment.None" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" BuildVersion_BuildAction="Both" />
344+
<UserProperties BuildVersion_BuildAction="Both" BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.None" BuildVersion_DetectChanges="False" />
345345
</VisualStudio>
346346
</ProjectExtensions>
347347
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

0 commit comments

Comments
 (0)