[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/diku/evb13192/apps/TestIeee802154Mac TestIeee802154MacM.nc, 1.21, 1.22

[Esben Zeuthen]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/apps/TestIeee802154Mac
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12254/apps/TestIeee802154Mac

Modified Files:
	TestIeee802154MacM.nc 
Log Message:
Updated defaults to no beacon, channel 11 for newcomers

Index: TestIeee802154MacM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/apps/TestIeee802154Mac/TestIeee802154MacM.nc,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** TestIeee802154MacM.nc	7 Mar 2006 16:11:28 -0000	1.21
--- TestIeee802154MacM.nc	27 Jun 2006 12:26:02 -0000	1.22
***************
*** 463,467 ****
  		call MlmeScanRequestConfirm.setScanType(request,IEEE802154_ActiveScan);
  		call MlmeScanRequestConfirm.setScanChannels(request,0x00000800);
! 		call MlmeScanRequestConfirm.setScanDuration(request,6);
  		
  		if (call MlmeRequestConfirmScan.request(request))
--- 463,467 ----
  		call MlmeScanRequestConfirm.setScanType(request,IEEE802154_ActiveScan);
  		call MlmeScanRequestConfirm.setScanChannels(request,0x00000800);
! 		call MlmeScanRequestConfirm.setScanDuration(request,8);
  		
  		if (call MlmeRequestConfirmScan.request(request))
***************
*** 990,996 ****
  		// Note, that the panid should not be hardcoded... :-)
  		call MlmeStartRequestConfirm.setPanId(request,myPanId);
! 		call MlmeStartRequestConfirm.setLogicalChannel(request,12);
! 		call MlmeStartRequestConfirm.setBeaconOrder(request,8); // beacon often
! 		call MlmeStartRequestConfirm.setSuperframeOrder(request,8); // superframe often
  		call MlmeStartRequestConfirm.setPanCoordinator(request,TRUE);
  		call MlmeStartRequestConfirm.setBatteryLifeExtension(request,FALSE);
--- 990,996 ----
  		// Note, that the panid should not be hardcoded... :-)
  		call MlmeStartRequestConfirm.setPanId(request,myPanId);
! 		call MlmeStartRequestConfirm.setLogicalChannel(request,11);
! 		call MlmeStartRequestConfirm.setBeaconOrder(request,15); // no beacon
! 		call MlmeStartRequestConfirm.setSuperframeOrder(request,15); // no superframe
  		call MlmeStartRequestConfirm.setPanCoordinator(request,TRUE);
  		call MlmeStartRequestConfirm.setBatteryLifeExtension(request,FALSE);