[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/handhelds/tos/interfaces MMA7260_Accel.h, NONE, 1.1 MMA7260_Accel.nc, NONE, 1.1 DMA.nc, 1.2, 1.3 IDChip.nc, 1.1, 1.2 IEEE802154.h, 1.2, 1.3 Leds.nc, 1.1, 1.2 Message.h, 1.1, 1.2 SD.nc, 1.1, 1.2

[steve ayer]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/handhelds/tos/interfaces
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32673/tos/interfaces

Modified Files:
	DMA.nc IDChip.nc IEEE802154.h Leds.nc Message.h SD.nc 
Added Files:
	MMA7260_Accel.h MMA7260_Accel.nc 
Log Message:

added mma7260 accelerometer interface/lib
updated shimmer hardware.h adding adc6&7 pins
added hwtest for shimmer gyro board to hwtest; two versions, one three
channel, one six channel
updated interfaces for above and dma.adcinterrupt event now provides
register number 


--- NEW FILE: MMA7260_Accel.h ---
/*
 * Copyright (c) 2006, Intel Corporation
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
 * 
 * Redistributions of source code must retain the above copyright notice, 
 * this list of conditions and the following disclaimer. 
 *
 * Redistributions in binary form must reproduce the above copyright notice,
 * this list of conditions and the following disclaimer in the documentation
 * and/or other materials provided with the distribution. 
 *
 * Neither the name of the Intel Corporation nor the names of its contributors
 * may be used to endorse or promote products derived from this software 
 * without specific prior written permission. 
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
 * POSSIBILITY OF SUCH DAMAGE.
 *
 *  Author:  Steve Ayer
 *           August, 2006
 */

enum MMA7260_RANGE {
  RANGE_1_5G  = 0,
  RANGE_2_0G  = 1,
  RANGE_4_0G  = 2,
  RANGE_6_0G  = 3
};



--- NEW FILE: MMA7260_Accel.nc ---
/*
 * Copyright (c) 2006, Intel Corporation
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
 * 
 * Redistributions of source code must retain the above copyright notice, 
 * this list of conditions and the following disclaimer. 
 *
 * Redistributions in binary form must reproduce the above copyright notice,
 * this list of conditions and the following disclaimer in the documentation
 * and/or other materials provided with the distribution. 
 *
 * Neither the name of the Intel Corporation nor the names of its contributors
 * may be used to endorse or promote products derived from this software 
 * without specific prior written permission. 
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
 * POSSIBILITY OF SUCH DAMAGE.
 *
 * Author: Steve Ayer
 *         August 2006
 */

includes MMA7260_Accel;

interface MMA7260_Accel {
  command void wake(bool wakeup); 

  command void setSensitivity(enum MMA7260_RANGE sensitivity);
}





Index: DMA.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/handhelds/tos/interfaces/DMA.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DMA.nc	3 Aug 2006 19:16:49 -0000	1.2
--- DMA.nc	7 Sep 2006 18:36:07 -0000	1.3
***************
*** 70,73 ****
    async default event void transferComplete();
  
!   async default event void ADCInterrupt();
  }    
--- 70,73 ----
    async default event void transferComplete();
  
!   async default event void ADCInterrupt(uint8_t regnum);
  }    




Index: Message.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/handhelds/tos/interfaces/Message.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Message.h	29 Jul 2005 18:29:25 -0000	1.1
--- Message.h	7 Sep 2006 18:36:07 -0000	1.2
***************
*** 335,338 ****
--- 335,339 ----
  inline void    msg_set_length( struct Message *msg, uint8_t len )  { msg->length = len; }
  inline uint8_t msg_get_length( const struct Message *msg )         { return msg->length; }
+ inline uint8_t msg_get_max_length( void )         { return MESSAGE_MAX_LENGTH; }
  
  /**

Index: SD.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/handhelds/tos/interfaces/SD.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SD.nc	3 Aug 2006 19:16:50 -0000	1.1
--- SD.nc	7 Sep 2006 18:36:07 -0000	1.2
***************
*** 63,66 ****
    // Read the Card Size from the CSD Register
    // unsupported on sdio only cards
!   command uint16_t readCardSize();
  }
--- 63,66 ----
    // Read the Card Size from the CSD Register
    // unsupported on sdio only cards
!   command uint32_t readCardSize();
  }