Skip to content

Commit 9eda2b8

Browse files
author
Wayne, W5XD. Round Rock
committed
vs 2022 and receive 3-call message properly
1 parent 71aecfc commit 9eda2b8

23 files changed

+503
-219
lines changed

‎AboutForm.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ private void AboutForm_Load(object sender, EventArgs e)
2828
#elif BUILD_X64
2929
" (X64 build)" +
3030
#endif
31-
"\r\nCopyright (c) 2020 WriteLog Contesting Software, LLC\r\n\r\n" +
32-
"This program is based on wsjtx-2.2.2 which is licensed software.\r\n" +
31+
"\r\nCopyright (c) 2024 Wayne Wright, W5XD\r\n\r\n" +
32+
"This program is based on wsjtx-2.6.0 which is licensed software.\r\n" +
3333
"See the file COPYING.\r\n\r\n" +
3434

3535
"The algorithms, source code, look-and-feel of WSJT-X and related" +

‎App.config

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
5-
<section name="DigiRite.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
4+
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5+
<section name="DigiRite.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
66
</sectionGroup>
77
</configSections>
88
<startup>
9-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
9+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
1010
</startup>
1111
<userSettings>
1212
<DigiRite.Properties.Settings>
@@ -41,34 +41,34 @@
4141
<value>0</value>
4242
</setting>
4343
<setting name="AudioInputDevice_1" serializeAs="String">
44-
<value />
44+
<value/>
4545
</setting>
4646
<setting name="AudioInputDevice_2" serializeAs="String">
47-
<value />
47+
<value/>
4848
</setting>
4949
<setting name="AudioInputDevice_3" serializeAs="String">
50-
<value />
50+
<value/>
5151
</setting>
5252
<setting name="AudioInputDevice_4" serializeAs="String">
53-
<value />
53+
<value/>
5454
</setting>
5555
<setting name="AudioOutputDevice_1" serializeAs="String">
56-
<value />
56+
<value/>
5757
</setting>
5858
<setting name="AudioOutputDevice_2" serializeAs="String">
59-
<value />
59+
<value/>
6060
</setting>
6161
<setting name="AudioOutputDevice_3" serializeAs="String">
62-
<value />
62+
<value/>
6363
</setting>
6464
<setting name="AudioOutputDevice_4" serializeAs="String">
65-
<value />
65+
<value/>
6666
</setting>
6767
<setting name="CallUsed" serializeAs="String">
68-
<value />
68+
<value/>
6969
</setting>
7070
<setting name="MyGrid" serializeAs="String">
71-
<value />
71+
<value/>
7272
</setting>
7373
<setting name="ContestExchange" serializeAs="String">
7474
<value>0</value>
@@ -101,7 +101,7 @@
101101
<value>CQ</value>
102102
</setting>
103103
<setting name="ContestMessageToSend" serializeAs="String">
104-
<value />
104+
<value/>
105105
</setting>
106106
<setting name="OnLoggedAcknowedgeMessage" serializeAs="String">
107107
<value>0</value>
@@ -117,4 +117,4 @@
117117
</setting>
118118
</DigiRite.Properties.Settings>
119119
</userSettings>
120-
</configuration>
120+
</configuration>

‎Digi-XDft

‎DigiRite.csproj

+5-1
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
<OutputType>WinExe</OutputType>
99
<RootNamespace>DigiRite</RootNamespace>
1010
<AssemblyName>DigiRite</AssemblyName>
11-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1414
<Deterministic>true</Deterministic>
15+
<TargetFrameworkProfile />
1516
</PropertyGroup>
1617
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
1718
<DebugSymbols>true</DebugSymbols>
@@ -172,6 +173,7 @@
172173
<EmbeddedResource Include="SetupForm.resx">
173174
<DependentUpon>SetupForm.cs</DependentUpon>
174175
</EmbeddedResource>
176+
<None Include="License.rtf" />
175177
<None Include="Properties\Settings.settings">
176178
<Generator>SettingsSingleFileGenerator</Generator>
177179
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -182,6 +184,7 @@
182184
<DependentUpon>Settings.settings</DependentUpon>
183185
<DesignTimeSharedInput>True</DesignTimeSharedInput>
184186
</Compile>
187+
<None Include="README.md" />
185188
</ItemGroup>
186189
<ItemGroup>
187190
<None Include="App.config">
@@ -190,6 +193,7 @@
190193
</ItemGroup>
191194
<ItemGroup>
192195
<Content Include="DigiRite.ico" />
196+
<Content Include="Tests\decoded-3-call.txt" />
193197
<Content Include="Tests\decoded-dbReport.txt" />
194198
<Content Include="Tests\decoded-test-ru.txt" />
195199
<Content Include="Tests\decoded-test-wwdigi.txt" />

‎DigiRiteComLogger/DigiRiteComLogger.csproj

+57-57
Original file line numberDiff line numberDiff line change
@@ -9,61 +9,61 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>DigiRiteComLogger</RootNamespace>
1111
<AssemblyName>DigiRiteComLogger</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<Deterministic>true</Deterministic>
15+
<TargetFrameworkProfile />
1516
</PropertyGroup>
16-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
17-
<DebugSymbols>true</DebugSymbols>
18-
<OutputPath>bin\x86\Debug\</OutputPath>
19-
<DefineConstants>DEBUG;TRACE</DefineConstants>
20-
<DebugType>full</DebugType>
21-
<PlatformTarget>x86</PlatformTarget>
22-
<ErrorReport>prompt</ErrorReport>
23-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
24-
<Prefer32Bit>true</Prefer32Bit>
25-
</PropertyGroup>
26-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
27-
<OutputPath>bin\x86\Release\</OutputPath>
28-
<DefineConstants>TRACE</DefineConstants>
29-
<Optimize>true</Optimize>
30-
<DebugType>pdbonly</DebugType>
31-
<PlatformTarget>x86</PlatformTarget>
32-
<ErrorReport>prompt</ErrorReport>
33-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
34-
<Prefer32Bit>true</Prefer32Bit>
35-
</PropertyGroup>
36-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
37-
<DebugSymbols>true</DebugSymbols>
38-
<OutputPath>bin\x64\Debug\</OutputPath>
39-
<DefineConstants>DEBUG;TRACE</DefineConstants>
40-
<DebugType>full</DebugType>
41-
<PlatformTarget>x64</PlatformTarget>
42-
<ErrorReport>prompt</ErrorReport>
43-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
44-
<Prefer32Bit>true</Prefer32Bit>
45-
</PropertyGroup>
46-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
47-
<OutputPath>bin\x64\Release\</OutputPath>
48-
<DefineConstants>TRACE</DefineConstants>
49-
<Optimize>true</Optimize>
50-
<DebugType>pdbonly</DebugType>
51-
<PlatformTarget>x64</PlatformTarget>
52-
<ErrorReport>prompt</ErrorReport>
53-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
54-
<Prefer32Bit>true</Prefer32Bit>
55-
</PropertyGroup>
56-
57-
<PropertyGroup Label="UserMacros" Condition="'$(Platform)' == 'x64'">
58-
<CopyArchitecture>x64</CopyArchitecture>
59-
</PropertyGroup>
60-
<PropertyGroup Label="UserMacros" Condition="'$(Platform)' == 'x86'">
61-
<CopyArchitecture>Win32</CopyArchitecture>
62-
</PropertyGroup>
63-
<PropertyGroup Label="UserMacros">
64-
<XDftSdkDir>$(ProjectDir)..\Digi-XDft\$(CopyArchitecture)\$(Configuration)\</XDftSdkDir>
65-
</PropertyGroup>
66-
<ItemGroup>
17+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
18+
<DebugSymbols>true</DebugSymbols>
19+
<OutputPath>bin\x86\Debug\</OutputPath>
20+
<DefineConstants>DEBUG;TRACE</DefineConstants>
21+
<DebugType>full</DebugType>
22+
<PlatformTarget>x86</PlatformTarget>
23+
<ErrorReport>prompt</ErrorReport>
24+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
25+
<Prefer32Bit>true</Prefer32Bit>
26+
</PropertyGroup>
27+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
28+
<OutputPath>bin\x86\Release\</OutputPath>
29+
<DefineConstants>TRACE</DefineConstants>
30+
<Optimize>true</Optimize>
31+
<DebugType>pdbonly</DebugType>
32+
<PlatformTarget>x86</PlatformTarget>
33+
<ErrorReport>prompt</ErrorReport>
34+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
35+
<Prefer32Bit>true</Prefer32Bit>
36+
</PropertyGroup>
37+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
38+
<DebugSymbols>true</DebugSymbols>
39+
<OutputPath>bin\x64\Debug\</OutputPath>
40+
<DefineConstants>DEBUG;TRACE</DefineConstants>
41+
<DebugType>full</DebugType>
42+
<PlatformTarget>x64</PlatformTarget>
43+
<ErrorReport>prompt</ErrorReport>
44+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
45+
<Prefer32Bit>true</Prefer32Bit>
46+
</PropertyGroup>
47+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
48+
<OutputPath>bin\x64\Release\</OutputPath>
49+
<DefineConstants>TRACE</DefineConstants>
50+
<Optimize>true</Optimize>
51+
<DebugType>pdbonly</DebugType>
52+
<PlatformTarget>x64</PlatformTarget>
53+
<ErrorReport>prompt</ErrorReport>
54+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
55+
<Prefer32Bit>true</Prefer32Bit>
56+
</PropertyGroup>
57+
<PropertyGroup Label="UserMacros" Condition="'$(Platform)' == 'x64'">
58+
<CopyArchitecture>x64</CopyArchitecture>
59+
</PropertyGroup>
60+
<PropertyGroup Label="UserMacros" Condition="'$(Platform)' == 'x86'">
61+
<CopyArchitecture>Win32</CopyArchitecture>
62+
</PropertyGroup>
63+
<PropertyGroup Label="UserMacros">
64+
<XDftSdkDir>$(ProjectDir)..\Digi-XDft\$(CopyArchitecture)\$(Configuration)\</XDftSdkDir>
65+
</PropertyGroup>
66+
<ItemGroup>
6767
<Reference Include="System" />
6868
<Reference Include="System.Core" />
6969
<Reference Include="System.Xml.Linq" />
@@ -73,9 +73,9 @@
7373
<Reference Include="System.Net.Http" />
7474
<Reference Include="System.Xml" />
7575
<Reference Include="XDpack77Message">
76-
<HintPath>$(XDftSdkDir)XDpack77Message.dll</HintPath>
76+
<HintPath>$(XDftSdkDir)XDpack77Message.dll</HintPath>
7777
</Reference>
78-
</ItemGroup>
78+
</ItemGroup>
7979
<ItemGroup>
8080
<Compile Include="..\AssemblyVersionInfo.cs">
8181
<Link>Properties\AssemblyVersionInfo.cs</Link>
@@ -90,7 +90,7 @@
9090
</ProjectReference>
9191
</ItemGroup>
9292
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
93-
<PropertyGroup>
94-
<PostBuildEvent>copy "$(TargetPath)" "$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)\"</PostBuildEvent>
95-
</PropertyGroup>
93+
<PropertyGroup>
94+
<PostBuildEvent>copy "$(TargetPath)" "$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)\"</PostBuildEvent>
95+
</PropertyGroup>
9696
</Project>

‎DigiRiteComLogger/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
1212
[assembly: AssemblyProduct("DigiRite")]
13-
[assembly: AssemblyCopyright("Copyright © 2022 WriteLog Contesting Software, LLC")]
13+
[assembly: AssemblyCopyright("Copyright © 2024 Wayne Wright, W5XD")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

‎DigiRiteLogger/DigiRiteLogger.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>DigiRiteLogger</RootNamespace>
1111
<AssemblyName>DigiRiteLogger</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<Deterministic>true</Deterministic>
15+
<TargetFrameworkProfile />
1516
</PropertyGroup>
1617
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
1718
<DebugSymbols>true</DebugSymbols>

‎DigiRiteLogger/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("WriteLog Contesting Software LLC")]
1212
[assembly: AssemblyProduct("DigiRite")]
13-
[assembly: AssemblyCopyright("Copyright © 2022 WriteLog Contesting Software, LLC")]
13+
[assembly: AssemblyCopyright("Copyright © 2024 Wayne Wright, W5XD")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

‎DigiRiteWriteLog/DigiRiteWriteLog.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>DigiRiteWriteLog</RootNamespace>
1111
<AssemblyName>DigiRiteWriteLog</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<Deterministic>true</Deterministic>
15+
<TargetFrameworkProfile />
1516
</PropertyGroup>
1617
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
1718
<DebugSymbols>true</DebugSymbols>

‎IQsoQueue.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ namespace DigiRite
55
{
66
public delegate void IsConversationMessage(Conversation.Origin reason);
77

8+
public enum CallQsled { None, ImplyAll, IsMe };
89
public interface IQsoQueue
910
{
1011
string MyCall { set; }
1112
string MyBaseCall { set; }
1213
void OnCycleBeginning(int cycleNumber);
1314
bool InitiateQso(RecentMessage rm, short band, bool onHisFrequency, System.Action onUsed=null);
1415
void MessageForMycall(RecentMessage recentMessage,
15-
bool directlyToMe, string callQsled, short band,
16+
bool directlyToMe, CallQsled callQsled, short band,
1617
bool autoStart, IsConversationMessage onUsed);
1718
}
1819

0 commit comments

Comments
 (0)