[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/shockfish/apps/BlastTx/scripts script.gdb, 1.2, 1.3

[Henri DF]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/shockfish/apps/BlastTx/scripts
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20350/BlastTx/scripts

Modified Files:
	script.gdb 
Log Message:
stats_xxx variables are now part of a struct in XE1205RadioM

Index: script.gdb
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/shockfish/apps/BlastTx/scripts/script.gdb,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** script.gdb	8 Jul 2005 16:50:11 -0000	1.2
--- script.gdb	22 Aug 2006 09:05:42 -0000	1.3
***************
*** 27,32 ****
  # printinfo pktlen testduration
  define printinfo
!  	set var $pktsTX = 'XE1205RadioM$stats_pktsTX'
!  	set var $bytesTX = 'XE1205RadioM$stats_bytesTX'
  	set var $theo_bytesTX = $pktsTX * ( $arg0 + 8 + 6)
  	set var $thruput_bits = ($bytesTX * 8) / $arg1
--- 27,32 ----
  # printinfo pktlen testduration
  define printinfo
!  	set var $pktsTX = 'XE1205RadioM$stats.pktsTX'
!  	set var $bytesTX = 'XE1205RadioM$stats.bytesTX'
  	set var $theo_bytesTX = $pktsTX * ( $arg0 + 8 + 6)
  	set var $thruput_bits = ($bytesTX * 8) / $arg1
***************
*** 34,38 ****
  
  	printf "Pkts sent: %d\n", $pktsTX
! 	printf "Bytes sent: %d  (Theoretical bytes sent: %d)\n", $bytesTX, $theo_bytesTX
  	printf "Thruput: %d [pkts/s],   %d [bits/s]\n", $thruput_pkts, $thruput_bits
  end
--- 34,38 ----
  
  	printf "Pkts sent: %d\n", $pktsTX
! 	printf "Bytes sent: %d  (Expected bytes sent: %d)\n", $bytesTX, $theo_bytesTX
  	printf "Thruput: %d [pkts/s],   %d [bits/s]\n", $thruput_pkts, $thruput_bits
  end
***************
*** 41,49 ****
  cont
  
! printinfo 28 60
  
  if 'BlastTxM$senddonefailed' == 1
   printerr "Senddone failed!"
!  beep_error
   quit
  end
--- 41,49 ----
  cont
  
! printinfo 30 120
  
  if 'BlastTxM$senddonefailed' == 1
   printerr "Senddone failed!"
! # beep_error
   quit
  end
***************
*** 51,58 ****
  if 'BlastTxM$sendfailed' == 1
   printerr "Send failed!"
!  beep_error
  # quit
  end
  
  
! beep_finished
--- 51,58 ----
  if 'BlastTxM$sendfailed' == 1
   printerr "Send failed!"
! # beep_error
  # quit
  end
  
  
! #beep_finished