Diff: inc/admw1001/admw1001_sensor_types.h

Revision:

6:9d393a9677f4

Parent:

5:0728bde67bdb

Child:

8:2f2775c34640

--- a/inc/admw1001/admw1001_sensor_types.h	Wed Jun 05 05:39:15 2019 +0000
+++ b/inc/admw1001/admw1001_sensor_types.h	Sat Jun 15 14:30:49 2019 +0000
@@ -1,5 +1,5 @@
 /*
-Copyright 2017 (c) Analog Devices, Inc.
+Copyright 2019 (c) Analog Devices, Inc.
 
 All rights reserved.
 
@@ -54,24 +54,17 @@
 /*! ADMW1001 measurement channel identifiers */
 typedef enum {
     ADMW1001_CHANNEL_ID_NONE  = -1,
-    /*!< Used to indicate when no channel is selected (e.g. compensation channel) */
+    /*!< Used to indicate when no channel is selected*/
 
-    ADMW1001_CHANNEL_ID_CJC_0 = 0,
-    /*!< Cold-Juction Compensation channel #0 */
-    ADMW1001_CHANNEL_ID_CJC_1,
-    /*!< Cold-Juction Compensation channel #1 */
-    ADMW1001_CHANNEL_ID_SENSOR_0,
-    /*!< Analog Sensor channel #0 */
-    ADMW1001_CHANNEL_ID_SENSOR_1,
-    /*!< Analog Sensor channel #1 */
-    ADMW1001_CHANNEL_ID_SENSOR_2,
-    /*!< Analog Sensor channel #2 */
-    ADMW1001_CHANNEL_ID_SENSOR_3,
-    /*!< Analog Sensor channel #3 */
-    ADMW1001_CHANNEL_ID_VOLTAGE_0,
-    /*!< Analog 0-10V Voltage Sensor channel #0 */
-    ADMW1001_CHANNEL_ID_CURRENT_0,
-    /*!< Analog 4-20mA Current Sensor channel #0 */
+    ADMW1001_CHANNEL_ID_ANALOG_1_UNIVERSAL = 0,
+    /*!< Universal channel 1 universal channel */
+    ADMW1001_CHANNEL_ID_ANALOG_2_UNIVERSAL,
+    /*!< Universal channel 2 universal channel */   
+    ADMW1001_CHANNEL_ID_ANALOG_1_DIFFERENTIAL,
+    /*!< Universal channel 1 differential channel */
+    ADMW1001_CHANNEL_ID_ANALOG_2_DIFFERENTIAL,
+    /*!< Universal channel 2 differential channel */ 
+    
     ADMW1001_CHANNEL_ID_I2C_0,
     /*!< Digital I2C Sensor channel #0 */
     ADMW1001_CHANNEL_ID_I2C_1,
@@ -82,8 +75,6 @@
     /*!< Digital SPI Sensor channel #1 */
     ADMW1001_CHANNEL_ID_SPI_2,
     /*!< Digital SPI Sensor channel #2 */
-    ADMW1001_CHANNEL_ID_UART,
-    /*!< Digital UART Sensor channel #0 */
 
     ADMW1001_MAX_CHANNELS,
     /*!< Maximum number of measurement channels on ADMW1001 */
@@ -416,7 +407,7 @@
      * @note For use with Analog Sensor channels only
      */
     ADMW1001_ADC_SENSOR_THERMISTOR_A_10K_DEF_L1 = 128,
-    /*!< Standard 10kOhm NTC Thermistor temperature sensor with Steinhart–Hart
+    /*!< Standard 10kOhm NTC Thermistor temperature sensor with Steinhart–Hart
      *   linearisation equation and default configuration options
      *
      * @note For use with Analog Sensor channels only
@@ -452,7 +443,7 @@
      * @note For use with Analog Sensor channels only
      */
     ADMW1001_ADC_SENSOR_THERMISTOR_A_10K_ADV_L1 = 144,
-    /*!< 10kOhm NTC Thermistor temperature sensor with Steinhart–Hart
+    /*!< 10kOhm NTC Thermistor temperature sensor with Steinhart–Hart
      *   linearisation equation and advanced configuration options
      *
      * @note For use with Analog Sensor channels only
@@ -987,64 +978,6 @@
      */
 } ADMW1001_SPI_SENSOR_TYPE;
 
-/*! ADMW1001 UART digital sensor type options
- *
- *  Select the sensor type that is connected to an UART digital measurement
- *  channel.
- *
- *  @note These are pre-defined sensors using built-in linearisation data
- */
-typedef enum {
-    ADMW1001_UART_SENSOR_UART_CO2_A_DEF_L1 = 3584,
-    /*!< COZIR AMB 2,000 ppm CO2 Sensor with default linearisation
-     * and default configuration options
-     *
-     * @note For use with UART Digital Sensor channels only
-     */
-    ADMW1001_UART_SENSOR_UART_CO2_B_DEF_L1 = 3585,
-    /*!< COZIR LP Miniature 5,000ppm CO2 Sensor with default linearisation
-     * and default configuration options
-     *
-     * @note For use with UART Digital Sensor channels only
-     */
-    ADMW1001_UART_SENSOR_UART_CO2_A_DEF_L2 = 3592,
-    /*!< COZIR AMB 2,000 ppm CO2 Sensor with user-defined linearisation
-     * and default configuration options
-     *
-     * @note For use with UART Digital Sensor channels only
-     */
-    ADMW1001_UART_SENSOR_UART_CO2_B_DEF_L2 = 3593,
-    /*!< COZIR LP Miniature 5,000ppm CO2 Sensor with user-defined linearisation
-     * and default configuration options
-     *
-     * @note For use with UART Digital Sensor channels only
-     */
-    ADMW1001_UART_SENSOR_UART_CO2_A_ADV_L1 = 3600,
-    /*!< COZIR AMB 2,000 ppm CO2 Sensor with default linearisation
-     * and advanced configuration options
-     *
-     * @note For use with UART Digital Sensor channels only
-     */
-    ADMW1001_UART_SENSOR_UART_CO2_B_ADV_L1 = 3601,
-    /*!< COZIR LP Miniature 5,000ppm CO2 Sensor with default linearisation
-     * and advanced configuration options
-     *
-     * @note For use with UART Digital Sensor channels only
-     */
-    ADMW1001_UART_SENSOR_UART_CO2_A_ADV_L2 = 3608,
-    /*!< COZIR AMB 2,000 ppm CO2 Sensor with user-defined linearisation
-     * and advanced configuration options
-     *
-     * @note For use with UART Digital Sensor channels only
-     */
-    ADMW1001_UART_SENSOR_UART_CO2_B_ADV_L2 = 3609,
-    /*!< COZIR LP Miniature 5,000ppm CO2 Sensor with user-defined linearisation
-     * and advanced configuration options
-     *
-     * @note For use with UART Digital Sensor channels only
-     */
-} ADMW1001_UART_SENSOR_TYPE;
-
 #ifdef __cplusplus
 }
 #endif
@@ -1054,4 +987,3 @@
  */
 
 #endif /* __ADMW1001_SENSOR_TYPES_H__ */
-