diff --git a/audio/comet/aidl_config/mixer_paths_aidl.xml b/audio/comet/aidl_config/mixer_paths_aidl.xml index a5d8e60..befdc9e 100644 --- a/audio/comet/aidl_config/mixer_paths_aidl.xml +++ b/audio/comet/aidl_config/mixer_paths_aidl.xml @@ -1298,6 +1298,10 @@ + + + + @@ -1332,6 +1336,10 @@ + + + + diff --git a/audio/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so b/audio/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so index f9fca0e..b9f43a7 100644 Binary files a/audio/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so and b/audio/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so differ diff --git a/audio/comet/tuning/waves/waves_config.ini b/audio/comet/tuning/waves/waves_config.ini index ad00ce9..7b40042 100644 --- a/audio/comet/tuning/waves/waves_config.ini +++ b/audio/comet/tuning/waves/waves_config.ini @@ -63,26 +63,26 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so #AudioFormatIncrement=8 [CUSTOM_ACTION_257] -CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0|3:0,PRESET:SPEAKER_MUSIC_FOLDED -CASE_2=PRIORITY:1,NUMBERS:2:0|1:1|2:0|3:1,PRESET:SPEAKER_MUSIC_FOLDED_NX -CASE_3=PRIORITY:2,NUMBERS:2:0|1:1|2:1:0,PRESET:SPEAKER_MUSIC_CLAMSHELL -CASE_4=PRIORITY:3,NUMBERS:2:0|1:1|2:1:1,PRESET:SPEAKER_MUSIC_CLAMSHELL_NX -CASE_5=PRIORITY:4,NUMBERS:2:0|1:1|2:2:0,PRESET:SPEAKER_MUSIC_UNFOLDED -CASE_6=PRIORITY:5,NUMBERS:2:0|1:1|2:2:1,PRESET:SPEAKER_MUSIC_UNFOLDED_NX -CASE_7=PRIORITY:6,NUMBERS:1|2|4194304:2|3|4:1|2:0|1|2|3:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE -CASE_8=PRIORITY:7,NUMBERS:1|4194304:0|1:1|2:0|1|2|3:0|1,PRESET:SPEAKER_SAFE_MUSIC -CASE_9=PRIORITY:8,NUMBERS:2:0|1:0:0|3:0|1,PRESET:SPEAKER_MUSIC_FOLDED_THROTTLE -CASE_10=PRIORITY:9,NUMBERS:2:0|1:0:0|3:0|1,PRESET:SPEAKER_MUSIC_FOLDED_THROTTLE_NX -CASE_11=PRIORITY:10,NUMBERS:2:0|1:0:1:0,PRESET:SPEAKER_MUSIC_CLAMSHELL_THROTTLE -CASE_12=PRIORITY:11,NUMBERS:2:0|1:0:1:0,PRESET:SPEAKER_MUSIC_CLAMSHELL_THROTTLE_NX -CASE_13=PRIORITY:12,NUMBERS:2:0|1:0:2:0,PRESET:SPEAKER_MUSIC_UNFOLDED_THROTTLE -CASE_14=PRIORITY:13,NUMBERS:2:0|1:0:2:0,PRESET:SPEAKER_MUSIC_UNFOLDED_THROTTLE_NX -CASE_15=PRIORITY:14,NUMBERS:1|2|4194304:2|3|4:0:0|1|2|3:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE -CASE_16=PRIORITY:15,NUMBERS:1|4194304:0|1:0:0|1|2|3:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE +CASE_1=PRIORITY:0,NUMBERS:2:0|1|4:1|2:0|3:0,PRESET:SPEAKER_MUSIC_FOLDED +CASE_2=PRIORITY:1,NUMBERS:2:0|1|4:1|2:0|3:1,PRESET:SPEAKER_MUSIC_FOLDED_NX +CASE_3=PRIORITY:2,NUMBERS:2:0|1|4:1|2:1:0,PRESET:SPEAKER_MUSIC_CLAMSHELL +CASE_4=PRIORITY:3,NUMBERS:2:0|1|4:1|2:1:1,PRESET:SPEAKER_MUSIC_CLAMSHELL_NX +CASE_5=PRIORITY:4,NUMBERS:2:0|1|4:1|2:2:0,PRESET:SPEAKER_MUSIC_UNFOLDED +CASE_6=PRIORITY:5,NUMBERS:2:0|1|4:1|2:2:1,PRESET:SPEAKER_MUSIC_UNFOLDED_NX +CASE_7=PRIORITY:6,NUMBERS:1|2|4194304:2|3:1|2:0|1|2|3:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE +CASE_8=PRIORITY:7,NUMBERS:1|4194304:0|1|4:1|2:0|1|2|3:0|1,PRESET:SPEAKER_SAFE_MUSIC +CASE_9=PRIORITY:8,NUMBERS:2:0|1|4:0:0|3:0|1,PRESET:SPEAKER_MUSIC_FOLDED_THROTTLE +CASE_10=PRIORITY:9,NUMBERS:2:0|1|4:0:0|3:0|1,PRESET:SPEAKER_MUSIC_FOLDED_THROTTLE_NX +CASE_11=PRIORITY:10,NUMBERS:2:0|1|4:0:1:0,PRESET:SPEAKER_MUSIC_CLAMSHELL_THROTTLE +CASE_12=PRIORITY:11,NUMBERS:2:0|1|4:0:1:0,PRESET:SPEAKER_MUSIC_CLAMSHELL_THROTTLE_NX +CASE_13=PRIORITY:12,NUMBERS:2:0|1|4:0:2:0,PRESET:SPEAKER_MUSIC_UNFOLDED_THROTTLE +CASE_14=PRIORITY:13,NUMBERS:2:0|1|4:0:2:0,PRESET:SPEAKER_MUSIC_UNFOLDED_THROTTLE_NX +CASE_15=PRIORITY:14,NUMBERS:1|2|4194304:2|3:0:0|1|2|3:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE +CASE_16=PRIORITY:15,NUMBERS:1|4194304:0|1|4:0:0|1|2|3:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE # Action 257 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t, folded_type_t, sound_usage_t # - audio_devices_t : current active device -# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip +# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip, 4 - call screen # - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed # - folded_type_t: 0 - Close, 1 -Clamshell, 2 - Open, 3 - unknown # - sound_usage_t: 0 - NX_off, 1 - NX_on diff --git a/bluetooth/bluetooth_power_limits_comet.csv b/bluetooth/bluetooth_power_limits_comet.csv index d516bb6..0ebad18 100644 --- a/bluetooth/bluetooth_power_limits_comet.csv +++ b/bluetooth/bluetooth_power_limits_comet.csv @@ -1,71 +1,71 @@ Hall,Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,HR_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,HR_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,HR_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1,HR_Dual_Chain_1 -off,off,off,off,off,off,on,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56 -off,off,off,off,off,on,on,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56 -off,off,off,off,on,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56 -off,off,off,off,on,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56 -off,off,off,on,off,off,on,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56 -off,off,off,on,off,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56 -off,off,off,on,on,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56 -off,off,off,on,on,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56 -off,off,on,off,off,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56 -off,off,on,off,off,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56 -off,off,on,off,on,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56 -off,off,on,off,on,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56 -off,off,on,on,off,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56 -off,off,on,on,off,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56 -off,off,on,on,on,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56 -off,off,on,on,on,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56 -off,on,off,off,off,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40 -off,on,off,off,off,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40 -off,on,off,off,on,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40 -off,on,off,off,on,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40 -off,on,off,on,off,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40 -off,on,off,on,off,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40 -off,on,off,on,on,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40 -off,on,off,on,on,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40 -off,on,on,off,off,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40 -off,on,on,off,off,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40 -off,on,on,off,on,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40 -off,on,on,off,on,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40 -off,on,on,on,off,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40 -off,on,on,on,off,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40 -off,on,on,on,on,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40 -off,on,on,on,on,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40 -off,off,off,any,off,any,off,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56 -off,off,on,any,off,any,off,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56 -off,off,off,any,on,any,off,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56 -on,off,off,off,off,off,on,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56 -on,off,off,off,off,on,on,78,68,78,68,76,68,76,68,66,56,66,56,66,56,66,56 -on,off,off,off,on,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56 -on,off,off,off,on,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56 -on,off,off,on,off,off,on,78,68,78,68,76,68,76,68,66,56,66,56,66,56,66,56 -on,off,off,on,off,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56 -on,off,off,on,on,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56 -on,off,off,on,on,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56 -on,off,on,off,off,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56 -on,off,on,off,off,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56 -on,off,on,off,on,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56 -on,off,on,off,on,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56 -on,off,on,on,off,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56 -on,off,on,on,off,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56 -on,off,on,on,on,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56 -on,off,on,on,on,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56 -on,on,off,off,off,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50 -on,on,off,off,off,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50 -on,on,off,off,on,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50 -on,on,off,off,on,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50 -on,on,off,on,off,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50 -on,on,off,on,off,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50 -on,on,off,on,on,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50 -on,on,off,on,on,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50 -on,on,on,off,off,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50 -on,on,on,off,off,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50 -on,on,on,off,on,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50 -on,on,on,off,on,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50 -on,on,on,on,off,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50 -on,on,on,on,off,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50 -on,on,on,on,on,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50 -on,on,on,on,on,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50 -on,off,off,any,off,any,off,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56 -on,off,on,any,off,any,off,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56 -on,off,off,any,on,any,off,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56 +off,off,off,off,off,off,on,66,64,34,64,66,64,34,64,54,52,22,52,54,52,22,52 +off,off,off,off,off,on,on,66,64,34,64,62,62,34,62,54,52,22,52,54,52,22,52 +off,off,off,off,on,off,on,66,64,34,64,50,50,34,50,46,46,22,46,46,46,22,46 +off,off,off,off,on,on,on,66,64,34,64,50,50,34,50,46,46,22,46,46,46,22,46 +off,off,off,on,off,off,on,66,64,34,64,62,62,34,62,54,52,22,52,60,52,22,52 +off,off,off,on,off,on,on,66,64,34,64,50,50,34,50,46,46,22,46,46,46,22,46 +off,off,off,on,on,off,on,66,64,34,64,50,50,34,50,46,46,22,46,46,46,22,46 +off,off,off,on,on,on,on,66,64,34,64,50,50,34,50,46,46,22,46,46,46,22,46 +off,off,on,off,off,off,on,66,64,34,64,50,50,34,50,46,46,22,46,46,46,22,46 +off,off,on,off,off,on,on,66,64,34,64,50,50,34,50,46,46,22,46,46,46,22,46 +off,off,on,off,on,off,on,66,64,34,64,50,50,34,50,46,46,22,46,46,46,22,46 +off,off,on,off,on,on,on,66,64,34,64,50,50,34,50,46,46,22,46,46,46,22,46 +off,off,on,on,off,off,on,66,64,34,64,50,50,34,50,46,46,22,46,46,46,22,46 +off,off,on,on,off,on,on,66,64,34,64,50,50,34,50,46,46,22,46,46,46,22,46 +off,off,on,on,on,off,on,66,64,34,64,50,50,34,50,46,46,22,46,46,46,22,46 +off,off,on,on,on,on,on,66,64,34,64,50,50,34,50,46,46,22,46,46,46,22,46 +off,on,off,off,off,off,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26 +off,on,off,off,off,on,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26 +off,on,off,off,on,off,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26 +off,on,off,off,on,on,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26 +off,on,off,on,off,off,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26 +off,on,off,on,off,on,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26 +off,on,off,on,on,off,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26 +off,on,off,on,on,on,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26 +off,on,on,off,off,off,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26 +off,on,on,off,off,on,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26 +off,on,on,off,on,off,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26 +off,on,on,off,on,on,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26 +off,on,on,on,off,off,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26 +off,on,on,on,off,on,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26 +off,on,on,on,on,off,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26 +off,on,on,on,on,on,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26 +off,off,off,any,off,any,off,66,64,34,64,66,64,34,64,54,52,22,52,54,52,22,52 +off,off,on,any,off,any,off,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52 +off,off,off,any,on,any,off,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52 +on,off,off,off,off,off,on,66,64,34,64,66,64,34,64,54,52,22,52,54,52,22,52 +on,off,off,off,off,on,on,66,64,34,64,66,64,34,64,54,52,22,52,54,52,22,52 +on,off,off,off,on,off,on,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52 +on,off,off,off,on,on,on,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52 +on,off,off,on,off,off,on,66,64,34,64,66,64,34,64,54,52,22,52,54,52,22,52 +on,off,off,on,off,on,on,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52 +on,off,off,on,on,off,on,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52 +on,off,off,on,on,on,on,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52 +on,off,on,off,off,off,on,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52 +on,off,on,off,off,on,on,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52 +on,off,on,off,on,off,on,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52 +on,off,on,off,on,on,on,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52 +on,off,on,on,off,off,on,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52 +on,off,on,on,off,on,on,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52 +on,off,on,on,on,off,on,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52 +on,off,on,on,on,on,on,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52 +on,on,off,off,off,off,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50 +on,on,off,off,off,on,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50 +on,on,off,off,on,off,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50 +on,on,off,off,on,on,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50 +on,on,off,on,off,off,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50 +on,on,off,on,off,on,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50 +on,on,off,on,on,off,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50 +on,on,off,on,on,on,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50 +on,on,on,off,off,off,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50 +on,on,on,off,off,on,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50 +on,on,on,off,on,off,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50 +on,on,on,off,on,on,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50 +on,on,on,on,off,off,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50 +on,on,on,on,off,on,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50 +on,on,on,on,on,off,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50 +on,on,on,on,on,on,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50 +on,off,off,any,off,any,off,66,64,34,64,66,64,34,64,54,52,22,52,54,52,22,52 +on,off,on,any,off,any,off,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52 +on,off,off,any,on,any,off,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52 diff --git a/bluetooth/bluetooth_power_limits_comet_CE.csv b/bluetooth/bluetooth_power_limits_comet_CE.csv deleted file mode 100644 index 5aef29d..0000000 --- a/bluetooth/bluetooth_power_limits_comet_CE.csv +++ /dev/null @@ -1,71 +0,0 @@ -Hall,Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,HR_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,HR_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,HR_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1,HR_Dual_Chain_1 -off,off,off,off,off,off,on,78,68,30,68,78,68,30,68,66,56,18,56,66,56,18,56 -off,off,off,off,off,on,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56 -off,off,off,off,on,off,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56 -off,off,off,off,on,on,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56 -off,off,off,on,off,off,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56 -off,off,off,on,off,on,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56 -off,off,off,on,on,off,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56 -off,off,off,on,on,on,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56 -off,off,on,off,off,off,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56 -off,off,on,off,off,on,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56 -off,off,on,off,on,off,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56 -off,off,on,off,on,on,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56 -off,off,on,on,off,off,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56 -off,off,on,on,off,on,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56 -off,off,on,on,on,off,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56 -off,off,on,on,on,on,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56 -off,on,off,off,off,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -off,on,off,off,off,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -off,on,off,off,on,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -off,on,off,off,on,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -off,on,off,on,off,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -off,on,off,on,off,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -off,on,off,on,on,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -off,on,off,on,on,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -off,on,on,off,off,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -off,on,on,off,off,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -off,on,on,off,on,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -off,on,on,off,on,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -off,on,on,on,off,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -off,on,on,on,off,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -off,on,on,on,on,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -off,on,on,on,on,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -off,off,off,any,off,any,off,78,68,30,68,78,68,30,68,66,56,18,56,66,56,18,56 -off,off,on,any,off,any,off,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56 -off,off,off,any,on,any,off,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56 -on,off,off,off,off,off,on,78,68,30,68,78,68,30,68,66,56,18,56,66,56,18,56 -on,off,off,off,off,on,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,off,off,off,on,off,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,off,off,off,on,on,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,off,off,on,off,off,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,off,off,on,off,on,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,off,off,on,on,off,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,off,off,on,on,on,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,off,on,off,off,off,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,off,on,off,off,on,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,off,on,off,on,off,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,off,on,off,on,on,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,off,on,on,off,off,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,off,on,on,off,on,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,off,on,on,on,off,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,off,on,on,on,on,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,on,off,off,off,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,on,off,off,off,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,on,off,off,on,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,on,off,off,on,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,on,off,on,off,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,on,off,on,off,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,on,off,on,on,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,on,off,on,on,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,on,on,off,off,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,on,on,off,off,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,on,on,off,on,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,on,on,off,on,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,on,on,on,off,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,on,on,on,off,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,on,on,on,on,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,on,on,on,on,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,off,off,any,off,any,off,78,68,30,68,78,68,30,68,66,56,18,56,66,56,18,56 -on,off,on,any,off,any,off,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 -on,off,off,any,on,any,off,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56 diff --git a/bluetooth/bluetooth_power_limits_comet_EU.csv b/bluetooth/bluetooth_power_limits_comet_EU.csv new file mode 100644 index 0000000..798da83 --- /dev/null +++ b/bluetooth/bluetooth_power_limits_comet_EU.csv @@ -0,0 +1,71 @@ +Hall,Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,HR_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,HR_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,HR_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1,HR_Dual_Chain_1 +off,off,off,off,off,off,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52 +off,off,off,off,off,on,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52 +off,off,off,off,on,off,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52 +off,off,off,off,on,on,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52 +off,off,off,on,off,off,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52 +off,off,off,on,off,on,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52 +off,off,off,on,on,off,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52 +off,off,off,on,on,on,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52 +off,off,on,off,off,off,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52 +off,off,on,off,off,on,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52 +off,off,on,off,on,off,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52 +off,off,on,off,on,on,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52 +off,off,on,on,off,off,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52 +off,off,on,on,off,on,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52 +off,off,on,on,on,off,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52 +off,off,on,on,on,on,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52 +off,on,off,off,off,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +off,on,off,off,off,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +off,on,off,off,on,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +off,on,off,off,on,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +off,on,off,on,off,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +off,on,off,on,off,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +off,on,off,on,on,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +off,on,off,on,on,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +off,on,on,off,off,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +off,on,on,off,off,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +off,on,on,off,on,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +off,on,on,off,on,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +off,on,on,on,off,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +off,on,on,on,off,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +off,on,on,on,on,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +off,on,on,on,on,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +off,off,off,any,off,any,off,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52 +off,off,on,any,off,any,off,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52 +off,off,off,any,on,any,off,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52 +on,off,off,off,off,off,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52 +on,off,off,off,off,on,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,off,off,off,on,off,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,off,off,off,on,on,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,off,off,on,off,off,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,off,off,on,off,on,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,off,off,on,on,off,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,off,off,on,on,on,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,off,on,off,off,off,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,off,on,off,off,on,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,off,on,off,on,off,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,off,on,off,on,on,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,off,on,on,off,off,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,off,on,on,off,on,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,off,on,on,on,off,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,off,on,on,on,on,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,on,off,off,off,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,on,off,off,off,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,on,off,off,on,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,on,off,off,on,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,on,off,on,off,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,on,off,on,off,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,on,off,on,on,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,on,off,on,on,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,on,on,off,off,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,on,on,off,off,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,on,on,off,on,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,on,on,off,on,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,on,on,on,off,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,on,on,on,off,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,on,on,on,on,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,on,on,on,on,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,off,off,any,off,any,off,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52 +on,off,on,any,off,any,off,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 +on,off,off,any,on,any,off,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52 diff --git a/bluetooth/bluetooth_power_limits_comet_JP.csv b/bluetooth/bluetooth_power_limits_comet_JP.csv index 8131391..768e102 100644 --- a/bluetooth/bluetooth_power_limits_comet_JP.csv +++ b/bluetooth/bluetooth_power_limits_comet_JP.csv @@ -1,71 +1,71 @@ Hall,Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,HR_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,HR_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,HR_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1,HR_Dual_Chain_1 -off,off,off,off,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,off,off,off,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,off,off,off,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,off,off,off,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,off,off,on,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,off,off,on,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,off,off,on,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,off,off,on,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,off,on,off,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,off,on,off,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,off,on,off,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,off,on,off,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,off,on,on,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,off,on,on,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,off,on,on,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,off,on,on,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,on,off,off,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,on,off,off,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,on,off,off,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,on,off,off,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,on,off,on,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,on,off,on,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,on,off,on,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,on,off,on,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,on,on,off,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,on,on,off,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,on,on,off,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,on,on,off,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,on,on,on,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,on,on,on,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,on,on,on,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,on,on,on,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,off,off,any,off,any,off,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,off,on,any,off,any,off,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -off,off,off,any,on,any,off,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,off,off,off,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,off,off,off,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,off,off,off,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,off,off,off,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,off,off,on,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,off,off,on,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,off,off,on,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,off,off,on,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,off,on,off,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,off,on,off,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,off,on,off,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,off,on,off,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,off,on,on,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,off,on,on,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,off,on,on,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,off,on,on,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,on,off,off,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,on,off,off,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,on,off,off,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,on,off,off,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,on,off,on,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,on,off,on,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,on,off,on,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,on,off,on,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,on,on,off,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,on,on,off,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,on,on,off,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,on,on,off,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,on,on,on,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,on,on,on,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,on,on,on,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,on,on,on,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,off,off,any,off,any,off,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,off,on,any,off,any,off,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 -on,off,off,any,on,any,off,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54 +off,off,off,off,off,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,off,off,off,off,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,off,off,off,on,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,off,off,off,on,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,off,off,on,off,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,off,off,on,off,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,off,off,on,on,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,off,off,on,on,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,off,on,off,off,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,off,on,off,off,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,off,on,off,on,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,off,on,off,on,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,off,on,on,off,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,off,on,on,off,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,off,on,on,on,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,off,on,on,on,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,on,off,off,off,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,on,off,off,off,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,on,off,off,on,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,on,off,off,on,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,on,off,on,off,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,on,off,on,off,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,on,off,on,on,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,on,off,on,on,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,on,on,off,off,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,on,on,off,off,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,on,on,off,on,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,on,on,off,on,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,on,on,on,off,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,on,on,on,off,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,on,on,on,on,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,on,on,on,on,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,off,off,any,off,any,off,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,off,on,any,off,any,off,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +off,off,off,any,on,any,off,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,off,off,off,off,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,off,off,off,off,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,off,off,off,on,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,off,off,off,on,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,off,off,on,off,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,off,off,on,off,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,off,off,on,on,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,off,off,on,on,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,off,on,off,off,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,off,on,off,off,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,off,on,off,on,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,off,on,off,on,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,off,on,on,off,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,off,on,on,off,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,off,on,on,on,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,off,on,on,on,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,on,off,off,off,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,on,off,off,off,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,on,off,off,on,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,on,off,off,on,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,on,off,on,off,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,on,off,on,off,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,on,off,on,on,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,on,off,on,on,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,on,on,off,off,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,on,on,off,off,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,on,on,off,on,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,on,on,off,on,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,on,on,on,off,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,on,on,on,off,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,on,on,on,on,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,on,on,on,on,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,off,off,any,off,any,off,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,off,on,any,off,any,off,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 +on,off,off,any,on,any,off,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52 diff --git a/comet/overlay/frameworks/base/core/res/res/values/config.xml b/comet/overlay/frameworks/base/core/res/res/values/config.xml index c2cf6be..a50bb31 100644 --- a/comet/overlay/frameworks/base/core/res/res/values/config.xml +++ b/comet/overlay/frameworks/base/core/res/res/values/config.xml @@ -268,7 +268,7 @@ Note: If the display supports multiple resolutions, please define the path config based on the highest resolution so that it can be scaled correctly in each resolution. --> - m 1079.5841,2228.3564 -0.1246,32.4289 -1.5262,29.5631 -5.2262,28.9368 -10.8184,28.1101 -17.0908,25.6679 -22.6755,21.2294 -24.9734,14.6141 -26.74845,9.0516 -27.32405,4.2923 -27.96102,1.2343 -30.67581,0.1 M 0.41700514,195.64292 0.54157654,163.21407 2.0678255,133.65079 7.2939781,104.71395 18.112341,76.603825 35.203139,50.936003 57.878707,29.706783 82.852085,15.092599 109.60055,6.040851 136.92456,1.7486483 164.88562,0.51443083 195.56143,0.41555729 m 688.87872,-2.2971e-4 32.41493,0.12395786 29.55063,1.52698566 28.92444,5.2283442 28.09805,10.8230047 25.6569,17.098154 21.22,22.685256 14.6081,24.984081 9.0478,26.759919 4.2904,27.33577 1.2336,27.97298 0.1,30.68899 M 195.56094,2423.584 l -32.41494,-0.1164 -29.55061,-1.527 -28.92444,-5.2283 -28.098077,-10.8231 -25.656844,-17.0981 -21.220125,-22.6853 -14.607925,-24.984 -9.0478703,-26.7598 -4.2903556,-27.3359 -1.23375522,-27.9729 -0.0996571,-30.689 m -0.001013,-0.01 V 195.6426 m 1079.16927242,0 V 2228.3577 M 884.44235,2423.5838 H 195.56204 m 0,-2423.16715466 h 688.88031 z + m 1079.946,2228.66 c 0,0 0.18,21.63 -0.12,32.44 -0.27,9.87 -0.39,19.77 -1.53,29.57 -1.13,9.74 -2.58,19.5 -5.23,28.95 -2.71,9.67 -6.21,19.2 -10.829,28.12 -4.72,9.13 -10.449,17.83 -17.099,25.68 -6.69,7.9 -14.379,15.04 -22.689,21.24 -7.73,5.77 -16.209,10.61 -24.989,14.62 -8.57,3.91 -17.619,6.81 -26.769,9.05 -8.96,2.2 -18.159,3.37 -27.339,4.29 -9.29,0.93 -18.649,1.01 -27.979,1.23 -10.229,0.24 -30.698,0.1 -30.698,0.1 H 195.323 c 0,0 -21.629,0.17 -32.438,-0.12 -9.869,-0.27 -19.769,-0.39 -29.568,-1.53 -9.739,-1.13 -19.499,-2.59 -28.938,-5.23 -9.669,-2.71 -19.199,-6.21 -28.119,-10.83 -9.14,-4.73 -17.829,-10.46 -25.669,-17.1 -7.91,-6.7 -15.039,-14.39 -21.229,-22.69 -5.77,-7.74 -10.619,-16.21 -14.619,-24.99 -3.91,-8.57 -6.81,-17.62 -9.05,-26.77 -2.2,-8.96 -3.37,-18.16 -4.29,-27.34 -0.93,-9.29 -1.01,-18.65 -1.24,-27.98 -0.24,-10.23 -0.1,-30.7 -0.1,-30.7 L 0.054,195.334 c 0,0 -0.18,-21.63 0.12,-32.44 C 0.444,153.024 0.564,143.124 1.703,133.324 2.833,123.584 4.283,113.824 6.933,104.374 9.643,94.704 13.143,85.174 17.763,76.254 22.482,67.124 28.212,58.424 34.862,50.584 41.551,42.684 49.241,35.544 57.551,29.344 65.28,23.574 73.76,18.734 82.539,14.724 91.109,10.824 100.158,7.924 109.308,5.674 c 8.96,-2.2 18.159,-3.37 27.339,-4.29 9.29,-0.93 18.649,-1.01 27.979,-1.23 10.229,-0.24 30.698,-0.1 30.698,-0.1 h 689.314 c 0,0 21.629,-0.18 32.438,0.12 9.869,0.27 19.769,0.39 29.568,1.53 9.739,1.13 19.499,2.59 28.938,5.23 9.669,2.71 19.199,6.21 28.119,10.83 9.14,4.73 17.829,10.46 25.669,17.1 7.91,6.7 15.039,14.39 21.229,22.69 5.77,7.74 10.619,16.21 14.619,24.99 3.91,8.57 6.81,17.62 9.05,26.77 2.2,8.96 3.37,18.16 4.29,27.34 0.93,9.29 1.01,18.65 1.24,27.98 0.24,10.23 0.1,30.7 0.1,30.7 z - m 141.72773,2075.6318 -21.50891,-0.2057 -24.262943,-2.3989 -25.997361,-7.6964 -25.027568,-14.7348 -20.81517,-21.2126 -14.032964,-24.7396 -7.2719262,-25.5084 -2.25203544,-23.7624 -0.19187278,-21.1004 m 2151.26552042,5e-4 -0.2056,21.5087 -2.3989,24.2627 -7.6964,25.997 -14.7351,25.0272 -21.2129,20.8149 -24.7398,14.0327 -25.5088,7.272 -23.7627,2.2519 -21.1008,0.1925 M 0.36718215,141.72593 0.5722516,120.21728 2.9710973,95.954655 10.667571,69.95761 25.402706,44.930369 46.615548,24.115468 71.355396,10.082677 96.864172,2.810842 120.62678,0.55883527 141.72762,0.36697958 m 1868.54408,1.8926e-4 21.509,0.20506687 24.263,2.39881539 25.9974,7.6963759 25.0275,14.734941 20.8152,21.212573 14.033,24.739531 7.2718,25.508452 2.2521,23.762356 0.1924,21.10053 M 141.72602,0.36821695 H 2010.27 m 0,2075.26478305 H 141.72602 M 2151.632,141.72452 V 1934.2729 m -2151.26408094,0 V 141.72452 z + M 0.041,2004.805 V 146.519 c 0,0 -0.176,-14.867 0.198,-22.287 C 0.663,115.839 1.046,107.394 2.553,99.126 4.225,89.962 6.479,80.819 9.977,72.185 13.68,63.046 18.377,54.207 24.187,46.24 30.028,38.231 36.947,30.898 44.657,24.668 51.905,18.813 60.025,13.937 68.523,10.118 76.345,6.602 84.716,4.282 93.122,2.583 100.634,1.064 108.342,0.675 115.994,0.248 122.769,-0.13 136.349,0.049 136.349,0.049 H 1939.018 c 0,0 14.16,-0.202 21.223,0.211 7.749,0.454 15.557,0.888 23.152,2.487 8.585,1.807 17.13,4.272 25.081,7.979 8.624,4.02 16.811,9.173 24.117,15.269 7.652,6.384 14.512,13.844 20.258,21.986 5.571,7.893 10.035,16.628 13.505,25.645 3.267,8.49 5.266,17.468 6.753,26.443 1.343,8.107 1.427,16.375 1.929,24.577 0.446,7.284 0.965,21.872 0.965,21.872 V 2004.805 c 0,0 -0.51,15.21 -0.965,22.805 -0.497,8.303 -0.455,16.692 -1.929,24.878 -1.656,9.197 -4.254,18.272 -7.717,26.951 -3.61,9.047 -7.794,18.024 -13.505,25.915 -5.942,8.209 -13.336,15.404 -21.223,21.768 -7.088,5.72 -14.838,10.792 -23.152,14.512 -7.944,3.555 -16.527,5.651 -25.081,7.256 -7.615,1.429 -15.423,1.53 -23.152,2.073 -6.745,0.474 -20.258,1.037 -20.258,1.037 H 136.349 c 0,0 -13.835,-0.558 -20.74,-1.037 -7.797,-0.541 -15.701,-0.49 -23.355,-2.073 -8.623,-1.783 -17.078,-4.62 -25.081,-8.293 -8.535,-3.917 -16.934,-8.498 -24.146,-14.512 -7.778,-6.486 -14.272,-14.505 -20.075,-22.805 -5.41,-7.738 -10.07,-16.098 -13.541,-24.878 -3.413,-8.633 -5.434,-17.803 -7.012,-26.951 -1.415,-8.203 -1.775,-16.563 -2.173,-24.878 -0.347,-7.248 -0.185,-21.768 -0.185,-21.768 z ggh2x @@ -299,6 +299,10 @@ off rounded corners logic in LetterboxUiController. Values are in pixel. --> 64 + + true + + + + + true + diff --git a/comet/overlay/packages/services/Telephony/res/values/config.xml b/comet/overlay/packages/services/Telephony/res/values/config.xml index 5f0d3a5..fc00abe 100644 --- a/comet/overlay/packages/services/Telephony/res/values/config.xml +++ b/comet/overlay/packages/services/Telephony/res/values/config.xml @@ -17,6 +17,44 @@ + + true + + + + in + il + tw + sg + ch + sk + pl + si + ba + + + + + in,,101,102,103,108 + il,,101,102 + tw,,110,119 + sg,,995 + ch,,1414 + gp,,115,119,191,196,197,116000,116111,116117 + sk,,159 + pl,01,984,985,997,998,999 + pl,06,984,985,997,998,999 + pl,,986,987,989,991,992,993,994,995,996 + re,,115,119,191,196,197,116000,116111,116117 + si,,113 + ba,,122,123,124 + + diff --git a/device-comet.mk b/device-comet.mk index 062fc28..51807b2 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -192,7 +192,7 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_comet.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_comet_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv \ $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_comet_CA.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_CA.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_comet_CE.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_CE.csv \ + $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_comet_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_EU.csv \ $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_comet_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_US.csv # DCK properties based on target @@ -326,24 +326,11 @@ PRODUCT_SOONG_NAMESPACES += \ device/google/comet/uwb # Location -# iGNSS -# gps.cfg PRODUCT_SOONG_NAMESPACES += device/google/comet/location +# For GPS property +PRODUCT_VENDOR_PROPERTIES += ro.vendor.gps.pps.enabled=true $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT)) PRODUCT_PACKAGES += gps.cfg -# eGNSS -# SDK build system -$(call soong_config_set, include_libsitril_gps_wifi, board_without_radio, $(BOARD_WITHOUT_RADIO)) -include device/google/gs-common/gps/brcm/device.mk -PRODUCT_SOONG_NAMESPACES += device/google/comet/location -SOONG_CONFIG_NAMESPACES += gpssdk -SOONG_CONFIG_gpssdk += gpsconf -SOONG_CONFIG_gpssdk_gpsconf ?= $(TARGET_BUILD_VARIANT) -PRODUCT_PACKAGES += \ - gps.cer \ - gps.xml \ - scd.conf \ - lhd.conf # Display PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ @@ -369,6 +356,10 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.front_720P_always_binning=true +# Enable camera exif model/make reporting +PRODUCT_VENDOR_PROPERTIES += \ + persist.vendor.camera.exif_reveal_make_model=true + # Media Performance Class 14 PRODUCT_PRODUCT_PROPERTIES += ro.odm.build.media_performance_class=34 @@ -453,6 +444,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio.allow_list=SM-R510 +# Telephony Satellite Feature +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.telephony.satellite.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/android.hardware.telephony.satellite.xml + # Battery Mitigation Config ifeq (,$(TARGET_VENDOR_BATTERY_MITIGATION_CONFIG_PATH)) TARGET_VENDOR_BATTERY_MITIGATION_CONFIG_PATH := device/google/comet/battery_mitigation diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 89d6ae9..4269e01 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -1,7 +1,7 @@ com.google.hardware.pixel.display - 11-12 + 12 IDisplay secondary diff --git a/factory_comet.mk b/factory_comet.mk index 45b2587..6797bfd 100644 --- a/factory_comet.mk +++ b/factory_comet.mk @@ -31,7 +31,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" # Location -# iGNSS PRODUCT_PACKAGES += \ sctd \ spad \ @@ -43,18 +42,6 @@ PRODUCT_PACKAGES += \ spad.json \ swcnd.json \ android.hardware.gnss@2.1-impl -# eGNSS -SOONG_CONFIG_NAMESPACES += gpssdk -SOONG_CONFIG_gpssdk += sdkv1 -SOONG_CONFIG_gpssdk_sdkv1 := true - -SOONG_CONFIG_NAMESPACES += gpssdk -SOONG_CONFIG_gpssdk += gpsmcuversion -SOONG_CONFIG_gpssdk_gpsmcuversion := gpsv1_$(TARGET_BUILD_VARIANT) - -SOONG_CONFIG_NAMESPACES += gpssdk -SOONG_CONFIG_gpssdk += gpsconf -SOONG_CONFIG_gpssdk_gpsconf := factory # Factory binary of camera PRODUCT_PACKAGES += fatp_ct3_wide_hat_tool fatp_ct3_tele_hat_tool fatp_ct3_ultrawide_hat_tool diff --git a/location/Android.bp b/location/Android.bp index 828d066..f173985 100644 --- a/location/Android.bp +++ b/location/Android.bp @@ -5,7 +5,7 @@ package { } soong_config_module_type { - name: "ignss_prebuilt_etc", + name: "gnss_prebuilt_etc", module_type: "prebuilt_etc", config_namespace: "gpssdk", variables: [ @@ -25,7 +25,7 @@ soong_config_string_variable { ], } -ignss_prebuilt_etc { +gnss_prebuilt_etc { name: "gps.cfg", soong_config_variables: { buildtype: { @@ -46,107 +46,3 @@ ignss_prebuilt_etc { relative_install_path: "gnss", vendor: true, } - -soong_config_module_type { - name: "egnss_prebuilt_etc", - module_type: "prebuilt_etc", - config_namespace: "gpssdk", - variables: [ - "gpsconf", - ], - properties: [ - "src", - ], -} - -soong_config_string_variable { - name: "gpsconf", - values: [ - "userdebug", - "eng", - "user", - "factory", - ], -} - -prebuilt_etc { - name: "gps.cer", - src: "gps.cer", - relative_install_path: "gnss", - vendor: true, -} - -egnss_prebuilt_etc { - name: "gps.xml", - soong_config_variables: { - gpsconf: { - user: { - src: "user/gps.xml", - }, - userdebug: { - src: "userdebug/gps.xml", - }, - eng: { - src: "userdebug/gps.xml", - }, - factory: { - src: "factory/gps.xml", - }, - conditions_default: { - src: "user/gps.xml", - }, - }, - }, - relative_install_path: "gnss", - vendor: true, -} - -egnss_prebuilt_etc { - name: "lhd.conf", - soong_config_variables: { - gpsconf: { - user: { - src: "user/lhd.conf", - }, - userdebug: { - src: "userdebug/lhd.conf", - }, - eng: { - src: "userdebug/lhd.conf", - }, - factory: { - src: "factory/lhd.conf", - }, - conditions_default: { - src: "user/lhd.conf", - }, - }, - }, - relative_install_path: "gnss", - vendor: true, -} - -egnss_prebuilt_etc { - name: "scd.conf", - soong_config_variables: { - gpsconf: { - user: { - src: "user/scd.conf", - }, - userdebug: { - src: "userdebug/scd.conf", - }, - eng: { - src: "userdebug/scd.conf", - }, - factory: { - src: "factory/scd.conf", - }, - conditions_default: { - src: "user/scd.conf", - }, - }, - }, - relative_install_path: "gnss", - vendor: true, -} diff --git a/location/factory/gps.xml b/location/factory/gps.xml deleted file mode 100644 index e2404a3..0000000 --- a/location/factory/gps.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - diff --git a/location/factory/lhd.conf b/location/factory/lhd.conf deleted file mode 100644 index c430b93..0000000 --- a/location/factory/lhd.conf +++ /dev/null @@ -1,33 +0,0 @@ -LheName=bbd - -LheRsmResetTimeoutMS=10000 -GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby - -LhePatch=/vendor/firmware/SensorHub.patch -Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG -LheConsole=/data/vendor/gps/LheConsole - -LogEnabled=true -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage - -LheBbdPacket=/dev/ttyBCM - -LheBbdControl=/dev/bbd_control - -# LheBbdSensor=/dev/bbd_sensor - -LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt -LogLevel=*:I - -NvStorageDir=/data/vendor/gps/ - -# Enable BBD debugging at these stages: -# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD - -LheAutoBaudDelayMS=10 -TrafficLogEnabled=false -SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf - -SkipSensorWakeLock=true -LoggerWakeLockEnable=false diff --git a/location/factory/scd.conf b/location/factory/scd.conf deleted file mode 100644 index 43f9cd2..0000000 --- a/location/factory/scd.conf +++ /dev/null @@ -1,6 +0,0 @@ -LogEnabled=true -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage -NvStorageDir=/data/vendor/gps/ -TcpConnectionTimeout=20 -SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf diff --git a/location/gps.cer b/location/gps.cer deleted file mode 100644 index 934e0c5..0000000 --- a/location/gps.cer +++ /dev/null @@ -1,161 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB -yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL -ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp -U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW -ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0 -aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL -MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW -ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln -biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp -U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y -aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1 -nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex -t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz -SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG -BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+ -rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/ -NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E -BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH -BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy -aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv -MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE -p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y -5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK -WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ -4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N -hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ -RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD -VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX -DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y -ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy -VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr -mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr -IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK -mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu -XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy -dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye -jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1 -BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3 -DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92 -9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx -jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0 -Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz -ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS -R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBh -MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 -d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH -MjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVT -MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j -b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG -9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI -2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx -1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQ -q2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5Wz -tCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQ -vIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo0IwQDAP -BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV -5uNu5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY -1Yl9PMWLSn/pvtsrF9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4 -NeF22d+mQrvHRAiGfzZ0JFrabA0UWTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NG -Fdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBHQRFXGU7Aj64GxJUTFy8bJZ91 -8rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/iyK5S9kJRaTe -pLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl -MrY= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB -yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL -ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp -U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW -ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0 -aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL -MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW -ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln -biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp -U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y -aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1 -nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex -t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz -SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG -BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+ -rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/ -NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E -BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH -BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy -aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv -MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE -p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y -5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK -WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ -4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N -hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIFZTCCA02gAwIBAgIPAWv6o5fPZQ5hxva1vuNrMA0GCSqGSIb3DQEBCwUAMDgx -CzAJBgNVBAYTAkpQMRcwFQYDVQQKDA5SYWt1dGVuIE1vYmlsZTEQMA4GA1UEAwwH -Um9vdCBDQTAeFw0xOTA3MTYxMTU1NDJaFw0yOTA3MTMxMTU1NDJaMD4xCzAJBgNV -BAYTAkpQMRcwFQYDVQQKEw5SYWt1dGVuIE1vYmlsZTEWMBQGA1UEAxMNREMgSXNz -dWluZyBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAObjAbQ8TkzF -A+/WvSE6fzDf+rlvBKY1dJJbiJ2/j0lc+tj56dE7+BhZ2JVmAYIYfEoUw69dwxTR -44EdZln3ZVFmMuOdfxvF9A46pMKzH1skr8ErDgjNyJ9f/JOuQ29p/7BvLC55aRzk -yj99BYdzJWKs+5W7jQlv7/HyJ/PQ+rUEBOx4o/YiTucDFduWdV6/x5mcEbKD3ufL -66vUEf3MHGegDkOWAMTchl1RmaYDlf3IMsXC7M2bFPFa/9y/vzaaY6EhnJ861co6 -rkOhTZe/kJZwqQYFmWczBPZK/9zRy3C1zA09tCBk+CDNBrNXe+3dMLFmnW4npxUQ -oceTPhaaDo5lA6HkkARwVWLrporFZ2B/th2Bqtu6uObLSB6JMA2jxmKwKukM8/jp -C9tKV9X03rHQIQultc63rivPdgQvqYgW1PVdzV1a3pZEMk5zv257+fxgfUGzfUh7 -tx0OY+BkykSP6ZK/BsbI/BY+rsS0L/0lmC22NU1p+qVeN3ZRHoqntB+FymaBfQ3/ -yfKkDNfnMua5GzLyyYGYUDDx71rtfrs3hGDiwjvE4B0IvsU0E7Oerk5gLqx8t0q/ -MmhI+CJJS1bH2sRBMcqfRAv+eyByFsvLY7Er/ztveaabX9xEwyPNFOcU+SZMhipv -EUKmUcOAHxzx4HbYEFyM0Z7WgUdlTd1xAgMBAAGjZjBkMB8GA1UdIwQYMBaAFPUI -BlLFno+y5xdHlCX349iVyS75MB0GA1UdDgQWBBQzVhTSCf8F31Zf0Bu661qymMko -JzAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADANBgkqhkiG9w0B -AQsFAAOCAgEADQEufjma/6fT/Do4Fh13lZhsowHSsGv5sFYly6224GsciE80ZwYg -R4EK/TAR0jorBXsu6sQc51pZ5SSHhIxfo2frfprTPaaWN6cZwfrb6UcnD/FaZ1jP -HzWrI3kRxG9JCDffzE8uMf8Rnc69n1j+TBerk4Ix3Zui2TaaF6LVceJ4RgeNkZl0 -OFkGGFruHz/d83q7A6YjgN0iwMEabdtKH7Sq27LqGPeCS8NuGlrziNAxktdwaYlN -D5t6ntM/1nHYPmVqdioEU9vAnyB3BiXOlITPHEEMOSlItcUsJ6rN5DZJaJgkBxvN -Qdi6wmaDlxy8XFyy4KGFKWAl17FlfpqW5VtYQJ4aDpibGlGqamg0vm+IJDIGPlOs -KQcxG17cOw4MCflAtnzHKHBn52DegQKwxev2ZpqdwVw/NqPq0yTNEbCRqEyiq7+H -ljKEFiEjEjeXTcqR4DoCseA5UgcriuriV0OCvr8KTlviV4FEUu+IA9ut8YIvf2of -Zz0z8rO4H+Rb4tMi/yBRM09x3rEW4hXwO0qpCBNBa0wEJBxufF3f6l9efEle+YTR -XS92gutaoVluqMfRSJckjwWokToi32/FvF79guZymD0qHkOSi5dewsIW7zsdobvv -t2CWLfTAb9cx222ELBpVPkfcgUKfF4RCGWPzuAlK6OueuDrInOiz8ag= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIFUjCCAzqgAwIBAgICBpAwDQYJKoZIhvcNAQELBQAwODELMAkGA1UEBhMCSlAx -FzAVBgNVBAoMDlJha3V0ZW4gTW9iaWxlMRAwDgYDVQQDDAdSb290IENBMB4XDTE5 -MDcxNjEwNTkwMVoXDTM5MDcxNTEwNTkwMVowODELMAkGA1UEBhMCSlAxFzAVBgNV -BAoMDlJha3V0ZW4gTW9iaWxlMRAwDgYDVQQDDAdSb290IENBMIICIjANBgkqhkiG -9w0BAQEFAAOCAg8AMIICCgKCAgEAqiPMbNudotG8afkk5Fwo2QdDcFFmC+qGpGjw -yQs57QtGPRk1HsIhZFfr6zn8t1tZw6Zo+A0biFA7d2N93nYsseHBy/bZlhhOL+Js -Jb907UM09L5xaJIgnbFYVT1QjtB7ksLAy3rHpdSKiggfT1ynwM/u6wIdWRSx24QU -Vxpq5iFpVj041+/RnpCPASL5pSnbYZKQyOb/XsOaR+hz7aSjwiUzk2cRjAmRqYxY -qYVe135IAy377inJRtUPvi3IhtmUHJToiMLBH5tChkjkIpdRG1lVIj4vGdzrIb+Q -Kvg/k7BDVZ3sstsLvJ8evNonBzrqcr80ek/X+HFrgY/3M1VEru4ohLAiA877CuuG -UAfrxFh9qjP1yue+dlrQWk+WHMbGMzKI1zCKEMphJatyNHfpRtD8LUWtLV96DD78 -qLwQwrSYrEMd2u/akeBFKINYWqpqkVBhSsV3eukXVIdSbtSAxZNv+4m6QddEcUvG -2ZLf+yCf2tl+LPGXNL08vwMVbQqcDw8m+nDP4vu0VUixddyoqnnDlWOoQESuQFQ1 -IqYFQhRPs2dFRf5TJzkmbqRUXbaPxsrKGjTtVpPgENbv40nyRGyBbl1CzqpBFEp5 -7w4MPYDIzWKYbRyCnUE5WScRBFmym7242KA3SOfkylzGMb8KGJxohVME+7oMbNf5 -EjLWVgECAwEAAaNmMGQwHwYDVR0jBBgwFoAU9QgGUsWej7LnF0eUJffj2JXJLvkw -HQYDVR0OBBYEFPUIBlLFno+y5xdHlCX349iVyS75MA4GA1UdDwEB/wQEAwIBBjAS -BgNVHRMBAf8ECDAGAQH/AgEBMA0GCSqGSIb3DQEBCwUAA4ICAQCDGIeYrtivFt3p -8k5vXKFUT072C7wMvfrAGYCYgIdUthWCqJoMwnG3Fsg7Ngu70La7ESBzEKpnpPWz -eIdnREJkNP9iqiKHXnaUV2P/21AS1q6enVKBFOl7dYiVjqOZ+vac3a1UjLWkvm0g -x4sg/f3PpiEzZM7ecnQYk2wfMSq8Jw0w1Lf0SEeoYZTkf12cqSJVSa/G7gEdL/Cn -LO3yyBq0KPNdd87eIfvCLJj55UJ5dCr0JXRTUteBvJwflbPXmOqfI8fA05fwlJZS -o1SBpMI9cEBwaPXQM9CPNKaWLvyOR1KpviRzbCnaKf44Fs2OuZboo3avZrC9eUoU -HU2HKXRj8UMRlFeCdNugbOdGyK+CpXwMHVtIrtpf0iOUqo0rOekgnUSNi9qyjD1g -IV3Y/NLVl9fqe8q66IWUn8NYndxigMKWcMCBFUjfP0yMZeqSHFiIv7zk9PuV/62k -Yele7cK9iHnEUwWBj6VCEs6pZBS1QSmhRw3GWlSDc/gHXd38PG20zH7xg4z2H9Rc -Op9P1ZW2kjqv5D2+q/qtaePAyHn3B05UZrQYUmx7LaHNO7op6dZgCdoR0sVsR+Fc -Zyr0AhgiuTWrjtUEOGx2qJVwAsHkpqtlN+DaGT08dT64LvIf0bfGvmtm++/WEDWJ -HInwg85pGm+sEkYbYFRBD0woPBsL3g== ------END CERTIFICATE----- diff --git a/location/user/gps.cfg b/location/user/gps.cfg index 03dc158..3cfefad 100644 --- a/location/user/gps.cfg +++ b/location/user/gps.cfg @@ -7,9 +7,10 @@ GlueLayer_EnableGnssCfgInterface=1 gnss_device_type=K042 gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin +allow_logging_if_disconnected=0 ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK -Is1PPSTimeSyncEnable=0 +Is1PPSTimeSyncEnable=1 MaxNtnRefLocAgeSecs=600 GlueLayer_IsPlatformRefTimeEnable=1 chpp_betp_client=1 @@ -33,7 +34,7 @@ qzssUsedInUSPolicy=2 navicUsedInUSPolicy=2 Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 -Chip_Configuration_FeatureCfg_MTPL = 0 +Chip_Configuration_FeatureCfg_MTPL = 1 Chip_Configuration_FeatureCfg_SDL_BYASS = 1 mailboxDisabled=0x0 gnss_rfic_chip_id=55400000 @@ -52,7 +53,7 @@ GlueLayer_isReqUBPFromPressureSensor=1 GlueLayer_IsRilCIDReqEnable=0 GlueLayer_IsMemsEnable=1 GlueLayer_MeasCorrCap=7 -Chip_Configuration_mems_data_Configuration=0x5 +Chip_Configuration_mems_data_Configuration=0x25 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 CP_LocTech_Constraints=1 @@ -70,6 +71,7 @@ isForceHighAccuracyMode=1 cp_partial_reset_disable=1 isUseUncalAccel=1 isUseUncalMagn=0 +NavOptions=0x2443 GNSS_CARRIER_CONFIG_BEGIN GNSS_CARRIER_ID=0 diff --git a/location/user/gps.xml b/location/user/gps.xml deleted file mode 100644 index fae192c..0000000 --- a/location/user/gps.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - diff --git a/location/user/lhd.conf b/location/user/lhd.conf deleted file mode 100644 index 73e03bc..0000000 --- a/location/user/lhd.conf +++ /dev/null @@ -1,31 +0,0 @@ -LheName=bbd - -LheRsmResetTimeoutMS=10000 -GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby - -LhePatch=/vendor/firmware/SensorHub.patch -Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG -# LheConsole=/data/vendor/gps/LheConsole - -LogEnabled=false -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage - -LheBbdPacket=/dev/ttyBCM - -LheBbdControl=/dev/bbd_control - -# LheBbdSensor=/dev/bbd_sensor - -# LheFailSafe=/data/vendor/gps/esw-crash-dump.txt - -NvStorageDir=/data/vendor/gps/ - -# Enable BBD debugging at these stages: -# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD - -LheAutoBaudDelayMS=10 -TrafficLogEnabled=false - -SkipSensorWakeLock=true -LoggerWakeLockEnable=false diff --git a/location/user/scd.conf b/location/user/scd.conf deleted file mode 100644 index e75f209..0000000 --- a/location/user/scd.conf +++ /dev/null @@ -1,5 +0,0 @@ -LogEnabled=false -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage -NvStorageDir=/data/vendor/gps/ -TcpConnectionTimeout=20 diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg index ea11f2b..29084da 100644 --- a/location/userdebug/gps.cfg +++ b/location/userdebug/gps.cfg @@ -20,12 +20,14 @@ gnss_device_type=K042 gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin +allow_logging_if_disconnected=0 + # enable ism stream for GAAM ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK # Enable/Disable 1PPS Time Sync policy -Is1PPSTimeSyncEnable=0 +Is1PPSTimeSyncEnable=1 MaxNtnRefLocAgeSecs=600 # CHIP_CONFIG_IO_OPT_HOSTIO_VIA_SECONDARY + CHIP_CONFIG_IO_OPT_CPMB_MASK @@ -123,7 +125,7 @@ navicUsedInUSPolicy=2 Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 # Disable MTPL -Chip_Configuration_FeatureCfg_MTPL = 0 +Chip_Configuration_FeatureCfg_MTPL = 1 # MCW Link failure behavior: 0 = SW Assert (default), 1 = GNSS restart (hot start) Chip_Configuration_FeatureCfg_SDL_BYASS = 1 @@ -180,7 +182,13 @@ GlueLayer_isReqUBPFromPressureSensor=1 GlueLayer_IsRilCIDReqEnable=0 GlueLayer_IsMemsEnable=1 GlueLayer_MeasCorrCap=7 -Chip_Configuration_mems_data_Configuration=0x5 + +# 0x0001: CHIP_CONFIG_MEMS_ACCEL_AVAILABLE +# 0x0002: CHIP_CONFIG_MEMS_MAGN_AVAILABLE +# 0x0004: CHIP_CONFIG_MEMS_GYRO_AVAILABLE +# 0x0010: CHIP_CONFIG_MEMS_ORIENTATION_AVAILABLE +# 0x0020: CHIP_CONFIG_MEMS_STEPCOUNTER_AVAILABLE +Chip_Configuration_mems_data_Configuration=0x25 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 CP_LocTech_Constraints=1 @@ -211,6 +219,13 @@ cp_partial_reset_disable=1 isUseUncalAccel=1 isUseUncalMagn=0 +# 0x0001: Enable StaticNavMode +# 0x0002: Enable TunnelDetection +# 0x0040: Self-detection Algorithm works +# 0x0400: Enable MEMS S5 +# 0x2000: Enable MEMS PGMF (Pedestrian GNSS + MEMS Fusion) +NavOptions=0x2443 + GNSS_CARRIER_CONFIG_BEGIN # DEFAULT GNSS_CARRIER_ID=0 diff --git a/location/userdebug/gps.xml b/location/userdebug/gps.xml deleted file mode 100644 index 6abfe50..0000000 --- a/location/userdebug/gps.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - diff --git a/location/userdebug/lhd.conf b/location/userdebug/lhd.conf deleted file mode 100644 index c430b93..0000000 --- a/location/userdebug/lhd.conf +++ /dev/null @@ -1,33 +0,0 @@ -LheName=bbd - -LheRsmResetTimeoutMS=10000 -GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby - -LhePatch=/vendor/firmware/SensorHub.patch -Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG -LheConsole=/data/vendor/gps/LheConsole - -LogEnabled=true -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage - -LheBbdPacket=/dev/ttyBCM - -LheBbdControl=/dev/bbd_control - -# LheBbdSensor=/dev/bbd_sensor - -LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt -LogLevel=*:I - -NvStorageDir=/data/vendor/gps/ - -# Enable BBD debugging at these stages: -# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD - -LheAutoBaudDelayMS=10 -TrafficLogEnabled=false -SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf - -SkipSensorWakeLock=true -LoggerWakeLockEnable=false diff --git a/location/userdebug/scd.conf b/location/userdebug/scd.conf deleted file mode 100644 index 43f9cd2..0000000 --- a/location/userdebug/scd.conf +++ /dev/null @@ -1,6 +0,0 @@ -LogEnabled=true -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage -NvStorageDir=/data/vendor/gps/ -TcpConnectionTimeout=20 -SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf diff --git a/powerhint-comet.json b/powerhint-comet.json index 360b12f..6d439d7 100644 --- a/powerhint-comet.json +++ b/powerhint-comet.json @@ -189,7 +189,8 @@ "Values": [ "1280", "1100", - "1280 1100 1055" + "1280 1100 1055", + "1100 1055 1055" ], "DefaultIndex": 1, "ResetOnInit": true @@ -588,15 +589,6 @@ ], "DefaultIndex": 0 }, - { - "Name": "PMU_FORCE_LIMIT", - "Path": "/proc/vendor_sched/pmu_force_limited", - "Values": [ - "1", - "0" - ], - "DefaultIndex": 0 - }, { "Name": "EM_Profile", "Path": "/sys/kernel/pixel_em/active_profile", @@ -624,14 +616,12 @@ "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold", "Values": [ "76", - "70", - "40", "55", - "42", - "35", + "38", + "36", + "10", "30", - "20", - "0" + "28" ], "DefaultIndex": 0 }, @@ -651,12 +641,11 @@ "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold", "Values": [ "59", - "50", - "32", - "15", "30", "20", - "18" + "2", + "18", + "15" ], "DefaultIndex": 0 }, @@ -675,9 +664,10 @@ "Path": "/sys/devices/system/cpu/cpufreq/policy7/sched_pixel/spc_threshold", "Values": [ "62", - "50", + "0", "20", - "22" + "22", + "15" ], "DefaultIndex": 0 }, @@ -1478,19 +1468,19 @@ "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "PMU_LIT_SPC_THRESHOLD", "Duration": 3000, - "Value": "40" + "Value": "10" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "PMU_MID_SPC_THRESHOLD", "Duration": 3000, - "Value": "15" + "Value": "2" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "PMU_BIG_SPC_THRESHOLD", "Duration": 3000, - "Value": "20" + "Value": "0" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", @@ -1790,7 +1780,7 @@ "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "PMU_LIT_SPC_THRESHOLD", "Duration": 0, - "Value": "20" + "Value": "36" }, { "PowerHint": "CAMERA_STREAMING_EXTREME", @@ -1802,7 +1792,7 @@ "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "PMU_MID_SPC_THRESHOLD", "Duration": 0, - "Value": "30" + "Value": "15" }, { "PowerHint": "CAMERA_STREAMING_EXTREME", @@ -1814,7 +1804,7 @@ "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "PMU_BIG_SPC_THRESHOLD", "Duration": 0, - "Value": "20" + "Value": "15" }, { "PowerHint": "CAMERA_STREAMING_EXTREME", @@ -1822,12 +1812,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "PMU_FORCE_LIMIT", - "Duration": 0, - "Value": "1" - }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "EM_Profile", @@ -1838,7 +1822,7 @@ "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CPUDVFSHeadroom", "Duration": 0, - "Value": "1100" + "Value": "1100 1055 1055" }, { "PowerHint": "CAMERA_STREAMING_EXTREME", @@ -1934,7 +1918,7 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_LIT_SPC_THRESHOLD", "Duration": 0, - "Value": "55" + "Value": "38" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -1946,7 +1930,7 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_MID_SPC_THRESHOLD", "Duration": 0, - "Value": "32" + "Value": "20" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -1966,12 +1950,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "PMU_FORCE_LIMIT", - "Duration": 0, - "Value": "1" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "EM_Profile", @@ -1988,7 +1966,7 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUDVFSHeadroom", "Duration": 0, - "Value": "1100" + "Value": "1100 1055 1055" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -1996,12 +1974,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CPULittleClusterMaxFreq", - "Duration": 0, - "Value": "1548000" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "MemFreq", @@ -2102,7 +2074,7 @@ "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PMU_LIT_SPC_THRESHOLD", "Duration": 0, - "Value": "55" + "Value": "30" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", @@ -2114,7 +2086,7 @@ "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PMU_MID_SPC_THRESHOLD", "Duration": 0, - "Value": "30" + "Value": "18" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", @@ -2126,7 +2098,7 @@ "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PMU_BIG_SPC_THRESHOLD", "Duration": 0, - "Value": "22" + "Value": "20" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", @@ -2134,12 +2106,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "PMU_FORCE_LIMIT", - "Duration": 0, - "Value": "1" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "EM_Profile", @@ -2446,12 +2412,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "PMU_FORCE_LIMIT", - "Duration": 0, - "Value": "1" - }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PMU_LIT_LIMIT_FREQ", @@ -2652,12 +2612,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "LOW_POWER", - "Node": "PMU_FORCE_LIMIT", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "LOW_POWER", "Node": "BigTjOffset", @@ -2783,12 +2737,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "PMU_FORCE_LIMIT", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "BigTjOffset", @@ -2965,19 +2913,19 @@ }, { "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPUBigClusterMaxFreq", + "Node": "CPUMidClusterMaxFreq", "Duration": 500, "Value": "9999999" }, { "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPUBigClusterMinFreq", + "Node": "CPUMidClusterMinFreq", "Duration": 500, - "Value": "1885000" + "Value": "1795000" }, { "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_BIG_TSKIN_BYPASS", + "Node": "CPU_MID_TSKIN_BYPASS", "Duration": 500, "Value": "1" }, @@ -3081,7 +3029,7 @@ "PowerHint": "CAMERA_PROJECT11", "Node": "PMU_LIT_SPC_THRESHOLD", "Duration": 0, - "Value": "55" + "Value": "28" }, { "PowerHint": "CAMERA_PROJECT11", @@ -3093,7 +3041,7 @@ "PowerHint": "CAMERA_PROJECT11", "Node": "PMU_MID_SPC_THRESHOLD", "Duration": 0, - "Value": "30" + "Value": "18" }, { "PowerHint": "CAMERA_PROJECT11", @@ -3105,7 +3053,7 @@ "PowerHint": "CAMERA_PROJECT11", "Node": "PMU_BIG_SPC_THRESHOLD", "Duration": 0, - "Value": "22" + "Value": "20" }, { "PowerHint": "CAMERA_PROJECT11", @@ -3113,12 +3061,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "CAMERA_PROJECT11", - "Node": "PMU_FORCE_LIMIT", - "Duration": 0, - "Value": "1" - }, { "PowerHint": "CAMERA_PROJECT11", "Node": "EM_Profile", diff --git a/thermal/thermal_info_config_charge_comet.json b/thermal/thermal_info_config_charge_comet.json index 88f9098..3d01ab5 100644 --- a/thermal/thermal_info_config_charge_comet.json +++ b/thermal/thermal_info_config_charge_comet.json @@ -202,19 +202,19 @@ "PIDInfo": { "K_Po": ["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], "K_Pu": ["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], - "K_I": ["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"], + "K_I": ["NAN", "NAN", 50, "NAN", "NAN", "NAN", "NAN"], "K_D": ["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "I_Max": ["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"], "S_Power": ["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower": ["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "MaxAllocPower": ["NAN", "NAN", 6219, "NAN", "NAN", "NAN", "NAN"], "I_Cutoff": ["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], - "I_Default": 1302 + "I_Default": 846 }, "ExcludedPowerInfo": [ { "PowerRail": "PARTIAL_SYSTEM_POWER", - "PowerWeight": [0.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24] + "PowerWeight": [0.12, 0.12, 1.0, 1.0, 1.0, 1.0, 1.0] } ], "BindedCdevInfo": [ diff --git a/thermal/thermal_info_config_comet.json b/thermal/thermal_info_config_comet.json index 2e625c6..e4536b5 100644 --- a/thermal/thermal_info_config_comet.json +++ b/thermal/thermal_info_config_comet.json @@ -133,8 +133,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["charger_therm", "modem_therm", "gnss_tcxo_therm"], - "Coefficient": [0.144, 0.448, 0.402], - "Offset": -1113, + "Coefficient": [0.263, 0.332, 0.519], + "Offset": -6068, "Multiplier": 0.001 }, { @@ -215,7 +215,7 @@ { "Name": "VIRTUAL-SKIN-LEGACY", "Type": "UNKNOWN", - "Version": "2.1", + "Version": "2.2", "VirtualSensor": true, "Hidden": true, "Formula": "WEIGHTED_AVG", @@ -234,7 +234,8 @@ "Combination":["soc_therm", "rffe_therm", "charger_therm", "usb_conn_therm", "modem_therm", "inner_display_therm", "display_therm", "gnss_tcxo_therm", "maxfg_base", "maxfg_secondary", "inner_brightness"], "Multiplier":0.001, "PreviousSampleCount": 3, - "SupportUnderSampling": true + "BackupSensor" : "VIRTUAL-SKIN-LEGACY", + "TimeResolution": 7000 }, { "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", @@ -249,7 +250,7 @@ { "Name": "VIRTUAL-SKIN", "Type": "SKIN", - "Version": "2.2", + "Version": "2.3", "VirtualSensor": true, "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"], "Formula": "MAXIMUM", @@ -805,19 +806,19 @@ "PIDInfo": { "K_Po": ["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], "K_Pu": ["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], - "K_I": ["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"], + "K_I": ["NAN", "NAN", 50, "NAN", "NAN", "NAN", "NAN"], "K_D": ["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "I_Max": ["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"], "S_Power": ["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower": ["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "MaxAllocPower": ["NAN", "NAN", 6219, "NAN", "NAN", "NAN", "NAN"], "I_Cutoff": ["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], - "I_Default": 1302 + "I_Default": 846 }, "ExcludedPowerInfo": [ { "PowerRail": "PARTIAL_SYSTEM_POWER", - "PowerWeight": [0.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24] + "PowerWeight": [0.12, 0.12, 1.0, 1.0, 1.0, 1.0, 1.0] } ], "BindedCdevInfo": [ @@ -898,7 +899,8 @@ "Combination": ["soc_therm", "rffe_therm", "charger_therm", "usb_conn_therm", "modem_therm", "inner_display_therm", "display_therm", "gnss_tcxo_therm", "maxfg_base", "maxfg_secondary", "inner_brightness"], "Multiplier": 0.001, "PreviousSampleCount": 3, - "SupportUnderSampling": true + "BackupSensor" : "VIRTUAL-SKIN-SPEAKER-LEGACY", + "TimeResolution": 7000 }, { "Name": "VIRTUAL-SKIN-SPEAKER-MODEL-LEGACY-DIFF", @@ -910,15 +912,46 @@ "Coefficient": [1.0, -1.0], "Multiplier": 1 }, + { + "Name": "IS_VSKIN_SPEAKER_MODEL_WITHIN_RANGE_CHECK", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula":"COUNT_THRESHOLD", + "Combination":["VIRTUAL-SKIN-SPEAKER-MODEL", "VIRTUAL-SKIN-SPEAKER-MODEL"], + "Coefficient":[20000, -57000], + "Multiplier":1 + }, + { + "Name":"IS_VSKIN_SPEAKER_MODEL_WITHIN_RANGE", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["IS_VSKIN_SPEAKER_MODEL_WITHIN_RANGE_CHECK"], + "Coefficient":[2], + "Multiplier":1 + }, + { + "Name":"NO_VSKIN_SPEAKER_MODEL_WITHIN_RANGE", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["IS_VSKIN_SPEAKER_MODEL_WITHIN_RANGE_CHECK"], + "Coefficient":[-2], + "Multiplier":1 + }, { "Name": "VIRTUAL-SKIN-SPEAKER", "Type": "UNKNOWN", - "Version": "1.0", + "Version": "2.0", "VirtualSensor": true, "TriggerSensor": "usb_conn_therm", - "Formula": "MAXIMUM", - "Combination": ["VIRTUAL-SKIN-SPEAKER-MODEL"], - "Coefficient": [1.0], + "Formula": "WEIGHTED_AVG", + "Combination": ["VIRTUAL-SKIN-SPEAKER-MODEL", "VIRTUAL-SKIN-SPEAKER-LEGACY"], + "Coefficient": ["IS_VSKIN_SPEAKER_MODEL_WITHIN_RANGE", "NO_VSKIN_SPEAKER_MODEL_WITHIN_RANGE"], + "CoefficientType": ["SENSOR", "SENSOR"], "HotThreshold": ["NAN", 37.0, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis": [0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0], "Multiplier": 0.001, @@ -1051,6 +1084,306 @@ "SendPowerHint": true, "PollingDelay": 300000, "PassiveDelay": 7000 + }, + { + "Name": "IS_WLC_WITHOUT_STEP_RATIO", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula":"COUNT_THRESHOLD", + "Combination":["WLC_CHECK"], + "Coefficient":[2], + "Multiplier":1 + }, + { + "Name": "NO_WLC_WITHOUT_STEP_RATIO", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula":"COUNT_THRESHOLD", + "Combination":["WLC_CHECK"], + "Coefficient":[-2], + "Multiplier":1 + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-DURING-WLC-STATS", + "Type":"UNKNOWN", + "Hidden": true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["VIRTUAL-SKIN-CHARGE-WLC-EQ", -1000000], + "CombinationType": ["SENSOR", "CONSTANT"], + "Coefficient":["IS_WLC_WITHOUT_STEP_RATIO", "NO_WLC_WITHOUT_STEP_RATIO"], + "CoefficientType": ["SENSOR", "SENSOR"], + "Multiplier": 0.001 + }, + { + "Name": "IS_WIRED_SUB5W_CHECK", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula":"COUNT_THRESHOLD", + "Combination":["thb_hda", "thb_hda"], + "Coefficient":[51, -52], + "Multiplier":1 + }, + { + "Name":"IS_WIRED_SUB5W", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["IS_WIRED_SUB5W_CHECK"], + "Coefficient":[2], + "Multiplier":1 + }, + { + "Name":"NO_WIRED_SUB5W", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["IS_WIRED_SUB5W_CHECK"], + "Coefficient":[-2], + "Multiplier":1 + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-DURING-WIRED-SUB5W-STATS", + "Type":"UNKNOWN", + "Hidden": true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["VIRTUAL-SKIN-CHARGE-WIRED-EQ", -1000000], + "CombinationType": ["SENSOR", "CONSTANT"], + "Coefficient":["IS_WIRED_SUB5W", "NO_WIRED_SUB5W"], + "CoefficientType": ["SENSOR", "SENSOR"], + "Multiplier": 0.001 + }, + { + "Name": "IS_WIRED_5W_CHECK", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula":"COUNT_THRESHOLD", + "Combination":["thb_hda", "thb_hda"], + "Coefficient":[52, -53], + "Multiplier":1 + }, + { + "Name":"IS_WIRED_5W", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["IS_WIRED_5W_CHECK"], + "Coefficient":[2], + "Multiplier":1 + }, + { + "Name":"NO_WIRED_5W", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["IS_WIRED_5W_CHECK"], + "Coefficient":[-2], + "Multiplier":1 + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-DURING-WIRED-5W-STATS", + "Type":"UNKNOWN", + "Hidden": true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["VIRTUAL-SKIN-CHARGE-WIRED-EQ", -1000000], + "CombinationType": ["SENSOR", "CONSTANT"], + "Coefficient":["IS_WIRED_5W", "NO_WIRED_5W"], + "CoefficientType": ["SENSOR", "SENSOR"], + "Multiplier": 0.001 + }, + { + "Name": "IS_WIRED_7_5W_CHECK", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula":"COUNT_THRESHOLD", + "Combination":["thb_hda", "thb_hda"], + "Coefficient":[53, -54], + "Multiplier":1 + }, + { + "Name":"IS_WIRED_7_5W", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["IS_WIRED_7_5W_CHECK"], + "Coefficient":[2], + "Multiplier":1 + }, + { + "Name":"NO_WIRED_7_5W", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["IS_WIRED_7_5W_CHECK"], + "Coefficient":[-2], + "Multiplier":1 + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-DURING-WIRED-7-5W-STATS", + "Type":"UNKNOWN", + "Hidden": true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["VIRTUAL-SKIN-CHARGE-WIRED-EQ", -1000000], + "CombinationType": ["SENSOR", "CONSTANT"], + "Coefficient":["IS_WIRED_7_5W", "NO_WIRED_7_5W"], + "CoefficientType": ["SENSOR", "SENSOR"], + "Multiplier": 0.001 + }, + { + "Name": "IS_WIRED_15W_CHECK", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula":"COUNT_THRESHOLD", + "Combination":["thb_hda", "thb_hda"], + "Coefficient":[54, -55], + "Multiplier":1 + }, + { + "Name":"IS_WIRED_15W", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["IS_WIRED_15W_CHECK"], + "Coefficient":[2], + "Multiplier":1 + }, + { + "Name":"NO_WIRED_15W", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["IS_WIRED_15W_CHECK"], + "Coefficient":[-2], + "Multiplier":1 + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-DURING-WIRED-15W-STATS", + "Type":"UNKNOWN", + "Hidden": true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["VIRTUAL-SKIN-CHARGE-WIRED-EQ", -1000000], + "CombinationType": ["SENSOR", "CONSTANT"], + "Coefficient":["IS_WIRED_15W", "NO_WIRED_15W"], + "CoefficientType": ["SENSOR", "SENSOR"], + "Multiplier": 0.001 + }, + { + "Name": "IS_WIRED_18W_CHECK", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula":"COUNT_THRESHOLD", + "Combination":["thb_hda", "thb_hda"], + "Coefficient":[55, -56], + "Multiplier":1 + }, + { + "Name":"IS_WIRED_18W", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["IS_WIRED_18W_CHECK"], + "Coefficient":[2], + "Multiplier":1 + }, + { + "Name":"NO_WIRED_18W", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["IS_WIRED_18W_CHECK"], + "Coefficient":[-2], + "Multiplier":1 + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-DURING-WIRED-18W-STATS", + "Type":"UNKNOWN", + "Hidden": true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["VIRTUAL-SKIN-CHARGE-WIRED-EQ", -1000000], + "CombinationType": ["SENSOR", "CONSTANT"], + "Coefficient":["IS_WIRED_18W", "NO_WIRED_18W"], + "CoefficientType": ["SENSOR", "SENSOR"], + "Multiplier": 0.001 + }, + { + "Name": "IS_WIRED_GT18W_CHECK", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula":"COUNT_THRESHOLD", + "Combination":["thb_hda", "thb_hda"], + "Coefficient":[56, -57], + "Multiplier":1 + }, + { + "Name":"IS_WIRED_GT18W", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["IS_WIRED_GT18W_CHECK"], + "Coefficient":[2], + "Multiplier":1 + }, + { + "Name":"NO_WIRED_GT18W", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["IS_WIRED_GT18W_CHECK"], + "Coefficient":[-2], + "Multiplier":1 + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-DURING-WIRED-GT18W-STATS", + "Type":"UNKNOWN", + "Hidden": true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["VIRTUAL-SKIN-CHARGE-WIRED-EQ", -1000000], + "CombinationType": ["SENSOR", "CONSTANT"], + "Coefficient":["IS_WIRED_GT18W", "NO_WIRED_GT18W"], + "CoefficientType": ["SENSOR", "SENSOR"], + "Multiplier": 0.001 + }, + { + "Name": "CHARGING-STATS-UPDATOR", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"], + "Formula": "WEIGHTED_AVG", + "Combination": ["VIRTUAL-SKIN-CHARGE-DURING-WLC-STATS", "VIRTUAL-SKIN-CHARGE-DURING-WIRED-SUB5W-STATS", "VIRTUAL-SKIN-CHARGE-DURING-WIRED-5W-STATS", + "VIRTUAL-SKIN-CHARGE-DURING-WIRED-7-5W-STATS", "VIRTUAL-SKIN-CHARGE-DURING-WIRED-15W-STATS", "VIRTUAL-SKIN-CHARGE-DURING-WIRED-18W-STATS", + "VIRTUAL-SKIN-CHARGE-DURING-WIRED-GT18W-STATS"], + "Coefficient": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0], + "Multiplier": 1, + "SendPowerHint": true, + "PollingDelay": 300000, + "PassiveDelay": 7000 } ], "CoolingDevices": [ @@ -1157,15 +1490,23 @@ ], "Stats": { "Sensors": { - "RecordWithDefaultThreshold": ["VIRTUAL-SKIN"], + "RecordWithDefaultThreshold": ["VIRTUAL-SKIN", "VIRTUAL-SKIN-OUTER-DISPLAY"], "RecordWithThreshold": [ { "Name": "VIRTUAL-SKIN", "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] }, + { + "Name": "VIRTUAL-SKIN-LEGACY", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55, 57] + }, { "Name": "VIRTUAL-SKIN-MODEL", - "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55, 57] + }, + { + "Name": "VIRTUAL-SKIN-OUTER-DISPLAY", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55, 57] }, { "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", @@ -1185,7 +1526,35 @@ }, { "Name": "VIRTUAL-SKIN-SPEAKER-MODEL", - "Thresholds": [0, 37, 42, 47, 57, 100] + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55, 57] + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-DURING-WLC-STATS", + "Thresholds": [-200, 15, 25, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55] + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-DURING-WIRED-SUB5W-STATS", + "Thresholds": [-200, 15, 25, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55] + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-DURING-WIRED-5W-STATS", + "Thresholds": [-200, 15, 25, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55] + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-DURING-WIRED-7-5W-STATS", + "Thresholds": [-200, 15, 25, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55] + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-DURING-WIRED-15W-STATS", + "Thresholds": [-200, 15, 25, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55] + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-DURING-WIRED-18W-STATS", + "Thresholds": [-200, 15, 25, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55] + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-DURING-WIRED-GT18W-STATS", + "Thresholds": [-200, 15, 25, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55] } ], "Abnormality": { diff --git a/thermal/thermal_info_config_comet_wingboard.json b/thermal/thermal_info_config_comet_wingboard.json index e8faa47..aa29f3d 100644 --- a/thermal/thermal_info_config_comet_wingboard.json +++ b/thermal/thermal_info_config_comet_wingboard.json @@ -105,8 +105,8 @@ "VirtualSensor": true, "Formula": "WEIGHTED_AVG", "Combination": ["charger_therm", "modem_therm", "gnss_tcxo_therm"], - "Coefficient": [0.144, 0.448, 0.402], - "Offset": -1113, + "Coefficient": [0.263, 0.332, 0.519], + "Offset": -6068, "Multiplier": 0.001 }, { @@ -123,7 +123,7 @@ { "Name": "VIRTUAL-SKIN", "Type": "SKIN", - "Version": "2.1", + "Version": "2.2", "VirtualSensor": true, "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"], "Formula": "MAXIMUM", diff --git a/thermal/vt_estimation_model_comet.tflite b/thermal/vt_estimation_model_comet.tflite index 4283a30..2095901 100644 Binary files a/thermal/vt_estimation_model_comet.tflite and b/thermal/vt_estimation_model_comet.tflite differ diff --git a/thermal/vt_speaker_estimation_model_comet.tflite b/thermal/vt_speaker_estimation_model_comet.tflite index b24da7b..65d0b74 100644 Binary files a/thermal/vt_speaker_estimation_model_comet.tflite and b/thermal/vt_speaker_estimation_model_comet.tflite differ diff --git a/uwb/calibration.conf b/uwb/calibration.conf index 15a5f2c..cbbd6f8 100644 --- a/uwb/calibration.conf +++ b/uwb/calibration.conf @@ -6,7 +6,7 @@ ant1.ch5.ant_delay=10:40:00:00 ant1.ch9.ant_delay=10:40:00:00 ant2.ch5.ant_delay=3D:40:00:00 -ant2.ch9.ant_delay=1F:40:00:00 +ant2.ch9.ant_delay=29:40:00:00 ant3.ch5.ant_delay=10:40:00:00 ant3.ch9.ant_delay=10:40:00:00 @@ -19,17 +19,17 @@ xtal_trim=0x30 dual_rx_auto.accum_period=0x00 # Increase TX power of 0.25 dB -# ant0.ch5.pa_gain_offset=0x00 -# ant0.ch9.pa_gain_offset=0x00 +# ant0.ch5.pa_gain_offset=0x01 +# ant0.ch9.pa_gain_offset=0x01 # Decrease TX power of -0.25 dB -# ant1.ch5.pa_gain_offset=0x00 -# ant1.ch9.pa_gain_offset=0x00 +# ant1.ch5.pa_gain_offset=0xFF +# ant1.ch9.pa_gain_offset=0xFF # Increase TX power of 0.25 dB -# ant2.ch5.pa_gain_offset=0x00 -# ant2.ch9.pa_gain_offset=0x00 +# ant2.ch5.pa_gain_offset=0x01 +# ant2.ch9.pa_gain_offset=0x01 # Decrease TX power of -0.25 dB -# ant3.ch5.pa_gain_offset=0x00 -# ant3.ch9.pa_gain_offset=0x00 +# ant3.ch5.pa_gain_offset=0xFF +# ant3.ch9.pa_gain_offset=0xFF \ No newline at end of file diff --git a/wifi/BoardConfig-wifi.mk b/wifi/BoardConfig-wifi.mk index 57d145d..8d0a3e6 100644 --- a/wifi/BoardConfig-wifi.mk +++ b/wifi/BoardConfig-wifi.mk @@ -31,6 +31,7 @@ WIFI_AVOID_IFACE_RESET_MAC_CHANGE := true WIFI_FEATURE_HOSTAPD_11AX := true BOARD_HOSTAPD_CONFIG_80211W_MFP_OPTIONAL := true WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true +WIFI_BRCM_OPEN_SOURCE_MULTI_AKM := enabled PRODUCT_COPY_FILES += \ device/google/comet/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \