Skip to content

Commit a71413d

Browse files
author
Fabiola De la Cueva
committed
Merge branch 'release/1.0'
2 parents 64a8b31 + 0756bb4 commit a71413d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+15
-24
lines changed

.gitignore

+7
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,9 @@
1+
# Ignore Project files, LabVIEW recreates these files every time it opens a project, no need to keep them in Git
2+
*.lvlps
3+
*.aliases
14

5+
#Ignore ~ files created by Open Office that are not needed in Git
26
1) Course Manuals/.~lock.Course Manual 1.odt\#
7+
8+
#Do not ignore the Emulator exe and keep it in Git
9+
!3) LabVIEW Instrument Emulator\builds\HandsOn\CTIPicoVISAEmulatorCTIPicoVISAEmulator.exe

1) Course Manuals/Course Manual 1.odt

-3.72 MB
Binary file not shown.
6.31 MB
Binary file not shown.
Binary file not shown.
715 KB
Binary file not shown.

2) Tutor Instructions/Pico Wiring.pdn

666 KB
Binary file not shown.
875 KB
Binary file not shown.
882 KB
Binary file not shown.

3) LabVIEW Instrument Emulator/Project/HandsOn.aliases

-2
This file was deleted.

3) LabVIEW Instrument Emulator/Project/HandsOn.lvlps

-8
This file was deleted.

3) LabVIEW Instrument Emulator/Project/HandsOn.lvproj

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version='1.0' encoding='UTF-8'?>
2-
<Project Type="Project" LVVersion="22308000">
2+
<Project Type="Project" LVVersion="23008000">
33
<Item Name="My Computer" Type="My Computer">
44
<Property Name="CCSymbols" Type="Str">OS,Win;CPU,x86;</Property>
55
<Property Name="IOScan.Faults" Type="Str"></Property>
@@ -71,7 +71,6 @@
7171
<Item Name="TCP Listen.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/tcp.llb/TCP Listen.vi"/>
7272
<Item Name="lveventtype.ctl" Type="VI" URL="/&lt;vilib&gt;/event_ctls.llb/lveventtype.ctl"/>
7373
<Item Name="Trim Whitespace One-Sided.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Trim Whitespace One-Sided.vi"/>
74-
<Item Name="System Exec.vi" Type="VI" URL="/&lt;vilib&gt;/Platform/system.llb/System Exec.vi"/>
7574
<Item Name="ex_CorrectErrorChain.vi" Type="VI" URL="/&lt;vilib&gt;/express/express shared/ex_CorrectErrorChain.vi"/>
7675
<Item Name="Waveform Array To Dynamic.vi" Type="VI" URL="/&lt;vilib&gt;/express/express shared/transition.llb/Waveform Array To Dynamic.vi"/>
7776
<Item Name="ex_WaveformAttribs.ctl" Type="VI" URL="/&lt;vilib&gt;/express/express shared/transition.llb/ex_WaveformAttribs.ctl"/>
@@ -94,8 +93,7 @@
9493
<Item Name="Nearest Frequency for Block.vi" Type="VI" URL="/&lt;vilib&gt;/express/express input/SimulateSignalConfig.llb/Nearest Frequency for Block.vi"/>
9594
<Item Name="subSigGeneratorBlock.vi" Type="VI" URL="/&lt;vilib&gt;/express/express input/SimulateSignalBlock.llb/subSigGeneratorBlock.vi"/>
9695
</Item>
97-
<Item Name="SQLiteError.vi" Type="VI" URL="../SourceCode/SubVIs/utilities/Error/SQLiteError.vi"/>
98-
<Item Name="lvanlys.so" Type="Document" URL="/&lt;resource&gt;/lvanlys.so"/>
96+
<Item Name="lvanlys.dll" Type="Document" URL="/&lt;resource&gt;/lvanlys.dll"/>
9997
</Item>
10098
<Item Name="Build Specifications" Type="Build">
10199
<Item Name="CTIPicoVISAEmulator" Type="EXE">
@@ -114,20 +112,20 @@
114112
<Property Name="Bld_modifyLibraryFile" Type="Bool">true</Property>
115113
<Property Name="Bld_previewCacheID" Type="Str">{D73502B8-B206-4E45-9147-4E6CC75FB7ED}</Property>
116114
<Property Name="Bld_version.major" Type="Int">1</Property>
117-
<Property Name="DestinationCount" Type="Int">2</Property>
118115
<Property Name="Destination[0].destName" Type="Str">CTIPicoVISAEmulator.exe</Property>
119116
<Property Name="Destination[0].path" Type="Path">../builds/NI_AB_PROJECTNAME/CTIPicoVISAEmulator/CTIPicoVISAEmulator.exe</Property>
120117
<Property Name="Destination[0].preserveHierarchy" Type="Bool">true</Property>
121118
<Property Name="Destination[0].type" Type="Str">App</Property>
122119
<Property Name="Destination[1].destName" Type="Str">Support Directory</Property>
123120
<Property Name="Destination[1].path" Type="Path">../builds/NI_AB_PROJECTNAME/CTIPicoVISAEmulator/data</Property>
124-
<Property Name="SourceCount" Type="Int">2</Property>
121+
<Property Name="DestinationCount" Type="Int">2</Property>
125122
<Property Name="Source[0].itemID" Type="Str">{5B9EA04C-53B5-11EE-8669-080027C43413}</Property>
126123
<Property Name="Source[0].type" Type="Str">Container</Property>
127124
<Property Name="Source[1].destinationIndex" Type="Int">0</Property>
128125
<Property Name="Source[1].itemID" Type="Ref">/My Computer/SourceCode/HandsOnEmulatedHardware.vi</Property>
129126
<Property Name="Source[1].sourceInclusion" Type="Str">TopLevel</Property>
130127
<Property Name="Source[1].type" Type="Str">VI</Property>
128+
<Property Name="SourceCount" Type="Int">2</Property>
131129
<Property Name="TgtF_fileDescription" Type="Str">CTIPicoVISAEmulator</Property>
132130
<Property Name="TgtF_internalName" Type="Str">CTIPicoVISAEmulator</Property>
133131
<Property Name="TgtF_legalCopyright" Type="Str">Copyright © 2013 </Property>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

4) LabVIEW Instrument Drivers/HandsOnPi2040/HandsOnPi2040.aliases

-2
This file was deleted.

4) LabVIEW Instrument Drivers/HandsOnPi2040/HandsOnPi2040.lvlib

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version='1.0' encoding='UTF-8'?>
2-
<Library LVVersion="22308000">
2+
<Library LVVersion="23008000">
33
<Property Name="Instrument Driver" Type="Str">True</Property>
44
<Property Name="NI.Lib.DefaultMenu" Type="Str">dir.mnu</Property>
55
<Property Name="NI.Lib.Description" Type="Str">LabVIEW Plug and Play instrument driver for
66

77
&lt;fill in information about manufacturer, model, and type of the instrument&gt;.</Property>
8-
<Property Name="NI.Lib.Icon" Type="Bin">)D#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!*+!!!*Q(C=\&gt;1^DBJ"%)&lt;B$]O"5WZA-5?I+X!""R-YM-DK#K1&lt;=I7[!F&gt;!C!N5MNL!A=56C&amp;=CQ/`U&amp;#P7NC!RECURMTX!V^X6T`TM3'X\*(X5[&gt;&lt;78&gt;X'@IJR[):DJWY][,+`^8&lt;D=@B2H\`-0Y]\\Z@TXV8Y&lt;8\V3X^?`ZJ@6\&gt;(`[0``_[`M4(G[?;A/W`3J%FJ31O;U[S&gt;X3H*ETT*ETT*ETT)ATT)ATT)A^T*H&gt;T*H&gt;T*H&gt;T)D&gt;T)D&gt;T)D&lt;TNZ#)8O=CZ+MHCS5**U;2!-BC+EE0C34S**`(Q5YEH]33?R*.Y'+,%EXA34_**0%R4YEE]C3@R*"Z+.5GWH2R0YK']!E`A#4S"*`#QJ!*0!!A7#QI(27!I[!S_"*\!%XDYKM!4?!*0Y!E]&gt;#PQ"*\!%XA#$V0;69GG'8:S0*32YX%]DM@R/"Z+S`%Y(M@D?"Q0S]HR/"Y(Y3TI&amp;)=A:Z)TQ0HB?"Q0(X)]DM@R/"\(1V?\1^[OT+!:&gt;H)]BM@Q'"\$9XAI)=.D?!S0Y4%]F*8B-4S'R`!9(J;3Y4%]BM?!')OSP)RCRE2DE"%9(P\;UW,N,E747.PL8X.]5&amp;50I/L"5DUQKA&gt;"&gt;9.6.UZV1V187H5"62&gt;'&gt;=+K%V%"61OL#KI'[M"R4^P1VL16&lt;5HL;80;D$9&gt;JP\FA9@$1@P^8JP.2OPV7KP63MPF5HX@;T[@;T;&lt;;4K&gt;PLWN0L/0W_4SP@4[MNU&gt;PXV&gt;P0\I&amp;]@P8R&lt;(Z_VOS*]9&gt;[]WPJ@_B8?D0OBU]:LH'PU%;Q!@MA!!!!!</Property>
9-
<Property Name="NI.Lib.SourceVersion" Type="Int">573603840</Property>
8+
<Property Name="NI.Lib.Icon" Type="Bin">)Q#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!*+!!!*Q(C=\&gt;1^DBJ"%)&lt;B$]O"5WZA-5?I+X!""R-YM-DK#K1&lt;=I7[!F&gt;!C!N5MNL!A=56C&amp;=CQ/`U&amp;#P7NC!RECURMTX!V^X6T`TM3'X\*(X5[&gt;&lt;78&gt;X'@IJR[):DJWY][,+`^8&lt;D=@B2H\`-0Y]\\Z@TXV8Y&lt;8\V3X^?`ZJ@6\&gt;(`[0``_[`M4(G[?;A/W`3J%FJ31O;U[S&gt;X3H*ETT*ETT*ETT)ATT)ATT)A^T*H&gt;T*H&gt;T*H&gt;T)D&gt;T)D&gt;T)D&lt;TNZ#)8O=CZ+MHCS5**U;2!-BC+EE0C34S**`(Q5YEH]33?R*.Y'+,%EXA34_**0%R4YEE]C3@R*"Z+.5GWH2R0YK']!E`A#4S"*`#QJ!*0!!A7#QI(27!I[!S_"*\!%XDYKM!4?!*0Y!E]&gt;#PQ"*\!%XA#$V0;69GG'8:S0*32YX%]DM@R/"Z+S`%Y(M@D?"Q0S]HR/"Y(Y3TI&amp;)=A:Z)TQ0HB?"Q0(X)]DM@R/"\(1V?\1^[OT+!:&gt;H)]BM@Q'"\$9XAI)=.D?!S0Y4%]F*8B-4S'R`!9(J;3Y4%]BM?!')OSP)RCRE2DE"%9(P\;UW,N,E747.PL8X.]5&amp;50I/L"5DUQKA&gt;"&gt;9.6.UZV1V187H5"62&gt;'&gt;=+K%V%"61OL#KI'[M"R4^P1VL16&lt;5HL;80;D$9&gt;JP\FA9@$1@P^8JP.2OPV7KP63MPF5HX@;T[@;T;&lt;;4K&gt;PLWN0L/0W_4SP@4[MNU&gt;PXV&gt;P0\I&amp;]@P8R&lt;(Z_VOS*]9&gt;[]WPJ@_B8?D0OBU]:LH'PU%;Q!@MA!!!!!</Property>
9+
<Property Name="NI.Lib.SourceVersion" Type="Int">587235328</Property>
1010
<Property Name="NI.Lib.Version" Type="Str">1.0.0.0</Property>
1111
<Item Name="Private" Type="Folder">
1212
<Property Name="NI.LibItem.Scope" Type="Int">2</Property>

4) LabVIEW Instrument Drivers/HandsOnPi2040/HandsOnPi2040.lvlps

-2
This file was deleted.

4) LabVIEW Instrument Drivers/HandsOnPi2040/HandsOnPi2040.lvproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version='1.0' encoding='UTF-8'?>
2-
<Project Name="Template - Generic.lvproj" Type="Project" LVVersion="22308000" URL="/&lt;instrlib&gt;/_Template - Generic/Template - Generic.lvproj">
2+
<Project Name="Template - Generic.lvproj" Type="Project" LVVersion="23008000" URL="/&lt;instrlib&gt;/_Template - Generic/Template - Generic.lvproj">
33
<Property Name="Instrument Driver" Type="Str">True</Property>
44
<Property Name="NI.Project.Description" Type="Str">This project is used by developers to edit API and example files for LabVIEW Plug and Play instrument drivers.</Property>
55
<Item Name="My Computer" Type="My Computer">
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

6) Solutions/AIs.vi

1.58 KB
Binary file not shown.

6) Solutions/AO(Read).vi

156 Bytes
Binary file not shown.

6) Solutions/AO(Write).vi

-348 Bytes
Binary file not shown.

6) Solutions/DIDOWhileLoop.vi

-612 Bytes
Binary file not shown.

6) Solutions/EventStructureDO.vi

-470 Bytes
Binary file not shown.

6) Solutions/ForLoopDOBlink.vi

68 Bytes
Binary file not shown.

6) Solutions/HelloWorld.vi

84 Bytes
Binary file not shown.

6) Solutions/Piano/Piano.vi

127 KB
Binary file not shown.

6) Solutions/WhileLoopDOBlink.vi

456 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)