Build for TUmux 2 (cFP). Update .gitignore (*.lvbitx).

87b9e697 · Dirk Geerts · 79254e37 · 87b9e697 · e12e6a82 · 87b9e697
Commit 87b9e697 authored 7 years ago by Dirk Geerts
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,9 @@
 *.aliases
 *.lvlps

+# FPGA bitfiles
+*.lvbitx

 /builds/**/*
-/Builds/**/*
\ No newline at end of file
+/Builds/**/*
+
--- a/DCP @ e12e6a82
+++ b/DCP @ e12e6a82
-Subproject commit 3470f5052d67d19643e7a8b1d0ab33cdd8e1fa65
+Subproject commit e12e6a823ea4a53ec7e83788d0c3dba5d61c3546
--- a/modules/tmx.hw.cRIO.vi
+++ b/modules/tmx.hw.cRIO.vi
--- a/tumux.aliases
+++ b/tumux.aliases
@@ -10,6 +10,9 @@ cRIO-N2O-2 = "10.50.44.238"
 [My Computer]
 My Computer = "10.50.44.5"

+[TUmux-2]
+TUmux-2 = "10.50.44.234"
+
 [TUmux-5]
 TUmux-5 = "10.50.44.233"


--- a/tumux.iak
+++ b/tumux.iak
--- a/tumux.lvlps
+++ b/tumux.lvlps
@@ -49,3 +49,11 @@ Cache_Path[Path] Line0002 = "9B07-62C5-4279-8468-627A5B46F579}.txt"
 Cache_Path[Path] Line0001 = "/C/Users/dgeerts/AppData/Local/Temp/AB_Cache_{E360"
 Cache_Path[Path] Line0002 = "0E97-0967-407E-885C-6EFAC840196E}.txt"

+[AB_Cache_{FF51085E-2B6C-494E-B81F-D9E935BB2199}]
+Cache_Path[Path] Line0001 = "/C/Users/dgeerts/AppData/Local/Temp/AB_Cache_{FF51"
+Cache_Path[Path] Line0002 = "085E-2B6C-494E-B81F-D9E935BB2199}.txt"
+
+[AB_Cache_{275CB092-AB6A-45D0-AB82-0D41EEAB8978}]
+Cache_Path[Path] Line0001 = "/C/Users/dgeerts/AppData/Local/Temp/AB_Cache_{275C"
+Cache_Path[Path] Line0002 = "B092-AB6A-45D0-AB82-0D41EEAB8978}.txt"
+
--- a/tumux.lvproj
+++ b/tumux.lvproj
--- a/tumux.vi
+++ b/tumux.vi
--- a/www/TUmux-2/images/logo_tumux.png
+++ b/www/TUmux-2/images/logo_tumux.png
--- a/www/TUmux-2/tumux.html
+++ b/www/TUmux-2/tumux.html
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<html>
+  <head>
+    <meta name="generator"
+    content="HTML Tidy for HTML5 (experimental) for Windows https://github.com/w3c/tidy-html5/tree/c63cc39" />
+    <script language="JavaScript">
+var userAgent = navigator.userAgent;
+var versionOffset = userAgent.indexOf(&amp;quot;Chrome&amp;quot;);
+
+if (versionOffset != -1)
+{
+    var fullVersion = userAgent.substring(versionOffset+7);
+    var majorVersion = parseInt(&amp;#39;&amp;#39;+fullVersion,10);
+    if (majorVersion &amp;gt;= 42)
+    {
+        var plugins = navigator.plugins;
+        var hasNIPlugin = false;
+        for (var i = 0; i &amp;lt; plugins.length; i++) {
+                if (plugins[i].name.indexOf(&amp;quot;National Instruments&amp;quot;) != -1) {
+                        hasNIPlugin = true;
+                }
+        }
+        if (hasNIPlugin == false) {
+                document.write(&amp;#39;&amp;lt;strong&amp;gt;&amp;lt;em&amp;gt;NI has detected that your &amp;#39; +
+                               &amp;#39;browser might be blocking a plug-in.  &amp;#39;+
+                               &amp;#39;Visit ni.com/info and enter the following &amp;#39;+
+                               &amp;#39;Info Code for more information: &amp;#39;+
+                               &amp;#39;BlockedPlugin&amp;lt;\/em&amp;gt;&amp;lt;\/strong&amp;gt;&amp;#39;)
+        }
+    }
+}
+</script>
+    <title>TUmux 2 offgas multiplexer</title>
+  <style type="text/css">
+h2 {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 18px;
+}
+  </style>
+  </head>
+  <body>
+  <h2><img src="images/logo_tumux.png" width="205" height="45" alt="TUmux"> Off-gas Multiplexer 2</h2>
+    <p>
+<OBJECT ID="LabVIEWControl" CLASSID="CLSID:A40B0AD4-B50E-4E58-8A1D-8544233807B7" WIDTH=512 HEIGHT=543 CODEBASE="ftp://ftp.ni.com/support/labview/runtime/windows/2015/LVRTE2015min.exe">
+<PARAM name="LVFPPVINAME" value="tumux.lvproj/TUmux-2/tumux.vi">
+<PARAM name="REQCTRL" value=true>
+<EMBED SRC=".LV_FrontPanelProtocol.rpvi150" LVFPPVINAME="tumux.lvproj/TUmux-2/tumux.vi" REQCTRL=true TYPE="application/x-labviewrpvi150" WIDTH=512 HEIGHT=543  PLUGINSPAGE="http://digital.ni.com/express.nsf/bycode/exck2m">
+</EMBED>
+</OBJECT>
+    </p>
+    <p>
+     Download the <a href="./files/LVRTE2015_f1Patchmin.exe">LabVIEW Runtime Engine 2015</a>
+    </p>
+  </body>
+</html>