machine gun popup 44/1844/1
authorKevron Rees <kevron_m_rees@linux.intel.com>
Fri, 14 Sep 2012 22:58:54 +0000 (15:58 -0700)
committerKevron Rees <kevron_m_rees@linux.intel.com>
Fri, 14 Sep 2012 22:58:54 +0000 (15:58 -0700)
assets/machinegun.png [new file with mode: 0644]
business.js
index.html

diff --git a/assets/machinegun.png b/assets/machinegun.png
new file mode 100644 (file)
index 0000000..53c1b46
Binary files /dev/null and b/assets/machinegun.png differ
index 8571d59..0f84f47 100644 (file)
@@ -38,9 +38,9 @@ function calcAverageVelocity(newVel) {
 function connected()
 {
     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(["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"]);
@@ -74,6 +74,7 @@ function connected()
     document.addEventListener("running_status_steering_wheel_angle", function(data) {
                                   value = data.value;
                                   $('#wheel').css("-webkit-transform","rotate("+value+"deg)");
+                                  $('#machinegun').css("-webkit-transform","rotate("+value+"deg)");
                               },false);
 
     document.addEventListener("ThrottlePosition", function(data) {
@@ -94,8 +95,9 @@ function connected()
 
     document.addEventListener("MachineGunTurretStatus", function(data) {
                                   value = data.value;
-                                  if(value === true)
+                                  if(value === "1")
                                       $('#machineGunTurretPopup').popup('open');
+                                  else $('#machineGunTurretPopup').popup('close');
 
                               },false);
 
index 1b1e068..125cbbc 100644 (file)
@@ -68,7 +68,7 @@
                        </div>
 
                        <div data-role="popup" id="machineGunTurretPopup" data-transition="flip">
-                       MACHINE GUN!!!! BANG BANG BANG!!!
+                               <img id="machinegun" src="assets/machinegun.png" />
                        </div>
 
                        <div id="infoarea">