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
2 changes: 1 addition & 1 deletion .github/workflows/Build_VIPM_Library.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
# This workflow contains a single job called "build"
Build_VIPM_Library:
# The type of runner that the job will run on
runs-on: [self-hosted, lv2014]
runs-on: [self-hosted, lv2017]

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Check_Broken_VIs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
# This workflow contains a single job called "build"
Check_Broken_VIs:
# The type of runner that the job will run on
runs-on: [self-hosted, lv2014]
runs-on: [self-hosted, lv2017]

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ build/
installer/
ignore/
storage/
/vip/*.vip
File renamed without changes.
59 changes: 1 addition & 58 deletions GlobalStop.lvproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<Project Type="Project" LVVersion="14008000">
<Project Type="Project" LVVersion="17008000">
<Property Name="NI.LV.All.SourceOnly" Type="Bool">true</Property>
<Property Name="SMProvider.SMVersion" Type="Int">201310</Property>
<Item Name="My Computer" Type="My Computer">
Expand Down Expand Up @@ -28,61 +28,4 @@
<Property Name="NI.SortType" Type="Int">3</Property>
</Item>
</Item>
<Item Name="RT CompactRIO终端" Type="RT CompactRIO">
<Property Name="alias.name" Type="Str">RT CompactRIO终端</Property>
<Property Name="alias.value" Type="Str">0.0.0.0</Property>
<Property Name="CCSymbols" Type="Str">TARGET_TYPE,RT;OS,VxWorks;CPU,PowerPC;</Property>
<Property Name="crio.ControllerPID" Type="Str">7459</Property>
<Property Name="crio.family" Type="Str">901x</Property>
<Property Name="host.ResponsivenessCheckEnabled" Type="Bool">true</Property>
<Property Name="host.ResponsivenessCheckPingDelay" Type="UInt">5000</Property>
<Property Name="host.ResponsivenessCheckPingTimeout" Type="UInt">1000</Property>
<Property Name="host.TargetCPUID" Type="UInt">2</Property>
<Property Name="host.TargetOSID" Type="UInt">14</Property>
<Property Name="target.cleanupVisa" Type="Bool">false</Property>
<Property Name="target.FPProtocolGlobals_ControlTimeLimit" Type="Int">300</Property>
<Property Name="target.getDefault-&gt;WebServer.Port" Type="Int">80</Property>
<Property Name="target.getDefault-&gt;WebServer.Timeout" Type="Int">60</Property>
<Property Name="target.IOScan.Faults" Type="Str"></Property>
<Property Name="target.IOScan.NetVarPeriod" Type="UInt">100</Property>
<Property Name="target.IOScan.NetWatchdogEnabled" Type="Bool">false</Property>
<Property Name="target.IOScan.Period" Type="UInt">10000</Property>
<Property Name="target.IOScan.PowerupMode" Type="UInt">0</Property>
<Property Name="target.IOScan.Priority" Type="UInt">0</Property>
<Property Name="target.IOScan.ReportModeConflict" Type="Bool">true</Property>
<Property Name="target.IsRemotePanelSupported" Type="Bool">true</Property>
<Property Name="target.RTCPULoadMonitoringEnabled" Type="Bool">true</Property>
<Property Name="target.RTDebugWebServerHTTPPort" Type="Int">8001</Property>
<Property Name="target.RTTarget.ApplicationPath" Type="Path">/c/ni-rt/startup/startup.rtexe</Property>
<Property Name="target.RTTarget.EnableFileSharing" Type="Bool">true</Property>
<Property Name="target.RTTarget.IPAccess" Type="Str">+*</Property>
<Property Name="target.RTTarget.LaunchAppAtBoot" Type="Bool">false</Property>
<Property Name="target.RTTarget.VIPath" Type="Path">/c/ni-rt/startup</Property>
<Property Name="target.server.app.propertiesEnabled" Type="Bool">true</Property>
<Property Name="target.server.control.propertiesEnabled" Type="Bool">true</Property>
<Property Name="target.server.tcp.access" Type="Str">+*</Property>
<Property Name="target.server.tcp.enabled" Type="Bool">false</Property>
<Property Name="target.server.tcp.paranoid" Type="Bool">true</Property>
<Property Name="target.server.tcp.port" Type="Int">3363</Property>
<Property Name="target.server.tcp.serviceName" Type="Str">Main Application Instance/VI Server</Property>
<Property Name="target.server.tcp.serviceName.default" Type="Str">Main Application Instance/VI Server</Property>
<Property Name="target.server.vi.access" Type="Str">+*</Property>
<Property Name="target.server.vi.callsEnabled" Type="Bool">true</Property>
<Property Name="target.server.vi.propertiesEnabled" Type="Bool">true</Property>
<Property Name="target.WebServer.Enabled" Type="Bool">false</Property>
<Property Name="target.WebServer.LogEnabled" Type="Bool">false</Property>
<Property Name="target.WebServer.LogPath" Type="Path">/c/ni-rt/system/www/www.log</Property>
<Property Name="target.WebServer.Port" Type="Int">80</Property>
<Property Name="target.WebServer.RootPath" Type="Path">/c/ni-rt/system/www</Property>
<Property Name="target.WebServer.TcpAccess" Type="Str">c+*</Property>
<Property Name="target.WebServer.Timeout" Type="Int">60</Property>
<Property Name="target.WebServer.ViAccess" Type="Str">+*</Property>
<Property Name="target.webservices.SecurityAPIKey" Type="Str">PqVr/ifkAQh+lVrdPIykXlFvg12GhhQFR8H9cUhphgg=:pTe9HRlQuMfJxAG6QCGq7UvoUpJzAzWGKy5SbZ+roSU=</Property>
<Property Name="target.webservices.ValidTimestampWindow" Type="Int">15</Property>
<Item Name="main2.vi" Type="VI" URL="../main2.vi"/>
<Item Name="依赖关系" Type="Dependencies">
<Item Name="GSTOP.lvlib" Type="Library" URL="../src/user.lib/_NEVSTOP/GlobalStop/GSTOP.lvlib"/>
</Item>
<Item Name="程序生成规范" Type="Build"/>
</Item>
</Project>
2 changes: 1 addition & 1 deletion README.en.md → README(en).md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# LabVIEW GlobalStop Library

[中文](./README.md) | [English](./README.en.md)
[中文](./README.md) | [English](./README(en).md)

[![Check_Broken_VIs](https://github.com/NEVSTOP-LAB/LabVIEW-GlobalStop-Library/actions/workflows/Check_Broken_VIs.yml/badge.svg)](https://github.com/NEVSTOP-LAB/LabVIEW-GlobalStop-Library/actions/workflows/Check_Broken_VIs.yml)
[![Build_VIPM_Library](https://github.com/NEVSTOP-LAB/LabVIEW-GlobalStop-Library/actions/workflows/Build_VIPM_Library.yml/badge.svg)](https://github.com/NEVSTOP-LAB/LabVIEW-GlobalStop-Library/actions/workflows/Build_VIPM_Library.yml)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# LabVIEW GlobalStop Library

[中文](./README.md) | [English](./README.en.md)
[中文](./README.md) | [English](./README(en).md)

[![Check_Broken_VIs](https://github.com/NEVSTOP-LAB/LabVIEW-GlobalStop-Library/actions/workflows/Check_Broken_VIs.yml/badge.svg)](https://github.com/NEVSTOP-LAB/LabVIEW-GlobalStop-Library/actions/workflows/Check_Broken_VIs.yml)
[![Build_VIPM_Library](https://github.com/NEVSTOP-LAB/LabVIEW-GlobalStop-Library/actions/workflows/Build_VIPM_Library.yml/badge.svg)](https://github.com/NEVSTOP-LAB/LabVIEW-GlobalStop-Library/actions/workflows/Build_VIPM_Library.yml)
Expand Down
Loading
Loading