Revision 20:f94859dd2ca0, committed 2019-09-11

Comitter:

Vkadaba

Date:

Wed Sep 11 08:37:22 2019 +0000

Parent:

19:09d58952b65d

Child:

21:8e00425b8096

Commit message:

Removed multichannel config file- It was created for my reference for debugging MWARE-1612

Changed in this revision

--- a/main.cpp	Mon Sep 09 05:57:43 2019 +0000
+++ b/main.cpp	Wed Sep 11 08:37:22 2019 +0000
@@ -62,7 +62,7 @@
 extern ADMW_CONFIG config;
 extern ADMW_CONFIG multichannel_thermocoupleAndHumidity;
 /* Change the following pointer to select any of the configurations above */
-static ADMW_CONFIG *pSelectedConfig = &i2c0_sensirionSHT3X_config;
+static ADMW_CONFIG *pSelectedConfig = &multichannel_thermocoupleAndHumidity;
 
 static ADMW_CONNECTION connectionInfo = PLATFORM_CONNECTION_INFO;
 

--- a/multichannel_thermocoupleAndHumidity.c	Mon Sep 09 05:57:43 2019 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,146 +0,0 @@
-/*
-Copyright 2019 (c) Analog Devices, 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 Analog Devices, Inc. nor the names of its
-    contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
-  - The use of this software may or may not infringe the patent rights
-    of one or more patent holders. This license does not release you
-    from the requirement that you obtain separate licenses from these
-    patent holders to use this software.
-  - Use of the software either in source or binary form, must be run
-    on or directly connected to an Analog Devices Inc. component.
-
-THIS SOFTWARE IS PROVIDED BY ANALOG DEVICES "AS IS" AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, NON-INFRINGEMENT,
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL ANALOG DEVICES BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, INTELLECTUAL PROPERTY RIGHTS, 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.
- *
- *****************************************************************************/
-
-/*!
- ******************************************************************************
- * @file:
- * @brief:
- *-----------------------------------------------------------------------------
- */
-#include "admw_config_types.h"
-
-ADMW_CONFIG multichannel_thermocoupleAndHumidity = {
-   .versionId = { .major = 2, .minor = 0 },
-    .productId = ADMW_PRODUCT_ID_ADMW1001,
-    .admw1001 = {
-            .power = {
-                .powerMode = ADMW1001_POWER_MODE_ACTIVE,
-            },
-            .measurement = {
-                .operatingMode = ADMW1001_OPERATING_MODE_CONTINUOUS,
-                .dataReadyMode = ADMW1001_DATAREADY_PER_CYCLE, // FIX: Temporarily all values from json are hardcoded to this one in the Contracts.FileGenerator - > file translations!!
-                .cycleInterval = 0,
-                .vBiasEnable = true,
-            },
-            .diagnostics = {
-                .disableGlobalDiag = true,
-                .disableMeasurementDiag = true,
-                .osdFrequency = ADMW1001_OPEN_SENSOR_DIAGNOSTICS_DISABLED,
-            },
-            .channels = {
-                [ADMW1001_CH_ID_ANLG_1_UNIVERSAL] = {
-                    .enableChannel = true,
-                    .disablePublishing = false,
-                    .compensationChannel = ADMW1001_CH_ID_NONE,
-                    .lutSelect = ADMW1001_LUT_DEFAULT,
-                    .measurementUnit = ADMW1001_MEASUREMENT_UNIT_FAHRENHEIT,
-                    .lowThreshold = -58,
-                    .highThreshold = 482,
-                    .offsetAdjustment = 0.0,
-                    .gainAdjustment = 0.0,
-                    .sensorParameter = 0.0,
-                    .measurementsPerCycle = 10,
-                    .cycleSkipCount = 0,
-                    .extraSettlingTime = 0,
-                    .priority = 0,
-                    .adcChannelConfig = {
-                        .sensor = ADMW1001_ADC_SENSOR_RTD_2WIRE_PT100,
-                        .rtdCurve = ADMW1001_ADC_RTD_CURVE_EUROPEAN,
-                        .gain = ADMW1001_ADC_GAIN_1X,
-                        .current = {
-                            .excitationState= ADMW1001_ADC_EXC_STATE_ALWAYS_ON,
-                            .outputLevel = ADMW1001_ADC_EXC_CURRENT_250uA,
-                            .diodeRatio = 0,
-                        },
-                        .filter = {
-                            .type = ADMW1001_ADC_FILTER_SINC3,
-                            .sf = ADMW1001_SF_8P24HZ,
-                            .chopMode = ADMW1001_CHOP_MD_SW,
-                            .notch1p2 = false,
-                            .groundSwitch = ADMW1001_ADC_GND_SW_OPEN
-                        },
-                        .reference = ADMW1001_ADC_REFERENCE_VOLTAGE_INTERNAL,
-                    },
-                },
-                [ADMW1001_CH_ID_ANLG_1_DIFFERENTIAL] = {
-                    .enableChannel = true,
-                    .disablePublishing = false,
-                    .compensationChannel = ADMW1001_CH_ID_ANLG_1_UNIVERSAL,
-                    .lutSelect = ADMW1001_LUT_DEFAULT,
-                    .measurementUnit = ADMW1001_MEASUREMENT_UNIT_FAHRENHEIT,
-                    .lowThreshold = -58,
-                    .highThreshold = 482,
-                    .offsetAdjustment = 0.0,
-                    .gainAdjustment = 0.0,
-                    .sensorParameter = 0.0,
-                    .measurementsPerCycle = 10,
-                    .cycleSkipCount = 0,
-                    .extraSettlingTime = 4499.99986449257,
-                    .priority = 0,
-                    .adcChannelConfig = {
-                        .sensor = ADMW1001_ADC_SENSOR_THERMOCOUPLE_K,
-                        .rtdCurve = ADMW1001_ADC_RTD_CURVE_EUROPEAN,
-                        .gain = ADMW1001_ADC_GAIN_8X,
-                        .current = {
-                            .excitationState= ADMW1001_ADC_EXC_STATE_CYCLE_POWER,
-                            .outputLevel = ADMW1001_ADC_EXC_CURRENT_EXTERNAL,
-                            .diodeRatio = 0,
-                        },
-                        .filter = {
-                            .type = ADMW1001_ADC_FILTER_SINC3,
-                            .sf = ADMW1001_SF_8P24HZ,
-                            .chopMode = ADMW1001_CHOP_MD_SW,
-                            .notch1p2 = false,
-                            .groundSwitch = ADMW1001_ADC_GND_SW_OPEN
-                        },
-                        .reference = ADMW1001_ADC_REFERENCE_VOLTAGE_INTERNAL,
-                    },
-                },
-            [ADMW1001_CH_ID_DIG_I2C_0] = {
-                .enableChannel = true,
-                .disablePublishing = false,
-                .compensationChannel = ADMW1001_CH_ID_NONE,
-                .measurementsPerCycle = 10,
-                .extraSettlingTime = 15000,
-                .i2cChannelConfig = {
-                    .sensor = ADMW1001_I2C_SENSOR_HUMIDITY_B,
-                    .deviceAddress = 0x44,
-                },
-            },
-        },
-            },
-};
-