[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/TestAdc Makefile, NONE, 1.1.4.2 README.txt, NONE, 1.1.4.2 TestAdcAppC.nc, NONE, 1.1.4.2 TestAdcC.nc, NONE, 1.1.4.2

[Kevin Klues]

Update of /cvsroot/tinyos/tinyos-2.x/apps/tests/TestAdc
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18756/apps/tests/TestAdc

Added Files:
      Tag: tos-2-resource-pm-eval-cand
	Makefile README.txt TestAdcAppC.nc TestAdcC.nc 
Log Message:
Merging the development branch with the resource/power management evaluation branch.  After this merge all files except those already commited should be identical.

--- NEW FILE: Makefile ---
COMPONENT=TestAdcAppC
CFLAGS += -I%T/oski
include $(MAKERULES)

--- NEW FILE: README.txt ---
README for TestAdc
Author/Contact: tinyos-help at millennium.berkeley.edu

Description:

TestAdc is an application for testing the ADC subsystem. It requires a generic
platform dependent DemoSensorC, DemoSensorNowC and DemoSensorStreamC components
that provide the following interfaces: Read<uint16_t> (DemoSensorC),
ReadStream<uint16_t> (DemoSensorStreamC) and ReadNow<uint16_t> and Resource (DemoSensorNowC).
It requests data via the three data collection interfaces and switches on
leds 0, 1 and 2 when the conversion results are signalled from the ADC subsystem:

 LED0 denotes a successful Read operation,
 LED1 denotes a successful ReadNow operation,
 LED2 denotes a successful ReadStream operation.

Please refer to TEP 101 for more information on the ADC abstraction.


--- NEW FILE: TestAdcAppC.nc ---
/*
 * Copyright (c) 2004, Technische Universitaet Berlin
 * 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 Technische Universitaet Berlin 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.
 *
 * - Revision -------------------------------------------------------------
 * $Revision: 1.1.4.2 $
 * $Date: 2006/05/15 18:35:23 $
 * @author: Jan Hauer <hauer at tkn.tu-berlin.de>
 * ========================================================================
 */

/**
 * Tests the AdcC subsystem and switches on leds 0, 1 and 2
 * if the test is successful:
 * LED0 denotes a successful Read operation,
 * LED1 denotes a successful ReadNow operation,
 * LED2 denotes a successful ReadStream operation.
 *
 * Requires a platform-specific DemoSensorC component that provides
 * Read<uint16_t>, a platform-specific DemoSensorStreamC component that provides
 * ReadStream<uint16_t> and a platform-specific DemoSensorNowC component that provides
 * ReadNow<uint16_t> and Resource
 *
 * @author Jan Hauer
 */
configuration TestAdcAppC {
}
implementation
{
  components MainC,
             TestAdcC,
             new DemoSensorC() as Sensor,
             new DemoSensorNowC() as SensorNow,
             new DemoSensorStreamC() as SensorStream,
             LedsC;

  TestAdcC -> MainC.Boot;
  
  TestAdcC.Leds -> LedsC;
  TestAdcC.Read -> Sensor;
  TestAdcC.ReadNow -> SensorNow;
  TestAdcC.ReadNowResource -> SensorNow;
  TestAdcC.ReadStream -> SensorStream;
}


--- NEW FILE: TestAdcC.nc ---
/* 
 * Copyright (c) 2004, Technische Universitaet Berlin
 * 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 Technische Universitaet Berlin 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.
 *
 * - Revision -------------------------------------------------------------
 * $Revision: 1.1.4.2 $
 * $Date: 2006/05/15 18:35:23 $
 * @author: Jan Hauer <hauer at tkn.tu-berlin.de>
 * ========================================================================
 */

/**
 * Tests the AdcC subsystem and switches on leds 0, 1 and 2
 * if the test is successful:
 * LED0 denotes a successful Read operation,
 * LED1 denotes a successful ReadNow operation,
 * LED2 denotes a successful ReadStream operation.
 *
 * @author Jan Hauer 
 */
module TestAdcC
{
  uses interface Read<uint16_t> as Read;
  uses interface ReadNow<uint16_t> as ReadNow;
  uses interface Resource as ReadNowResource;
  uses interface ReadStream<uint16_t> as ReadStream;
  uses interface Boot;
  uses interface Leds;
}
implementation
{
#define BUF_SIZE 100
  uint16_t buf[BUF_SIZE];
  bool streamSuccess;
  
  event void Boot.booted()
  {
    streamSuccess = FALSE;
    call Read.read();
    call ReadStream.postBuffer(buf, BUF_SIZE);
    call ReadStream.read(10000);
    call ReadNowResource.request();
  }
  
  event void Read.readDone(error_t result, uint16_t data)
  {
    if (result == SUCCESS)
      call Leds.led0On();
  }

  event void ReadNowResource.granted()
  {
    call ReadNow.read();
  }
  
  async event void ReadNow.readDone(error_t result, uint16_t data)
  {
    if (result == SUCCESS)
      call Leds.led1On();
    call ReadNowResource.release();
  }

  event void ReadStream.bufferDone( error_t result, 
			 uint16_t* buffer, uint16_t count )
  {
    streamSuccess = TRUE;
  }

  event void ReadStream.readDone(error_t result, uint32_t actualPeriod)
  {
    if (result == SUCCESS && streamSuccess)
      call Leds.led2On();
  }
}