tirecheck-device-sdk 0.1.999 → 0.2.2

package/dist/index.cjs

@@ -2907,6 +2907,22 @@ const bridgeSimulator = {
   async setVehicle(deviceId, vehicle) {
     const bridge = getSimulatedBridge(deviceId);
     bridge.vin = vehicle.vin ?? bridge.vin;
+    for (const tcTyre of vehicle.tcTyres) {
+      if (tcTyre.tcTpmsSensor?.id && tcTyre.mountedOn?.positionId) {
+        const currentSensor = bridge.simulatorData.sensors[tcTyre.mountedOn.positionId];
+        if (currentSensor?.sensorId === tcTyre.tcTpmsSensor.id) {
+          continue;
+        }
+        const tyreAxle = bridge.simulatorData.vehicle.axles[Math.floor(tcTyre.mountedOn.positionId / 100) - 1];
+        if (!tyreAxle) continue;
+        const sensorIdInBinary = bridgeTools.hexToDecimalArray(tcTyre.tcTpmsSensor.id).reverse();
+        bridge.simulatorData.sensors[tcTyre.mountedOn.positionId] = createSensorData(
+          tyreAxle,
+          tcTyre.tcTpmsSensor.id,
+          sensorIdInBinary
+        );
+      }
+    }
     bridge.simulatorData.vehicle = vehicle;
   },
   async getConfiguration(deviceId) {
@@ -3162,6 +3178,39 @@ function getSimulatedBridgeTemplate() {
     }
   };
 }
+function createSensorData(tyreAxle, sensorId, sensorIdInBinary) {
+  return {
+    date: Date.now(),
+    eceStatus: 0,
+    sensorId,
+    sensorStatus: 0,
+    pressure: {
+      bar: tyreAxle.targetPressure ?? 0,
+      meas: tyreAxle.targetPressure ?? 0,
+      raw: (tyreAxle.targetPressure ?? 0) * 19.753086
+    },
+    pressureIssue: void 0,
+    temperature: { amb: 20, celsius: 24, raw: 64 },
+    byteReading: [
+      16,
+      1,
+      12,
+      253,
+      25,
+      ...sensorIdInBinary,
+      tyreAxle.targetPressure ? tyreAxle.targetPressure * 19.753086 : 0,
+      64,
+      255,
+      0,
+      0,
+      40,
+      255,
+      255,
+      255,
+      255
+    ]
+  };
+}
 
 const flexiGaugeTpmsSimulator = {
   createSimulatedDevice(initialData) {
@@ -3241,7 +3290,12 @@ const simulator = {
     const simulatedDevices = {};
     for (const key in devices) {
       const device = devices[key];
-      const normalizedDevice = normalizeSimulatedDevice(device);
+      let normalizedDevice = normalizeSimulatedDevice(device);
+      if (normalizedDevice) {
+        if (normalizedDevice?.type === "bridge" && normalizedDevice?.simulatorData?.sensors) {
+          normalizedDevice = processNormalizedBridgeDevice(normalizedDevice);
+        }
+      }
       if (normalizedDevice) simulatedDevices[normalizedDevice.id] = normalizedDevice;
     }
     store.simulatedDevices = simulatedDevices;
@@ -3249,7 +3303,12 @@ const simulator = {
   },
   putSimulatedDevice(device) {
     ensureSimulatorMethodsAreInjected();
-    const normalizedDevice = this.createSimulatedDevice(device);
+    let normalizedDevice = this.createSimulatedDevice(device);
+    if (normalizedDevice) {
+      if (normalizedDevice?.type === "bridge" && normalizedDevice?.simulatorData?.sensors) {
+        normalizedDevice = processNormalizedBridgeDevice(normalizedDevice);
+      }
+    }
     store.simulatedDevices[normalizedDevice.id] = normalizedDevice;
     return normalizedDevice;
   },
@@ -3258,40 +3317,10 @@ const simulator = {
   },
   createSimulatedDevice(device) {
     ensureSimulatorMethodsAreInjected();
-    const normalizedDevice = normalizeSimulatedDevice(device);
+    let normalizedDevice = normalizeSimulatedDevice(device);
     if (normalizedDevice) {
       if (normalizedDevice?.type === "bridge" && normalizedDevice?.simulatorData?.sensors) {
-        const keys = Object.keys(normalizedDevice.simulatorData.sensors);
-        for (const key of keys) {
-          const sensor = normalizedDevice.simulatorData.sensors[key];
-          const sensorIdInBinary = bridgeTools.hexToDecimalArray(sensor.sensorId).reverse();
-          const pressureTemperature = getRawPressureandTemperatureValue(
-            sensor.pressure.bar,
-            sensor.pressure.meas,
-            sensor.temperature.celsius
-          );
-          const responseHeader = [16, 1, 12, 253];
-          const rssiByte = 255;
-          const sensorStatus = sensor.sensorStatus;
-          const eceStatusByte = calculateEceStatusByte(
-            key,
-            normalizedDevice.simulatorData,
-            normalizedDevice.advertisingData
-          );
-          const signatureBytes = [255, 255, 255, 255];
-          sensor.byteReading = [
-            ...responseHeader,
-            25,
-            ...sensorIdInBinary,
-            ...pressureTemperature,
-            rssiByte,
-            sensorStatus,
-            eceStatusByte,
-            40,
-            ...signatureBytes
-          ];
-          sensor.eceStatus = eceStatusByte;
-        }
+        normalizedDevice = processNormalizedBridgeDevice(normalizedDevice);
       }
     }
     return normalizedDevice;
@@ -3350,12 +3379,12 @@ function getRawPressureandTemperatureValue(barPressure, measPressure, measuredTe
   const ambientTemperature = 20;
   const rawTemperature = 40 + measuredTemperature;
   if (measPressure !== null) {
-    return [Math.round((measPressure + 1) * 19.753086), rawTemperature];
+    return { rawPressure: Math.round((measPressure + 1) * 19.753086), rawTemperature };
   }
   const rawPressure = Math.round(
     (barPressure + 1) * (273 + measuredTemperature) / (273 + ambientTemperature) * 19.753086
   );
-  return [rawPressure, rawTemperature];
+  return { rawPressure, rawTemperature };
 }
 function ensureSimulatorMethodsAreInjected() {
   if (areSimulatorMethodsInjected) return;
@@ -3407,6 +3436,39 @@ function ensureSimulatorMethodsAreInjected() {
     }
   }
 }
+function processNormalizedBridgeDevice(device) {
+  const keys = Object.keys(device.simulatorData.sensors);
+  for (const key of keys) {
+    const sensor = device.simulatorData.sensors[key];
+    const sensorIdInBinary = bridgeTools.hexToDecimalArray(sensor.sensorId).reverse();
+    const { rawPressure, rawTemperature } = getRawPressureandTemperatureValue(
+      sensor.pressure.bar,
+      sensor.pressure.meas,
+      sensor.temperature.celsius
+    );
+    sensor.pressure.raw = rawPressure;
+    sensor.temperature.raw = rawTemperature;
+    const responseHeader = [16, 1, 12, 253];
+    const rssiByte = 255;
+    const sensorStatus = sensor.sensorStatus;
+    const eceStatusByte = calculateEceStatusByte(key, device.simulatorData, device.advertisingData);
+    const signatureBytes = [255, 255, 255, 255];
+    sensor.byteReading = [
+      ...responseHeader,
+      25,
+      ...sensorIdInBinary,
+      rawPressure,
+      rawTemperature,
+      rssiByte,
+      sensorStatus,
+      eceStatusByte,
+      40,
+      ...signatureBytes
+    ];
+    sensor.eceStatus = eceStatusByte;
+  }
+  return device;
+}
 
 class BridgeTcVehicleAxle {
   targetPressure;

package/dist/index.mjs

@@ -2900,6 +2900,22 @@ const bridgeSimulator = {
   async setVehicle(deviceId, vehicle) {
     const bridge = getSimulatedBridge(deviceId);
     bridge.vin = vehicle.vin ?? bridge.vin;
+    for (const tcTyre of vehicle.tcTyres) {
+      if (tcTyre.tcTpmsSensor?.id && tcTyre.mountedOn?.positionId) {
+        const currentSensor = bridge.simulatorData.sensors[tcTyre.mountedOn.positionId];
+        if (currentSensor?.sensorId === tcTyre.tcTpmsSensor.id) {
+          continue;
+        }
+        const tyreAxle = bridge.simulatorData.vehicle.axles[Math.floor(tcTyre.mountedOn.positionId / 100) - 1];
+        if (!tyreAxle) continue;
+        const sensorIdInBinary = bridgeTools.hexToDecimalArray(tcTyre.tcTpmsSensor.id).reverse();
+        bridge.simulatorData.sensors[tcTyre.mountedOn.positionId] = createSensorData(
+          tyreAxle,
+          tcTyre.tcTpmsSensor.id,
+          sensorIdInBinary
+        );
+      }
+    }
     bridge.simulatorData.vehicle = vehicle;
   },
   async getConfiguration(deviceId) {
@@ -3155,6 +3171,39 @@ function getSimulatedBridgeTemplate() {
     }
   };
 }
+function createSensorData(tyreAxle, sensorId, sensorIdInBinary) {
+  return {
+    date: Date.now(),
+    eceStatus: 0,
+    sensorId,
+    sensorStatus: 0,
+    pressure: {
+      bar: tyreAxle.targetPressure ?? 0,
+      meas: tyreAxle.targetPressure ?? 0,
+      raw: (tyreAxle.targetPressure ?? 0) * 19.753086
+    },
+    pressureIssue: void 0,
+    temperature: { amb: 20, celsius: 24, raw: 64 },
+    byteReading: [
+      16,
+      1,
+      12,
+      253,
+      25,
+      ...sensorIdInBinary,
+      tyreAxle.targetPressure ? tyreAxle.targetPressure * 19.753086 : 0,
+      64,
+      255,
+      0,
+      0,
+      40,
+      255,
+      255,
+      255,
+      255
+    ]
+  };
+}
 
 const flexiGaugeTpmsSimulator = {
   createSimulatedDevice(initialData) {
@@ -3234,7 +3283,12 @@ const simulator = {
     const simulatedDevices = {};
     for (const key in devices) {
       const device = devices[key];
-      const normalizedDevice = normalizeSimulatedDevice(device);
+      let normalizedDevice = normalizeSimulatedDevice(device);
+      if (normalizedDevice) {
+        if (normalizedDevice?.type === "bridge" && normalizedDevice?.simulatorData?.sensors) {
+          normalizedDevice = processNormalizedBridgeDevice(normalizedDevice);
+        }
+      }
       if (normalizedDevice) simulatedDevices[normalizedDevice.id] = normalizedDevice;
     }
     store.simulatedDevices = simulatedDevices;
@@ -3242,7 +3296,12 @@ const simulator = {
   },
   putSimulatedDevice(device) {
     ensureSimulatorMethodsAreInjected();
-    const normalizedDevice = this.createSimulatedDevice(device);
+    let normalizedDevice = this.createSimulatedDevice(device);
+    if (normalizedDevice) {
+      if (normalizedDevice?.type === "bridge" && normalizedDevice?.simulatorData?.sensors) {
+        normalizedDevice = processNormalizedBridgeDevice(normalizedDevice);
+      }
+    }
     store.simulatedDevices[normalizedDevice.id] = normalizedDevice;
     return normalizedDevice;
   },
@@ -3251,40 +3310,10 @@ const simulator = {
   },
   createSimulatedDevice(device) {
     ensureSimulatorMethodsAreInjected();
-    const normalizedDevice = normalizeSimulatedDevice(device);
+    let normalizedDevice = normalizeSimulatedDevice(device);
     if (normalizedDevice) {
       if (normalizedDevice?.type === "bridge" && normalizedDevice?.simulatorData?.sensors) {
-        const keys = Object.keys(normalizedDevice.simulatorData.sensors);
-        for (const key of keys) {
-          const sensor = normalizedDevice.simulatorData.sensors[key];
-          const sensorIdInBinary = bridgeTools.hexToDecimalArray(sensor.sensorId).reverse();
-          const pressureTemperature = getRawPressureandTemperatureValue(
-            sensor.pressure.bar,
-            sensor.pressure.meas,
-            sensor.temperature.celsius
-          );
-          const responseHeader = [16, 1, 12, 253];
-          const rssiByte = 255;
-          const sensorStatus = sensor.sensorStatus;
-          const eceStatusByte = calculateEceStatusByte(
-            key,
-            normalizedDevice.simulatorData,
-            normalizedDevice.advertisingData
-          );
-          const signatureBytes = [255, 255, 255, 255];
-          sensor.byteReading = [
-            ...responseHeader,
-            25,
-            ...sensorIdInBinary,
-            ...pressureTemperature,
-            rssiByte,
-            sensorStatus,
-            eceStatusByte,
-            40,
-            ...signatureBytes
-          ];
-          sensor.eceStatus = eceStatusByte;
-        }
+        normalizedDevice = processNormalizedBridgeDevice(normalizedDevice);
       }
     }
     return normalizedDevice;
@@ -3343,12 +3372,12 @@ function getRawPressureandTemperatureValue(barPressure, measPressure, measuredTe
   const ambientTemperature = 20;
   const rawTemperature = 40 + measuredTemperature;
   if (measPressure !== null) {
-    return [Math.round((measPressure + 1) * 19.753086), rawTemperature];
+    return { rawPressure: Math.round((measPressure + 1) * 19.753086), rawTemperature };
   }
   const rawPressure = Math.round(
     (barPressure + 1) * (273 + measuredTemperature) / (273 + ambientTemperature) * 19.753086
   );
-  return [rawPressure, rawTemperature];
+  return { rawPressure, rawTemperature };
 }
 function ensureSimulatorMethodsAreInjected() {
   if (areSimulatorMethodsInjected) return;
@@ -3400,6 +3429,39 @@ function ensureSimulatorMethodsAreInjected() {
     }
   }
 }
+function processNormalizedBridgeDevice(device) {
+  const keys = Object.keys(device.simulatorData.sensors);
+  for (const key of keys) {
+    const sensor = device.simulatorData.sensors[key];
+    const sensorIdInBinary = bridgeTools.hexToDecimalArray(sensor.sensorId).reverse();
+    const { rawPressure, rawTemperature } = getRawPressureandTemperatureValue(
+      sensor.pressure.bar,
+      sensor.pressure.meas,
+      sensor.temperature.celsius
+    );
+    sensor.pressure.raw = rawPressure;
+    sensor.temperature.raw = rawTemperature;
+    const responseHeader = [16, 1, 12, 253];
+    const rssiByte = 255;
+    const sensorStatus = sensor.sensorStatus;
+    const eceStatusByte = calculateEceStatusByte(key, device.simulatorData, device.advertisingData);
+    const signatureBytes = [255, 255, 255, 255];
+    sensor.byteReading = [
+      ...responseHeader,
+      25,
+      ...sensorIdInBinary,
+      rawPressure,
+      rawTemperature,
+      rssiByte,
+      sensorStatus,
+      eceStatusByte,
+      40,
+      ...signatureBytes
+    ];
+    sensor.eceStatus = eceStatusByte;
+  }
+  return device;
+}
 
 class BridgeTcVehicleAxle {
   targetPressure;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tirecheck-device-sdk",
-  "version": "0.1.999",
+  "version": "0.2.02",
   "description": "SDK for working with various devices produced by Tirecheck via Bluetooth (CAN Bridge, Routers, Sensors, FlexiGauge, PressureStick, etc)",
   "author": "Leonid Buneev <leonid.buneev@tirecheck.com>",
   "license": "ISC",