Merge pull request #6 from Team6083/develop

V1.0.4 add NT ip display
Team6083 · Aug 26, 2018 · cae59e4 · cae59e4
2 parents d3a9976 + e8c2156
commit cae59e4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/index.html b/index.html
@@ -22,9 +22,11 @@ <h5 class="mb-0">Mode: <span class="badge badge-pill badge-danger" id="mode-stat
                 Event:<span class="badge badge-pill badge-info" id="event">N/A</span> Match:
                 <span class="badge badge-pill badge-info" id="match">N/A</span> Station:
                 <span class="badge badge-pill badge-info" id="station">N/A</span>
+                MatchTime:<span class="badge badge-pill badge-info" id="mtime">N/A</span>
               </div>
               <div class="col-2">
-                MatchTime:<span class="badge badge-pill badge-info" id="mtime">N/A</span>
+                NT: <span  class="badge badge-pill badge-info" id="ntip">N/A</span>
+                <br>
                 Ping:<span class="badge badge-pill badge-info" id="ptime">N/A</span>
               </div>
               <div class="col-2">

diff --git a/js/nt_6083.js b/js/nt_6083.js
@@ -17,12 +17,17 @@ function updateCommStat() {
   updateModeStat();
 }
 
-NetworkTables.putValue("/SmartDashboard/ping", -1);
+NetworkTables.putValue("/SmartDashboard/NT/ping", -1);
+NetworkTables.putValue("/SmartDashboard/NT/ip", "noConnect");
 
-NetworkTables.addKeyListener("/SmartDashboard/ping", function(key, value, isNew) {
+NetworkTables.addKeyListener("/SmartDashboard/NT/ping", function(key, value, isNew) {
   $("#ptime").html(value);
 }, true);
 
+NetworkTables.addKeyListener("/SmartDashboard/NT/ip", function(key, value, isNew) {
+  $("#ntip").html(value);
+});
+
 var fmsAtt = false;
 var robotMode = -1;
 

diff --git a/main.js b/main.js
@@ -162,6 +162,7 @@ function startNTconnect() {
         else {
             connectToNT(targetHost);
             setTimeout(function(){
+                client.Update(client.getKeyID("/SmartDashboard/NT/ip"), targetHost);
                 readPing();
             },1000);
         }
@@ -170,7 +171,7 @@ function startNTconnect() {
 
 function readPing() {
     tcpp.ping({ address: targetHost, port: 1735}, function(err, data) {
-        client.Update(client.getKeyID("/SmartDashboard/ping"), Math.round(parseFloat(data.avg)));
+        client.Update(client.getKeyID("/SmartDashboard/NT/ping"), Math.round(parseFloat(data.avg)));
         console.log(parseFloat(data.avg));
         setTimeout(function(){
             readPing();

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "overdashboard-electron",
   "productName": "OverDashboard",
-  "version": "1.0.0",
+  "version": "1.0.4",
   "description": "Dashboard for Overlooking",
   "main": "main.js",
   "scripts": {