From 12fcd01d96c811c819b31104274a40b57dbbdb14 Mon Sep 17 00:00:00 2001 From: jabashque Date: Wed, 9 Nov 2022 03:43:15 +0000 Subject: [PATCH] vibrator: Redo LedVibratorDevice effects and vibrator timeout handling For aw8697_haptic, OOS 12 never really properly implemented any effect other than CLICK and HEAVY_CLICK. Let's implement our own TEXTURE_TICK, TICK, CLICK, and HEAVY_CLICK so that the user can actually feel a noticeable difference between each haptic effect. As a quick summary: - CLICK: same as oplus CLICK, but with vmax set to 2500. - DOUBLE_CLICK: replaced with our CLICK played twice in a row, w/ a 100ms delay - TICK: same as oplus CLICK, but with vmax set to 1400. - HEAVY_CLICK: same as oplus CLICK, but with vmax set to 2500 and waveform_index set to 4. - TEXTURE_TICK: same as oplus CLICK, but with vmax set to 60 and waveform_index set to 2. In addition, modify LedVibratorDevice's on() to better reflect the timeout duration actually being passed in to the function. The original tried to change waveforms instead for various durations at 102 ms or lower, which didn't really work out in practice for our vibrator. Change-Id: Ifb769bc2292774afa4977026787a7882430c09d0 --- aidl/vibrator/Vibrator.cpp | 71 ++++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 33 deletions(-) diff --git a/aidl/vibrator/Vibrator.cpp b/aidl/vibrator/Vibrator.cpp index 7151d4a..8d2d65e 100644 --- a/aidl/vibrator/Vibrator.cpp +++ b/aidl/vibrator/Vibrator.cpp @@ -373,18 +373,19 @@ int LedVibratorDevice::write_value(const char *file, int value) { int LedVibratorDevice::on(int32_t timeoutMs) { int ret = 0; - if (timeoutMs <= 12) { - ret |= onWaveform(7); - } else if (timeoutMs <= 52) { - ret |= onWaveform(2); - } else if (timeoutMs <= 102) { - ret |= onWaveform(6); + if (timeoutMs <= 0) { + return ret; + } else if (timeoutMs <= 20) { + ret |= write_value(LED_DEVICE "/vmax", timeoutMs * 10); } else { - ret |= write_value(LED_DEVICE "/duration", timeoutMs); - ret |= write_value(LED_DEVICE "/state", "1"); - ret |= write_value(LED_DEVICE "/activate", "1"); - ret |= write_value(LED_DEVICE "/activate", "0"); + ret |= write_value(LED_DEVICE "/vmax", 1600); } + ret |= write_value(LED_DEVICE "/waveform_index", 7); + ret |= write_value(LED_DEVICE "/duration", timeoutMs); + ret |= write_value(LED_DEVICE "/state", "1"); + ret |= write_value(LED_DEVICE "/activate", "1"); + ret |= write_value(LED_DEVICE "/activate", "0"); + return ret; } @@ -479,41 +480,44 @@ ndk::ScopedAStatus Vibrator::perform(Effect effect, EffectStrength es, const std switch (effect) { case Effect::CLICK: ledVib.write_value(LED_DEVICE "/rtp", "0"); - ledVib.write_value(LED_DEVICE "/vmax", "1600"); + ledVib.write_value(LED_DEVICE "/vmax", "2500"); ledVib.write_value(LED_DEVICE "/waveform_index", "1"); ledVib.write_value(LED_DEVICE "/brightness", "1"); ledVib.write_value(LED_DEVICE "/rtp", "0"); break; case Effect::DOUBLE_CLICK: + ledVib.write_value(LED_DEVICE "/rtp", "0"); + ledVib.write_value(LED_DEVICE "/vmax", "2500"); ledVib.write_value(LED_DEVICE "/waveform_index", "1"); - ledVib.write_value(LED_DEVICE "/vmax", "1600"); - ledVib.write_value(LED_DEVICE "/duration", "30"); - ledVib.write_value(LED_DEVICE "/state", "1"); - ledVib.write_value(LED_DEVICE "/activate", "1"); - ledVib.write_value(LED_DEVICE "/activate", "0"); - usleep(150 * 1000); - ledVib.write_value(LED_DEVICE "/duration", "30"); - ledVib.write_value(LED_DEVICE "/state", "1"); - ledVib.write_value(LED_DEVICE "/activate", "1"); - ledVib.write_value(LED_DEVICE "/activate", "0"); + ledVib.write_value(LED_DEVICE "/brightness", "1"); + ledVib.write_value(LED_DEVICE "/rtp", "0"); + usleep(100 * 1000); + ledVib.write_value(LED_DEVICE "/rtp", "0"); + ledVib.write_value(LED_DEVICE "/vmax", "2500"); + ledVib.write_value(LED_DEVICE "/waveform_index", "1"); + ledVib.write_value(LED_DEVICE "/brightness", "1"); + ledVib.write_value(LED_DEVICE "/rtp", "0"); break; case Effect::TICK: ledVib.write_value(LED_DEVICE "/rtp", "0"); - ledVib.write_value(LED_DEVICE "/vmax", "80"); - ledVib.write_value(LED_DEVICE "/waveform_index", "2"); + ledVib.write_value(LED_DEVICE "/vmax", "1400"); + ledVib.write_value(LED_DEVICE "/waveform_index", "1"); ledVib.write_value(LED_DEVICE "/brightness", "1"); ledVib.write_value(LED_DEVICE "/rtp", "0"); break; case Effect::HEAVY_CLICK: - ledVib.write_value(LED_DEVICE "/waveform_index", "1"); - ledVib.write_value(LED_DEVICE "/vmax", "1600"); - ledVib.write_value(LED_DEVICE "/duration", "1"); - ledVib.write_value(LED_DEVICE "/state", "1"); - ledVib.write_value(LED_DEVICE "/activate", "1"); - ledVib.write_value(LED_DEVICE "/duration", "24"); - ledVib.write_value(LED_DEVICE "/state", "1"); - ledVib.write_value(LED_DEVICE "/activate", "1"); - ledVib.write_value(LED_DEVICE "/activate", "0"); + ledVib.write_value(LED_DEVICE "/rtp", "0"); + ledVib.write_value(LED_DEVICE "/vmax", "2500"); + ledVib.write_value(LED_DEVICE "/waveform_index", "4"); + ledVib.write_value(LED_DEVICE "/brightness", "1"); + ledVib.write_value(LED_DEVICE "/rtp", "0"); + break; + case Effect::TEXTURE_TICK: + ledVib.write_value(LED_DEVICE "/rtp", "0"); + ledVib.write_value(LED_DEVICE "/vmax", "60"); + ledVib.write_value(LED_DEVICE "/waveform_index", "2"); + ledVib.write_value(LED_DEVICE "/brightness", "1"); + ledVib.write_value(LED_DEVICE "/rtp", "0"); break; default: return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION)); @@ -553,7 +557,8 @@ ndk::ScopedAStatus Vibrator::perform(Effect effect, EffectStrength es, const std ndk::ScopedAStatus Vibrator::getSupportedEffects(std::vector* _aidl_return) { if (ledVib.mDetected) { - *_aidl_return = {Effect::CLICK, Effect::DOUBLE_CLICK, Effect::TICK, Effect::HEAVY_CLICK}; + *_aidl_return = {Effect::CLICK, Effect::DOUBLE_CLICK, Effect::TICK, Effect::HEAVY_CLICK, + Effect::TEXTURE_TICK}; } else { #ifdef TARGET_SUPPORTS_OFFLOAD *_aidl_return = {Effect::CLICK, Effect::DOUBLE_CLICK, Effect::TICK, Effect::THUD,