diff --git a/audio/audio_ext_spkr.conf b/audio/audio_ext_spkr.conf index 447c1a5..85d0a04 100644 --- a/audio/audio_ext_spkr.conf +++ b/audio/audio_ext_spkr.conf @@ -1,6 +1,6 @@ global_config { - name Potter - sonification_pad 19 + name Sanders + sonification_pad 20 sonification_prox_timeout_sec 5 } @@ -8,22 +8,19 @@ ring { #dB to attenuate playback to meet safety level at each volume step #16 steps total, 15...0. In case of truncated list, last attenuation #given will be applied to all lower volume steps - attenuation 38,38,35,35,32,32,29,29,26,26,24,24,22,22,20,20 - knee_step 16 + #attenuation 28,28,25,25,22,22,20,20,20,20,20,20,20,20,20,20 } voice { #dB to attenuate playback to meet safety level at each volume step #16 steps total, 15...0. In case of truncated list, last attenuation #given will be applied to all lower volume steps - attenuation 35,35,32,32,29,29,26,26,23,23,20,20,17,17,14,14 - knee_step 16 + #attenuation 35,35,32,32,29,29,26,26,23,23,20,20,17,17,14,14 } media { #dB to attenuate playback to meet safety level at each volume step #16 steps total, 15...0. In case of truncated list, last attenuation #given will be applied to all lower volume steps - attenuation 38,36,34,32,30,28,26,24,22,20,18,16,14,12,10,8 - knee_step 16 + #attenuation 38,36,34,32,30,28,26,24,22,20,18,16,14,12,10,8 } diff --git a/audio/audio_platform_info.xml b/audio/audio_platform_info.xml index 9f6ba62..5a6124c 100644 --- a/audio/audio_platform_info.xml +++ b/audio/audio_platform_info.xml @@ -5,18 +5,25 @@ + + + + + + + @@ -25,13 +32,29 @@ + + + + + + + + + + + + + + + + @@ -43,6 +66,11 @@ + + + + + diff --git a/audio/mixer_paths.xml b/audio/mixer_paths.xml index 51d280f..d3e085f 100644 --- a/audio/mixer_paths.xml +++ b/audio/mixer_paths.xml @@ -55,7 +55,8 @@ - + + @@ -86,6 +87,15 @@ + + + + + + + + + @@ -94,6 +104,7 @@ + @@ -103,6 +114,7 @@ + @@ -114,6 +126,7 @@ + @@ -124,6 +137,7 @@ + @@ -133,6 +147,7 @@ + @@ -140,16 +155,6 @@ - - - - - - - - - - @@ -220,6 +225,14 @@ + + + + + + + + @@ -232,6 +245,15 @@ + + + + + + + + + @@ -249,6 +271,15 @@ + + + + + + + + + @@ -266,6 +297,15 @@ + + + + + + + + + @@ -283,10 +323,24 @@ + + + + + + + + + + + + + + @@ -356,6 +410,11 @@ + + + + + @@ -380,6 +439,11 @@ + + + + + @@ -409,6 +473,11 @@ + + + + + @@ -434,6 +503,15 @@ + + + + + + + + + @@ -458,6 +536,15 @@ + + + + + + + + + @@ -612,6 +699,11 @@ + + + + + @@ -636,21 +728,6 @@ - - - - - - - - - - - - - - - @@ -695,8 +772,7 @@ - - + @@ -710,6 +786,7 @@ + @@ -727,6 +804,7 @@ + @@ -788,7 +866,8 @@ - + + @@ -796,6 +875,7 @@ + @@ -887,6 +967,10 @@ + + + + @@ -939,6 +1023,7 @@ + diff --git a/configs/media_codecs_performance.xml b/configs/media_codecs_performance.xml index 6622f87..297fa47 100644 --- a/configs/media_codecs_performance.xml +++ b/configs/media_codecs_performance.xml @@ -100,26 +100,26 @@ - - - - + + + + - - + + - - - - - - + + + + + + - - + + diff --git a/configs/media_profiles.xml b/configs/media_profiles.xml index 59466c8..2036ecf 100644 --- a/configs/media_profiles.xml +++ b/configs/media_profiles.xml @@ -27,7 +27,7 @@ - + @@ -173,6 +173,457 @@ channels="2" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/configs/sec_config b/configs/sec_config index b0db281..069f2a9 100644 --- a/configs/sec_config +++ b/configs/sec_config @@ -272,7 +272,7 @@ 18:4294967295:1001:3004 /* Allow QMID service to aquire net_raw permission */ 3:4294967295:1001:3004 -2:4294967295:1001:3004 +2:4294967295:1000:1001:3004 42:4294967295:1001:3004 18:4294967295:1001:3004 9:4294967295:1001:3004 diff --git a/configs/sensors/hals.conf b/configs/sensors/hals.conf index 4fd77f3..cbd61a1 100644 --- a/configs/sensors/hals.conf +++ b/configs/sensors/hals.conf @@ -1,2 +1,2 @@ sensors.ssc.so -sensors.iio.so +sensors.rp.so diff --git a/configs/sensors/sensor_def_qcomdev.conf b/configs/sensors/sensor_def_qcomdev.conf index acbb99b..427fe59 100644 --- a/configs/sensors/sensor_def_qcomdev.conf +++ b/configs/sensors/sensor_def_qcomdev.conf @@ -1,5 +1,5 @@ # -# File: sensor_def_qcomdev.conf +# File: sensor_def_qcomdev.conf for sanders # # Tihs file contains default sensor registry values for Qualcomm development # test platforms. @@ -893,12 +893,12 @@ # Orientation of sensors # accel x/y/z 700 -1 0x00010001 #accel-x-axis -701 2 0x00010001 #accel-y-axis -702 -3 0x00010001 #accel-z-axis +701 -2 0x00010001 #accel-y-axis +702 3 0x00010001 #accel-z-axis # gyro x/y/z -800 1 0x00010001 #gyro-x-axis +800 -1 0x00010001 #gyro-x-axis 801 -2 0x00010001 #gyro-y-axis -802 -3 0x00010001 #gyro-z-axis +802 3 0x00010001 #gyro-z-axis # mag x/y/z 900 1 0x00010001 #mag-x-axis 901 -2 0x00010001 #mag-y-axis @@ -926,9 +926,41 @@ 4112 65536 0x00010001 # SMD 4103 5 0x00010001 # SMD_ACC_WIN_TIME -# SSI SMGR Cfg 0: LSM6DS3 Accel FIFO -1903 0x1a0bd9d5956c508e 0x00010001 #UUID -1902 0x1246e1cb09a92baa 0x00010001 #UUID +# Mot Chopchop config +10000 0x38ffc7 0x10001 # max gyro rot, 57 degrees in deg, Q16 +10001 0x15dfea2 0x10001 # max chop dur, ms, Q16 +10002 0x231860 0x10001 # accel thres 1, m/s2, Q16 +10003 0xA8750 0x10001 # accel thres 2, m/s2, Q16 +10004 0x2666 0x10001 # min mag per, Q16 +10005 0x5999 0x10001 # max xy per, Q16 + +# ALS/Prox Config (AMS TMD2725-based) +107 100 0x10001 # Prox Covered Threshold (PIHT) +108 60 0x10001 # Prox Uncovered Threshold (PILT) +109 16 0x10001 # Prox Pulse Count (PPULSE) +110 1 0x10001 # Prox Pulse Length (PPULSE_LEN) +111 102 0x10001 # Prox LED Current (PLDRIVE) - in mA +112 4 0x10001 # Prox Gain (PGAIN) - choose from 1/2/4/8 +113 2 0x10001 # Prox Persistence (PPERS) +114 4000 0x10001 # Prox Integration Time (PTIME) - in us +116 5 0x10001 # ALS Threshold High - in % +117 5 0x10001 # ALS Threshold Low - in % +118 200000 0x10001 # ALS Integration Time (ATIME) - in us +119 2800 0x10001 # ALS Wait Time (WTIME) - in us +120 4 0x10001 # ALS Gain (AGAIN) - choose from 1/4/16/64 +121 1 0x10001 # ALS Persistence (APERS) +122 9900 0x10001 # ALS Calibration Factor +123 170 0x10001 # ALS L1 Factor +124 1000 0x10001 # ALS L2 Factor +125 170 0x10001 # ALS L3 Factor +126 41 0x10001 # ALS D Factor +# ALS/Prox Mot Custom Config +131 0x03 0x10001 # Cal Config (Bit 0 - Prox Re-cal, Bit 1 - Prox Fast-cal) +132 0x00 0x10001 # Log Config (Bit 0 - Raw ALS, Bit 1 - Raw Prox, Bit 2 - Verbose) + +# SSI SMGR Cfg 0: BMI160 Accel DRI/FIFO +1903 0x0f4d0fd654c7eab5 0x00010001 #UUID +1902 0xd646cb83ec0cd5a5 0x00010001 #UUID 1904 100000 0x00010001 #off_to_idle 1905 0 0x00010001 #idle_to_ready 1906 0x1006 0x00010001 #spi_bus @@ -937,18 +969,20 @@ 1909 42 0x00010001 #gpio1 1910 0xFFFF 0x00010001 #gpio2 1911 0 0x00010001 #sensor_id -1912 0 0x00010001 #spi cs +1912 0 0x00010001 #CS for SPI 1913 1 0x00010001 #data_type1 1914 0 0x00010001 #data_type2 1915 -1 0x00010001 #rel_sns_idx 1916 1 0x00010001 #sens_default 1917 0xD0 0x00010001 #flags 1982 0 0x00010001 #device_select +1987 0x2 0x00010001 #vdd +1988 0x2 0x00010001 #vddio -# SSI SMGR Cfg 1: LSM6DS3 GYRO DRI/FIFO -1919 0x1a0bd9d5956c508e 0x00010001 #UUID -1918 0x1246e1cb09a92baa 0x00010001 #UUID -1920 100000 0x00010001 #off_to_idle +# SSI SMGR Cfg 1 BMI160 gyro DRI/FIFO +1919 0x0f4d0fd654c7eab5 0x00010001 #UUID +1918 0xd646cb83ec0cd5a5 0x00010001 #UUID +1920 150000 0x00010001 #off_to_idle 1921 0 0x00010001 #idle_to_ready 1922 0x1006 0x00010001 #SPI_bus 1923 1010 0x00010001 #reg_group_id @@ -963,10 +997,12 @@ 1932 3 0x00010001 #sens_default 1933 0xD0 0x00010001 #flags 1983 0 0x00010001 #device_select +1989 0x2 0x00010001 #vdd +1990 0x2 0x00010001 #vddio # SSI SMGR Cfg 2: AKM09915 DRI/FIFO -1935 0x90611b98d561168f 0x00010001 #UUID -1934 0x564d2b94fe80aef6 0x00010001 #UUID +1935 0x0000000000000000 0x00010001 #UUID +1934 0x0000000000000000 0x00010001 #UUID 1936 3000 0x00010001 #off_to_idle 1937 10000 0x00010001 #idle_to_ready 1938 4 0x00010001 #I2c_bus @@ -1049,21 +1085,21 @@ 104 50 0x00010001 #far_thresh 105 200 0x00010001 #prx_factor 106 32 0x00010001 #als factor -107 50 0x00010001 #ams_magic_number -108 1 0x00010001 #ams_driver_id -109 1 0x00010001 #calibratePhone -110 4 0x00010001 #ams_sensor -111 250 0x00010001 #calLuxLower -112 350 0x00010001 #calLuxUpper -113 24 0x00010001 #d_factor -114 2000 0x00010001 #iCoefB -115 600 0x00010001 #iCoefC -116 1000 0x00010001 #iCoefD -117 600 0x00010001 #proxDetect -118 400 0x00010001 #proxRelease -119 65536 0x00010001 #luxCorrection -120 20 0x00010001 #als_thresh_high -121 20 0x00010001 #als_thresh_low +#107 50 0x00010001 #ams_magic_number +#108 1 0x00010001 #ams_driver_id +#109 1 0x00010001 #calibratePhone +#110 4 0x00010001 #ams_sensor +#111 250 0x00010001 #calLuxLower +#112 350 0x00010001 #calLuxUpper +#113 24 0x00010001 #d_factor +#114 2000 0x00010001 #iCoefB +#115 600 0x00010001 #iCoefC +#116 1000 0x00010001 #iCoefD +#117 600 0x00010001 #proxDetect +#118 400 0x00010001 #proxRelease +#119 65536 0x00010001 #luxCorrection +#120 20 0x00010001 #als_thresh_high +#121 20 0x00010001 #als_thresh_low # Factory magnetometer calibration 401 0x00000001 0x00010001 #Mag_fac_cal_bias_valid @@ -1079,16 +1115,23 @@ 414 0x00010144 0x00010001 #Compensation_matrix_2_2 :property ro.hw.revision p0 -# SSI SMGR Cfg 2: AKM09912 DRI (Non-FIFO override for p0) -1949 0xC0 0x00010002 #flags +# accel x/y/z +700 -2 0x00010001 #accel-x-axis +701 1 0x00010001 #accel-y-axis +702 3 0x00010001 #accel-z-axis +# gyro x/y/z +800 -2 0x00010001 #gyro-x-axis +801 1 0x00010001 #gyro-y-axis +802 3 0x00010001 #gyro-z-axis -:property ro.hw.revision p1a -# SSI SMGR Cfg 2: AKM09912 DRI (Non-FIFO override for p1a) -1949 0xC0 0x00010002 #flags +# SSI SMGR Cfg 0: LSM6DS3 Accel FIFO +1903 0x1a0bd9d5956c508e 0x00010001 #UUID +1902 0x1246e1cb09a92baa 0x00010001 #UUID -:property ro.hw.revision p1a1 -# SSI SMGR Cfg 2: AKM09912 DRI (Non-FIFO override for p1a1) -1949 0xC0 0x00010002 #flags +# SSI SMGR Cfg 1: LSM6DS3 GYRO DRI/FIFO +1919 0x1a0bd9d5956c508e 0x00010001 #UUID +1918 0x1246e1cb09a92baa 0x00010001 #UUID +1920 100000 0x00010001 #off_to_idle :platform QRD @@ -1367,17 +1410,17 @@ :soc_id # Orientation of sensors # accel x/y/z -700 1 0x00010002 #accel-x-axis -701 2 0x00010002 #accel-y-axis -702 3 0x00010002 #accel-z-axis +700 2 0x00010002 #accel-x-axis +701 1 0x00010002 #accel-y-axis +702 -3 0x00010002 #accel-z-axis # gyro x/y/z 800 1 0x00010002 #gyro-x-axis 801 2 0x00010002 #gyro-y-axis 802 3 0x00010002 #gyro-z-axis # mag x/y/z -900 -1 0x00010002 #mag-x-axis -901 3 0x00010002 #mag-y-axis -902 2 0x00010002 #mag-z-axis +900 -2 0x00010002 #mag-x-axis +901 1 0x00010002 #mag-y-axis +902 3 0x00010002 #mag-z-axis # SSI SMGR Version 1900 1 0x00010001 #Maj Ver 1901 1 0x00010001 #Min Ver @@ -1401,12 +1444,37 @@ 4103 5 0x10001 # SMD_ACC_WIN_TIME # Mot Chopchop config -10000 0x707f8f8 0x10001 # max gyro rot, rad/s, Q16 -10001 0x15dfea2 0x10001 # max chop dur, ms, Q16 -10002 0x13ffec 0x10001 # accel thres 1, m/s2, Q16 -10003 0x5fffa 0x10001 # accel thres 2, m/s2, Q16 -10004 0x2666 0x10001 # min mag per, Q16 -10005 0x5999 0x10001 # max xy per, Q16 +10000 0x68FF97 0x10001 # max gyro rot, 105 degrees in deg, Q16 +10001 0x15DFEA2 0x10001 # max chop dur, 350 ms, Q16 +10002 0x25FFDA 0x10001 # accel thres 1, 38 m/s2, Q16 +10003 0x23FFDC 0x10001 # accel thres 2, 36 m/s2, Q16 +10004 0x4CCD 0x10001 # min mag per, 0.3, Q16 +10005 0x599A 0x10001 # max xy per, 0.35, Q16 + +# ALS/Prox Config (AMS TMD2725-based) +107 85 0x10001 # Prox Covered Threshold (PIHT) +108 65 0x10001 # Prox Uncovered Threshold (PILT) +109 32 0x10001 # Prox Pulse Count (PPULSE) +110 1 0x10001 # Prox Pulse Length (PPULSE_LEN) +111 54 0x10001 # Prox LED Current (PLDRIVE) - in mA +112 1 0x10001 # Prox Gain (PGAIN) - choose from 1/2/4/8 +113 1 0x10001 # Prox Persistence (PPERS) +114 4000 0x10001 # Prox Integration Time (PTIME) - in us +116 5 0x10001 # ALS Threshold High - in % +117 5 0x10001 # ALS Threshold Low - in % +118 51000 0x10001 # ALS Integration Time (ATIME) - in us +119 40000 0x10001 # ALS Wait Time (WTIME) - in us +120 4 0x10001 # ALS Gain (AGAIN) - choose from 1/4/16/64 +121 1 0x10001 # ALS Persistence (APERS) +122 9900 0x10001 # ALS Calibration Factor +123 200 0x10001 # ALS L1 Factor +124 697 0x10001 # ALS L2 Factor +125 85 0x10001 # ALS L3 Factor +126 52 0x10001 # ALS D Factor +127 2 0x10001 # Prox Binary Search Target (x = 0~7, target = 2^x - 1) +# ALS/Prox Mot Custom Config +131 0x07 0x10001 # Cal Config (Bit 0 - Prox Re-cal, Bit 1 - Prox Fast-cal, Bit 2 - Unlock Re-cal) +132 0x00 0x10001 # Log Config (Bit 0 - Raw ALS, Bit 1 - Raw Prox, Bit 2 - Verbose) # SSI SMGR Cfg 0: LSM6DS3 Accel DRI/FIFO 1903 0x1a0bd9d5956c508e 0x00010001 #UUID @@ -1511,7 +1579,7 @@ 3604 100 0x00010001 #off_to_idle 3605 100 0x00010001 #idle_to_ready 3606 4 0x00010001 #i2c_bus - ignored, unused by this device -3607 0xFFFF 0x00010001 #reg_group_id +3607 10001 0x00010001 #reg_group_id 3608 0xFFFF 0x00010001 #cal_grp_id 3609 90 0x00010001 #gpio1 CC_INT 3610 106 0x00010001 #gpio2 CC_CLR @@ -1522,7 +1590,7 @@ 3615 0xFF 0x00010001 #rel_sns_idx 3616 0 0x00010001 #sens_default 3617 0x80 0x00010001 #flags -3682 0 0x00010001 #device_select +3682 0x0C 0x00010001 #device_select - Third GPIO, valid in Rev 07+ HW # SSI SMGR Cfg 6: Motorola DSP 3619 0x9ccb3198c7b94c22 0x00010001 #UUID @@ -1582,24 +1650,7 @@ 223 0x00001657 0x00010001 #RMD INT Cfg param3 224 0x00003333 0x00010001 #RMD INT Cfg param4 -:property ro.hw.revision p0 -# SSI SMGR Cfg 2: AKM09912 DRI (Non-FIFO override for p0) -1949 0xC0 0x00010002 #flags - -:property ro.hw.revision p1a -# SSI SMGR Cfg 2: AKM09912 DRI (Non-FIFO override for p1a) -1949 0xC0 0x00010002 #flags - -:property ro.hw.revision p1a1 -# SSI SMGR Cfg 2: AKM09912 DRI (Non-FIFO override for p1a1) -1949 0xC0 0x00010002 #flags - -:property ro.build.product sanders -700 2 0x00010002 #accel-x-axis -701 1 0x00010002 #accel-y-axis -702 -3 0x00010002 #accel-z-axis - -:platform MTP +:platform MTP_xxx_NEVER_USE # TMD27723 override default parameters 100 25 0x00010001 #visible_light_trans_ratio 101 60 0x00010001 #ir_light_trans_ratio