[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/ptII/ptinyos/tos/platform/ptII adc_model.c, 1.3, 1.4 ptII.c, 1.12, 1.13

[Elaine Cheong]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/ptII/ptinyos/tos/platform/ptII
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6785/tos/platform/ptII

Modified Files:
	adc_model.c ptII.c 
Log Message:
- Responded to PtinyOS code review (part II) on Dec 15, 2006.
- Changed accelx, accely, magx, magy parameters in MicaCompositeActor.java to
accelerometerX, accelerometerY, magnetometerX, magnetometerY.  Updated
adc_model.c to use these names.



Index: adc_model.c
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/ptII/ptinyos/tos/platform/ptII/adc_model.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** adc_model.c	1 Feb 2006 07:50:12 -0000	1.3
--- adc_model.c	18 Dec 2006 07:20:00 -0000	1.4
***************
*** 119,131 ****
        case TOS_ADC_TEMP_PORT: portname = "temperature";
            break;
!       case TOS_ADC_MIC_PORT: portname = "mic";
            break;
!       case TOS_ADC_ACCEL_X_PORT: portname = "accelx";
            break;
!       case TOS_ADC_ACCEL_Y_PORT: portname = "accely";
            break;
!       case TOS_ADC_MAG_X_PORT: portname = "magx";
            break;
!       case TOS_ADC_MAG_Y_PORT: portname = "magy";
            break;
        default:
--- 119,131 ----
        case TOS_ADC_TEMP_PORT: portname = "temperature";
            break;
!       case TOS_ADC_MIC_PORT: portname = "microphone";
            break;
!       case TOS_ADC_ACCEL_X_PORT: portname = "accelerometerX";
            break;
!       case TOS_ADC_ACCEL_Y_PORT: portname = "accelerometerY";
            break;
!       case TOS_ADC_MAG_X_PORT: portname = "magnetometerX";
            break;
!       case TOS_ADC_MAG_Y_PORT: portname = "magnetometerY";
            break;
        default:

Index: ptII.c
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/ptII/ptinyos/tos/platform/ptII/ptII.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ptII.c	15 Dec 2006 01:00:06 -0000	1.12
--- ptII.c	18 Dec 2006 07:20:00 -0000	1.13
***************
*** 1303,1306 ****
--- 1303,1310 ----
  
  /* Close the Selector.
+  *
+  * Called from external_comm.c: eventAcceptThreadFunc() and
+  * commandReadThreadFunc().
+  *
   * Arguments:
   *   selector: The selector that should be closed (type Selector).
***************
*** 1349,1353 ****
   * about to close.
   *
!  * See external_comm.c: eventAcceptThreadFunc()
   *
   * Also see:
--- 1353,1358 ----
   * about to close.
   *
!  * Called from external_comm.c: eventAcceptThreadFunc() and
!  * commandReadThreadFunc().
   *
   * Also see: