[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/imote2/test/Testradio Testradio.nc, 1.2, 1.3 TestradioM.nc, 1.2, 1.3

[Lama Nachman]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/imote2/test/Testradio
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22259

Modified Files:
	Testradio.nc TestradioM.nc 
Log Message:
Pushed out new release OCT 2006



Index: TestradioM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/imote2/test/Testradio/TestradioM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestradioM.nc	18 Aug 2005 23:26:01 -0000	1.2
--- TestradioM.nc	10 Oct 2006 02:43:56 -0000	1.3
***************
*** 34,37 ****
--- 34,39 ----
   * Timer fires.
   **/
+ includes trace;
+ 
  module TestradioM {
    provides {
***************
*** 54,62 ****
  implementation {
  
-     //something is wrong with stdio.h...
-     //#include <stdio.h>
-     int sprintf(char *, const char *, ...) __attribute__ ((C, spontaneous));
-     int sscanf(const char *, const char *, ...) __attribute__ ((C, spontaneous));
-     void trace(const char *format, ...) __attribute__ ((C, spontaneous));
      /**
     * Initialize the component.
--- 56,59 ----
***************
*** 131,135 ****
            sprintf(resBuff,"Sending Radio Command %#x\r\n",cmd);
            result = call HPLCC2420.cmd(cmd);
!           trace("result = %#x\r\n",result);
        }
        return BLUSH_SUCCESS_DONE;
--- 128,132 ----
            sprintf(resBuff,"Sending Radio Command %#x\r\n",cmd);
            result = call HPLCC2420.cmd(cmd);
!           trace(DBG_USR1,"result = %#x\r\n",result);
        }
        return BLUSH_SUCCESS_DONE;
***************
*** 155,159 ****
            sprintf(resBuff,"Writing %#x to [%#x]\r\n",data, addr);
            result = call HPLCC2420.write(addr, data);
!           trace("result = %#x\r\n",result);
        }
        return BLUSH_SUCCESS_DONE;
--- 152,156 ----
            sprintf(resBuff,"Writing %#x to [%#x]\r\n",data, addr);
            result = call HPLCC2420.write(addr, data);
!           trace(DBG_USR1,"result = %#x\r\n",result);
        }
        return BLUSH_SUCCESS_DONE;
***************
*** 179,183 ****
            sprintf(resBuff,"Reading Radio [%#x]\r\n",addr);
            result = call HPLCC2420.read(addr);
!           trace("result = %#x\r\n",result);
        }
        return BLUSH_SUCCESS_DONE;
--- 176,180 ----
            sprintf(resBuff,"Reading Radio [%#x]\r\n",addr);
            result = call HPLCC2420.read(addr);
!           trace(DBG_USR1,"result = %#x\r\n",result);
        }
        return BLUSH_SUCCESS_DONE;
***************
*** 198,202 ****
      if(status == 0){
        
!       trace("TurningOnCarrier\r\n");
        //things we need to do:
        //turn on the OSC (0x01
--- 195,199 ----
      if(status == 0){
        
!       trace(DBG_USR1,"TurningOnCarrier\r\n");
        //things we need to do:
        //turn on the OSC (0x01
***************
*** 211,215 ****
      }
      else{
!       trace("TurningOffCarrier\r\n");
        result = call HPLCC2420.cmd(CC2420_SXOSCOFF);
        status =0;
--- 208,212 ----
      }
      else{
!       trace(DBG_USR1,"TurningOffCarrier\r\n");
        result = call HPLCC2420.cmd(CC2420_SXOSCOFF);
        status =0;
***************
*** 232,236 ****
      if(status == 0){
        
!       trace("TurningOnTxTest\r\n");
        //things we need to do:
        //turn on the OSC (0x01
--- 229,233 ----
      if(status == 0){
        
!       trace(DBG_USR1,"TurningOnTxTest\r\n");
        //things we need to do:
        //turn on the OSC (0x01
***************
*** 244,248 ****
      }
      else{
!       trace("TurningOffTxTest\r\n");
        result = call HPLCC2420.cmd(CC2420_SXOSCOFF);
        status =0;
--- 241,245 ----
      }
      else{
!       trace(DBG_USR1,"TurningOffTxTest\r\n");
        result = call HPLCC2420.cmd(CC2420_SXOSCOFF);
        status =0;
***************
*** 297,301 ****
  	  result = call HPLCC2420.write(CC2420_TXCTRL, data);
            result = call HPLCC2420.read(CC2420_TXCTRL);
! 	  trace("Set TxPower to %#x \r\n",result);
        }
        return BLUSH_SUCCESS_DONE;
--- 294,298 ----
  	  result = call HPLCC2420.write(CC2420_TXCTRL, data);
            result = call HPLCC2420.read(CC2420_TXCTRL);
! 	  trace(DBG_USR1,"Set TxPower to %#x \r\n",result);
        }
        return BLUSH_SUCCESS_DONE;
***************
*** 317,321 ****
      if(status == 0){
        
!       trace("Outputting 8MHz Oscillator on SFD\r\n");
        //things we need to do:
        //turn on the OSC (0x01
--- 314,318 ----
      if(status == 0){
        
!       trace(DBG_USR1,"Outputting 8MHz Oscillator on SFD\r\n");
        //things we need to do:
        //turn on the OSC (0x01
***************
*** 328,332 ****
      }
      else{
!       trace("Turning off 8MHz Oscillator output from SFD\r\n");
        result = call HPLCC2420.write(CC2420_IOCFG1, 0);
        status =0;
--- 325,329 ----
      }
      else{
!       trace(DBG_USR1,"Turning off 8MHz Oscillator output from SFD\r\n");
        result = call HPLCC2420.write(CC2420_IOCFG1, 0);
        status =0;