Vybhav Kadaba
Code clean up, removed unwanted enums and configurations
Diff: inc/admw1001/admw1001_config.h
- Revision:
- 6:9d393a9677f4
- Parent:
- 5:0728bde67bdb
- Child:
- 8:2f2775c34640
--- a/inc/admw1001/admw1001_config.h Wed Jun 05 05:39:15 2019 +0000
+++ b/inc/admw1001/admw1001_config.h Sat Jun 15 14:30:49 2019 +0000
@@ -1,5 +1,5 @@
/*
-Copyright 2018 (c) Analog Devices, Inc.
+Copyright 2019 (c) Analog Devices, Inc.
All rights reserved.
@@ -33,45 +33,6 @@
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/*
-Copyright (c) 2017 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.
- - Modified versions of the software must be conspicuously marked as such.
- - This software is licensed solely and exclusively for use with processors
- manufactured by or for Analog Devices, Inc.
- - This software may not be combined or merged with other code in any manner
- that would cause the software to become subject to terms and conditions
- which differ from those listed here.
- - 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.
-
-THIS SOFTWARE IS PROVIDED BY ANALOG DEVICES, INC. AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, NON-INFRINGEMENT,
-TITLE, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
-NO EVENT SHALL ANALOG DEVICES, INC. OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, PUNITIVE OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, DAMAGES ARISING OUT OF CLAIMS OF INTELLECTUAL
-PROPERTY RIGHTS INFRINGEMENT; 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: admw1001_config.h
@@ -156,43 +117,21 @@
*/
} ADMW1001_DATAREADY_MODE;
-/*! ADMW1001 calibration mode options */
-typedef enum {
- ADMW1001_NO_CALIBRATION = 0,
- /*!< No full scale ADC calibration is performed after a latch command is sent.
- */
- ADMW1001_DO_CALIBRATION,
- /*!< Full scale ADC Calibration is performed after a latch command is sent.
- */
-} ADMW1001_CALIBRATION_MODE;
-
/*! ADMW1001 power mode options */
typedef enum {
- ADMW1001_POWER_MODE_LOW = 1,
- /*!< Lowest ADC power consumption mode, with lowest conversion rate */
- ADMW1001_POWER_MODE_MID,
- /*!< Medium ADC power consumption mode, with medium conversion rate */
- ADMW1001_POWER_MODE_FULL,
- /*!< Highest ADC power consumption mode, with highest conversion rate */
+ ADMW1001_POWER_MODE_HIBERNATION = 0,
+ /*!< module has entede hibernation mode. All analog circuitry is disabled. All peripherals disabled apart from the Wake-up pin functionality. */
+ ADMW1001_POWER_MODE_ACTIVE,
+ /*!< Part is fully powered up and either cycling through a sequence or awaiting a configuration */
} ADMW1001_POWER_MODE;
-/*! ADMW1001 measurement cycle types */
-typedef enum
-{
- ADMW1001_CYCLE_TYPE_SWITCH = 0,
- /*!< Switch channels after every conversion */
- ADMW1001_CYCLE_TYPE_FULL = 1
- /*!< Perform full number of requested conversions on a channel
- * consecutively before switching to the next channel */
-} ADMW1001_CYCLE_TYPE;
-
#ifdef __V2_3_CFG_FMT__
/*! ADMW1001 measurement analog filter settling options */
typedef enum
{
ADMW1001_FILTER_SETTLING_ALWAYS = 0,
/*!< Allow full settling time to elapse between every measurement from an analog sensor */
- ADMW1001_FILTER_SETTLING_FAST = 1
+ ADMW1001_FILTER_SETTLING_FAST,
/*!< Skip settling time between consecutive measurements from an analog sensor */
} ADMW1001_FILTER_SETTLING;
#endif
@@ -229,7 +168,7 @@
ADMW1001_OPEN_SENSOR_DIAGNOSTICS_PER_100_CYCLES,
/*!< No Open-Sensor Detection is performed at intervals of 100 cycles */
ADMW1001_OPEN_SENSOR_DIAGNOSTICS_PER_1000_CYCLES,
- /*!< No Open-Sensor Detection is performed at intervals of 1000 cycles */
+ /*!< No Open-Sensor Detection is performed at intervals of 1001 cycles */
} ADMW1001_OPEN_SENSOR_DIAGNOSTICS;
/*! ADMW1001 analog input signal amplification gain options
@@ -237,6 +176,20 @@
* @note applicable only to ADC analog sensor channels
*/
typedef enum {
+ ADMW1001_ADC_RTD_CURVE_EUROPEAN = 0,
+ /*!< EUROPEAN RTD curve used. */
+ ADMW1001_ADC_RTD_CURVE_AMERICAN,
+ /*!< AMERICAN RTD curve used. */
+ ADMW1001_ADC_RTD_CURVE_JAPANESE,
+ /*!< JAPANESE RTD curve used. */
+ ADMW1001_ADC_RTD_CURVE_ITS90,
+ /*!< ITS90 RTD curve used. */
+} ADMW1001_ADC_RTD_CURVE;
+/*! ADMW1001 analog input signal amplification gain options
+ *
+ * @note applicable only to ADC analog sensor channels
+ */
+typedef enum {
ADMW1001_ADC_GAIN_1X = 0,
/*!< no amplification gain */
ADMW1001_ADC_GAIN_2X,
@@ -255,14 +208,26 @@
/*!< x128 amplification gain */
} ADMW1001_ADC_GAIN;
+/*! ADMW1001 analog sensor excitation state options
+ *
+ * @note applicable only to ADC analog sensor channels, and
+ * specific sensor types
+ */
+typedef enum {
+ ADMW1001_ADC_EXC_STATE_ALWAYS_ON,
+ /*!< Excitation for measurement is always on */
+ ADMW1001_ADC_EXC_STATE_CYCLE_POWER,
+ /*!< Excitation for measurement is active only during measurement */
+} ADMW1001_ADC_EXC_STATE;
+
/*! ADMW1001 analog sensor excitation current output level options
*
* @note applicable only to ADC analog sensor channels, and
* specific sensor types
*/
typedef enum {
- ADMW1001_ADC_EXC_CURRENT_NONE = 0,
- /*!< Excitation current disabled */
+ ADMW1001_ADC_EXC_CURRENT_EXTERNAL = 0,
+ /*!< External excitation is provided */
ADMW1001_ADC_EXC_CURRENT_50uA,
/*!< 50uA excitation current enabled */
ADMW1001_ADC_EXC_CURRENT_100uA,
@@ -271,8 +236,6 @@
/*!< 250uA excitation current enabled */
ADMW1001_ADC_EXC_CURRENT_500uA,
/*!< 500uA excitation current enabled */
- ADMW1001_ADC_EXC_CURRENT_750uA,
- /*!< 750uA excitation current enabled */
ADMW1001_ADC_EXC_CURRENT_1000uA,
/*!< 1mA excitation current enabled */
} ADMW1001_ADC_EXC_CURRENT;
@@ -282,8 +245,22 @@
* @note applicable only to a diode sensor
*/
typedef enum {
- ADMW1001_ADC_EXC_CURRENT_IOUT_DIODE_DEFAULT = 0,
- ADMW1001_ADC_EXC_CURRENT_IOUT_DIODE_MAX,
+ ADMW1001_ADC_EXC_CURRENT_IOUT_DIODE_10UA_100UA = 0,
+ /**< 2 Current measurement 10uA 100uA */
+ ADMW1001_ADC_EXC_CURRENT_IOUT_DIODE_20UA_160UA,
+ /**< 2 Current measurement 20uA 160uA */
+ ADMW1001_ADC_EXC_CURRENT_IOUT_DIODE_50UA_300UA,
+ /**< 2 Current measurement 50uA 300uA */
+ ADMW1001_ADC_EXC_CURRENT_IOUT_DIODE_100UA_600UA,
+ /**< 2 Current measurement 100uA 600uA */
+ ADMW1001_ADC_EXC_CURRENT_IOUT_DIODE_10UA_50UA_100UA,
+ /**< 3 current measuremetn 10uA 50uA 100uA */
+ ADMW1001_ADC_EXC_CURRENT_IOUT_DIODE_20UA_100UA_160UA,
+ /**< 3 current measuremetn 20uA 100uA 160uA */
+ ADMW1001_ADC_EXC_CURRENT_IOUT_DIODE_50UA_150UA_300UA,
+ /**< 3 current measuremetn 50uA 150uA 300uA */
+ ADMW1001_ADC_EXC_CURRENT_IOUT_DIODE_100UA_300UA_600UA,
+ /**< 3 current measuremetn 100uA 300uA 600uA */
} ADMW1001_ADC_EXC_CURRENT_DIODE_RATIO;
/*! ADMW1001 analog reference selection options
@@ -298,7 +275,7 @@
ADMW1001_ADC_REFERENCE_RESISTOR_INTERNAL_1,
/*!< Internal reference resistor #1 (4320 ohms) is selected */
ADMW1001_ADC_REFERENCE_RESISTOR_INTERNAL_2,
- /*!< Internal reference resistor #2 (10000 ohms) is selected */
+ /*!< Internal reference resistor #2 (10010 ohms) is selected */
ADMW1001_ADC_REFERENCE_VOLTAGE_INTERNAL,
/*!< Internal ADC voltage reference (2.5V) is selected */
ADMW1001_ADC_REFERENCE_VOLTAGE_AVDD,
@@ -331,76 +308,32 @@
* (see @ref ADMW1001_ADC_SENSOR_TYPE) */
} ADMW1001_ADC_REFERENCE_TYPE;
+/*! ADMW1001 ADC Reference configuration
+ *
+ * @note applicable only to ADC analog sensor channels
+ */
+typedef enum {
+ ADMW1001_ADC_GND_SW_OPEN = 0,
+ /*!< Ground switch not enabled for measurement. */
+ ADMW1001_ADC_GND_SW_CLOSED,
+ /*!< Ground switch closed for measurement. */
+} ADMW1001_ADC_GND_SW;
+
/*! ADMW1001 analog filter selection options
*
* @note applicable only to ADC analog sensor channels
*/
typedef enum {
- ADMW1001_ADC_FILTER_SINC4 = 1,
+ ADMW1001_ADC_FILTER_SINC4 = 0,
/*!< SINC4 filter
*
* @note The number of input samples to be averaged by the filter
* must be specified by fs (see @ref ADMW1001_ADC_FILTER_CONFIG).
* The fs value affects the output sample rate and settling times
* of the ADC */
- ADMW1001_ADC_FILTER_FIR_20SPS,
- /*!< FIR post filter, producing a 20sps output sample rate */
- ADMW1001_ADC_FILTER_FIR_25SPS,
- /*!< FIR post filter, producing a 25sps output sample rate */
+ ADMW1001_ADC_FILTER_SINC3,
} ADMW1001_ADC_FILTER_TYPE;
-/*! ADMW1001 FFT sequence mode options
- *
- * @note applicable only for FFT measurement modes
- */
-typedef enum {
- ADMW1001_FFT_MODE_SINGLE = 0,
- /*!< Performs a single sequence of FFTs on selected channels and stops */
- ADMW1001_FFT_MODE_CONTINUOUS,
- /*!< Performs continuous sequences of FFTs on selected channels */
-} ADMW1001_FFT_MODE;
-
-/*! ADMW1001 FFT size options (number of bins)
- *
- * @note applicable only for FFT measurement modes
- */
-typedef enum {
- ADMW1001_FFT_SIZE_256 = 0,
- /*!< 256 bins */
- ADMW1001_FFT_SIZE_512,
- /*!< 512 bins */
- ADMW1001_FFT_SIZE_1024,
- /*!< 1024 bins */
- ADMW1001_FFT_SIZE_2048,
- /*!< 2048 bins */
-} ADMW1001_FFT_SIZE;
-
-/*! ADMW1001 FFT window type options
- *
- * @note applicable only for FFT measurement modes
- */
-typedef enum {
- ADMW1001_FFT_WINDOW_NONE = 0,
- /*!< No Window */
- ADMW1001_FFT_WINDOW_HANN,
- /*!< Hann Window */
- ADMW1001_FFT_WINDOW_BLACKMAN_HARRIS,
- /*!< Blackman-Harris Window */
-} ADMW1001_FFT_WINDOW;
-
-/*! ADMW1001 FFT output format options
- *
- * @note applicable only for FFT measurement modes
- */
-typedef enum {
- ADMW1001_FFT_OUTPUT_FULL = 0,
- /*!< N/2-Term Amplitude Response */
- ADMW1001_FFT_OUTPUT_FULL_WITH_RAW,
- /**< N/2-Term Amplitude Response Plus N Raw ADC Samples */
- ADMW1001_FFT_OUTPUT_MAX16,
- /*!< Bin-Number and Amplitude of 16 Highest Peaks of Amplitude Response */
-} ADMW1001_FFT_OUTPUT;
-
/*! ADMW1001 I2C clock speed options
*
* @note applicable only for I2C sensors
@@ -413,56 +346,6 @@
/*!< 400kHz I2C clock speed */
} ADMW1001_DIGITAL_SENSOR_COMMS_I2C_CLOCK_SPEED;
-/*! ADMW1001 UART baud rate options
- *
- * @note applicable only for UART sensors
- */
-typedef enum
-{
- ADMW1001_DIGITAL_SENSOR_COMMS_UART_BAUD_RATE_115200 = 0,
- /*!< 115200 UART baud rate */
- ADMW1001_DIGITAL_SENSOR_COMMS_UART_BAUD_RATE_57600,
- /*!< 57600 UART baud rate */
- ADMW1001_DIGITAL_SENSOR_COMMS_UART_BAUD_RATE_38400,
- /*!< 38400 UART baud rate */
- ADMW1001_DIGITAL_SENSOR_COMMS_UART_BAUD_RATE_19200,
- /*!< 19200 UART baud rate */
- ADMW1001_DIGITAL_SENSOR_COMMS_UART_BAUD_RATE_9600,
- /*!< 9600 UART baud rate */
- ADMW1001_DIGITAL_SENSOR_COMMS_UART_BAUD_RATE_4800,
- /*!< 4800 UART baud rate */
- ADMW1001_DIGITAL_SENSOR_COMMS_UART_BAUD_RATE_2400,
- /*!< 2400 UART baud rate */
- ADMW1001_DIGITAL_SENSOR_COMMS_UART_BAUD_RATE_1200,
- /*!< 1200 UART baud rate */
-} ADMW1001_DIGITAL_SENSOR_COMMS_UART_BAUD_RATE;
-
-/*! ADMW1001 UART line config options
- *
- * @note applicable only for UART sensors
- */
-typedef enum
-{
- ADMW1001_DIGITAL_SENSOR_COMMS_UART_LINE_CONFIG_8N1 = 0,
- /*!< UART line control 8 data bits / no parity / 1 stop bit */
- ADMW1001_DIGITAL_SENSOR_COMMS_UART_LINE_CONFIG_8N2,
- /*!< UART line control 8 data bits / no parity / 2 stop bits */
- ADMW1001_DIGITAL_SENSOR_COMMS_UART_LINE_CONFIG_8N3,
- /*!< UART line control 8 data bits / no parity / 3 stop bits */
- ADMW1001_DIGITAL_SENSOR_COMMS_UART_LINE_CONFIG_8E1,
- /*!< UART line control 8 data bits / even parity / 1 stop bit */
- ADMW1001_DIGITAL_SENSOR_COMMS_UART_LINE_CONFIG_8E2,
- /*!< UART line control 8 data bits / even parity / 2 stop bits */
- ADMW1001_DIGITAL_SENSOR_COMMS_UART_LINE_CONFIG_8E3,
- /*!< UART line control 8 data bits / even parity / 3 stop bits */
- ADMW1001_DIGITAL_SENSOR_COMMS_UART_LINE_CONFIG_8O1,
- /*!< UART line control 8 data bits / odd parity / 1 stop bit */
- ADMW1001_DIGITAL_SENSOR_COMMS_UART_LINE_CONFIG_8O2,
- /*!< UART line control 8 data bits / odd parity / 2 stop bits */
- ADMW1001_DIGITAL_SENSOR_COMMS_UART_LINE_CONFIG_8O3,
- /*!< UART line control 8 data bits / odd parity / 3 stop bits */
-} ADMW1001_DIGITAL_SENSOR_COMMS_UART_LINE_CONFIG;
-
/*! ADMW1001 SPI mode options
*
* @note applicable only for SPI sensors
@@ -543,22 +426,16 @@
/*!< Operating mode - specifies how measurement cycles are scheduled */
ADMW1001_DATAREADY_MODE dataReadyMode;
/*!< Data read mode - specifies how output samples are stored for reading */
- ADMW1001_CALIBRATION_MODE calibrationMode;
- /*!< Calibration mode - specifies if adc calibration is performed after a latch command */
ADMW1001_MULTICYCLE_CONFIG multiCycleConfig;
/*!< Multi-Cycle configuration - specifies how bursts of measurement cycles
* are scheduled. Applicable only when operatingMode is
* ADMW1001_OPERATING_MODE_MULTICYCLE
*/
- uint32_t cycleInterval;
+ uint32_t cycleInterval;
/*!< Cycle interval - specifies the time interval between the start of each
* successive measurement cycle. Applicable only when operatingMode is
* not ADMW1001_OPERATING_MODE_SINGLECYCLE
*/
- ADMW1001_CYCLE_TYPE cycleType;
- /*!< Cycle type - specifies how the channel list is traversed with each
- * conversion during the cycle.
- */
#ifdef __V2_3_CFG_FMT__
ADMW1001_FILTER_SETTLING filterSettling;
/*!< Analog filter settling - specifies the policy for settling time
@@ -574,13 +451,6 @@
* ADMW1001_ADC_REFERENCE_RESISTOR_EXTERNAL_1 or
* ADMW1001_ADC_REFERENCE_VOLTAGE_EXTERNAL_1
* (see @ref ADMW1001_ADC_REFERENCE_TYPE)
- */
- float32_t externalRef2Value;
- /*!< Resistance/voltage value connected to external reference input #2.
- * Applicable only if the selected reference type is
- * ADMW1001_ADC_REFERENCE_RESISTOR_EXTERNAL_2 or
- * ADMW1001_ADC_REFERENCE_VOLTAGE_EXTERNAL_2
- * (see @ref ADMW1001_ADC_REFERENCE_TYPE)
*/
bool enableExternalFlash;
/*!< Enable the use of external flash memory for storage of samples.
@@ -593,6 +463,8 @@
* specific sensor types
*/
typedef struct {
+ ADMW1001_ADC_EXC_STATE excitationState;
+ /*!< Excitation current state */
ADMW1001_ADC_EXC_CURRENT outputLevel;
/*!< Excitation current output level */
ADMW1001_ADC_EXC_CURRENT_DIODE_RATIO diodeRatio;
@@ -606,9 +478,14 @@
typedef struct {
ADMW1001_ADC_FILTER_TYPE type;
/*!< Filter type selection */
- uint32_t fs;
- /*!< Number of input samples to accumulate and average in the filter.
- * Applicable only when type is ADMW1001_ADC_FILTER_SINC4 */
+ uint32_t sf;
+ /*!< SF value used along with filter type to determine speed */
+ bool filterChop;
+ /*!< Enable filter chop */
+ bool notch1p2;
+ /*!< Enable Notch 2 Filter Mode */
+ ADMW1001_ADC_GND_SW groundSwitch;
+ /*!< Option to open or close sensor ground switch */
} ADMW1001_ADC_FILTER_CONFIG;
/*! ADMW1001 ADC Referemce configuration
@@ -616,10 +493,8 @@
* @note applicable only to ADC analog sensor channels
*/
typedef struct {
- ADMW1001_ADC_REFERENCE_TYPE type;
+ ADMW1001_ADC_REFERENCE_TYPE type;
/*!< Filter type selection */
- bool disableBuffer;
- /*!< Option to disable internal ADC reference buffer */
} ADMW1001_ADC_REFERENCE_CONFIG;
/*! ADMW1001 ADC analog channel configuration details
@@ -629,6 +504,8 @@
typedef struct {
ADMW1001_ADC_SENSOR_TYPE sensor;
/*!< Sensor type selection */
+ ADMW1001_ADC_RTD_CURVE rtdCurve;
+ /*!< Rtd curve selection */
ADMW1001_ADC_GAIN gain;
/*!< ADC Gain selection */
ADMW1001_ADC_EXC_CURRENT_CONFIG current;
@@ -637,7 +514,7 @@
/*!< ADC Filter configuration */
ADMW1001_ADC_REFERENCE_CONFIG reference;
/*!< ADC Reference configuration */
- bool enableVbias;
+ bool enableVbias;
/*!< Option to enable internal ADC voltage bias */
} ADMW1001_ADC_CHANNEL_CONFIG;
@@ -715,10 +592,6 @@
/*!< Optional parameter to configure specific spi mode for spi sensor */
ADMW1001_DIGITAL_SENSOR_COMMS_SPI_CLOCK spiClock;
/*!< Optional parameter to configure specific spi clock for spi sensor */
- ADMW1001_DIGITAL_SENSOR_COMMS_UART_BAUD_RATE uartBaudRate;
- /*!< Optional parameter to configure specific uart baud rate for uart sensor */
- ADMW1001_DIGITAL_SENSOR_COMMS_UART_LINE_CONFIG uartLineConfig;
- /*!< Optional parameter to configure specific uart line control for uart sensor */
} ADMW1001_DIGITAL_SENSOR_COMMS;
/*! ADMW1001 I2C digital channel configuration details
@@ -795,33 +668,11 @@
*/
} ADMW1001_SPI_CHANNEL_CONFIG;
-/*! ADMW1001 UART digital channel configuration details
- *
- * @note applicable only to UART digital sensor channels
- */
-typedef struct {
- ADMW1001_UART_SENSOR_TYPE sensor;
- /*!< Sensor type selection */
- ADMW1001_DIGITAL_CALIBRATION_COMMAND digitalCalibrationParam;
- /*!< This is used to supply an independently established environmental variable
- * that must be used during calibration of a [digital] sensor which a)
- * supports calibration and b) expects an environmental parameter.
- * An example is a CO2 sensor, which may require the CO2 concentration level
- * when performing a calibration
- */
- ADMW1001_DIGITAL_SENSOR_COMMS configureComms;
- /*!< Optional configuration to setup a user communication config.
- * A default configuration will be used if this is not specified.
- * Applicable only to specific UART sensor types.
- */
-} ADMW1001_UART_CHANNEL_CONFIG;
/*! ADMW1001 Measurement Channel configuration details */
typedef struct {
bool enableChannel;
/*!< Option to include this channel in normal measurement cycles */
- bool enableFFT;
- /*!< Option to include this channel in FFT measurement cycles */
bool disablePublishing;
/*!< Option to disable publishing of data samples from this channel. The
* channel may still be included in measurement cycles, but data samples
@@ -829,7 +680,7 @@
* used for channels which are required only as a compensation reference
* for another channel (e.g. Cold-Junction Compensation channels).
*/
- ADMW1001_CHANNEL_ID compensationChannel;
+ ADMW1001_CHANNEL_ID compensationChannel;
/*!< Optional compensation channel. Set to ADMW1001_CHANNEL_ID_NONE if not
* required. Typically used for thermocouple sensors that require a
* separate measurement of the "cold-junction" temperature, which can be
@@ -840,7 +691,7 @@
* fundamental measurement for the sensor (typically mV or Ohms)
* would be returned as the measurement result.
*/
- ADMW1001_MEASUREMENT_UNIT measurementUnit;
+ ADMW1001_MEASUREMENT_UNIT measurementUnit;
/*!< Optional measurement unit selection for conversion results. Applicable
* only for certain sensor types. Set to
* ADMW1001_MEASUREMENT_UNIT_DEFAULT if not applicable.
@@ -887,7 +738,7 @@
* on the sensor type. However, additional settling time (microseconds)
* can optionally be specified. Set to 0 if not required.
*/
- ADMW1001_CHANNEL_PRIORITY priority;
+ ADMW1001_CHANNEL_PRIORITY priority;
/*!< By default, channels are arranged in the measurement sequence based on
* ascending order of channel ID. However, a priority-level may be
* specified per channel to force a different ordering of the channels,
@@ -903,12 +754,10 @@
/*!< I2C channel configuration - applicable only to I2C channels */
ADMW1001_SPI_CHANNEL_CONFIG spiChannelConfig;
/*!< SPI channel configuration - applicable only to SPI channels */
- ADMW1001_UART_CHANNEL_CONFIG uartChannelConfig;
- /*!< UART channel configuration - applicable only to UART channels */
};
- /*!< Only one of adcChannelConfig, i2cChannelConfig, spiChannelConfig or
- * uartChannelConfig is required, depending on the channel designation
- * (analog, I2C, SPI or UART)
+ /*!< Only one of adcChannelConfig, i2cChannelConfig, spiChannelConfig
+ * is required, depending on the channel designation
+ * (analog, I2C, SPI)
*/
} ADMW1001_CHANNEL_CONFIG;
@@ -934,18 +783,6 @@
/*!< Option to enable Open-Circuit Detection at a selected cycle interval */
} ADMW1001_DIAGNOSTICS_CONFIG;
-/*! ADMW1001 FFT Measurement Mode configuration options */
-typedef struct {
- ADMW1001_FFT_MODE mode;
- /*!< FFT sequence mode */
- ADMW1001_FFT_SIZE size;
- /*!< FFT size selection */
- ADMW1001_FFT_WINDOW window;
- /*!< FFT window type selection */
- ADMW1001_FFT_OUTPUT output;
- /*!< FFT output type selection */
-} ADMW1001_FFT_CONFIG;
-
#ifdef __V2_3_CFG_FMT__
typedef uint16_t ADMW1001_ADVANCED_ACCESS_KEY;
#endif
@@ -957,8 +794,6 @@
ADMW1001_MEASUREMENT_CONFIG measurement;
/*!< Measurement configuration details */
ADMW1001_DIAGNOSTICS_CONFIG diagnostics;
- /*!< Diagnostics configuration details */
- ADMW1001_FFT_CONFIG fft;
/*!< FFT configuration details */
ADMW1001_CHANNEL_CONFIG channels[ADMW1001_MAX_CHANNELS];
/*!< Channel-specific configuration details */
@@ -977,4 +812,3 @@
*/
#endif /* __ADMW1001_CONFIG_H__ */
-