[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/rincon/tos/platform/mica2 CC1000ControlM.nc, 1.2, 1.3

[dmm]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/rincon/tos/platform/mica2
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27053/contrib/rincon/tos/platform/mica2

Modified Files:
	CC1000ControlM.nc 
Log Message:
Switched to a single-calibration algorithm and added support for runtime frequency hopping

Index: CC1000ControlM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/rincon/tos/platform/mica2/CC1000ControlM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CC1000ControlM.nc	1 May 2006 16:50:42 -0000	1.2
--- CC1000ControlM.nc	19 May 2006 18:25:50 -0000	1.3
***************
*** 65,71 ****
   *   Jaein Jeong
   *   Phil Buonadonna
!  * Date last modified:  2/22/2006 dmm - Performs a single calibration instead of dual.
   *                                      Added notes about MODEM0 doubling the throughput.
   *                                      Doubled the throughput in MODEM0 - not compatible with mica2dot's.
   *
   * This module provides the CONTROL functionality for the Chipcon1000 series radio.
--- 65,72 ----
   *   Jaein Jeong
   *   Phil Buonadonna
!  * Date last modified:  2/22/2006 dmm - Performs a single calibration instead of dual, with runtime freq hopping
   *                                      Added notes about MODEM0 doubling the throughput.
   *                                      Doubled the throughput in MODEM0 - not compatible with mica2dot's.
+  *                                      
   *
   * This module provides the CONTROL functionality for the Chipcon1000 series radio.
***************
*** 237,241 ****
      call HPLChipcon.write(CC1K_MAIN,
  			  ((1<<CC1K_TX_PD) | (1<<CC1K_RESET_N)));
!     // Sex the RX mode VCO Current
      call HPLChipcon.write(CC1K_CURRENT,gCurrentParameters[0x09]);
      call HPLChipcon.write(CC1K_PA_POW,0x00);
--- 238,242 ----
      call HPLChipcon.write(CC1K_MAIN,
  			  ((1<<CC1K_TX_PD) | (1<<CC1K_RESET_N)));
!     // Sets the RX mode VCO Current
      call HPLChipcon.write(CC1K_CURRENT,gCurrentParameters[0x09]);
      call HPLChipcon.write(CC1K_PA_POW,0x00);
***************
*** 515,518 ****
--- 516,523 ----
      call HPLChipcon.write(CC1K_CAL,
  			  ((1<<CC1K_CAL_WAIT) | (6<<CC1K_CAL_ITERATE)));
+ 			  
+     // Reset MAIN
+     call HPLChipcon.write(CC1K_MAIN,
+ 			  ((1<<CC1K_TX_PD) | (1<<CC1K_RESET_N)));
    }
  
***************
*** 532,536 ****
      call HPLChipcon.write(CC1K_MATCH,gCurrentParameters[0x12]);
  
!     dualCalibration();
      
      return;
--- 537,541 ----
      call HPLChipcon.write(CC1K_MATCH,gCurrentParameters[0x12]);
  
!     singleCalibration();
      
      return;