tirecheck-device-sdk 0.2.42 → 0.2.44

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/index.cjs +14 -12
  2. package/dist/index.mjs +14 -12
  3. package/package.json +1 -1
package/dist/index.cjs CHANGED
@@ -2086,8 +2086,8 @@ async function updateFirmware(deviceId, bootloader, firmware, reportStatus) {
2086
2086
  reportStatus("Update finished!", 1);
2087
2087
  }
2088
2088
  async function setVehicleLayout(deviceId, tcVehicle) {
2089
- const spareTyres = tcVehicle.tcTyres?.filter((tyre) => String(tyre.mountedOn?.positionId).endsWith("0"));
2090
- let spareTyresCount = Math.min(spareTyres?.length || 0, 2);
2089
+ const spareAxles = tcVehicle.axles?.filter((axle) => axle.isSpare);
2090
+ let spareAxlesCount = Math.min(spareAxles?.length || 0, 2);
2091
2091
  const result = {
2092
2092
  axle01: "0000",
2093
2093
  axle02: "0000",
@@ -2111,18 +2111,18 @@ async function setVehicleLayout(deviceId, tcVehicle) {
2111
2111
  const resultKey = Object.keys(result)[index];
2112
2112
  const tyreCount = tcVehicle.axles[index]?.tyresCount;
2113
2113
  if (tyreCount === 2) {
2114
- if (spareTyresCount) {
2114
+ if (spareAxlesCount) {
2115
2115
  result[resultKey] = vehicleLayoutAxleTypes.twoTyresAxleSpare;
2116
- spareTyresCount -= 1;
2116
+ spareAxlesCount -= 1;
2117
2117
  } else {
2118
2118
  result[resultKey] = vehicleLayoutAxleTypes.twoTyresAxle;
2119
2119
  }
2120
2120
  continue;
2121
2121
  }
2122
2122
  if (tyreCount === 4) {
2123
- if (spareTyresCount) {
2123
+ if (spareAxlesCount) {
2124
2124
  result[resultKey] = vehicleLayoutAxleTypes.fourTyresAxleSpare;
2125
- spareTyresCount -= 1;
2125
+ spareAxlesCount -= 1;
2126
2126
  } else {
2127
2127
  result[resultKey] = vehicleLayoutAxleTypes.fourTyresAxle;
2128
2128
  }
@@ -2302,16 +2302,18 @@ async function setAxleInfo(deviceId, tcVehicle) {
2302
2302
  (t) => t.mountedOn?.positionId ? bridgeTools.getPositionInfo(t.mountedOn?.positionId).axlePosition === axleIndex + 1 && spareTyre?.mountedOn?.positionId !== t.mountedOn?.positionId : false
2303
2303
  ) || [];
2304
2304
  axleTyres = axleTyres.sort((a, b) => (a.mountedOn?.positionId || 0) - (b.mountedOn?.positionId || 0));
2305
- for (let tyreIndex = 0; tyreIndex < axleTyres.length; tyreIndex++) {
2306
- const sensorId = axleTyres[tyreIndex].tcTpmsSensor?.id;
2305
+ for (const [tyreIndex, tyre] of axleTyres.entries()) {
2306
+ const tyrePosition = tyre.mountedOn && bridgeTools.getPositionInfo(tyre.mountedOn.positionId).tyrePosition;
2307
+ const realTyreIndex = tyrePosition ? tyrePosition - 1 : tyreIndex;
2308
+ const sensorId = tyre.tcTpmsSensor?.id;
2307
2309
  if (!sensorId) continue;
2308
2310
  if (axle.isSpare) continue;
2309
2311
  const isTwinTyre = axle.tyresCount === 4;
2310
2312
  let bridgeTyreIndex = 0;
2311
- if (isTwinTyre && tyreIndex === 0) bridgeTyreIndex = 5;
2312
- if (isTwinTyre && tyreIndex === 1 || !isTwinTyre && tyreIndex === 0) bridgeTyreIndex = 6;
2313
- if (isTwinTyre && tyreIndex === 3) bridgeTyreIndex = 9;
2314
- if (isTwinTyre && tyreIndex === 2 || !isTwinTyre && tyreIndex === 1) bridgeTyreIndex = 8;
2313
+ if (isTwinTyre && realTyreIndex === 0) bridgeTyreIndex = 5;
2314
+ if (isTwinTyre && realTyreIndex === 1 || !isTwinTyre && realTyreIndex === 0) bridgeTyreIndex = 6;
2315
+ if (isTwinTyre && realTyreIndex === 3) bridgeTyreIndex = 9;
2316
+ if (isTwinTyre && realTyreIndex === 2 || !isTwinTyre && realTyreIndex === 1) bridgeTyreIndex = 8;
2315
2317
  tyres[bridgeTyreIndex] = bridgeTools.convertSensorIdForBridge(sensorId);
2316
2318
  }
2317
2319
  if (!___default.inRange(axleIndex, 0, 16)) return;
package/dist/index.mjs CHANGED
@@ -2079,8 +2079,8 @@ async function updateFirmware(deviceId, bootloader, firmware, reportStatus) {
2079
2079
  reportStatus("Update finished!", 1);
2080
2080
  }
2081
2081
  async function setVehicleLayout(deviceId, tcVehicle) {
2082
- const spareTyres = tcVehicle.tcTyres?.filter((tyre) => String(tyre.mountedOn?.positionId).endsWith("0"));
2083
- let spareTyresCount = Math.min(spareTyres?.length || 0, 2);
2082
+ const spareAxles = tcVehicle.axles?.filter((axle) => axle.isSpare);
2083
+ let spareAxlesCount = Math.min(spareAxles?.length || 0, 2);
2084
2084
  const result = {
2085
2085
  axle01: "0000",
2086
2086
  axle02: "0000",
@@ -2104,18 +2104,18 @@ async function setVehicleLayout(deviceId, tcVehicle) {
2104
2104
  const resultKey = Object.keys(result)[index];
2105
2105
  const tyreCount = tcVehicle.axles[index]?.tyresCount;
2106
2106
  if (tyreCount === 2) {
2107
- if (spareTyresCount) {
2107
+ if (spareAxlesCount) {
2108
2108
  result[resultKey] = vehicleLayoutAxleTypes.twoTyresAxleSpare;
2109
- spareTyresCount -= 1;
2109
+ spareAxlesCount -= 1;
2110
2110
  } else {
2111
2111
  result[resultKey] = vehicleLayoutAxleTypes.twoTyresAxle;
2112
2112
  }
2113
2113
  continue;
2114
2114
  }
2115
2115
  if (tyreCount === 4) {
2116
- if (spareTyresCount) {
2116
+ if (spareAxlesCount) {
2117
2117
  result[resultKey] = vehicleLayoutAxleTypes.fourTyresAxleSpare;
2118
- spareTyresCount -= 1;
2118
+ spareAxlesCount -= 1;
2119
2119
  } else {
2120
2120
  result[resultKey] = vehicleLayoutAxleTypes.fourTyresAxle;
2121
2121
  }
@@ -2295,16 +2295,18 @@ async function setAxleInfo(deviceId, tcVehicle) {
2295
2295
  (t) => t.mountedOn?.positionId ? bridgeTools.getPositionInfo(t.mountedOn?.positionId).axlePosition === axleIndex + 1 && spareTyre?.mountedOn?.positionId !== t.mountedOn?.positionId : false
2296
2296
  ) || [];
2297
2297
  axleTyres = axleTyres.sort((a, b) => (a.mountedOn?.positionId || 0) - (b.mountedOn?.positionId || 0));
2298
- for (let tyreIndex = 0; tyreIndex < axleTyres.length; tyreIndex++) {
2299
- const sensorId = axleTyres[tyreIndex].tcTpmsSensor?.id;
2298
+ for (const [tyreIndex, tyre] of axleTyres.entries()) {
2299
+ const tyrePosition = tyre.mountedOn && bridgeTools.getPositionInfo(tyre.mountedOn.positionId).tyrePosition;
2300
+ const realTyreIndex = tyrePosition ? tyrePosition - 1 : tyreIndex;
2301
+ const sensorId = tyre.tcTpmsSensor?.id;
2300
2302
  if (!sensorId) continue;
2301
2303
  if (axle.isSpare) continue;
2302
2304
  const isTwinTyre = axle.tyresCount === 4;
2303
2305
  let bridgeTyreIndex = 0;
2304
- if (isTwinTyre && tyreIndex === 0) bridgeTyreIndex = 5;
2305
- if (isTwinTyre && tyreIndex === 1 || !isTwinTyre && tyreIndex === 0) bridgeTyreIndex = 6;
2306
- if (isTwinTyre && tyreIndex === 3) bridgeTyreIndex = 9;
2307
- if (isTwinTyre && tyreIndex === 2 || !isTwinTyre && tyreIndex === 1) bridgeTyreIndex = 8;
2306
+ if (isTwinTyre && realTyreIndex === 0) bridgeTyreIndex = 5;
2307
+ if (isTwinTyre && realTyreIndex === 1 || !isTwinTyre && realTyreIndex === 0) bridgeTyreIndex = 6;
2308
+ if (isTwinTyre && realTyreIndex === 3) bridgeTyreIndex = 9;
2309
+ if (isTwinTyre && realTyreIndex === 2 || !isTwinTyre && realTyreIndex === 1) bridgeTyreIndex = 8;
2308
2310
  tyres[bridgeTyreIndex] = bridgeTools.convertSensorIdForBridge(sensorId);
2309
2311
  }
2310
2312
  if (!_.inRange(axleIndex, 0, 16)) return;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "tirecheck-device-sdk",
3
- "version": "0.2.42",
3
+ "version": "0.2.44",
4
4
  "description": "SDK for working with various devices produced by Tirecheck via Bluetooth (CAN Bridge, Routers, Sensors, FlexiGauge, PressureStick, etc)",
5
5
  "author": "Leonid Buneev <leonid.buneev@tirecheck.com>",
6
6
  "license": "ISC",