diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-26 10:30:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-05-26 10:30:34 +0000 |
| commit | e7052ea794fd968edacb6762f1b9aecc5863968c (patch) | |
| tree | 653bec35d4e135f10f889ec819362e376a6d791c /vibrator | |
| parent | e46f290efe0bba926de3b908b3e6277f16891b32 (diff) | |
| parent | aca43ec13789699a5aac28d27c360e3255ed0307 (diff) | |
| download | bramble-e7052ea794fd968edacb6762f1b9aecc5863968c.tar.gz | |
Merge "vibrator: Add an initial value for non-motion vibration intensity" into rvc-d1-dev
Diffstat (limited to 'vibrator')
| -rw-r--r-- | vibrator/drv2624/Vibrator.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vibrator/drv2624/Vibrator.cpp b/vibrator/drv2624/Vibrator.cpp index 54a31cc..7a1069d 100644 --- a/vibrator/drv2624/Vibrator.cpp +++ b/vibrator/drv2624/Vibrator.cpp @@ -351,6 +351,10 @@ Vibrator::Vibrator(std::unique_ptr<HwApi> hwapi, std::unique_ptr<HwCal> hwcal) mHwCal->getSteadyAmpMax(&tempAmpMax) ? round((STEADY_TARGET_G[0] / tempAmpMax) * longVoltageMax) : longVoltageMax; + mSteadyTargetOdClamp[2] = + mHwCal->getSteadyAmpMax(&tempAmpMax) + ? round((STEADY_TARGET_G[2] / tempAmpMax) * longVoltageMax) + : longVoltageMax; } mHwCal->getSteadyShape(&shape); mSteadyConfig.reset(new VibrationConfig({ |