tirecheck-device-sdk 0.1.997 → 0.1.998

package/dist/index.cjs

@@ -235,7 +235,7 @@ const bridgeTools = {
   },
   barToKpaByte(value) {
     if (!value) return 0;
-    return ___default.round((value + 1) * 100 / 5.0625);
+    return ___default.round(value * 100 / 5.0625);
   },
   convertSensorIdForBridge(sensorId) {
     if (sensorId.startsWith("2") && sensorId.length === 10) {
@@ -243,12 +243,12 @@ const bridgeTools = {
     }
     return sensorId;
   },
-  kpaByteToBar(value, decrementValue = 1) {
+  kpaByteToBar(value) {
     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 - decrementValue, 0), 1);
+    return ___default.round(Math.max(rawBar, 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 - 1),
-      bar: Math.max(0, compensatedPressureAbsolute - 1)
+      meas: Math.max(0, measuredPressureAbsolute),
+      bar: Math.max(0, compensatedPressureAbsolute)
     },
     temperature: { raw: rawTemperature, amb: ambientTemperature, celsius: measuredTemperature }
   };
@@ -2615,16 +2615,13 @@ 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]), 1);
+    tcVehicleAxle.maxTargetPressure = ___default.floor(bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3]));
   }
   if (axlesPressureData[axleIndex * 3 + 1]) {
-    tcVehicleAxle.minTargetPressure = ___default.ceil(bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3 + 1]), 1);
+    tcVehicleAxle.minTargetPressure = ___default.ceil(bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3 + 1]));
   }
   if (axlesPressureData[axleIndex * 3 + 2]) {
-    tcVehicleAxle.targetPressure = ___default.round(
-      bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3 + 2], void 0),
-      1
-    );
+    tcVehicleAxle.targetPressure = ___default.round(bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3 + 2]), 1);
   }
   return tcVehicleAxle;
 }
@@ -2906,6 +2903,7 @@ const bridgeSimulator = {
   },
   async setVehicle(deviceId, vehicle) {
     const bridge = getSimulatedBridge(deviceId);
+    bridge.vin = vehicle.vin ?? bridge.vin;
     bridge.simulatorData.vehicle = vehicle;
   },
   async getConfiguration(deviceId) {
@@ -2924,6 +2922,7 @@ const bridgeSimulator = {
     const bridge = getSimulatedBridge(deviceId);
     const readings = ___default.values(bridge.simulatorData.sensors);
     for (const reading of readings) {
+      reading.date = (/* @__PURE__ */ new Date()).getTime();
       reading.pressureIssue = getPressureIssue(deviceId, reading.eceStatus);
     }
     return readings;
@@ -2963,7 +2962,16 @@ const bridgeSimulator = {
     store.setState(deviceId, void 0, "manualDisconnection");
   },
   createSimulatedDevice(initialData) {
-    return simulatorSvc.merge(getSimulatedBridgeTemplate(), initialData);
+    const mergedData = simulatorSvc.merge(getSimulatedBridgeTemplate(), initialData);
+    mergedData.advertisingData.macAddress = initialData.id?.split(":").map((x) => Number.parseInt(x, 16)) ?? [
+      1,
+      2,
+      3,
+      4,
+      5,
+      6
+    ];
+    return mergedData;
   }
 };
 function getPressureIssue(deviceId, eceStatus) {

package/dist/index.mjs

@@ -228,7 +228,7 @@ const bridgeTools = {
   },
   barToKpaByte(value) {
     if (!value) return 0;
-    return _.round((value + 1) * 100 / 5.0625);
+    return _.round(value * 100 / 5.0625);
   },
   convertSensorIdForBridge(sensorId) {
     if (sensorId.startsWith("2") && sensorId.length === 10) {
@@ -236,12 +236,12 @@ const bridgeTools = {
     }
     return sensorId;
   },
-  kpaByteToBar(value, decrementValue = 1) {
+  kpaByteToBar(value) {
     if (!_.isNumber(value)) {
       throw new TypeError("Value has to be a number");
     }
     const rawBar = value * 5.0625 / 100;
-    return _.round(Math.max(rawBar - decrementValue, 0), 1);
+    return _.round(Math.max(rawBar, 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 - 1),
-      bar: Math.max(0, compensatedPressureAbsolute - 1)
+      meas: Math.max(0, measuredPressureAbsolute),
+      bar: Math.max(0, compensatedPressureAbsolute)
     },
     temperature: { raw: rawTemperature, amb: ambientTemperature, celsius: measuredTemperature }
   };
@@ -2608,16 +2608,13 @@ 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]), 1);
+    tcVehicleAxle.maxTargetPressure = _.floor(bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3]));
   }
   if (axlesPressureData[axleIndex * 3 + 1]) {
-    tcVehicleAxle.minTargetPressure = _.ceil(bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3 + 1]), 1);
+    tcVehicleAxle.minTargetPressure = _.ceil(bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3 + 1]));
   }
   if (axlesPressureData[axleIndex * 3 + 2]) {
-    tcVehicleAxle.targetPressure = _.round(
-      bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3 + 2], void 0),
-      1
-    );
+    tcVehicleAxle.targetPressure = _.round(bridgeTools.kpaByteToBar(axlesPressureData[axleIndex * 3 + 2]), 1);
   }
   return tcVehicleAxle;
 }
@@ -2899,6 +2896,7 @@ const bridgeSimulator = {
   },
   async setVehicle(deviceId, vehicle) {
     const bridge = getSimulatedBridge(deviceId);
+    bridge.vin = vehicle.vin ?? bridge.vin;
     bridge.simulatorData.vehicle = vehicle;
   },
   async getConfiguration(deviceId) {
@@ -2917,6 +2915,7 @@ const bridgeSimulator = {
     const bridge = getSimulatedBridge(deviceId);
     const readings = _.values(bridge.simulatorData.sensors);
     for (const reading of readings) {
+      reading.date = (/* @__PURE__ */ new Date()).getTime();
       reading.pressureIssue = getPressureIssue(deviceId, reading.eceStatus);
     }
     return readings;
@@ -2956,7 +2955,16 @@ const bridgeSimulator = {
     store.setState(deviceId, void 0, "manualDisconnection");
   },
   createSimulatedDevice(initialData) {
-    return simulatorSvc.merge(getSimulatedBridgeTemplate(), initialData);
+    const mergedData = simulatorSvc.merge(getSimulatedBridgeTemplate(), initialData);
+    mergedData.advertisingData.macAddress = initialData.id?.split(":").map((x) => Number.parseInt(x, 16)) ?? [
+      1,
+      2,
+      3,
+      4,
+      5,
+      6
+    ];
+    return mergedData;
   }
 };
 function getPressureIssue(deviceId, eceStatus) {

package/package.json

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