[Firebug-cvs] firebug/project/src/multihop CollectDataMFB.nc,1.6,1.7 Makefile,1.10,1.11

[<che...@us...>]

Update of /cvsroot/firebug/firebug/project/src/multihop
In directory sc8-pr-cvs1:/tmp/cvs-serv7254

Modified Files:
	CollectDataMFB.nc Makefile 
Log Message:
.

Index: CollectDataMFB.nc
===================================================================
RCS file: /cvsroot/firebug/firebug/project/src/multihop/CollectDataMFB.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CollectDataMFB.nc	23 May 2003 14:58:27 -0000	1.6
--- CollectDataMFB.nc	27 Jun 2003 19:17:20 -0000	1.7
***************
*** 23,28 ****
   * number generation scheme used in tinyos.
   */
! #define FB_RAND_MAX  256*256
! 
  
  module CollectDataMFB {
--- 23,27 ----
   * number generation scheme used in tinyos.
   */
! //#define FB_RAND_MAX  256*256
  
  module CollectDataMFB {
***************
*** 86,90 ****
  
    float get_temp() {
! 
      //#if 0
      float x1,x2,w,y1,y2;
--- 85,89 ----
  
    float get_temp() {
!     /*
      //#if 0
      float x1,x2,w,y1,y2;
***************
*** 100,103 ****
--- 99,103 ----
      y2 = x2*w;
      //#endif
+     */
  
      return 72.1;
***************
*** 123,128 ****
    event result_t Timer.fired() {
  
!     uint8_t result; 
      uint8_t *dataPortion;
      struct DataFormat_t *df;
  
--- 123,129 ----
    event result_t Timer.fired() {
  
!     //uint8_t result; 
      uint8_t *dataPortion;
+ 
      struct DataFormat_t *df;
  
***************
*** 144,149 ****
  
      sending = 1;
!     result = call MultiHopSend.send(&msgToSend, sizeof(struct DataFormat_t));
!     call Leds.greenToggle();
      return SUCCESS;
    }
--- 145,150 ----
  
      sending = 1;
!     call MultiHopSend.send(&msgToSend, sizeof(struct DataFormat_t));
!     //call Leds.greenToggle();
      return SUCCESS;
    }
***************
*** 162,171 ****
      sending = 0;
    }
! 
    event void HandleBcast.execute(TOS_MsgPtr msg) {
      //    uint8_t *cmdmsg = call HandleBcast.extractData(msg);
      // do whatever we want to this message 
    }
! 
   
  }
--- 163,172 ----
      sending = 0;
    }
!   
    event void HandleBcast.execute(TOS_MsgPtr msg) {
      //    uint8_t *cmdmsg = call HandleBcast.extractData(msg);
      // do whatever we want to this message 
    }
!   
   
  }

Index: Makefile
===================================================================
RCS file: /cvsroot/firebug/firebug/project/src/multihop/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Makefile	23 May 2003 00:57:14 -0000	1.10
--- Makefile	27 Jun 2003 19:17:20 -0000	1.11
***************
*** 11,22 ****
  
  
! TOSROOT=/cygdrive/c/tinyos-1.x
  
  DATASTRUCTURE=$(TOSROOT)/broken/experimental/terence/tos/lib/DataStructure
  ROUTESTACK=$(TOSROOT)/broken/experimental/terence/apps/mh6
! INCLUDES=-I$(DATASTRUCTURE) -I$(ROUTESTACK) 
  
- MAIN_EXE= build/mica/main.exe
- MAIN_SREC= build/mica/main.srec
  
  APPLICATION = CollectDataFB.nc
--- 11,27 ----
  
  
! TOSROOT=/cygdrive/c
  
  DATASTRUCTURE=$(TOSROOT)/broken/experimental/terence/tos/lib/DataStructure
  ROUTESTACK=$(TOSROOT)/broken/experimental/terence/apps/mh6
! INCLUDES=-I$(DATASTRUCTURE) -I$(ROUTESTACK) -I$(TOSROOT)/tinyos-1.x/tos
! 
! #INCLUDES=-I$(TOSROOT)/Blast-0.1/Sender -I$(TOSROOT)/Blast-0.1/Interface -I$(TOSROOT)/Blast-0.1/DataStructure -I$(TOSROOT)/Blast-0.1/VirtualComm -I$(TOSROOT)/Blast-0.1/ParentSelection 
! #-I$(TOSROOT)/tinyos-1.x/tos
! 
! PLATFORM=mica2
! MAIN_EXE= build/$(PLATFORM)/main.exe
! MAIN_SREC= build/$(PLATFORM)/main.srec
  
  
  APPLICATION = CollectDataFB.nc
***************
*** 42,51 ****
  	ncc -board=micasb -o build/mica/main.exe -Os -target=mica  -Wall -Wshadow -DDEF_TOS_AM_GROUP=0x7d -finline-limit=100000 -fnesc-cfile=build/mica/app.c $(INCLUDES) $(APPLICATION) -lm
  
  install: $(MAIN_SREC) FORCE
! 	$(MAKE) mica re$@
  
  
  install.%: $(MAIN_SREC) FORCE
! 	$(MAKE) mica re$@
  
  UISP = uisp
--- 47,58 ----
  	ncc -board=micasb -o build/mica/main.exe -Os -target=mica  -Wall -Wshadow -DDEF_TOS_AM_GROUP=0x7d -finline-limit=100000 -fnesc-cfile=build/mica/app.c $(INCLUDES) $(APPLICATION) -lm
  
+ mica2:
+ 	ncc -board=micasb -o build/mica2/main.exe -Os -target=mica2  -Wall -Wshadow -DDEF_TOS_AM_GROUP=0x7d -finline-limit=100000 -fnesc-cfile=build/mica2/app.c $(INCLUDES) $(APPLICATION) -lm
  install: $(MAIN_SREC) FORCE
! 	$(MAKE) $(PLATFORM) re$@
  
  
  install.%: $(MAIN_SREC) FORCE
! 	$(MAKE) $(PLATFORM) re$@
  
  UISP = uisp
***************
*** 56,75 ****
  	$(UISP) $(UISP_FLAGS) --erase
  	sleep 1
! 	$(UISP) $(UISP_FLAGS) --upload if=build/mica/main.srec
  	sleep 1
! 	$(UISP) $(UISP_FLAGS) --verify if=build/mica/main.srec
  
  
  reinstall.%: FORCE
  	@echo " installing mica binary "
! 	set-mote-id build/mica/main.srec build/mica/main.srec.out `echo $@ |sed 's:reinstall.::g'`
  	$(UISP) $(UISP_FLAGS) --erase
  	sleep 1
! 	$(UISP) $(UISP_FLAGS) --upload if=build/mica/main.srec.out
  	sleep 1
! 	$(UISP) $(UISP_FLAGS) --verify if=build/mica/main.srec.out
  
  $(MAIN_SREC): $(MAIN_EXE)
! 	avr-objcopy --output-target=srec build/mica/main.exe build/mica/main.srec
  
  clean: 
--- 63,82 ----
  	$(UISP) $(UISP_FLAGS) --erase
  	sleep 1
! 	$(UISP) $(UISP_FLAGS) --upload if=build/$(PLATFORM)/main.srec
  	sleep 1
! 	$(UISP) $(UISP_FLAGS) --verify if=build/$(PLATFORM)/main.srec
  
  
  reinstall.%: FORCE
  	@echo " installing mica binary "
! 	set-mote-id build/$(PLATFORM)/main.srec build/$(PLATFORM)/main.srec.out `echo $@ |sed 's:reinstall.::g'`
  	$(UISP) $(UISP_FLAGS) --erase
  	sleep 1
! 	$(UISP) $(UISP_FLAGS) --upload if=build/$(PLATFORM)/main.srec.out
  	sleep 1
! 	$(UISP) $(UISP_FLAGS) --verify if=build/$(PLATFORM)/main.srec.out
  
  $(MAIN_SREC): $(MAIN_EXE)
! 	avr-objcopy --output-target=srec build/$(PLATFORM)/main.exe build/$(PLATFORM)/main.srec
  
  clean: