Minor changes to support ADMW FWv1.17.75

Revision:
44:94bdfaefddac
Parent:
43:e1789b7214cf
Child:
50:d84305e5e1c0
--- a/inc/admw1001/ADMW1001_REGISTERS.h	Tue Jan 07 05:45:58 2020 +0000
+++ b/inc/admw1001/ADMW1001_REGISTERS.h	Thu Jan 16 06:52:27 2020 +0000
@@ -1,7 +1,7 @@
 /* ================================================================================
  
      Created by   : 
-     Created on   : 2019 Oct 08, 09:43 GMT Daylight Time
+     Created on   : 2020 Jan 08, 12:45 GMT Standard Time
 
      Project      :   ADMW1001_REGISTERS
      File         :   ADMW1001_REGISTERS.h
@@ -10,7 +10,7 @@
      !! ADI Confidential !!
        INTERNAL USE ONLY
 
-     Copyright (c) 2019 Analog Devices, Inc.  All Rights Reserved.
+     Copyright (c) 2020 Analog Devices, Inc.  All Rights Reserved.
      This software is proprietary and confidential to Analog Devices, Inc. and
      its licensors.
 
@@ -262,6 +262,8 @@
 #define REG_CORE_EXTERNAL_REFERENCE_RESISTOR 0x00000050            /*  CORE External Reference Resistor Value */
 #define REG_CORE_EXTERNAL_VOLTAGE_REFERENCE_RESET 0x3F99999A            /*      Reset Value for External_Voltage_Reference  */
 #define REG_CORE_EXTERNAL_VOLTAGE_REFERENCE  0x00000054            /*  CORE External Reference Information */
+#define REG_CORE_AVDD_VOLTAGE_RESET          0x40533333            /*      Reset Value for AVDD_Voltage  */
+#define REG_CORE_AVDD_VOLTAGE                0x00000058            /*  CORE AVDD Voltage */
 #define REG_CORE_DIAGNOSTICS_CONTROL_RESET   0x00000000            /*      Reset Value for Diagnostics_Control  */
 #define REG_CORE_DIAGNOSTICS_CONTROL         0x0000005C            /*  CORE Diagnostic Control */
 #define REG_CORE_DATA_FIFO_RESET             0x00000000            /*      Reset Value for Data_FIFO  */
@@ -580,8 +582,6 @@
 #define REG_CORE_SENSOR_GAIN8_RESET          0x3F800000            /*      Reset Value for REG_CORE_SENSOR_GAIN8  */
 #define REG_CORE_SENSOR_GAIN9_RESET          0x3F800000            /*      Reset Value for REG_CORE_SENSOR_GAIN9  */
 #define REG_CORE_SENSOR_GAIN10_RESET         0x3F800000            /*      Reset Value for REG_CORE_SENSOR_GAIN10  */
-#define REG_CORE_SENSOR_GAIN11_RESET         0x3F800000            /*      Reset Value for REG_CORE_SENSOR_GAIN11  */
-#define REG_CORE_SENSOR_GAIN12_RESET         0x3F800000            /*      Reset Value for REG_CORE_SENSOR_GAIN12  */
 #define REG_CORE_SENSOR_GAIN0                0x000000AC            /*  CORE Sensor Gain Adjustment */
 #define REG_CORE_SENSOR_GAIN1                0x000000EC            /*  CORE Sensor Gain Adjustment */
 #define REG_CORE_SENSOR_GAIN2                0x0000012C            /*  CORE Sensor Gain Adjustment */
@@ -593,10 +593,8 @@
 #define REG_CORE_SENSOR_GAIN8                0x000002AC            /*  CORE Sensor Gain Adjustment */
 #define REG_CORE_SENSOR_GAIN9                0x000002EC            /*  CORE Sensor Gain Adjustment */
 #define REG_CORE_SENSOR_GAIN10               0x0000032C            /*  CORE Sensor Gain Adjustment */
-#define REG_CORE_SENSOR_GAIN11               0x0000036C            /*  CORE Sensor Gain Adjustment */
-#define REG_CORE_SENSOR_GAIN12               0x000003AC            /*  CORE Sensor Gain Adjustment */
 #define REG_CORE_SENSOR_GAINn(i)             (REG_CORE_SENSOR_GAIN0 + ((i) * 64))
-#define REG_CORE_SENSOR_GAINn_COUNT          13
+#define REG_CORE_SENSOR_GAINn_COUNT          11
 #define REG_CORE_CHANNEL_SKIPn_RESET         0x00000000            /*      Reset Value for Channel_Skip[n]  */
 #define REG_CORE_CHANNEL_SKIP0_RESET         0x00000000            /*      Reset Value for REG_CORE_CHANNEL_SKIP0  */
 #define REG_CORE_CHANNEL_SKIP1_RESET         0x00000000            /*      Reset Value for REG_CORE_CHANNEL_SKIP1  */
@@ -626,6 +624,35 @@
 #define REG_CORE_CHANNEL_SKIP12              0x000003B2            /*  CORE Indicates If Channel Will Skip Some Measurement Cycles */
 #define REG_CORE_CHANNEL_SKIPn(i)            (REG_CORE_CHANNEL_SKIP0 + ((i) * 64))
 #define REG_CORE_CHANNEL_SKIPn_COUNT         13
+#define REG_CORE_SENSOR_PARAMETERn_RESET     0x7FC00000            /*      Reset Value for Sensor_Parameter[n]  */
+#define REG_CORE_SENSOR_PARAMETER0_RESET     0x7FC00000            /*      Reset Value for REG_CORE_SENSOR_PARAMETER0  */
+#define REG_CORE_SENSOR_PARAMETER1_RESET     0x7FC00000            /*      Reset Value for REG_CORE_SENSOR_PARAMETER1  */
+#define REG_CORE_SENSOR_PARAMETER2_RESET     0x7FC00000            /*      Reset Value for REG_CORE_SENSOR_PARAMETER2  */
+#define REG_CORE_SENSOR_PARAMETER3_RESET     0x7FC00000            /*      Reset Value for REG_CORE_SENSOR_PARAMETER3  */
+#define REG_CORE_SENSOR_PARAMETER4_RESET     0x7FC00000            /*      Reset Value for REG_CORE_SENSOR_PARAMETER4  */
+#define REG_CORE_SENSOR_PARAMETER5_RESET     0x7FC00000            /*      Reset Value for REG_CORE_SENSOR_PARAMETER5  */
+#define REG_CORE_SENSOR_PARAMETER6_RESET     0x7FC00000            /*      Reset Value for REG_CORE_SENSOR_PARAMETER6  */
+#define REG_CORE_SENSOR_PARAMETER7_RESET     0x7FC00000            /*      Reset Value for REG_CORE_SENSOR_PARAMETER7  */
+#define REG_CORE_SENSOR_PARAMETER8_RESET     0x7FC00000            /*      Reset Value for REG_CORE_SENSOR_PARAMETER8  */
+#define REG_CORE_SENSOR_PARAMETER9_RESET     0x7FC00000            /*      Reset Value for REG_CORE_SENSOR_PARAMETER9  */
+#define REG_CORE_SENSOR_PARAMETER10_RESET    0x7FC00000            /*      Reset Value for REG_CORE_SENSOR_PARAMETER10  */
+#define REG_CORE_SENSOR_PARAMETER11_RESET    0x7FC00000            /*      Reset Value for REG_CORE_SENSOR_PARAMETER11  */
+#define REG_CORE_SENSOR_PARAMETER12_RESET    0x7FC00000            /*      Reset Value for REG_CORE_SENSOR_PARAMETER12  */
+#define REG_CORE_SENSOR_PARAMETER0           0x000000B4            /*  CORE Sensor Parameter Adjustment */
+#define REG_CORE_SENSOR_PARAMETER1           0x000000F4            /*  CORE Sensor Parameter Adjustment */
+#define REG_CORE_SENSOR_PARAMETER2           0x00000134            /*  CORE Sensor Parameter Adjustment */
+#define REG_CORE_SENSOR_PARAMETER3           0x00000174            /*  CORE Sensor Parameter Adjustment */
+#define REG_CORE_SENSOR_PARAMETER4           0x000001B4            /*  CORE Sensor Parameter Adjustment */
+#define REG_CORE_SENSOR_PARAMETER5           0x000001F4            /*  CORE Sensor Parameter Adjustment */
+#define REG_CORE_SENSOR_PARAMETER6           0x00000234            /*  CORE Sensor Parameter Adjustment */
+#define REG_CORE_SENSOR_PARAMETER7           0x00000274            /*  CORE Sensor Parameter Adjustment */
+#define REG_CORE_SENSOR_PARAMETER8           0x000002B4            /*  CORE Sensor Parameter Adjustment */
+#define REG_CORE_SENSOR_PARAMETER9           0x000002F4            /*  CORE Sensor Parameter Adjustment */
+#define REG_CORE_SENSOR_PARAMETER10          0x00000334            /*  CORE Sensor Parameter Adjustment */
+#define REG_CORE_SENSOR_PARAMETER11          0x00000374            /*  CORE Sensor Parameter Adjustment */
+#define REG_CORE_SENSOR_PARAMETER12          0x000003B4            /*  CORE Sensor Parameter Adjustment */
+#define REG_CORE_SENSOR_PARAMETERn(i)        (REG_CORE_SENSOR_PARAMETER0 + ((i) * 64))
+#define REG_CORE_SENSOR_PARAMETERn_COUNT     13
 #define REG_CORE_DIGITAL_SENSOR_CONFIGn_RESET 0x00000000            /*      Reset Value for Digital_Sensor_Config[n]  */
 #define REG_CORE_DIGITAL_SENSOR_CONFIG0_RESET 0x00000000            /*      Reset Value for REG_CORE_DIGITAL_SENSOR_CONFIG0  */
 #define REG_CORE_DIGITAL_SENSOR_CONFIG1_RESET 0x00000000            /*      Reset Value for REG_CORE_DIGITAL_SENSOR_CONFIG1  */
@@ -869,16 +896,18 @@
 #define BITM_CORE_EXTERNAL_VOLTAGE_REFERENCE_EXT_REFIN2_VALUE 0xFFFFFFFF    /*  Reference Input Value */
 
 /* -------------------------------------------------------------------------------------------------------------------------
+          CORE_AVDD_VOLTAGE                    Pos/Masks         Description
+   ------------------------------------------------------------------------------------------------------------------------- */
+#define BITP_CORE_AVDD_VOLTAGE_AVDD_VOLTAGE   0            /*  AVDD Voltage */
+#define BITM_CORE_AVDD_VOLTAGE_AVDD_VOLTAGE  0xFFFFFFFF    /*  AVDD Voltage */
+
+/* -------------------------------------------------------------------------------------------------------------------------
           CORE_DIAGNOSTICS_CONTROL             Pos/Masks         Description
    ------------------------------------------------------------------------------------------------------------------------- */
-#define BITP_CORE_DIAGNOSTICS_CONTROL_DIAG_OSD_FREQ  1            /*  Diagnostics Open Sensor Detect Frequency */
+#define BITP_CORE_DIAGNOSTICS_CONTROL_DIAG_OSD_FREQ  1            /*  Diagnostics Sensor Detect Frequency */
 #define BITP_CORE_DIAGNOSTICS_CONTROL_DIAG_MEAS_EN  0            /*  Diagnostics Measure Enable */
-#define BITM_CORE_DIAGNOSTICS_CONTROL_DIAG_OSD_FREQ 0x00000006    /*  Diagnostics Open Sensor Detect Frequency */
+#define BITM_CORE_DIAGNOSTICS_CONTROL_DIAG_OSD_FREQ 0x000000FE    /*  Diagnostics Sensor Detect Frequency */
 #define BITM_CORE_DIAGNOSTICS_CONTROL_DIAG_MEAS_EN 0x00000001    /*  Diagnostics Measure Enable */
-#define ENUM_CORE_DIAGNOSTICS_CONTROL_OCD_OFF 0x00000000            /*  Diag_OSD_Freq: No Open-Circuit Detection During Measurement */
-#define ENUM_CORE_DIAGNOSTICS_CONTROL_OCD_PER_1_CYCLE 0x00000002            /*  Diag_OSD_Freq: Open-Circuit Detection Performed Once Per Measurement Cycle */
-#define ENUM_CORE_DIAGNOSTICS_CONTROL_OCD_PER_10_CYCLES 0x00000004            /*  Diag_OSD_Freq: Open-Circuit Detection Performed Once Per Ten Measurement Cycles */
-#define ENUM_CORE_DIAGNOSTICS_CONTROL_OCD_PER_100_CYCLES 0x00000006            /*  Diag_OSD_Freq: Open-Circuit Detection Performed Once Per Hundred Measurement Cycles */
 
 /* -------------------------------------------------------------------------------------------------------------------------
           CORE_DATA_FIFO                       Pos/Masks         Description
@@ -910,7 +939,7 @@
           CORE_LUT_OFFSET                      Pos/Masks         Description
    ------------------------------------------------------------------------------------------------------------------------- */
 #define BITP_CORE_LUT_OFFSET_LUT_OFFSET       0            /*  Offset into the Lookup Table */
-#define BITM_CORE_LUT_OFFSET_LUT_OFFSET      0x00003FFF    /*  Offset into the Lookup Table */
+#define BITM_CORE_LUT_OFFSET_LUT_OFFSET      0x000007FF    /*  Offset into the Lookup Table */
 
 /* -------------------------------------------------------------------------------------------------------------------------
           CORE_LUT_DATA                        Pos/Masks         Description
@@ -957,6 +986,7 @@
 #define ENUM_CORE_SENSOR_TYPE_RTD_4W_PT100   0x00000060            /*  Sensor_Type: RTD 4 wire PT100 sensor */
 #define ENUM_CORE_SENSOR_TYPE_RTD_4W_PT1000  0x00000061            /*  Sensor_Type: RTD 4 wire PT1000 sensor */
 #define ENUM_CORE_SENSOR_TYPE_BRIDGE_4W      0x000000A9            /*  Sensor_Type: Bridge 4 wire sensor */
+#define ENUM_CORE_SENSOR_TYPE_VOLTAGE        0x00000200            /*  Sensor_Type: Voltage Input */
 #define ENUM_CORE_SENSOR_TYPE_CUSTOM1        0x00000400            /*  Sensor_Type: Custom1 */
 #define ENUM_CORE_SENSOR_TYPE_I2C_HUMIDITY_B 0x00000841            /*  Sensor_Type: I2C humidity sensor B */
 #define ENUM_CORE_SENSOR_TYPE_SENSOR_RESERVED_1 0x00000FE0            /*  Sensor_Type: RESERVED. NOT TO BE USED */
@@ -1008,8 +1038,18 @@
 /* -------------------------------------------------------------------------------------------------------------------------
           CORE_CHANNEL_EXCITATION[n]           Pos/Masks         Description
    ------------------------------------------------------------------------------------------------------------------------- */
+#define BITP_CORE_CHANNEL_EXCITATION_IOUT_DIODE_RATIO  6            /*  Modify Current Ratios Used for Diode Sensor */
 #define BITP_CORE_CHANNEL_EXCITATION_IOUT_EXCITATION_CURRENT  0            /*  Current Source Value */
+#define BITM_CORE_CHANNEL_EXCITATION_IOUT_DIODE_RATIO 0x000001C0    /*  Modify Current Ratios Used for Diode Sensor */
 #define BITM_CORE_CHANNEL_EXCITATION_IOUT_EXCITATION_CURRENT 0x0000000F    /*  Current Source Value */
+#define ENUM_CORE_CHANNEL_EXCITATION_DIODE_2PT_10UA_100UA 0x00000000            /*  IOUT_Diode_Ratio: 2 Current measurement 10uA 100uA */
+#define ENUM_CORE_CHANNEL_EXCITATION_DIODE_2PT_20UA_160UA 0x00000040            /*  IOUT_Diode_Ratio: 2 Current measurement 20uA 160uA */
+#define ENUM_CORE_CHANNEL_EXCITATION_DIODE_2PT_50UA_300UA 0x00000080            /*  IOUT_Diode_Ratio: 2 Current measurement 50uA 300uA */
+#define ENUM_CORE_CHANNEL_EXCITATION_DIODE_2PT_100UA_600UA 0x000000C0            /*  IOUT_Diode_Ratio: 2 Current measurement 100uA 600uA */
+#define ENUM_CORE_CHANNEL_EXCITATION_DIODE_3PT_10UA_50UA_100UA 0x00000100            /*  IOUT_Diode_Ratio: 3 current measuremet 10uA 50uA 100uA */
+#define ENUM_CORE_CHANNEL_EXCITATION_DIODE_3PT_20UA_100UA_160UA 0x00000140            /*  IOUT_Diode_Ratio: 3 current measuremet 20uA 100uA 160uA */
+#define ENUM_CORE_CHANNEL_EXCITATION_DIODE_3PT_50UA_150UA_300UA 0x00000180            /*  IOUT_Diode_Ratio: 3 current measuremet 50uA 150uA 300uA */
+#define ENUM_CORE_CHANNEL_EXCITATION_DIODE_3PT_100UA_300UA_600UA 0x000001C0            /*  IOUT_Diode_Ratio: 3 current measuremet 100uA 300uA 600uA */
 #define ENUM_CORE_CHANNEL_EXCITATION_NONE    0x00000000            /*  IOUT_Excitation_Current: Excitation Current Disabled */
 #define ENUM_CORE_CHANNEL_EXCITATION_RESERVED 0x00000001            /*  IOUT_Excitation_Current: Reserved */
 #define ENUM_CORE_CHANNEL_EXCITATION_IEXC_10UA 0x00000002            /*  IOUT_Excitation_Current: 10 \mu;A */
@@ -1028,9 +1068,9 @@
 #define BITP_CORE_SETTLING_TIME_SETTLING_TIME  0            /*  Settling Time to Allow When Switching to Channel */
 #define BITM_CORE_SETTLING_TIME_SETTLING_TIME_UNITS 0x0000C000    /*  Units for Settling Time */
 #define BITM_CORE_SETTLING_TIME_SETTLING_TIME 0x00003FFF    /*  Settling Time to Allow When Switching to Channel */
-#define ENUM_CORE_SETTLING_TIME_MICROSECONDS 0x00000000            /*  Settling_Time_Units: Micro-seconds */
-#define ENUM_CORE_SETTLING_TIME_MILLISECONDS 0x00004000            /*  Settling_Time_Units: Milli-seconds */
-#define ENUM_CORE_SETTLING_TIME_SECONDS      0x00008000            /*  Settling_Time_Units: Seconds */
+#define ENUM_CORE_SETTLING_TIME_MILLISECONDS 0x00000000            /*  Settling_Time_Units: Micro-seconds */
+#define ENUM_CORE_SETTLING_TIME_SECONDS      0x00004000            /*  Settling_Time_Units: Milli-seconds */
+#define ENUM_CORE_SETTLING_TIME_RESERVED     0x00008000            /*  Settling_Time_Units: Seconds */
 #define ENUM_CORE_SETTLING_TIME_UNDEFINED    0x0000C000            /*  Settling_Time_Units: Undefined */
 
 /* -------------------------------------------------------------------------------------------------------------------------
@@ -1070,6 +1110,12 @@
 #define BITM_CORE_LOW_THRESHOLD_LIMIT_LOW_THRESHOLD 0xFFFFFFFF    /*  Lower Limit for Sensor Alert Comparison */
 
 /* -------------------------------------------------------------------------------------------------------------------------
+          CORE_IDEALITY_FACTOR[n]              Pos/Masks         Description
+   ------------------------------------------------------------------------------------------------------------------------- */
+#define BITP_CORE_IDEALITY_FACTOR_IDEALITY_FACTOR  0            /*  Diode Ideality Factor, Default 1.003. */
+#define BITM_CORE_IDEALITY_FACTOR_IDEALITY_FACTOR 0xFFFFFFFF    /*  Diode Ideality Factor, Default 1.003. */
+
+/* -------------------------------------------------------------------------------------------------------------------------
           CORE_SENSOR_OFFSET[n]                Pos/Masks         Description
    ------------------------------------------------------------------------------------------------------------------------- */
 #define BITP_CORE_SENSOR_OFFSET_SENSOR_OFFSET  0            /*  Sensor Offset Adjustment */
@@ -1088,6 +1134,12 @@
 #define BITM_CORE_CHANNEL_SKIP_CHANNEL_SKIP  0x000000FF    /*  Indicates If Channel Will Skip Some Measurement Cycles */
 
 /* -------------------------------------------------------------------------------------------------------------------------
+          CORE_SENSOR_PARAMETER[n]             Pos/Masks         Description
+   ------------------------------------------------------------------------------------------------------------------------- */
+#define BITP_CORE_SENSOR_PARAMETER_SENSOR_PARAMETER  0            /*  Sensor Parameter Adjustment */
+#define BITM_CORE_SENSOR_PARAMETER_SENSOR_PARAMETER 0xFFFFFFFF    /*  Sensor Parameter Adjustment */
+
+/* -------------------------------------------------------------------------------------------------------------------------
           CORE_DIGITAL_SENSOR_CONFIG[n]        Pos/Masks         Description
    ------------------------------------------------------------------------------------------------------------------------- */
 #define BITP_CORE_DIGITAL_SENSOR_CONFIG_DIGITAL_SENSOR_DATA_BITS 11            /*  Number of Relevant Data Bits */