h918: Update variable sensors definition from elsa

2 files changed, 133 insertions, 125 deletions

diff --git a/configs/sensors/sensor_def_h1_tmo_us.conf b/configs/sensors/sensor_def_elsa_tmo_us.conf
index 153e2b8..6d65995 100644
--- a/configs/sensors/sensor_def_h1_tmo_us.conf
+++ b/configs/sensors/sensor_def_elsa_tmo_us.conf
@@ -1,5 +1,5 @@
 #
-# File: sensor_def_h1_tmo_us.conf
+# File: sensor_def_elsa_tmo_us.conf
 #
 # Tihs file contains default sensor registry values for LGE development
 # Model platforms.
@@ -66,24 +66,24 @@
 
 
 ########################################################################
-###        h1_tmo_us
+###        elsa_base
 ########################################################################
 
 #----------------------------------
 ## Orientation of sensors
 #----------------------------------
 # accelerometer x/y/z of AXIS
-700   -1                 0x00000002 #accel-x-axis
-701    2                 0x00000002 #accel-y-axis
+700    2                 0x00000002 #accel-x-axis
+701    1                 0x00000002 #accel-y-axis
 702   -3                 0x00000002 #accel-z-axis
 # gyroscope x/y/z of AXIS
-800   -1                 0x00000002 #gyro-x-axis
-801    2                 0x00000002 #gyro-y-axis
+800    2                 0x00000002 #gyro-x-axis
+801    1                 0x00000002 #gyro-y-axis
 802   -3                 0x00000002 #gyro-z-axis
 # magnetic x/y/z of AXIS
-900   -1                 0x00000002 #mag-x-axis
-901    2                 0x00000002 #mag-y-axis
-902   -3                 0x00000002 #mag-z-axis
+900    2                 0x00000002 #mag-x-axis
+901   -1                 0x00000002 #mag-y-axis
+902    3                 0x00000002 #mag-z-axis
 
 ## Proximity & ambient sensor
 #----------------------------------
@@ -95,7 +95,7 @@
 111   0x22               0x00000002 # ALS_MEAS_RATE[0x04]
 112   53                 0x00000002 # ALS_COE_B TBD
 113   0                  0x00000002 # ALS_COE_C TBD
-114   40                 0x00000002 # PRX_PULSES[0x02]
+114   50                 0x00000002 # PRX_PULSES[0x02]
 115   0x36               0x00000002 # PRX_LED[0x01]
 116   56                 0x00000002 # prx_cal_hysteresis
 117   650                0x00000002 # prx_cal_threshold
@@ -104,8 +104,8 @@
 120   400                0x00000002 # PRX_THRES_LOW[0x1D]
 121   0x56               0x00000002 # PRX_MEAS_RATE[0x03]
 122   0x11               0x00000002 # INT_PST[0x1A]
-123   390                0x00000002 # prx_knock_near2
-124   290                0x00000002 # prx_knock_far2
+123   1022               0x00000002 # prx_knock_near2
+124   850                0x00000002 # prx_knock_far2
 125   0                  0x00000002 # reserved param
 126   0                  0x00000002 # reserved param
 127   0                  0x00000002 # reserved param
@@ -119,158 +119,166 @@
 135   0                  0x00000002 # reserved param
 
 
-# EVB board
-:property ro.revision 4
-#----------------------------------
-## Orientation of sensors
-#----------------------------------
-# accelerometer x/y/z of AXIS
-700    2                 0x00000002 #accel-x-axis
-701    1                 0x00000002 #accel-y-axis
-702   -3                 0x00000002 #accel-z-axis
-# gyroscope x/y/z of AXIS
-800    2                 0x00000002 #gyro-x-axis
-801    1                 0x00000002 #gyro-y-axis
-802   -3                 0x00000002 #gyro-z-axis
+# Rev_A board
+:property ro.revision 6
 # magnetic x/y/z of AXIS
 900    1                 0x00000002 #mag-x-axis
-901   -2                 0x00000002 #mag-y-axis
-902   -3                 0x00000002 #mag-z-axis
+901    2                 0x00000002 #mag-y-axis
+902    3                 0x00000002 #mag-z-axis
+#----------------------------------
+# SSI SMGR Cfg 3: HSPPAD042A Pressure
+#----------------------------------
+1950 0x69469b7038b0ddd8   0x00000002    #UUID
+1951 0x5588c14de03f6490   0x00000002    #UUID
+1952 5000                 0x00010001    #off_to_idle
+1953 2000                 0x00010001    #idle_to_ready
+1954 3                    0x00010001    #i2c_bus
+1955 0xFFFF               0x00010001    #reg_group_id
+1956 0xFFFF               0x00010001    #cal_grp_id
+1957 118                  0x00010001    #gpio1(DRI/FIFO)
+1958 0xFFFF               0x00010001    #gpio2
+1959 30                   0x00010001    #sensor_id
+1960 0x48                 0x00010001    #i2c_address
+1961 7                    0x00010001    #data_type1
+1962 0                    0x00010001    #data_type2
+1963 0xFF                 0x00010001    #rel_sns_idx
+1964 0                    0x00010001    #sens_default
+1965 0xD0                 0x00010001    #flags(FIFO)
+1985 0                    0x00010001    #device_select
+1993 0x2                  0x00000002    #vdd
+1994 0x2                  0x00000002    #vddio
 
-# SSI SMGR Cfg 3: HSPPAD038A Pressure
-1950 0x69469b7038b0dde8 0x00000002 #UUID
-1951 0x5588c14de03f6490 0x00000002 #UUID
-1952 10000              0x00000002 #off_to_idle
-1953 10000              0x00000002 #idle_to_ready
-1954 3                  0x00000002 #i2c_bus
-1955 0xFFFF             0x00000002 #reg_group_id
-1956 0xFFFF             0x00000002 #cal_grp_id
-1957 0xFFFF             0x00000002 #gpio1
-1958 0xFFFF             0x00000002 #gpio2
-1959 30                 0x00000002 #sensor_id
-1960 0x48               0x00000002 #i2c_address
-1961 7                  0x00000002 #data_type1
-1962 4                  0x00000002 #data_type2
-1963 0xFF               0x00000002 #rel_sns_idx
-1964 0                  0x00000002 #sens_default
-1965 0                  0x00000002 #flags
-1985 0                  0x00000002 #device_select
-1993 0x2                0x00000002 #vdd
-1994 0x2                0x00000002 #vddio
 
-# EVB Rev.A
+# HDK_2 board
 :property ro.revision 5
 #----------------------------------
 ## Orientation of sensors
 #----------------------------------
 # accelerometer x/y/z of AXIS
-700   -2                 0x00000002 #accel-x-axis
-701   -1                 0x00000002 #accel-y-axis
+700   -1                 0x00000002 #accel-x-axis
+701    2                 0x00000002 #accel-y-axis
 702   -3                 0x00000002 #accel-z-axis
 # gyroscope x/y/z of AXIS
-800   -2                 0x00000002 #gyro-x-axis
-801   -1                 0x00000002 #gyro-y-axis
+800   -1                 0x00000002 #gyro-x-axis
+801    2                 0x00000002 #gyro-y-axis
 802   -3                 0x00000002 #gyro-z-axis
 # magnetic x/y/z of AXIS
 900   -1                 0x00000002 #mag-x-axis
 901    2                 0x00000002 #mag-y-axis
 902   -3                 0x00000002 #mag-z-axis
 
-# SSI SMGR Cfg 3: HSPPAD038A Pressure
-1950 0x69469b7038b0dde8 0x00000002 #UUID
-1951 0x5588c14de03f6490 0x00000002 #UUID
-1952 10000              0x00000002 #off_to_idle
-1953 10000              0x00000002 #idle_to_ready
-1954 3                  0x00000002 #i2c_bus
-1955 0xFFFF             0x00000002 #reg_group_id
-1956 0xFFFF             0x00000002 #cal_grp_id
-1957 0xFFFF             0x00000002 #gpio1
-1958 0xFFFF             0x00000002 #gpio2
-1959 30                 0x00000002 #sensor_id
-1960 0x48               0x00000002 #i2c_address
-1961 7                  0x00000002 #data_type1
-1962 4                  0x00000002 #data_type2
-1963 0xFF               0x00000002 #rel_sns_idx
-1964 0                  0x00000002 #sens_default
-1965 0                  0x00000002 #flags
-1985 0                  0x00000002 #device_select
-1993 0x2                0x00000002 #vdd
-1994 0x2                0x00000002 #vddio
+#----------------------------------
+# SSI SMGR Cfg 3: HSPPAD042A Pressure
+#----------------------------------
+1950 0x69469b7038b0ddd8   0x00000002    #UUID
+1951 0x5588c14de03f6490   0x00000002    #UUID
+1952 5000                 0x00010001    #off_to_idle
+1953 2000                 0x00010001    #idle_to_ready
+1954 3                    0x00010001    #i2c_bus
+1955 0xFFFF               0x00010001    #reg_group_id
+1956 0xFFFF               0x00010001    #cal_grp_id
+1957 118                  0x00010001    #gpio1(DRI/FIFO)
+1958 0xFFFF               0x00010001    #gpio2
+1959 30                   0x00010001    #sensor_id
+1960 0x48                 0x00010001    #i2c_address
+1961 7                    0x00010001    #data_type1
+1962 0                    0x00010001    #data_type2
+1963 0xFF                 0x00010001    #rel_sns_idx
+1964 0                    0x00010001    #sens_default
+1965 0xD0                 0x00010001    #flags(FIFO)
+1985 0                    0x00010001    #device_select
+1993 0x2                  0x00000002    #vdd
+1994 0x2                  0x00000002    #vddio
 
 
-# EVB Rev.B
-:property ro.revision 9
+# REV_0 board
+:property ro.revision 4
 #----------------------------------
 ## Orientation of sensors
 #----------------------------------
 # accelerometer x/y/z of AXIS
-700   -2                 0x00000002 #accel-x-axis
-701   -1                 0x00000002 #accel-y-axis
-702   -3                 0x00000002 #accel-z-axis
+700   -1                 0x00000002 #accel-x-axis
+701   -2                 0x00000002 #accel-y-axis
+702    3                 0x00000002 #accel-z-axis
 # gyroscope x/y/z of AXIS
-800   -2                 0x00000002 #gyro-x-axis
-801   -1                 0x00000002 #gyro-y-axis
-802   -3                 0x00000002 #gyro-z-axis
+800   -1                 0x00000002 #gyro-x-axis
+801   -2                 0x00000002 #gyro-y-axis
+802    3                 0x00000002 #gyro-z-axis
 # magnetic x/y/z of AXIS
 900   -1                 0x00000002 #mag-x-axis
-901    2                 0x00000002 #mag-y-axis
-902   -3                 0x00000002 #mag-z-axis
-
-# SSI SMGR Cfg 3: HSPPAD038A Pressure
-1950 0x69469b7038b0dde8 0x00000002 #UUID
-1951 0x5588c14de03f6490 0x00000002 #UUID
-1952 10000              0x00000002 #off_to_idle
-1953 10000              0x00000002 #idle_to_ready
-1954 3                  0x00000002 #i2c_bus
-1955 0xFFFF             0x00000002 #reg_group_id
-1956 0xFFFF             0x00000002 #cal_grp_id
-1957 0xFFFF             0x00000002 #gpio1
-1958 0xFFFF             0x00000002 #gpio2
-1959 30                 0x00000002 #sensor_id
-1960 0x48               0x00000002 #i2c_address
-1961 7                  0x00000002 #data_type1
-1962 4                  0x00000002 #data_type2
-1963 0xFF               0x00000002 #rel_sns_idx
-1964 0                  0x00000002 #sens_default
-1965 0                  0x00000002 #flags
-1985 0                  0x00000002 #device_select
-1993 0x2                0x00000002 #vdd
-1994 0x2                0x00000002 #vddio
+901   -2                 0x00000002 #mag-y-axis
+902    3                 0x00000002 #mag-z-axis
 
+## Proximity & ambient sensor
+#----------------------------------
+# ID  VALUE              VERSION
+112   10                 0x00000002 # ALS_COE_B TBD    - apply value for VZW_FAKE.
+114   24                 0x00000002 # PRX_PULSES[0x02] - tuning value for VZW_FAKE.
+115   0x32               0x00000002 # PRX_LED[0x01]    - LED Pulse Frequency(60kHz)/Current(10mA) for VZW_FAKE.
+123   450                0x00000002 # prx_knock_near2
+124   400                0x00000002 # prx_knock_far2
 
-# Rev.A
-:property ro.revision 10
 #----------------------------------
-## Orientation of sensors
+# SSI SMGR Cfg 3: HSPPAD042A Pressure
 #----------------------------------
-# accelerometer x/y/z of AXIS
-700   -2                 0x00000002 #accel-x-axis
-701   -1                 0x00000002 #accel-y-axis
-702   -3                 0x00000002 #accel-z-axis
-# gyroscope x/y/z of AXIS
-800   -2                 0x00000002 #gyro-x-axis
-801   -1                 0x00000002 #gyro-y-axis
-802   -3                 0x00000002 #gyro-z-axis
-# magnetic x/y/z of AXIS
-900   -2                 0x00000002 #mag-x-axis
-901   -1                 0x00000002 #mag-y-axis
-902   -3                 0x00000002 #mag-z-axis
+1950 0x69469b7038b0ddd8   0x00000002    #UUID
+1951 0x5588c14de03f6490   0x00000002    #UUID
+1952 5000                 0x00010001    #off_to_idle
+1953 2000                 0x00010001    #idle_to_ready
+1954 3                    0x00010001    #i2c_bus
+1955 0xFFFF               0x00010001    #reg_group_id
+1956 0xFFFF               0x00010001    #cal_grp_id
+1957 118                  0x00010001    #gpio1(DRI/FIFO)
+1958 0xFFFF               0x00010001    #gpio2
+1959 30                   0x00010001    #sensor_id
+1960 0x48                 0x00010001    #i2c_address
+1961 7                    0x00010001    #data_type1
+1962 0                    0x00010001    #data_type2
+1963 0xFF                 0x00010001    #rel_sns_idx
+1964 0                    0x00010001    #sens_default
+1965 0xD0                 0x00010001    #flags(FIFO)
+1985 0                    0x00010001    #device_select
+1993 0x2                  0x00000002    #vdd
+1994 0x2                  0x00000002    #vddio
 
-# Rev.B
-:property ro.revision 6
+
+# HDK board
+:property ro.revision 3
 #----------------------------------
 ## Orientation of sensors
 #----------------------------------
 # accelerometer x/y/z of AXIS
-700   -2                 0x00000002 #accel-x-axis
-701   -1                 0x00000002 #accel-y-axis
+700   -1                 0x00000002 #accel-x-axis
+701    2                 0x00000002 #accel-y-axis
 702   -3                 0x00000002 #accel-z-axis
 # gyroscope x/y/z of AXIS
-800   -2                 0x00000002 #gyro-x-axis
-801   -1                 0x00000002 #gyro-y-axis
+800   -1                 0x00000002 #gyro-x-axis
+801    2                 0x00000002 #gyro-y-axis
 802   -3                 0x00000002 #gyro-z-axis
 # magnetic x/y/z of AXIS
 900   -1                 0x00000002 #mag-x-axis
 901    2                 0x00000002 #mag-y-axis
 902   -3                 0x00000002 #mag-z-axis
 
+#----------------------------------
+# SSI SMGR Cfg 3: HSPPAD042A Pressure
+#----------------------------------
+1950 0x69469b7038b0ddd8   0x00000002    #UUID
+1951 0x5588c14de03f6490   0x00000002    #UUID
+1952 5000                 0x00010001    #off_to_idle
+1953 2000                 0x00010001    #idle_to_ready
+1954 3                    0x00010001    #i2c_bus
+1955 0xFFFF               0x00010001    #reg_group_id
+1956 0xFFFF               0x00010001    #cal_grp_id
+1957 118                  0x00010001    #gpio1(DRI/FIFO)
+1958 0xFFFF               0x00010001    #gpio2
+1959 30                   0x00010001    #sensor_id
+1960 0x48                 0x00010001    #i2c_address
+1961 7                    0x00010001    #data_type1
+1962 0                    0x00010001    #data_type2
+1963 0xFF                 0x00010001    #rel_sns_idx
+1964 0                    0x00010001    #sens_default
+1965 0xD0                 0x00010001    #flags(FIFO)
+1985 0                    0x00010001    #device_select
+1993 0x2                  0x00000002    #vdd
+1994 0x2                  0x00000002    #vddio
diff --git a/device.mk b/device.mk
index 357b934..158b73b 100644
--- a/device.mk
+++ b/device.mk
@@ -27,7 +27,7 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 
 # Sensors
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/sensors/sensor_def_h1_tmo_us.conf:system/etc/sensors/sensor_def_variable.conf
+    $(LOCAL_PATH)/configs/sensors/sensor_def_elsa_tmo_us.conf:system/etc/sensors/sensor_def_variable.conf
 
 # WiFi Calibration
 PRODUCT_COPY_FILES += \