[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/GGB/apps/TestStraw Makefile, 1.2, 1.3 README, 1.3, 1.4 TestStraw.h, 1.1, 1.2 TestStraw.nc, 1.1, 1.2 TestStrawM.nc, 1.1, 1.2

[Sukun Kim]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/GGB/apps/TestStraw
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv16965

Modified Files:
	Makefile README TestStraw.h TestStraw.nc TestStrawM.nc 
Log Message:


Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/GGB/apps/TestStraw/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile	1 Dec 2006 01:04:55 -0000	1.2
--- Makefile	1 Dec 2006 05:22:34 -0000	1.3
***************
*** 1,9 ****
! COMPONENT=DataCollector
  
! PFLAGS += -I%T/lib/Queue
! PFLAGS += -I%T/lib/Broadcast
! PFLAGS += -I%T/lib/MintRoute
! PFLAGS += -I../../tos/lib/Straw
  
! include ../Makerules
  
--- 1,15 ----
! COMPONENT=TestStraw
  
! PLATFORMS=mica2 micaz
! PLATFORM := $(filter mica2 micaz, $(MAKECMDGOALS))
  
! ifndef CONTRIBDIR
! CONTRIBDIR := $(shell ncc -print-tosdir)/../contrib
! endif
  
+ PFLAGS += -I$(CONTRIBDIR)/GGB/tos/lib/Queue
+ PFLAGS += -I$(CONTRIBDIR)/GGB/tos/lib/Broadcast
+ PFLAGS += -I$(CONTRIBDIR)/GGB/tos/lib/MintRoute
+ PFLAGS += -I$(CONTRIBDIR)/GGB/tos/lib/Straw
+ 
+ include ../Makerules

Index: README
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/GGB/apps/TestStraw/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** README	1 Dec 2006 01:04:55 -0000	1.3
--- README	1 Dec 2006 05:22:34 -0000	1.4
***************
*** 1 ****
--- 1,2 ----
  A program testing Straw
+ Straw (Scalable Thin and Rapid Amassment Without loss)

Index: TestStraw.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/GGB/apps/TestStraw/TestStraw.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestStraw.h	1 Dec 2006 01:04:55 -0000	1.1
--- TestStraw.h	1 Dec 2006 05:22:34 -0000	1.2
***************
*** 1,6 ****
  enum {
!   EEPROM_ID = unique("ByteEEPROM"),
!   STRAW_ID = 2,
!   EEPROM_USAGE = 50000,
  };
  
--- 1,4 ----
  enum {
!   STRAW_PORT = 2,
  };
  

Index: TestStraw.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/GGB/apps/TestStraw/TestStraw.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestStraw.nc	1 Dec 2006 01:04:55 -0000	1.1
--- TestStraw.nc	1 Dec 2006 05:22:34 -0000	1.2
***************
*** 5,17 ****
  implementation
  {
!   components Main, TestStrawM, StrawC, ByteEEPROM;
  
-   Main.StdControl -> TestStrawM;
    Main.StdControl -> StrawC;
!   Main.StdControl -> ByteEEPROM;
  
!   TestStrawM.Straw -> StrawC.Straw[STRAW_ID];
!   TestStrawM.ReadData -> ByteEEPROM.ReadData[EEPROM_ID];
!   TestStrawM.AllocationReq -> ByteEEPROM.AllocationReq[EEPROM_ID];
  }
  
--- 5,16 ----
  implementation
  {
!   components Main, LedsC, CC2420RadioC, StrawC, TestStrawM;
  
    Main.StdControl -> StrawC;
!   Main.StdControl -> TestStrawM;
  
!   TestStrawM.Leds -> LedsC;
!   TestStrawM.MacControl -> CC2420RadioC;
!   TestStrawM.Straw -> StrawC.Straw[STRAW_PORT];
  }
  

Index: TestStrawM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/GGB/apps/TestStraw/TestStrawM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestStrawM.nc	1 Dec 2006 01:04:55 -0000	1.1
--- TestStrawM.nc	1 Dec 2006 05:22:34 -0000	1.2
***************
*** 5,33 ****
    }
    uses {
      interface Straw;
-     interface ReadData;
-     interface AllocationReq;
    }
  }
  implementation
  {
!   event result_t ReadData.readDone(uint8_t *buffer, uint32_t numBytesRead,
!     result_t success) {
!     return call Straw.readDone(success);
!   }
  
!   event result_t Straw.read(uint32_t start, uint32_t size, uint8_t* bffr) {
!     return call ReadData.read(start, bffr, size);
    }
  
!   event result_t AllocationReq.requestProcessed(result_t success) {
      return SUCCESS;
    }
  
    command result_t StdControl.init() {
!     call AllocationReq.request(EEPROM_USAGE);
      return SUCCESS;
    }
    command result_t StdControl.start() {
      return SUCCESS;
    }
--- 5,42 ----
    }
    uses {
+     interface Leds;
+     interface MacControl;
      interface Straw;
    }
  }
  implementation
  {
!   uint32_t tmpStart;
!   uint32_t tmpSize;
!   uint8_t* tmpBffr;
  
!   void task readDone() {
!     int i;
!     call Leds.yellowToggle();
!     for (i = 0; i < tmpSize; i++) {
!       tmpBffr[i] = tmpStart + i;
!     }
!     call Straw.readDone(SUCCESS);
    }
  
!   event result_t Straw.read(uint32_t start, uint32_t size, uint8_t* bffr) {
!     tmpStart = start;
!     tmpSize = size;
!     tmpBffr = bffr;
!     post readDone();
      return SUCCESS;
    }
  
    command result_t StdControl.init() {
!     call Leds.init();
      return SUCCESS;
    }
    command result_t StdControl.start() {
+     call MacControl.enableAck();
      return SUCCESS;
    }