From 2f59aebb6650cf37f59c44724afdd87619bdb02a Mon Sep 17 00:00:00 2001 From: smckown Date: Tue, 16 Sep 2008 17:12:03 +0000 Subject: [PATCH] Add ADC sensors for reading pyranomenter and battery to tmirws platform. --- tos/platforms/tmirws/.platform | 1 + tos/platforms/tmirws/sensors/BattAdcC.nc | 61 +++++++++++++++++++ tos/platforms/tmirws/sensors/BattAdcP.nc | 58 ++++++++++++++++++ .../tmirws/sensors/PyranometerAdcC.nc | 61 +++++++++++++++++++ .../tmirws/sensors/PyranometerAdcP.nc | 58 ++++++++++++++++++ 5 files changed, 239 insertions(+) create mode 100644 tos/platforms/tmirws/sensors/BattAdcC.nc create mode 100644 tos/platforms/tmirws/sensors/BattAdcP.nc create mode 100644 tos/platforms/tmirws/sensors/PyranometerAdcC.nc create mode 100644 tos/platforms/tmirws/sensors/PyranometerAdcP.nc diff --git a/tos/platforms/tmirws/.platform b/tos/platforms/tmirws/.platform index af2b475f..6c9b9d60 100755 --- a/tos/platforms/tmirws/.platform +++ b/tos/platforms/tmirws/.platform @@ -7,6 +7,7 @@ push( @includes, qw( %T/platforms/tmirws %T/platforms/tmirws/chips/scp1000 %T/platforms/tmirws/chips/sht11 + %T/platforms/tmirws/sensors %T/platforms/tmicore %T/platforms/tmicore/chips/bq2403x %T/platforms/tmicore/chips/cp210x diff --git a/tos/platforms/tmirws/sensors/BattAdcC.nc b/tos/platforms/tmirws/sensors/BattAdcC.nc new file mode 100644 index 00000000..aa0a90a4 --- /dev/null +++ b/tos/platforms/tmirws/sensors/BattAdcC.nc @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2008, Titanium Mirror, Inc. + * 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 Titanium Mirror, Inc. 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. + */ + +/** + * Reads the ADC pin connected to the LiPoly battery. The connection is made + * via a resistor divider where the battery voltage is 3x that read by the ADC. + * Therefore, BattV = ADC / 4096 * 1.5 * 3. + * + * @author R. Steve McKown + */ + +generic configuration BattAdcC() { + provides interface Read; + provides interface ReadStream; + + provides interface Resource; + provides interface ReadNow; +} +implementation { + components new AdcReadClientC(); + Read = AdcReadClientC; + + components new AdcReadStreamClientC(); + ReadStream = AdcReadStreamClientC; + + components BattAdcP; + AdcReadClientC.AdcConfigure -> BattAdcP; + AdcReadStreamClientC.AdcConfigure -> BattAdcP; + + components new AdcReadNowClientC(); + Resource = AdcReadNowClientC; + ReadNow = AdcReadNowClientC; + + AdcReadNowClientC.AdcConfigure -> BattAdcP; +} diff --git a/tos/platforms/tmirws/sensors/BattAdcP.nc b/tos/platforms/tmirws/sensors/BattAdcP.nc new file mode 100644 index 00000000..08c0b064 --- /dev/null +++ b/tos/platforms/tmirws/sensors/BattAdcP.nc @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2008, Titanium Mirror, Inc. + * 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 Titanium Mirror, Inc. 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. + */ + +/** + * Battery ADC reading. + * + * @author R. Steve McKown + */ + +#include "Msp430Adc12.h" + +module BattAdcP { + provides interface AdcConfigure; +} +implementation { + + const msp430adc12_channel_config_t config = { + inch: INPUT_CHANNEL_A0, + sref: REFERENCE_VREFplus_AVss, + ref2_5v: REFVOLT_LEVEL_1_5, + adc12ssel: SHT_SOURCE_ADC12OSC, + adc12div: SHT_CLOCK_DIV_1, + sht: SAMPLE_HOLD_8_CYCLES, + sampcon_ssel: SAMPCON_SOURCE_ACLK, + sampcon_id: SAMPCON_CLOCK_DIV_1 + }; + + async command const msp430adc12_channel_config_t* AdcConfigure.getConfiguration() + { + return &config; + } +} diff --git a/tos/platforms/tmirws/sensors/PyranometerAdcC.nc b/tos/platforms/tmirws/sensors/PyranometerAdcC.nc new file mode 100644 index 00000000..26297ed2 --- /dev/null +++ b/tos/platforms/tmirws/sensors/PyranometerAdcC.nc @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2008, Titanium Mirror, Inc. + * 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 Titanium Mirror, Inc. 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. + */ + +/** + * Reads the ADC pin connected to the LiPoly battery. The connection is made + * via a resistor divider where the battery voltage is 3x that read by the ADC. + * Therefore, PyranometerV = ADC / 4096 * 1.5 * 3. + * + * @author R. Steve McKown + */ + +generic configuration PyranometerAdcC() { + provides interface Read; + provides interface ReadStream; + + provides interface Resource; + provides interface ReadNow; +} +implementation { + components new AdcReadClientC(); + Read = AdcReadClientC; + + components new AdcReadStreamClientC(); + ReadStream = AdcReadStreamClientC; + + components PyranometerAdcP; + AdcReadClientC.AdcConfigure -> PyranometerAdcP; + AdcReadStreamClientC.AdcConfigure -> PyranometerAdcP; + + components new AdcReadNowClientC(); + Resource = AdcReadNowClientC; + ReadNow = AdcReadNowClientC; + + AdcReadNowClientC.AdcConfigure -> PyranometerAdcP; +} diff --git a/tos/platforms/tmirws/sensors/PyranometerAdcP.nc b/tos/platforms/tmirws/sensors/PyranometerAdcP.nc new file mode 100644 index 00000000..11e8ad37 --- /dev/null +++ b/tos/platforms/tmirws/sensors/PyranometerAdcP.nc @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2008, Titanium Mirror, Inc. + * 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 Titanium Mirror, Inc. 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. + */ + +/** + * Pyranometerery ADC reading. + * + * @author R. Steve McKown + */ + +#include "Msp430Adc12.h" + +module PyranometerAdcP { + provides interface AdcConfigure; +} +implementation { + + const msp430adc12_channel_config_t config = { + inch: INPUT_CHANNEL_A3, + sref: REFERENCE_VREFplus_AVss, + ref2_5v: REFVOLT_LEVEL_1_5, + adc12ssel: SHT_SOURCE_ADC12OSC, + adc12div: SHT_CLOCK_DIV_1, + sht: SAMPLE_HOLD_8_CYCLES, + sampcon_ssel: SAMPCON_SOURCE_ACLK, + sampcon_id: SAMPCON_CLOCK_DIV_1 + }; + + async command const msp430adc12_channel_config_t* AdcConfigure.getConfiguration() + { + return &config; + } +} -- 2.39.2