ceac_pqy@163.com 3 سال پیش
والد
کامیت
fa5c7cfc24

BIN
exe.rar


+ 1 - 0
exe/apps/DevicesApp/commands/程控命令.xml

@@ -243,6 +243,7 @@
 		<Command Key="NextPeakRight" Value=":CALC:MARK{0}:MAX:RIGHT" Description="标记右峰值,{0}MARK点"/>
 		
         <Command Key="MARK打开" Value=":CALC:MARK{0}:STAT ON" Description="打开MARK,{0}MARK点"/>
+		<Command Key="MARK关闭" Value=":CALC:MARK{0}:STAT OFF" Description="关闭MARK,{0}MARK点"/>
 		
 		<Command Key="打开MARK精度" Value=":CALC:MARK{0}:FCO ON" Description="设置MARK显示精度,{0}MARK点"/>
 		<Command Key="读MARK高精度频率" Value=":CALC:MARK{0}:FCO:X?" Description="读MARK频率,{0}MARK点,读MARK高精度频率,仅在MARK显示精度打开模式下"/>

BIN
exe/apps/Tps_LQ_Transmitter/Tps_LQ_Transmitter.dll


BIN
exe/apps/Tps_LQ_Transmitter/Tps_LQ_Transmitter.pdb


BIN
exe/apps/Tps_LQ_Transmitter/config/串口控制.xlsx


+ 34 - 0
exe/logs/202108.log

@@ -7324,3 +7324,37 @@
 2021-08-22 12:31:51.6750 Info:                [source]:runtime,[msg]:插件"资源管理器"停止成功 
 2021-08-22 12:31:51.6750 Info:                [source]:runtime,[msg]:插件"6YX03B-9B"停止成功 
 2021-08-22 12:31:51.6750 Info:                [source]:runtime,[msg]:Runtime 关闭 
+2021-08-24 12:31:13.2744 Info:                [source]:runtime,[msg]:Runtime 启动 
+2021-08-24 12:31:13.3804 Info:                [source]:runtime,[msg]:加载插件"F:\Code\new\TpsLabStudio_LTS\exe\apps\DataApp\bundle.config" 
+2021-08-24 12:31:13.5854 Info:                [source]:runtime,[msg]:加载插件"F:\Code\new\TpsLabStudio_LTS\exe\apps\DevicesApp\bundle.config" 
+2021-08-24 12:31:13.5854 Info:                [source]:runtime,[msg]:加载插件"F:\Code\new\TpsLabStudio_LTS\exe\apps\Tps_LQ_Transmitter\bundle.config" 
+2021-08-24 12:31:13.6054 Info:                [source]:runtime,[msg]:AppHost 开始启动插件 
+2021-08-24 12:31:13.6054 Info:                [source]:runtime,[msg]:插件"数据管理"启动成功 
+2021-08-24 12:31:13.6054 Info:                [source]:runtime,[msg]:插件"资源管理器"启动成功 
+2021-08-24 12:31:13.6054 Info:                [source]:runtime,[msg]:插件"6YX03B-9B"启动成功 
+2021-08-24 12:31:13.6134 Info:                [source]:runtime,[msg]:Runtime 启动完成 
+2021-08-24 12:31:21.6264 Error:                [source]:Visa SearchDevices,[msg]:VISA设备搜索执行异常,   在 System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor)
+   在 System.Reflection.RuntimeConstructorInfo.Invoke(BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture)
+   在 System.RuntimeType.CreateInstanceImpl(BindingFlags bindingAttr, Binder binder, Object[] args, CultureInfo culture, Object[] activationAttributes, StackCrawlMark& stackMark)
+   在 System.Activator.CreateInstance(Type type, BindingFlags bindingAttr, Binder binder, Object[] args, CultureInfo culture, Object[] activationAttributes)
+   在 System.Activator.CreateInstance(Type type, Object[] args)
+   在 NationalInstruments.VisaNS.ResourceManager.Open(String resourceName, AccessModes accessMode, Int32 openTimeout)
+   在 NationalInstruments.VisaNS.ResourceManager.Open(String resourceName)
+   在 DevicesApp.VisaBus.GetDeviceModel(String resourcehandle, String& deviceID, String& bustype) 位置 D:\code\LabStudio\component\DevicesApp\VisaBus.cs:行号 129
+   在 DevicesApp.VisaBus.SearchDevices() 位置 D:\code\LabStudio\component\DevicesApp\VisaBus.cs:行号 30 
+2021-08-24 12:31:23.6504 Error:                [source]:Visa SearchDevices,[msg]:VISA设备搜索执行异常,   在 System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor)
+   在 System.Reflection.RuntimeConstructorInfo.Invoke(BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture)
+   在 System.RuntimeType.CreateInstanceImpl(BindingFlags bindingAttr, Binder binder, Object[] args, CultureInfo culture, Object[] activationAttributes, StackCrawlMark& stackMark)
+   在 System.Activator.CreateInstance(Type type, BindingFlags bindingAttr, Binder binder, Object[] args, CultureInfo culture, Object[] activationAttributes)
+   在 System.Activator.CreateInstance(Type type, Object[] args)
+   在 NationalInstruments.VisaNS.ResourceManager.Open(String resourceName, AccessModes accessMode, Int32 openTimeout)
+   在 NationalInstruments.VisaNS.ResourceManager.Open(String resourceName)
+   在 DevicesApp.VisaBus.GetDeviceModel(String resourcehandle, String& deviceID, String& bustype) 位置 D:\code\LabStudio\component\DevicesApp\VisaBus.cs:行号 129
+   在 DevicesApp.VisaBus.SearchDevices() 位置 D:\code\LabStudio\component\DevicesApp\VisaBus.cs:行号 30 
+2021-08-24 12:31:23.6654 Info:                [source]:资源管理器 LoadDevice,[msg]:初始化设备成功:GPIB0::34::INSTR。 
+2021-08-24 12:31:23.6784 Error:                [source]:资源管理器 LoadDevice,[msg]:初始化本地配置文件的设备异常:USB0::0x0957::0x0D0B::US49230327::INSTR,请确认设备是否存在。原因:调用的目标发生了异常。 
+2021-08-24 12:31:26.0864 Info:                [source]:runtime,[msg]:AppHost 停止插件 
+2021-08-24 12:31:26.0864 Info:                [source]:runtime,[msg]:插件"数据管理"停止成功 
+2021-08-24 12:31:26.0864 Info:                [source]:runtime,[msg]:插件"资源管理器"停止成功 
+2021-08-24 12:31:26.0944 Info:                [source]:runtime,[msg]:插件"6YX03B-9B"停止成功 
+2021-08-24 12:31:26.0944 Info:                [source]:runtime,[msg]:Runtime 关闭 

BIN
tps/TpsLabStudio/.vs/TpsLabStudio/v16/.suo


+ 1 - 1
tps/TpsLabStudio/TpsLabStudio.csproj.user

@@ -5,6 +5,6 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <StartAction>Program</StartAction>
-    <StartProgram>D:\000Code\0.TpsLabStudio_LTS\Tps_LQ_Transmitter\TpsLabStudio_LTS\exe\JGWorks.exe</StartProgram>
+    <StartProgram>F:\Project\Launch\new%288.24%29\TpsLabStudio_LTS\exe\JGWorks.exe</StartProgram>
   </PropertyGroup>
 </Project>

+ 9 - 6
tps/TpsLabStudio/models/PowerAndFreqStability.cs

@@ -155,15 +155,18 @@ namespace Tps_LQ_Transmitter.models
                     SA.Write("SingleOrCont", "1"); SA.Query("OPC");
                     Thread.Sleep(500);
                     SA.Write("MARK打开", "1"); SA.Query("OPC");
+                    Thread.Sleep(200);
                     SA.Write("打开MARK精度", "1"); SA.Query("OPC");
-                    Thread.Sleep(100);
+                    Thread.Sleep(200);
                     SA.Write("PEAK", "1"); SA.Query("OPC");
-                    SA.Write("SingleOrCont", "0"); SA.Query("OPC");
-                    SA.Write("单次扫描"); SA.Query("OPC");
-                    Thread.Sleep(100);
+                    Thread.Sleep(200);
+                    // SA.Write("SingleOrCont", "0"); SA.Query("OPC");
+                    //   SA.Write("单次扫描"); SA.Query("OPC");
+                    //   Thread.Sleep(100);
                     // string i=SA.Query("读MARK高精度频率", "1");
-                    TestFreq = double.Parse(SA.Query("读MARK高精度频率", "1")); SA.Query("OPC"); ;
-                    
+                    TestFreq = double.Parse(SA.Query("读MARK高精度频率", "1"));
+                    SA.Write("MARK关闭", "1"); SA.Query("OPC");
+
 
                     SA.Write("设置通道功率模式"); SA.Query("OPC");
                     SA.Write("SingleOrCont", "0"); SA.Query("OPC");

BIN
tps/TpsLabStudio/obj/Debug/DesignTimeResolveAssemblyReferences.cache


BIN
tps/TpsLabStudio/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache


+ 1 - 1
tps/TpsLabStudio/obj/Debug/TpsLabStudio.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-6f56a72e8483eb052eadd03b9e05a07ae2689ee4
+d7ee0bce168564a66702feb8fbfc85dec7b27a27

+ 19 - 0
tps/TpsLabStudio/obj/Debug/TpsLabStudio.csproj.FileListAbsolute.txt

@@ -41,3 +41,22 @@ F:\Code\Transmitter-3-New\TpsLabStudio_LTS\tps\TpsLabStudio\obj\Debug\TpsLabStud
 F:\Code\Transmitter-3-New\TpsLabStudio_LTS\tps\TpsLabStudio\obj\Debug\Tps_LQ_Transmitter.dll
 F:\Code\Transmitter-3-New\TpsLabStudio_LTS\tps\TpsLabStudio\obj\Debug\Tps_LQ_Transmitter.pdb
 F:\Code\Transmitter-3-New\TpsLabStudio_LTS\exe\apps\Tps_LQ_Transmitter\config\测试#常温测试#9B发射机-N9030A.xlsx
+F:\Code\new\TpsLabStudio_LTS\exe\apps\Tps_LQ_Transmitter\aa.PNG
+F:\Code\new\TpsLabStudio_LTS\exe\apps\Tps_LQ_Transmitter\config\测试#常温测试#9B发射机-N9030A.xlsx
+F:\Code\new\TpsLabStudio_LTS\exe\apps\Tps_LQ_Transmitter\config\测试#常温测试#发射机_FSU-26.xlsx
+F:\Code\new\TpsLabStudio_LTS\exe\apps\Tps_LQ_Transmitter\test.png
+F:\Code\new\TpsLabStudio_LTS\exe\apps\Tps_LQ_Transmitter\bundle.config
+F:\Code\new\TpsLabStudio_LTS\exe\apps\Tps_LQ_Transmitter\config\ModulationMode.xlsx
+F:\Code\new\TpsLabStudio_LTS\exe\apps\Tps_LQ_Transmitter\config\串口控制.xlsx
+F:\Code\new\TpsLabStudio_LTS\exe\apps\Tps_LQ_Transmitter\Tps_LQ_Transmitter.dll
+F:\Code\new\TpsLabStudio_LTS\exe\apps\Tps_LQ_Transmitter\Tps_LQ_Transmitter.pdb
+F:\Code\new\TpsLabStudio_LTS\tps\TpsLabStudio\obj\Debug\TpsLabStudio.csprojAssemblyReference.cache
+F:\Code\new\TpsLabStudio_LTS\tps\TpsLabStudio\obj\Debug\Tps_LQ_Transmitter.FrmMain.resources
+F:\Code\new\TpsLabStudio_LTS\tps\TpsLabStudio\obj\Debug\Tps_LQ_Transmitter.Properties.Resources.resources
+F:\Code\new\TpsLabStudio_LTS\tps\TpsLabStudio\obj\Debug\Tps_LQ_Transmitter.views.FrmDevice.resources
+F:\Code\new\TpsLabStudio_LTS\tps\TpsLabStudio\obj\Debug\Tps_LQ_Transmitter.views.FrmMsg.resources
+F:\Code\new\TpsLabStudio_LTS\tps\TpsLabStudio\obj\Debug\TpsLabStudio.csproj.GenerateResource.cache
+F:\Code\new\TpsLabStudio_LTS\tps\TpsLabStudio\obj\Debug\TpsLabStudio.csproj.CoreCompileInputs.cache
+F:\Code\new\TpsLabStudio_LTS\tps\TpsLabStudio\obj\Debug\TpsLabStudio.csproj.CopyComplete
+F:\Code\new\TpsLabStudio_LTS\tps\TpsLabStudio\obj\Debug\Tps_LQ_Transmitter.dll
+F:\Code\new\TpsLabStudio_LTS\tps\TpsLabStudio\obj\Debug\Tps_LQ_Transmitter.pdb

BIN
tps/TpsLabStudio/obj/Debug/TpsLabStudio.csproj.GenerateResource.cache


BIN
tps/TpsLabStudio/obj/Debug/TpsLabStudio.csprojAssemblyReference.cache


BIN
tps/TpsLabStudio/obj/Debug/Tps_LQ_Transmitter.dll


BIN
tps/TpsLabStudio/obj/Debug/Tps_LQ_Transmitter.pdb