diff --git a/audio/komodo/aidl_config/audio_policy_volumes.xml b/audio/komodo/aidl_config/audio_policy_volumes.xml
index 9d616610..6614d064 100644
--- a/audio/komodo/aidl_config/audio_policy_volumes.xml
+++ b/audio/komodo/aidl_config/audio_policy_volumes.xml
@@ -53,13 +53,13 @@ volume index from 0 to 100.
1,-5200
- 13,-4150
- 29,-3400
- 43,-2870
- 57,-2350
- 71,-2100
- 86,-1780
- 100,-1420
+ 13,-4455
+ 29,-3660
+ 43,-3165
+ 57,-2630
+ 71,-2400
+ 86,-2100
+ 100,-1720
@@ -71,12 +71,12 @@ volume index from 0 to 100.
ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
1,-4250
- 14,-3200
- 29,-2800
- 43,-2250
- 57,-1750
- 71,-1050
- 86,-280
+ 14,-3450
+ 29,-3000
+ 43,-2500
+ 57,-1840
+ 71,-1090
+ 86,-400
100,0
1,-6500
- 4,-5917
- 8,-5660
- 12,-5361
- 16,-5050
- 20,-4735
- 24,-4367
- 28,-4014
- 32,-3805
- 36,-3574
- 40,-3354
- 44,-3154
- 48,-2946
- 52,-2701
- 56,-2497
- 60,-2314
- 64,-2126
- 68,-1931
- 72,-1786
- 76,-1633
- 80,-1370
- 84,-1175
- 88,-866
- 92,-579
- 96,-232
+ 4,-6140
+ 8,-5854
+ 12,-5568
+ 16,-5255
+ 20,-4923
+ 24,-4543
+ 28,-4142
+ 32,-3895
+ 36,-3634
+ 40,-3364
+ 44,-3195
+ 48,-2996
+ 52,-2773
+ 56,-2584
+ 60,-2407
+ 64,-2234
+ 68,-2039
+ 72,-1914
+ 76,-1787
+ 80,-1612
+ 84,-1333
+ 88,-1030
+ 92,-698
+ 96,-312
100,0
- 0,-5950
- 17,-4450
- 33,-2800
- 50,-1900
- 67,-1000
- 83,-330
+ 0,-5510
+ 17,-4660
+ 33,-3000
+ 50,-2000
+ 67,-890
+ 83,-270
100,0
- 1,-4800
- 14,-4350
- 29,-3700
- 43,-3050
- 57,-2400
- 71,-1850
- 86,-1200
- 100,-500
+ 1,-4700
+ 13,-4380
+ 29,-3680
+ 43,-3130
+ 57,-2490
+ 71,-1900
+ 86,-1340
+ 100,-680
@@ -186,13 +186,13 @@ volume index from 0 to 100.
1,-5200
- 13,-4150
- 29,-3400
- 43,-2870
- 57,-2350
- 71,-2100
- 86,-1780
- 100,-1420
+ 13,-4455
+ 29,-3660
+ 43,-3165
+ 57,-2630
+ 71,-2400
+ 86,-2100
+ 100,-1720
@@ -208,13 +208,13 @@ volume index from 0 to 100.
1,-6600
- 14,-5250
- 29,-4500
- 43,-3600
- 57,-3230
- 71,-2750
- 85,-2300
- 100,-1900
+ 14,-5440
+ 29,-4740
+ 43,-3850
+ 57,-3520
+ 71,-2900
+ 85,-2470
+ 100,-2038
diff --git a/audio/komodo/tuning/waves/waves_preset.mps b/audio/komodo/tuning/waves/waves_preset.mps
index 3f82d3c9..c335a34d 100644
Binary files a/audio/komodo/tuning/waves/waves_preset.mps and b/audio/komodo/tuning/waves/waves_preset.mps differ
diff --git a/bluetooth/bluetooth_power_limits_caiman.csv b/bluetooth/bluetooth_power_limits_caiman.csv
new file mode 100644
index 00000000..467fc203
--- /dev/null
+++ b/bluetooth/bluetooth_power_limits_caiman.csv
@@ -0,0 +1,36 @@
+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,on,66,67,39,62,66,67,40,61,54,54,30,62,54,54,30,62
+off,off,off,off,on,on,66,67,39,62,66,67,40,61,54,54,30,62,54,54,30,62
+off,off,off,on,off,on,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
+off,off,off,on,on,on,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
+off,off,on,off,off,on,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
+off,off,on,off,on,on,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
+off,off,on,on,off,on,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
+off,off,on,on,on,on,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
+off,on,off,off,off,on,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
+off,on,off,off,on,on,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
+off,on,off,on,off,on,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
+off,on,off,on,on,on,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
+off,on,on,off,off,on,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
+off,on,on,off,on,on,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
+off,on,on,on,off,on,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
+off,on,on,on,on,on,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
+on,off,off,off,off,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
+on,off,off,off,on,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
+on,off,off,on,off,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
+on,off,off,on,on,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
+on,off,on,off,off,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
+on,off,on,off,on,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
+on,off,on,on,off,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
+on,off,on,on,on,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
+on,on,off,off,off,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
+on,on,off,off,on,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
+on,on,off,on,off,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
+on,on,off,on,on,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
+on,on,on,off,off,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
+on,on,on,off,on,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
+on,on,on,on,off,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
+on,on,on,on,on,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
+off,off,any,off,any,off,66,67,39,62,66,67,40,61,54,54,30,62,54,54,30,62
+off,on,any,any,any,off,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
+off,any,any,on,any,off,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
\ No newline at end of file
diff --git a/bluetooth/bluetooth_power_limits_caiman_CA.csv b/bluetooth/bluetooth_power_limits_caiman_CA.csv
new file mode 100644
index 00000000..2d262da3
--- /dev/null
+++ b/bluetooth/bluetooth_power_limits_caiman_CA.csv
@@ -0,0 +1,36 @@
+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,on,76,68,76,76,76,68,76,76,76,68,76,76,76,68,76,76
+off,off,off,off,on,on,76,68,76,76,76,68,76,76,76,68,76,76,76,68,76,76
+off,off,off,on,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,off,off,on,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,off,on,off,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,off,on,off,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,off,on,on,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,off,on,on,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,off,off,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,off,off,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,off,on,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,off,on,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,on,off,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,on,off,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,on,on,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,on,on,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+on,off,off,off,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,off,off,off,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,off,off,on,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,off,off,on,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,off,on,off,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,off,on,off,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,off,on,on,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,off,on,on,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,off,off,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,off,off,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,off,on,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,off,on,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,on,off,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,on,off,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,on,on,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,on,on,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+off,off,any,off,any,off,76,68,76,76,76,68,76,76,76,68,76,76,76,68,76,76
+off,on,any,any,any,off,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,any,any,on,any,off,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
\ No newline at end of file
diff --git a/bluetooth/bluetooth_power_limits_caiman_EU.csv b/bluetooth/bluetooth_power_limits_caiman_EU.csv
new file mode 100644
index 00000000..3a998c3e
--- /dev/null
+++ b/bluetooth/bluetooth_power_limits_caiman_EU.csv
@@ -0,0 +1,36 @@
+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,on,76,68,42,76,76,68,43,76,66,66,30,62,66,66,30,62
+off,off,off,off,on,on,76,68,42,76,76,68,43,76,66,66,30,62,66,66,30,62
+off,off,off,on,off,on,62,62,42,62,62,62,43,62,62,62,30,62,62,62,30,62
+off,off,off,on,on,on,62,62,42,62,62,62,43,62,62,62,30,62,62,62,30,62
+off,off,on,off,off,on,62,62,42,62,62,62,43,62,62,62,30,62,62,62,30,62
+off,off,on,off,on,on,62,62,42,62,62,62,43,62,62,62,30,62,62,62,30,62
+off,off,on,on,off,on,62,62,42,62,62,62,43,62,62,62,30,62,62,62,30,62
+off,off,on,on,on,on,62,62,42,62,62,62,43,62,62,62,30,62,62,62,30,62
+off,on,off,off,off,on,62,62,42,62,62,62,43,62,62,62,30,62,62,62,30,62
+off,on,off,off,on,on,62,62,42,62,62,62,43,62,62,62,30,62,62,62,30,62
+off,on,off,on,off,on,62,62,42,62,62,62,43,62,62,62,30,62,62,62,30,62
+off,on,off,on,on,on,62,62,42,62,62,62,43,62,62,62,30,62,62,62,30,62
+off,on,on,off,off,on,62,62,42,62,62,62,43,62,62,62,30,62,62,62,30,62
+off,on,on,off,on,on,62,62,42,62,62,62,43,62,62,62,30,62,62,62,30,62
+off,on,on,on,off,on,62,62,42,62,62,62,43,62,62,62,30,62,62,62,30,62
+off,on,on,on,on,on,62,62,42,62,62,62,43,62,62,62,30,62,62,62,30,62
+on,off,off,off,off,any,66,66,42,66,66,66,43,66,66,66,30,62,66,66,30,62
+on,off,off,off,on,any,66,66,42,66,66,66,43,66,66,66,30,62,66,66,30,62
+on,off,off,on,off,any,66,66,42,66,66,66,43,66,66,66,30,62,66,66,30,62
+on,off,off,on,on,any,66,66,42,66,66,66,43,66,66,66,30,62,66,66,30,62
+on,off,on,off,off,any,66,66,42,66,66,66,43,66,66,66,30,62,66,66,30,62
+on,off,on,off,on,any,66,66,42,66,66,66,43,66,66,66,30,62,66,66,30,62
+on,off,on,on,off,any,66,66,42,66,66,66,43,66,66,66,30,62,66,66,30,62
+on,off,on,on,on,any,66,66,42,66,66,66,43,66,66,66,30,62,66,66,30,62
+on,on,off,off,off,any,66,66,42,66,66,66,43,66,66,66,30,62,66,66,30,62
+on,on,off,off,on,any,66,66,42,66,66,66,43,66,66,66,30,62,66,66,30,62
+on,on,off,on,off,any,66,66,42,66,66,66,43,66,66,66,30,62,66,66,30,62
+on,on,off,on,on,any,66,66,42,66,66,66,43,66,66,66,30,62,66,66,30,62
+on,on,on,off,off,any,66,66,42,66,66,66,43,66,66,66,30,62,66,66,30,62
+on,on,on,off,on,any,66,66,42,66,66,66,43,66,66,66,30,62,66,66,30,62
+on,on,on,on,off,any,66,66,42,66,66,66,43,66,66,66,30,62,66,66,30,62
+on,on,on,on,on,any,66,66,42,66,66,66,43,66,66,66,30,62,66,66,30,62
+off,off,any,off,any,off,76,68,42,76,76,68,43,76,66,66,30,62,66,66,30,62
+off,on,any,any,any,off,62,62,42,62,62,62,43,62,62,62,30,62,62,62,30,62
+off,any,any,on,any,off,62,62,42,62,62,62,43,62,62,62,30,62,62,62,30,62
\ No newline at end of file
diff --git a/bluetooth/bluetooth_power_limits_caiman_JP.csv b/bluetooth/bluetooth_power_limits_caiman_JP.csv
new file mode 100644
index 00000000..0e416b58
--- /dev/null
+++ b/bluetooth/bluetooth_power_limits_caiman_JP.csv
@@ -0,0 +1,36 @@
+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,on,66,67,39,62,66,67,40,61,54,54,32,62,54,54,32,62
+off,off,off,off,on,on,66,67,39,62,66,67,40,61,54,54,32,62,54,54,32,62
+off,off,off,on,off,on,62,62,39,62,62,62,40,61,54,54,32,62,54,54,32,62
+off,off,off,on,on,on,62,62,39,62,62,62,40,61,54,54,32,62,54,54,32,62
+off,off,on,off,off,on,62,62,39,62,62,62,40,61,54,54,32,62,54,54,32,62
+off,off,on,off,on,on,62,62,39,62,62,62,40,61,54,54,32,62,54,54,32,62
+off,off,on,on,off,on,62,62,39,62,62,62,40,61,54,54,32,62,54,54,32,62
+off,off,on,on,on,on,62,62,39,62,62,62,40,61,54,54,32,62,54,54,32,62
+off,on,off,off,off,on,62,62,39,62,62,62,40,61,54,54,32,62,54,54,32,62
+off,on,off,off,on,on,62,62,39,62,62,62,40,61,54,54,32,62,54,54,32,62
+off,on,off,on,off,on,62,62,39,62,62,62,40,61,54,54,32,62,54,54,32,62
+off,on,off,on,on,on,62,62,39,62,62,62,40,61,54,54,32,62,54,54,32,62
+off,on,on,off,off,on,62,62,39,62,62,62,40,61,54,54,32,62,54,54,32,62
+off,on,on,off,on,on,62,62,39,62,62,62,40,61,54,54,32,62,54,54,32,62
+off,on,on,on,off,on,62,62,39,62,62,62,40,61,54,54,32,62,54,54,32,62
+off,on,on,on,on,on,62,62,39,62,62,62,40,61,54,54,32,62,54,54,32,62
+on,off,off,off,off,any,66,66,39,62,66,66,40,61,54,54,32,62,54,54,32,62
+on,off,off,off,on,any,66,66,39,62,66,66,40,61,54,54,32,62,54,54,32,62
+on,off,off,on,off,any,66,66,39,62,66,66,40,61,54,54,32,62,54,54,32,62
+on,off,off,on,on,any,66,66,39,62,66,66,40,61,54,54,32,62,54,54,32,62
+on,off,on,off,off,any,66,66,39,62,66,66,40,61,54,54,32,62,54,54,32,62
+on,off,on,off,on,any,66,66,39,62,66,66,40,61,54,54,32,62,54,54,32,62
+on,off,on,on,off,any,66,66,39,62,66,66,40,61,54,54,32,62,54,54,32,62
+on,off,on,on,on,any,66,66,39,62,66,66,40,61,54,54,32,62,54,54,32,62
+on,on,off,off,off,any,66,66,39,62,66,66,40,61,54,54,32,62,54,54,32,62
+on,on,off,off,on,any,66,66,39,62,66,66,40,61,54,54,32,62,54,54,32,62
+on,on,off,on,off,any,66,66,39,62,66,66,40,61,54,54,32,62,54,54,32,62
+on,on,off,on,on,any,66,66,39,62,66,66,40,61,54,54,32,62,54,54,32,62
+on,on,on,off,off,any,66,66,39,62,66,66,40,61,54,54,32,62,54,54,32,62
+on,on,on,off,on,any,66,66,39,62,66,66,40,61,54,54,32,62,54,54,32,62
+on,on,on,on,off,any,66,66,39,62,66,66,40,61,54,54,32,62,54,54,32,62
+on,on,on,on,on,any,66,66,39,62,66,66,40,61,54,54,32,62,54,54,32,62
+off,off,any,off,any,off,66,67,39,62,66,67,40,61,54,54,32,62,54,54,32,62
+off,on,any,any,any,off,62,62,39,62,62,62,40,61,54,54,32,62,54,54,32,62
+off,any,any,on,any,off,62,62,39,62,62,62,40,61,54,54,32,62,54,54,32,62
\ No newline at end of file
diff --git a/bluetooth/bluetooth_power_limits_caiman_US.csv b/bluetooth/bluetooth_power_limits_caiman_US.csv
new file mode 100644
index 00000000..2d262da3
--- /dev/null
+++ b/bluetooth/bluetooth_power_limits_caiman_US.csv
@@ -0,0 +1,36 @@
+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,on,76,68,76,76,76,68,76,76,76,68,76,76,76,68,76,76
+off,off,off,off,on,on,76,68,76,76,76,68,76,76,76,68,76,76,76,68,76,76
+off,off,off,on,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,off,off,on,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,off,on,off,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,off,on,off,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,off,on,on,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,off,on,on,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,off,off,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,off,off,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,off,on,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,off,on,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,on,off,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,on,off,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,on,on,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,on,on,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+on,off,off,off,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,off,off,off,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,off,off,on,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,off,off,on,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,off,on,off,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,off,on,off,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,off,on,on,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,off,on,on,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,off,off,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,off,off,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,off,on,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,off,on,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,on,off,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,on,off,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,on,on,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,on,on,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+off,off,any,off,any,off,76,68,76,76,76,68,76,76,76,68,76,76,76,68,76,76
+off,on,any,any,any,off,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,any,any,on,any,off,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
\ No newline at end of file
diff --git a/bluetooth/bluetooth_power_limits_komodo.csv b/bluetooth/bluetooth_power_limits_komodo.csv
new file mode 100644
index 00000000..c77e0cfe
--- /dev/null
+++ b/bluetooth/bluetooth_power_limits_komodo.csv
@@ -0,0 +1,36 @@
+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,on,66,68,38,60,66,66,40,59,54,54,26,59,54,54,26,59
+off,off,off,off,on,on,66,68,38,60,66,66,40,59,54,54,26,59,54,54,26,59
+off,off,off,on,off,on,62,62,38,60,62,62,40,59,54,54,26,59,54,54,26,59
+off,off,off,on,on,on,62,62,38,60,62,62,40,59,54,54,26,59,54,54,26,59
+off,off,on,off,off,on,62,62,38,60,62,62,40,59,54,54,26,59,54,54,26,59
+off,off,on,off,on,on,62,62,38,60,62,62,40,59,54,54,26,59,54,54,26,59
+off,off,on,on,off,on,62,62,38,60,62,62,40,59,54,54,26,59,54,54,26,59
+off,off,on,on,on,on,62,62,38,60,62,62,40,59,54,54,26,59,54,54,26,59
+off,on,off,off,off,on,62,62,38,60,62,62,40,59,54,54,26,59,54,54,26,59
+off,on,off,off,on,on,62,62,38,60,62,62,40,59,54,54,26,59,54,54,26,59
+off,on,off,on,off,on,62,62,38,62,62,62,40,59,54,54,26,59,54,54,26,59
+off,on,off,on,on,on,62,62,38,60,62,62,40,59,54,54,26,59,54,54,26,59
+off,on,on,off,off,on,62,62,38,60,62,62,40,59,54,54,26,59,54,54,26,59
+off,on,on,off,on,on,62,62,38,60,62,62,40,59,54,54,26,59,54,54,26,59
+off,on,on,on,off,on,62,62,38,60,62,62,40,59,54,54,26,59,54,54,26,59
+off,on,on,on,on,on,62,62,38,60,62,62,40,59,54,54,26,59,54,54,26,59
+on,off,off,off,off,any,46,46,38,46,46,46,40,46,46,46,26,46,46,46,26,46
+on,off,off,off,on,any,46,46,38,46,46,46,40,46,46,46,26,46,46,46,26,46
+on,off,off,on,off,any,46,46,38,46,46,46,40,46,46,46,26,46,46,46,26,46
+on,off,off,on,on,any,46,46,38,46,46,46,40,46,46,46,26,46,46,46,26,46
+on,off,on,off,off,any,46,46,38,46,46,46,40,46,46,46,26,46,46,46,26,46
+on,off,on,off,on,any,46,46,38,46,46,46,40,46,46,46,26,46,46,46,26,46
+on,off,on,on,off,any,46,46,38,46,46,46,40,46,46,46,26,46,46,46,26,46
+on,off,on,on,on,any,46,46,38,46,46,46,40,46,46,46,26,46,46,46,26,46
+on,on,off,off,off,any,46,46,38,46,46,46,40,46,46,46,26,46,46,46,26,46
+on,on,off,off,on,any,46,46,38,46,46,46,40,46,46,46,26,46,46,46,26,46
+on,on,off,on,off,any,46,46,38,46,46,46,40,46,46,46,26,46,46,46,26,46
+on,on,off,on,on,any,46,46,38,46,46,46,40,46,46,46,26,46,46,46,26,46
+on,on,on,off,off,any,46,46,38,46,46,46,40,46,46,46,26,46,46,46,26,46
+on,on,on,off,on,any,46,46,38,46,46,46,40,46,46,46,26,46,46,46,26,46
+on,on,on,on,off,any,46,46,38,46,46,46,40,46,46,46,26,46,46,46,26,46
+on,on,on,on,on,any,46,46,38,46,46,46,40,46,46,46,26,46,46,46,26,46
+off,off,any,off,any,off,66,68,38,60,66,66,40,59,54,54,26,59,54,54,26,59
+off,on,any,any,any,off,62,62,38,60,62,62,40,59,54,54,26,59,54,54,26,59
+off,any,any,on,any,off,62,62,38,60,62,62,40,59,54,54,26,59,54,54,26,59
\ No newline at end of file
diff --git a/bluetooth/bluetooth_power_limits_komodo_CA.csv b/bluetooth/bluetooth_power_limits_komodo_CA.csv
new file mode 100644
index 00000000..0bc80ffd
--- /dev/null
+++ b/bluetooth/bluetooth_power_limits_komodo_CA.csv
@@ -0,0 +1,36 @@
+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,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,off,off,off,on,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,off,off,on,off,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,off,off,on,on,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,off,on,off,off,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,off,on,off,on,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,off,on,on,off,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,off,on,on,on,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,on,off,off,off,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,on,off,off,on,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,on,off,on,off,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,on,off,on,on,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,on,on,off,off,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,on,on,off,on,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,on,on,on,off,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,on,on,on,on,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+on,off,off,off,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,off,off,off,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,off,off,on,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,off,off,on,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,off,on,off,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,off,on,off,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,off,on,on,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,off,on,on,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,off,off,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,off,off,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,off,on,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,off,on,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,on,off,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,on,off,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,on,on,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,on,on,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+off,off,any,off,any,off,76,68,76,76,76,68,76,76,76,68,76,76,76,68,76,76
+off,on,any,any,any,off,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,any,any,on,any,off,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
\ No newline at end of file
diff --git a/bluetooth/bluetooth_power_limits_komodo_EU.csv b/bluetooth/bluetooth_power_limits_komodo_EU.csv
new file mode 100644
index 00000000..f910b5e6
--- /dev/null
+++ b/bluetooth/bluetooth_power_limits_komodo_EU.csv
@@ -0,0 +1,36 @@
+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,on,76,68,38,76,76,68,49,76,68,68,32,68,68,68,32,68
+off,off,off,off,on,on,76,68,38,76,76,68,49,76,68,68,32,68,68,68,32,68
+off,off,off,on,off,on,62,62,38,62,62,62,49,62,60,60,32,60,60,60,32,60
+off,off,off,on,on,on,62,62,38,62,62,62,49,62,60,60,32,60,60,60,32,60
+off,off,on,off,off,on,62,62,38,62,62,62,49,62,60,60,32,60,60,60,32,60
+off,off,on,off,on,on,62,62,38,62,62,62,49,62,60,60,32,60,60,60,32,60
+off,off,on,on,off,on,62,62,38,62,62,62,49,62,60,60,32,60,60,60,32,60
+off,off,on,on,on,on,62,62,38,62,62,62,49,62,60,60,32,60,60,60,32,60
+off,on,off,off,off,on,62,62,38,62,62,62,49,62,60,60,32,60,60,60,32,60
+off,on,off,off,on,on,62,62,38,62,62,62,49,62,60,60,32,60,60,60,32,60
+off,on,off,on,off,on,62,62,38,62,62,62,49,62,60,60,32,60,60,60,32,60
+off,on,off,on,on,on,62,62,38,62,62,62,49,62,60,60,32,60,60,60,32,60
+off,on,on,off,off,on,62,62,38,62,62,62,49,62,60,60,32,60,60,60,32,60
+off,on,on,off,on,on,62,62,38,62,62,62,49,62,60,60,32,60,60,60,32,60
+off,on,on,on,off,on,62,62,38,62,62,62,49,62,60,60,32,60,60,60,32,60
+off,on,on,on,on,on,62,62,38,62,62,62,49,62,60,60,32,60,60,60,32,60
+on,off,off,off,off,any,68,68,38,68,68,68,49,68,68,68,32,68,68,68,32,68
+on,off,off,off,on,any,68,68,38,68,68,68,49,68,68,68,32,68,68,68,32,68
+on,off,off,on,off,any,68,68,38,68,68,68,49,68,68,68,32,68,68,68,32,68
+on,off,off,on,on,any,68,68,38,68,68,68,49,68,68,68,32,68,68,68,32,68
+on,off,on,off,off,any,68,68,38,68,68,68,49,68,68,68,32,68,68,68,32,68
+on,off,on,off,on,any,68,68,38,68,68,68,49,68,68,68,32,68,68,68,32,68
+on,off,on,on,off,any,68,68,38,68,68,68,49,68,68,68,32,68,68,68,32,68
+on,off,on,on,on,any,68,68,38,68,68,68,49,68,68,68,32,68,68,68,32,68
+on,on,off,off,off,any,68,68,38,68,68,68,49,68,68,68,32,68,68,68,32,68
+on,on,off,off,on,any,68,68,38,68,68,68,49,68,68,68,32,68,68,68,32,68
+on,on,off,on,off,any,68,68,38,68,68,68,49,68,68,68,32,68,68,68,32,68
+on,on,off,on,on,any,68,68,38,68,68,68,49,68,68,68,32,68,68,68,32,68
+on,on,on,off,off,any,68,68,38,68,68,68,49,68,68,68,32,68,68,68,32,68
+on,on,on,off,on,any,68,68,38,68,68,68,49,68,68,68,32,68,68,68,32,68
+on,on,on,on,off,any,68,68,38,68,68,68,49,68,68,68,32,68,68,68,32,68
+on,on,on,on,on,any,68,68,38,68,68,68,49,68,68,68,32,68,68,68,32,68
+off,off,any,off,any,off,76,68,38,76,76,68,49,76,68,68,32,68,68,68,32,68
+off,on,any,any,any,off,62,62,38,62,62,62,49,62,60,60,32,60,60,60,32,60
+off,any,any,on,any,off,62,62,38,62,62,62,49,62,60,60,32,60,60,60,32,60
\ No newline at end of file
diff --git a/bluetooth/bluetooth_power_limits_komodo_JP.csv b/bluetooth/bluetooth_power_limits_komodo_JP.csv
new file mode 100644
index 00000000..73202422
--- /dev/null
+++ b/bluetooth/bluetooth_power_limits_komodo_JP.csv
@@ -0,0 +1,36 @@
+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,on,66,68,41,60,66,66,40,59,54,54,26,59,54,54,26,59
+off,off,off,off,on,on,66,68,41,60,66,66,40,59,54,54,26,59,54,54,26,59
+off,off,off,on,off,on,62,62,41,60,62,62,40,59,54,54,26,59,54,54,26,59
+off,off,off,on,on,on,62,62,41,60,62,62,40,59,54,54,26,59,54,54,26,59
+off,off,on,off,off,on,62,62,41,60,62,62,40,59,54,54,26,59,54,54,26,59
+off,off,on,off,on,on,62,62,41,60,62,62,40,59,54,54,26,59,54,54,26,59
+off,off,on,on,off,on,62,62,41,60,62,62,40,59,54,54,26,59,54,54,26,59
+off,off,on,on,on,on,62,62,41,60,62,62,40,59,54,54,26,59,54,54,26,59
+off,on,off,off,off,on,62,62,41,60,62,62,40,59,54,54,26,59,54,54,26,59
+off,on,off,off,on,on,62,62,41,60,62,62,40,59,54,54,26,59,54,54,26,59
+off,on,off,on,off,on,62,62,41,62,62,62,40,59,54,54,26,59,54,54,26,59
+off,on,off,on,on,on,62,62,41,60,62,62,40,59,54,54,26,59,54,54,26,59
+off,on,on,off,off,on,62,62,41,60,62,62,40,59,54,54,26,59,54,54,26,59
+off,on,on,off,on,on,62,62,41,60,62,62,40,59,54,54,26,59,54,54,26,59
+off,on,on,on,off,on,62,62,41,60,62,62,40,59,54,54,26,59,54,54,26,59
+off,on,on,on,on,on,62,62,41,60,62,62,40,59,54,54,26,59,54,54,26,59
+on,off,off,off,off,any,66,68,41,60,66,66,40,59,54,54,26,59,54,54,26,59
+on,off,off,off,on,any,66,68,41,60,66,66,40,59,54,54,26,59,54,54,26,59
+on,off,off,on,off,any,66,68,41,60,66,66,40,59,54,54,26,59,54,54,26,59
+on,off,off,on,on,any,66,68,41,60,66,66,40,59,54,54,26,59,54,54,26,59
+on,off,on,off,off,any,66,68,41,60,66,66,40,59,54,54,26,59,54,54,26,59
+on,off,on,off,on,any,66,68,41,60,66,66,40,59,54,54,26,59,54,54,26,59
+on,off,on,on,off,any,66,68,41,60,66,66,40,59,54,54,26,59,54,54,26,59
+on,off,on,on,on,any,66,68,41,60,66,66,40,59,54,54,26,59,54,54,26,59
+on,on,off,off,off,any,66,68,41,60,66,66,40,59,54,54,26,59,54,54,26,59
+on,on,off,off,on,any,66,68,41,60,66,66,40,59,54,54,26,59,54,54,26,59
+on,on,off,on,off,any,66,68,41,60,66,66,40,59,54,54,26,59,54,54,26,59
+on,on,off,on,on,any,66,68,41,60,66,66,40,59,54,54,26,59,54,54,26,59
+on,on,on,off,off,any,66,68,41,60,66,66,40,59,54,54,26,59,54,54,26,59
+on,on,on,off,on,any,66,68,41,60,66,66,40,59,54,54,26,59,54,54,26,59
+on,on,on,on,off,any,66,68,41,60,66,66,40,59,54,54,26,59,54,54,26,59
+on,on,on,on,on,any,66,68,41,60,66,66,40,59,54,54,26,59,54,54,26,59
+off,off,any,off,any,off,66,68,41,60,66,66,40,59,54,54,26,59,54,54,26,59
+off,on,any,any,any,off,62,62,41,60,62,62,40,59,54,54,26,59,54,54,26,59
+off,any,any,on,any,off,62,62,41,60,62,62,40,59,54,54,26,59,54,54,26,59
\ No newline at end of file
diff --git a/bluetooth/bluetooth_power_limits_komodo_US.csv b/bluetooth/bluetooth_power_limits_komodo_US.csv
new file mode 100644
index 00000000..0bc80ffd
--- /dev/null
+++ b/bluetooth/bluetooth_power_limits_komodo_US.csv
@@ -0,0 +1,36 @@
+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,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,off,off,off,on,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,off,off,on,off,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,off,off,on,on,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,off,on,off,off,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,off,on,off,on,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,off,on,on,off,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,off,on,on,on,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,on,off,off,off,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,on,off,off,on,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,on,off,on,off,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,on,off,on,on,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,on,on,off,off,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,on,on,off,on,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,on,on,on,off,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,on,on,on,on,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+on,off,off,off,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,off,off,off,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,off,off,on,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,off,off,on,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,off,on,off,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,off,on,off,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,off,on,on,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,off,on,on,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,off,off,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,off,off,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,off,on,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,off,on,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,on,off,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,on,off,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,on,on,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+on,on,on,on,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
+off,off,any,off,any,off,76,68,76,76,76,68,76,76,76,68,76,76,76,68,76,76
+off,on,any,any,any,off,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,any,any,on,any,off,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
\ No newline at end of file
diff --git a/bluetooth/bluetooth_power_limits_tokay.csv b/bluetooth/bluetooth_power_limits_tokay.csv
new file mode 100644
index 00000000..fb0dd4ab
--- /dev/null
+++ b/bluetooth/bluetooth_power_limits_tokay.csv
@@ -0,0 +1,36 @@
+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,on,66,66,34,62,66,66,41,65,53,53,26,61,53,53,26,61
+off,off,off,off,on,on,66,66,34,62,66,66,41,65,53,53,26,61,53,53,26,61
+off,off,off,on,off,on,60,60,34,60,60,60,41,60,53,53,26,58,53,53,26,58
+off,off,off,on,on,on,60,60,34,60,60,60,41,60,53,53,26,58,53,53,26,58
+off,off,on,off,off,on,60,60,34,60,60,60,41,60,53,53,26,58,53,53,26,58
+off,off,on,off,on,on,60,60,34,60,60,60,41,60,53,53,26,58,53,53,26,58
+off,off,on,on,off,on,60,60,34,60,60,60,41,60,53,53,26,58,53,53,26,58
+off,off,on,on,on,on,60,60,34,60,60,60,41,60,53,53,26,58,53,53,26,58
+off,on,off,off,off,on,60,60,34,60,60,60,41,60,53,53,26,58,53,53,26,58
+off,on,off,off,on,on,60,60,34,60,60,60,41,60,53,53,26,58,53,53,26,58
+off,on,off,on,off,on,60,60,34,60,60,60,41,60,53,53,26,58,53,53,26,58
+off,on,off,on,on,on,60,60,34,60,60,60,41,60,53,53,26,58,53,53,26,58
+off,on,on,off,off,on,60,60,34,60,60,60,41,60,53,53,26,58,53,53,26,58
+off,on,on,off,on,on,60,60,34,60,60,60,41,60,53,53,26,58,53,53,26,58
+off,on,on,on,off,on,60,60,34,60,60,60,41,60,53,53,26,58,53,53,26,58
+off,on,on,on,on,on,60,60,34,60,60,60,41,60,53,53,26,58,53,53,26,58
+on,off,off,off,off,any,42,38,34,38,42,38,41,38,42,38,26,38,42,38,26,38
+on,off,off,off,on,any,42,38,34,38,42,38,41,38,42,38,26,38,42,38,26,38
+on,off,off,on,off,any,42,38,34,38,42,38,41,38,42,38,26,38,42,38,26,38
+on,off,off,on,on,any,42,38,34,38,42,38,41,38,42,38,26,38,42,38,26,38
+on,off,on,off,off,any,42,38,34,38,42,38,41,38,42,38,26,38,42,38,26,38
+on,off,on,off,on,any,42,38,34,38,42,38,41,38,42,38,26,38,42,38,26,38
+on,off,on,on,off,any,42,38,34,38,42,38,41,38,42,38,26,38,42,38,26,38
+on,off,on,on,on,any,42,38,34,38,42,38,41,38,42,38,26,38,42,38,26,38
+on,on,off,off,off,any,42,38,34,38,42,38,41,38,42,38,26,38,42,38,26,38
+on,on,off,off,on,any,42,38,34,38,42,38,41,38,42,38,26,38,42,38,26,38
+on,on,off,on,off,any,42,38,34,38,42,38,41,38,42,38,26,38,42,38,26,38
+on,on,off,on,on,any,42,38,34,38,42,38,41,38,42,38,26,38,42,38,26,38
+on,on,on,off,off,any,42,38,34,38,42,38,41,38,42,38,26,38,42,38,26,38
+on,on,on,off,on,any,42,38,34,38,42,38,41,38,42,38,26,38,42,38,26,38
+on,on,on,on,off,any,42,38,34,38,42,38,41,38,42,38,26,38,42,38,26,38
+on,on,on,on,on,any,42,38,34,38,42,38,41,38,42,38,26,38,42,38,26,38
+off,off,any,off,any,off,66,66,34,62,66,66,41,65,53,53,26,58,53,53,26,58
+off,on,any,any,any,off,60,60,34,60,60,60,41,60,53,53,26,58,53,53,26,58
+off,any,any,on,any,off,60,60,34,60,60,60,41,60,53,53,26,58,53,53,26,58
\ No newline at end of file
diff --git a/bluetooth/bluetooth_power_limits_tokay_CA.csv b/bluetooth/bluetooth_power_limits_tokay_CA.csv
new file mode 100644
index 00000000..d119e468
--- /dev/null
+++ b/bluetooth/bluetooth_power_limits_tokay_CA.csv
@@ -0,0 +1,36 @@
+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,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,off,off,off,on,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,off,off,on,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,off,off,on,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,off,on,off,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,off,on,off,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,off,on,on,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,off,on,on,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,off,off,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,off,off,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,off,on,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,off,on,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,on,off,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,on,off,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,on,on,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,on,on,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+on,off,off,off,off,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,off,off,off,on,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,off,off,on,off,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,off,off,on,on,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,off,on,off,off,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,off,on,off,on,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,off,on,on,off,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,off,on,on,on,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,on,off,off,off,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,on,off,off,on,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,on,off,on,off,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,on,off,on,on,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,on,on,off,off,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,on,on,off,on,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,on,on,on,off,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,on,on,on,on,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+off,off,any,off,any,off,76,68,76,76,76,68,76,76,76,68,76,76,76,68,76,76
+off,on,any,any,any,off,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,any,any,on,any,off,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
\ No newline at end of file
diff --git a/bluetooth/bluetooth_power_limits_tokay_EU.csv b/bluetooth/bluetooth_power_limits_tokay_EU.csv
new file mode 100644
index 00000000..1fcefcd0
--- /dev/null
+++ b/bluetooth/bluetooth_power_limits_tokay_EU.csv
@@ -0,0 +1,36 @@
+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,on,74,68,34,74,74,68,41,74,62,62,26,62,62,62,26,62
+off,off,off,off,on,on,74,68,34,74,74,68,41,74,62,62,26,62,62,62,26,62
+off,off,off,on,off,on,60,60,34,60,60,60,41,60,58,58,26,58,58,58,26,58
+off,off,off,on,on,on,60,60,34,60,60,60,41,60,58,58,26,58,58,58,26,58
+off,off,on,off,off,on,60,60,34,60,60,60,41,60,58,58,26,58,58,58,26,58
+off,off,on,off,on,on,60,60,34,60,60,60,41,60,58,58,26,58,58,58,26,58
+off,off,on,on,off,on,60,60,34,60,60,60,41,60,58,58,26,58,58,58,26,58
+off,off,on,on,on,on,60,60,34,60,60,60,41,60,58,58,26,58,58,58,26,58
+off,on,off,off,off,on,60,60,34,60,60,60,41,60,58,58,26,58,58,58,26,58
+off,on,off,off,on,on,60,60,34,60,60,60,41,60,58,58,26,58,58,58,26,58
+off,on,off,on,off,on,60,60,34,60,60,60,41,60,58,58,26,58,58,58,26,58
+off,on,off,on,on,on,60,60,34,60,60,60,41,60,58,58,26,58,58,58,26,58
+off,on,on,off,off,on,60,60,34,60,60,60,41,60,58,58,26,58,58,58,26,58
+off,on,on,off,on,on,60,60,34,60,60,60,41,60,58,58,26,58,58,58,26,58
+off,on,on,on,off,on,60,60,34,60,60,60,41,60,58,58,26,58,58,58,26,58
+off,on,on,on,on,on,60,60,34,60,60,60,41,60,58,58,26,58,58,58,26,58
+on,off,off,off,off,any,58,58,34,58,58,58,41,58,58,58,26,58,58,58,26,58
+on,off,off,off,on,any,58,58,34,58,58,58,41,58,58,58,26,58,58,58,26,58
+on,off,off,on,off,any,58,58,34,58,58,58,41,58,58,58,26,58,58,58,26,58
+on,off,off,on,on,any,58,58,34,58,58,58,41,58,58,58,26,58,58,58,26,58
+on,off,on,off,off,any,58,58,34,58,58,58,41,58,58,58,26,58,58,58,26,58
+on,off,on,off,on,any,58,58,34,58,58,58,41,58,58,58,26,58,58,58,26,58
+on,off,on,on,off,any,58,58,34,58,58,58,41,58,58,58,26,58,58,58,26,58
+on,off,on,on,on,any,58,58,34,58,58,58,41,58,58,58,26,58,58,58,26,58
+on,on,off,off,off,any,58,58,34,58,58,58,41,58,58,58,26,58,58,58,26,58
+on,on,off,off,on,any,58,58,34,58,58,58,41,58,58,58,26,58,58,58,26,58
+on,on,off,on,off,any,58,58,34,58,58,58,41,58,58,58,26,58,58,58,26,58
+on,on,off,on,on,any,58,58,34,58,58,58,41,58,58,58,26,58,58,58,26,58
+on,on,on,off,off,any,58,58,34,58,58,58,41,58,58,58,26,58,58,58,26,58
+on,on,on,off,on,any,58,58,34,58,58,58,41,58,58,58,26,58,58,58,26,58
+on,on,on,on,off,any,58,58,34,58,58,58,41,58,58,58,26,58,58,58,26,58
+on,on,on,on,on,any,58,58,34,58,58,58,41,58,58,58,26,58,58,58,26,58
+off,off,any,off,any,off,74,68,34,74,74,68,41,74,58,58,26,58,58,58,26,58
+off,on,any,any,any,off,60,60,34,60,60,60,41,60,58,58,26,58,58,58,26,58
+off,any,any,on,any,off,60,60,34,60,60,60,41,60,58,58,26,58,58,58,26,58
\ No newline at end of file
diff --git a/bluetooth/bluetooth_power_limits_tokay_JP.csv b/bluetooth/bluetooth_power_limits_tokay_JP.csv
new file mode 100644
index 00000000..fa4fdd6a
--- /dev/null
+++ b/bluetooth/bluetooth_power_limits_tokay_JP.csv
@@ -0,0 +1,36 @@
+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,on,66,66,41,62,66,66,41,65,53,53,29,61,53,53,29,61
+off,off,off,off,on,on,66,66,41,62,66,66,41,65,53,53,29,61,53,53,29,61
+off,off,off,on,off,on,60,60,41,60,60,60,41,60,53,53,29,58,53,53,29,58
+off,off,off,on,on,on,60,60,41,60,60,60,41,60,53,53,29,58,53,53,29,58
+off,off,on,off,off,on,60,60,41,60,60,60,41,60,53,53,29,58,53,53,29,58
+off,off,on,off,on,on,60,60,41,60,60,60,41,60,53,53,29,58,53,53,29,58
+off,off,on,on,off,on,60,60,41,60,60,60,41,60,53,53,29,58,53,53,29,58
+off,off,on,on,on,on,60,60,41,60,60,60,41,60,53,53,29,58,53,53,29,58
+off,on,off,off,off,on,60,60,41,60,60,60,41,60,53,53,29,58,53,53,29,58
+off,on,off,off,on,on,60,60,41,60,60,60,41,60,53,53,29,58,53,53,29,58
+off,on,off,on,off,on,60,60,41,60,60,60,41,60,53,53,29,58,53,53,29,58
+off,on,off,on,on,on,60,60,41,60,60,60,41,60,53,53,29,58,53,53,29,58
+off,on,on,off,off,on,60,60,41,60,60,60,41,60,53,53,29,58,53,53,29,58
+off,on,on,off,on,on,60,60,41,60,60,60,41,60,53,53,29,58,53,53,29,58
+off,on,on,on,off,on,60,60,41,60,60,60,41,60,53,53,29,58,53,53,29,58
+off,on,on,on,on,on,60,60,41,60,60,60,41,60,53,53,29,58,53,53,29,58
+on,off,off,off,off,any,58,58,41,58,58,58,41,58,53,53,29,58,53,53,29,58
+on,off,off,off,on,any,58,58,41,58,58,58,41,58,53,53,29,58,53,53,29,58
+on,off,off,on,off,any,58,58,41,58,58,58,41,58,53,53,29,58,53,53,29,58
+on,off,off,on,on,any,58,58,41,58,58,58,41,58,53,53,29,58,53,53,29,58
+on,off,on,off,off,any,58,58,41,58,58,58,41,58,53,53,29,58,53,53,29,58
+on,off,on,off,on,any,58,58,41,58,58,58,41,58,53,53,29,58,53,53,29,58
+on,off,on,on,off,any,58,58,41,58,58,58,41,58,53,53,29,58,53,53,29,58
+on,off,on,on,on,any,58,58,41,58,58,58,41,58,53,53,29,58,53,53,29,58
+on,on,off,off,off,any,58,58,41,58,58,58,41,58,53,53,29,58,53,53,29,58
+on,on,off,off,on,any,58,58,41,58,58,58,41,58,53,53,29,58,53,53,29,58
+on,on,off,on,off,any,58,58,41,58,58,58,41,58,53,53,29,58,53,53,29,58
+on,on,off,on,on,any,58,58,41,58,58,58,41,58,53,53,29,58,53,53,29,58
+on,on,on,off,off,any,58,58,41,58,58,58,41,58,53,53,29,58,53,53,29,58
+on,on,on,off,on,any,58,58,41,58,58,58,41,58,53,53,29,58,53,53,29,58
+on,on,on,on,off,any,58,58,41,58,58,58,41,58,53,53,29,58,53,53,29,58
+on,on,on,on,on,any,58,58,41,58,58,58,41,58,53,53,29,58,53,53,29,58
+off,off,any,off,any,off,66,66,41,62,66,66,41,65,53,53,29,58,53,53,29,58
+off,on,any,any,any,off,60,60,41,60,60,60,41,60,53,53,29,58,53,53,29,58
+off,any,any,on,any,off,60,60,41,60,60,60,41,60,53,53,29,58,53,53,29,58
\ No newline at end of file
diff --git a/bluetooth/bluetooth_power_limits_tokay_US.csv b/bluetooth/bluetooth_power_limits_tokay_US.csv
new file mode 100644
index 00000000..d119e468
--- /dev/null
+++ b/bluetooth/bluetooth_power_limits_tokay_US.csv
@@ -0,0 +1,36 @@
+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,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,off,off,off,on,on,70,68,70,70,70,68,70,70,70,68,70,70,70,68,70,70
+off,off,off,on,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,off,off,on,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,off,on,off,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,off,on,off,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,off,on,on,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,off,on,on,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,off,off,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,off,off,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,off,on,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,off,on,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,on,off,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,on,off,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,on,on,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,on,on,on,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+on,off,off,off,off,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,off,off,off,on,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,off,off,on,off,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,off,off,on,on,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,off,on,off,off,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,off,on,off,on,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,off,on,on,off,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,off,on,on,on,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,on,off,off,off,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,on,off,off,on,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,on,off,on,off,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,on,off,on,on,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,on,on,off,off,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,on,on,off,on,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,on,on,on,off,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+on,on,on,on,on,any,42,38,42,38,42,38,42,38,42,38,42,38,42,38,42,38
+off,off,any,off,any,off,76,68,76,76,76,68,76,76,76,68,76,76,76,68,76,76
+off,on,any,any,any,off,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
+off,any,any,on,any,off,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
\ No newline at end of file
diff --git a/conf/init.caiman.rc b/conf/init.caiman.rc
index 5fd9bc26..c63cfa7d 100644
--- a/conf/init.caiman.rc
+++ b/conf/init.caiman.rc
@@ -73,3 +73,9 @@ on property:sys.boot_completed=1
chown system input /dev/touch_offload
chmod 660 /dev/touch_offload
start twoshay
+
+# For Japan sku, always enforce camera shutter sound
+# Since this property is read by the audio server in system service,
+# it should be written by the system init.
+on property:ro.boot.hardware.sku=GWVK6
+ setprop audio.camerasound.force true
diff --git a/conf/init.komodo.rc b/conf/init.komodo.rc
index 3ea5e2b2..51d7027f 100644
--- a/conf/init.komodo.rc
+++ b/conf/init.komodo.rc
@@ -77,3 +77,9 @@ on property:sys.boot_completed=1
chown system input /dev/touch_offload
chmod 660 /dev/touch_offload
start twoshay
+
+# For Japan sku, always enforce camera shutter sound
+# Since this property is read by the audio server in system service,
+# it should be written by the system init.
+on property:ro.boot.hardware.sku=GQ57S
+ setprop audio.camerasound.force true
diff --git a/conf/init.tokay.rc b/conf/init.tokay.rc
index 40e95a6d..f0626726 100644
--- a/conf/init.tokay.rc
+++ b/conf/init.tokay.rc
@@ -75,3 +75,9 @@ on fs
# Permission for SSC mode enable
chown system system /sys/class/backlight/panel0-backlight/ssc_en
chmod 664 /sys/class/backlight/panel0-backlight/ssc_en
+
+# For Japan sku, always enforce camera shutter sound
+# Since this property is read by the audio server in system service,
+# it should be written by the system init.
+on property:ro.boot.hardware.sku=G1B60
+ setprop audio.camerasound.force true
diff --git a/device-caiman.mk b/device-caiman.mk
index ae844ab5..717f7913 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -24,9 +24,9 @@ RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR ?= 24D1# Keep this for pdk TODO: b/32711900
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR)
$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR))
-ifdef RELEASE_GOOGLE_CAIMAN_KERNEL_DIR
-TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_CAIMAN_KERNEL_DIR)
-TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_CAIMAN_KERNEL_DIR)/kernel-headers
+ifdef RELEASE_KERNEL_CAIMAN_DIR
+TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CAIMAN_DIR)
+TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CAIMAN_DIR)/kernel-headers
else
TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers
@@ -128,8 +128,11 @@ PRODUCT_PACKAGES += \
# Bluetooth Tx power caps
PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/bluetooth/bluetooth_power_limits.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \
- $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv
+ $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_caiman.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \
+ $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_caiman_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv \
+ $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_caiman_CA.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_CA.csv \
+ $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_caiman_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_EU.csv \
+ $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_caiman_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_US.csv
# DCK properties based on target
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/device-komodo.mk b/device-komodo.mk
index 75d1a585..c97ab223 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -24,9 +24,9 @@ RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR ?= 24D1# Keep this for pdk TODO: b/32711900
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR)
$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR))
-ifdef RELEASE_GOOGLE_KOMODO_KERNEL_DIR
-TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_KOMODO_KERNEL_DIR)
-TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_KOMODO_KERNEL_DIR)/kernel-headers
+ifdef RELEASE_KERNEL_KOMODO_DIR
+TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_KOMODO_DIR)
+TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_KOMODO_DIR)/kernel-headers
else
TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers
@@ -151,8 +151,11 @@ PRODUCT_PACKAGES += \
# Bluetooth Tx power caps
PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/bluetooth/bluetooth_power_limits.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \
- $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv
+ $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_komodo.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \
+ $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_komodo_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv \
+ $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_komodo_CA.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_CA.csv \
+ $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_komodo_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_EU.csv \
+ $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_komodo_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_US.csv
# DCK properties based on target
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/device-ripcurrent24.mk b/device-ripcurrent24.mk
index b0e6b854..e147a992 100644
--- a/device-ripcurrent24.mk
+++ b/device-ripcurrent24.mk
@@ -24,9 +24,9 @@ RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT24_DIR ?= 24D1# Keep this for pdk TODO: b/32
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT24_DIR)
$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT24_DIR))
-ifdef RELEASE_GOOGLE_RIPCURRENT24_KERNEL_DIR
-TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_RIPCURRENT24_KERNEL_DIR)
-TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_RIPCURRENT24_KERNEL_DIR)/kernel-headers
+ifdef RELEASE_KERNEL_RIPCURRENT24_DIR
+TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_RIPCURRENT24_DIR)
+TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_RIPCURRENT24_DIR)/kernel-headers
else
TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers
diff --git a/device-ripcurrentpro.mk b/device-ripcurrentpro.mk
index 1b517e6d..2871aa0e 100644
--- a/device-ripcurrentpro.mk
+++ b/device-ripcurrentpro.mk
@@ -24,9 +24,9 @@ RELEASE_GOOGLE_BOOTLOADER_RIPCURRENTPRO_DIR ?= 24D1# Keep this for pdk TODO: b/3
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENTPRO_DIR)
$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENTPRO_DIR))
-ifdef RELEASE_GOOGLE_RIPCURRENTPRO_KERNEL_DIR
-TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_RIPCURRENTPRO_KERNEL_DIR)
-TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_RIPCURRENTPRO_KERNEL_DIR)/kernel-headers
+ifdef RELEASE_KERNEL_RIPCURRENTPRO_DIR
+TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_RIPCURRENTPRO_DIR)
+TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_RIPCURRENTPRO_DIR)/kernel-headers
else
TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers
diff --git a/device-tokay.mk b/device-tokay.mk
index 72d2d780..49787ada 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -24,9 +24,9 @@ RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR ?= 24D1# Keep this for pdk TODO: b/327119000
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR)
$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR))
-ifdef RELEASE_GOOGLE_TOKAY_KERNEL_DIR
-TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_TOKAY_KERNEL_DIR)
-TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_TOKAY_KERNEL_DIR)/kernel-headers
+ifdef RELEASE_KERNEL_TOKAY_DIR
+TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_TOKAY_DIR)
+TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_TOKAY_DIR)/kernel-headers
else
TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers
@@ -121,8 +121,11 @@ PRODUCT_PACKAGES += \
# Bluetooth Tx power caps
PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/bluetooth/bluetooth_power_limits.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \
- $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv
+ $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_tokay.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \
+ $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_tokay_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv \
+ $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_tokay_CA.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_CA.csv \
+ $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_tokay_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_EU.csv \
+ $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_tokay_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_US.csv
# DCK properties based on target
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/location/caiman/user/gps.cfg b/location/caiman/user/gps.cfg
index f756cfeb..950f4564 100644
--- a/location/caiman/user/gps.cfg
+++ b/location/caiman/user/gps.cfg
@@ -1,3 +1,4 @@
+GlueLayer_IsUseNfwLocAccess=0
GlueLayer_ToolConfigSelection=3
debug_console=0
debug_enable=0
diff --git a/location/caiman/userdebug/gps.cfg b/location/caiman/userdebug/gps.cfg
index 523b35b9..d178e24a 100644
--- a/location/caiman/userdebug/gps.cfg
+++ b/location/caiman/userdebug/gps.cfg
@@ -1,3 +1,4 @@
+GlueLayer_IsUseNfwLocAccess=0
############################################
GlueLayer_ToolConfigSelection=3
user_ports_tcp_name=Autotest
diff --git a/location/komodo/user/gps.cfg b/location/komodo/user/gps.cfg
index 189a0986..290e724e 100644
--- a/location/komodo/user/gps.cfg
+++ b/location/komodo/user/gps.cfg
@@ -1,3 +1,4 @@
+GlueLayer_IsUseNfwLocAccess=0
GlueLayer_ToolConfigSelection=3
debug_console=0
debug_enable=0
diff --git a/location/komodo/userdebug/gps.cfg b/location/komodo/userdebug/gps.cfg
index cae080f1..d1ebe03f 100644
--- a/location/komodo/userdebug/gps.cfg
+++ b/location/komodo/userdebug/gps.cfg
@@ -1,3 +1,4 @@
+GlueLayer_IsUseNfwLocAccess=0
############################################
GlueLayer_ToolConfigSelection=3
user_ports_tcp_name=Autotest
diff --git a/location/ripcurrent24/user/gps.cfg b/location/ripcurrent24/user/gps.cfg
index 9ee0f5cc..46f564f2 100644
--- a/location/ripcurrent24/user/gps.cfg
+++ b/location/ripcurrent24/user/gps.cfg
@@ -1,3 +1,4 @@
+GlueLayer_IsUseNfwLocAccess=0
GlueLayer_ToolConfigSelection=3
debug_console=0
debug_enable=0
diff --git a/location/ripcurrent24/userdebug/gps.cfg b/location/ripcurrent24/userdebug/gps.cfg
index d21c4474..62ce7671 100644
--- a/location/ripcurrent24/userdebug/gps.cfg
+++ b/location/ripcurrent24/userdebug/gps.cfg
@@ -1,3 +1,4 @@
+GlueLayer_IsUseNfwLocAccess=0
############################################
GlueLayer_ToolConfigSelection=3
user_ports_tcp_name=Autotest
diff --git a/location/ripcurrentpro/user/gps.cfg b/location/ripcurrentpro/user/gps.cfg
index 9ee0f5cc..46f564f2 100644
--- a/location/ripcurrentpro/user/gps.cfg
+++ b/location/ripcurrentpro/user/gps.cfg
@@ -1,3 +1,4 @@
+GlueLayer_IsUseNfwLocAccess=0
GlueLayer_ToolConfigSelection=3
debug_console=0
debug_enable=0
diff --git a/location/ripcurrentpro/userdebug/gps.cfg b/location/ripcurrentpro/userdebug/gps.cfg
index d21c4474..62ce7671 100644
--- a/location/ripcurrentpro/userdebug/gps.cfg
+++ b/location/ripcurrentpro/userdebug/gps.cfg
@@ -1,3 +1,4 @@
+GlueLayer_IsUseNfwLocAccess=0
############################################
GlueLayer_ToolConfigSelection=3
user_ports_tcp_name=Autotest
diff --git a/location/tokay/user/gps.cfg b/location/tokay/user/gps.cfg
index a4ffcb57..94d01994 100644
--- a/location/tokay/user/gps.cfg
+++ b/location/tokay/user/gps.cfg
@@ -1,3 +1,4 @@
+GlueLayer_IsUseNfwLocAccess=0
GlueLayer_ToolConfigSelection=3
debug_console=0
debug_enable=0
diff --git a/location/tokay/userdebug/gps.cfg b/location/tokay/userdebug/gps.cfg
index dff542f6..723aa65e 100644
--- a/location/tokay/userdebug/gps.cfg
+++ b/location/tokay/userdebug/gps.cfg
@@ -1,3 +1,4 @@
+GlueLayer_IsUseNfwLocAccess=0
############################################
GlueLayer_ToolConfigSelection=3
user_ports_tcp_name=Autotest
diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json
index 70e0e788..9935bac3 100644
--- a/thermal/thermal_info_config_caiman.json
+++ b/thermal/thermal_info_config_caiman.json
@@ -282,7 +282,7 @@
"Formula": "COUNT_THRESHOLD",
"StepRatio": 0.2,
"Combination": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "VIRTUAL-SKIN-LEGACY-MODEL-DIFF"],
- "Coefficient": [7000, 7000],
+ "Coefficient": [10000, 7000],
"Multiplier": 1,
"PassiveDelay": 7000
},
diff --git a/thermal/thermal_info_config_komodo.json b/thermal/thermal_info_config_komodo.json
index 833ff372..50dec2aa 100644
--- a/thermal/thermal_info_config_komodo.json
+++ b/thermal/thermal_info_config_komodo.json
@@ -272,7 +272,7 @@
"Formula": "COUNT_THRESHOLD",
"StepRatio": 0.2,
"Combination": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "VIRTUAL-SKIN-LEGACY-MODEL-DIFF"],
- "Coefficient": [7000, 7000],
+ "Coefficient": [10000, 7000],
"Multiplier": 1,
"PassiveDelay": 7000
},
diff --git a/thermal/thermal_info_config_tokay.json b/thermal/thermal_info_config_tokay.json
index b1a03226..2bc4a373 100644
--- a/thermal/thermal_info_config_tokay.json
+++ b/thermal/thermal_info_config_tokay.json
@@ -261,7 +261,7 @@
"Formula": "COUNT_THRESHOLD",
"StepRatio": 0.2,
"Combination": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "VIRTUAL-SKIN-LEGACY-MODEL-DIFF"],
- "Coefficient": [7000, 7000],
+ "Coefficient": [10000, 7000],
"Multiplier": 1,
"PassiveDelay": 7000
},