Revision 11:8e6023d2e584, committed 2019-07-15

Comitter:

Vkadaba

Date:

Mon Jul 15 13:04:34 2019 +0000

Parent:

10:14954555be2a

Child:

12:8f21099b8028

Commit message:

sensor2_bridge_4w_load_cell_config.c file is updated and able to download the bin file .

Changed in this revision

--- a/inc/admw1001/admw1001_config.h	Fri Jun 21 10:53:09 2019 +0000
+++ b/inc/admw1001/admw1001_config.h	Mon Jul 15 13:04:34 2019 +0000
@@ -551,6 +551,7 @@
     ADMW1001_ADC_FILTER_CONFIG      filter;
     /*!< ADC Filter configuration */
     ADMW1001_ADC_REFERENCE_TYPE     reference;
+    bool                        vBiasEnable;
     /*!< ADC Reference configuration */
     uint8_t                         reserved0[3];
     /*!< Reserved for future use and ensure word alignment. */

--- a/main.cpp	Fri Jun 21 10:53:09 2019 +0000
+++ b/main.cpp	Mon Jul 15 13:04:34 2019 +0000
@@ -93,7 +93,7 @@
 extern ADMW_CONFIG multichannel_singlecycle_config;
 
 /* Change the following pointer to select any of the configurations above */
-static ADMW_CONFIG *pSelectedConfig = &sensor2_typeT_cjc0_config;
+static ADMW_CONFIG *pSelectedConfig = &sensor1_rtd_3w_pt100_config;
 
 static ADMW_CONNECTION connectionInfo = PLATFORM_CONNECTION_INFO;
 

--- a/sensor1_rtd-3w-pt100_config.c	Fri Jun 21 10:53:09 2019 +0000
+++ b/sensor1_rtd-3w-pt100_config.c	Mon Jul 15 13:04:34 2019 +0000
@@ -62,10 +62,10 @@
                 .measurementsPerCycle = 10,
                 .extraSettlingTime = 0,
                 .adcChannelConfig = {
-                    .sensor = ADMW1001_ADC_SENSOR_RTD_3WIRE_PT100,
+                    .sensor = ADMW1001_ADC_SENSOR_RTD_3WIRE_PT1000,
                     .gain = ADMW1001_ADC_GAIN_8X,
                     .current = {
-                        .outputLevel = ADMW1001_ADC_EXC_CURRENT_250uA,
+                        .outputLevel = ADMW1001_ADC_EXC_CURRENT_100uA,
                     },
                     .filter = {
                         .type = ADMW1001_ADC_FILTER_SINC3,

--- a/sensor2_bridge-6w-pressure_config.c	Fri Jun 21 10:53:09 2019 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/*
-Copyright 2017 (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 sensor2_bridge_6w_pressure_config = {
-    .versionId = { .major = 1, .minor = 4 },
-    .productId = ADMW_PRODUCT_ID_ADMW1001,
-    .admw1001 = {
-        .power = {
-            .powerMode = ADMW1001_POWER_MODE_ACTIVE,
-        },
-        .measurement = {
-            .operatingMode = ADMW1001_OPERATING_MODE_SINGLECYCLE,
-            .dataReadyMode = ADMW1001_DATAREADY_PER_CYCLE,
-        },
-        .channels = {
-            [ADMW1001_CH_ID_ANLG_1_UNIVERSAL] = {
-                .enableChannel = true,
-                .disablePublishing = false,
-                .compensationChannel = ADMW1001_CH_ID_NONE,
-                .measurementsPerCycle = 10,
-                .extraSettlingTime = 0,
-                .adcChannelConfig = {
-                    .sensor = ADMW1001_ADC_SENSOR_BRIDGE_6WIRE_1,
-                    .gain = ADMW1001_ADC_GAIN_1X,
-                    .filter = {
-                        .type = ADMW1001_ADC_FILTER_SINC4,
-                    },
-                    .reference = {
-                        ADMW1001_ADC_REFERENCE_VOLTAGE_AVDD,
-                    },
-                },
-            },
-        },
-    },
-};

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sensor2_bridge_4w_load_cell_config.c	Mon Jul 15 13:04:34 2019 +0000
@@ -0,0 +1,94 @@
+/*
+Copyright 2017 (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 "inc/admw_config_types.h"
+
+ADMW_CONFIG default_config= {
+    .versionId = { .major = 1, .minor = 7 },
+    .productId = ADMW_PRODUCT_ID_ADMW1001,
+    .admw1001 = {
+        .power = {
+            .powerMode = ADMW1001_POWER_MODE_ACTIVE,
+        },
+        .measurement = {
+            .operatingMode = ADMW1001_OPERATING_MODE_SINGLECYCLE,
+            .dataReadyMode = ADMW1001_DATAREADY_PER_CYCLE,
+        .externalRef1Value = 1000.123,
+        },
+        .diagnostics = {
+            .disableGlobalDiag = true,
+            .disableMeasurementDiag = true,
+            .osdFrequency = ADMW1001_OPEN_SENSOR_DIAGNOSTICS_DISABLED,
+      },
+        .channels = {
+                [ADMW1001_CH_ID_ANLG_2_UNIVERSAL] = {
+                        .enableChannel = true,
+                .measurementsPerCycle = 1,
+                        .extraSettlingTime = 0.00050000002374872565,
+                .disablePublishing = false,
+                        
+                        .measurementUnit = ADMW1001_MEASUREMENT_UNIT_UNSPECIFIED,
+                        .lowThreshold = 0,
+                .highThreshold = 200,
+                        .adcChannelConfig = {
+                    .sensor = ADMW1001_ADC_SENSOR_BRIDGE_4WIRE_1,
+                    .gain = ADMW1001_ADC_GAIN_8X,
+                    .current = {
+                        .excitationState = ADMW1001_ADC_EXC_STATE_ALWAYS_ON,
+                                .outputLevel = ADMW1001_ADC_EXC_CURRENT_250uA,
+                    },
+                    .filter = {
+                        .type = ADMW1001_ADC_FILTER_SINC3,
+                        .sf = 125,
+                        .filterChop = true,
+                        .notch1p2 = false,
+                        .groundSwitch = ADMW1001_ADC_GND_SW_CLOSED,
+                    },
+                    .reference = {
+                         ADMW1001_ADC_REFERENCE_VOLTAGE_INTERNAL,
+                    },
+                    .vBiasEnable = true,
+                },
+            },
+        },
+    },
+};