tirecheck-device-sdk 0.2.49 → 0.2.50

package/dist/index.cjs

@@ -145,7 +145,7 @@ const bridgeTools = {
   convertBytesToStructure(objStructure, payload, fwVersion) {
     let numArray = ___default.clone(payload);
     const keys = Object.keys(objStructure).filter(
-      (key) => !objStructure[key].version || !fwVersion || fwVersion >= objStructure[key].version
+      (key) => !objStructure[key].version || fwVersion && fwVersion >= objStructure[key].version
     );
     let sumWithInitial = 0;
     for (const key of keys) {
@@ -169,7 +169,7 @@ const bridgeTools = {
   },
   convertStructureToBytes(objStructure, structurizedObj, fwVersion) {
     const keys = Object.keys(objStructure).filter(
-      (key) => !objStructure[key].version || !fwVersion || fwVersion >= objStructure[key].version
+      (key) => !objStructure[key].version || fwVersion && fwVersion >= objStructure[key].version
     );
     const result = [];
     for (const key of keys) {
@@ -339,6 +339,13 @@ const bridgeTools = {
   getSpareTyres(tcVehicle) {
     const spareTyres = tcVehicle.tcTyres?.filter((tyre) => String(tyre.mountedOn?.positionId).endsWith("0"));
     return spareTyres;
+  },
+  getBridgeIndexFromPositionId(positionId, centerIndex = 8) {
+    const halfPoint = positionId % 10 * 6;
+    const tyrePosition = positionId % 100;
+    const result = (tyrePosition - halfPoint) / 10 - (tyrePosition <= halfPoint ? 1 : 0);
+    const bitIndex = centerIndex + result;
+    return bitIndex;
   }
 };
 function getDefaultTyreLabels() {
@@ -1688,21 +1695,6 @@ const subCommandIds = {
   /** 0x20 - 0x2F */
   idsPerWheel: (axleIndex) => 32 + axleIndex,
   /** only for commandIds.sensorMeasurement */
-  sensorMeasurementPerWheel: (axlePosition, tyrePosition, isTwinTyre, isSpareAxle) => {
-    let bridgeTyrePosition = 0;
-    if (isTwinTyre && !isSpareAxle) {
-      if (tyrePosition === 1) bridgeTyrePosition = 6;
-      else if (tyrePosition === 2) bridgeTyrePosition = 7;
-      else if (tyrePosition === 3) bridgeTyrePosition = 9;
-      else if (tyrePosition === 4) bridgeTyrePosition = 10;
-    } else if (!isTwinTyre && !isSpareAxle) {
-      if (tyrePosition === 1) bridgeTyrePosition = 7;
-      else if (tyrePosition === 2) bridgeTyrePosition = 9;
-    } else if (isSpareAxle) {
-      if (tyrePosition === 1) bridgeTyrePosition = 8;
-    }
-    return axlePosition * 16 + bridgeTyrePosition;
-  },
   pressurePerAxle: 48,
   customerPressureThresholds: 64,
   customerTemperatureThresholds: 65,
@@ -1981,16 +1973,13 @@ const bridgeCommands = {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
     const isSpare = String(positionId).endsWith("0");
     const positionInfo = bridgeTools.getPositionInfo(positionId);
-    const { axlePosition, tyrePosition, isTwinTyre } = positionInfo;
-    if (axlePosition == null || isTwinTyre == null || tyrePosition == null) {
+    const { axlePosition } = positionInfo;
+    if (axlePosition == null) {
       throw new Error(`Invalid positionId ${positionId}`);
     }
-    const result = await this.writeCommand(
-      deviceData,
-      commandIds$1.sensorMeasurement,
-      subCommandIds.sensorMeasurementPerWheel(axlePosition, tyrePosition, isTwinTyre, isSpare),
-      []
-    );
+    const bridgeIndex = isSpare ? 8 : bridgeTools.getBridgeIndexFromPositionId(positionId);
+    const subCommandId = axlePosition * 16 + bridgeIndex;
+    const result = await this.writeCommand(deviceData, commandIds$1.sensorMeasurement, subCommandId, []);
     return result;
   },
   async readCommand(device, subCommandId) {
@@ -2310,7 +2299,7 @@ async function setAxleInfo(deviceId, tcVehicle) {
     const spareTyre = spareTyres[axleIndex];
     if (!axleTyres.length && !spareTyre && axleIndex >= tcVehicle.axles.length) continue;
     for (const tyre of axleTyres) {
-      const bridgeIndex = getBridgeIndexFromPositionId(tyre.positionId, 7);
+      const bridgeIndex = bridgeTools.getBridgeIndexFromPositionId(tyre.positionId, 7);
       tyres[bridgeIndex] = tyre.tcTpmsSensor.id;
     }
     if (spareTyre && spareTyre.tcTpmsSensor) tyres[7] = spareTyre.tcTpmsSensor.id;
@@ -2430,7 +2419,7 @@ async function getAutolearnStatuses(deviceId, tcVehicle) {
     if (!tcTyre.mountedOn?.positionId || tcTyre.mountedOn?.positionId % 10 === 0) continue;
     const axleIndex = Math.floor(tcTyre.mountedOn?.positionId / 100) - 1;
     const axleStatuses = statusEntries[axleIndex];
-    const tyreIndex = getBridgeIndexFromPositionId(tcTyre.mountedOn.positionId, 7);
+    const tyreIndex = bridgeTools.getBridgeIndexFromPositionId(tcTyre.mountedOn.positionId, 7);
     const tyreStatus = axleStatuses.split("").reverse().join("")[tyreIndex];
     let autolearnedSensorId;
     if (["1", "4", "9"].includes(tyreStatus)) {
@@ -2474,7 +2463,7 @@ async function resetAutolearnStatuses(deviceId, positionIds) {
   for (const [axleIndex, axlePositionIds] of Object.entries(sortedByAxle)) {
     const statusesAxleIndex = Number(axleIndex) - 1;
     for (const positionId of axlePositionIds) {
-      const bitIndex = getBridgeIndexFromPositionId(positionId, 7);
+      const bitIndex = bridgeTools.getBridgeIndexFromPositionId(positionId, 7);
       let status = statuses[statusesKeys[statusesAxleIndex]].split("").reverse().join("");
       status = `${status.substring(0, bitIndex)}0${status.substring(bitIndex + 1)}`;
       statuses[statusesKeys[statusesAxleIndex]] = status.split("").reverse().join("");
@@ -2482,13 +2471,6 @@ async function resetAutolearnStatuses(deviceId, positionIds) {
   }
   await bridgeCommands.setAutolearnIdStatus(deviceId, statuses);
 }
-function getBridgeIndexFromPositionId(positionId, centerIndex = 8) {
-  const halfPoint = positionId % 10 * 6;
-  const tyrePosition = positionId % 100;
-  const result = (tyrePosition - halfPoint) / 10 - (tyrePosition <= halfPoint ? 1 : 0);
-  const bitIndex = centerIndex + result;
-  return bitIndex;
-}
 function getPressureAndTemperatureReadingObjects(rawPressure, rawTemperature) {
   if (rawTemperature === 255 || rawPressure === 0) {
     return {
@@ -2664,7 +2646,7 @@ async function assignTyres(deviceId, tcVehicle) {
     }
     for (let tyreIndex = 1; tyreIndex <= axle.tyresCount; tyreIndex++) {
       const tyrePositionId = getPositionId(index + 1, tyreIndex, axle.tyresCount);
-      const sensorIndex = getBridgeIndexFromPositionId(tyrePositionId, 7);
+      const sensorIndex = bridgeTools.getBridgeIndexFromPositionId(tyrePositionId, 7);
       const tyre = createNewTyre(tyrePositionId);
       if (Number.parseInt(joinedAxleData[sensorIndex], 16)) {
         tyre.tcTpmsSensor = {

package/dist/index.mjs

@@ -138,7 +138,7 @@ const bridgeTools = {
   convertBytesToStructure(objStructure, payload, fwVersion) {
     let numArray = _.clone(payload);
     const keys = Object.keys(objStructure).filter(
-      (key) => !objStructure[key].version || !fwVersion || fwVersion >= objStructure[key].version
+      (key) => !objStructure[key].version || fwVersion && fwVersion >= objStructure[key].version
     );
     let sumWithInitial = 0;
     for (const key of keys) {
@@ -162,7 +162,7 @@ const bridgeTools = {
   },
   convertStructureToBytes(objStructure, structurizedObj, fwVersion) {
     const keys = Object.keys(objStructure).filter(
-      (key) => !objStructure[key].version || !fwVersion || fwVersion >= objStructure[key].version
+      (key) => !objStructure[key].version || fwVersion && fwVersion >= objStructure[key].version
     );
     const result = [];
     for (const key of keys) {
@@ -332,6 +332,13 @@ const bridgeTools = {
   getSpareTyres(tcVehicle) {
     const spareTyres = tcVehicle.tcTyres?.filter((tyre) => String(tyre.mountedOn?.positionId).endsWith("0"));
     return spareTyres;
+  },
+  getBridgeIndexFromPositionId(positionId, centerIndex = 8) {
+    const halfPoint = positionId % 10 * 6;
+    const tyrePosition = positionId % 100;
+    const result = (tyrePosition - halfPoint) / 10 - (tyrePosition <= halfPoint ? 1 : 0);
+    const bitIndex = centerIndex + result;
+    return bitIndex;
   }
 };
 function getDefaultTyreLabels() {
@@ -1681,21 +1688,6 @@ const subCommandIds = {
   /** 0x20 - 0x2F */
   idsPerWheel: (axleIndex) => 32 + axleIndex,
   /** only for commandIds.sensorMeasurement */
-  sensorMeasurementPerWheel: (axlePosition, tyrePosition, isTwinTyre, isSpareAxle) => {
-    let bridgeTyrePosition = 0;
-    if (isTwinTyre && !isSpareAxle) {
-      if (tyrePosition === 1) bridgeTyrePosition = 6;
-      else if (tyrePosition === 2) bridgeTyrePosition = 7;
-      else if (tyrePosition === 3) bridgeTyrePosition = 9;
-      else if (tyrePosition === 4) bridgeTyrePosition = 10;
-    } else if (!isTwinTyre && !isSpareAxle) {
-      if (tyrePosition === 1) bridgeTyrePosition = 7;
-      else if (tyrePosition === 2) bridgeTyrePosition = 9;
-    } else if (isSpareAxle) {
-      if (tyrePosition === 1) bridgeTyrePosition = 8;
-    }
-    return axlePosition * 16 + bridgeTyrePosition;
-  },
   pressurePerAxle: 48,
   customerPressureThresholds: 64,
   customerTemperatureThresholds: 65,
@@ -1974,16 +1966,13 @@ const bridgeCommands = {
     const deviceData = bridgeTools.getBridgeFromStore(deviceId);
     const isSpare = String(positionId).endsWith("0");
     const positionInfo = bridgeTools.getPositionInfo(positionId);
-    const { axlePosition, tyrePosition, isTwinTyre } = positionInfo;
-    if (axlePosition == null || isTwinTyre == null || tyrePosition == null) {
+    const { axlePosition } = positionInfo;
+    if (axlePosition == null) {
       throw new Error(`Invalid positionId ${positionId}`);
     }
-    const result = await this.writeCommand(
-      deviceData,
-      commandIds$1.sensorMeasurement,
-      subCommandIds.sensorMeasurementPerWheel(axlePosition, tyrePosition, isTwinTyre, isSpare),
-      []
-    );
+    const bridgeIndex = isSpare ? 8 : bridgeTools.getBridgeIndexFromPositionId(positionId);
+    const subCommandId = axlePosition * 16 + bridgeIndex;
+    const result = await this.writeCommand(deviceData, commandIds$1.sensorMeasurement, subCommandId, []);
     return result;
   },
   async readCommand(device, subCommandId) {
@@ -2303,7 +2292,7 @@ async function setAxleInfo(deviceId, tcVehicle) {
     const spareTyre = spareTyres[axleIndex];
     if (!axleTyres.length && !spareTyre && axleIndex >= tcVehicle.axles.length) continue;
     for (const tyre of axleTyres) {
-      const bridgeIndex = getBridgeIndexFromPositionId(tyre.positionId, 7);
+      const bridgeIndex = bridgeTools.getBridgeIndexFromPositionId(tyre.positionId, 7);
       tyres[bridgeIndex] = tyre.tcTpmsSensor.id;
     }
     if (spareTyre && spareTyre.tcTpmsSensor) tyres[7] = spareTyre.tcTpmsSensor.id;
@@ -2423,7 +2412,7 @@ async function getAutolearnStatuses(deviceId, tcVehicle) {
     if (!tcTyre.mountedOn?.positionId || tcTyre.mountedOn?.positionId % 10 === 0) continue;
     const axleIndex = Math.floor(tcTyre.mountedOn?.positionId / 100) - 1;
     const axleStatuses = statusEntries[axleIndex];
-    const tyreIndex = getBridgeIndexFromPositionId(tcTyre.mountedOn.positionId, 7);
+    const tyreIndex = bridgeTools.getBridgeIndexFromPositionId(tcTyre.mountedOn.positionId, 7);
     const tyreStatus = axleStatuses.split("").reverse().join("")[tyreIndex];
     let autolearnedSensorId;
     if (["1", "4", "9"].includes(tyreStatus)) {
@@ -2467,7 +2456,7 @@ async function resetAutolearnStatuses(deviceId, positionIds) {
   for (const [axleIndex, axlePositionIds] of Object.entries(sortedByAxle)) {
     const statusesAxleIndex = Number(axleIndex) - 1;
     for (const positionId of axlePositionIds) {
-      const bitIndex = getBridgeIndexFromPositionId(positionId, 7);
+      const bitIndex = bridgeTools.getBridgeIndexFromPositionId(positionId, 7);
       let status = statuses[statusesKeys[statusesAxleIndex]].split("").reverse().join("");
       status = `${status.substring(0, bitIndex)}0${status.substring(bitIndex + 1)}`;
       statuses[statusesKeys[statusesAxleIndex]] = status.split("").reverse().join("");
@@ -2475,13 +2464,6 @@ async function resetAutolearnStatuses(deviceId, positionIds) {
   }
   await bridgeCommands.setAutolearnIdStatus(deviceId, statuses);
 }
-function getBridgeIndexFromPositionId(positionId, centerIndex = 8) {
-  const halfPoint = positionId % 10 * 6;
-  const tyrePosition = positionId % 100;
-  const result = (tyrePosition - halfPoint) / 10 - (tyrePosition <= halfPoint ? 1 : 0);
-  const bitIndex = centerIndex + result;
-  return bitIndex;
-}
 function getPressureAndTemperatureReadingObjects(rawPressure, rawTemperature) {
   if (rawTemperature === 255 || rawPressure === 0) {
     return {
@@ -2657,7 +2639,7 @@ async function assignTyres(deviceId, tcVehicle) {
     }
     for (let tyreIndex = 1; tyreIndex <= axle.tyresCount; tyreIndex++) {
       const tyrePositionId = getPositionId(index + 1, tyreIndex, axle.tyresCount);
-      const sensorIndex = getBridgeIndexFromPositionId(tyrePositionId, 7);
+      const sensorIndex = bridgeTools.getBridgeIndexFromPositionId(tyrePositionId, 7);
       const tyre = createNewTyre(tyrePositionId);
       if (Number.parseInt(joinedAxleData[sensorIndex], 16)) {
         tyre.tcTpmsSensor = {

package/package.json

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