diff --git a/PipeGallery.sln b/PipeGallery.sln
index 3ce323f..e269cfc 100644
--- a/PipeGallery.sln
+++ b/PipeGallery.sln
@@ -5,8 +5,6 @@
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PipeGallery", "PipeGallery\PipeGallery.csproj", "{FB422BF3-8715-42B6-9D6B-535A2C8079E3}"
EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Correlator", "..\..\Setup Project\相关仪\Correlator\Correlator.vdproj", "{22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -17,8 +15,6 @@
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Release|Any CPU.Build.0 = Release|Any CPU
- {22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}.Debug|Any CPU.ActiveCfg = Debug
- {22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}.Release|Any CPU.ActiveCfg = Release
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/PipeGallery.sln b/PipeGallery.sln
index 3ce323f..e269cfc 100644
--- a/PipeGallery.sln
+++ b/PipeGallery.sln
@@ -5,8 +5,6 @@
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PipeGallery", "PipeGallery\PipeGallery.csproj", "{FB422BF3-8715-42B6-9D6B-535A2C8079E3}"
EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Correlator", "..\..\Setup Project\相关仪\Correlator\Correlator.vdproj", "{22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -17,8 +15,6 @@
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Release|Any CPU.Build.0 = Release|Any CPU
- {22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}.Debug|Any CPU.ActiveCfg = Debug
- {22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}.Release|Any CPU.ActiveCfg = Release
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/PipeGallery/Correlator/CalculteThread.cs b/PipeGallery/Correlator/CalculteThread.cs
index 8d87795..ff1ae03 100644
--- a/PipeGallery/Correlator/CalculteThread.cs
+++ b/PipeGallery/Correlator/CalculteThread.cs
@@ -158,9 +158,6 @@
{
SenderClass.sendCorrelatorWakeUpCmd(CalculteSatus.msp.sp);
Thread.Sleep(10000);
-
- HomePageViewModel.Instance.TransmitterASignalIntensity = 6;
- HomePageViewModel.Instance.TransmitterBSignalIntensity = 6;
}
}
diff --git a/PipeGallery.sln b/PipeGallery.sln
index 3ce323f..e269cfc 100644
--- a/PipeGallery.sln
+++ b/PipeGallery.sln
@@ -5,8 +5,6 @@
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PipeGallery", "PipeGallery\PipeGallery.csproj", "{FB422BF3-8715-42B6-9D6B-535A2C8079E3}"
EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Correlator", "..\..\Setup Project\相关仪\Correlator\Correlator.vdproj", "{22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -17,8 +15,6 @@
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Release|Any CPU.Build.0 = Release|Any CPU
- {22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}.Debug|Any CPU.ActiveCfg = Debug
- {22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}.Release|Any CPU.ActiveCfg = Release
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/PipeGallery/Correlator/CalculteThread.cs b/PipeGallery/Correlator/CalculteThread.cs
index 8d87795..ff1ae03 100644
--- a/PipeGallery/Correlator/CalculteThread.cs
+++ b/PipeGallery/Correlator/CalculteThread.cs
@@ -158,9 +158,6 @@
{
SenderClass.sendCorrelatorWakeUpCmd(CalculteSatus.msp.sp);
Thread.Sleep(10000);
-
- HomePageViewModel.Instance.TransmitterASignalIntensity = 6;
- HomePageViewModel.Instance.TransmitterBSignalIntensity = 6;
}
}
diff --git a/PipeGallery/PipeGallery.csproj b/PipeGallery/PipeGallery.csproj
index 86fc3f3..c277173 100644
--- a/PipeGallery/PipeGallery.csproj
+++ b/PipeGallery/PipeGallery.csproj
@@ -16,14 +16,14 @@
- AnyCPU
- true
- full
- false
- ..\bin\
- DEBUG;TRACE
- prompt
- 2
+ AnyCPU
+ true
+ full
+ false
+ ..\bin\
+ DEBUG;TRACE
+ prompt
+ 2
false
@@ -44,9 +44,8 @@
False
..\bin\CorrelatorCSharp.dll
-
- False
- C:\Users\Administrator\Desktop\dll\国外\CorrelatorSingle.dll
+
+ C:\Users\Administrator\Desktop\dll\CorrelatorSingle.dll
False
@@ -102,16 +101,16 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -549,15 +548,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -594,10 +593,10 @@
+ Other similar extension points exist, see Microsoft.Common.targets.
+
+
+
+
+ -->
\ No newline at end of file
diff --git a/PipeGallery.sln b/PipeGallery.sln
index 3ce323f..e269cfc 100644
--- a/PipeGallery.sln
+++ b/PipeGallery.sln
@@ -5,8 +5,6 @@
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PipeGallery", "PipeGallery\PipeGallery.csproj", "{FB422BF3-8715-42B6-9D6B-535A2C8079E3}"
EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Correlator", "..\..\Setup Project\相关仪\Correlator\Correlator.vdproj", "{22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -17,8 +15,6 @@
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Release|Any CPU.Build.0 = Release|Any CPU
- {22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}.Debug|Any CPU.ActiveCfg = Debug
- {22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}.Release|Any CPU.ActiveCfg = Release
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/PipeGallery/Correlator/CalculteThread.cs b/PipeGallery/Correlator/CalculteThread.cs
index 8d87795..ff1ae03 100644
--- a/PipeGallery/Correlator/CalculteThread.cs
+++ b/PipeGallery/Correlator/CalculteThread.cs
@@ -158,9 +158,6 @@
{
SenderClass.sendCorrelatorWakeUpCmd(CalculteSatus.msp.sp);
Thread.Sleep(10000);
-
- HomePageViewModel.Instance.TransmitterASignalIntensity = 6;
- HomePageViewModel.Instance.TransmitterBSignalIntensity = 6;
}
}
diff --git a/PipeGallery/PipeGallery.csproj b/PipeGallery/PipeGallery.csproj
index 86fc3f3..c277173 100644
--- a/PipeGallery/PipeGallery.csproj
+++ b/PipeGallery/PipeGallery.csproj
@@ -16,14 +16,14 @@
- AnyCPU
- true
- full
- false
- ..\bin\
- DEBUG;TRACE
- prompt
- 2
+ AnyCPU
+ true
+ full
+ false
+ ..\bin\
+ DEBUG;TRACE
+ prompt
+ 2
false
@@ -44,9 +44,8 @@
False
..\bin\CorrelatorCSharp.dll
-
- False
- C:\Users\Administrator\Desktop\dll\国外\CorrelatorSingle.dll
+
+ C:\Users\Administrator\Desktop\dll\CorrelatorSingle.dll
False
@@ -102,16 +101,16 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -549,15 +548,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -594,10 +593,10 @@
+ Other similar extension points exist, see Microsoft.Common.targets.
+
+
+
+
+ -->
\ No newline at end of file
diff --git a/bin/CorrelatorSingle.dll b/bin/CorrelatorSingle.dll
index e86c578..3338f8d 100644
--- a/bin/CorrelatorSingle.dll
+++ b/bin/CorrelatorSingle.dll
Binary files differ
diff --git a/PipeGallery.sln b/PipeGallery.sln
index 3ce323f..e269cfc 100644
--- a/PipeGallery.sln
+++ b/PipeGallery.sln
@@ -5,8 +5,6 @@
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PipeGallery", "PipeGallery\PipeGallery.csproj", "{FB422BF3-8715-42B6-9D6B-535A2C8079E3}"
EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Correlator", "..\..\Setup Project\相关仪\Correlator\Correlator.vdproj", "{22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -17,8 +15,6 @@
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FB422BF3-8715-42B6-9D6B-535A2C8079E3}.Release|Any CPU.Build.0 = Release|Any CPU
- {22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}.Debug|Any CPU.ActiveCfg = Debug
- {22C1AFF0-9FA7-41D6-B859-CEA89A4715EA}.Release|Any CPU.ActiveCfg = Release
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/PipeGallery/Correlator/CalculteThread.cs b/PipeGallery/Correlator/CalculteThread.cs
index 8d87795..ff1ae03 100644
--- a/PipeGallery/Correlator/CalculteThread.cs
+++ b/PipeGallery/Correlator/CalculteThread.cs
@@ -158,9 +158,6 @@
{
SenderClass.sendCorrelatorWakeUpCmd(CalculteSatus.msp.sp);
Thread.Sleep(10000);
-
- HomePageViewModel.Instance.TransmitterASignalIntensity = 6;
- HomePageViewModel.Instance.TransmitterBSignalIntensity = 6;
}
}
diff --git a/PipeGallery/PipeGallery.csproj b/PipeGallery/PipeGallery.csproj
index 86fc3f3..c277173 100644
--- a/PipeGallery/PipeGallery.csproj
+++ b/PipeGallery/PipeGallery.csproj
@@ -16,14 +16,14 @@
- AnyCPU
- true
- full
- false
- ..\bin\
- DEBUG;TRACE
- prompt
- 2
+ AnyCPU
+ true
+ full
+ false
+ ..\bin\
+ DEBUG;TRACE
+ prompt
+ 2
false
@@ -44,9 +44,8 @@
False
..\bin\CorrelatorCSharp.dll
-
- False
- C:\Users\Administrator\Desktop\dll\国外\CorrelatorSingle.dll
+
+ C:\Users\Administrator\Desktop\dll\CorrelatorSingle.dll
False
@@ -102,16 +101,16 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -549,15 +548,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -594,10 +593,10 @@
+ Other similar extension points exist, see Microsoft.Common.targets.
+
+
+
+
+ -->
\ No newline at end of file
diff --git a/bin/CorrelatorSingle.dll b/bin/CorrelatorSingle.dll
index e86c578..3338f8d 100644
--- a/bin/CorrelatorSingle.dll
+++ b/bin/CorrelatorSingle.dll
Binary files differ
diff --git a/bin/number.json b/bin/number.json
index d5ac6a0..b06c16e 100644
--- a/bin/number.json
+++ b/bin/number.json
@@ -1 +1 @@
-{"date":"20221201","pipe":7,"locate":2,"listen":1}
\ No newline at end of file
+{"date":"20221220","pipe":3,"locate":2,"listen":1}
\ No newline at end of file