Revision 58:aa9cd5072f66, committed 2020-03-16

Comitter:

Vkadaba

Date:

Mon Mar 16 09:02:06 2020 +0000

Parent:

57:c6275de14bc5

Commit message:

1.modified ADMW1001_REGISTERS_typedefs.h to support changes in sensor_types.h; 2.removed unnecessary enums from admw1001_sensor_types.h

Changed in this revision

--- a/bridge_4w_load_cell_config.c	Fri Mar 06 05:32:12 2020 +0000
+++ b/bridge_4w_load_cell_config.c	Mon Mar 16 09:02:06 2020 +0000
@@ -74,7 +74,7 @@
                 .offsetAdjustment = 0,
                 .gainAdjustment = 1,
                 .adcChannelConfig = {
-                    .sensor = ADMW1001_ADC_SENSOR_BRIDGE_4WIRE_1,
+                    .sensor = ADMW1001_ADC_SENSOR_BRIDGE_4WIRE,
                     .gain = ADMW1001_ADC_GAIN_8X,
                     .filter = {
                         .type = ADMW1001_ADC_FILTER_SINC3,

--- a/i2c0_sensirionSHT3X_config.c	Fri Mar 06 05:32:12 2020 +0000
+++ b/i2c0_sensirionSHT3X_config.c	Mon Mar 16 09:02:06 2020 +0000
@@ -66,7 +66,7 @@
                 .measurementsPerCycle = 1,
                 .extraSettlingTime = 99.5000014663674,
                 .i2cChannelConfig = {
-                    .sensor = ADMW1001_I2C_SENSOR_HUMIDITY_B,
+                    .sensor = ADMW1001_I2C_SENSOR_HUMIDITY,
                 },
             }
         },

--- a/inc/admw1001/ADMW1001_REGISTERS_typedefs.h	Fri Mar 06 05:32:12 2020 +0000
+++ b/inc/admw1001/ADMW1001_REGISTERS_typedefs.h	Mon Mar 16 09:02:06 2020 +0000
@@ -1,7 +1,7 @@
 /* ================================================================================
  
      Created by   : 
-     Created on   : 2020 Jan 15, 14:45 GMT Standard Time
+     Created on   : 2020 Mar 12, 16:15 GMT Standard Time
 
      Project      :   ADMW1001_REGISTERS
      File         :   ADMW1001_REGISTERS_typedefs.h
@@ -342,7 +342,7 @@
 {
   CORE_MODE_DRDY_PER_CONVERSION = 0,  /**< Data ready per conversion */
   CORE_MODE_DRDY_PER_CYCLE      = 1,  /**< Data ready per cycle      */
-  CORE_MODE_DRDY_PER_FIFO_FILL  = 2
+  CORE_MODE_DRDY_PER_FIFO_FILL  = 2   /**< Data ready per FIFO fill  */
 } ADMW_CORE_Mode_Drdy_Mode;
 
 
@@ -499,7 +499,7 @@
       uint8_t Alert_Active        :  1;  /**< Indicates One or More Sensor Alerts Active */
       uint8_t Error               :  1;  /**< Indicates an Error */
       uint8_t Drdy                :  1;  /**< Indicates New Sensor Result Available to Read */
-      uint8_t Cmd_Running         :  1;  /**< Indicates Special Command Active */
+      uint8_t Cmd_Running         :  1;  /**< Indicates Special Command Active, Active Low */
       uint8_t FIFO_Error          :  1;  /**< Indicates Error with FIFO */
       uint8_t Diag_Checksum_Error :  1;  /**< Indicates Error on Internal Checksum Calculations */
       uint8_t LUT_Error           :  1;  /**< Indicates Error with One or More Lookup Tables */
@@ -561,10 +561,10 @@
       uint16_t Sensor_OverRange   :  1;  /**< Indicates If the Sensor is Overrange */
       uint16_t CJ_Soft_Fault      :  1;  /**< Cold Junction Soft Fault */
       uint16_t CJ_Hard_Fault      :  1;  /**< Cold Junction Hard Fault */
-      uint16_t ADC_Input_OverRange : 1;  /**< Indicates the ADC Input is Overrange */
-      uint16_t Sensor_HardFault    : 1;  /**< Indicates Sensor Hard Fault */
-      uint16_t Threshold_Exceeded  : 1;      
-      uint16_t reserved7           :  7;
+      uint16_t ADC_Input_OverRange :  1;  /**< Indicates the ADC Input is Overrange */
+      uint16_t Sensor_HardFault    :  1;  /**< Indicates Sensor Hard Fault */
+      uint16_t Threshold_Exceeded  :  1;  /**< Channel Threshold Limits Exceeded */
+      uint16_t reserved9           :  7;
     };
     uint16_t VALUE16;
   };
@@ -673,6 +673,39 @@
 
 /*@}*/
 
+/** @defgroup EXT_VBUFF External Reference Buffer (EXT_VBUFF) Register
+ *  External Reference Buffer (EXT_VBUFF) Register.
+ *  @{
+ */
+
+/*  =========================================================================
+ *! \enum   ADMW_CORE_EXT_VBUFF_EXT_VBUFF
+ *! \brief  This field is used to configure the reference buffers (EXT_VBUFF) Enumerations
+ *  ========================================================================= */
+typedef enum
+{
+  CORE_EXT_VBUFF_BOTH_INACTIVE_MODE = 0,  /**< Both Reference Buffers Disabled */
+  CORE_EXT_VBUFF_BOTH_ACTIVE_MODE   = 1,  /**< Both Reference Buffers Enabled  */
+  CORE_EXT_VBUFF_ONLY_VPOS_MODE     = 2   /**< VREF+ Enabled Only              */
+} ADMW_CORE_EXT_VBUFF_EXT_VBUFF;
+
+
+/* ==========================================================================
+ *! \struct ADMW_CORE_EXT_VBUFF_Struct
+ *! \brief  External Reference Buffer Register bit field structure
+ * ========================================================================== */
+typedef struct _ADMW_CORE_EXT_VBUFF_t {
+  union {
+    struct {
+      uint8_t EXT_VBUFF  :  2;  /**< This field is used to configure the reference buffers */
+      uint8_t reserved2  :  6;
+    };
+    uint8_t VALUE8;
+  };
+} ADMW_CORE_EXT_VBUFF_t;
+
+/*@}*/
+
 /** @defgroup Data_FIFO FIFO Buffer of Sensor Results (Data_FIFO) Register
  *  FIFO Buffer of Sensor Results (Data_FIFO) Register.
  *  @{
@@ -881,21 +914,60 @@
  *  ========================================================================= */
 typedef enum
 {
-  CORE_SENSOR_TYPE_THERMOCOUPLE_T    = 0,     /**< Thermocouple T-Type sensor */
-  CORE_SENSOR_TYPE_THERMOCOUPLE_J    = 1,     /**< Thermocouple J-Type Sensor */
-  CORE_SENSOR_TYPE_THERMOCOUPLE_K    = 2,     /**< Thermocouple K-Type Sensor */
-  CORE_SENSOR_TYPE_RTD_2W_PT100      = 32,    /**< RTD 2 wire PT100 sensor    */
-  CORE_SENSOR_TYPE_RTD_2W_PT1000     = 33,    /**< RTD 2 wire PT1000 sensor   */
-  CORE_SENSOR_TYPE_RTD_3W_PT100      = 64,    /**< RTD 3 wire PT100 sensor    */
-  CORE_SENSOR_TYPE_RTD_3W_PT1000     = 65,    /**< RTD 3 wire PT1000 sensor   */
-  CORE_SENSOR_TYPE_RTD_4W_PT100      = 96,    /**< RTD 4 wire PT100 sensor    */
-  CORE_SENSOR_TYPE_RTD_4W_PT1000     = 97,    /**< RTD 4 wire PT1000 sensor   */
-  CORE_SENSOR_TYPE_BRIDGE_4W         = 169,   /**< Bridge 4 wire sensor       */
-  CORE_SENSOR_TYPE_VOLTAGE           = 512,   /**< Voltage Input              */
-  CORE_SENSOR_TYPE_CUSTOM1           = 1024,  /**< Custom1                    */
-  CORE_SENSOR_TYPE_I2C_HUMIDITY_B    = 2113,  /**< I2C humidity sensor B      */
-  CORE_SENSOR_TYPE_SENSOR_RESERVED_1 = 4064,  /**< RESERVED. NOT TO BE USED   */
-  CORE_SENSOR_TYPE_SENSOR_RESERVED_2 = 4095   /**< RESERVED. NOT TO BE USED   */
+  CORE_SENSOR_TYPE_THERMOCOUPLE_T                       = 0,     /**< Thermocouple T-Type sensor                        */
+  CORE_SENSOR_TYPE_THERMOCOUPLE_J                       = 1,     /**< Thermocouple J-Type Sensor                        */
+  CORE_SENSOR_TYPE_THERMOCOUPLE_K                       = 2,     /**< Thermocouple K-Type Sensor                        */
+  CORE_SENSOR_TYPE_THERMOCOUPLE_E                       = 3,     /**< Thermocouple E-Type Sensor                        */
+  CORE_SENSOR_TYPE_THERMOCOUPLE_N                       = 4,     /**< Thermocouple N-Type Sensor                        */
+  CORE_SENSOR_TYPE_THERMOCOUPLE_R                       = 5,     /**< Thermocouple R-Type Sensor                        */
+  CORE_SENSOR_TYPE_THERMOCOUPLE_S                       = 6,     /**< Thermocouple S-Type Sensor                        */
+  CORE_SENSOR_TYPE_THERMOCOUPLE_B                       = 7,     /**< Thermocouple B-Type Sensor                        */
+  CORE_SENSOR_TYPE_THERMOCOUPLE_CUSTOM                  = 8,     /**< Thermocouple CUSTOM-Type Sensor                   */
+  CORE_SENSOR_TYPE_RTD_2W_PT100                         = 32,    /**< RTD 2 wire PT100 sensor                           */
+  CORE_SENSOR_TYPE_RTD_2W_PT1000                        = 33,    /**< RTD 2 wire PT1000 sensor                          */
+  CORE_SENSOR_TYPE_RTD_2W_PT10                          = 34,    /**< RTD 2 wire PT10 sensor                            */
+  CORE_SENSOR_TYPE_RTD_2W_PT50                          = 35,    /**< RTD 2 wire PT50 sensor                            */
+  CORE_SENSOR_TYPE_RTD_2W_PT200                         = 36,    /**< RTD 2 wire PT200 sensor                           */
+  CORE_SENSOR_TYPE_RTD_2W_PT500                         = 37,    /**< RTD 2 wire PT500 sensor                           */
+  CORE_SENSOR_TYPE_RTD_2W_PT1000_0P00375                = 38,    /**< RTD 2 wire PT1000 sensor                          */
+  CORE_SENSOR_TYPE_RTD_2W_NI120                         = 39,    /**< RTD 2 wire PT1000 sensor                          */
+  CORE_SENSOR_TYPE_RTD_2W_CUSTOM                        = 40,    /**< RTD 2 wire Custom sensor                          */
+  CORE_SENSOR_TYPE_RTD_3W_PT100                         = 64,    /**< RTD 3 wire PT100 sensor                           */
+  CORE_SENSOR_TYPE_RTD_3W_PT1000                        = 65,    /**< RTD 3 wire PT1000 sensor                          */
+  CORE_SENSOR_TYPE_RTD_3W_PT10                          = 66,    /**< RTD 3 wire PT10 sensor                            */
+  CORE_SENSOR_TYPE_RTD_3W_PT50                          = 67,    /**< RTD 3 wire PT50 sensor                            */
+  CORE_SENSOR_TYPE_RTD_3W_PT200                         = 68,    /**< RTD 3 wire PT200 sensor                           */
+  CORE_SENSOR_TYPE_RTD_3W_PT500                         = 69,    /**< RTD 3 wire PT500 sensor                           */
+  CORE_SENSOR_TYPE_RTD_3W_PT1000_0P00375                = 70,    /**< RTD 3 wire PT1000 sensor                          */
+  CORE_SENSOR_TYPE_RTD_3W_NI120                         = 71,    /**< RTD 3 wire NI120 sensor                           */
+  CORE_SENSOR_TYPE_RTD_3W_CUSTOM                        = 72,    /**< RTD 3 wire Custom sensor                          */
+  CORE_SENSOR_TYPE_RTD_4W_PT100                         = 96,    /**< RTD 4 wire PT100 sensor                           */
+  CORE_SENSOR_TYPE_RTD_4W_PT1000                        = 97,    /**< RTD 4 wire PT1000 sensor                          */
+  CORE_SENSOR_TYPE_RTD_4W_PT10                          = 98,    /**< RTD 4 wire PT10 sensor                            */
+  CORE_SENSOR_TYPE_RTD_4W_PT50                          = 99,    /**< RTD 4 wire PT50 sensor                            */
+  CORE_SENSOR_TYPE_RTD_4W_PT200                         = 100,   /**< RTD 4 wire PT200 sensor                           */
+  CORE_SENSOR_TYPE_RTD_4W_PT500                         = 101,   /**< RTD 4 wire PT500 sensor                           */
+  CORE_SENSOR_TYPE_RTD_4W_PT1000_0P00375                = 102,   /**< RTD 4 wire PT1000 0.00375 sensor                  */
+  CORE_SENSOR_TYPE_RTD_4W_NI120                         = 103,   /**< RTD 4 wire NI120                                  */
+  CORE_SENSOR_TYPE_RTD_4W_CUSTOM                        = 104,   /**< RTD 4 wire Custom sensor                          */
+  CORE_SENSOR_TYPE_THERMISTOR_44004_44033_2P252K_AT_25C = 128,   /**< THERMISTOR_44004_44033_2P252K_AT_25C              */
+  CORE_SENSOR_TYPE_THERMISTOR_44005_44030_3K_AT_25C     = 129,   /**< THERMISTOR_44005_44030_3K_AT_25C                  */
+  CORE_SENSOR_TYPE_THERMISTOR_44007_44034_5K_AT_25C     = 130,   /**< THERMISTOR_44007_44034_5K_AT_25C                  */
+  CORE_SENSOR_TYPE_THERMISTOR_44006_44031_10K_AT_25C    = 131,   /**< THERMISTOR_44006_44031_10K_AT_25C                 */
+  CORE_SENSOR_TYPE_THERMISTOR_44008_44032_30K_AT_25C    = 132,   /**< THERMISTOR_44008_44032_30K_AT_25C                 */
+  CORE_SENSOR_TYPE_THERMISTOR_YSI_400                   = 133,   /**< THERMISTOR_YSI_400                                */
+  CORE_SENSOR_TYPE_THERMISTOR_SPECTRUM_1003K_1K         = 134,   /**< THERMISTOR_SPECTRUM_1003K_1K                      */
+  CORE_SENSOR_TYPE_THERMISTOR_CUSTOM_STEINHART_HART     = 135,   /**< THERMISTOR_CUSTOM_STEINHART_HART                  */
+  CORE_SENSOR_TYPE_THERMISTOR_CUSTOM_TABLE              = 136,   /**< THERMISTOR_CUSTOM_TABLE                           */
+  CORE_SENSOR_TYPE_BRIDGE_4WIRE                         = 168,   /**< Bridge 4 wire sensor                              */
+  CORE_SENSOR_TYPE_BRIDGE_6WIRE                         = 200,   /**< Bridge 6 wire sensor                              */
+  CORE_SENSOR_TYPE_DIODE                                = 224,   /**< DIODE Temperature Sensor                          */
+  CORE_SENSOR_TYPE_SINGLE_ENDED_ABSOLUTE                = 576,   /**< Voltage Input Single Ended on V+                  */
+  CORE_SENSOR_TYPE_DIFFERENTIAL_ABSOLUTE                = 640,   /**< Voltage Input Differential Ended on V+ and V-     */
+  CORE_SENSOR_TYPE_SINGLE_ENDED_RATIO                   = 656,   /**< Ratiometeric Output, Voltage_IN/Voltage_Reference */
+  CORE_SENSOR_TYPE_DIFFERENTIAL_RATIO                   = 672,   /**< Ratiometeric Output, Voltage_IN/Voltage_Reference */
+  CORE_SENSOR_TYPE_I2C_HUMIDITY                         = 2112,  /**< I2C humidity sensor B                             */
+  CORE_SENSOR_TYPE_I2C_TEMPERATURE_ADT742X              = 2218   /**< ADI Precision I2C Digital Temperature Sensor      */
 } ADMW_CORE_Sensor_Type_Sensor_Type;
 
 
@@ -1114,10 +1186,8 @@
  *  ========================================================================= */
 typedef enum
 {
-  CORE_MEASUREMENT_SETUP_DISABLE_CHOP = 0,  /**< ADC front end chopping disabled    */
-  CORE_MEASUREMENT_SETUP_HW_CHOP      = 1,  /**< Hardware chopping enabled          */
-  CORE_MEASUREMENT_SETUP_SW_CHOP      = 2,  /**< SW chop enabled                    */
-  CORE_MEASUREMENT_SETUP_HW_SW_CHOP   = 3   /**< Hardware and software chop enabled */
+  CORE_MEASUREMENT_SETUP_DISABLE_CHOP = 0,  /**< ADC front end chopping disabled */
+  CORE_MEASUREMENT_SETUP_ENABLE_CHOP  = 1   /**< ADC front end chopping enabled  */
 } ADMW_CORE_Measurement_Setup_Chop_Mode;
 
 
@@ -1154,7 +1224,8 @@
       uint32_t reserved7  :  1;
       uint32_t NOTCH_EN_2 :  1;  /**< Enable Notch 2 Filter Mode */
       uint32_t reserved9  :  1;
-      uint32_t Chop_Mode  :  2;  /**< Enabled and Disable Chop Mode */
+      uint32_t Chop_Mode  :  1;  /**< Enabled and Disable Chop Mode */
+      uint32_t reserved11      :  1;
       uint32_t ADC_Filter_Type :  1;  /**< ADC Digital Filter Type */
       uint32_t reserved13      :  2;
       uint32_t Buffer_Bypass   :  1;  /**< Disable Buffers */
@@ -1166,6 +1237,26 @@
 
 /*@}*/
 
+/** @defgroup Ideality_Factor Diode Ideality Factor Register (Ideality_Factor) Register
+ *  Diode Ideality Factor Register (Ideality_Factor) Register.
+ *  @{
+ */
+
+/* ==========================================================================
+ *! \struct ADMW_CORE_Ideality_Factor_Struct
+ *! \brief  Diode Ideality Factor Register bit field structure
+ * ========================================================================== */
+typedef struct _ADMW_CORE_Ideality_Factor_t {
+  union {
+    struct {
+      float32_t Ideality_Factor;  /**< Diode Ideality Factor, Default 1.003. */
+    };
+    float32_t VALUE32;
+  };
+} ADMW_CORE_Ideality_Factor_t;
+
+/*@}*/
+
 /** @defgroup High_Threshold_Limit High Threshold (High_Threshold_Limit) Register
  *  High Threshold (High_Threshold_Limit) Register.
  *  @{
@@ -1206,26 +1297,6 @@
 
 /*@}*/
 
-/** @defgroup Ideality_Factor Diode Ideality Factor Register (Ideality_Factor) Register
- *  Diode Ideality Factor Register (Ideality_Factor) Register.
- *  @{
- */
-
-/* ==========================================================================
- *! \struct ADMW_CORE_Ideality_Factor_Struct
- *! \brief  Diode Ideality Factor Register bit field structure
- * ========================================================================== */
-typedef struct _ADMW_CORE_Ideality_Factor_t {
-  union {
-    struct {
-      float32_t Ideality_Factor;  /**< Diode Ideality Factor, Default 1.003. */
-    };
-    float32_t VALUE32;
-  };
-} ADMW_CORE_Ideality_Factor_t;
-
-/*@}*/
-
 /** @defgroup Sensor_Offset Sensor Offset Adjustment (Sensor_Offset) Register
  *  Sensor Offset Adjustment (Sensor_Offset) Register.
  *  @{

--- a/inc/admw1001/admw1001_sensor_types.h	Fri Mar 06 05:32:12 2020 +0000
+++ b/inc/admw1001/admw1001_sensor_types.h	Mon Mar 16 09:02:06 2020 +0000
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 (c) Analog Devices, Inc.
+Copyright 2019, 2020 (c) Analog Devices, Inc.
 
 All rights reserved.
 
@@ -100,8 +100,12 @@
  *        below.
  *
  */
-typedef enum
-{
+typedef enum {
+    ADMW1001_ADC_SENSOR_THERMOCOUPLE_T = 0,
+        /*!< Standard T-type Thermocouple temperature sensor
+         *
+         * @note For use with Analog Sensor channels only
+         */
     ADMW1001_ADC_SENSOR_THERMOCOUPLE_J = 1,
     /*!< Standard J-type Thermocouple temperature sensor
      *
@@ -136,31 +140,26 @@
      *
      * @note For use with Analog Sensor channels only
      */
-      ADMW1001_ADC_SENSOR_THERMOCOUPLE_T = 7,
-    /*!< Standard T-type Thermocouple temperature sensor
-     *
-     * @note For use with Analog Sensor channels only
-     */
-     ADMW1001_ADC_SENSOR_THERMOCOUPLE_B = 8,
+     ADMW1001_ADC_SENSOR_THERMOCOUPLE_B = 7,
     /*!< Standard B-type Thermocouple temperature sensor with default
      *   linearisation and default configuration options
      *
      * @note For use with Analog Sensor channels only
      */
-     ADMW1001_ADC_SENSOR_THERMOCOUPLE_CUSTOM = 9,
+     ADMW1001_ADC_SENSOR_THERMOCOUPLE_CUSTOM = 8,
     /*!< CUSTOM -type Thermocouple temperature sensor with custom
      *   linearisation and default configuration options
      *
      * @note For use with Analog Sensor channels only
      */
-    ADMW1001_ADC_SENSOR_RTD_2WIRE_PT100_DEF_L1 = 32,
+    ADMW1001_ADC_SENSOR_RTD_2WIRE_PT100 = 32,
     /*!< Standard 2-wire PT100 RTD temperature sensor with default
      *   linearisation and default configuration options
      *
      * @note For use with Cold-Juction Compensation and Analog Sensor channels
      *       only
      */
-    ADMW1001_ADC_SENSOR_RTD_2WIRE_PT1000_DEF_L1 = 33,
+    ADMW1001_ADC_SENSOR_RTD_2WIRE_PT1000 = 33,
     /*!< Standard 2-wire PT1000 RTD temperature sensor with default
      *   linearisation and default configuration options
      *
@@ -181,65 +180,53 @@
      * @note For use with Cold-Juction Compensation and Analog Sensor channels
      *       only
      */
-    ADMW1001_ADC_SENSOR_RTD_2WIRE_PT100 = 36,
-    /*!< Standard 2-wire PT100 RTD temperature sensor with default
-     *   linearisation and default configuration options
-     *
-     * @note For use with Cold-Juction Compensation and Analog Sensor channels
-     *       only
-     */
-    ADMW1001_ADC_SENSOR_RTD_2WIRE_PT200 = 37,
+    ADMW1001_ADC_SENSOR_RTD_2WIRE_PT200 = 36,
     /*!< Standard 2-wire PT200 RTD temperature sensor with default
      *   linearisation and default configuration options
      *
      * @note For use with Cold-Juction Compensation and Analog Sensor channels
      *       only
      */
-    ADMW1001_ADC_SENSOR_RTD_2WIRE_PT500 = 38,
+    ADMW1001_ADC_SENSOR_RTD_2WIRE_PT500 = 37,
     /*!< Standard 2-wire PT500 RTD temperature sensor with default
      *   linearisation and default configuration options
      *
      * @note For use with Cold-Juction Compensation and Analog Sensor channels
      *       only
      */
-    ADMW1001_ADC_SENSOR_RTD_2WIRE_PT1000 = 39,
-    /*!< Standard 2-wire PT1000 RTD temperature sensor with default
-     *   linearisation and default configuration options
-     *
-     * @note For use with Cold-Juction Compensation and Analog Sensor channels
-     *       only
-     */
-    ADMW1001_ADC_SENSOR_RTD_2WIRE_PT1000_0P00375 = 40,
+    ADMW1001_ADC_SENSOR_RTD_2WIRE_PT1000_0P00375 = 38,
     /*!< Standard 2-wire PT1000 RTD temperature sensor with alpha 0.00375
      *   linearisation
      *
      * @note For use with Cold-Juction Compensation and Analog Sensor channels
      *       only
      */
-    ADMW1001_ADC_SENSOR_RTD_2WIRE_NI120 = 41,
+    ADMW1001_ADC_SENSOR_RTD_2WIRE_NI120 = 39,
     /*!< Standard 2-wire NI120 RTD temperature sensor
      *
      * @note For use with Cold-Juction Compensation and Analog Sensor channels
      *       only
      */
-    ADMW1001_ADC_SENSOR_RTD_2WIRE_CUSTOM = 42,
+    ADMW1001_ADC_SENSOR_RTD_2WIRE_CUSTOM = 40,
     /*!< 2-wire Custom RTD temperature sensor with user-defined linearisation and
      *   default configuration options
      *
      * @note For use with Cold-Juction Compensation and Analog Sensor channels
      *       only
      */
-    ADMW1001_ADC_SENSOR_RTD_3WIRE_PT100_DEF_L1 = 64,
+    ADMW1001_ADC_SENSOR_RTD_3WIRE_PT100 = 64,
     /*!< Standard 3-wire PT100 RTD temperature sensor with default
      *   linearisation and default configuration options
      *
-     * @note For use with Analog Sensor channels only
+     * @note For use with Cold-Juction Compensation and Analog Sensor channels
+     *       only
      */
-    ADMW1001_ADC_SENSOR_RTD_3WIRE_PT1000_DEF_L1 = 65,
+    ADMW1001_ADC_SENSOR_RTD_3WIRE_PT1000 = 65,
     /*!< Standard 3-wire PT1000 RTD temperature sensor with default
      *   linearisation and default configuration options
      *
-     * @note For use with Analog Sensor channels only
+     * @note For use with Cold-Juction Compensation and Analog Sensor channels
+     *       only
      */
     ADMW1001_ADC_SENSOR_RTD_3WIRE_PT10 = 66,
     /*!< Standard 3-wire PT10 RTD temperature sensor with default
@@ -255,67 +242,54 @@
      * @note For use with Cold-Juction Compensation and Analog Sensor channels
      *       only
      */
-    ADMW1001_ADC_SENSOR_RTD_3WIRE_PT100 = 68,
-    /*!< Standard 3-wire PT100 RTD temperature sensor with default
-     *   linearisation and default configuration options
-     *
-     * @note For use with Cold-Juction Compensation and Analog Sensor channels
-     *       only
-     */
-    ADMW1001_ADC_SENSOR_RTD_3WIRE_PT200 = 69,
+    ADMW1001_ADC_SENSOR_RTD_3WIRE_PT200 = 68,
     /*!< Standard 3-wire PT200 RTD temperature sensor with default
      *   linearisation and default configuration options
      *
      * @note For use with Cold-Juction Compensation and Analog Sensor channels
      *       only
      */
-    ADMW1001_ADC_SENSOR_RTD_3WIRE_PT500 = 70,
+    ADMW1001_ADC_SENSOR_RTD_3WIRE_PT500 = 69,
     /*!< Standard 3-wire PT500 RTD temperature sensor with default
      *   linearisation and default configuration options
      *
      * @note For use with Cold-Juction Compensation and Analog Sensor channels
      *       only
      */
-    ADMW1001_ADC_SENSOR_RTD_3WIRE_PT1000 = 71,
-    /*!< Standard 3-wire PT1000 RTD temperature sensor with default
-     *   linearisation and default configuration options
-     *
-     * @note For use with Cold-Juction Compensation and Analog Sensor channels
-     *       only
-     */
-    ADMW1001_ADC_SENSOR_RTD_3WIRE_PT1000_0P00375 = 72,
+    ADMW1001_ADC_SENSOR_RTD_3WIRE_PT1000_0P00375 = 70,
     /*!< Standard 3-wire PT1000 RTD temperature sensor with alpha 0.00375
      *   linearisation
      *
      * @note For use with Cold-Juction Compensation and Analog Sensor channels
      *       only
      */
-    ADMW1001_ADC_SENSOR_RTD_3WIRE_NI120 = 73,
+    ADMW1001_ADC_SENSOR_RTD_3WIRE_NI120 = 71,
     /*!< Standard 3-wire NI120 RTD temperature sensor
      *
      * @note For use with Cold-Juction Compensation and Analog Sensor channels
      *       only
      */
-    ADMW1001_ADC_SENSOR_RTD_3WIRE_CUSTOM = 74,
+    ADMW1001_ADC_SENSOR_RTD_3WIRE_CUSTOM = 72,
     /*!< 3-wire Custom RTD temperature sensor with user-defined linearisation and
      *   default configuration options
      *
      * @note For use with Cold-Juction Compensation and Analog Sensor channels
      *       only
      */
-    ADMW1001_ADC_SENSOR_RTD_4WIRE_PT100_DEF_L1 = 96,
+    ADMW1001_ADC_SENSOR_RTD_4WIRE_PT100 = 96,
     /*!< Standard 4-wire PT100 RTD temperature sensor with default
      *   linearisation and default configuration options
      *
-     * @note For use with Analog Sensor channels only
+     * @note For use with Cold-Juction Compensation and Analog Sensor channels
+     *       only
      */
-    ADMW1001_ADC_SENSOR_RTD_4WIRE_PT1000_DEF_L1 = 97,
+    ADMW1001_ADC_SENSOR_RTD_4WIRE_PT1000 = 97,
     /*!< Standard 4-wire PT1000 RTD temperature sensor with default
      *   linearisation and default configuration options
      *
-     * @note For use with Analog Sensor channels only
-     */
-    ADMW1001_ADC_SENSOR_RTD_4WIRE_PT10 = 98,
+     * @note For use with Cold-Juction Compensation and Analog Sensor channels
+     *       only
+     */    ADMW1001_ADC_SENSOR_RTD_4WIRE_PT10 = 98,
     /*!< Standard 4-wire PT10 RTD temperature sensor with default
      *   linearisation and default configuration options
      *
@@ -329,48 +303,35 @@
      * @note For use with Cold-Juction Compensation and Analog Sensor channels
      *       only
      */
-    ADMW1001_ADC_SENSOR_RTD_4WIRE_PT100 = 100,
-    /*!< Standard 4-wire PT100 RTD temperature sensor with default
-     *   linearisation and default configuration options
-     *
-     * @note For use with Cold-Juction Compensation and Analog Sensor channels
-     *       only
-     */
-    ADMW1001_ADC_SENSOR_RTD_4WIRE_PT200 = 101,
+    ADMW1001_ADC_SENSOR_RTD_4WIRE_PT200 = 100,
     /*!< Standard 4-wire PT200 RTD temperature sensor with default
      *   linearisation and default configuration options
      *
      * @note For use with Cold-Juction Compensation and Analog Sensor channels
      *       only
      */
-    ADMW1001_ADC_SENSOR_RTD_4WIRE_PT500 = 102,
+    ADMW1001_ADC_SENSOR_RTD_4WIRE_PT500 = 101,
     /*!< Standard 4-wire PT500 RTD temperature sensor with default
      *   linearisation and default configuration options
      *
      * @note For use with Cold-Juction Compensation and Analog Sensor channels
      *       only
      */
-    ADMW1001_ADC_SENSOR_RTD_4WIRE_PT1000 = 103,
-    /*!< Standard 4-wire PT1000 RTD temperature sensor with default
-     *   linearisation and default configuration options
-     *
-     * @note For use with Cold-Juction Compensation and Analog Sensor channels
-     *       only
-     */
-    ADMW1001_ADC_SENSOR_RTD_4WIRE_PT1000_0P00375 = 104,
+
+    ADMW1001_ADC_SENSOR_RTD_4WIRE_PT1000_0P00375 = 102,
     /*!< Standard 4-wire PT1000 RTD temperature sensor with alpha 0.00375
      *   linearisation
      *
      * @note For use with Cold-Juction Compensation and Analog Sensor channels
      *       only
      */
-    ADMW1001_ADC_SENSOR_RTD_4WIRE_NI120 = 105,
+    ADMW1001_ADC_SENSOR_RTD_4WIRE_NI120 = 103,
     /*!< Standard 4-wire NI120 RTD temperature sensor
      *
      * @note For use with Cold-Juction Compensation and Analog Sensor channels
      *       only
      */
-    ADMW1001_ADC_SENSOR_RTD_4WIRE_CUSTOM = 106,
+    ADMW1001_ADC_SENSOR_RTD_4WIRE_CUSTOM = 104,
     /*!< 4-wire Custom RTD temperature sensor with user-defined linearisation and
      *   default configuration options
      *
@@ -382,150 +343,65 @@
      *
      * @note For use with Analog Sensor channels only
      */
-    ADMW1001_ADC_SENSOR_THERMISTOR_44005_44030_3K_AT_25C = 129,    
+    ADMW1001_ADC_SENSOR_THERMISTOR_44005_44030_3K_AT_25C = 129,
     /*!< Standard 3kOhm NTC Thermistor
      *
      * @note For use with Analog Sensor channels only
      */
-    ADMW1001_ADC_SENSOR_THERMISTOR_44007_44034_5K_AT_25C = 130,    
+    ADMW1001_ADC_SENSOR_THERMISTOR_44007_44034_5K_AT_25C = 130,
     /*!< Standard 5kOhm NTC Thermistor
      *
      * @note For use with Analog Sensor channels only
      */
-    ADMW1001_ADC_SENSOR_THERMISTOR_44006_44031_10K_AT_25C = 131,   
+    ADMW1001_ADC_SENSOR_THERMISTOR_44006_44031_10K_AT_25C = 131,
     /*!< Standard 10kOhm NTC Thermistor
      *
      * @note For use with Analog Sensor channels only
      */
-    ADMW1001_ADC_SENSOR_THERMISTOR_44008_44032_30K_AT_25C = 132,   
+    ADMW1001_ADC_SENSOR_THERMISTOR_44008_44032_30K_AT_25C = 132,
     /*!< Standard 30kOhm NTC Thermistor
      *
      * @note For use with Analog Sensor channels only
      */
-    ADMW1001_ADC_SENSOR_THERMISTOR_YSI_400 = 133,    
+    ADMW1001_ADC_SENSOR_THERMISTOR_YSI_400 = 133,
     /*!< Standard YSI400 NTC Thermistor
      *
      * @note For use with Analog Sensor channels only
      */
-    ADMW1001_ADC_SENSOR_THERMISTOR_SPECTRUM_1003K_1K = 134,        
+    ADMW1001_ADC_SENSOR_THERMISTOR_SPECTRUM_1003K_1K = 134,
     /*!< Standard 1kOhm NTC Thermistor
      *
      * @note For use with Analog Sensor channels only
      */
-    ADMW1001_ADC_SENSOR_THERMISTOR_CUSTOM_STEINHART_HART = 135,    
+    ADMW1001_ADC_SENSOR_THERMISTOR_CUSTOM_STEINHART_HART = 135,
     /*!< CUSTOM Equation NTC Thermistor
      *
      * @note For use with Analog Sensor channels only
      */
-    ADMW1001_ADC_SENSOR_THERMISTOR_CUSTOM_TABLE = 136,             
+    ADMW1001_ADC_SENSOR_THERMISTOR_CUSTOM_TABLE = 136,
     /*!< Custom Table NTC Thermistor
      *
      * @note For use with Analog Sensor channels only
      */
-    ADMW1001_ADC_SENSOR_BRIDGE_4WIRE_1 = 168,
-    /*!< Standard 4-wire Bridge Transducer sensor
-     *
-     * @note For use with Analog Sensor channels only
-     * @note Bridge Excitation Voltage must be selected as reference
-     */
-    ADMW1001_ADC_SENSOR_BRIDGE_4WIRE_2 = 169,
-    /*!< Standard 4-wire Bridge Transducer sensor
-     *
-     * @note For use with Analog Sensor channels only
-     * @note Bridge Excitation Voltage must be selected as reference
-     */
-    ADMW1001_ADC_SENSOR_BRIDGE_4WIRE_3 = 170,
-    /*!< Standard 4-wire Bridge Transducer sensor
-     *
-     * @note For use with Analog Sensor channels only
-     * @note Bridge Excitation Voltage must be selected as reference
-     */
-    ADMW1001_ADC_SENSOR_BRIDGE_4WIRE_4 = 171,
-    /*!< Standard 4-wire Bridge Transducer sensor
+    ADMW1001_ADC_SENSOR_BRIDGE_4WIRE = 168,
+    /*!< Standard 4-wire Bridge Transducer sensor with user-defined
+     *   linearisation and default configuration options
      *
      * @note For use with Analog Sensor channels only
      * @note Bridge Excitation Voltage must be selected as reference
      */
-    ADMW1001_ADC_SENSOR_BRIDGE_6WIRE_1 = 200,
-    /*!< Standard 6-wire Bridge Transducer sensor
-     *
-     * @note For use with Analog Sensor channels only
-     * @note Bridge Excitation Voltage must be selected as reference
-     */
-    ADMW1001_ADC_SENSOR_BRIDGE_6WIRE_2 = 201,
-    /*!< Standard 6-wire Bridge Transducer sensor
+    ADMW1001_ADC_SENSOR_BRIDGE_6WIRE = 200,
+    /*!< Standard 6-wire Bridge Transducer sensor with user-defined
+     *   linearisation and default configuration options
      *
      * @note For use with Analog Sensor channels only
-     * @note Bridge Excitation Voltage must be selected as reference
-     */
-    ADMW1001_ADC_SENSOR_BRIDGE_6WIRE_3 = 202,
-    /*!< Standard 6-wire Bridge Transducer sensor
-     *
-     * @note For use with Analog Sensor channels only
-     * @note Bridge Excitation Voltage must be selected as reference
-     */
-    ADMW1001_ADC_SENSOR_BRIDGE_6WIRE_4 = 203,
-    /*!< Standard 6-wire Bridge Transducer sensor
-     *
-     * @note For use with Analog Sensor channels only
-     * @note Bridge Excitation Voltage must be selected as reference
+     * @note Bridge Excition Voltage must be selected as reference
      */
     ADMW1001_ADC_SENSOR_DIODE = 224,
     /*!< Standard Diode current temperature sensor
      *
      * @note For use with  Analog Sensor channels only
      */
-    ADMW1001_ADC_SENSOR_VOLTAGE = 512,
-    /*!< Generic voltage sensor
-     *
-     * @note For use with Analog 0-10V Voltage Sensor channels only
-     */
-    ADMW1001_ADC_SENSOR_VOLTAGE_PRESSURE_A = 544,
-    /*!< Honeywell Pressure voltage sensor (HSCMRNN1.6BAAA3) with default
-     *   linearisation and default configuration options
-     *
-     * @note For use with Analog 0-10V Voltage Sensor channels only
-     */
-    ADMW1001_ADC_SENSOR_VOLTAGE_PRESSURE_B = 545,
-    /*!< Amphenol Pressure voltage sensor (NPA-300B-015A)
-     *
-     * @note For use with Analog 0-10V Voltage Sensor channels only
-     */
-    ADMW1001_ADC_SENSOR_VOLTAGE_PRESSURE_1 = 552,
-    /*!< Generic pressure voltage sensor
-     *
-     * @note For use with Analog 0-10V Voltage Sensor channels only
-     */
-    ADMW1001_ADC_SENSOR_VOLTAGE_PRESSURE_2 = 553,
-    /*!< Generic pressure voltage sensor
-     *
-     * @note For use with Analog 0-10V Voltage Sensor channels only
-     */
-    ADMW1001_ADC_SENSOR_CURRENT = 768,
-    /*!< Generic current sensor with no linearisation applied
-     *
-     * @note For use with Analog 4-20mA Current Sensor channels only
-     */
-    ADMW1001_ADC_SENSOR_CURRENT_PRESSURE_A = 800,
-    /*!< Honeywell Pressure current sensor (PX2CN2XX100PACH)
-     *
-     * @note For use with Analog 4-20mA Current Sensor channels only
-     */
-    ADMW1001_ADC_SENSOR_CURRENT_PRESSURE_1 = 808,
-    /*!< Generic pressure current sensor
-     *
-     * @note For use with Analog 4-20mA Current Sensor channels only
-     */
-    ADMW1001_ADC_SENSOR_CURRENT_PRESSURE_2 = 809,
-    /*!< Generic pressure current sensor
-     *
-     * @note For use with Analog 4-20mA Current Sensor channels only
-     */
-     ADMW1001_ADC_SENSOR_CUSTOM_TEST = 576,
-    /*!< Test sensor for internal use
-     *
-     * @note For use with Analog 4-20mA Current Sensor channels only
-     */
      ADMW1001_ADC_SENSOR_SINGLE_ENDED_ABSOLUTE = 576,
     /*!< Test sensor for internal use
      *
@@ -536,7 +412,7 @@
      *
      * @note For use with Analog 4-20mA Current Sensor channels only
      */
-     ADMW1001_ADC_SENSOR_SINGLE_ENDED_RATIO = 608,
+     ADMW1001_ADC_SENSOR_SINGLE_ENDED_RATIO = 656,
     /*!< Test sensor for internal use
      *
      * @note For use with Analog 4-20mA Current Sensor channels only
@@ -558,73 +434,19 @@
  */
 typedef enum
 {
-    ADMW1001_I2C_SENSOR_HUMIDITY_A = 2112,
-    /*!< Honeywell HiH9000-series humidity sensor
-     *
-     * @note For use with I2C Digital Sensor channels only
-     */
-    ADMW1001_I2C_SENSOR_HUMIDITY_B = 2113,
+
+    ADMW1001_I2C_SENSOR_HUMIDITY = 2112,
     /*!< Sensirion SHT35-DIS-B humidity sensor
      *
      * @note For use with I2C Digital Sensor channels only
      */
-    ADMW1001_I2C_SENSOR_HUMIDITY_C = 2114,
-    /*!< TE MS8607 humidity sensor
-     *   Note: the MS8607 is a combined Pressure & Temperature, Humidity sensor.
-     *   The humidity sensor is treated as a virtual device, i.e. standalone.
-     *
-     * @note For use with I2C Digital Sensor channels only
-     */
-    ADMW1001_I2C_SENSOR_HUMIDITY_D = 2115,
-    /*!< Sensirion SCD30 humidity sensor
-     *   Note: the SCD30 is a combined CO2, Humidity and Temperature sensor.
-     *   The humidity sensor is treated as a virtual device, i.e. standalone.
-     *
-     * @note For use with I2C Digital Sensor channels only
-     */
-    ADMW1001_I2C_SENSOR_AMBIENTLIGHT_A = 2176,
-    /*!< ON-Semiconductor NOA1305 ambient light sensor
-     *
-     * @note For use with I2C Digital Sensor channels only
-     */
-    ADMW1001_I2C_SENSOR_PRESSURE_A = 2208,
-    /*!< TE MS8607 pressure sensor
-     *   Note: the MS8607 is a combined Pressure & Temperature, Humidity sensor.
-     *   The pressure sensor is treated as a virtual device, i.e. standalone.
-     *
-     * @note For use with I2C Digital Sensor channels only
-     */
-    ADMW1001_I2C_SENSOR_TEMPERATURE_A = 2216,
-    /*!< TE MS8607 temperature sensor
-     *   Note: the MS8607 is a combined Pressure & Temperature, Humidity sensor.
-     *   The temperature sensor is treated as a virtual device, i.e. standalone.
-     *
-     * @note For use with I2C Digital Sensor channels only
-     */
-    ADMW1001_I2C_SENSOR_TEMPERATURE_B = 2217,
-    /*!< Sensirion SCD30 temperature sensor
-     *   Note: the SCD30 is a combined CO2, Humidity and Temperature sensor.
-     *   The temperature sensor is treated as a virtual device, i.e. standalone.
-     *
-     * @note For use with I2C Digital Sensor channels only
-     */
      ADMW1001_I2C_SENSOR_TEMPERATURE_ADT742X = 2218,
     /*!< ADT742X sensor
      *   Note: the ADT742X Temperature sensor.
      *
      * @note For use with I2C Digital Sensor channels only
      */
-    ADMW1001_I2C_SENSOR_CO2_A = 2224,
-    /*!< Sensirion SCD30 C02 sensor
-     *   Note: the SCD30 is a combined CO2, Humidity and Temperature sensor.
-     *   The CO2 sensor is treated as a virtual device, i.e. standalone.
-     *
-     * @note For use with I2C Digital Sensor channels only
-     */
-     
-     
-
-}   ADMW1001_I2C_SENSOR_TYPE;
+} ADMW1001_I2C_SENSOR_TYPE;
 
 /*! ADMW1001 SPI digital sensor type options
  *
@@ -635,30 +457,7 @@
  */
 typedef enum
 {
-    ADMW1001_SPI_SENSOR_PRESSURE_A = 3072,
-    /*!< Honeywell HSCDRNN1.6BASA3 pressure sensor
-     *
-     * @note For use with SPI Digital Sensor channels only
-     */
-    ADMW1001_SPI_SENSOR_ACCELEROMETER_A = 3200,
-    /*!< Analog Devices ADxL362 3-axis accelerometer sensor
-     *
-     * @note For use with SPI Digital Sensor channels only
-     *
-     * @note This sensor requires the use of 3 SPI Digital Sensor channels, with
-     *       the sensor measurements from the X/Y/Z axes each output on a
-     *       seperate dedicated channel (SPI#0/SPI#1/SPI#2, respectively)
-     */
-    ADMW1001_SPI_SENSOR_ACCELEROMETER_B = 3201,
-    /*!< Analog Devices ADxL355 3-axis accelerometer sensor
-     *
-     * @note For use with SPI Digital Sensor channels only
-     *
-     * @note This sensor requires the use of 3 SPI Digital Sensor channels, with
-     *       the sensor measurements from the X/Y/Z axes each output on a
-     *       seperate dedicated channel (SPI#0/SPI#1/SPI#2, respectively)
-     */
-
+    ADMW1001_SPI_SENSOR,
 }   ADMW1001_SPI_SENSOR_TYPE;
 
 #ifdef __cplusplus

--- a/lut_data.c	Fri Mar 06 05:32:12 2020 +0000
+++ b/lut_data.c	Mon Mar 16 09:02:06 2020 +0000
@@ -13,7 +13,7 @@
     .channel =ADMW1001_CH_ID_ANLG_1_UNIVERSAL,
     .equation = ADMW1001_LUT_EQUATION_LUT,
     .dir = ADMW1001_LUT_TC_DIRECTION_FORWARD,
-    .sensor = ADMW1001_ADC_SENSOR_BRIDGE_4WIRE_1,
+    .sensor = ADMW1001_ADC_SENSOR_BRIDGE_4WIRE,
     .dataType = ADMW1001_LUT_DATA_TYPE_FLOAT32,
     .length = 0, /* Filled by admw_1001_AssembleLutData() */
     .crc16 = 0   /* Filled by admw_1001_AssembleLutData() */

--- a/multichannel_continuous_config.c	Fri Mar 06 05:32:12 2020 +0000
+++ b/multichannel_continuous_config.c	Mon Mar 16 09:02:06 2020 +0000
@@ -122,7 +122,7 @@
                 .measurementsPerCycle = 1,
                 .extraSettlingTime = 99.5000014663674,
                 .i2cChannelConfig = {
-                    .sensor = ADMW1001_I2C_SENSOR_HUMIDITY_B,
+                    .sensor = ADMW1001_I2C_SENSOR_HUMIDITY,
                 },
             }
         },

--- a/multichannel_singlecycle_config.c	Fri Mar 06 05:32:12 2020 +0000
+++ b/multichannel_singlecycle_config.c	Mon Mar 16 09:02:06 2020 +0000
@@ -122,7 +122,7 @@
                 .measurementsPerCycle = 1,
                 .extraSettlingTime = 99.5000014663674,
                 .i2cChannelConfig = {
-                    .sensor = ADMW1001_I2C_SENSOR_HUMIDITY_B,
+                    .sensor = ADMW1001_I2C_SENSOR_HUMIDITY,
                     .dataFormat.coding = ADMW1001_DIGITAL_SENSOR_DATA_CODING_UNIPOLAR,
                 },
             }

--- a/src/admw_1001.c	Fri Mar 06 05:32:12 2020 +0000
+++ b/src/admw_1001.c	Mon Mar 16 09:02:06 2020 +0000
@@ -1378,14 +1378,8 @@
 
         case ADMW1001_ADC_SENSOR_RTD_3WIRE_NI120:
         case ADMW1001_ADC_SENSOR_RTD_3WIRE_CUSTOM:
-        case ADMW1001_ADC_SENSOR_BRIDGE_4WIRE_1:
-        case ADMW1001_ADC_SENSOR_BRIDGE_4WIRE_2:
-        case ADMW1001_ADC_SENSOR_BRIDGE_4WIRE_3:
-        case ADMW1001_ADC_SENSOR_BRIDGE_4WIRE_4:
-        case ADMW1001_ADC_SENSOR_BRIDGE_6WIRE_1:
-        case ADMW1001_ADC_SENSOR_BRIDGE_6WIRE_2:
-        case ADMW1001_ADC_SENSOR_BRIDGE_6WIRE_3:
-        case ADMW1001_ADC_SENSOR_BRIDGE_6WIRE_4:
+        case ADMW1001_ADC_SENSOR_BRIDGE_4WIRE:
+        case ADMW1001_ADC_SENSOR_BRIDGE_6WIRE:
         case ADMW1001_ADC_SENSOR_DIODE:
         case ADMW1001_ADC_SENSOR_THERMISTOR_44004_44033_2P252K_AT_25C:
         case ADMW1001_ADC_SENSOR_THERMISTOR_44005_44030_3K_AT_25C:
@@ -1409,11 +1403,6 @@
                 return ADMW_INVALID_PARAM;
             }
             break;
-        case ADMW1001_ADC_SENSOR_VOLTAGE:
-        case ADMW1001_ADC_SENSOR_VOLTAGE_PRESSURE_A:
-        case ADMW1001_ADC_SENSOR_VOLTAGE_PRESSURE_B:
-        case ADMW1001_ADC_SENSOR_VOLTAGE_PRESSURE_1:
-        case ADMW1001_ADC_SENSOR_VOLTAGE_PRESSURE_2:
         case ADMW1001_ADC_SENSOR_THERMOCOUPLE_J:
         case ADMW1001_ADC_SENSOR_THERMOCOUPLE_K:
         case ADMW1001_ADC_SENSOR_THERMOCOUPLE_T:
@@ -1430,17 +1419,6 @@
                 return ADMW_INVALID_PARAM;
             }
             break;
-        case ADMW1001_ADC_SENSOR_CURRENT:
-        case ADMW1001_ADC_SENSOR_CURRENT_PRESSURE_A:
-        case ADMW1001_ADC_SENSOR_CURRENT_PRESSURE_1:
-        case ADMW1001_ADC_SENSOR_CURRENT_PRESSURE_2:
-            if (! ADMW1001_CHANNEL_IS_ADC_CURRENT(eChannelId)) {
-                ADMW_LOG_ERROR(
-                    "Invalid ADC sensor type %d specified for channel %d",
-                    sensorType, eChannelId);
-                return ADMW_INVALID_PARAM;
-            }
-            break;
         default:
             ADMW_LOG_ERROR("Invalid/unsupported ADC sensor type %d specified",
                            sensorType);
@@ -1827,8 +1805,7 @@
 
     /* Ensure that the sensor type is valid for this channel */
     switch(sensorType) {
-        case ADMW1001_I2C_SENSOR_HUMIDITY_A:
-        case ADMW1001_I2C_SENSOR_HUMIDITY_B:
+        case ADMW1001_I2C_SENSOR_HUMIDITY:
         case ADMW1001_I2C_SENSOR_TEMPERATURE_ADT742X:
             sensorTypeReg.Sensor_Type = sensorType;
             break;
@@ -2021,9 +1998,7 @@
 
     /* Ensure that the sensor type is valid for this channel */
     switch(sensorType) {
-        case ADMW1001_SPI_SENSOR_PRESSURE_A:
-        case ADMW1001_SPI_SENSOR_ACCELEROMETER_A:
-        case ADMW1001_SPI_SENSOR_ACCELEROMETER_B:
+        case ADMW1001_SPI_SENSOR:
 
             sensorTypeReg.Sensor_Type = sensorType;
             break;