tirecheck-device-sdk 0.1.998 → 0.2.1

package/dist/index.cjs

@@ -235,7 +235,7 @@ const bridgeTools = {
   },
   barToKpaByte(value) {
     if (!value) return 0;
-    return ___default.round(value * 100 / 5.0625);
+    return ___default.round((value + 1) * 100 / 5.0625);
   },
   convertSensorIdForBridge(sensorId) {
     if (sensorId.startsWith("2") && sensorId.length === 10) {
@@ -243,12 +243,12 @@ const bridgeTools = {
     }
     return sensorId;
   },
-  kpaByteToBar(value) {
+  kpaByteToBar(value, decrementValue = 1) {
     if (!___default.isNumber(value)) {
       throw new TypeError("Value has to be a number");
     }
     const rawBar = value * 5.0625 / 100;
-    return ___default.round(Math.max(rawBar, 0), 1);
+    return ___default.round(Math.max(rawBar - decrementValue, 0), 1);
   },
   isVersionGreaterThan(deviceId, version) {
     if (version.length !== 5) {
@@ -2436,8 +2436,8 @@ function getPressureAndTemperatureReadingObjects(rawPressure, rawTemperature) {
   return {
     pressure: {
       raw: rawPressure,
-      meas: Math.max(0, measuredPressureAbsolute),
-      bar: Math.max(0, compensatedPressureAbsolute)
+      meas: Math.max(0, measuredPressureAbsolute - 1),
+      bar: Math.max(0, compensatedPressureAbsolute - 1)
     },
     temperature: { raw: rawTemperature, amb: ambientTemperature, celsius: measuredTemperature }
   };
@@ -2615,13 +2615,16 @@ async function assignTyres(deviceId, tcVehicle) {
 async function assignAxlePressureLimits(deviceId, tcVehicle, tcVehicleAxle, axleIndex, bridgeAxlesPressureData) {
   const axlesPressureData = bridgeAxlesPressureData ?? (await bridgeCommands.getAxlesPressure(deviceId)).data;
   if (axlesPressureData[axleIndex * 3]) {
-    tcVehicleAxle.maxTargetPressure = ___default.floor(bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3]));
+    tcVehicleAxle.maxTargetPressure = ___default.floor(bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3]), 1);
   }
   if (axlesPressureData[axleIndex * 3 + 1]) {
-    tcVehicleAxle.minTargetPressure = ___default.ceil(bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3 + 1]));
+    tcVehicleAxle.minTargetPressure = ___default.ceil(bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3 + 1]), 1);
   }
   if (axlesPressureData[axleIndex * 3 + 2]) {
-    tcVehicleAxle.targetPressure = ___default.round(bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3 + 2]), 1);
+    tcVehicleAxle.targetPressure = ___default.round(
+      bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3 + 2], void 0),
+      1
+    );
   }
   return tcVehicleAxle;
 }
@@ -2904,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) {
@@ -3159,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) {

package/dist/index.mjs

@@ -228,7 +228,7 @@ const bridgeTools = {
   },
   barToKpaByte(value) {
     if (!value) return 0;
-    return _.round(value * 100 / 5.0625);
+    return _.round((value + 1) * 100 / 5.0625);
   },
   convertSensorIdForBridge(sensorId) {
     if (sensorId.startsWith("2") && sensorId.length === 10) {
@@ -236,12 +236,12 @@ const bridgeTools = {
     }
     return sensorId;
   },
-  kpaByteToBar(value) {
+  kpaByteToBar(value, decrementValue = 1) {
     if (!_.isNumber(value)) {
       throw new TypeError("Value has to be a number");
     }
     const rawBar = value * 5.0625 / 100;
-    return _.round(Math.max(rawBar, 0), 1);
+    return _.round(Math.max(rawBar - decrementValue, 0), 1);
   },
   isVersionGreaterThan(deviceId, version) {
     if (version.length !== 5) {
@@ -2429,8 +2429,8 @@ function getPressureAndTemperatureReadingObjects(rawPressure, rawTemperature) {
   return {
     pressure: {
       raw: rawPressure,
-      meas: Math.max(0, measuredPressureAbsolute),
-      bar: Math.max(0, compensatedPressureAbsolute)
+      meas: Math.max(0, measuredPressureAbsolute - 1),
+      bar: Math.max(0, compensatedPressureAbsolute - 1)
     },
     temperature: { raw: rawTemperature, amb: ambientTemperature, celsius: measuredTemperature }
   };
@@ -2608,13 +2608,16 @@ async function assignTyres(deviceId, tcVehicle) {
 async function assignAxlePressureLimits(deviceId, tcVehicle, tcVehicleAxle, axleIndex, bridgeAxlesPressureData) {
   const axlesPressureData = bridgeAxlesPressureData ?? (await bridgeCommands.getAxlesPressure(deviceId)).data;
   if (axlesPressureData[axleIndex * 3]) {
-    tcVehicleAxle.maxTargetPressure = _.floor(bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3]));
+    tcVehicleAxle.maxTargetPressure = _.floor(bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3]), 1);
   }
   if (axlesPressureData[axleIndex * 3 + 1]) {
-    tcVehicleAxle.minTargetPressure = _.ceil(bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3 + 1]));
+    tcVehicleAxle.minTargetPressure = _.ceil(bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3 + 1]), 1);
   }
   if (axlesPressureData[axleIndex * 3 + 2]) {
-    tcVehicleAxle.targetPressure = _.round(bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3 + 2]), 1);
+    tcVehicleAxle.targetPressure = _.round(
+      bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3 + 2], void 0),
+      1
+    );
   }
   return tcVehicleAxle;
 }
@@ -2897,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) {
@@ -3152,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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tirecheck-device-sdk",
-  "version": "0.1.998",
+  "version": "0.2.01",
   "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",