[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/apps/AgillaAgents/GroupComm/chat Leader.ma, 1.1, 1.2 Member.ma, 1.1, 1.2 README.txt, 1.1, 1.2

[Chien-Liang Fok]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/AgillaAgents/GroupComm/chat
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32588

Modified Files:
	Leader.ma Member.ma README.txt 
Log Message:
debug me

Index: Leader.ma
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/AgillaAgents/GroupComm/chat/Leader.ma,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Leader.ma	20 Sep 2006 08:00:40 -0000	1.1
--- Leader.ma	20 Sep 2006 10:53:05 -0000	1.2
***************
*** 30,34 ****
  		pushc RXN_GROUP_SEND
  		regrxn			// register a reaction for member broadcast messages
! 		wait
  
  // The group send reaction sensitive to <"mbm", string, string>
--- 30,34 ----
  		pushc RXN_GROUP_SEND
  		regrxn			// register a reaction for member broadcast messages
! WAIT		wait
  
  // The group send reaction sensitive to <"mbm", string, string>
***************
*** 39,42 ****
--- 39,44 ----
  		esetvar 19		// heap[19] = name
  		esetvar 18		// heap[18] = message
+ 		pushc 28
+ 		putled			// toggle yellow
  		pushc 0
  RGS_LOOP	inc
***************
*** 47,53 ****
  		copy
  		getvars			// get the neighbor's address
! 		egetvar 18		
  		swap
! 		egetvar 19
  		swap
  		pushn lbm
--- 49,57 ----
  		copy
  		getvars			// get the neighbor's address
! 		//egetvar 18		
! 		pushn aaa
  		swap
! 		pushn bbb
! 		//egetvar 19
  		swap
  		pushn lbm
***************
*** 58,62 ****
  		pushc RGS_LOOP
  		jumps			// go back to STG_LOOP		
! DONE		pop			// pop the counter
  		endrxn			// end the reaction
  
--- 62,68 ----
  		pushc RGS_LOOP
  		jumps			// go back to STG_LOOP		
! DONE		pushc 25
! 		putled			// toggle red
! 		pop			// pop the counter	
  		endrxn			// end the reaction
  
***************
*** 71,74 ****
--- 77,82 ----
  		setvar 0		// heap[0]++
  		setvars			// save the location of the member on the heap
+ 		pushc 28
+ 		putled			// toggle yellow
  		endrxn
  		
\ No newline at end of file

Index: Member.ma
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/AgillaAgents/GroupComm/chat/Member.ma,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Member.ma	20 Sep 2006 08:00:40 -0000	1.1
--- Member.ma	20 Sep 2006 10:53:05 -0000	1.2
***************
*** 25,32 ****
  		pushc SND_MSG
  		regrxn
! 		wait
  
  RXN_FIRED	remove			// remove the tuple
! 		pushc uart_x uart_y
  		rout			// send tuple to base station
  		endrxn
--- 25,32 ----
  		pushc SND_MSG
  		regrxn
! WAIT		wait
  
  RXN_FIRED	remove			// remove the tuple
! 		pushloc uart_x uart_y
  		rout			// send tuple to base station
  		endrxn
***************
*** 38,41 ****
  		pushc 3			// <"mbm", String:name, String:msg>
  		getvar 0
! 		rout			// send to leader
  		endrxn
--- 38,44 ----
  		pushc 3			// <"mbm", String:name, String:msg>
  		getvar 0
! 		rout			// send to leader	
! 		pushc 26
! 		putled
! 		pushc WAIT
  		endrxn

Index: README.txt
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/AgillaAgents/GroupComm/chat/README.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** README.txt	20 Sep 2006 08:00:40 -0000	1.1
--- README.txt	20 Sep 2006 10:53:05 -0000	1.2
***************
*** 9,11 ****
--- 9,13 ----
  	<"mbm", String:Name, String:msg>
  
+ Message from base station to its member agent:
+ 	<"snd", String:Name, String:msg>