updated ui and added new data to get

KnightWebnApps · KnightWebnApps · commit 6fd10fc531cc · 2020-03-16T19:48:02.000-04:00
diff --git a/client/index.html b/client/index.html
@@ -30,6 +30,12 @@
       padding: .7em 1em;
     }
 
+    main #addition {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+
     main #dashboard {
       display: -ms-grid;
       display: grid;
@@ -38,17 +44,19 @@
     }
 
     main #dashboard .meter {
-      display: -webkit-box;
-      display: -ms-flexbox;
       display: flex;
-      -webkit-box-orient: vertical;
-      -webkit-box-direction: normal;
-      -ms-flex-direction: column;
       flex-direction: column;
-      -webkit-box-align: center;
-      -ms-flex-align: center;
       align-items: center;
     }
+
+    main #dashboard .meter #rpm, #spd {
+      background-color: #333;
+      width: 250px;
+      color: whitesmoke;
+      position:fixed;
+      bottom:0;
+      
+    }
   </style>
 </head>
   <body>
@@ -59,14 +67,20 @@ <h1>OBD Client</h1>
         <p id="error"></p>
         <button onclick="location.reload()">Retry</button>
       </section>
+      <section id="addition">
+        <div class="meter">
+          <h2>MAF</h2>
+          <div id="maf"></div>
+        </div>
+      </section>
       <section id="dashboard">
         <div class="meter">
           <h2>Speed</h2>
-          <h3 id="spd"></h3>
+          <div id="spd"></div>
         </div>
         <div class="meter">
           <h2>RPM</h2>
-          <h3 id="rpm"></h3>
+          <div id="rpm"></div>
         </div>
       </section>
     </main>
@@ -78,6 +92,7 @@ <h3 id="rpm"></h3>
       var error = document.querySelector('#error');
       var spd = document.getElementById('spd');
       var rpm = document.getElementById('rpm');
+      var maf = document.getElementById('maf');
 
       const errors = [];
 
@@ -86,9 +101,16 @@ <h3 id="rpm"></h3>
         console.log(msg);
         if(msg['speed'] !== undefined){
           spd.innerText = msg['speed'];
+
+          spd.style.height = `${(parseInt(msg['speed']))*10}px`
         }
         if(msg['rpm'] !== undefined){
           rpm.innerText = msg['rpm'];
+
+          rpm.style.height = `${(parseInt(msg['rpm']))/3}px`  
+        }
+        if(msg['maf'] !== undefined){
+          maf.innerText = msg['maf'];
         }
         errors = [];
       });
diff --git a/main.py b/main.py
@@ -8,29 +8,45 @@
 
 def new_spd(s):
   string = str(s.value.to('mph'))
-  data = {
-    "speed" : string
-  }
+  data = {"speed" : string}
   print(json.dumps(data))
   sys.stdout.flush()
 
 def new_rpm(r):
   string = str(r.value)
-  data = {
-    "rpm": string
-  }
+  data = {"rpm" : string}
   print(json.dumps(data))
   sys.stdout.flush()
 
+def new_maf(r):
+  string = str(r.value)
+  data = {"maf" : string}
+  print(json.dumps(data))
+  sys.stdout.flush()
+
+def new_fuel(r):
+  string = str(r.value)
+  data = {"fuel" : string}
+  print(json.dumps(data))
+  sys.stdout.flush()
+
+def new_temp(r):
+  string = str(r.value)
+  data = {"temp" : string}
+  print(json.dumps(data))
+  sys.stdout.flush()
 
 # commands to watch
 connection.watch(obd.commands.SPEED, callback=new_spd)
 connection.watch(obd.commands.RPM, callback=new_rpm)
-# connection.watch(obd.commands.FUEL_PRESSURE)
+connection.watch(obd.commands.MAF, callback=new_maf)
+connection.watch(obd.commands.FUEL_LEVEL, callback=new_fuel)
+connection.watch(obd.commands.COOLANT_TEMP, callback=new_temp)
 
 # start the connection
 connection.start()
 
-time.sleep(60)
-connection.stop()
+while True:
+  
 
+connection.stop()
