[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/mica VoltageP.nc, 1.2, 1.3 VoltageC.nc, 1.2, 1.3

[Razvan Musaloiu-E.]

Update of /cvsroot/tinyos/tinyos-2.x/tos/platforms/mica
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9551/platforms/mica

Modified Files:
	VoltageP.nc VoltageC.nc 
Log Message:
Convert to Unix-style line terminators.


Index: VoltageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/mica/VoltageP.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** VoltageP.nc	22 May 2007 21:34:49 -0000	1.2
--- VoltageP.nc	11 Jun 2008 00:42:14 -0000	1.3
***************
*** 1,49 ****
! /* Copyright (c) 2007 Johns Hopkins University.
!  * All rights reserved.
!  *
!  * Permission to use, copy, modify, and distribute this software and its
!  * documentation for any purpose, without fee, and without written
!  * agreement is hereby granted, provided that the above copyright
!  * notice, the (updated) modification history and the author appear in
!  * all copies of this source code.
!  *
!  * 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 HOLDERS OR CONTRIBUTORS
!  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
!  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
!  * OR PROFITS) 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.
!  */
! /**
!  * Battery Voltage. The returned value represents the difference
!  * between the battery voltage and V_BG (1.23V). The formula to convert
!  * it to mV is: 1223 * 1024 / value.
!  *
!  * @author Razvan Musaloiu-E.
!  */
! module VoltageP
! {
!   provides interface Atm128AdcConfig;
! }
! implementation
! {
!   async command uint8_t Atm128AdcConfig.getChannel()
!   {
!     // select the 1.23V (V_BG). Reference: Table 97, page 244 from the Atmega128
!     return ATM128_ADC_SNGL_1_23;
!   }
! 
!   async command uint8_t Atm128AdcConfig.getRefVoltage()
!   {
!     return ATM128_ADC_VREF_OFF;
!   }
! 
!   async command uint8_t Atm128AdcConfig.getPrescaler()
!   {
!     return ATM128_ADC_PRESCALE;
!   }
! }
--- 1,49 ----
! /* Copyright (c) 2007 Johns Hopkins University.
!  * All rights reserved.
!  *
!  * Permission to use, copy, modify, and distribute this software and its
!  * documentation for any purpose, without fee, and without written
!  * agreement is hereby granted, provided that the above copyright
!  * notice, the (updated) modification history and the author appear in
!  * all copies of this source code.
!  *
!  * 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 HOLDERS OR CONTRIBUTORS
!  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
!  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
!  * OR PROFITS) 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.
!  */
! /**
!  * Battery Voltage. The returned value represents the difference
!  * between the battery voltage and V_BG (1.23V). The formula to convert
!  * it to mV is: 1223 * 1024 / value.
!  *
!  * @author Razvan Musaloiu-E.
!  */
! module VoltageP
! {
!   provides interface Atm128AdcConfig;
! }
! implementation
! {
!   async command uint8_t Atm128AdcConfig.getChannel()
!   {
!     // select the 1.23V (V_BG). Reference: Table 97, page 244 from the Atmega128
!     return ATM128_ADC_SNGL_1_23;
!   }
! 
!   async command uint8_t Atm128AdcConfig.getRefVoltage()
!   {
!     return ATM128_ADC_VREF_OFF;
!   }
! 
!   async command uint8_t Atm128AdcConfig.getPrescaler()
!   {
!     return ATM128_ADC_PRESCALE;
!   }
! }

Index: VoltageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/mica/VoltageC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** VoltageC.nc	22 May 2007 21:34:49 -0000	1.2
--- VoltageC.nc	11 Jun 2008 00:42:14 -0000	1.3
***************
*** 1,41 ****
! /* Copyright (c) 2007 Johns Hopkins University.
!  * All rights reserved.
!  *
!  * Permission to use, copy, modify, and distribute this software and its
!  * documentation for any purpose, without fee, and without written
!  * agreement is hereby granted, provided that the above copyright
!  * notice, the (updated) modification history and the author appear in
!  * all copies of this source code.
!  *
!  * 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 HOLDERS OR CONTRIBUTORS
!  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
!  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
!  * OR PROFITS) 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.
!  */
! /**
!  * Battery Voltage. The returned value represents the difference
!  * between the battery voltage and V_BG (1.23V). The formula to convert
!  * it to mV is: 1223 * 1024 / value.
!  *
!  * @author Razvan Musaloiu-E.
!  */
! 
! generic configuration VoltageC()
! {
!   provides interface Read<uint16_t>;
! }
! 
! implementation
! {
!   components new AdcReadClientC(), VoltageP;
! 
!   Read = AdcReadClientC;
! 
!   AdcReadClientC.Atm128AdcConfig -> VoltageP;
! }
--- 1,41 ----
! /* Copyright (c) 2007 Johns Hopkins University.
!  * All rights reserved.
!  *
!  * Permission to use, copy, modify, and distribute this software and its
!  * documentation for any purpose, without fee, and without written
!  * agreement is hereby granted, provided that the above copyright
!  * notice, the (updated) modification history and the author appear in
!  * all copies of this source code.
!  *
!  * 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 HOLDERS OR CONTRIBUTORS
!  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
!  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
!  * OR PROFITS) 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.
!  */
! /**
!  * Battery Voltage. The returned value represents the difference
!  * between the battery voltage and V_BG (1.23V). The formula to convert
!  * it to mV is: 1223 * 1024 / value.
!  *
!  * @author Razvan Musaloiu-E.
!  */
! 
! generic configuration VoltageC()
! {
!   provides interface Read<uint16_t>;
! }
! 
! implementation
! {
!   components new AdcReadClientC(), VoltageP;
! 
!   Read = AdcReadClientC;
! 
!   AdcReadClientC.Atm128AdcConfig -> VoltageP;
! }