[Tinyos-2-commits] CVS: tinyos-2.x/tools/tinyos/misc tos-deluge, 1.7, 1.8

[Razvan Musaloiu-E.]

Update of /cvsroot/tinyos/tinyos-2.x/tools/tinyos/misc
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23513/tools/tinyos/misc

Modified Files:
	tos-deluge 
Log Message:
Improve Deluge to report the UID of the running application. tos-deluge script from the tools package was affected by this change.


Index: tos-deluge
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/tinyos/misc/tos-deluge,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tos-deluge	16 Jul 2007 22:11:04 -0000	1.7
--- tos-deluge	20 Dec 2007 21:23:51 -0000	1.8
***************
*** 55,58 ****
--- 55,59 ----
  MSG_REPROG_BS = 7
  MSG_SYNC      = 8
+ MSG_IDENT     = 9
  
  ERROR_SUCCESS = 0   # T2-compatible
***************
*** 187,190 ****
--- 188,200 ----
          
      return r
+ 
+ def op_ident(s):
+     sreqpkt = SerialReqPacket((MSG_IDENT, 0, 0, 0, []))
+     if s.write_packet(SERIAL_AMGROUP, SERIAL_AMID, sreqpkt.payload()):
+         packet = s.read_packet(SERIAL_AMGROUP, SERIAL_AMID)
+         sreplypkt = SerialReplyPacket(packet[1])
+         if sreplypkt.error == ERROR_SUCCESS:
+             return toInt(sreplypkt.data)
+     return 0
      
  # Checks for valid CRC and image timestamp
***************
*** 216,219 ****
--- 226,230 ----
  # Prints status of the image in the external flash
  def op_ping(s, img_num):
+     uid = op_ident(s)
      metadata = getMetaData(s, img_num)
      if not metadata == None:
***************
*** 222,225 ****
--- 233,238 ----
              # Prints out image status
              print "--------------------------------------------------"
+             print "Currently Executing:"
+             print "  UID:         %d" % (uid)
              print "Stored image %d" % img_num
              print toStatusStr(2, metadata)