@leonardojc/capacitor-ioboard 2.0.0 → 2.0.2

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

@@ -187,33 +187,46 @@ public class CapacitorIoboardPlugin extends Plugin implements SerialConnectionMa
         }
         
         try {
-            // TEMPORAL: Generar exactamente el frame de la documentación
-            // Address: 01; Unlock: 01; Extended output: 80; 
-            // All 8 LEDs: flashing red, brightness 255, flashing 16 times, interval 1 second
-            Log.d(TAG, "🧪 TESTING: Generating exact documentation frame");
-            
-            int address = 1;
-            String color = "RED";
-            int intensity = 255;  // FF en hex
-            int blinkTimes = 16;  // 10 en hex
-            int blinkSpeed = 1;   // 01 en hex
-            
-            // Usar todos los pallets (1-8) como en el ejemplo
-            List<Integer> allPallets = new ArrayList<>();
-            for (int i = 1; i <= 8; i++) {
-                allPallets.add(i);
+            // 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);
+            
+            // Leer array de pallets
+            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);
+                    }
+                }
+            }
+            
+            // Si no se especificaron pallets, usar todos (1-8)
+            if (pallets.isEmpty()) {
+                for (int i = 1; i <= 8; i++) {
+                    pallets.add(i);
+                }
             }
             
-            byte[] frame = createMultiplePalletsFrame(address, color, intensity, blinkTimes, blinkSpeed, allPallets);
+            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);
             boolean success = serialManager.writeData(frame);
             
             if (success) {
                 JSObject result = new JSObject();
                 result.put("success", true);
-                result.put("message", String.format("TEST: Documentation frame sent - %d pallets with %s LEDs (intensity=%d, blink=%d)", 
-                    allPallets.size(), color, intensity, blinkTimes));
+                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("address", address);
-                result.put("palletsCount", allPallets.size());
+                result.put("palletsCount", pallets.size());
                 call.resolve(result);
             } else {
                 call.reject("Failed to send multiple pallets command");
@@ -350,8 +363,10 @@ public class CapacitorIoboardPlugin extends Plugin implements SerialConnectionMa
         Log.d(TAG, "🔓 unlockPallet called");
         
         int address = call.getInt("address", 1);
-        int pallet = call.getInt("pallet", 1);
-        String color = call.getString("color", "FF0000");
+        // Soportar ambos nombres para compatibilidad
+        int pallet = call.hasOption("pallet") ? call.getInt("pallet", 0) : call.getInt("palletNumber", 0);
+        // Soportar ambos nombres para compatibilidad
+        String color = call.hasOption("ledColor") ? call.getString("ledColor", "green") : call.getString("color", "green");
         
         Log.d(TAG, String.format("Parameters - address: %d, pallet: %d, color: %s", address, pallet, color));
         
@@ -633,6 +648,80 @@ public class CapacitorIoboardPlugin extends Plugin implements SerialConnectionMa
         }
     }
 
+    // Helper method to parse RGB color from string
+    // Accepts: "RED", "255,128,64", "#FF8040", or "rgb(255,128,64)"
+    private int[] parseColorToRGB(String color) {
+        int[] rgb = new int[3]; // [R, G, B]
+        
+        // Check if it's RGB format: "255,128,64" or "rgb(255,128,64)"
+        if (color.contains(",")) {
+            String rgbString = color.replace("rgb(", "").replace(")", "").trim();
+            String[] parts = rgbString.split(",");
+            if (parts.length == 3) {
+                try {
+                    rgb[0] = Integer.parseInt(parts[0].trim());
+                    rgb[1] = Integer.parseInt(parts[1].trim());
+                    rgb[2] = Integer.parseInt(parts[2].trim());
+                    Log.d(TAG, String.format("🎨 Parsed RGB: (%d, %d, %d)", rgb[0], rgb[1], rgb[2]));
+                    return rgb;
+                } catch (NumberFormatException e) {
+                    Log.w(TAG, "⚠️ Invalid RGB format: " + color);
+                }
+            }
+        }
+        
+        // Check if it's hex format: "#FF8040" or "FF8040"
+        if (color.startsWith("#") || (color.length() == 6 && color.matches("[0-9A-Fa-f]+"))) {
+            try {
+                String hex = color.replace("#", "");
+                rgb[0] = Integer.parseInt(hex.substring(0, 2), 16);
+                rgb[1] = Integer.parseInt(hex.substring(2, 4), 16);
+                rgb[2] = Integer.parseInt(hex.substring(4, 6), 16);
+                Log.d(TAG, String.format("🎨 Parsed HEX %s: RGB(%d, %d, %d)", color, rgb[0], rgb[1], rgb[2]));
+                return rgb;
+            } catch (Exception e) {
+                Log.w(TAG, "⚠️ Invalid HEX format: " + color);
+            }
+        }
+        
+        // Named colors
+        switch (color.toUpperCase()) {
+            case "RED":
+                rgb[0] = 255; rgb[1] = 0; rgb[2] = 0;
+                break;
+            case "GREEN":
+                rgb[0] = 0; rgb[1] = 255; rgb[2] = 0;
+                break;
+            case "BLUE":
+                rgb[0] = 0; rgb[1] = 0; rgb[2] = 255;
+                break;
+            case "WHITE":
+                rgb[0] = 255; rgb[1] = 255; rgb[2] = 255;
+                break;
+            case "YELLOW":
+                rgb[0] = 255; rgb[1] = 255; rgb[2] = 0;
+                break;
+            case "CYAN":
+                rgb[0] = 0; rgb[1] = 255; rgb[2] = 255;
+                break;
+            case "MAGENTA":
+            case "PURPLE":
+                rgb[0] = 255; rgb[1] = 0; rgb[2] = 255;
+                break;
+            case "ORANGE":
+                rgb[0] = 255; rgb[1] = 165; rgb[2] = 0;
+                break;
+            case "PINK":
+                rgb[0] = 255; rgb[1] = 192; rgb[2] = 203;
+                break;
+            default:
+                Log.w(TAG, "⚠️ Unknown color: " + color + ", using GREEN as default");
+                rgb[0] = 0; rgb[1] = 255; rgb[2] = 0;
+                break;
+        }
+        return rgb;
+    }
+
     // Create MTC3P08L protocol frame for unlock pallet command
     private byte[] createUnlockPalletFrame(int address, int palletNumber, String ledColor) {
         // MTC3P08L Protocol Frame Structure (según documentación):
@@ -652,33 +741,10 @@ public class CapacitorIoboardPlugin extends Plugin implements SerialConnectionMa
         byte doorLock = 0x01;                  // LOCK: 1=unlock, 0=no action
         
         // LED section (6 bytes): [RGB_R][RGB_G][RGB_B][Intensity][BlinkTimes][BlinkSpeed]
-        byte red = 0, green = 0, blue = 0;
-        switch (ledColor.toLowerCase()) {
-            case "red":
-                red = (byte) 255;
-                break;
-            case "green":
-                green = (byte) 255;
-                break;
-            case "blue":
-                blue = (byte) 255;
-                break;
-            case "white":
-                red = green = blue = (byte) 255;
-                break;
-            case "yellow":
-                red = green = (byte) 255;
-                break;
-            case "cyan":
-                green = blue = (byte) 255;
-                break;
-            case "magenta":
-                red = blue = (byte) 255;
-                break;
-            default:
-                green = (byte) 255; // Default to green
-                break;
-        }
+        int[] rgb = parseColorToRGB(ledColor);
+        byte red = (byte) rgb[0];
+        byte green = (byte) rgb[1];
+        byte blue = (byte) rgb[2];
         
         byte intensity = (byte) 255;      // Max intensity
         byte blinkTimes = 16;             // 16 veces como en el ejemplo
@@ -728,40 +794,11 @@ public class CapacitorIoboardPlugin extends Plugin implements SerialConnectionMa
         
         byte extControl = (byte) 0x80; // Extended output control (fixed as per example)
         
-        // Convert color to RGB
-        byte red = 0x00, green = 0x00, blue = 0x00;
-        switch (color.toUpperCase()) {
-            case "RED":
-                red = (byte) 0xFF;
-                break;
-            case "GREEN":
-                green = (byte) 0xFF;
-                break;
-            case "BLUE":
-                blue = (byte) 0xFF;
-                break;
-            case "YELLOW":
-                red = (byte) 0xFF;
-                green = (byte) 0xFF;
-                break;
-            case "PURPLE":
-                red = (byte) 0xFF;
-                blue = (byte) 0xFF;
-                break;
-            case "CYAN":
-                green = (byte) 0xFF;
-                blue = (byte) 0xFF;
-                break;
-            case "WHITE":
-                red = (byte) 0xFF;
-                green = (byte) 0xFF;
-                blue = (byte) 0xFF;
-                break;
-            default:
-                Log.w(TAG, "⚠️ Unknown color: " + color + ", using RED as default");
-                red = (byte) 0xFF;
-                break;
-        }
+        // Convert color to RGB using helper method
+        int[] rgb = parseColorToRGB(color);
+        byte red = (byte) rgb[0];
+        byte green = (byte) rgb[1];
+        byte blue = (byte) rgb[2];
         
         // Build data array for CRC calculation
         // CRC includes SOI + all data up to (but not including) the CRC field itself

package/dist/esm/definitions.d.ts

@@ -103,13 +103,13 @@ export interface DeviceOptions {
 }
 export interface UnlockPalletOptions extends DeviceOptions {
     palletNumber: number;
-    ledColor?: 'red' | 'green' | 'blue' | 'yellow' | 'white' | 'off';
+    ledColor?: string;
     blinkTimes?: number;
     blinkSpeed?: number;
 }
 export interface MultiplePalletOptions extends DeviceOptions {
     doorLockMask: number;
-    ledColor?: 'red' | 'green' | 'blue' | 'yellow' | 'white' | 'off';
+    ledColor?: string;
     ledControls?: LEDControlOptions[];
 }
 export interface ScanOptions {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leonardojc/capacitor-ioboard",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "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",