[zb4osgi-changeset] [scm] ZigBee 4 OSGi repository change: r568 - in /projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/com/itaca/ztool: api/ZToolPacket.java util/ByteUtils.java

[scm-notify at zb4osgi.aaloa.org]

Author: stefano.lenzi
Date: Wed Oct 24 13:47:37 2012
New Revision: 568

Log:
Test for valid byte value was missing a NOT and caused Test Unit failure ( refs #151 )

Modified:
    projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/api/ZToolPacket.java
    projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/util/ByteUtils.java

Modified: projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/api/ZToolPacket.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/api/ZToolPacket.java (original)
+++ projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/api/ZToolPacket.java Wed Oct 24 13:47:37 2012
@@ -101,7 +101,7 @@
         this.CMD = ApiId;
         //data
         for (int i = 0; i < frameData.length; i++) {
-            if ( ByteUtils.isByteValue( frameData[i] ) ) {
+            if ( ! ByteUtils.isByteValue( frameData[i] ) ) {
                 throw new RuntimeException("Value is greater than one byte: " + frameData[i] +" ("+ Integer.toHexString( frameData[i] ) + ")");
             }
             packet[PAYLOAD_START_INDEX + i] = frameData[i];

Modified: projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/util/ByteUtils.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/util/ByteUtils.java (original)
+++ projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/util/ByteUtils.java Wed Oct 24 13:47:37 2012
@@ -26,6 +26,7 @@
 package com.itaca.ztool.util;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.regex.Pattern;
 
 import org.slf4j.Logger;