Minor changes to support ADMW FWv1.17.75

Revision:
6:9d393a9677f4
Parent:
5:0728bde67bdb
Child:
8:2f2775c34640
--- a/inc/admw1001/ADMW1001_REGISTERS_typedefs.h	Wed Jun 05 05:39:15 2019 +0000
+++ b/inc/admw1001/ADMW1001_REGISTERS_typedefs.h	Sat Jun 15 14:30:49 2019 +0000
@@ -4,9 +4,9 @@
      File         :   ADMW1001_REGISTERS_typedefs.h
      Description  :   C Register Structures
 
-     Date         :   Nov 5, 2018
+     Date         :   Apr 30, 2019
 
-     Copyright (c) 2018 Analog Devices, Inc.  All Rights Reserved.
+     Copyright (c) 2019 Analog Devices, Inc.  All Rights Reserved.
      This software is proprietary and confidential to Analog Devices, Inc. and
      its licensors.
 
@@ -47,7 +47,7 @@
  *! \struct ADMW_SPI_Interface_Config_A_Struct
  *! \brief  Interface Configuration A Register bit field structure
  * ========================================================================== */
-typedef struct _ADMW_SPI_Interface_Config_A_t {
+typedef struct SPI_Interface_Config_A_t {
   union {
     struct {
       uint8_t SW_ResetX  :  1;  /**< Second  of Two of SW_RESET Bits. */
@@ -250,8 +250,8 @@
  *  ========================================================================= */
 typedef enum
 {
-  ADMW_SPI_SPI_REVISION_ADMW_SPI = 0,  /**<  */
-  ADMW_SPI_SPI_REVISION_LPT_SPI = 2   /**<  */
+  SPI_SPI_REVISION_ADI_SPI = 0,  /**<  */
+  SPI_SPI_REVISION_LPT_SPI = 2   /**<  */
 } ADMW_SPI_SPI_Revision_SPI_Type;
 
 
@@ -259,7 +259,7 @@
  *! \struct ADMW_SPI_SPI_Revision_Struct
  *! \brief  SPI Revision Register bit field structure
  * ========================================================================== */
-typedef struct _ADMW_SPI_SPI_Revision_t {
+typedef struct SPI_SPI_Revision_t {
   union {
     struct {
       uint8_t Version    :  6;  /**< SPI Version */
@@ -280,7 +280,7 @@
  *! \struct ADMW_SPI_Vendor_L_Struct
  *! \brief  Vendor ID Low Register bit field structure
  * ========================================================================== */
-typedef struct _ADMW_SPI_Vendor_L_t {
+typedef struct SPI_Vendor_L_t {
   union {
     struct {
       uint8_t VID        :  8;  /**< VID[7:0] Analog Devices Vendor ID */
@@ -300,7 +300,7 @@
  *! \struct ADMW_SPI_Vendor_H_Struct
  *! \brief  Vendor ID High Register bit field structure
  * ========================================================================== */
-typedef struct _ADMW_SPI_Vendor_H_t {
+typedef struct SPI_Vendor_H_t {
   union {
     struct {
       uint8_t VID        :  8;  /**< VID[15:8] Analog Devices Vendor ID */
@@ -320,7 +320,7 @@
  *! \struct ADMW_SPI_Stream_Mode_Struct
  *! \brief  Stream Mode Register bit field structure
  * ========================================================================== */
-typedef struct _ADMW_SPI_Stream_Mode_t {
+typedef struct SPI_Stream_Mode_t {
   union {
     struct {
       uint8_t Loop_Count :  8;  /**< Sets the Data Byte Count Before Looping to Start Address */
@@ -342,8 +342,8 @@
  *  ========================================================================= */
 typedef enum
 {
-  ADMW_SPI_TRANSFER_CONFIG_UPDATE_ON_WRITE        = 0,  /**< Transfers after each byte/mulit-byte register */
-  ADMW_SPI_TRANSFER_CONFIG_UPDATE_ON_ADDRESS_LOOP = 1   /**< Transfers when address loops                  */
+  SPI_TRANSFER_CONFIG_UPDATE_ON_WRITE        = 0,  /**< Transfers after each byte/mulit-byte register */
+  SPI_TRANSFER_CONFIG_UPDATE_ON_ADDRESS_LOOP = 1   /**< Transfers when address loops                  */
 } ADMW_SPI_Transfer_Config_Stream_Mode;
 
 
@@ -351,7 +351,7 @@
  *! \struct ADMW_SPI_Transfer_Config_Struct
  *! \brief  Transfer Config Register bit field structure
  * ========================================================================== */
-typedef struct _ADMW_SPI_Transfer_Config_t {
+typedef struct SPI_Transfer_Config_t {
   union {
     struct {
       uint8_t reserved0   :  1;
@@ -375,8 +375,8 @@
  *  ========================================================================= */
 typedef enum
 {
-  ADMW_SPI_INTERFACE_CONFIG_C_NORMAL_ACCESS = 0,  /**< Normal mode, no access restrictions                              */
-  ADMW_SPI_INTERFACE_CONFIG_C_STRICT_ACCESS = 1   /**< Strict mode, multi-byte registers require all bytes read/written */
+  SPI_INTERFACE_CONFIG_C_NORMAL_ACCESS = 0,  /**< Normal mode, no access restrictions                              */
+  SPI_INTERFACE_CONFIG_C_STRICT_ACCESS = 1   /**< Strict mode, multi-byte registers require all bytes read/written */
 } ADMW_SPI_Interface_Config_C_Strict_Register_Access;
 
 
@@ -386,8 +386,8 @@
  *  ========================================================================= */
 typedef enum
 {
-  ADMW_SPI_INTERFACE_CONFIG_C_DISABLED = 0,  /**< CRC Disabled */
-  ADMW_SPI_INTERFACE_CONFIG_C_ENABLED  = 1   /**< CRC Enabled  */
+  SPI_INTERFACE_CONFIG_C_DISABLED = 0,  /**< CRC Disabled */
+  SPI_INTERFACE_CONFIG_C_ENABLED  = 1   /**< CRC Enabled  */
 } ADMW_SPI_Interface_Config_C_CRC_Enable;
 
 
@@ -395,7 +395,7 @@
  *! \struct ADMW_SPI_Interface_Config_C_Struct
  *! \brief  Interface Configuration C Register bit field structure
  * ========================================================================== */
-typedef struct _ADMW_SPI_Interface_Config_C_t {
+typedef struct SPI_Interface_Config_C_t {
   union {
     struct {
       uint8_t CRC_EnableB :  2;  /**< Inverted CRC Enable */
@@ -419,7 +419,7 @@
  *! \struct ADMW_SPI_Interface_Status_A_Struct
  *! \brief  Interface Status A Register bit field structure
  * ========================================================================== */
-typedef struct _ADMW_SPI_Interface_Status_A_t {
+typedef struct SPI_Interface_Status_A_t {
   union {
     struct {
       uint8_t Address_Invalid_Error :  1;  /**< Attempt to Read/Write Non-existent Register Address */
@@ -447,27 +447,16 @@
  *  ========================================================================= */
 typedef enum
 {
-  CORE_COMMAND_NOP                  = 0,   /**< No Command                                                        */
-  CORE_COMMAND_CONVERT              = 1,   /**< Start ADC Conversions                                             */
-  CORE_COMMAND_CONVERT_WITH_RAW     = 2,   /**< Start Conversions with Added RAW ADC Data                         */
-  CORE_COMMAND_RUN_DIAGNOSTICS      = 3,   /**< Initiate a Diagnostics Cycle                                      */
-  CORE_COMMAND_SELF_CALIBRATION     = 4,   /**< Initiate a Self-Calibration Cycle                                 */
-  CORE_COMMAND_LATCH_CONFIG         = 7,   /**< Latch Configuration.                                              */
-  CORE_COMMAND_LOAD_LUT             = 8,   /**< Load LUT from FLASH                                               */
-  CORE_COMMAND_SAVE_LUT             = 9,   /**< Save LUT to FLASH                                                 */
-  CORE_COMMAND_SYSTEM_CHECK         = 10,  /**< Full Suite of Measurement Diagnostics                             */
-  CORE_COMMAND_CONVERT_FFT          = 11,  /**< Perform FFTs on Selected Channel(s)                               */
-  CORE_COMMAND_ERASE_EXTERNAL_FLASH = 16,  /**< Erase Contents of External Flash                                  */
-  CORE_COMMAND_POWER_DOWN           = 20,  /**< Enter Low Power State                                             */
-  CORE_COMMAND_LOAD_CONFIG_1        = 24,  /**< Load Registers with Configuration#1 from FLASH                    */
-  CORE_COMMAND_SAVE_CONFIG_1        = 25,  /**< Store Current Registers to FLASH Configuration#1                  */
-  CORE_COMMAND_LOAD_CONFIG_2        = 26,  /**< Load Registers with Configuration#2 from FLASH                    */
-  CORE_COMMAND_SAVE_CONFIG_2        = 27,  /**< Store Current Registers to FLASH Configuration#2                  */
-  CORE_COMMAND_LOAD_CONFIG_3        = 28,  /**< Load Registers with Configuration#3 from FLASH                    */
-  CORE_COMMAND_SAVE_CONFIG_3        = 29,  /**< Store Current Registers to FLASH Configuration#3                  */
-  CORE_COMMAND_LOAD_CONFIG_4        = 30,  /**< Load Registers with Configuration#4 from FLASH                    */
-  CORE_COMMAND_SAVE_CONFIG_4        = 31,  /**< Store Current Registers to FLASH Configuration#4                  */
-  CORE_COMMAND_CALIBRATE_DIGITAL    = 32   /**< Performs a Calibration of Digital Sensor, if Supported & Enabled. */
+  CORE_COMMAND_NOP               = 0,   /**< No Command                                                        */
+  CORE_COMMAND_CONVERT           = 1,   /**< Start ADC Conversions                                             */
+  CORE_COMMAND_CONVERT_WITH_RAW  = 2,   /**< Start Conversions with Added RAW ADC Data                         */
+  CORE_COMMAND_LATCH_CONFIG      = 7,   /**< Latch Configuration.                                              */
+  CORE_COMMAND_LOAD_LUT          = 8,   /**< Load LUT from FLASH                                               */
+  CORE_COMMAND_SAVE_LUT          = 9,   /**< Save LUT to FLASH                                                 */
+  CORE_COMMAND_POWER_DOWN        = 20,  /**< Enter Low Power State                                             */
+  CORE_COMMAND_LOAD_CONFIG_1     = 24,  /**< Load Registers with Configuration#1 from FLASH                    */
+  CORE_COMMAND_SAVE_CONFIG_1     = 25,  /**< Store Current Registers to FLASH Configuration#1                  */
+  CORE_COMMAND_CALIBRATE_DIGITAL = 32   /**< Performs a Calibration of Digital Sensor, if Supported & Enabled. */
 } CORE_Command_Special_Command;
 
 
@@ -515,39 +504,6 @@
 } CORE_Mode_Drdy_Mode;
 
 
-/*  =========================================================================
- *! \enum   CORE_Mode_Calibration_Method
- *! \brief  Indicates If Calibration is Required on 'Latch' Command (Calibration_Method) Enumerations
- *  ========================================================================= */
-typedef enum
-{
-  CORE_MODE_NO_CAL = 0,  /**< No Calibration Performed */
-  CORE_MODE_DO_CAL = 1   /**< Calibration Performed    */
-} CORE_Mode_Calibration_Method;
-
-
-/*  =========================================================================
- *! \enum   CORE_Mode_FFT_Mode
- *! \brief  Indicates Single or Multiple Sequence of FFTs (FFT_Mode) Enumerations
- *  ========================================================================= */
-typedef enum
-{
-  CORE_MODE_FFT_MODE_SINGLE     = 0,  /**< Perform Single Sequence of FFT(s) on Selected Channel(s)   */
-  CORE_MODE_FFT_MODE_CONTINUOUS = 1   /**< Perform Continuous Sequence of FFTs on Selected Channel(s) */
-} CORE_Mode_FFT_Mode;
-
-
-/*  =========================================================================
- *! \enum   CORE_Mode_Ext_Flash_Store
- *! \brief  Indicates If Measurement Data Should Be Stored in Flash (Ext_Flash_Store) Enumerations
- *  ========================================================================= */
-typedef enum
-{
-  CORE_MODE_EXT_FLASH_NOT_USED = 0,  /**< Do Not Use External Flash */
-  CORE_MODE_EXT_FLASH_USED     = 1   /**< Use External Flash        */
-} CORE_Mode_Ext_Flash_Store;
-
-
 /* ==========================================================================
  *! \struct CORE_Mode_Struct
  *! \brief  Operating Mode and DRDY Control Register bit field structure
@@ -557,10 +513,7 @@
     struct {
       uint8_t Conversion_Mode :  2;  /**< Conversion Mode */
       uint8_t Drdy_Mode       :  2;  /**< Indicates Behavior of DRDY with Respect to FIFO State */
-      uint8_t Calibration_Method :  1;  /**< Indicates If Calibration is Required on 'Latch' Command */
-      uint8_t FFT_Mode           :  1;  /**< Indicates Single or Multiple Sequence of FFTs */
-      uint8_t reserved6          :  1;
-      uint8_t Ext_Flash_Store    :  1;  /**< Indicates If Measurement Data Should Be Stored in Flash */
+      uint8_t reserved4       :  4;
     };
     uint8_t VALUE8;
   };
@@ -574,15 +527,14 @@
  */
 
 /*  =========================================================================
- *! \enum   CORE_Power_Config_Power_Mode_ADC
- *! \brief  ADC Power Mode (Power_Mode_ADC) Enumerations
+ *! \enum   CORE_Power_Config_Power_Mode_MCU
+ *! \brief  MCU Power Mode (Power_Mode_MCU) Enumerations
  *  ========================================================================= */
 typedef enum
 {
-  CORE_POWER_CONFIG_ADC_LOW_POWER  = 0,  /**< ADC Low Power Mode  */
-  CORE_POWER_CONFIG_ADC_MID_POWER  = 1,  /**< ADC Mid Power Mode  */
-  CORE_POWER_CONFIG_ADC_FULL_POWER = 2   /**< ADC Full Power Mode */
-} CORE_Power_Config_Power_Mode_ADC;
+  CORE_POWER_CONFIG_ACTIVE_MODE = 0,  /**< Part is fully powered up and either cycling through a sequence or awaiting a configuration                                               */
+  CORE_POWER_CONFIG_HIBERNATION = 1   /**< module has entede hibernation mode. All analog circuitry is disabled. All peripherals disabled apart from the Wake-up pin functionality. */
+} CORE_Power_Config_Power_Mode_MCU;
 
 
 /* ==========================================================================
@@ -592,8 +544,8 @@
 typedef struct CORE_Power_Config_t {
   union {
     struct {
-      uint8_t Power_Mode_ADC :  2;  /**< ADC Power Mode */
-      uint8_t reserved2      :  6;
+      uint8_t Power_Mode_MCU :  1;  /**< MCU Power Mode */
+      uint8_t reserved1      :  7;
     };
     uint8_t VALUE8;
   };
@@ -607,28 +559,6 @@
  */
 
 /*  =========================================================================
- *! \enum   CORE_Cycle_Control_Cycle_Type
- *! \brief  Type of Measurement Cycle (Cycle_Type) Enumerations
- *  ========================================================================= */
-typedef enum
-{
-  CORE_CYCLE_CONTROL_CYCLE_TYPE_SWITCH = 0,  /**< Switch Channels After Every Conversion                        */
-  CORE_CYCLE_CONTROL_CYCLE_TYPE_FULL   = 1   /**< Perform Full Number Of Conversions On A Channel Consecutively */
-} CORE_Cycle_Control_Cycle_Type;
-
-
-/*  =========================================================================
- *! \enum   CORE_Cycle_Control_Filter_Settling
- *! \brief  Determines ADC Filter Settling in a Multi-Channel Sequence (Filter_Settling) Enumerations
- *  ========================================================================= */
-typedef enum
-{
-  CORE_CYCLE_CONTROL_FILTER_SETTLING_SETTLED = 0,  /**< ADC Result Fully Settles for Every Output                            */
-  CORE_CYCLE_CONTROL_FILTER_SETTLING_FAST    = 1   /**< ADC Result Appears at Higher Update Rate for Consecutive Conversions */
-} CORE_Cycle_Control_Filter_Settling;
-
-
-/*  =========================================================================
  *! \enum   CORE_Cycle_Control_Cycle_Time_Units
  *! \brief  Units for Cycle Time (Cycle_Time_Units) Enumerations
  *  ========================================================================= */
@@ -648,8 +578,7 @@
   union {
     struct {
       uint16_t Cycle_Time : 12;  /**< Duration of a Full Measurement Cycle */
-      uint16_t Cycle_Type :  1;  /**< Type of Measurement Cycle */
-      uint16_t Filter_Settling :  1;  /**< Determines ADC Filter Settling in a Multi-Channel Sequence */
+      uint16_t reserved12       :  2;
       uint16_t Cycle_Time_Units :  2;  /**< Units for Cycle Time */
     };
     uint16_t VALUE16;
@@ -738,13 +667,14 @@
   union {
     struct {
       uint16_t Diag_Checksum_Error :  1;  /**< Indicates Error on Internal Checksum Calculations */
-      uint16_t Diag_Comms_Error    :  1;  /**< Indicates Error on Internal Device Communications */
-      uint16_t Diag_Supply_Monitor_Error :  1;  /**< Indicates Low Voltage on Internal Supply Voltages */
-      uint16_t Diag_Supply_Cap_Error     :  1;  /**< Indicates Fault on Internal Supply Regulator Capacitor */
-      uint16_t reserved4                 :  8;
-      uint16_t Diag_Conversion_Error     :  1;  /**< Indicates Error During Internal ADC Conversions */
-      uint16_t Diag_Calibration_Error    :  1;  /**< Indicates Error During Internal Device Calibrations */
-      uint16_t reserved14                :  2;
+      uint16_t reserved1           :  7;
+      uint16_t Diag_Ainm_UV_Error  :  1;  /**< Indicates Under-Voltage Error on Negative Analog Input */
+      uint16_t Diag_Ainm_OV_Error  :  1;  /**< Indicates Over-Voltage Error on Negative Analog Input */
+      uint16_t Diag_Ainp_UV_Error  :  1;  /**< Indicates Under-Voltage Error on Positive Analog Input */
+      uint16_t Diag_Ainp_OV_Error  :  1;  /**< Indicates Over-Voltage Error on Positive Analog Input */
+      uint16_t Diag_Conversion_Error :  1;  /**< Indicates Error During Internal ADC Conversions */
+      uint16_t Diag_Calibration_Error :  1;  /**< Indicates Error During Internal Device Calibrations */
+      uint16_t reserved14             :  2;
     };
     uint16_t VALUE16;
   };
@@ -776,10 +706,7 @@
       uint16_t Alert_Ch9  :  1;  /**< Indicates Channel Alert is Active */
       uint16_t Alert_Ch10 :  1;  /**< Indicates Channel Alert is Active */
       uint16_t Alert_Ch11 :  1;  /**< Indicates Channel Alert is Active */
-      uint16_t Alert_Ch12 :  1;  /**< Indicates Channel Alert is Active */
-      uint16_t Alert_Ch13 :  1;  /**< Indicates Channel Alert is Active */
-      uint16_t Alert_Ch14 :  1;  /**< Indicates Channel Alert is Active */
-      uint16_t Alert_Ch15 :  1;  /**< Indicates Channel Alert is Active */
+      uint16_t reserved12 :  4;
     };
     uint16_t VALUE16;
   };
@@ -802,12 +729,7 @@
       uint16_t reserved0  :  1;
       uint16_t LUT_Error  :  1;  /**< Indicates Error with One or More Look-Up-Tables */
       uint16_t Configuration_Error :  1;  /**< Indicates Error with Programmed Configuration */
-      uint16_t Temperature_Alert_Hi :  1;  /**< Indicates Device Temperature High Alert */
-      uint16_t Temperature_Alert_Lo :  1;  /**< Indicates Device Temperature Low Alert */
-      uint16_t Temperature_Alarm_Hi :  1;  /**< Indicates Device Temperature High Alarm */
-      uint16_t Temperature_Alarm_Lo :  1;  /**< Indicates Device Temperature Low Alarm */
-      uint16_t Ext_Flash_Error      :  1;  /**< Indicates with External Flash Memory */
-      uint16_t reserved8            :  8;
+      uint16_t reserved3           : 13;
     };
     uint16_t VALUE16;
   };
@@ -890,43 +812,43 @@
 
 /*@}*/
 
-/** @defgroup External_Reference1 External Reference Information (External_Reference1) Register
- *  External Reference Information (External_Reference1) Register.
+/** @defgroup External_Reference_Resistor External Reference Information (External_Reference_Resistor) Register
+ *  External Reference Information (External_Reference_Resistor) Register.
  *  @{
  */
 
 /* ==========================================================================
- *! \struct CORE_External_Reference1_Struct
+ *! \struct CORE_External_Reference_Resistor_Struct
  *! \brief  External Reference Information Register bit field structure
  * ========================================================================== */
-typedef struct CORE_External_Reference1_t {
+typedef struct CORE_External_Reference_Resistor_t {
   union {
     struct {
       float Ext_Refin1_Value;  /**< Refin1 Value */
     };
     float VALUE32;
   };
-} CORE_External_Reference1_t;
+} CORE_External_Reference_Resistor_t;
 
 /*@}*/
 
-/** @defgroup External_Reference2 External Reference Information (External_Reference2) Register
- *  External Reference Information (External_Reference2) Register.
+/** @defgroup External_Voltage_Reference External Reference Information (External_Voltage_Reference) Register
+ *  External Reference Information (External_Voltage_Reference) Register.
  *  @{
  */
 
 /* ==========================================================================
- *! \struct CORE_External_Reference2_Struct
+ *! \struct CORE_External_Voltage_Reference_Struct
  *! \brief  External Reference Information Register bit field structure
  * ========================================================================== */
-typedef struct CORE_External_Reference2_t {
+typedef struct CORE_External_Voltage_Reference_t {
   union {
     struct {
       float Ext_Refin2_Value;  /**< Refin2 Value */
     };
     float VALUE32;
   };
-} CORE_External_Reference2_t;
+} CORE_External_Voltage_Reference_t;
 
 /*@}*/
 
@@ -948,17 +870,6 @@
 } CORE_Diagnostics_Control_Diag_OSD_Freq;
 
 
-/*  =========================================================================
- *! \enum   CORE_Diagnostics_Control_Temperarure_Alarm_Action
- *! \brief  Determines Output in Response to Temperature Alarm (Temperarure_Alarm_Action) Enumerations
- *  ========================================================================= */
-typedef enum
-{
-  CORE_DIAGNOSTICS_CONTROL_TEMPERATURE_ALARM_NAN           = 0,  /**< Sensor Output Equals Not-A-Number in Response to Temperature Alarm            */
-  CORE_DIAGNOSTICS_CONTROL_TEMPERATURE_ALARM_OUTPUT_ACTIVE = 1   /**< Sensor Output is not Clamped to Not-A-Number in Response to Temperature Alarm */
-} CORE_Diagnostics_Control_Temperarure_Alarm_Action;
-
-
 /* ==========================================================================
  *! \struct CORE_Diagnostics_Control_Struct
  *! \brief  Diagnostic Control Register bit field structure
@@ -969,8 +880,7 @@
       uint16_t Diag_Global_En :  1;  /**< Diagnostics Global Enable */
       uint16_t Diag_Meas_En   :  1;  /**< Diagnostics Measure Enable */
       uint16_t Diag_OSD_Freq  :  2;  /**< Diagnostics Open Sensor Detect Frequency */
-      uint16_t Temperarure_Alarm_Action :  1;  /**< Determines Output in Response to Temperature Alarm */
-      uint16_t reserved5                : 11;
+      uint16_t reserved4      : 12;
     };
     uint16_t VALUE16;
   };
@@ -1018,81 +928,6 @@
 
 /*@}*/
 
-/** @defgroup FFT_Config FFT Configuration (FFT_Config) Register
- *  FFT Configuration (FFT_Config) Register.
- *  @{
- */
-
-/*  =========================================================================
- *! \enum   CORE_FFT_Config_FFT_Num_Bins
- *! \brief  Indicates Number of Bins in FFT (FFT_Num_Bins) Enumerations
- *  ========================================================================= */
-typedef enum
-{
-  CORE_FFT_CONFIG_FFT_BINS_256  = 0,  /**< FFT Size 256  */
-  CORE_FFT_CONFIG_FFT_BINS_512  = 1,  /**< FFT Size 512  */
-  CORE_FFT_CONFIG_FFT_BINS_1024 = 2,  /**< FFT Size 1024 */
-  CORE_FFT_CONFIG_FFT_BINS_2048 = 3   /**< FFT Size 2048 */
-} CORE_FFT_Config_FFT_Num_Bins;
-
-
-/*  =========================================================================
- *! \enum   CORE_FFT_Config_FFT_Window
- *! \brief  Indicates Window Type for FFT (FFT_Window) Enumerations
- *  ========================================================================= */
-typedef enum
-{
-  CORE_FFT_CONFIG_FFT_WINDOW_NONE             = 0,  /**< No Window                      */
-  CORE_FFT_CONFIG_FFT_WINDOW_HANN             = 1,  /**< Hann Window                    */
-  CORE_FFT_CONFIG_FFT_WINDOW_BLACKMANN_HARRIS = 2,  /**< Blackman-Harris-Nuttall Window */
-  CORE_FFT_CONFIG_FFT_WINDOW_TBD              = 3   /**< Reserved                       */
-} CORE_FFT_Config_FFT_Window;
-
-
-/*  =========================================================================
- *! \enum   CORE_FFT_Config_FFT_Output
- *! \brief  Indicates FFT Output Format (FFT_Output) Enumerations
- *  ========================================================================= */
-typedef enum
-{
-  CORE_FFT_CONFIG_FFT_OUTPUT_FULL          = 0,  /**< N/2-Term Amplitude Response                                        */
-  CORE_FFT_CONFIG_FFT_OUTPUT_MAX16         = 1,  /**< Bin-Number and Amplitude of 16 Highest Peaks of Amplitude Response */
-  CORE_FFT_CONFIG_FFT_OUTPUT_FULL_WITH_RAW = 2   /**< N/2-Term Amplitude Response Plus N Raw ADC Samples                 */
-} CORE_FFT_Config_FFT_Output;
-
-
-/*  =========================================================================
- *! \enum   CORE_FFT_Config_FFT_Num_Channels
- *! \brief  Indicates Number of Channels for FFT (FFT_Num_Channels) Enumerations
- *  ========================================================================= */
-typedef enum
-{
-  CORE_FFT_CONFIG_FFT_CHANS_1 = 0,  /**< One FFT Channel    */
-  CORE_FFT_CONFIG_FFT_CHANS_2 = 1,  /**< Two FFT Channels   */
-  CORE_FFT_CONFIG_FFT_CHANS_3 = 2,  /**< Three FFT Channels */
-  CORE_FFT_CONFIG_FFT_CHANS_4 = 3   /**< Four FFT Channels  */
-} CORE_FFT_Config_FFT_Num_Channels;
-
-
-/* ==========================================================================
- *! \struct CORE_FFT_Config_Struct
- *! \brief  FFT Configuration Register bit field structure
- * ========================================================================== */
-typedef struct CORE_FFT_Config_t {
-  union {
-    struct {
-      uint32_t FFT_Num_Bins :  2;  /**< Indicates Number of Bins in FFT */
-      uint32_t FFT_Window   :  2;  /**< Indicates Window Type for FFT */
-      uint32_t FFT_Output   :  2;  /**< Indicates FFT Output Format */
-      uint32_t FFT_Num_Channels :  2;  /**< Indicates Number of Channels for FFT */
-      uint32_t reserved8        : 24;
-    };
-    uint32_t VALUE32;
-  };
-} CORE_FFT_Config_t;
-
-/*@}*/
-
 /** @defgroup Advanced_Sensor_Access Enables Access to Advanced Sensor Configuration (Advanced_Sensor_Access) Register
  *  Enables Access to Advanced Sensor Configuration (Advanced_Sensor_Access) Register.
  *  @{
@@ -1186,66 +1021,6 @@
 
 /*@}*/
 
-/** @defgroup Ext_Flash_Index Start Position (Sample No.) for Retrieval of Ext. Flash Data (Ext_Flash_Index) Register
- *  Start Position (Sample No.) for Retrieval of Ext. Flash Data (Ext_Flash_Index) Register.
- *  @{
- */
-
-/* ==========================================================================
- *! \struct CORE_Ext_Flash_Index_Struct
- *! \brief  Start Position (Sample No.) for Retrieval of Ext. Flash Data Register bit field structure
- * ========================================================================== */
-typedef struct CORE_Ext_Flash_Index_t {
-  union {
-    struct {
-      uint32_t Ext_Flash_Index : 32;  /**< Start Position (Sample No.) for Retrieval of Ext. Flash Data */
-    };
-    uint32_t VALUE32;
-  };
-} CORE_Ext_Flash_Index_t;
-
-/*@}*/
-
-/** @defgroup Ext_Flash_Sample_Count Indicates How Many Samples Stored in External Flash (Ext_Flash_Sample_Count) Register
- *  Indicates How Many Samples Stored in External Flash (Ext_Flash_Sample_Count) Register.
- *  @{
- */
-
-/* ==========================================================================
- *! \struct CORE_Ext_Flash_Sample_Count_Struct
- *! \brief  Indicates How Many Samples Stored in External Flash Register bit field structure
- * ========================================================================== */
-typedef struct CORE_Ext_Flash_Sample_Count_t {
-  union {
-    struct {
-      uint32_t Ext_Flash_Sample_Count : 32;  /**< Indicates How Many Samples Stored in External Flash */
-    };
-    uint32_t VALUE32;
-  };
-} CORE_Ext_Flash_Sample_Count_t;
-
-/*@}*/
-
-/** @defgroup Ext_Flash_Data Data Read Back from External Flash (Ext_Flash_Data) Register
- *  Data Read Back from External Flash (Ext_Flash_Data) Register.
- *  @{
- */
-
-/* ==========================================================================
- *! \struct CORE_Ext_Flash_Data_Struct
- *! \brief  Data Read Back from External Flash Register bit field structure
- * ========================================================================== */
-typedef struct CORE_Ext_Flash_Data_t {
-  union {
-    struct {
-      uint8_t Ext_Flash_Data :  8;  /**< Data Read Back from External Flash */
-    };
-    uint8_t VALUE8;
-  };
-} CORE_Ext_Flash_Data_t;
-
-/*@}*/
-
 /** @defgroup Revision Hardware, Firmware Revision (Revision) Register
  *  Hardware, Firmware Revision (Revision) Register.
  *  @{
@@ -1294,17 +1069,6 @@
  *  @{
  */
 
-/*  =========================================================================
- *! \enum   CORE_Channel_Options_FFT_Enable_Ch
- *! \brief  Indicates Channel to Be Used for FFT (FFT_Enable_Ch) Enumerations
- *  ========================================================================= */
-typedef enum
-{
-  CORE_CHANNEL_OPTIONS_NO_FFT = 0,  /**< FFT Will not be Performed on This Channel */
-  CORE_CHANNEL_OPTIONS_DO_FFT = 1   /**< FFT Will be Performed on This Channel     */
-} CORE_Channel_Options_FFT_Enable_Ch;
-
-
 /* ==========================================================================
  *! \struct CORE_Channel_Options_Struct
  *! \brief  Position of Channel Within Sequence and Enable for FFT Register bit field structure
@@ -1313,8 +1077,7 @@
   union {
     struct {
       uint8_t Channel_Priority :  4;  /**< Indicates Priority or Position of This Channel in Sequence */
-      uint8_t reserved4        :  3;
-      uint8_t FFT_Enable_Ch    :  1;  /**< Indicates Channel to Be Used for FFT */
+      uint8_t reserved4        :  4;
     };
     uint8_t VALUE8;
   };
@@ -1333,164 +1096,35 @@
  *  ========================================================================= */
 typedef enum
 {
-  CORE_SENSOR_TYPE_SENSOR_THERMOCOUPLE_T_DEF_L1      = 0,     /**< Thermocouple T-Type Sensor Defined Level 1             */
-  CORE_SENSOR_TYPE_SENSOR_THERMOCOUPLE_J_DEF_L1      = 1,     /**< Thermocouple J-Type Sensor Defined Level 1             */
-  CORE_SENSOR_TYPE_SENSOR_THERMOCOUPLE_K_DEF_L1      = 2,     /**< Thermocouple K-Type Sensor Defined Level 1             */
-  CORE_SENSOR_TYPE_SENSOR_THERMOCOUPLE_1_DEF_L2      = 8,     /**< Thermocouple Sensor 1 Defined Level 2                  */
-  CORE_SENSOR_TYPE_SENSOR_THERMOCOUPLE_2_DEF_L2      = 9,     /**< Thermocouple Sensor 2 Defined Level 2                  */
-  CORE_SENSOR_TYPE_SENSOR_THERMOCOUPLE_3_DEF_L2      = 10,    /**< Thermocouple Sensor 3 Defined Level 2                  */
-  CORE_SENSOR_TYPE_SENSOR_THERMOCOUPLE_4_DEF_L2      = 11,    /**< Thermocouple Sensor 4 Defined Level 2                  */
-  CORE_SENSOR_TYPE_SENSOR_THERMOCOUPLE_T_ADV_L1      = 16,    /**< Thermocouple T-Type Sensor Advanced Level 1            */
-  CORE_SENSOR_TYPE_SENSOR_THERMOCOUPLE_J_ADV_L1      = 17,    /**< Thermocouple J-Type Sensor Advanced Level 1            */
-  CORE_SENSOR_TYPE_SENSOR_THERMOCOUPLE_K_ADV_L1      = 18,    /**< Thermocouple K-Type Sensor Advanced Level 1            */
-  CORE_SENSOR_TYPE_SENSOR_THERMOCOUPLE_1_ADV_L2      = 24,    /**< Thermocouple Sensor 1 Advanced Level 2                 */
-  CORE_SENSOR_TYPE_SENSOR_THERMOCOUPLE_2_ADV_L2      = 25,    /**< Thermocouple Sensor 2 Advanced Level 2                 */
-  CORE_SENSOR_TYPE_SENSOR_THERMOCOUPLE_3_ADV_L2      = 26,    /**< Thermocouple Sensor 3 Advanced Level 2                 */
-  CORE_SENSOR_TYPE_SENSOR_THERMOCOUPLE_4_ADV_L2      = 27,    /**< Thermocouple Sensor 4 Advanced Level 2                 */
-  CORE_SENSOR_TYPE_SENSOR_RTD_2W_PT100_DEF_L1        = 32,    /**< RTD 2 Wire PT100 Sensor Defined Level 1                */
-  CORE_SENSOR_TYPE_SENSOR_RTD_2W_PT1000_DEF_L1       = 33,    /**< RTD 2 Wire PT1000 Sensor Defined Level 1               */
-  CORE_SENSOR_TYPE_SENSOR_RTD_2W_1_DEF_L2            = 40,    /**< RTD 2 Wire Sensor 1 Defined Level 2                    */
-  CORE_SENSOR_TYPE_SENSOR_RTD_2W_2_DEF_L2            = 41,    /**< RTD 2 Wire Sensor 2 Defined Level 2                    */
-  CORE_SENSOR_TYPE_SENSOR_RTD_2W_3_DEF_L2            = 42,    /**< RTD 2 Wire Sensor 3 Defined Level 2                    */
-  CORE_SENSOR_TYPE_SENSOR_RTD_2W_4_DEF_L2            = 43,    /**< RTD 2 Wire Sensor 4 Defined Level 2                    */
-  CORE_SENSOR_TYPE_SENSOR_RTD_2W_PT100_ADV_L1        = 48,    /**< RTD 2 Wire PT100 Sensor Advanced Level 1               */
-  CORE_SENSOR_TYPE_SENSOR_RTD_2W_PT1000_ADV_L1       = 49,    /**< RTD 2 Wire PT1000 Sensor Advanced Level 1              */
-  CORE_SENSOR_TYPE_SENSOR_RTD_2W_1_ADV_L2            = 56,    /**< RTD 2 Wire Sensor 1 Advanced Level 2                   */
-  CORE_SENSOR_TYPE_SENSOR_RTD_2W_2_ADV_L2            = 57,    /**< RTD 2 Wire Sensor 2 Advanced Level 2                   */
-  CORE_SENSOR_TYPE_SENSOR_RTD_2W_3_ADV_L2            = 58,    /**< RTD 2 Wire Sensor 3 Advanced Level 2                   */
-  CORE_SENSOR_TYPE_SENSOR_RTD_2W_4_ADV_L2            = 59,    /**< RTD 2 Wire Sensor 4 Advanced Level 2                   */
-  CORE_SENSOR_TYPE_SENSOR_RTD_3W_PT100_DEF_L1        = 64,    /**< RTD 3 Wire PT100 Sensor Defined Level 1                */
-  CORE_SENSOR_TYPE_SENSOR_RTD_3W_PT1000_DEF_L1       = 65,    /**< RTD 3 Wire PT1000 Sensor Defined Level 1               */
-  CORE_SENSOR_TYPE_SENSOR_RTD_3W_1_DEF_L2            = 72,    /**< RTD 3 Wire Sensor 1 Defined Level 2                    */
-  CORE_SENSOR_TYPE_SENSOR_RTD_3W_2_DEF_L2            = 73,    /**< RTD 3 Wire Sensor 2 Defined Level 2                    */
-  CORE_SENSOR_TYPE_SENSOR_RTD_3W_3_DEF_L2            = 74,    /**< RTD 3 Wire Sensor 3 Defined Level 2                    */
-  CORE_SENSOR_TYPE_SENSOR_RTD_3W_4_DEF_L2            = 75,    /**< RTD 3 Wire Sensor 4 Defined Level 2                    */
-  CORE_SENSOR_TYPE_SENSOR_RTD_3W_PT100_ADV_L1        = 80,    /**< RTD 3 Wire PT100 Sensor Advanced Level 1               */
-  CORE_SENSOR_TYPE_SENSOR_RTD_3W_PT1000_ADV_L1       = 81,    /**< RTD 3 Wire PT1000 Sensor Advanced Level 1              */
-  CORE_SENSOR_TYPE_SENSOR_RTD_3W_1_ADV_L2            = 88,    /**< RTD 3 Wire Sensor 1 Advanced Level 2                   */
-  CORE_SENSOR_TYPE_SENSOR_RTD_3W_2_ADV_L2            = 89,    /**< RTD 3 Wire Sensor 2 Advanced Level 2                   */
-  CORE_SENSOR_TYPE_SENSOR_RTD_3W_3_ADV_L2            = 90,    /**< RTD 3 Wire Sensor 3 Advanced Level 2                   */
-  CORE_SENSOR_TYPE_SENSOR_RTD_3W_4_ADV_L2            = 91,    /**< RTD 3 Wire Sensor 4 Advanced Level 2                   */
-  CORE_SENSOR_TYPE_SENSOR_RTD_4W_PT100_DEF_L1        = 96,    /**< RTD 4 Wire PT100 Sensor Defined Level 1                */
-  CORE_SENSOR_TYPE_SENSOR_RTD_4W_PT1000_DEF_L1       = 97,    /**< RTD 4 Wire PT1000 Sensor Defined Level 1               */
-  CORE_SENSOR_TYPE_SENSOR_RTD_4W_1_DEF_L2            = 104,   /**< RTD 4 Wire Sensor 1 Defined Level 2                    */
-  CORE_SENSOR_TYPE_SENSOR_RTD_4W_2_DEF_L2            = 105,   /**< RTD 4 Wire Sensor 2 Defined Level 2                    */
-  CORE_SENSOR_TYPE_SENSOR_RTD_4W_3_DEF_L2            = 106,   /**< RTD 4 Wire Sensor 3 Defined Level 2                    */
-  CORE_SENSOR_TYPE_SENSOR_RTD_4W_4_DEF_L2            = 107,   /**< RTD 4 Wire Sensor 4 Defined Level 2                    */
-  CORE_SENSOR_TYPE_SENSOR_RTD_4W_PT100_ADV_L1        = 112,   /**< RTD 4 Wire PT100 Sensor Advanced Level 1               */
-  CORE_SENSOR_TYPE_SENSOR_RTD_4W_PT1000_ADV_L1       = 113,   /**< RTD 4 Wire PT1000 Sensor Advanced Level 1              */
-  CORE_SENSOR_TYPE_SENSOR_RTD_4W_1_ADV_L2            = 120,   /**< RTD 4 Wire Sensor 1 Advanced Level 2                   */
-  CORE_SENSOR_TYPE_SENSOR_RTD_4W_2_ADV_L2            = 121,   /**< RTD 4 Wire Sensor 2 Advanced Level 2                   */
-  CORE_SENSOR_TYPE_SENSOR_RTD_4W_3_ADV_L2            = 122,   /**< RTD 4 Wire Sensor 3 Advanced Level 2                   */
-  CORE_SENSOR_TYPE_SENSOR_RTD_4W_4_ADV_L2            = 123,   /**< RTD 4 Wire Sensor 4 Advanced Level 2                   */
-  CORE_SENSOR_TYPE_SENSOR_THERMISTOR_A_10K_DEF_L1    = 128,   /**< Thermistor Type A 10kOhm Sensor Defined Level 1        */
-  CORE_SENSOR_TYPE_SENSOR_THERMISTOR_B_10K_DEF_L1    = 129,   /**< Thermistor Type B 10kOhm Sensor Defined Level 1        */
-  CORE_SENSOR_TYPE_SENSOR_THERMISTOR_1_DEF_L2        = 136,   /**< Thermistor Sensor 1 Defined Level 2                    */
-  CORE_SENSOR_TYPE_SENSOR_THERMISTOR_2_DEF_L2        = 137,   /**< Thermistor Sensor 2 Defined Level 2                    */
-  CORE_SENSOR_TYPE_SENSOR_THERMISTOR_3_DEF_L2        = 138,   /**< Thermistor Sensor 3 Defined Level 2                    */
-  CORE_SENSOR_TYPE_SENSOR_THERMISTOR_4_DEF_L2        = 139,   /**< Thermistor Sensor 4 Defined Level 2                    */
-  CORE_SENSOR_TYPE_SENSOR_THERMISTOR_A_10K_ADV_L1    = 144,   /**< Thermistor Type A 10kOhm Sensor Advanced Level 1       */
-  CORE_SENSOR_TYPE_SENSOR_THERMISTOR_B_10K_ADV_L1    = 145,   /**< Thermistor Type B 10kOhm Sensor Advanced Level 1       */
-  CORE_SENSOR_TYPE_SENSOR_THERMISTOR_1_ADV_L2        = 152,   /**< Thermistor Sensor 1 Advanced Level 2                   */
-  CORE_SENSOR_TYPE_SENSOR_THERMISTOR_2_ADV_L2        = 153,   /**< Thermistor Sensor 2 Advanced Level 2                   */
-  CORE_SENSOR_TYPE_SENSOR_THERMISTOR_3_ADV_L2        = 154,   /**< Thermistor Sensor 3 Advanced Level 2                   */
-  CORE_SENSOR_TYPE_SENSOR_THERMISTOR_4_ADV_L2        = 155,   /**< Thermistor Sensor 4 Advanced Level 2                   */
-  CORE_SENSOR_TYPE_SENSOR_BRIDGE_4W_1_DEF_L2         = 168,   /**< Bridge 4 Wire Sensor 1 Defined Level 2                 */
-  CORE_SENSOR_TYPE_SENSOR_BRIDGE_4W_2_DEF_L2         = 169,   /**< Bridge 4 Wire Sensor 2 Defined Level 2                 */
-  CORE_SENSOR_TYPE_SENSOR_BRIDGE_4W_3_DEF_L2         = 170,   /**< Bridge 4 Wire Sensor 3 Defined Level 2                 */
-  CORE_SENSOR_TYPE_SENSOR_BRIDGE_4W_4_DEF_L2         = 171,   /**< Bridge 4 Wire Sensor 4 Defined Level 2                 */
-  CORE_SENSOR_TYPE_SENSOR_BRIDGE_4W_1_ADV_L2         = 184,   /**< Bridge 4 Wire Sensor 1 Advanced Level 2                */
-  CORE_SENSOR_TYPE_SENSOR_BRIDGE_4W_2_ADV_L2         = 185,   /**< Bridge 4 Wire Sensor 2 Advanced Level 2                */
-  CORE_SENSOR_TYPE_SENSOR_BRIDGE_4W_3_ADV_L2         = 186,   /**< Bridge 4 Wire Sensor 2 Advanced Level 2                */
-  CORE_SENSOR_TYPE_SENSOR_BRIDGE_4W_4_ADV_L2         = 187,   /**< Bridge 4 Wire Sensor 2 Advanced Level 2                */
-  CORE_SENSOR_TYPE_SENSOR_BRIDGE_6W_1_DEF_L2         = 200,   /**< Bridge 6 Wire Sensor 1 Defined Level 2                 */
-  CORE_SENSOR_TYPE_SENSOR_BRIDGE_6W_2_DEF_L2         = 201,   /**< Bridge 6 Wire Sensor 2 Defined Level 2                 */
-  CORE_SENSOR_TYPE_SENSOR_BRIDGE_6W_3_DEF_L2         = 202,   /**< Bridge 6 Wire Sensor 3 Defined Level 2                 */
-  CORE_SENSOR_TYPE_SENSOR_BRIDGE_6W_4_DEF_L2         = 203,   /**< Bridge 6 Wire Sensor 4 Defined Level 2                 */
-  CORE_SENSOR_TYPE_SENSOR_BRIDGE_6W_1_ADV_L2         = 216,   /**< Bridge 6 Wire Sensor 1 Advanced Level 2                */
-  CORE_SENSOR_TYPE_SENSOR_BRIDGE_6W_2_ADV_L2         = 217,   /**< Bridge 6 Wire Sensor 2 Advanced Level 2                */
-  CORE_SENSOR_TYPE_SENSOR_BRIDGE_6W_3_ADV_L2         = 218,   /**< Bridge 6 Wire Sensor 3 Advanced Level 2                */
-  CORE_SENSOR_TYPE_SENSOR_BRIDGE_6W_4_ADV_L2         = 219,   /**< Bridge 6 Wire Sensor 4 Advanced Level 2                */
-  CORE_SENSOR_TYPE_SENSOR_DIODE_2C_TYPEA_DEF_L1      = 224,   /**< Diode 2 Current Type A Sensor Defined Level 1          */
-  CORE_SENSOR_TYPE_SENSOR_DIODE_3C_TYPEA_DEF_L1      = 225,   /**< Diode 3 Current Type A Sensor Defined Level 1          */
-  CORE_SENSOR_TYPE_SENSOR_DIODE_2C_1_DEF_L2          = 232,   /**< Diode 2 Current Sensor 1 Defined Level 2               */
-  CORE_SENSOR_TYPE_SENSOR_DIODE_3C_1_DEF_L2          = 233,   /**< Diode 3 Current Sensor 1 Defined Level 2               */
-  CORE_SENSOR_TYPE_SENSOR_DIODE_2C_TYPEA_ADV_L1      = 240,   /**< Diode 2 Current Type A Sensor Advanced Level 1         */
-  CORE_SENSOR_TYPE_SENSOR_DIODE_3C_TYPEA_ADV_L1      = 241,   /**< Diode 3 Current Type A Sensor Advanced Level 1         */
-  CORE_SENSOR_TYPE_SENSOR_DIODE_2C_1_ADV_L2          = 248,   /**< Diode 2 Current Sensor 1 Advanced Level 2              */
-  CORE_SENSOR_TYPE_SENSOR_DIODE_3C_1_ADV_L2          = 249,   /**< Diode 3 Current Sensor 1 Advanced Level 2              */
-  CORE_SENSOR_TYPE_SENSOR_MICROPHONE_A_DEF_L1        = 256,   /**< Microphone With No External Amplifier Defined Level 1  */
-  CORE_SENSOR_TYPE_SENSOR_MICROPHONE_B_DEF_L1        = 257,   /**< Microphone With External Amplifier Defined Level 1     */
-  CORE_SENSOR_TYPE_SENSOR_MICROPHONE_1_DEF_L2        = 264,   /**< Microphone With No External Amplifier Defined Level 2  */
-  CORE_SENSOR_TYPE_SENSOR_MICROPHONE_2_DEF_L2        = 265,   /**< Microphone With External Amplifier Defined Level 2     */
-  CORE_SENSOR_TYPE_SENSOR_MICROPHONE_A_ADV_L1        = 272,   /**< Microphone With No External Amplifier Advanced Level 1 */
-  CORE_SENSOR_TYPE_SENSOR_MICROPHONE_B_ADV_L1        = 273,   /**< Microphone With External Amplifier Advanced Level 1    */
-  CORE_SENSOR_TYPE_SENSOR_MICROPHONE_1_ADV_L2        = 278,   /**< Microphone With No External Amplifier Advanced Level 2 */
-  CORE_SENSOR_TYPE_SENSOR_MICROPHONE_2_ADV_L2        = 279,   /**< Microphone With External Amplifier Advanced Level 2    */
-  CORE_SENSOR_TYPE_SENSOR_VOLTAGE                    = 512,   /**< Voltage Input                                          */
-  CORE_SENSOR_TYPE_SENSOR_VOLTAGE_PRESSURE_A_DEF_L1  = 544,   /**< Voltage Output Pressure Sensor A Defined Level 1       */
-  CORE_SENSOR_TYPE_SENSOR_VOLTAGE_PRESSURE_B_DEF_L1  = 545,   /**< Voltage Output Pressure Sensor B Defined Level 1       */
-  CORE_SENSOR_TYPE_SENSOR_VOLTAGE_PRESSURE_1_DEF_L2  = 552,   /**< Voltage Output Pressure Sensor 1 Defined Level 2       */
-  CORE_SENSOR_TYPE_SENSOR_VOLTAGE_PRESSURE_2_DEF_L2  = 553,   /**< Voltage Output Pressure Sensor 2 Defined Level 2       */
-  CORE_SENSOR_TYPE_SENSOR_VOLTAGE_PRESSURE_A_ADV_L1  = 560,   /**< Voltage Output Pressure Sensor A Advanced Level 1      */
-  CORE_SENSOR_TYPE_SENSOR_VOLTAGE_PRESSURE_B_ADV_L1  = 561,   /**< Voltage Output Pressure Sensor B Advanced Level 1      */
-  CORE_SENSOR_TYPE_SENSOR_VOLTAGE_PRESSURE_1_ADV_L2  = 568,   /**< Voltage Output Pressure Sensor 1 Advanced Level 2      */
-  CORE_SENSOR_TYPE_SENSOR_VOLTAGE_PRESSURE_2_ADV_L2  = 569,   /**< Voltage Output Pressure Sensor 2 Advanced Level 2      */
-  CORE_SENSOR_TYPE_SENSOR_CURRENT                    = 768,   /**< Current Input                                          */
-  CORE_SENSOR_TYPE_SENSOR_CURRENT_PRESSURE_A_DEF_L1  = 800,   /**< Current Output Pressure Sensor A Defined Level 1       */
-  CORE_SENSOR_TYPE_SENSOR_CURRENT_PRESSURE_1_DEF_L2  = 808,   /**< Current Output Pressure Sensor 1 Defined Level 2       */
-  CORE_SENSOR_TYPE_SENSOR_CURRENT_PRESSURE_2_DEF_L2  = 809,   /**< Current Output Pressure Sensor 2 Defined Level 2       */
-  CORE_SENSOR_TYPE_SENSOR_CURRENT_PRESSURE_A_ADV_L1  = 816,   /**< Current Output Pressure Sensor A Advanced Level 1      */
-  CORE_SENSOR_TYPE_SENSOR_CURRENT_PRESSURE_1_ADV_L2  = 824,   /**< Current Output Pressure Sensor 1 Advanced Level 2      */
-  CORE_SENSOR_TYPE_SENSOR_CURRENT_PRESSURE_2_ADV_L2  = 825,   /**< Current Output Pressure Sensor 2 Advanced Level 2      */
-  CORE_SENSOR_TYPE_SENSOR_I2C_PRESSURE_A_DEF_L1      = 2048,  /**< I2C Pressure Sensor A Defined Level 1                  */
-  CORE_SENSOR_TYPE_SENSOR_I2C_PRESSURE_B_DEF_L1      = 2049,  /**< I2C Pressure Sensor B Defined Level 1                  */
-  CORE_SENSOR_TYPE_SENSOR_I2C_PRESSURE_A_DEF_L2      = 2056,  /**< I2C Pressure Sensor A Defined Level 2                  */
-  CORE_SENSOR_TYPE_SENSOR_I2C_PRESSURE_B_DEF_L2      = 2057,  /**< I2C Pressure Sensor B Defined Level 2                  */
-  CORE_SENSOR_TYPE_SENSOR_I2C_PRESSURE_A_ADV_L1      = 2064,  /**< I2C Pressure Sensor A Advanced Level 1                 */
-  CORE_SENSOR_TYPE_SENSOR_I2C_PRESSURE_B_ADV_L1      = 2065,  /**< I2C Pressure Sensor B Advanced Level 1                 */
-  CORE_SENSOR_TYPE_SENSOR_I2C_PRESSURE_A_ADV_L2      = 2072,  /**< I2C Pressure Sensor A Advanced Level 2                 */
-  CORE_SENSOR_TYPE_SENSOR_I2C_PRESSURE_B_ADV_L2      = 2073,  /**< I2C Pressure Sensor B Advanced Level 2                 */
-  CORE_SENSOR_TYPE_SENSOR_I2C_HUMIDITY_A_DEF_L1      = 2112,  /**< I2C Humidity Sensor A Defined Level 1                  */
-  CORE_SENSOR_TYPE_SENSOR_I2C_HUMIDITY_B_DEF_L1      = 2113,  /**< I2C Humidity Sensor B Defined Level 1                  */
-  CORE_SENSOR_TYPE_SENSOR_I2C_HUMIDITY_A_DEF_L2      = 2120,  /**< I2C Humidity Sensor A Defined Level 2                  */
-  CORE_SENSOR_TYPE_SENSOR_I2C_HUMIDITY_B_DEF_L2      = 2121,  /**< I2C Humidity Sensor B Defined Level 2                  */
-  CORE_SENSOR_TYPE_SENSOR_I2C_HUMIDITY_A_ADV_L1      = 2128,  /**< I2C Humidity Sensor A Advanced Level 1                 */
-  CORE_SENSOR_TYPE_SENSOR_I2C_HUMIDITY_B_ADV_L1      = 2129,  /**< I2C Humidity Sensor B Advanced Level 1                 */
-  CORE_SENSOR_TYPE_SENSOR_I2C_HUMIDITY_A_ADV_L2      = 2136,  /**< I2C Humidity Sensor A Advanced Level 2                 */
-  CORE_SENSOR_TYPE_SENSOR_I2C_HUMIDITY_B_ADV_L2      = 2137,  /**< I2C Humidity Sensor B Advanced Level 2                 */
-  CORE_SENSOR_TYPE_SENSOR_I2C_AMBIENTLIGHT_A_DEF_L1  = 2176,  /**< I2C Ambient Light Sensor A Defined Level 1             */
-  CORE_SENSOR_TYPE_SENSOR_I2C_AMBIENTLIGHT_A_DEF_L2  = 2184,  /**< I2C Ambient Light Sensor A Defined Level 2             */
-  CORE_SENSOR_TYPE_SENSOR_I2C_AMBIENTLIGHT_A_ADV_L1  = 2192,  /**< I2C Ambient Light Sensor A Advanced Level 1            */
-  CORE_SENSOR_TYPE_SENSOR_I2C_AMBIENTLIGHT_A_ADV_L2  = 2200,  /**< I2C Ambient Light Sensor A Advanced Level 2            */
-  CORE_SENSOR_TYPE_SENSOR_SPI_PRESSURE_A_DEF_L1      = 3072,  /**< SPI Pressure Sensor A Defined Level 1                  */
-  CORE_SENSOR_TYPE_SENSOR_SPI_PRESSURE_A_DEF_L2      = 3080,  /**< SPI Pressure Sensor A Defined Level 2                  */
-  CORE_SENSOR_TYPE_SENSOR_SPI_PRESSURE_A_ADV_L1      = 3088,  /**< SPI Pressure Sensor A Advanced Level 1                 */
-  CORE_SENSOR_TYPE_SENSOR_SPI_PRESSURE_A_ADV_L2      = 3096,  /**< SPI Pressure Sensor A Advanced Level 2                 */
-  CORE_SENSOR_TYPE_SENSOR_SPI_HUMIDITY_A_DEF_L1      = 3136,  /**< SPI Humidity Sensor A Defined Level 1                  */
-  CORE_SENSOR_TYPE_SENSOR_SPI_HUMIDITY_B_DEF_L1      = 3137,  /**< SPI Humidity Sensor B Defined Level 1                  */
-  CORE_SENSOR_TYPE_SENSOR_SPI_HUMIDITY_A_DEF_L2      = 3144,  /**< SPI Humidity Sensor A Defined Level 2                  */
-  CORE_SENSOR_TYPE_SENSOR_SPI_HUMIDITY_B_DEF_L2      = 3145,  /**< SPI Humidity Sensor B Defined Level 2                  */
-  CORE_SENSOR_TYPE_SENSOR_SPI_HUMIDITY_A_ADV_L1      = 3152,  /**< SPI Humidity Sensor A Advanced Level 1                 */
-  CORE_SENSOR_TYPE_SENSOR_SPI_HUMIDITY_B_ADV_L1      = 3153,  /**< SPI Humidity Sensor B Advanced Level 1                 */
-  CORE_SENSOR_TYPE_SENSOR_SPI_HUMIDITY_A_ADV_L2      = 3160,  /**< SPI Humidity Sensor A Advanced Level 2                 */
-  CORE_SENSOR_TYPE_SENSOR_SPI_HUMIDITY_B_ADV_L2      = 3161,  /**< SPI Humidity Sensor B Advanced Level 2                 */
-  CORE_SENSOR_TYPE_SENSOR_SPI_ACCELEROMETER_A_DEF_L1 = 3200,  /**< SPI Accelerometer Sensor A 3-Axis Defined Level 1      */
-  CORE_SENSOR_TYPE_SENSOR_SPI_ACCELEROMETER_B_DEF_L1 = 3201,  /**< SPI Accelerometer Sensor B 3-Axis Defined Level 1      */
-  CORE_SENSOR_TYPE_SENSOR_SPI_ACCELEROMETER_A_DEF_L2 = 3208,  /**< SPI Accelerometer Sensor A 3-Axis Defined Level 2      */
-  CORE_SENSOR_TYPE_SENSOR_SPI_ACCELEROMETER_B_DEF_L2 = 3209,  /**< SPI Accelerometer Sensor B 3-Axis Defined Level 2      */
-  CORE_SENSOR_TYPE_SENSOR_SPI_ACCELEROMETER_A_ADV_L1 = 3216,  /**< SPI Accelerometer Sensor A 3-Axis Advanced Level 1     */
-  CORE_SENSOR_TYPE_SENSOR_SPI_ACCELEROMETER_B_ADV_L1 = 3217,  /**< SPI Accelerometer Sensor B 3-Axis Advanced Level 1     */
-  CORE_SENSOR_TYPE_SENSOR_SPI_ACCELEROMETER_A_ADV_L2 = 3224,  /**< SPI Accelerometer Sensor A 3-Axis Advanced Level 2     */
-  CORE_SENSOR_TYPE_SENSOR_SPI_ACCELEROMETER_B_ADV_L2 = 3225,  /**< SPI Accelerometer Sensor B 3-Axis Advanced Level 2     */
-  CORE_SENSOR_TYPE_SENSOR_UART_CO2_A_DEF_L1          = 3584,  /**< UART CO2 Sensor A Defined Level 1                      */
-  CORE_SENSOR_TYPE_SENSOR_UART_CO2_B_DEF_L1          = 3585,  /**< UART CO2 Sensor B Defined Level 1                      */
-  CORE_SENSOR_TYPE_SENSOR_UART_CO2_A_DEF_L2          = 3592,  /**< UART CO2 Sensor A Defined Level 2                      */
-  CORE_SENSOR_TYPE_SENSOR_UART_CO2_B_DEF_L2          = 3593,  /**< UART CO2 Sensor B Defined Level 2                      */
-  CORE_SENSOR_TYPE_SENSOR_UART_CO2_A_ADV_L1          = 3600,  /**< UART CO2 Sensor A Advanced Level 1                     */
-  CORE_SENSOR_TYPE_SENSOR_UART_CO2_B_ADV_L1          = 3601,  /**< UART CO2 Sensor B Advanced Level 1                     */
-  CORE_SENSOR_TYPE_SENSOR_UART_CO2_A_ADV_L2          = 3608,  /**< UART CO2 Sensor A Advanced Level 2                     */
-  CORE_CYCLE_TYPE_SENSOR_UART_CO2_B_ADV_L2          = 3609   /**< UART CO2 Sensor B Advanced Level 2                     */
+  CORE_SENSOR_TYPE_THERMOCOUPLE_T      = 0,     /**< Thermocouple T-Type Sensor Defined Level 1        */
+  CORE_SENSOR_TYPE_THERMOCOUPLE_J      = 1,     /**< Thermocouple J-Type Sensor Defined Level 1        */
+  CORE_SENSOR_TYPE_THERMOCOUPLE_K      = 2,     /**< Thermocouple K-Type Sensor Defined Level 1        */
+  CORE_SENSOR_TYPE_RTD_2W_PT100        = 32,    /**< RTD 2 Wire PT100 Sensor Defined Level 1           */
+  CORE_SENSOR_TYPE_RTD_2W_PT1000       = 33,    /**< RTD 2 Wire PT1000 Sensor Defined Level 1          */
+  CORE_SENSOR_TYPE_RTD_3W_PT100        = 64,    /**< RTD 3 Wire PT100 Sensor Defined Level 1           */
+  CORE_SENSOR_TYPE_RTD_3W_PT1000       = 65,    /**< RTD 3 Wire PT1000 Sensor Defined Level 1          */
+  CORE_SENSOR_TYPE_RTD_4W_PT100        = 96,    /**< RTD 4 Wire PT100 Sensor Defined Level 1           */
+  CORE_SENSOR_TYPE_RTD_4W_PT1000       = 97,    /**< RTD 4 Wire PT1000 Sensor Defined Level 1          */
+  CORE_SENSOR_TYPE_THERMISTOR_A_10K    = 128,   /**< Thermistor Type A 10kOhm Sensor Defined Level 1   */
+  CORE_SENSOR_TYPE_THERMISTOR_B_10K    = 129,   /**< Thermistor Type B 10kOhm Sensor Defined Level 1   */
+  CORE_SENSOR_TYPE_BRIDGE_4W_2         = 169,   /**< Bridge 4 Wire Sensor 2 Defined Level 2            */
+  CORE_SENSOR_TYPE_BRIDGE_6W_1         = 200,   /**< Bridge 6 Wire Sensor 1 Defined Level 2            */
+  CORE_SENSOR_TYPE_BRIDGE_6W_2         = 201,   /**< Bridge 6 Wire Sensor 2 Defined Level 2            */
+  CORE_SENSOR_TYPE_DIODE_2C_TYPEA      = 224,   /**< Diode 2 Current Type A Sensor Defined Level 1     */
+  CORE_SENSOR_TYPE_DIODE_3C_TYPEA      = 225,   /**< Diode 3 Current Type A Sensor Defined Level 1     */
+  CORE_SENSOR_TYPE_DIODE_2C_1          = 232,   /**< Diode 2 Current Sensor 1 Defined Level 2          */
+  CORE_SENSOR_TYPE_DIODE_3C_1          = 233,   /**< Diode 3 Current Sensor 1 Defined Level 2          */
+  CORE_SENSOR_TYPE_VOLTAGE             = 512,   /**< Voltage Input                                     */
+  CORE_SENSOR_TYPE_VOLTAGE_PRESSURE_A  = 544,   /**< Voltage Output Pressure Sensor A Defined Level 1  */
+  CORE_SENSOR_TYPE_VOLTAGE_PRESSURE_B  = 545,   /**< Voltage Output Pressure Sensor B Defined Level 1  */
+  CORE_SENSOR_TYPE_CURRENT             = 768,   /**< Current Input                                     */
+  CORE_SENSOR_TYPE_I2C_PRESSURE_A      = 2048,  /**< I2C Pressure Sensor A Defined Level 1             */
+  CORE_SENSOR_TYPE_I2C_PRESSURE_B      = 2049,  /**< I2C Pressure Sensor B Defined Level 1             */
+  CORE_SENSOR_TYPE_I2C_HUMIDITY_A      = 2112,  /**< I2C Humidity Sensor A Defined Level 1             */
+  CORE_SENSOR_TYPE_I2C_HUMIDITY_B      = 2113,  /**< I2C Humidity Sensor B Defined Level 1             */
+  CORE_SENSOR_TYPE_SPI_ACCELEROMETER_A = 3200,  /**< SPI Accelerometer Sensor A 3-Axis Defined Level 1 */
+  CORE_SENSOR_TYPE_SPI_ACCELEROMETER_B = 3201,  /**< SPI Accelerometer Sensor B 3-Axis Defined Level 1 */
+  CORE_SENSOR_TYPE_CO2_A_DEF           = 3584   /**< CO2 Sensor A Defined Level 1                      */
 } CORE_Sensor_Type_Sensor_Type;
 
 
@@ -1527,6 +1161,20 @@
   CORE_SENSOR_DETAILS_UNITS_DEGF        = 3   /**< Degrees F     */
 } CORE_Sensor_Details_Measurement_Units;
 
+/*  =========================================================================
+ *! \enum   ADMW_CORE_Sensor_Details_LUT_Select
+ *! \brief  Lookup Table Select (LUT_Select) Enumerations
+ *  ========================================================================= */
+typedef enum
+{
+  CORE_SENSOR_DETAILS_LUT_DEFAULT  = 0,  /**< Default Lookup Table for Selected Sensor Type        */
+  CORE_SENSOR_DETAILS_LUT_UNITY    = 1,  /**< Unity Lookup Table. 1:1 Mapping From Input to Output */
+  CORE_SENSOR_DETAILS_LUT_CUSTOM   = 2,  /**< User Defined Custom Lookup Table.                    */
+  CORE_SENSOR_DETAILS_LUT_RESERVED = 3   /**< Reserved                                             */
+} CORE_Sensor_Details_LUT_Select;
+
+
+/*  =========================================================================
 
 /*  =========================================================================
  *! \enum   CORE_Sensor_Details_Reference_Select
@@ -1534,15 +1182,11 @@
  *  ========================================================================= */
 typedef enum
 {
-  CORE_SENSOR_DETAILS_REF_INT   = 0,  /**< Internal Reference          */
-  CORE_SENSOR_DETAILS_REF_AVDD  = 1,  /**< AVDD                        */
-  CORE_SENSOR_DETAILS_REF_VEXT1 = 2,  /**< External Voltage on Refin1  */
-  CORE_SENSOR_DETAILS_REF_VEXT2 = 3,  /**< External Voltage on Refin2  */
-  CORE_SENSOR_DETAILS_REF_RINT1 = 4,  /**< Internal Resistor1          */
-  CORE_SENSOR_DETAILS_REF_RINT2 = 5,  /**< Internal Resistor2          */
-  CORE_SENSOR_DETAILS_REF_REXT1 = 6,  /**< External Resistor on Refin1 */
-  CORE_SENSOR_DETAILS_REF_REXT2 = 7,  /**< External Resistor on Refin2 */
-  CORE_SENSOR_DETAILS_REF_EXC   = 8   /**< Bridge Excitation Voltage   */
+  CORE_SENSOR_DETAILS_REF_INT   = 0,  /**< Internal Reference                             */
+  CORE_SENSOR_DETAILS_REF_AVDD  = 1,  /**< AVDD                                           */
+  CORE_SENSOR_DETAILS_REF_VEXT1 = 2,  /**< External Voltage on Refin1                     */
+  CORE_SENSOR_DETAILS_REF_REXT1 = 6,  /**< External Resistor on RSENSE+ and RSENSE-       */
+  CORE_SENSOR_DETAILS_REF_EXC   = 8   /**< Bridge Excitation Voltage from VREF+ and VREF- */
 } CORE_Sensor_Details_Reference_Select;
 
 
@@ -1563,6 +1207,19 @@
 } CORE_Sensor_Details_PGA_Gain;
 
 
+/*  =========================================================================
+ *! \enum   CORE_Sensor_Details_RTD_Curve
+ *! \brief  Select RTD Curve for Linearisation (RTD_Curve) Enumerations
+ *  ========================================================================= */
+typedef enum
+{
+  CORE_SENSOR_DETAILS_EUROPEAN_CURVE = 0,  /**< European Curve */
+  CORE_SENSOR_DETAILS_AMERICAN_CURVE = 1,  /**< American Curve */
+  CORE_SENSOR_DETAILS_JAPANESE_CURVE = 2,  /**< Japanese Curve */
+  CORE_SENSOR_DETAILS_ITS90_CURVE    = 3   /**< ITS-90 Curve   */
+} CORE_Sensor_Details_RTD_Curve;
+
+
 /* ==========================================================================
  *! \struct CORE_Sensor_Details_Struct
  *! \brief  Sensor Details Register bit field structure
@@ -1575,13 +1232,13 @@
       uint32_t reserved8            :  8;
       uint32_t Unity_LUT_Select     :  1;  /**< Selects Unity Transfer Function Instead of Sensor Default */
       uint32_t Do_Not_Publish       :  1;  /**< Do Not Publish Channel Result */
-      uint32_t Reference_Buffer_Disable :  1;  /**< Enable or Disable ADC Reference Buffer */
-      uint32_t Vbias                    :  1;  /**< Controls ADC Vbias Output */
-      uint32_t Reference_Select         :  4;  /**< Reference Selection */
-      uint32_t PGA_Gain                 :  3;  /**< PGA Gain */
-      uint32_t reserved27               :  1;
-      uint32_t Averaging                :  3;  /**< Number of ADC Results to Average */
-      uint32_t Compensation_Disable     :  1;  /**< Indicates Compensation Data Should Not Be Used */
+      uint32_t reserved18           :  1;
+      uint32_t Vbias                :  1;  /**< Controls ADC Vbias Output */
+      uint32_t Reference_Select     :  4;  /**< Reference Selection */
+      uint32_t PGA_Gain             :  3;  /**< PGA Gain */
+      uint32_t RTD_Curve            :  2;  /**< Select RTD Curve for Linearisation */
+      uint32_t reserved29           :  2;
+      uint32_t Compensation_Disable :  1;  /**< Indicates Compensation Data Should Not Be Used */
     };
     uint32_t VALUE32;
   };
@@ -1600,13 +1257,15 @@
  *  ========================================================================= */
 typedef enum
 {
-  CORE_CHANNEL_EXCITATION_IEXC_OFF    = 0,  /**< Disabled   */
-  CORE_CHANNEL_EXCITATION_IEXC_50UA   = 1,  /**< 50 \mu;A   */
-  CORE_CHANNEL_EXCITATION_IEXC_100UA  = 2,  /**< 100 \mu;A  */
-  CORE_CHANNEL_EXCITATION_IEXC_250UA  = 3,  /**< 250 \mu;A  */
-  CORE_CHANNEL_EXCITATION_IEXC_500UA  = 4,  /**< 500 \mu;A  */
-  CORE_CHANNEL_EXCITATION_IEXC_750UA  = 5,  /**< 750 \mu;A  */
-  CORE_CHANNEL_EXCITATION_IEXC_1000UA = 6   /**< 1000 \mu;A */
+  CORE_CHANNEL_EXCITATION_EXTERNAL   = 0,  /**< External Current Sourced */
+  CORE_CHANNEL_EXCITATION_RESERVED   = 1,  /**< Reserved                 */
+  CORE_CHANNEL_EXCITATION_IEXC_10UA  = 2,  /**< 10 \mu;A                 */
+  CORE_CHANNEL_EXCITATION_RESERVED2  = 3,  /**< Reserved                 */
+  CORE_CHANNEL_EXCITATION_IEXC_50UA  = 4,  /**< 50 \mu;A                 */
+  CORE_CHANNEL_EXCITATION_IEXC_100UA = 5,  /**< 100 \mu;A                */
+  CORE_CHANNEL_EXCITATION_IEXC_250UA = 6,  /**< 250 \mu;A                */
+  CORE_CHANNEL_EXCITATION_IEXC_500UA = 7,  /**< 500 \mu;A                */
+  CORE_CHANNEL_EXCITATION_IEXC_1000UA = 8   /**< 1000 \mu;A                */
 } CORE_Channel_Excitation_IOUT_Excitation_Current;
 
 
@@ -1616,8 +1275,14 @@
  *  ========================================================================= */
 typedef enum
 {
-  CORE_CHANNEL_EXCITATION_IOUT_DIODE_DEFAULT = 0,  /**< Default Excitation Current Ratios */
-  CORE_CHANNEL_EXCITATION_IOUT_DIODE_MAX     = 1   /**< Higher Excitation Current Ratios  */
+  CORE_CHANNEL_EXCITATION_DIODE_2PT_10UA_100UA        = 0,  /**< 2 Current measurement 10uA 100uA       */
+  CORE_CHANNEL_EXCITATION_DIODE_2PT_20UA_160UA        = 1,  /**< 2 Current measurement 20uA 160uA       */
+  CORE_CHANNEL_EXCITATION_DIODE_2PT_50UA_300UA        = 2,  /**< 2 Current measurement 50uA 300uA       */
+  CORE_CHANNEL_EXCITATION_DIODE_2PT_100UA_600UA       = 3,  /**< 2 Current measurement 100uA 600uA      */
+  CORE_CHANNEL_EXCITATION_DIODE_3PT_10UA_50UA_100UA   = 4,  /**< 3 current measuremet 10uA 50uA 100uA   */
+  CORE_CHANNEL_EXCITATION_DIODE_3PT_20UA_100UA_160UA  = 5,  /**< 3 current measuremet 20uA 100uA 160uA  */
+  CORE_CHANNEL_EXCITATION_DIODE_3PT_50UA_150UA_300UA  = 6,  /**< 3 current measuremet 50uA 150uA 300uA  */
+  CORE_CHANNEL_EXCITATION_DIODE_3PT_100UA_300UA_600UA = 7   /**< 3 current measuremet 100uA 300uA 600uA */
 } CORE_Channel_Excitation_IOUT_Diode_Ratio;
 
 
@@ -1628,13 +1293,12 @@
 typedef struct CORE_Channel_Excitation_t {
   union {
     struct {
-      uint8_t IOUT_Excitation_Current :  3;  /**< Current Source Value */
-      uint8_t reserved3               :  2;
-      uint8_t IOUT_Diode_Ratio        :  1;  /**< Modify Current Ratios Used for Diode Sensor */
-      uint8_t reserved6               :  1;
-      uint8_t IOUT_Dont_Swap_3Wire    :  1;  /**< Indicates 3-Wire Excitation Currents Should Not Be Swapped */
+      uint16_t IOUT_Excitation_Current :  4;  /**< Current Source Value */
+      uint16_t reserved4               :  2;
+      uint16_t IOUT_Diode_Ratio        :  3;  /**< Modify Current Ratios Used for Diode Sensor */
+      uint16_t reserved9               :  7;
     };
-    uint8_t VALUE8;
+    uint16_t VALUE16;
   };
 } CORE_Channel_Excitation_t;
 
@@ -1673,38 +1337,85 @@
 
 /*@}*/
 
-/** @defgroup Filter_Select ADC Digital Filter Selection (Filter_Select) Register
- *  ADC Digital Filter Selection (Filter_Select) Register.
+/** @defgroup Measurement_Setup ADC Digital Filter Selection (Measurement_Setup) Register
+ *  ADC Digital Filter Selection (Measurement_Setup) Register.
  *  @{
  */
 
 /*  =========================================================================
- *! \enum   CORE_Filter_Select_ADC_Filter_Type
+ *! \enum   CORE_Measurement_Setup_Custom_Calibration
+ *! \brief  Enables Custom Calibration for Selected Sensor (Custom_Calibration) Enumerations
+ *  ========================================================================= */
+typedef enum
+{
+  CORE_MEASUREMENT_SETUP_INTERNAL_CALIBRATION = 0,  /**<  */
+  CORE_MEASUREMENT_SETUP_CUSTOM_CALIBRATION   = 1   /**<  */
+} CORE_Measurement_Setup_Custom_Calibration;
+
+
+/*  =========================================================================
+ *! \enum   CORE_Measurement_Setup_NOTCH_EN_2
+ *! \brief  Enable Notch 2 Filter Mode (NOTCH_EN_2) Enumerations
+ *  ========================================================================= */
+typedef enum
+{
+  CORE_MEASUREMENT_SETUP_NOTCH_DIS = 0,  /**< Disable Notch Filter                                                                                                     */
+  CORE_MEASUREMENT_SETUP_NOTCH_EN  = 1   /**< Enable Notch 2 Filter option. Places a addtional notch at 1.2X ODR. Can be used for 50 and 60Hz rejection simultaneously */
+} CORE_Measurement_Setup_NOTCH_EN_2;
+
+
+/*  =========================================================================
+ *! \enum   CORE_Measurement_Setup_Chop_Mode
+ *! \brief  Enabled and Disable Chop Mode (Chop_Mode) Enumerations
+ *  ========================================================================= */
+typedef enum
+{
+  CORE_MEASUREMENT_SETUP_DISABLE_CHOP = 0,  /**< Chop Mode Disabled */
+  CORE_MEASUREMENT_SETUP_ENABLE_CHOP  = 2   /**< Chop Mode Enabled  */
+} CORE_Measurement_Setup_Chop_Mode;
+
+
+/*  =========================================================================
+ *! \enum   CORE_Measurement_Setup_ADC_Filter_Type
  *! \brief  ADC Digital Filter Type (ADC_Filter_Type) Enumerations
  *  ========================================================================= */
 typedef enum
 {
-  CORE_FILTER_SELECT_FILTER_FIR_25SPS = 0,  /**< FIR Filter 25 SPS */
-  CORE_FILTER_SELECT_FILTER_FIR_20SPS = 1,  /**< FIR Filter 20 SPS */
-  CORE_FILTER_SELECT_FILTER_SINC4     = 2,  /**< Sinc4 Filter      */
-  CORE_FILTER_SELECT_FILTER_TBD       = 3   /**< TBD Filter        */
-} CORE_Filter_Select_ADC_Filter_Type;
+  CORE_MEASUREMENT_SETUP_ENABLE_SINC4 = 0,  /**< Enabled SINC4 Filter */
+  CORE_MEASUREMENT_SETUP_ENABLE_SINC3 = 1   /**< Enabled SINC3 Filter */
+} CORE_Measurement_Setup_ADC_Filter_Type;
+
+
+/*  =========================================================================
+ *! \enum   CORE_Measurement_Setup_GND_SW
+ *! \brief  GND_SW (GND_SW) Enumerations
+ *  ========================================================================= */
+typedef enum
+{
+  CORE_MEASUREMENT_SETUP_GND_SW_OPEN   = 0,  /**< GND_SW Open. The GND SW is not enabled for the sensor measurement                                             */
+  CORE_MEASUREMENT_SETUP_GND_SW_CLOSED = 1   /**< GND_SW Closed. The GND SW is enabled for the sensor measurement, bit wiil Remain Closed After the Measurement */
+} CORE_Measurement_Setup_GND_SW;
 
 
 /* ==========================================================================
- *! \struct CORE_Filter_Select_Struct
+ *! \struct CORE_Measurement_Setup_Struct
  *! \brief  ADC Digital Filter Selection Register bit field structure
  * ========================================================================== */
-typedef struct CORE_Filter_Select_t {
+typedef struct CORE_Measurement_Setup_t {
   union {
     struct {
-      uint32_t ADC_FS     : 11;  /**< ADC Digital Filter Select */
-      uint32_t ADC_Filter_Type :  5;  /**< ADC Digital Filter Type */
-      uint32_t reserved16      : 16;
+      uint32_t ADC_SF     :  7;  /**< ADC Digital Filter Select */
+      uint32_t Custom_Calibration :  1;  /**< Enables Custom Calibration for Selected Sensor */
+      uint32_t NOTCH_EN_2         :  1;  /**< Enable Notch 2 Filter Mode */
+      uint32_t PST_MEAS_EXC_CTRL  :  1;  /**< Disabled Current Sources After Measurement Has Been Complete */
+      uint32_t Chop_Mode          :  2;  /**< Enabled and Disable Chop Mode */
+      uint32_t ADC_Filter_Type    :  1;  /**< ADC Digital Filter Type */
+      uint32_t GND_SW             :  2;  /**< GND_SW */
+      uint32_t reserved15         : 17;
     };
     uint32_t VALUE32;
   };
-} CORE_Filter_Select_t;
+} CORE_Measurement_Setup_t;
 
 /*@}*/
 
@@ -2007,23 +1718,6 @@
 
 
 /*  =========================================================================
- *! \enum   CORE_Digital_Sensor_Comms_Uart_Baud
- *! \brief  Controls Baud Rate for UART Sensors (Uart_Baud) Enumerations
- *  ========================================================================= */
-typedef enum
-{
-  CORE_DIGITAL_SENSOR_COMMS_UART_115200 = 0,  /**< 115200 bps */
-  CORE_DIGITAL_SENSOR_COMMS_UART_57600  = 1,  /**< 57600 bps  */
-  CORE_DIGITAL_SENSOR_COMMS_UART_38400  = 2,  /**< 38400 bps  */
-  CORE_DIGITAL_SENSOR_COMMS_UART_19200  = 3,  /**< 19200 bps  */
-  CORE_DIGITAL_SENSOR_COMMS_UART_9600   = 4,  /**< 9600 bps   */
-  CORE_DIGITAL_SENSOR_COMMS_UART_4800   = 5,  /**< 4800 bps   */
-  CORE_DIGITAL_SENSOR_COMMS_UART_2400   = 6,  /**< 2400 bps   */
-  CORE_DIGITAL_SENSOR_COMMS_UART_1200   = 7   /**< 1200 bps   */
-} CORE_Digital_Sensor_Comms_Uart_Baud;
-
-
-/*  =========================================================================
  *! \enum   CORE_Digital_Sensor_Comms_SPI_Mode
  *! \brief  Configuration for Sensor SPI Protocol (SPI_Mode) Enumerations
  *  ========================================================================= */
@@ -2036,24 +1730,6 @@
 } CORE_Digital_Sensor_Comms_SPI_Mode;
 
 
-/*  =========================================================================
- *! \enum   CORE_Digital_Sensor_Comms_Uart_Mode
- *! \brief  Configuration for Sensor UART Protocol (Uart_Mode) Enumerations
- *  ========================================================================= */
-typedef enum
-{
-  CORE_DIGITAL_SENSOR_COMMS_LINECONTROL_8N1 = 0,   /**< 8 Data Bits No Parity 1 Stop Bit    */
-  CORE_DIGITAL_SENSOR_COMMS_LINECONTROL_8N2 = 1,   /**< 8 Data Bits No Parity 2 Stop Bits   */
-  CORE_DIGITAL_SENSOR_COMMS_LINECONTROL_8N3 = 2,   /**< 8 Data Bits No Parity 3 Stop Bits   */
-  CORE_DIGITAL_SENSOR_COMMS_LINECONTROL_8E1 = 4,   /**< 8 Data Bits Even Parity 1 Stop Bit  */
-  CORE_DIGITAL_SENSOR_COMMS_LINECONTROL_8E2 = 5,   /**< 8 Data Bits Even Parity 2 Stop Bits */
-  CORE_DIGITAL_SENSOR_COMMS_LINECONTROL_8E3 = 6,   /**< 8 Data Bits Even Parity 3 Stop Bits */
-  CORE_DIGITAL_SENSOR_COMMS_LINECONTROL_8O1 = 8,   /**< 8 Data Bits Odd Parity 1 Stop Bit   */
-  CORE_DIGITAL_SENSOR_COMMS_LINECONTROL_8O2 = 9,   /**< 8 Data Bits Odd Parity 2 Stop Bits  */
-  CORE_DIGITAL_SENSOR_COMMS_LINECONTROL_8O3 = 10   /**< 8 Data Bits Odd Parity 3 Stop Bits  */
-} CORE_Digital_Sensor_Comms_Uart_Mode;
-
-
 /* ==========================================================================
  *! \struct CORE_Digital_Sensor_Comms_Struct
  *! \brief  Digital Sensor Communication Clock Configuration Register bit field structure
@@ -2064,9 +1740,9 @@
       uint16_t Digital_Sensor_Comms_En :  1;  /**< Enable Digital Sensor Comms Register Parameters */
       uint16_t SPI_Clock               :  4;  /**< Controls Clock Frequency for SPI Sensors */
       uint16_t I2C_Clock               :  2;  /**< Controls SCLK Frequency for I2C Sensors */
-      uint16_t Uart_Baud               :  3;  /**< Controls Baud Rate for UART Sensors */
+      uint16_t reserved7               :  3;
       uint16_t SPI_Mode                :  2;  /**< Configuration for Sensor SPI Protocol */
-      uint16_t Uart_Mode               :  4;  /**< Configuration for Sensor UART Protocol */
+      uint16_t reserved12              :  4;
     };
     uint16_t VALUE16;
   };
@@ -2360,4 +2036,3 @@
 #endif 
 
 #endif
-