[zb4osgi-changeset] [scm] ZigBee 4 OSGi repository change: r556 - in /projects/zb4osgi/trunk/zigbee.cc2480.datalink/src: main/java/com/itaca/ztool/util/ByteUtils.java main/java/it/cnr/isti/cc2480/high/HWHighLevelDriver.java test/java/com/itaca/ztool/util/ByteUtilsTest.java

[scm-notify at zb4osgi.aaloa.org]

Author: stefano.lenzi
Date: Tue Oct 23 12:13:55 2012
New Revision: 556

Log:
Trying to figure out the Exception thrown during the converstion of ZToolPacket to String ( refs #151 )


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/it/cnr/isti/cc2480/high/HWHighLevelDriver.java
    projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/test/java/com/itaca/ztool/util/ByteUtilsTest.java

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 Tue Oct 23 12:13:55 2012
@@ -345,7 +345,7 @@
 	public static String toBase16(int b) {
 		
 		if (b > 0xff || b < -128) {
-			throw new IllegalArgumentException("Input value is larger than a byte");
+			throw new IllegalArgumentException("Error converting "+b+" input value to hex string it is larger than a byte");
 		}
 		if ( b < 0) {
 			return "0x" + Integer.toHexString(b).substring(6);

Modified: projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/it/cnr/isti/cc2480/high/HWHighLevelDriver.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/it/cnr/isti/cc2480/high/HWHighLevelDriver.java (original)
+++ projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/main/java/it/cnr/isti/cc2480/high/HWHighLevelDriver.java Tue Oct 23 12:13:55 2012
@@ -161,7 +161,7 @@
 					+"Evaluated "+value+" instead of "+0x20+"\nPacket "+packet.getClass().getName()+"\n"+packet
 			);
 		}
-		profiler.info("m_sendSynchrounsCommand(ZToolPacket packet, SynchrounsCommandListner listner): called");
+		profiler.info(" m_sendSynchrounsCommand(ZToolPacket packet, SynchrounsCommandListner listner): called");
 		logger.debug("Preparing to send SynchrounsCommand {} ", packet);
 		cleanExpiredListener();
 		if ( supportMultipleSynchrounsCommand ) {

Modified: projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/test/java/com/itaca/ztool/util/ByteUtilsTest.java
==============================================================================
--- projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/test/java/com/itaca/ztool/util/ByteUtilsTest.java (original)
+++ projects/zb4osgi/trunk/zigbee.cc2480.datalink/src/test/java/com/itaca/ztool/util/ByteUtilsTest.java Tue Oct 23 12:13:55 2012
@@ -36,6 +36,16 @@
 public class ByteUtilsTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(ByteUtilsTest.class);
+
+	/**
+	 * @since 0.8.0
+	 */
+	@Test
+	public void testToBase16() {
+		assertEquals("0xc8", ByteUtils.toBase16(200) );
+		assertEquals("0xc8", ByteUtils.toBase16((byte)0xc8) );
+		assertEquals("0xc8", ByteUtils.toBase16(0xc8) );
+	}
 
 	/**
 	 * Test methods for coherance among the following group:<br>