@leonardojc/capacitor-ioboard 2.0.10 → 2.0.12

package/android/src/main/java/com/leonardojc/capacitor/ioboard/CapacitorIoboardPlugin.java

@@ -7,6 +7,7 @@ import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
 import com.getcapacitor.annotation.CapacitorPlugin;
+import org.json.JSONObject;
 import java.util.List;
 import java.util.ArrayList;
 
@@ -25,6 +26,21 @@ public class CapacitorIoboardPlugin extends Plugin implements SerialConnectionMa
     private String currentDeviceInfo = "";
     private String lastError = "";
     
+    // Helper class for pallet configuration
+    private static class PalletConfig {
+        String ledColor;
+        int intensity;
+        int blinkTimes;
+        int blinkSpeed;
+        
+        PalletConfig(String ledColor, int intensity, int blinkTimes, int blinkSpeed) {
+            this.ledColor = ledColor;
+            this.intensity = intensity;
+            this.blinkTimes = blinkTimes;
+            this.blinkSpeed = blinkSpeed;
+        }
+    }
+    
     // For response waiting in getStatus()
     private volatile byte[] pendingResponse = null;
     private final Object responseLock = new Object();
@@ -290,49 +306,52 @@ public class CapacitorIoboardPlugin extends Plugin implements SerialConnectionMa
         }
         
         try {
-            // Leer parámetros del call
             int address = call.getInt("address", 1);
-            String color = call.getString("color", "RED");
-            int intensity = call.getInt("intensity", 255);
-            int blinkTimes = call.getInt("blinkTimes", 16);
-            int blinkSpeed = call.getInt("blinkSpeed", 1);
+            int lockMask = call.getInt("lockMask", 0);
+            int extendedControl = call.getInt("extendedControl", 0);
             
-            // Leer array de pallets
+            // Leer array de pallets (objetos con ledColor, intensity, blinkTimes, blinkSpeed)
             JSArray palletsArray = call.getArray("pallets");
-            List<Integer> pallets = new ArrayList<>();
-            if (palletsArray != null) {
-                for (int i = 0; i < palletsArray.length(); i++) {
-                    try {
-                        pallets.add(palletsArray.getInt(i));
-                    } catch (Exception e) {
-                        Log.w(TAG, "Error reading pallet at index " + i);
-                    }
-                }
+            
+            if (palletsArray == null || palletsArray.length() != 8) {
+                call.reject("pallets array must contain exactly 8 pallet objects");
+                return;
             }
             
-            // Si no se especificaron pallets, usar todos (1-8)
-            if (pallets.isEmpty()) {
-                for (int i = 1; i <= 8; i++) {
-                    pallets.add(i);
+            // Parsear los 8 objetos pallet
+            List<PalletConfig> pallets = new ArrayList<>();
+            for (int i = 0; i < 8; i++) {
+                try {
+                    JSONObject palletJson = palletsArray.getJSONObject(i);
+                    JSObject pallet = JSObject.fromJSONObject(palletJson);
+                    
+                    String ledColor = pallet.getString("ledColor", "OFF");
+                    int intensity = pallet.getInteger("intensity", 0);
+                    int blinkTimes = pallet.getInteger("blinkTimes", 0);
+                    int blinkSpeed = pallet.getInteger("blinkSpeed", 1);
+                    
+                    pallets.add(new PalletConfig(ledColor, intensity, blinkTimes, blinkSpeed));
+                    
+                    Log.d(TAG, String.format("Pallet %d: color=%s, intensity=%d, blink=%d, speed=%d",
+                        i+1, ledColor, intensity, blinkTimes, blinkSpeed));
+                } catch (Exception e) {
+                    Log.e(TAG, "Error reading pallet at index " + i + ": " + e.getMessage(), e);
+                    call.reject("Error parsing pallet at index " + i);
+                    return;
                 }
             }
             
-            Log.d(TAG, String.format("Parameters - address: %d, color: %s, intensity: %d, blinkTimes: %d, blinkSpeed: %d, pallets: %s",
-                address, color, intensity, blinkTimes, blinkSpeed, pallets.toString()));
-            
-            byte[] frame = createMultiplePalletsFrame(address, color, intensity, blinkTimes, blinkSpeed, pallets);
+            byte[] frame = createFullPalletControlFrame(address, lockMask, extendedControl, pallets);
             boolean success = serialManager.writeData(frame);
             
             if (success) {
                 JSObject result = new JSObject();
                 result.put("success", true);
-                result.put("message", String.format("Multiple pallets command sent - %d pallets with %s LEDs (intensity=%d, blink=%d)", 
-                    pallets.size(), color, intensity, blinkTimes));
+                result.put("message", "Full pallet control command sent successfully");
                 result.put("address", address);
-                result.put("palletsCount", pallets.size());
                 call.resolve(result);
             } else {
-                call.reject("Failed to send multiple pallets command");
+                call.reject("Failed to send full pallet control command");
             }
             
         } catch (Exception e) {
@@ -374,7 +393,8 @@ public class CapacitorIoboardPlugin extends Plugin implements SerialConnectionMa
             
             for (int i = 0; i < actionsArray.length(); i++) {
                 try {
-                    JSObject action = actionsArray.getJSObject(i);
+                    JSONObject actionJson = actionsArray.getJSONObject(i);
+                    JSObject action = JSObject.fromJSONObject(actionJson);
                     
                     int palletNumber = action.getInteger("palletNumber", 0);
                     boolean unlock = action.has("unlock") ? action.getBoolean("unlock") : true;
@@ -1111,6 +1131,73 @@ public class CapacitorIoboardPlugin extends Plugin implements SerialConnectionMa
         return frameArray;
     }
 
+    // New method for Full Pallet Control with individual pallet configurations
+    private byte[] createFullPalletControlFrame(int address, int lockMask, int extendedControl, List<PalletConfig> pallets) {
+        Log.d(TAG, "🎨 Creating Full Pallet Control frame with individual configs: address=" + address + 
+              ", lockMask=0x" + String.format("%02X", lockMask) + 
+              ", extControl=0x" + String.format("%02X", extendedControl));
+        
+        byte soi = 0x0D;
+        byte eoi = 0x0A;
+        byte len = 0x39;  // 57 bytes
+        byte addr = (byte) address;
+        byte type = 0x02;
+        byte lockCtrl = (byte) lockMask;
+        byte extCtrl = (byte) extendedControl;
+        
+        // Build data for CRC
+        List<Byte> dataForCrc = new ArrayList<>();
+        dataForCrc.add(soi);
+        dataForCrc.add(len);
+        dataForCrc.add(addr);
+        dataForCrc.add(type);
+        dataForCrc.add(lockCtrl);
+        dataForCrc.add(extCtrl);
+        
+        // Add 8 LED groups (6 bytes each)
+        for (int i = 0; i < 8; i++) {
+            PalletConfig pallet = pallets.get(i);
+            int[] rgb = parseColorToRGB(pallet.ledColor);
+            
+            dataForCrc.add((byte) rgb[0]);  // R
+            dataForCrc.add((byte) rgb[1]);  // G
+            dataForCrc.add((byte) rgb[2]);  // B
+            dataForCrc.add((byte) pallet.intensity);
+            dataForCrc.add((byte) pallet.blinkTimes);
+            dataForCrc.add((byte) pallet.blinkSpeed);
+        }
+        
+        // Calculate CRC16
+        byte[] crcData = new byte[dataForCrc.size()];
+        for (int i = 0; i < dataForCrc.size(); i++) {
+            crcData[i] = dataForCrc.get(i);
+        }
+        int crc16 = calculateCRC16Modbus(crcData);
+        byte crcLow = (byte) (crc16 & 0xFF);
+        byte crcHigh = (byte) ((crc16 >> 8) & 0xFF);
+        
+        // Build final frame
+        List<Byte> frame = new ArrayList<>();
+        frame.addAll(dataForCrc);
+        frame.add(crcLow);
+        frame.add(crcHigh);
+        frame.add(eoi);
+        
+        byte[] frameArray = new byte[frame.size()];
+        for (int i = 0; i < frame.size(); i++) {
+            frameArray[i] = frame.get(i);
+        }
+        
+        // Log frame
+        StringBuilder hexFrame = new StringBuilder();
+        for (byte b : frameArray) {
+            hexFrame.append(String.format("%02X ", b & 0xFF));
+        }
+        Log.d(TAG, "🎯 Full Pallet Control frame created: " + hexFrame.toString().trim());
+        
+        return frameArray;
+    }
+
     // Implementación CRC16-Modbus (x16+x15+x2+1) según documentación MTC3P08L
     private static int calculateCRC16Modbus(byte[] data) {
         int crc = 0xFFFF;  // Initial value

package/android/src/main/java/com/leonardojc/capacitor/ioboard/SerialConnectionManager.java

@@ -194,10 +194,10 @@ public class SerialConnectionManager {
         try {
             // Enhanced logging with hex dump (DEBUG only)
             logDebug("=== WRITING TO SERIAL PORT ===");
-            logDebug("Port: " + currentPortPath);
-            logDebug("Data length: " + data.length + " bytes");
+            //logDebug("Port: " + currentPortPath);
+            //logDebug("Data length: " + data.length + " bytes");
             logDebug("HEX data: " + bytesToHex(data));
-            logDebug("Raw bytes: " + java.util.Arrays.toString(data));
+            //logDebug("Raw bytes: " + java.util.Arrays.toString(data));
             
             // Clear any pending input first
             if (serialInputStream != null && serialInputStream.available() > 0) {
@@ -351,10 +351,10 @@ public class SerialConnectionManager {
                                 
                                 // Enhanced logging for received data (DEBUG only for detailed hex)
                                 logDebug("=== 📥 RECEIVED FROM IOBOARD ===");
-                                logDebug("Port: " + currentPortPath);
-                                logDebug("Received " + bytesRead + " bytes");
+                                //logDebug("Port: " + currentPortPath);
+                                //logDebug("Received " + bytesRead + " bytes");
                                 logDebug("HEX received: " + bytesToHex(data));
-                                logDebug("Raw bytes: " + java.util.Arrays.toString(data));
+                                //logDebug("Raw bytes: " + java.util.Arrays.toString(data));
                                 
                                 // Parser automático de respuesta del IOBoard
                                 try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leonardojc/capacitor-ioboard",
-  "version": "2.0.10",
+  "version": "2.0.12",
   "description": "A comprehensive Capacitor plugin for IOBoard devices with integrated serial communication and complete MTC3P08L protocol support including OTA updates",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",