Skip to content

Commit 20666ac

Browse files
committed
use EasyCon2 instead winform as v2 still wip
1 parent 1f9420c commit 20666ac

File tree

936 files changed

+2619
-492
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

936 files changed

+2619
-492
lines changed

DirectInput/DirectInput.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<ProjectReference Include="..\src\EasyCon.Device\EasyDevice.csproj" />
15+
<ProjectReference Include="..\src\EasyCon.Device\EasyCon.Device.csproj" />
1616
</ItemGroup>
1717

1818
</Project>

Directory.Packages.props

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,8 @@
2121
<PackageVersion Include="SharpDX" Version="4.2.0" />
2222
<PackageVersion Include="SharpDX.DirectInput" Version="4.2.0" />
2323
<PackageVersion Include="WebSocketSharp-netstandard" Version="1.0.1" />
24+
2425
<PackageVersion Include="Tesseract" Version="5.2.0" />
2526
<PackageVersion Include="NLua" Version="1.6.0" />
26-
27-
<PackageVersion Include="Avalonia" Version="11.3.8" />
28-
<PackageVersion Include="Avalonia.Desktop" Version="11.3.8" />
29-
<PackageVersion Include="Avalonia.Themes.Fluent" Version="11.3.8" />
30-
<PackageVersion Include="Avalonia.Fonts.Inter" Version="11.3.8" />
31-
<PackageVersion Include="Avalonia.Diagnostics" Version="11.3.8" />
32-
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
33-
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
34-
35-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
36-
<PackageVersion Include="NUnit" Version="4.3.2" />
37-
<PackageVersion Include="NUnit.Analyzers" Version="4.7.0" />
38-
<PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" />
3927
</ItemGroup>
4028
</Project>

EasyCon2.sln

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 18
44
VisualStudioVersion = 18.3.11206.111
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCon.Winform", "src\EasyCon.Winform\EasyCon2.csproj", "{53DD390A-7372-45C1-85C7-6CF070E0694F}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCon2", "src\EasyCon2\EasyCon2.csproj", "{53DD390A-7372-45C1-85C7-6CF070E0694F}"
77
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCon.Device", "src\EasyCon.Device\EasyDevice.csproj", "{3CA35B95-9764-4DD4-B5DE-1784E6FD7E51}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCon.Device", "src\EasyCon.Device\EasyCon.Device.csproj", "{3CA35B95-9764-4DD4-B5DE-1784E6FD7E51}"
99
EndProject
10-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCon.VPad", "src\EasyCon.VPad\EasyVPad.csproj", "{5E89F088-E9CD-4390-8A78-7F3A391AC7B2}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCon.VPad", "src\EasyCon.VPad\EasyCon.VPad.csproj", "{5E89F088-E9CD-4390-8A78-7F3A391AC7B2}"
1111
EndProject
12-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCon.Script", "src\EasyCon.Script\EasyScript.csproj", "{FC55EBC4-FC1E-446B-A83B-7B4A5C3E0194}"
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCon.Script", "src\EasyCon.Script\EasyCon.Script.csproj", "{FC55EBC4-FC1E-446B-A83B-7B4A5C3E0194}"
1313
EndProject
14-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCon.Capture", "src\EasyCon.Capture\EasyCapture.csproj", "{2FD3997D-B64E-4B39-9EB7-24D279C3897B}"
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCon.Script2", "src\EasyCon.Script2\EasyCon.Script2.csproj", "{27EE54A7-2CFB-4617-BF69-353EE8F85E53}"
1515
EndProject
16-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DirectInput", "DirectInput\DirectInput.csproj", "{C4E877CF-D0B9-4659-9109-C37ED73D5FCB}"
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCon.Capture", "src\EasyCon.Capture\EasyCon.Capture.csproj", "{2FD3997D-B64E-4B39-9EB7-24D279C3897B}"
1717
EndProject
18-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyCon.Tests", "src\EasyCon.Tests\EasyCon.Tests.csproj", "{9D757FA7-0F16-4434-8D34-3756B3AC68D6}"
18+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DirectInput", "DirectInput\DirectInput.csproj", "{C4E877CF-D0B9-4659-9109-C37ED73D5FCB}"
1919
EndProject
2020
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{083BEF92-5E14-4170-979C-E1C1E11E4781}"
2121
ProjectSection(SolutionItems) = preProject
@@ -53,10 +53,10 @@ Global
5353
{C4E877CF-D0B9-4659-9109-C37ED73D5FCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
5454
{C4E877CF-D0B9-4659-9109-C37ED73D5FCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
5555
{C4E877CF-D0B9-4659-9109-C37ED73D5FCB}.Release|Any CPU.Build.0 = Release|Any CPU
56-
{9D757FA7-0F16-4434-8D34-3756B3AC68D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
57-
{9D757FA7-0F16-4434-8D34-3756B3AC68D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
58-
{9D757FA7-0F16-4434-8D34-3756B3AC68D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
59-
{9D757FA7-0F16-4434-8D34-3756B3AC68D6}.Release|Any CPU.Build.0 = Release|Any CPU
56+
{27EE54A7-2CFB-4617-BF69-353EE8F85E53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
57+
{27EE54A7-2CFB-4617-BF69-353EE8F85E53}.Debug|Any CPU.Build.0 = Debug|Any CPU
58+
{27EE54A7-2CFB-4617-BF69-353EE8F85E53}.Release|Any CPU.ActiveCfg = Release|Any CPU
59+
{27EE54A7-2CFB-4617-BF69-353EE8F85E53}.Release|Any CPU.Build.0 = Release|Any CPU
6060
EndGlobalSection
6161
GlobalSection(SolutionProperties) = preSolution
6262
HideSolutionNode = FALSE

build.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set projname="EasyCon2"
44

55
cd src
66
rmdir /s /q publish
7-
cd EasyCon.Winform\
7+
cd EasyCon2\
88

99
rmdir /s /q bin
1010
rmdir /s /q obj
@@ -18,7 +18,7 @@ ren EasyCon2.exe EasyCon.net8.0.%commitid%.exe
1818
cd ../
1919
xcopy ..\Firmware .\publish\Firmware\
2020
xcopy ..\Script .\publish\Script\
21-
xcopy .\EasyCon.Winform\Resources\AmiiboImages .\publish\Amiibo\AmiiboImages\
21+
xcopy .\EasyCon2\Resources\AmiiboImages .\publish\Amiibo\AmiiboImages\
2222
mkdir .\publish\ImgLabel\
2323
del .\publish\*.pdb
2424
pause

src/EasyCon.Device/Connection/IConnection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace EasyDevice.Connection;
22

3-
public delegate void BytesTransferedHandler(string connString, byte[] bytes);
3+
public delegate void BytesTransferedHandler(string comPort, byte[] bytes);
44
public delegate void StatusChangedHandler(Status status);
55

66
abstract class IConnection

src/EasyCon.Device/Connection/TTLSerialClient.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Threading.Tasks;
5-
using System.Threading;
6-
using System.Diagnostics;
1+
using System.Diagnostics;
72
using System.IO.Ports;
83

94
namespace EasyDevice.Connection;
File renamed without changes.

0 commit comments

Comments
 (0)