@autorunify/capacitor-nrfmesh 0.0.17 → 0.0.18

package/Android-nRF-Mesh-Library/mesh/src/main/java/no/nordicsemi/android/mesh/MeshNetwork.java

@@ -1,25 +1,26 @@
 
 package no.nordicsemi.android.mesh;
 
+import static no.nordicsemi.android.mesh.AddressRange.isAddressInAnyRanges;
+
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
+import androidx.room.Entity;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RestrictTo;
-import androidx.room.Entity;
 import no.nordicsemi.android.mesh.transport.Element;
 import no.nordicsemi.android.mesh.transport.MeshModel;
 import no.nordicsemi.android.mesh.transport.ProvisionedMeshNode;
 import no.nordicsemi.android.mesh.utils.MeshAddress;
 
-import static no.nordicsemi.android.mesh.AddressRange.isAddressInAnyRanges;
-
 @SuppressWarnings({"WeakerAccess", "UnusedReturnValue"})
 @Entity(tableName = "mesh_network")
 public final class MeshNetwork extends BaseMeshNetwork {
@@ -156,43 +157,54 @@ public final class MeshNetwork extends BaseMeshNetwork {
         }
         // Excluded addresses with the current IvIndex and current IvIndex - 1 must be considered as addresses in use.
         final List<Integer> addressesWithCurrentIvIndex = networkExclusions.get(ivIndex.getIvIndex());
-        if (addressesWithCurrentIvIndex != null)
-            usedAddresses.addAll(addressesWithCurrentIvIndex);
+//        if (addressesWithCurrentIvIndex != null)
+//            usedAddresses.addAll(addressesWithCurrentIvIndex);
         final List<Integer> addressesWithCurrentIvIndexMinusOne = networkExclusions.get(ivIndex.getIvIndex() - 1);
-        if (addressesWithCurrentIvIndexMinusOne != null)
-            usedAddresses.addAll(addressesWithCurrentIvIndexMinusOne);
+//        if (addressesWithCurrentIvIndexMinusOne != null)
+//            usedAddresses.addAll(addressesWithCurrentIvIndexMinusOne);
 
         Collections.sort(usedAddresses);
         // Iterate through all nodes just once, while iterating over ranges.
-        int index = 0;
+        boolean findAddress = false;
         for (AllocatedUnicastRange range : provisioner.getAllocatedUnicastRanges()) {
             // Start from the beginning of the current range.
-            int address = range.getLowAddress();
+            int lowAddress = range.getLowAddress();
+            findAddress = false;
 
             // Iterate through nodes that weren't checked yet in essence the used addresses which include the excluded adresses
             for (int usedAddress : usedAddresses) {
 
                 // Skip nodes with addresses below the range.
-                if (address > usedAddress) {
+                if (lowAddress > usedAddress) {
                     continue;
                 }
 
                 // If we found a space before the current node, return the address.
-                if (usedAddress > (address + (elementCount - 1))) {
-                    return address;
+                if (usedAddress > (lowAddress + (elementCount - 1))) {
+                    findAddress = true;
+                    break;
                 }
 
                 // Else, move the address to the next available address.
-                address = usedAddress + 1;
+                lowAddress = usedAddress + 1;
 
                 // If the new address is outside of the range, go to the next one.
-                if (range.highAddress < address + (elementCount - 1)) {
+                if (range.highAddress < lowAddress + (elementCount - 1)) {
                     break;
                 }
             }
 
-            if (range.getHighAddress() >= address + (elementCount - 1)) {
-                return address;
+            if (findAddress || usedAddresses.size() == 1) {
+                for (int i = 0; i < elementCount; i++) {
+                    if (addressesWithCurrentIvIndex != null)
+                        addressesWithCurrentIvIndex.remove((Object) (lowAddress + i));
+                    if (addressesWithCurrentIvIndexMinusOne != null)
+                        addressesWithCurrentIvIndexMinusOne.remove((Object) (lowAddress + i));
+                }
+            }
+
+            if (range.getHighAddress() >= lowAddress + (elementCount - 1)) {
+                return lowAddress;
             }
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorunify/capacitor-nrfmesh",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "description": "nrf mesh plugin",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",