Skip to content

2023 working #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sudilav wants to merge 2 commits into
base: master
Choose a base branch
from
Open

2023 working #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49ff92c
Fixed for 2023
sudilav Oct 6, 2023
2d796c9
fixed working method now
sudilav Oct 17, 2023
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
14 changes: 3 additions & 11 deletions Source/Custom Device Waveform-Processing-Custom-Device.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,13 @@
<RealTimeSystemDestination>c:\ni-rt\VeriStand\Custom Devices\Waveform-Processing-Custom-Device\Waveform-Processing-Custom-Device Engine Windows.llb\RT Driver VI.vi</RealTimeSystemDestination>
</Source>
<Source>
<SupportedTarget>Pharlap</SupportedTarget>
<SupportedTarget>Linux_x64</SupportedTarget>
<Source>
<Type>To Common Doc Dir</Type>
<Path>Custom Devices\Waveform-Processing-Custom-Device\Pharlap\Waveform-Processing-Custom-Device Engine Pharlap.llb\RT Driver VI.vi</Path>
<Path>Custom Devices\Waveform-Processing-Custom-Device\Linux_x64\Waveform-Processing-Custom-Device Engine Linux64.llb\RT Driver VI.vi</Path>
</Source>
<RealTimeSystemDestination>c:\ni-rt\VeriStand\Custom Devices\Waveform-Processing-Custom-Device\Waveform-Processing-Custom-Device Engine Pharlap.llb\RT Driver VI.vi</RealTimeSystemDestination>
<RealTimeSystemDestination>c:\ni-rt\NIVeriStand\Custom Devices\Waveform-Processing-Custom-Device\Waveform-Processing-Custom-Device Engine Linux64.llb\RT Driver VI.vi</RealTimeSystemDestination>
</Source>
<Source>
<SupportedTarget>VxWorks</SupportedTarget>
<Source>
<Type>To Common Doc Dir</Type>
<Path>Custom Devices\Waveform-Processing-Custom-Device\VxWorks\Waveform-Processing-Custom-Device Engine VxWorks.llb\RT Driver VI.vi</Path>
</Source>
<RealTimeSystemDestination>c:\ni-rt\VeriStand\Custom Devices\Waveform-Processing-Custom-Device\Waveform-Processing-Custom-Device Engine VxWorks.llb\RT Driver VI.vi</RealTimeSystemDestination>
</Source>
</SourceDistribution>
</CustomDeviceVI>
<Dependencies />
Expand Down
198 changes: 198 additions & 0 deletions Source/Custom Device Waveform-Processing-Custom-Device.xml.bak
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,198 @@
<?xml version="1.0" encoding="utf-8"?>
<CustomDevice xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Custom Device.xsd">
<XSDVersion Major="2010" Minor="0" Fix="0" Build="0" />
<AddMenu>
<eng>Waveform-Processing-Custom-Device</eng>
<loc>Waveform-Processing-Custom-Device</loc>
</AddMenu>
<Version>1.0.0</Version>
<Type>Inline HW Interface</Type>
<MaxOccurrence>-1</MaxOccurrence>
<MainPageGUID>2e5751d4-f26f-4961-8df7-f46ae00d1276</MainPageGUID>
<InitializationVI>
<Type>Action</Type>
<Item2Launch>
<Type>To Common Doc Dir</Type>
<Path>Custom Devices\Waveform-Processing-Custom-Device\Windows\Waveform-Processing-Custom-Device Configuration.llb\Initialization VI.vi</Path>
</Item2Launch>
</InitializationVI>
<CustomDeviceVI>
<SourceDistribution>
<Source>
<SupportedTarget>Windows</SupportedTarget>
<Source>
<Type>To Common Doc Dir</Type>
<Path>Custom Devices\Waveform-Processing-Custom-Device\Windows\Waveform-Processing-Custom-Device Engine Windows.llb\RT Driver VI.vi</Path>
</Source>
<RealTimeSystemDestination>c:\ni-rt\VeriStand\Custom Devices\Waveform-Processing-Custom-Device\Waveform-Processing-Custom-Device Engine Windows.llb\RT Driver VI.vi</RealTimeSystemDestination>
</Source>
</SourceDistribution>
</CustomDeviceVI>
<Dependencies />
<Pages>
<Page>
<Name>
<eng>Waveform-Processing-Custom-Device</eng>
<loc>Waveform-Processing-Custom-Device</loc>
</Name>
<GUID>2e5751d4-f26f-4961-8df7-f46ae00d1276</GUID>
<Glyph>
<Type>To Application Data Dir</Type>
<Path>System Explorer\Glyphs\ai section wfm.png</Path>
</Glyph>
<Item2Launch>
<Type>To Common Doc Dir</Type>
<Path>Custom Devices\Waveform-Processing-Custom-Device\Windows\Waveform-Processing-Custom-Device Configuration.llb\Main Page.vi</Path>
</Item2Launch>
<RunTimeMenu>
<MenuItem>
<GUID>01e8f077-156a-4698-bbdc-a047cf741b9d</GUID>
<Type>Action</Type>
<Name>
<eng>Disable</eng>
<loc>Disable</loc>
</Name>
<Item2Launch>
<Type>To Common Doc Dir</Type>
<Path>Custom Devices\Waveform-Processing-Custom-Device\Windows\Waveform-Processing-Custom-Device Configuration.llb\EnableDisable Main Page.vi</Path>
</Item2Launch>
</MenuItem>
<MenuItem>
<GUID>7755077A-1485-13A6-5674A23FB86277FF</GUID>
<Type>Separator</Type>
<Name>
<eng>.</eng>
<loc>.</loc>
</Name>
<Item2Launch>
<Type>Absolute</Type>
<Path>.</Path>
</Item2Launch>
</MenuItem>
<MenuItem>
<GUID>77550670-1485-13A6-568B9AB41979630D</GUID>
<Type>Action</Type>
<Name>
<eng>Delete</eng>
<loc>Delete</loc>
</Name>
<Item2Launch>
<Type>Absolute</Type>
<Path>Actions\Delete.vi</Path>
</Item2Launch>
</MenuItem>
</RunTimeMenu>
<ActionVIOnCompile>
<Type>To Common Doc Dir</Type>
<Path>Custom Devices\Waveform-Processing-Custom-Device\Windows\Waveform-Processing-Custom-Device Configuration.llb\ActionVIOnCompile.vi</Path>
</ActionVIOnCompile>
</Page>
<Page>
<Name>
<eng>Waveform-Processing-Custom-Device</eng>
<loc>Waveform-Processing-Custom-Device</loc>
</Name>
<GUID>7b547a45-b3bf-4a70-a525-6bc55fa12b7c</GUID>
<Glyph>
<Type>To Application Data Dir</Type>
<Path>System Explorer\Glyphs\fpga device_disabled.png</Path>
</Glyph>
<Item2Launch>
<Type>To Common Doc Dir</Type>
<Path>Custom Devices\Waveform-Processing-Custom-Device\Windows\Waveform-Processing-Custom-Device Configuration.llb\Main Page.vi</Path>
</Item2Launch>
<RunTimeMenu>
<MenuItem>
<GUID>01e8f077-156a-4698-bbdc-a047cf741b9d</GUID>
<Type>Action</Type>
<Name>
<eng>Enable</eng>
<loc>Enable</loc>
</Name>
<Item2Launch>
<Type>To Common Doc Dir</Type>
<Path>Custom Devices\Waveform-Processing-Custom-Device\Windows\Waveform-Processing-Custom-Device Configuration.llb\EnableDisable Main Page.vi</Path>
</Item2Launch>
</MenuItem>
<MenuItem>
<GUID>7755077A-1485-13A6-5674A23FB86277FF</GUID>
<Type>Separator</Type>
<Name>
<eng>.</eng>
<loc>.</loc>
</Name>
<Item2Launch>
<Type>Absolute</Type>
<Path>.</Path>
</Item2Launch>
</MenuItem>
<MenuItem>
<GUID>77550670-1485-13A6-568B9AB41979630D</GUID>
<Type>Action</Type>
<Name>
<eng>Delete</eng>
<loc>Delete</loc>
</Name>
<Item2Launch>
<Type>Absolute</Type>
<Path>Actions\Delete.vi</Path>
</Item2Launch>
</MenuItem>
</RunTimeMenu>
</Page>
<Page>
<Name>
<eng>Running Average Settings</eng>
<loc>Running Average Settings</loc>
</Name>
<DisallowRenaming>true</DisallowRenaming>
<DeleteProtection>true</DeleteProtection>
<GUID>98bae003-a8c4-4cad-9e5d-6f3690f27bc7</GUID>
<Glyph>
<Type>To Application Data Dir</Type>
<Path>System Explorer\Glyphs\sim parameters.png</Path>
</Glyph>
<Item2Launch>
<Type>To Common Doc Dir</Type>
<Path>Custom Devices\Waveform-Processing-Custom-Device\Windows\Waveform-Processing-Custom-Device Configuration.llb\Running Average Settings.vi</Path>
</Item2Launch>
</Page>
<Page>
<Name>
<eng>Scaled Waveform Settings</eng>
<loc>Scaled Waveform Settings</loc>
</Name>
<DisallowRenaming>true</DisallowRenaming>
<DeleteProtection>true</DeleteProtection>
<GUID>573b5558-ec58-48eb-8ed3-20ae50d5140e</GUID>
<Glyph>
<Type>To Application Data Dir</Type>
<Path>System Explorer\Glyphs\sim parameters.png</Path>
</Glyph>
<Item2Launch>
<Type>To Common Doc Dir</Type>
<Path>Custom Devices\Waveform-Processing-Custom-Device\Windows\Waveform-Processing-Custom-Device Configuration.llb\Scaled Waveform Settings.vi</Path>
</Item2Launch>
</Page>
<Page>
<Name>
<eng>Waveform Results Section</eng>
<loc>Waveform Results Section</loc>
</Name>
<DisallowRenaming>true</DisallowRenaming>
<DeleteProtection>true</DeleteProtection>
<GUID>e38e89f1-3d1b-4012-b75e-d54b3a46b12e</GUID>
<Glyph>
<Type>To Application Data Dir</Type>
<Path>System Explorer\Glyphs\ChnGroup.png</Path>
</Glyph>
<Item2Launch>
<Type>To Common Doc Dir</Type>
<Path>Custom Devices\Waveform-Processing-Custom-Device\Windows\Waveform-Processing-Custom-Device Configuration.llb\Waveform Results Section.vi</Path>
</Item2Launch>
</Page>
</Pages>
<CustomXML>
<Dummy></Dummy>
</CustomXML>
</CustomDevice>
Binary file modified Source/Engine/Async/Processing Steps/Running Average.vi
View file
Open in desktop
Binary file not shown.
Binary file modified Source/Engine/Async/Processing Steps/Scale Waveform.vi
View file
Open in desktop
Binary file not shown.
Binary file modified Source/Engine/Async/SubVIs/Get Async FIFO Refs.vi
View file
Open in desktop
Binary file not shown.
Binary file modified Source/Engine/Async/SubVIs/Init Buffer.vi
View file
Open in desktop
Binary file not shown.
Binary file modified Source/Engine/Async/SubVIs/Read Wfm Data.vi
View file
Open in desktop
Binary file not shown.
Binary file modified Source/Engine/Async/SubVIs/Start Result Waveforms (First Call).vi
View file
Open in desktop
Binary file not shown.
Binary file modified Source/Engine/Async/SubVIs/Write Wfm Data.vi
View file
Open in desktop
Binary file not shown.
Binary file modified Source/Engine/RT Driver VI.vi
View file
Open in desktop
Binary file not shown.
Binary file modified Source/Engine/RTStateVariables.ctl
View file
Open in desktop
Binary file not shown.
Binary file modified Source/Engine/SubVIs/Build Async Parameters.vi
View file
Open in desktop
Binary file not shown.
Binary file modified Source/Engine/SubVIs/Open Waveform Sessions.vi
View file
Open in desktop
Binary file not shown.
Binary file modified Source/Engine/Types/AsyncStateVariables.ctl
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions Source/Engine/Waveform-Processing-Custom-Device Engine.lvlib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<Library LVVersion="15008000">
<Property Name="NI.Lib.Icon" Type="Bin">&amp;1#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!(]!!!*Q(C=\&gt;8"=&gt;MQ%!8143;(8.6"2CVM#WJ",7Q,SN&amp;(N&lt;!NK!7VM#WI"&lt;8A0$%94UZ2$P%E"Y.?G@I%A7=11U&gt;M\7P%FXB^VL\`NHV=@X&lt;^39O0^N(_&lt;8NZOEH@@=^_CM?,3)VK63LD-&gt;8LS%=_]J'0@/1N&lt;XH,7^\SFJ?]Z#5P?=F,HP+5JTTF+5`Z&gt;MB$(P+1)YX*RU2DU$(![)Q3YW.YBG&gt;YBM@8'*\B':\B'2Z&gt;9HC':XC':XD=&amp;M-T0--T0-.DK%USWS(H'2\$2`-U4`-U4`/9-JKH!&gt;JE&lt;?!W#%;UC_WE?:KH?:R']T20]T20]\A=T&gt;-]T&gt;-]T?/7&lt;66[UTQ//9^BIHC+JXC+JXA-(=640-640-6DOCC?YCG)-G%:(#(+4;6$_6)]R?.8&amp;%`R&amp;%`R&amp;)^,WR/K&lt;75?GM=BZUG?Z%G?Z%E?1U4S*%`S*%`S'$;3*XG3*XG3RV320-G40!G3*D6^J-(3D;F4#J,(T\:&lt;=HN+P5FS/S,7ZIWV+7.NNFC&lt;+.&lt;GC0819TX-7!]JVO,(7N29CR6L%7,^=&lt;(1M4#R*IFV][.DX(X?V&amp;6&gt;V&amp;G&gt;V&amp;%&gt;V&amp;\N(L@_Z9\X_TVONVN=L^?Y8#ZR0J`D&gt;$L&amp;]8C-Q_%1_`U_&gt;LP&gt;WWPAG_0NB@$TP@4C`%`KH@[8`A@PRPA=PYZLD8Y!#/7SO!!!!!!</Property>
<Property Name="NI.Lib.SourceVersion" Type="Int">352354304</Property>
<Library LVVersion="23008000">
<Property Name="NI.Lib.Icon" Type="Bin">)Q#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!(]!!!*Q(C=\&gt;8"=&gt;MQ%!8143;(8.6"2CVM#WJ",7Q,SN&amp;(N&lt;!NK!7VM#WI"&lt;8A0$%94UZ2$P%E"Y.?G@I%A7=11U&gt;M\7P%FXB^VL\`NHV=@X&lt;^39O0^N(_&lt;8NZOEH@@=^_CM?,3)VK63LD-&gt;8LS%=_]J'0@/1N&lt;XH,7^\SFJ?]Z#5P?=F,HP+5JTTF+5`Z&gt;MB$(P+1)YX*RU2DU$(![)Q3YW.YBG&gt;YBM@8'*\B':\B'2Z&gt;9HC':XC':XD=&amp;M-T0--T0-.DK%USWS(H'2\$2`-U4`-U4`/9-JKH!&gt;JE&lt;?!W#%;UC_WE?:KH?:R']T20]T20]\A=T&gt;-]T&gt;-]T?/7&lt;66[UTQ//9^BIHC+JXC+JXA-(=640-640-6DOCC?YCG)-G%:(#(+4;6$_6)]R?.8&amp;%`R&amp;%`R&amp;)^,WR/K&lt;75?GM=BZUG?Z%G?Z%E?1U4S*%`S*%`S'$;3*XG3*XG3RV320-G40!G3*D6^J-(3D;F4#J,(T\:&lt;=HN+P5FS/S,7ZIWV+7.NNFC&lt;+.&lt;GC0819TX-7!]JVO,(7N29CR6L%7,^=&lt;(1M4#R*IFV][.DX(X?V&amp;6&gt;V&amp;G&gt;V&amp;%&gt;V&amp;\N(L@_Z9\X_TVONVN=L^?Y8#ZR0J`D&gt;$L&amp;]8C-Q_%1_`U_&gt;LP&gt;WWPAG_0NB@$TP@4C`%`KH@[8`A@PRPA=PYZLD8Y!#/7SO!!!!!!</Property>
<Property Name="NI.Lib.SourceVersion" Type="Int">587235328</Property>
<Property Name="NI.Lib.Version" Type="Str">1.0.0.0</Property>
<Item Name="Engine" Type="Folder">
<Item Name="SubVIs" Type="Folder">
Expand Down
Binary file modified Source/Engine/Waveform-Processing-Custom-Device.Async.vi
View file
Open in desktop
Binary file not shown.
Binary file modified Source/Shared/CD Config Settings FG.vi
View file
Open in desktop
Binary file not shown.
Binary file modified Source/Shared/CompiledSettings.ctl
View file
Open in desktop
Binary file not shown.
Binary file modified Source/Shared/Custom Device Settings.ctl
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions Source/Shared/Running Average/Running Average.lvlib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<Library LVVersion="15008000">
<Library LVVersion="23008000">
<Property Name="NI.Lib.ContainingLib" Type="Str">Waveform-Processing-Custom-Device Shared.lvlib</Property>
<Property Name="NI.Lib.ContainingLibPath" Type="Str">../../Waveform-Processing-Custom-Device Shared.lvlib</Property>
<Property Name="NI.Lib.Icon" Type="Bin">&amp;1#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!(]!!!*Q(C=\&gt;7R=2MR%!81N=?"5X&lt;A91P&lt;!FNA#^M#5Y6M96NA"R[WM#WQ"&lt;9A0ZYR'E?G!WPM1$AN&gt;@S(!ZZQG&amp;0%VLZ'@)H8:_X\&lt;^P(^7@8H\4Y;"`NX\;8JZPUX@@MJXC]C.3I6K5S(F/^DHTE)R`ZS%@?]J;XP/5N&lt;XH*3V\SEJ?]Z#F0?=J4HP+5&lt;Y=]Z#%0/&gt;+9@%QU"BU$D-YI-4[':XC':XB]D?%:HO%:HO(2*9:H?):H?)&lt;(&lt;4%]QT-]QT-]BNIEMRVSHO%R@$20]T20]T30+;.Z'K".VA:OAW"%O^B/GK&gt;ZGM&gt;J.%`T.%`T.)`,U4T.UTT.UTROW6;F.]XDE0-9*IKH?)KH?)L(U&amp;%]R6-]R6-]JIPC+:[#+"/7Q2'CX&amp;1[F#`&amp;5TR_2@%54`%54`'YN$WBWF&lt;GI8E==J\E3:\E3:\E-51E4`)E4`)EDW%D?:)H?:)H?5Q6S:-]S:-A;6,42RIMX:A[J3"Z`'S\*&lt;?HV*MENS.C&lt;&gt;Z9GT,7:IOVC7*NDFA00&gt;&lt;$D0719CV_L%7.N6CR&amp;C(7(R=,(1M4;Z*9.T][RNXH46X62:X632X61?X6\H(L8_ZYP^`D&gt;LP&amp;^8K.S_53Z`-Z4K&gt;4()`(/"Q/M&gt;`P9\@&lt;P&lt;U'PDH?8AA`XUMPTP_EXOF`[8`Q&lt;IT0]?OYVOA(5/(_Z!!!!!!</Property>
<Property Name="NI.Lib.SourceVersion" Type="Int">352354304</Property>
<Property Name="NI.Lib.Icon" Type="Bin">)Q#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!(]!!!*Q(C=\&gt;7R=2MR%!81N=?"5X&lt;A91P&lt;!FNA#^M#5Y6M96NA"R[WM#WQ"&lt;9A0ZYR'E?G!WPM1$AN&gt;@S(!ZZQG&amp;0%VLZ'@)H8:_X\&lt;^P(^7@8H\4Y;"`NX\;8JZPUX@@MJXC]C.3I6K5S(F/^DHTE)R`ZS%@?]J;XP/5N&lt;XH*3V\SEJ?]Z#F0?=J4HP+5&lt;Y=]Z#%0/&gt;+9@%QU"BU$D-YI-4[':XC':XB]D?%:HO%:HO(2*9:H?):H?)&lt;(&lt;4%]QT-]QT-]BNIEMRVSHO%R@$20]T20]T30+;.Z'K".VA:OAW"%O^B/GK&gt;ZGM&gt;J.%`T.%`T.)`,U4T.UTT.UTROW6;F.]XDE0-9*IKH?)KH?)L(U&amp;%]R6-]R6-]JIPC+:[#+"/7Q2'CX&amp;1[F#`&amp;5TR_2@%54`%54`'YN$WBWF&lt;GI8E==J\E3:\E3:\E-51E4`)E4`)EDW%D?:)H?:)H?5Q6S:-]S:-A;6,42RIMX:A[J3"Z`'S\*&lt;?HV*MENS.C&lt;&gt;Z9GT,7:IOVC7*NDFA00&gt;&lt;$D0719CV_L%7.N6CR&amp;C(7(R=,(1M4;Z*9.T][RNXH46X62:X632X61?X6\H(L8_ZYP^`D&gt;LP&amp;^8K.S_53Z`-Z4K&gt;4()`(/"Q/M&gt;`P9\@&lt;P&lt;U'PDH?8AA`XUMPTP_EXOF`[8`Q&lt;IT0]?OYVOA(5/(_Z!!!!!!</Property>
<Property Name="NI.Lib.SourceVersion" Type="Int">587235328</Property>
<Property Name="NI.Lib.Version" Type="Str">1.0.0.0</Property>
<Property Name="NI.LV.All.SourceOnly" Type="Bool">false</Property>
<Item Name="Engine" Type="Folder">
Expand Down
Binary file modified Source/Shared/Running Average/RunningAverage-AddResultChannels.vi
View file
Open in desktop
Binary file not shown.
Binary file modified Source/Shared/Running Average/RunningAverage-AddSection.vi
View file
Open in desktop
Binary file not shown.
Binary file modified Source/Shared/Running Average/RunningAverage-GetGroupData.vi
View file
Open in desktop
Binary file not shown.
Binary file modified Source/Shared/Running Average/RunningAverage-RemoveResultChannel.vi
View file
Open in desktop
Binary file not shown.
Binary file modified Source/Shared/Running Average/RunningAverage-RemoveSection.vi
View file
Open in desktop
Binary file not shown.
Binary file modified Source/Shared/Running Average/RunningAverage-UpdateChannels.vi
View file
Open in desktop
Binary file not shown.
Loading