diff options
| author | cjh1249131356 <cjh1249131356@gmail.com> | 2022-03-04 13:34:00 +0300 |
|---|---|---|
| committer | Semavi Ulusoy <doc.divxm@gmail.com> | 2022-03-04 23:28:12 +0300 |
| commit | b88e0a4b7da730cea03679972b6501ef06b3ad21 (patch) | |
| tree | e9f28f541c3d66a1f6c2b77382a6fa896fb06f7a | |
| parent | 709d9612668c441389eacc41c23533f7b985fc83 (diff) | |
sm8250-common: vibrator: Update vibration effects
* Best result for me after hours test :)
Also add back THUD effect.
Signed-off-by: cjh1249131356 <cjh1249131356@gmail.com>
Change-Id: I50ce7b8eb196b5608495c920de5b73782efb4703
| -rw-r--r-- | aidl/vibrator/Vibrator.cpp | 53 |
1 files changed, 29 insertions, 24 deletions
diff --git a/aidl/vibrator/Vibrator.cpp b/aidl/vibrator/Vibrator.cpp index 2cc09c0..fc6115b 100644 --- a/aidl/vibrator/Vibrator.cpp +++ b/aidl/vibrator/Vibrator.cpp @@ -79,54 +79,63 @@ 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, "8" }, + { DURATION_PATH, "60" }, { VMAX_PATH, "0x1f" }, - { GAIN_PATH, "0x70" }, - { SEQ_PATH, "0x00 0x01" }, + { GAIN_PATH, "0x96" }, + { SEQ_PATH, "0x00 0x03" }, { LOOP_PATH, "0x00 0x00" }, { BRIGHTNESS_PATH, "1" }, }}, { Effect::DOUBLE_CLICK, { { IGNORE_STORE_PATH, "0" }, - { DURATION_PATH, "13" }, + { DURATION_PATH, "80" }, { VMAX_PATH, "0x1f" }, - { GAIN_PATH, "0x80" }, - { SEQ_PATH, "0x00 0x01" }, + { GAIN_PATH, "0x96" }, + { SEQ_PATH, "0x00 0x03" }, { LOOP_PATH, "0x00 0x00" }, { BRIGHTNESS_PATH, "1" }, { "SLEEP", "150" }, { IGNORE_STORE_PATH, "0" }, - { DURATION_PATH, "13" }, + { DURATION_PATH, "75" }, { VMAX_PATH, "0x1f" }, - { GAIN_PATH, "0x80" }, - { SEQ_PATH, "0x00 0x01" }, + { GAIN_PATH, "0x96" }, + { SEQ_PATH, "0x00 0x03" }, { LOOP_PATH, "0x00 0x00" }, { BRIGHTNESS_PATH, "1" }, }}, { Effect::TICK, { { IGNORE_STORE_PATH, "0" }, - { DURATION_PATH, "5" }, + { DURATION_PATH, "30" }, { VMAX_PATH, "0x1f" }, - { GAIN_PATH, "0x29" }, - { SEQ_PATH, "0x00 0x01" }, + { GAIN_PATH, "0x80" }, + { 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" }, + { SEQ_PATH, "0x00 0x03" }, { LOOP_PATH, "0x00 0x00" }, { BRIGHTNESS_PATH, "1" }, }}, { Effect::POP, { { IGNORE_STORE_PATH, "0" }, - { DURATION_PATH, "13" }, + { DURATION_PATH, "60" }, { VMAX_PATH, "0x1f" }, - { GAIN_PATH, "0x80" }, - { SEQ_PATH, "0x00 0x04" }, + { GAIN_PATH, "0x96" }, + { SEQ_PATH, "0x00 0x03" }, { LOOP_PATH, "0x00 0x00" }, { BRIGHTNESS_PATH, "1" }, }}, { Effect::HEAVY_CLICK, { { IGNORE_STORE_PATH, "0" }, - { DURATION_PATH, "30" }, + { DURATION_PATH, "100" }, { VMAX_PATH, "0x1f" }, - { GAIN_PATH, "0x80" }, - { SEQ_PATH, "0x00 0x05" }, + { GAIN_PATH, "0x96" }, + { SEQ_PATH, "0x00 0x03" }, { LOOP_PATH, "0x00 0x00" }, { BRIGHTNESS_PATH, "1" }, }} @@ -623,12 +632,8 @@ ndk::ScopedAStatus Vibrator::perform(Effect effect, EffectStrength es, const std } ndk::ScopedAStatus Vibrator::getSupportedEffects(std::vector<Effect>* _aidl_return) { - if (ledVib.mDetected) { - *_aidl_return = {Effect::CLICK, Effect::DOUBLE_CLICK, Effect::TICK, Effect::HEAVY_CLICK}; - } else { - *_aidl_return = {Effect::CLICK, Effect::DOUBLE_CLICK, Effect::TICK, Effect::THUD, - Effect::POP, Effect::HEAVY_CLICK}; - } + *_aidl_return = {Effect::CLICK, Effect::DOUBLE_CLICK, Effect::TICK, Effect::THUD, + Effect::POP, Effect::HEAVY_CLICK}; return ndk::ScopedAStatus::ok(); } |