From 4cbcc6e02df9ae9d18c29a79cf727329149d6776 Mon Sep 17 00:00:00 2001 From: Kevron Rees Date: Fri, 14 Dec 2012 11:44:08 -0800 Subject: [PATCH] updated for new AMB 0.7 protocol --- business.js | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/business.js b/business.js index 92af074..0575589 100644 --- a/business.js +++ b/business.js @@ -14,6 +14,7 @@ var vehicle; var mpgReadings = 0; var prevMpg = 0; +var curVss; function calcAverageMpg(newMpg) { prevMpg += parseInt(newMpg); @@ -51,11 +52,12 @@ function connected() document.addEventListener("VehicleSpeed",function(data) { - adjvalue = data.value; + adjvalue = data.value.value; + curVss = adjvalue; var velocityUnits = $('#velocityUnits'); if(velocityUnits.text() === "MPH") - adjvalue = Math.floor(data.value * 0.62137); + adjvalue = Math.floor(adjvalue * 0.62137); $('#velocity').text(adjvalue); @@ -63,7 +65,7 @@ function connected() },false); document.addEventListener("EngineSpeed", function(data) { - var value = data.value; + var value = data.value.value; if(value > 10000) value =10000; var needleDegs = value / 10000 * 180; $('#rpms').text(value); @@ -71,7 +73,7 @@ function connected() },false); document.addEventListener("TransmissionGearStatus",function(data) { - value = data.value; + value = data.value.value; if(value == 128) $('#gear').text('Reverse'); else if(value == 0) @@ -81,13 +83,13 @@ function connected() },false); document.addEventListener("SteeringWheelAngle", function(data) { - value = data.value; + value = data.value.value; $('#wheel').css("-webkit-transform","rotate("+value+"deg)"); $('#machinegun').css("-webkit-transform","rotate("+value+"deg)"); },false); document.addEventListener("ThrottlePosition", function(data) { - value = data.value; + value = data.value.value; var needleDegs = (value / 100 * 180) + 270 $('#throttleNeedle').css("-webkit-transform","rotate("+needleDegs+"deg)"); @@ -95,7 +97,7 @@ function connected() },false); document.addEventListener("EngineCoolantTemperature", function(data) { - value = data.value; + value = data.value.value; var needleDegs = (value / 180 * 70) + 270 $('#engineCoolantNeedle').css("-webkit-transform","rotate("+needleDegs+"deg)"); @@ -103,13 +105,25 @@ function connected() },false); document.addEventListener("MachineGunTurretStatus", function(data) { - value = data.value; + value = data.value.value; 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); + } -- 2.7.4