[Tinyos-beta-commits] CVS: tinyos-1.x/beta/SystemCore/java/net/tinyos/tests Makefile, 1.4, 1.5

[Gilman Tolle]

Update of /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29603/java/net/tinyos/tests

Modified Files:
	Makefile 
Log Message:
* Added an estimator to MultiHopRSSI that checks for asymmetric links
and downed nodes by keeping track of the percentage of acknowledged
packets. This estimate is then added into the link cost. -DNO_ACK_EST
to disable it, because it's still sort of new, though tested to be
more responsive.

* Added timestamps to the MgmtQuery results, and cleaned up the log
output of EventLogger.

* You can now disable sleep-on-boot by defining HELLO_NO_SLEEP. Useful
in the testbed.



Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/tests/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile	26 Jun 2004 01:09:28 -0000	1.4
--- Makefile	1 Sep 2004 01:32:30 -0000	1.5
***************
*** 1,12 ****
  PACKAGE = net.tinyos.tests
  OTHER_CLEAN = cleanmig
! MULTIHOP = $(TOSDIR)/../beta/SystemCore/MultiHopRSSI
! TESTNETWORK = $(TOSDIR)/../beta/SystemCore/tests/TestNetwork
! MGMTQUERY = $(TOSDIR)/../beta/SystemCore/MgmtQuery
  
  MIG = mig java
  NCG = ncg java
  
! MSGS = DripMsg.java MultihopLayerMsg.java TestNetworkReportMsg.java MgmtQueryMsg.java
  INITIAL_TARGETS = $(MSGS)
  
--- 1,10 ----
  PACKAGE = net.tinyos.tests
  OTHER_CLEAN = cleanmig
! LIB = $(TOSDIR)/../beta/SystemCore
  
  MIG = mig java
  NCG = ncg java
  
! MSGS = DripMsg.java TestDripMsg.java
  INITIAL_TARGETS = $(MSGS)
  
***************
*** 14,28 ****
  include $(ROOT)/Makefile.include
  
! DripMsg.java:
! 	$(MIG) -java-classname=$(PACKAGE).DripMsg $(TOSDIR)/../beta/SystemCore/Drip/Drip.h DripMsg -o $@
! 
! MultihopLayerMsg.java:
! 	$(MIG) -java-classname=$(PACKAGE).MultihopLayerMsg $(MULTIHOP)/MultiHopLayer.h MultihopLayerMsg -o$@
  
! TestNetworkReportMsg.java:
! 	$(MIG) -java-classname=$(PACKAGE).TestNetworkReportMsg $(TESTNETWORK)/TestNetwork.h TestNetworkReportMsg -o$@
  
- MgmtQueryMsg.java:
- 	$(MIG) -java-classname=$(PACKAGE).MgmtQueryMsg $(MGMTQUERY)/MgmtQuery.h MgmtQueryMsg -o$@
  
  cleanmig:
--- 12,21 ----
  include $(ROOT)/Makefile.include
  
! DripMsg.java: $(LIB)/Drip/Drip.h
! 	$(MIG) -java-classname=$(PACKAGE).DripMsg $(LIB)/Drip/Drip.h DripMsg -o $@
  
! TestDripMsg.java: $(LIB)/tests/TestDrip/TestDrip.h
! 	$(MIG) -java-classname=$(PACKAGE).TestDripMsg $(LIB)/tests/TestDrip/TestDrip.h TestDripMsg -o $@
  
  
  cleanmig: