sm8250-common: vibrator: Update vibration effects

Squashed commit from:
1. vibrator: Update vibration effects from 8T/9R: https://github.com/Project-Zephyrus/android_device_oneplus_sm8250-common/commit/8706e4ce6a3ea845141964145fe13043ef69cb1c
2. vibrator: Update effect pop and thud duration: https://github.com/Project-Zephyrus/android_device_oneplus_sm8250-common/commit/47c12de312ee7a70934cff9656f7fb8ee597f941
3. vibrator: Update sleep duration for EFFECT_DOUBLE_CLICK: https://github.com/Project-Zephyrus/android_device_oneplus_sm8250-common/commit/ee7dc6496648d95486fc0170204aee395e074ef1

Change-Id: I3c701ec8c41762eee44b70fbdaeb77622fa58d93

1 files changed, 30 insertions, 30 deletions

diff --git a/aidl/vibrator/Vibrator.cpp b/aidl/vibrator/Vibrator.cpp
index fc6115b..c74b675 100644
--- a/aidl/vibrator/Vibrator.cpp
+++ b/aidl/vibrator/Vibrator.cpp
@@ -79,62 +79,62 @@ static const char LED_DEVICE[] = "/sys/class/leds/vibrator";
 static std::map<Effect, std::vector<std::pair<std::string, std::string>>> LED_EFFECTS{
     { Effect::CLICK, {
         { IGNORE_STORE_PATH, "0" },
-        { DURATION_PATH, "60" },
-        { VMAX_PATH, "0x1f" },
-        { GAIN_PATH, "0x96" },
+        { DURATION_PATH, "10" },
+        { VMAX_PATH, "0x16" },
+        { GAIN_PATH, "0x77" },
         { SEQ_PATH, "0x00 0x03" },
         { LOOP_PATH, "0x00 0x00" },
         { BRIGHTNESS_PATH, "1" },
     }},
     { Effect::DOUBLE_CLICK, {
         { IGNORE_STORE_PATH, "0" },
-        { DURATION_PATH, "80" },
-        { VMAX_PATH, "0x1f" },
-        { GAIN_PATH, "0x96" },
-        { SEQ_PATH, "0x00 0x03" },
+        { DURATION_PATH, "13" },
+        { VMAX_PATH, "0x16" },
+        { GAIN_PATH, "0x77" },
+        { SEQ_PATH, "0x00 0x05" },
         { LOOP_PATH, "0x00 0x00" },
         { BRIGHTNESS_PATH, "1" },
-        { "SLEEP", "150" },
+        { "SLEEP", "100" },
         { IGNORE_STORE_PATH, "0" },
-        { DURATION_PATH, "75" },
-        { VMAX_PATH, "0x1f" },
-        { GAIN_PATH, "0x96" },
-        { SEQ_PATH, "0x00 0x03" },
+        { DURATION_PATH, "13" },
+        { VMAX_PATH, "0x16" },
+        { GAIN_PATH, "0x77" },
+        { SEQ_PATH, "0x00 0x05" },
         { LOOP_PATH, "0x00 0x00" },
         { BRIGHTNESS_PATH, "1" },
     }},
     { Effect::TICK, {
         { IGNORE_STORE_PATH, "0" },
         { DURATION_PATH, "30" },
-        { VMAX_PATH, "0x1f" },
-        { GAIN_PATH, "0x80" },
+        { VMAX_PATH, "0x16" },
+        { GAIN_PATH, "0x77" },
         { SEQ_PATH, "0x00 0x03" },
         { LOOP_PATH, "0x00 0x00" },
         { BRIGHTNESS_PATH, "1" },
     }},
     { Effect::THUD, {
         { IGNORE_STORE_PATH, "0" },
-        { DURATION_PATH, "60" },
-        { VMAX_PATH, "0x1f" },
-        { GAIN_PATH, "0x96" },
+        { DURATION_PATH, "40" },
+        { VMAX_PATH, "0x16" },
+        { GAIN_PATH, "0x77" },
         { SEQ_PATH, "0x00 0x03" },
         { LOOP_PATH, "0x00 0x00" },
         { BRIGHTNESS_PATH, "1" },
     }},
     { Effect::POP, {
         { IGNORE_STORE_PATH, "0" },
-        { DURATION_PATH, "60" },
-        { VMAX_PATH, "0x1f" },
-        { GAIN_PATH, "0x96" },
+        { DURATION_PATH, "13" },
+        { VMAX_PATH, "0x16" },
+        { GAIN_PATH, "0x77" },
         { SEQ_PATH, "0x00 0x03" },
         { LOOP_PATH, "0x00 0x00" },
         { BRIGHTNESS_PATH, "1" },
     }},
     { Effect::HEAVY_CLICK, {
         { IGNORE_STORE_PATH, "0" },
-        { DURATION_PATH, "100" },
-        { VMAX_PATH, "0x1f" },
-        { GAIN_PATH, "0x96" },
+        { DURATION_PATH, "10" },
+        { VMAX_PATH, "0x16" },
+        { GAIN_PATH, "0x77" },
         { SEQ_PATH, "0x00 0x03" },
         { LOOP_PATH, "0x00 0x00" },
         { BRIGHTNESS_PATH, "1" },
@@ -147,7 +147,7 @@ static std::vector<std::vector<std::pair<std::string, std::string>>> VIBRATOR_CO
         { DURATION_PATH, "0" },         // placeholder
         { SEQ_PATH, "0x00 0x01" },
         { GAIN_PATH, "0" },             // placeholder
-        { VMAX_PATH, "0x1f" },
+        { VMAX_PATH, "0x16" },
         { LOOP_PATH, "0x00 0x00" },
         { BRIGHTNESS_PATH, "1" },
     },
@@ -156,7 +156,7 @@ static std::vector<std::vector<std::pair<std::string, std::string>>> VIBRATOR_CO
         { DURATION_PATH, "0" },         // placeholder
         { SEQ_PATH, "0x00 0x02" },
         { GAIN_PATH, "0" },             // placeholder
-        { VMAX_PATH, "0x1f" },
+        { VMAX_PATH, "0x16" },
         { LOOP_PATH, "0x00 0x00" },
         { BRIGHTNESS_PATH, "1" },
     },
@@ -165,15 +165,15 @@ static std::vector<std::vector<std::pair<std::string, std::string>>> VIBRATOR_CO
         { DURATION_PATH, "0" },         // placeholder
         { SEQ_PATH, "0x00 0x03" },
         { GAIN_PATH, "0" },             // placeholder
-        { VMAX_PATH, "0x1f" },
+        { VMAX_PATH, "0x16" },
         { LOOP_PATH, "0x00 0x00" },
         { BRIGHTNESS_PATH, "1" },
     },
     {   // 100ms+
         { IGNORE_STORE_PATH, "0\n" },
         { DURATION_PATH, "0" },         // placeholder
-        { VMAX_PATH, "0x1f" },
-        { GAIN_PATH, "0x80" },
+        { VMAX_PATH, "0x16" },
+        { GAIN_PATH, "0x60" },
         { ACTIVATE_PATH, "1" },
     }
 };
@@ -485,8 +485,8 @@ int LedVibratorDevice::on(int32_t timeoutMs) {
     int index = (timeoutMs < 81) ? 0 : (timeoutMs < 91) ? 1 :
                 (timeoutMs < 101) ? 2 : 3;
     int gain = 4 + 1.24*timeoutMs;
-    if (gain > 128) {
-        gain = 128;             // 0x80
+    if (gain > 119) {
+        gain = 119;             // 0x77
     }
     ALOGD("QTI Vibrator on for %d ms with a gain of 0x%x", timeoutMs, gain);
     for (const auto &[path, value] : VIBRATOR_CONSTANTS[index]) {