fixed merge issues

diff --git a/business.js b/business.js
index 248b2d6..f307d54 100644 (file)
--- a/business.js
+++ b/business.js
@@ -68,7 +68,12 @@ function connected()
 
     document.addEventListener("running_status_transmission_gear_status",function(data) {
                                   value = data.value;
-                                  $('#gear').text(value);
+                                                                 if(value == 128)
+                                                                         $('#gear').text('Reverse');
+                                                                 else if(value == 0)
+                                                                         $('#gear').text('Neutral');
+                                  else $('#gear').text(value);
+                                                                 
                               },false);
 
     document.addEventListener("running_status_steering_wheel_angle", function(data) {

diff --git a/style.css b/style.css
index db3eb0f..8190149 100644 (file)
--- a/style.css
+++ b/style.css
@@ -148,7 +148,7 @@ body {
 #wheel {
         -webkit-transform:rotate(0deg);
         -webkit-transform-origin: 50% 50%;
-               -webkit-transition: all 100ms;
+               -webkit-transition: all;
 }
 
 #iatNeedle {