[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/harvard/spaulding/src/sampling MercurySampling.h, 1.2, 1.3

[Konrad Lorincz]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/harvard/spaulding/src/sampling
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29791/src/sampling

Modified Files:
	MercurySampling.h 
Log Message:
Checked in EMG, and fixed display issue with gui

Index: MercurySampling.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/harvard/spaulding/src/sampling/MercurySampling.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MercurySampling.h	20 Dec 2007 01:29:34 -0000	1.2
--- MercurySampling.h	11 Mar 2008 20:30:52 -0000	1.3
***************
*** 41,45 ****
        MERCURY_CHAN_GYROY = 6,
        MERCURY_CHAN_GYROZ = 2,
!       MERCURY_CHAN_EMG = 5,
        MERCURY_CHAN_INVALID = 255,
    };
--- 41,46 ----
        MERCURY_CHAN_GYROY = 6,
        MERCURY_CHAN_GYROZ = 2,
!       MERCURY_CHAN_EMGRALL = 2,
!       MERCURY_CHAN_EMGLALL = 1,
        MERCURY_CHAN_INVALID = 255,
    };
***************
*** 59,65 ****
  // (2) - Type of sampling sensors
  #ifdef SAMPLING_PLATFORM_EMG
!   enum {MERCURY_SAMPLING_RATE = 1024};  // in Hz
!   enum {MERCURY_NBR_CHANS = 1};
!   channelID_t MERCURY_CHANS[MERCURY_NBR_CHANS] = {MERCURY_CHAN_EMG};
  #else  // assumie ACC and Gyro
    enum {MERCURY_SAMPLING_RATE = 100};  // in Hz
--- 60,67 ----
  // (2) - Type of sampling sensors
  #ifdef SAMPLING_PLATFORM_EMG
!   enum {MERCURY_SAMPLING_RATE = 512};  // in Hz
!   enum {MERCURY_NBR_CHANS = 2};
!   channelID_t MERCURY_CHANS[MERCURY_NBR_CHANS] = {MERCURY_CHAN_EMGRALL,
!                                                   MERCURY_CHAN_EMGLALL};
  #else  // assumie ACC and Gyro
    enum {MERCURY_SAMPLING_RATE = 100};  // in Hz