add the webble support for BSEC2 sensors 116 and 117

Author: lucasguocn

tools/bhy-controller/src/static/parse-scheme.json

@@ -90,9 +90,35 @@
         {"name": "Accuracy", "type": "uint8", "scale-factor": 1},
         {"name": "Compensated-Temperature(°C)", "type": "int16", "scale-factor": 0.003906},
         {"name": "Compensated-Humidity(%)", "type": "uint16", "scale-factor": 0.002},
-        {"name": "Compensated-Gas Resistance(Ohms)", "type": "float", "scale-factor": 1}
+        {"name": "Compensated-Gas Resistance(Ω)", "type": "uint32", "scale-factor": 1}
       ]
-    }
+    },
+
+    {
+      "id": 8,
+      "type": "BSEC2DataCollectorOutput",
+      "parse-scheme":
+      [
+        {"name": "Timestamp(ms)", "type": "uint64", "scale-factor": 1},
+        {"name": "Temperature(°C)", "type": "int16", "scale-factor": 0.003906},
+        {"name": "Pressure(Pa)", "type": "float", "scale-factor": 1},
+        {"name": "Humidity(%)", "type": "uint16", "scale-factor": 0.002},
+        {"name": "Gas(Ω)", "type": "float", "scale-factor": 1},
+        {"name": "Index", "type": "uint8", "scale-factor": 1}
+      ]
+    },
 
+    {
+      "id": 9,
+      "type": "BSEC2GasClassifierOutput",
+      "parse-scheme":
+      [
+        {"name": "Gas0(%)", "type": "uint8", "scale-factor": 1},
+        {"name": "Gas1(%)", "type": "uint8", "scale-factor": 1},
+        {"name": "Gas2(%)", "type": "uint8", "scale-factor": 1},
+        {"name": "Gas3(%)", "type": "uint8", "scale-factor": 1},
+        {"name": "Accuracy", "type": "uint8", "scale-factor": 1}
+      ]
+    }
   ]
 }

tools/bhy-controller/src/static/sensor-type-map.json

@@ -353,6 +353,20 @@
     "dashboard": 1
   },
 
+  "116": {
+      "name": "BSEC2 Data Collector Output",
+      "scheme": "BSEC2DataCollectorOutput",
+      "value": 0,
+      "dashboard": 1
+  },
+
+  "117": {
+      "name": "BSEC2 Gas Classifier Output",
+      "scheme": "BSEC2GasClassifierOutput",
+      "value": 0,
+      "dashboard": 1
+  },
+
   "128": {
     "name": "TEMPERATURE",
     "scheme": "singleRead",

tools/bhy-controller/src/static/sensor.html

@@ -487,6 +487,44 @@ <h3>Read sensor data</h3>
           });
         }
 
+    } else if (sensorTypes[sensor].scheme == "BSEC2GasClassifierOutput") {
+        //Parse BSEC values
+        const BSECValues = parsedStringValue.split(" ");
+        console.log("Split: ", BSECValues);
+
+        var val0 = BSECValues[1];   //gas 0 probability (%)
+        var val1 = BSECValues[5];   //gas 1 probability (%)
+        var val2 = BSECValues[9];   //gas 2 probability (%)
+        var val3 = BSECValues[13];  //gas 3 probability (%)
+        //var status = BSECValues[17];  //status
+        //var total = (val0+val1+val2+val3);
+
+        if (sensorTypes[sensor].value == 0) {   //Plot doesn't exist yet because no valid data have been received
+            Plotly.newPlot(chartIdx,
+                [
+                    {y:[val0],name:'Gas0 probability(%)',type:'line'}, {y:[val1],name:'Gas1 probability(%)',type:'line'},
+                    {y:[val2],name:'Gas2 probability(%)',type:'line'}, {y:[val3],name:'Gas3 probability(%)',type:'line'}
+                ]);
+            //Update json to signal that the reception started
+            cnt = sensorTypes[sensor].value + 1;
+            sensorTypes[sensor].value = cnt;
+        } else {    //Plot already exists
+            Plotly.extendTraces(chartIdx,{y:[[val0]]}, [0]);
+            Plotly.extendTraces(chartIdx,{y:[[val1]]}, [1]);
+            Plotly.extendTraces(chartIdx,{y:[[val2]]}, [2]);
+            Plotly.extendTraces(chartIdx,{y:[[val3]]}, [3]);
+            cnt = sensorTypes[sensor].value;
+            sensorTypes[sensor].value = cnt + 1;
+        }
+
+        if (cnt > 150) {
+            Plotly.relayout(chartIdx,{
+                xaxis: {
+                    range: [cnt-150,cnt]
+                }
+            });
+        }
+
     }
   }
 }
@@ -524,6 +562,10 @@ <h3>Read sensor data</h3>
       } else {
          parse_scheme = parseScheme["types"][7]["parse-scheme"];
       }
+  } else if (scheme == "BSEC2DataCollectorOutput") {
+    parse_scheme = parseScheme["types"][8]["parse-scheme"];
+  } else if (scheme == "BSEC2GasClassifierOutput") {
+    parse_scheme = parseScheme["types"][9]["parse-scheme"];
   }
 
   parse_scheme.forEach(element => {
@@ -547,13 +589,22 @@ <h3>Read sensor data</h3>
       size = 2;
     } else if (valueType == "uint24") {
       value = data.getUint16(dataIndex, true) + (data.getUint8(dataIndex+2, true) << 16);
+      value = value * scale;
       size = 3;
     } else if (valueType == "uint32") {
       value = data.getUint16(dataIndex, true) + (data.getUint16(dataIndex+2, true) << 16);
+      value = value * scale;
       size = 4;
     } else if (valueType == "float") {
       value = data.getFloat32(dataIndex, true) * scale; 
       size = 4;
+    } else if (valueType == "uint64") {
+      valLow = data.getUint32(dataIndex, true)
+      valHigh = data.getUint32(dataIndex + 4, true)
+      value = (valLow + (valHigh * 2**32)) * scale
+      //value = (valLow) * scale
+      //console.log('value:' + value + 'scale:' + scale)
+      size = 8;
     } else if (valueType == "none") {
       value = eventcount + 1;
       sensorTypes[sensor].eventcount = value;