projects / profile / ivi / GhostCluster.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cb8d188)
made work with new amb api
authorKevron Rees <tripzero.kev@gmail.com>
Thu, 23 Aug 2012 19:36:49 +0000 (12:36 -0700)
committerKevron Rees <tripzero.kev@gmail.com>
Thu, 23 Aug 2012 19:36:49 +0000 (12:36 -0700)
business.js patch | blob | history
index.html patch | blob | history

diff --git a/business.js b/business.js
index a7fb642..f472397 100644 (file)
--- a/business.js
+++ b/business.js
@@ -10,7 +10,7 @@ var engineLoadStream;
 var engineoiltemp;
 var mafStream;
 
-var nobdy;
+var vehicle;
 
 var mpgReadings = 0;
 var prevMpg = 0;
@@ -35,25 +35,49 @@ function calcAverageVelocity(newVel) {
        $("#avgspeed").text(Math.floor(averageVel));
 }
 
+function connected()
+{
+    setInterval(function() {
+                  vehicle.get("running_status_speedometer", function(data) {
+
+                                  adjvalue = data[0].value;
+                                  var velocityUnits = $('#velocityUnits');
+
+                                  if(velocityUnits.text() === "MPH")
+                                      adjvalue = Math.floor(data[0].value * 0.62137);
+
+                                  $('#velocity').text(adjvalue);
+
+                                  calcAverageVelocity(adjvalue);
+                              },
+                              function() { });
+              },1000);
+}
+
 window.onload = function()
 {
+            vehicle = new Vehicle(connected, function(){$('#velocity').text("ERR");}, "ws://localhost:23000", "http-only");
+
        var velocityUnits = $('#velocityUnits');
        velocityUnits.click(function() {
-                                                         if(velocityUnits.text() == "MPH")
+                              if(velocityUnits.text() === "MPH")
                                                          {
                                                                  velocityUnits.text("KPH");
                                                          }
                                                          else velocityUnits.text("MPH");
                                                });
 
-       nobdy.connected = function () {
+
+
+
+    /*nobdy.connected = function () {
                if(nobdy.supported.Velocity) {
                        velocityStream = nobdy.createStream(nobdy.supported.Velocity);
                        velocityStream.changed = function (value) {
 
                                adjvalue = value;
 
-                               if(velocityUnits.text() == "MPH")
+                if(velocityUnits.text() === "MPH")
                                        adjvalue = Math.floor(value * 0.62137);
 
                                $('#velocity').text(adjvalue);
@@ -137,7 +161,7 @@ window.onload = function()
                                calcAverageMpg(mpg);
                        }
                }
-       }
+    }*/
 
-       nobdy.connect("localhost:8082");
+    //nobdy.connect("localhost:8082");
 }
diff --git a/index.html b/index.html
index 2a8086f..cc6ffa6 100644 (file)
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
                <link rel="stylesheet" type="text/css" href="style.css" />
-               <script type="text/javascript" src="nobdy.js" ></script>
+                <script type="text/javascript" src="api.js" ></script>
                <script type="text/javascript" src="jquery-1.6.2.js" ></script>
                <script type="text/javascript" src="business.js" ></script>
 
Domain: System / Uncategorized;