[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/rincon/tools/java/com/rincon/blackbook/printstatus PrintNode.java, 1.1, 1.2 PrintSector.java, 1.1, 1.2 PrintFile.class, 1.1, 1.2 PrintFile.java, 1.1, 1.2 PrintSector.class, 1.1, 1.2 PrintNode.class, 1.1, 1.2

[dmm]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/rincon/tools/java/com/rincon/blackbook/printstatus
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28804/contrib/rincon/tools/java/com/rincon/blackbook/printstatus

Modified Files:
	PrintNode.java PrintSector.java PrintFile.class PrintFile.java 
	PrintSector.class PrintNode.class 
Log Message:
Updated Blackbook to v.5.1, fixed many bugs and increased reliability

Index: PrintNode.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/rincon/tools/java/com/rincon/blackbook/printstatus/PrintNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PrintNode.java	20 Apr 2006 23:02:52 -0000	1.1
--- PrintNode.java	6 Jun 2006 16:50:31 -0000	1.2
***************
*** 58,62 ****
  		}
  		
! 		outMsg.set_focusedNode_client((short) Integer.parseInt(args[0]));
  		send(outMsg);
  	}
--- 58,62 ----
  		}
  		
! 		outMsg.set_focusedNode_state((short) Integer.parseInt(args[0]));
  		send(outMsg);
  	}
***************
*** 89,99 ****
  		BlackbookNodeMsg inMsg = (BlackbookNodeMsg) m;
  
! 		System.out.println("\nNode " + outMsg.get_focusedNode_client());
!         System.out.println("\tflashAddress=0x" + Long.toHexString(inMsg.get_focusedNode_flashAddress()));
          System.out.println("\tnextNode=" + inMsg.get_focusedNode_nextNode());
!         System.out.println("\tdataLength=0x" + Long.toHexString(inMsg.get_focusedNode_dataLength()));
!         System.out.println("\treserveLength=0x" + Long.toHexString(inMsg.get_focusedNode_reserveLength()));
!         System.out.println("\tdataCrc=0x" + Long.toHexString(inMsg.get_focusedNode_dataCrc()));
!         System.out.println("\tfilenameCrc=0x" + Long.toHexString(inMsg.get_focusedNode_filenameCrc()));
          System.out.print("\tstate=");
          
--- 89,100 ----
  		BlackbookNodeMsg inMsg = (BlackbookNodeMsg) m;
  
! 		System.out.println("\nNode " + outMsg.get_focusedNode_state());
!         System.out.println("\tflashAddress=0x" + Long.toHexString(inMsg.get_focusedNode_flashAddress()).toUpperCase());
          System.out.println("\tnextNode=" + inMsg.get_focusedNode_nextNode());
!         System.out.println("\tdataLength=0x" + Long.toHexString(inMsg.get_focusedNode_dataLength()).toUpperCase());
!         System.out.println("\treserveLength=0x" + Long.toHexString(inMsg.get_focusedNode_reserveLength()).toUpperCase());
!         System.out.println("\tdataCrc=0x" + Long.toHexString(inMsg.get_focusedNode_dataCrc()).toUpperCase());
!         System.out.println("\tfilenameCrc=0x" + Long.toHexString(inMsg.get_focusedNode_filenameCrc()).toUpperCase());
!         System.out.println("\tfileElement (for freshly booted nodes)=" + inMsg.get_focusedNode_fileElement());
          System.out.print("\tstate=");
          
***************
*** 104,132 ****
          
          case 1: 
!         	System.out.println("NODE_IDLE");
          	break;
          	
          case 2:
!         	System.out.println("NODE_WRITING_UNFINALIZED");
!         	break;
!         
!         case 3:
!         	System.out.println("NODE_CLOSED_UNFINALIZED");
          	break;
          	
!         case 4:
!         	System.out.println("NODE_OPEN");
          	break;
          	
!         case 5:
          	System.out.println("NODE_TEMPORARY");
          	break;
          	
!         case 6: 
!         	System.out.println("NODE_BOOTING");
          	break;
          
!         case 7:
!         	System.out.println("NODE_DELETED");
          	break;
          	
--- 105,129 ----
          
          case 1: 
!         	System.out.println("NODE_CONSTRUCTING");
          	break;
          	
          case 2:
!         	System.out.println("NODE_VALID");
          	break;
          	
!         case 3: 
!         	System.out.println("NODE_LOCKED");
          	break;
          	
!         case 4:
          	System.out.println("NODE_TEMPORARY");
          	break;
          	
!         case 5: 
!         	System.out.println("NODE_DELETED");
          	break;
          
!         case 6:
!         	System.out.println("NODE_BOOTING");
          	break;
          	
***************
*** 136,140 ****
          }
          System.exit(0);
! 	
  	}
  
--- 133,137 ----
          }
          System.exit(0);
! 
  	}
  

Index: PrintSector.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/rincon/tools/java/com/rincon/blackbook/printstatus/PrintSector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PrintSector.java	20 Apr 2006 23:02:52 -0000	1.1
--- PrintSector.java	6 Jun 2006 16:50:31 -0000	1.2
***************
*** 91,98 ****
  
  		System.out.println("\nSector " + outMsg.get_focusedSector_index());
- 		System.out.println("\ttotalUnfinalizedNodes=" + inMsg.get_focusedSector_totalUnfinalizedNodes());
- 		System.out.println("\twritePage=" + inMsg.get_focusedSector_writePage());
  		System.out.println("\ttotalNodes=" + inMsg.get_focusedSector_totalNodes());
! 		System.out.println("\tindex=" + inMsg.get_focusedSector_index());
  		System.out.println("\tinUse=" + inMsg.get_focusedSector_inUse());
  		
--- 91,96 ----
  
  		System.out.println("\nSector " + outMsg.get_focusedSector_index());
  		System.out.println("\ttotalNodes=" + inMsg.get_focusedSector_totalNodes());
! 		System.out.println("\twritePage=" + inMsg.get_focusedSector_writePage() + " (0x" + Long.toHexString(inMsg.get_focusedSector_writePage()*0x100 + outMsg.get_focusedSector_index() * 0x10000).toUpperCase() + ")");
  		System.out.println("\tinUse=" + inMsg.get_focusedSector_inUse());
  		

Index: PrintFile.class
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/rincon/tools/java/com/rincon/blackbook/printstatus/PrintFile.class,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvs2fKlDQ and /tmp/cvsk74Zju differ

Index: PrintFile.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/rincon/tools/java/com/rincon/blackbook/printstatus/PrintFile.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PrintFile.java	20 Apr 2006 23:02:52 -0000	1.1
--- PrintFile.java	6 Jun 2006 16:50:31 -0000	1.2
***************
*** 58,62 ****
  		}
  		
! 		outMsg.set_focusedFile_type((short) Integer.parseInt(args[0]));
  		send(outMsg);
  	}
--- 58,62 ----
  		}
  		
! 		outMsg.set_focusedFile_state((short) Integer.parseInt(args[0]));
  		send(outMsg);
  	}
***************
*** 89,96 ****
  		BlackbookFileMsg inMsg = (BlackbookFileMsg) m;
  
! 		System.out.println("\nFile " + outMsg.get_focusedFile_type());
  		System.out.println("\tfirstNode=0x" + Long.toHexString(inMsg.get_focusedFile_firstNode()));
! 		System.out.println("\tfilenameCrc=0x" + Long.toHexString(inMsg.get_focusedFile_filenameCrc()));
! 		System.out.println("\ttype=" + inMsg.get_focusedFile_type());
  		
  		System.out.print("\tstate=");
--- 89,95 ----
  		BlackbookFileMsg inMsg = (BlackbookFileMsg) m;
  
! 		System.out.println("\nFile " + outMsg.get_focusedFile_state());
  		System.out.println("\tfirstNode=0x" + Long.toHexString(inMsg.get_focusedFile_firstNode()));
! 		System.out.println("\tfilenameCrc=0x" + Long.toHexString(inMsg.get_focusedFile_filenameCrc()).toUpperCase());
  		
  		System.out.print("\tstate=");
***************
*** 116,135 ****
  			break;
  			
- 		case 5: 
- 			System.out.println("FILE_DELETING");
- 			break;
- 			
- 		case 6: 
- 			System.out.println("FILE_BOOTING");
- 			break;
- 			
- 		case 7:
- 			System.out.println("FILE_DELETED");
- 			break;
- 			
- 		case 8:
- 			System.out.println("FILE_OPEN");
- 			break;
- 			
  		default:
  			System.out.println("Unknown State (" + inMsg.get_focusedFile_state() + ")");
--- 115,118 ----

Index: PrintSector.class
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/rincon/tools/java/com/rincon/blackbook/printstatus/PrintSector.class,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsoHUd6T and /tmp/cvswUQxWx differ

Index: PrintNode.class
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/rincon/tools/java/com/rincon/blackbook/printstatus/PrintNode.class,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvs5JB5cX and /tmp/cvsJSrgkB differ