updated vehicle.set usage to include zone

[profile/ivi/GhostCluster.git] / business.js

diff --git a/business.js b/business.js
index 5f38af5..9fc521a 100644 (file)
--- a/business.js
+++ b/business.js
@@ -36,23 +36,29 @@ function calcAverageVelocity(newVel) {
        $("#avgspeed").text(Math.floor(averageVel));
 }
 
-function connected()
+window.onload = function()
 {
-    /*vehicle.subscribe(["running_status_speedometer", "running_status_engine_speed", "running_status_transmission_gear_status", "running_status_steering_wheel_angle"]);
-    //vehicle.subscribe(["running_status_engine_speed"]);
-    //vehicle.subscribe(["running_status_transmission_gear_status"]);
-    //vehicle.subscribe(["running_status_steering_wheel_angle"]);
-    vehicle.subscribe(["ThrottlePosition"]);
-    vehicle.subscribe(["EngineCoolantTemperature"]);
-    vehicle.subscribe(["MachineGunTurretStatus"]);
-    vehicle.subscribe(["AirIntakeTemperature"]);*/
+    var vehicle = tizen.vehicle
+
+    var vehicleSpeed = vehicle.get("VehicleSpeed");
+    if(vehicleSpeed != undefined)
+        console.log("Vehicle speed: " + vehicleSpeed.vehicleSpeed);
 
-    vehicle.subscribe(["VehicleSpeed","EngineSpeed","MassAirFlow","AirIntakeTemperature","ThrottlePosition","EngineCoolantTemperature", "TransmissionShiftPosition",
-                       "SteeringWheelAngle","MachineGunTurretStatus"]);
+    vehicle.set("MachineGunTurretStatus", { "machineGunTurretStatus" : true, "zone" : 0 },
+                function(error) { console.log("set() error " + error); });
 
-    document.addEventListener("VehicleSpeed",function(data) {
+    var velocityUnits = $('#velocityUnits');
+    velocityUnits.click(function() {
+                              if(velocityUnits.text() === "MPH")
+                              {
+                                  velocityUnits.text("KPH");
+                              }
+                              else velocityUnits.text("MPH");
+                        });
 
-                                  adjvalue = data.value.value;
+   vehicle.subscribe("VehicleSpeed",function(data) {
+                                 console.log("Vehicle data" + data.vehicleSpeed);
+                                  adjvalue = data.vehicleSpeed;
                                   curVss = adjvalue;
                                   var velocityUnits = $('#velocityUnits');
 
@@ -62,101 +68,54 @@ function connected()
                                   $('#velocity').text(adjvalue);
 
                                   calcAverageVelocity(adjvalue);
-                              },false);
+                              });
 
-    document.addEventListener("EngineSpeed", function(data) {
-                                  var value = data.value.value;
+   vehicle.subscribe("EngineSpeed", function(data) {
+                                  var value = data.engineSpeed;
                                   if(value > 10000) value =10000;
                                   var needleDegs = value / 10000 * 180;
                                   $('#rpms').text(value);
                                   $('#rpmNeedle').css("-webkit-transform","rotate("+needleDegs+"deg)");
-                              },false);
-
-    document.addEventListener("TransmissionShiftPosition",function(data) {
-                                  value = data.value.value;
-                                                                 if(value == 128)
-                                                                         $('#gear').text('Reverse');
-                                                                 else if(value == 0)
-                                                                         $('#gear').text('Neutral');
+                              });
+
+    vehicle.subscribe("Transmission",function(data) {
+                                  value = data.gearPosition;
+                                  if(value == 128)
+                                      $('#gear').text('Reverse');
+                                  else if(value == 0)
+                                      $('#gear').text('Neutral');
                                   else $('#gear').text(value);
-                                                                 
-                              },false);
 
-    document.addEventListener("SteeringWheelAngle", function(data) {
-                                  value = data.value.value;
+                              });
+
+    vehicle.subscribe("SteeringWheelAngle", function(data) {
+                                  value = data.steeringWheelAngle;
                                   $('#wheel').css("-webkit-transform","rotate("+value+"deg)");
                                   $('#machinegun').css("-webkit-transform","rotate("+value+"deg)");
-                              },false);
+                              });
 
-    document.addEventListener("ThrottlePosition", function(data) {
-                                  value = data.value.value;
+    vehicle.subscribe("ThrottlePosition", function(data) {
+                                  value = data.throttlePosition;
                                   var needleDegs = (value / 100 * 180) + 270
 
                                   $('#throttleNeedle').css("-webkit-transform","rotate("+needleDegs+"deg)");
 
-                              },false);
+                              });
 
-    document.addEventListener("EngineCoolantTemperature", function(data) {
-                                  value = data.value.value;
+    vehicle.subscribe("EngineCoolantTemperature", function(data) {
+                                  value = data.engineCoolantTemperature;
                                   var needleDegs = (value / 180 * 70) + 270
 
                                   $('#engineCoolantNeedle').css("-webkit-transform","rotate("+needleDegs+"deg)");
 
-                              },false);
+                              });
 
-    document.addEventListener("MachineGunTurretStatus", function(data) {
-                                  value = data.value.value;
+    vehicle.subscribe("MachineGunTurretStatus", function(data) {
+                                  value = data.machineGunTurretStatus;
                                   if(value === "1")
                                       $('#machineGunTurretPopup').popup('open');
                                   else $('#machineGunTurretPopup').popup('close');
 
-                              },false);
-
-    document.addEventListener("MassAirFlow", function(data) {
-                                  value = data.value.value;
-                                  var maf = value;
-                                  var vss = curVss;
-                                  var mpg = Math.floor((14.7 * 6.17 * 4.54 * vss * 0.621371) / (3600 * maf / 100));
-
-                                  $('#mpg').text(mpg);
-
-                                  calcAverageMpg(mpg);
-
-                              },false);
-
-
-
-}
-
-function connect(addy)
-{
-    vehicle = new Vehicle(connected, function(){$('#velocity').text("ERR");}, "ws://"+addy, "http-only");
-}
-
-window.onload = function()
-{
-    var addy = "127.0.0.1:23000";
-
-    if(typeof(Storage)!== "undefined")
-    {
-        addyTemp = localStorage.address;
-        if(addyTemp !== undefined) addy = addyTemp;
-    }
-
-    $("#address").val(addy);
-    $("#address").change(function() { localStorage.address = $("#address").val(); });
-    $("#connectButton").click(function() { connect(addy) });
-
-
+                              });
 
-    connect(addy);
-
-    var velocityUnits = $('#velocityUnits');
-    velocityUnits.click(function() {
-                              if(velocityUnits.text() === "MPH")
-                              {
-                                  velocityUnits.text("KPH");
-                              }
-                              else velocityUnits.text("MPH");
-                        });
 }