Skip to content
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

Data on demand #7

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

Data on demand #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f48b962
Send r before attempting to read from arduino COM port
adambrown1 Jan 30, 2017
c509010
Move arduino reading (including serial command to arduino) to sub-vi
adambrown1 Jan 31, 2017
f074ca5
Tidy up shift registers doing nothing to tunnels
adambrown1 Jan 31, 2017
b6c3d4b
Move slow tidy up outside loop structure
adambrown1 Jan 31, 2017
629807c
Remove superfluous close slow control case
adambrown1 Jan 31, 2017
50ac24a
More tidying
adambrown1 Jan 31, 2017
5e8843e
Finish tidying, convert slow control frequency to slow control update…
adambrown1 Jan 31, 2017
1154453
Add check to arduino read subVI to ensure there is not 'left over' da…
adambrown1 Feb 1, 2017
da1e0ac
Check more thoroughly for NIST errors
adambrown1 Feb 8, 2017
4ed84eb
Better error handling when getting NIST time and see arbitrary choice…
adambrown1 May 10, 2017
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
6 changes: 3 additions & 3 deletions CAENHVs/CAEN/labview/CAENHVWrapper/CAENHVWrapper.lvlib
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified CAENHVs/CAEN/labview/CAENHVWrapper/VIs/CAENHV Deinit System.vi
View file
Open in desktop
Binary file not shown.
Binary file modified CAENHVs/CAEN/labview/CAENHVWrapper/VIs/CAENHV Get Ch Param Single.vi
View file
Open in desktop
Binary file not shown.
Binary file modified CAENHVs/CAEN/labview/CAENHVWrapper/VIs/CAENHV Init System.vi
View file
Open in desktop
Binary file not shown.
Binary file modified CAENHVs/CAEN/labview/CAENHVWrapper/subvi/Error Converter (ErrCode or Status).vi
View file
Open in desktop
Binary file not shown.
Binary file modified CAENHVs/sCAEN Read.vi
View file
Open in desktop
Binary file not shown.
Binary file modified FPGA Bitfiles/ModuFPGAtype.ctl
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion ModuDAQ.aliases
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ Bose = "128.210.146.51"
Einstein = "128.210.146.200"

[My Computer]
My Computer = "128.210.146.106"
My Computer = "130.60.154.136"

2 changes: 1 addition & 1 deletion ModuDAQ.lvlps
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[ProjectWindow_Data]
ProjectExplorer.ClassicPosition[String] = "131,692,816,1278"
ProjectExplorer.ClassicPosition[String] = "34,824,719,1410"

173 changes: 98 additions & 75 deletions ModuDAQ.lvproj
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified ModuHost.vi
View file
Open in desktop
Binary file not shown.
Binary file modified fDisplay Waveform.vi
View file
Open in desktop
Binary file not shown.
Binary file modified fFIFO Throughput.vi
View file
Open in desktop
Binary file not shown.
Binary file modified fFPGA Initialization.vi
View file
Open in desktop
Binary file not shown.
Binary file modified fWrite Binary.vi
View file
Open in desktop
Binary file not shown.
Binary file modified hCreate Data Filename.vi
View file
Open in desktop
Binary file not shown.
Binary file modified hv cluster control.ctl
View file
Open in desktop
Binary file not shown.
Binary file modified sArduinoParse.vi
View file
Open in desktop
Binary file not shown.
Binary file modified sCombine Slow.vi
View file
Open in desktop
Binary file not shown.
Binary file modified sData Write.vi
View file
Open in desktop
Binary file not shown.
Binary file modified sGet NIST Time.vi
View file
Open in desktop
Binary file not shown.
Binary file modified sInitialization.vi
View file
Open in desktop
Binary file not shown.
Binary file added sReadArduinoParams.vi
View file
Open in desktop
Binary file not shown.
Binary file modified sTimer.vi
View file
Open in desktop
Binary file not shown.
18 changes: 9 additions & 9 deletions slowlibrary.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="12008004">
<Library LVVersion="14008000">
<Property Name="NI.Lib.HelpPath" Type="Str"></Property>
<Property Name="NI.Lib.Icon" Type="Bin">%A#!"!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!(]!!!*Q(C=\&gt;7R=2MR%!81N=?"5Q&lt;/07RB7W!,&lt;'&amp;&lt;9+K1,7Q,&lt;)%N&lt;!NMA3X)DW?-RJ(JQ"I\%%Z,(@`BA#==ZB3RN;]28_,V7@PWW`:R`&gt;HV*SU_WE@\N_XF[3:^^TX\+2YP)D7K6;G-RV3P)R`ZS%=_]J'XP/5N&lt;XH,7V\SEJ?]Z#5P?=J4HP+5JTTFWS%0?=B$DD1G(R/.1==!IT.+D)`B':\B'2Z@9XC':XC':XBUC?%:HO%:HO&amp;R7QT0]!T0]!S0I4&lt;*&lt;)?=:XA-(]X40-X40-VDSGC?"GC4N9(&lt;)"D2,L;4ZGG?ZH%;T&gt;-]T&gt;-]T?.S.%`T.%`T.)^&lt;NF8J4@-YZ$S'C?)JHO)JHO)R&gt;"20]220]230[;*YCK=ASI2F=)1I.Z5/Z5PR&amp;)^@54T&amp;5TT&amp;5TQO&lt;5_INJ6Z;"[(H#&gt;ZEC&gt;ZEC&gt;Z$"(*ETT*ETT*9^B)HO2*HO2*(F.&amp;]C20]C2)GN4UE1:,.[:/+5A?0^NOS?UJ^3&lt;*\9B9GT@7JISVW7*NIFC&lt;)^:$D`5Q9TWE7)M@;V&amp;D,6;M29DVR]6#R],%GC47T9_/=@&gt;Z5V&gt;V57&gt;V5E&gt;V5(OV?^T[FTP?\`?YX7ZRP6\D=LH%_8S/U_E5R_-R$I&gt;$\0@\W/VW&lt;[_"\Y[X&amp;],0^^+,]T_J&gt;`J@_B_]'_.T`$KO.@I"XC-_N!!!!!!</Property>
<Property Name="NI.Lib.Icon" Type="Bin">&amp;!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!(]!!!*Q(C=\&gt;7R=2MR%!81N=?"5Q&lt;/07RB7W!,&lt;'&amp;&lt;9+K1,7Q,&lt;)%N&lt;!NMA3X)DW?-RJ(JQ"I\%%Z,(@`BA#==ZB3RN;]28_,V7@PWW`:R`&gt;HV*SU_WE@\N_XF[3:^^TX\+2YP)D7K6;G-RV3P)R`ZS%=_]J'XP/5N&lt;XH,7V\SEJ?]Z#5P?=J4HP+5JTTFWS%0?=B$DD1G(R/.1==!IT.+D)`B':\B'2Z@9XC':XC':XBUC?%:HO%:HO&amp;R7QT0]!T0]!S0I4&lt;*&lt;)?=:XA-(]X40-X40-VDSGC?"GC4N9(&lt;)"D2,L;4ZGG?ZH%;T&gt;-]T&gt;-]T?.S.%`T.%`T.)^&lt;NF8J4@-YZ$S'C?)JHO)JHO)R&gt;"20]220]230[;*YCK=ASI2F=)1I.Z5/Z5PR&amp;)^@54T&amp;5TT&amp;5TQO&lt;5_INJ6Z;"[(H#&gt;ZEC&gt;ZEC&gt;Z$"(*ETT*ETT*9^B)HO2*HO2*(F.&amp;]C20]C2)GN4UE1:,.[:/+5A?0^NOS?UJ^3&lt;*\9B9GT@7JISVW7*NIFC&lt;)^:$D`5Q9TWE7)M@;V&amp;D,6;M29DVR]6#R],%GC47T9_/=@&gt;Z5V&gt;V57&gt;V5E&gt;V5(OV?^T[FTP?\`?YX7ZRP6\D=LH%_8S/U_E5R_-R$I&gt;$\0@\W/VW&lt;[_"\Y[X&amp;],0^^+,]T_J&gt;`J@_B_]'_.T`$KO.@I"XC-_N!!!!!!</Property>
<Property Name="NI.Lib.LocalName" Type="Str">Slow Variables</Property>
<Property Name="NI.Lib.SourceVersion" Type="Int">302022660</Property>
<Property Name="NI.Lib.SourceVersion" Type="Int">335577088</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="B_x" Type="Variable">
Expand All @@ -13,7 +13,7 @@
<Property Name="numTypedefs" Type="UInt">0</Property>
<Property Name="Path" Type="Str">/ModuDAQ.lvproj/My Computer/Untitled Library 3/</Property>
<Property Name="type" Type="Str">Network</Property>
<Property Name="typeDesc" Type="Bin">%A#!"!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!J*1!!!")!A!1!!!!"!!V!#A!'2'^V9GRF!!!"!!!!!!!!!!!!!!!!!!!!!!!!</Property>
<Property Name="typeDesc" Type="Bin">&amp;!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!J*1!!!"1!A!!!!!!"!!V!#A!'2'^V9GRF!!!"!!!!!!!!!!!!!!!!!!!!!!!!</Property>
</Item>
<Item Name="B_y" Type="Variable">
<Property Name="featurePacks" Type="Str">Network</Property>
Expand All @@ -22,7 +22,7 @@
<Property Name="numTypedefs" Type="UInt">0</Property>
<Property Name="Path" Type="Str">/ModuDAQ.lvproj/My Computer/Untitled Library 3/</Property>
<Property Name="type" Type="Str">Network</Property>
<Property Name="typeDesc" Type="Bin">%A#!"!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!J*1!!!")!A!1!!!!"!!V!#A!'2'^V9GRF!!!"!!!!!!!!!!!!!!!!!!!!!!!!</Property>
<Property Name="typeDesc" Type="Bin">&amp;!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!J*1!!!"1!A!!!!!!"!!V!#A!'2'^V9GRF!!!"!!!!!!!!!!!!!!!!!!!!!!!!</Property>
</Item>
<Item Name="B_z" Type="Variable">
<Property Name="featurePacks" Type="Str">Network</Property>
Expand All @@ -31,7 +31,7 @@
<Property Name="numTypedefs" Type="UInt">0</Property>
<Property Name="Path" Type="Str">/ModuDAQ.lvproj/My Computer/Untitled Library 3/</Property>
<Property Name="type" Type="Str">Network</Property>
<Property Name="typeDesc" Type="Bin">%A#!"!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!J*1!!!")!A!1!!!!"!!V!#A!'2'^V9GRF!!!"!!!!!!!!!!!!!!!!!!!!!!!!</Property>
<Property Name="typeDesc" Type="Bin">&amp;!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!J*1!!!"1!A!!!!!!"!!V!#A!'2'^V9GRF!!!"!!!!!!!!!!!!!!!!!!!!!!!!</Property>
</Item>
<Item Name="Humidity" Type="Variable">
<Property Name="featurePacks" Type="Str">Network</Property>
Expand All @@ -40,7 +40,7 @@
<Property Name="numTypedefs" Type="UInt">0</Property>
<Property Name="Path" Type="Str">/ModuDAQ.lvproj/My Computer/Untitled Library 3/</Property>
<Property Name="type" Type="Str">Network</Property>
<Property Name="typeDesc" Type="Bin">%A#!"!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!J*1!!!")!A!1!!!!"!!V!#A!'2'^V9GRF!!!"!!!!!!!!!!!!!!!!!!!!!!!!</Property>
<Property Name="typeDesc" Type="Bin">&amp;!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!J*1!!!"1!A!!!!!!"!!V!#A!'2'^V9GRF!!!"!!!!!!!!!!!!!!!!!!!!!!!!</Property>
</Item>
<Item Name="Pressure" Type="Variable">
<Property Name="featurePacks" Type="Str">Network</Property>
Expand All @@ -49,7 +49,7 @@
<Property Name="numTypedefs" Type="UInt">0</Property>
<Property Name="Path" Type="Str">/ModuDAQ.lvproj/My Computer/Untitled Library 3/</Property>
<Property Name="type" Type="Str">Network</Property>
<Property Name="typeDesc" Type="Bin">%A#!"!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!J*1!!!")!A!1!!!!"!!V!#A!'2'^V9GRF!!!"!!!!!!!!!!!!!!!!!!!!!!!!</Property>
<Property Name="typeDesc" Type="Bin">&amp;!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!J*1!!!"1!A!!!!!!"!!V!#A!'2'^V9GRF!!!"!!!!!!!!!!!!!!!!!!!!!!!!</Property>
</Item>
<Item Name="Temperature" Type="Variable">
<Property Name="featurePacks" Type="Str">Network</Property>
Expand All @@ -58,6 +58,6 @@
<Property Name="numTypedefs" Type="UInt">0</Property>
<Property Name="Path" Type="Str">/ModuDAQ.lvproj/My Computer/Untitled Library 3/</Property>
<Property Name="type" Type="Str">Network</Property>
<Property Name="typeDesc" Type="Bin">%A#!"!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!J*1!!!")!A!1!!!!"!!V!#A!'2'^V9GRF!!!"!!!!!!!!!!!!!!!!!!!!!!!!</Property>
<Property Name="typeDesc" Type="Bin">&amp;!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!J*1!!!"1!A!!!!!!"!!V!#A!'2'^V9GRF!!!"!!!!!!!!!!!!!!!!!!!!!!!!</Property>
</Item>
</Library>
Binary file modified x LED Cluster to XML.vi
View file
Open in desktop
Binary file not shown.
Binary file modified xAnalog Channel Cluster to XML.vi
View file
Open in desktop
Binary file not shown.
Binary file modified xDaqinfo Cluster to XML.vi
View file
Open in desktop
Binary file not shown.
Binary file modified xFast Info to XML.vi
View file
Open in desktop
Binary file not shown.
Binary file modified xGeneral Cluster to XML.vi
View file
Open in desktop
Binary file not shown.
Binary file modified xI32 To XML.vi
View file
Open in desktop
Binary file not shown.
Binary file modified xSlow Info to XML.vi
View file
Open in desktop
Binary file not shown.
Binary file modified xString To XML String.vi
View file
Open in desktop
Binary file not shown.
Binary file modified xString to UTF8.vi
View file
Open in desktop
Binary file not shown.
Binary file modified xTime Info to XML.vi
View file
Open in desktop
Binary file not shown.
Binary file modified xU64 To XML.vi
View file
Open in desktop
Binary file not shown.