Skip to content

Commit 5bad93e

Browse files
Digitoxin1Digitoxin1
committed
Completed preliminary Greaseweazle support
1 parent ae19461 commit 5bad93e

22 files changed

+317
-87
lines changed

‎DiskImageTool/App.config‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@
6767
<setting name="GW_COMPort" serializeAs="String">
6868
<value />
6969
</setting>
70+
<setting name="GW_DefaultRevs" serializeAs="String">
71+
<value>3</value>
72+
</setting>
7073
</DiskImageTool.My.MySettings>
7174
</userSettings>
7275
<runtime>

‎DiskImageTool/DiskImageTool.vbproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,10 +179,10 @@
179179
<Compile Include="Greaseweazle\CommandLineBuilder.vb" />
180180
<Compile Include="Greaseweazle\ConsoleOutputParser.vb" />
181181
<Compile Include="Greaseweazle\Enums.vb" />
182-
<Compile Include="Greaseweazle\ConfigurationForm.Designer.vb">
182+
<Compile Include="Greaseweazle\Forms\ConfigurationForm.Designer.vb">
183183
<DependentUpon>ConfigurationForm.vb</DependentUpon>
184184
</Compile>
185-
<Compile Include="Greaseweazle\ConfigurationForm.vb">
185+
<Compile Include="Greaseweazle\Forms\ConfigurationForm.vb">
186186
<SubType>Form</SubType>
187187
</Compile>
188188
<Compile Include="Greaseweazle\Forms\EraseDiskForm.vb">
@@ -756,16 +756,16 @@
756756
<EmbeddedResource Include="Forms\VolumeSerialNumberForm.resx">
757757
<DependentUpon>VolumeSerialNumberForm.vb</DependentUpon>
758758
</EmbeddedResource>
759-
<EmbeddedResource Include="Greaseweazle\ConfigurationForm.de.resx">
759+
<EmbeddedResource Include="Greaseweazle\Forms\ConfigurationForm.de.resx">
760760
<DependentUpon>ConfigurationForm.vb</DependentUpon>
761761
</EmbeddedResource>
762-
<EmbeddedResource Include="Greaseweazle\ConfigurationForm.es.resx">
762+
<EmbeddedResource Include="Greaseweazle\Forms\ConfigurationForm.es.resx">
763763
<DependentUpon>ConfigurationForm.vb</DependentUpon>
764764
</EmbeddedResource>
765-
<EmbeddedResource Include="Greaseweazle\ConfigurationForm.fr.resx">
765+
<EmbeddedResource Include="Greaseweazle\Forms\ConfigurationForm.fr.resx">
766766
<DependentUpon>ConfigurationForm.vb</DependentUpon>
767767
</EmbeddedResource>
768-
<EmbeddedResource Include="Greaseweazle\ConfigurationForm.resx">
768+
<EmbeddedResource Include="Greaseweazle\Forms\ConfigurationForm.resx">
769769
<DependentUpon>ConfigurationForm.vb</DependentUpon>
770770
</EmbeddedResource>
771771
<EmbeddedResource Include="Greaseweazle\Forms\BaseForm.de.resx">

‎DiskImageTool/Greaseweazle/CommandLineBuilder.vb‎

Lines changed: 40 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
1-
Imports System.Runtime.Remoting.Messaging
2-
3-
Namespace Greaseweazle
1+
Namespace Greaseweazle
42
Class CommandLineBuilder
53
Public Const DEFAULT_CYLS As UInteger = 80
64
Public Const DEFAULT_LINGER As UInteger = 100
75
Public Const DEFAULT_PASSES As UInteger = 3
86
Public Const DEFAULT_RETRIES As UInteger = 3
97
Public Const DEFAULT_REVS As UInteger = 1
8+
Public Const DEFAULT_SEEK_RETRIES As UInteger = 0
9+
Public Const MAX_CYLS As UInteger = 80
10+
Public Const MAX_LINGER As UInteger = 1000
11+
Public Const MAX_PASSES As UInteger = 9
12+
Public Const MAX_RETRIES As UInteger = 99
13+
Public Const MAX_REVS As Byte = 20
14+
Public Const MIN_CYLS As UInteger = 1
15+
Public Const MIN_LINGER As UInteger = 1
16+
Public Const MIN_PASSES As UInteger = 1
17+
Public Const MIN_RETRIES As UInteger = 0
18+
Public Const MIN_REVS As Byte = 1
1019
Private Const DEFAULT_BITRATE As UInteger = 0
1120
Private Const DEFAULT_DRIVE As String = "A"
1221
Private Const DEFAULT_HEADS As TrackHeads = TrackHeads.both
@@ -63,7 +72,9 @@ Namespace Greaseweazle
6372
Public Property Raw As Boolean
6473
Public Property Retries As UInteger = DEFAULT_RETRIES
6574
Public Property Revs As UInteger = DEFAULT_REVS
75+
Public Property SeekRetries As UInteger = DEFAULT_SEEK_RETRIES
6676
Public Property Time As Boolean = False
77+
6778
Public Sub AddCylinder(Cylinder As UShort)
6879
_Cylinders.Add((Cylinder, Cylinder))
6980
End Sub
@@ -100,7 +111,11 @@ Namespace Greaseweazle
100111
args.Add("--retries " & _Retries)
101112
End If
102113

103-
If CheckOptionRevs() AndAlso _Revs <> DEFAULT_REVS Then
114+
If CheckOptionSeekRetries() AndAlso _SeekRetries <> DEFAULT_SEEK_RETRIES Then
115+
args.Add("--seek-retries " & _SeekRetries)
116+
End If
117+
118+
If CheckOptionRevs() Then
104119
args.Add("--revs " & _Revs)
105120
End If
106121

@@ -170,16 +185,6 @@ Namespace Greaseweazle
170185
Return String.Join(" ", args)
171186
End Function
172187

173-
Private Function CheckOptionRaw() As Boolean
174-
Select Case _Action
175-
Case CommandAction.read
176-
Return True
177-
Case Else
178-
Return False
179-
End Select
180-
End Function
181-
182-
183188
Private Function CheckOptionAdjustSpeed() As Boolean
184189
Select Case _Action
185190
Case CommandAction.read, CommandAction.write, CommandAction.convert
@@ -287,6 +292,7 @@ Namespace Greaseweazle
287292
Return False
288293
End Select
289294
End Function
295+
290296
Private Function CheckOptionOutFile() As Boolean
291297
Select Case _Action
292298
Case CommandAction.convert
@@ -304,6 +310,7 @@ Namespace Greaseweazle
304310
Return False
305311
End Select
306312
End Function
313+
307314
Private Function CheckOptionPreErase() As Boolean
308315
Select Case _Action
309316
Case CommandAction.write
@@ -313,6 +320,15 @@ Namespace Greaseweazle
313320
End Select
314321
End Function
315322

323+
Private Function CheckOptionRaw() As Boolean
324+
Select Case _Action
325+
Case CommandAction.read
326+
Return True
327+
Case Else
328+
Return False
329+
End Select
330+
End Function
331+
316332
Private Function CheckOptionRetries() As Boolean
317333
Select Case _Action
318334
Case CommandAction.read, CommandAction.write
@@ -324,7 +340,16 @@ Namespace Greaseweazle
324340

325341
Private Function CheckOptionRevs() As Boolean
326342
Select Case _Action
327-
Case CommandAction.erase
343+
Case CommandAction.erase, CommandAction.read
344+
Return True
345+
Case Else
346+
Return False
347+
End Select
348+
End Function
349+
350+
Private Function CheckOptionSeekRetries() As Boolean
351+
Select Case _Action
352+
Case CommandAction.read
328353
Return True
329354
Case Else
330355
Return False

‎DiskImageTool/Greaseweazle/Forms/CleanDiskForm.vb‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Namespace Greaseweazle
66
Private WithEvents ButtonProcess As Button
77
Private WithEvents ButtonReset As Button
88
Private WithEvents ComboImageDrives As ComboBox
9-
Private _Initialized As Boolean = False
9+
Private ReadOnly _Initialized As Boolean = False
1010
Private _ProcessRunning As Boolean = False
1111
Private NumericCyls As NumericUpDown
1212
Private NumericLinger As NumericUpDown
@@ -75,8 +75,8 @@ Namespace Greaseweazle
7575
NumericCyls = New NumericUpDown With {
7676
.Anchor = AnchorStyles.Left,
7777
.Width = 45,
78-
.Minimum = 1,
79-
.Maximum = 80
78+
.Minimum = CommandLineBuilder.MIN_CYLS,
79+
.Maximum = CommandLineBuilder.MAX_CYLS
8080
}
8181

8282
Dim PassesLabel = New Label With {
@@ -89,8 +89,8 @@ Namespace Greaseweazle
8989
NumericPasses = New NumericUpDown With {
9090
.Anchor = AnchorStyles.Left,
9191
.Width = 45,
92-
.Minimum = 1,
93-
.Maximum = 9
92+
.Minimum = CommandLineBuilder.MIN_PASSES,
93+
.Maximum = CommandLineBuilder.MAX_PASSES
9494
}
9595

9696
Dim LingerLabel = New Label With {
@@ -103,8 +103,8 @@ Namespace Greaseweazle
103103
NumericLinger = New NumericUpDown With {
104104
.Anchor = AnchorStyles.Left,
105105
.Width = 60,
106-
.Minimum = 1,
107-
.Maximum = 1000
106+
.Minimum = CommandLineBuilder.MIN_LINGER,
107+
.Maximum = CommandLineBuilder.MAX_LINGER
108108
}
109109

110110
Dim ButtonContainer = New FlowLayoutPanel With {

‎DiskImageTool/Greaseweazle/Forms/ConfigurationForm.Designer.vb‎

Lines changed: 19 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎DiskImageTool/Greaseweazle/Forms/ConfigurationForm.de.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,4 +153,7 @@
153153
<data name="LabelPort.Text" xml:space="preserve">
154154
<value>Port</value>
155155
</data>
156+
<data name="LabelDefaultRevs.Text" xml:space="preserve">
157+
<value>Standard-Umdrehungen</value>
158+
</data>
156159
</root>

‎DiskImageTool/Greaseweazle/Forms/ConfigurationForm.es.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,4 +153,7 @@
153153
<data name="LabelPort.Text" xml:space="preserve">
154154
<value>Puerto</value>
155155
</data>
156+
<data name="LabelDefaultRevs.Text" xml:space="preserve">
157+
<value>Revoluciones predeterminadas</value>
158+
</data>
156159
</root>

‎DiskImageTool/Greaseweazle/Forms/ConfigurationForm.fr.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,4 +153,7 @@
153153
<data name="LabelPort.Text" xml:space="preserve">
154154
<value>Port</value>
155155
</data>
156+
<data name="LabelDefaultRevs.Text" xml:space="preserve">
157+
<value>Tours par défaut</value>
158+
</data>
156159
</root>

0 commit comments

Comments
 (0)