Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Battery/OpenTap.Plugins.Demo.Battery.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

<ItemGroup>
<PackageReference Include="OpenTAP" Version="$(OpenTapVersion)" />
<OpenTapPackageReference Include="Metrics and Assets" Version="1.0.0+98e36f0d"/>
</ItemGroup>

</Project>
5 changes: 0 additions & 5 deletions Battery/PowerAnalyzer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
// you find useful, provided that you agree that Keysight Technologies has no
// warranty, obligations or liability for any sample application files.

using System;
using System.Diagnostics;
using OpenTap.Metrics;

namespace OpenTap.Plugins.Demo.Battery
{
Expand All @@ -16,9 +14,6 @@ public class PowerAnalyzer : Instrument
{
private double idleVoltage = 0.0;

[Metric] [Unit("V")]
[Display("Idle Voltage")]
public double? IdleVoltage => Math.Round( lastBattery?.Model?.Voc ?? idleVoltage, 2);
public PowerAnalyzer()
{
Name = "PSU";
Expand Down
5 changes: 0 additions & 5 deletions Battery/TemperatureChamber.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
// warranty, obligations or liability for any sample application files.

using System;
using OpenTap.Metrics;

namespace OpenTap.Plugins.Demo.Battery
{
Expand All @@ -16,10 +15,6 @@ public class TemperatureChamber : Instrument
private double temperatureTarget = 50;
public static double Temperature = 25;
public static double Humidity = 25;
[Metric]
[Unit("°C")]
[Display("Temperature")]
public double TemperatureMetric => Math.Round(Temperature, 2);

public TemperatureChamber()
{
Expand Down
94 changes: 51 additions & 43 deletions package.xml
Original file line number Diff line number Diff line change
@@ -1,46 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<Package Name="Demonstration" xmlns="http://opentap.io/schemas/package" Version="$(GitVersion)" OS="Windows,Linux,Macos">
<Description>
This plugin package contains a number of demonstration plugins, demonstration test steps, and demonstration test plans.
<Status>Released</Status>
<Organisation>OpenTAP</Organisation>
<Contacts><Contact Email="support@opentap.io" Name="OpenTAP Support"/></Contacts>
<Hardware>Emulated PSU</Hardware>
</Description>
<Package Name="Demonstration" xmlns="http://opentap.io/schemas/package" Version="$(GitVersion)"
OS="Windows,Linux,Macos">
<Description>
This plugin package contains a number of demonstration plugins, demonstration test steps, and demonstration test
plans.
<Status>Released</Status>
<Organisation>OpenTAP</Organisation>
<Contacts>
<Contact Email="support@opentap.io" Name="OpenTAP Support"/>
</Contacts>
<Hardware>Emulated PSU</Hardware>
</Description>
<Owner>Keysight Technologies, Inc.</Owner>
<SourceUrl>https://github.com/opentap/Demonstration</SourceUrl>
<Files>
<!--Note that this package file is homed in ONE of the projects, but actually picks up TWO dlls.
One of those dlls comes from a second project.-->
<File Path="Packages/Demonstration/OpenTap.Plugins.Demo.Battery.dll">
<SetAssemblyInfo Attributes="Version"/>
</File>
<File Path="Packages/Demonstration/OpenTap.Plugins.Demo.ResultsAndTiming.dll">
<SetAssemblyInfo Attributes="Version"/>
</File>
<File Path="Packages/Demonstration/OpenTap.Plugins.Demo.Battery.UI.dll">
<SetAssemblyInfo Attributes="Version"/>
</File>
<File Path="Packages/Demonstration/SampleLog.txt"/>
<File Path="Packages/Demonstration/DataGenForResultsViewer.TapPlan"/>
<File Path="Packages/Demonstration/DataGenForTimingAnalysis.TapPlan"/>
<File Path="Packages/Demonstration/DataGenForTimingAnalysisParallel.TapPlan"/>
<File Path="Packages/Demonstration/Tests/DemonstrationAllSteps.TapPlan" SourcePath="Tests/DemonstrationAllSteps.TapPlan"/>
<File Path="Packages/Demonstration/Tests/Test Bench Profile/Connections.xml" SourcePath="Tests/Test Bench Profile/Connections.xml"/>
<File Path="Packages/Demonstration/Tests/Test Bench Profile/DUTs.xml" SourcePath="Tests/Test Bench Profile/DUTs.xml"/>
<File Path="Packages/Demonstration/Tests/Test Bench Profile/Instruments.xml" SourcePath="Tests/Test Bench Profile/Instruments.xml"/>

<!--To pick up the chm file you should:
1. Add the file to the project that homes the package definition
2. Mark that file as
BuildAction = Content
Copy to Output Directory = Copy if newer-->
<File Path="DemonstrationHelp.chm"/>
</Files>
<PackageActionExtensions>
<ActionStep ActionName = "test" ExeFile="tap" Arguments='run Packages/Demonstration/DataGenForResultsViewer.TapPlan' />
<ActionStep ActionName = "test" ExeFile="tap" Arguments='run Packages/Demonstration/DataGenForTimingAnalysis.TapPlan --settings "../../Packages/Demonstration/Tests/Test Bench Profile"' />
<ActionStep ActionName = "test" ExeFile="tap" Arguments='run Packages/Demonstration/DataGenForTimingAnalysisParallel.TapPlan --settings "../../Packages/Demonstration/Tests/Test Bench Profile"' />
<ActionStep ActionName = "test" ExeFile="tap" Arguments='run Packages/Demonstration/Tests/DemonstrationAllSteps.TapPlan --settings "../../Packages/Demonstration/Tests/Test Bench Profile"' />
</PackageActionExtensions>
<SourceUrl>https://github.com/opentap/Demonstration</SourceUrl>
<Files>
<!--Note that this package file is homed in ONE of the projects, but actually picks up TWO dlls.
One of those dlls comes from a second project.-->
<File Path="Packages/Demonstration/OpenTap.Plugins.Demo.Battery.dll">
<SetAssemblyInfo Attributes="Version"/>
</File>
<File Path="Packages/Demonstration/OpenTap.Plugins.Demo.ResultsAndTiming.dll">
<SetAssemblyInfo Attributes="Version"/>
</File>
<File Path="Packages/Demonstration/OpenTap.Plugins.Demo.Battery.UI.dll">
<SetAssemblyInfo Attributes="Version"/>
</File>
<File Path="Packages/Demonstration/SampleLog.txt"/>
<File Path="Packages/Demonstration/DataGenForResultsViewer.TapPlan"/>
<File Path="Packages/Demonstration/DataGenForTimingAnalysis.TapPlan"/>
<File Path="Packages/Demonstration/DataGenForTimingAnalysisParallel.TapPlan"/>
<File Path="Packages/Demonstration/Tests/DemonstrationAllSteps.TapPlan"
SourcePath="Tests/DemonstrationAllSteps.TapPlan"/>
<File Path="Packages/Demonstration/Tests/Test Bench Profile/Connections.xml"
SourcePath="Tests/Test Bench Profile/Connections.xml"/>
<File Path="Packages/Demonstration/Tests/Test Bench Profile/DUTs.xml"
SourcePath="Tests/Test Bench Profile/DUTs.xml"/>
<File Path="Packages/Demonstration/Tests/Test Bench Profile/Instruments.xml"
SourcePath="Tests/Test Bench Profile/Instruments.xml"/>
<File Path="Packages/Demonstration/battery_demo.TapReport"/>
<File Path="Packages/Demonstration/battery_demo_preset.xml"/>
<File Path="DemonstrationHelp.chm"/>
</Files>
<PackageActionExtensions>
<ActionStep ActionName="test" ExeFile="tap"
Arguments='run Packages/Demonstration/DataGenForResultsViewer.TapPlan'/>
<ActionStep ActionName="test" ExeFile="tap"
Arguments='run Packages/Demonstration/DataGenForTimingAnalysis.TapPlan --settings "../../Packages/Demonstration/Tests/Test Bench Profile"'/>
<ActionStep ActionName="test" ExeFile="tap"
Arguments='run Packages/Demonstration/DataGenForTimingAnalysisParallel.TapPlan --settings "../../Packages/Demonstration/Tests/Test Bench Profile"'/>
<ActionStep ActionName="test" ExeFile="tap"
Arguments='run Packages/Demonstration/Tests/DemonstrationAllSteps.TapPlan --settings "../../Packages/Demonstration/Tests/Test Bench Profile"'/>
</PackageActionExtensions>
</Package>