Merge "vibrator: Add an initial value for non-motion vibration intensity" into rvc-d1-dev

Change-Id: I07fa931e44e316e7a1511a5a3cc5f38f7032a0e9
Change-Id: I545530b3d98b8f0c81dc3b2d925e423e27e72dfb
Change-Id: I4f4874d92fbecf338a4f15b526e98d1423d96436
Change-Id: Iee4bcc97fb8f22841dd5762c04bc8a1a3e9db756
Change-Id: I622e02c9d21d563d6337d129aed3920dddc12415
This commit is contained in:
TreeHugger Robot 2020-05-26 10:30:34 +00:00 committed by Cyan_Hsieh
commit abe7c51aec
1 changed files with 5 additions and 0 deletions

View File

@ -363,11 +363,16 @@ Vibrator::Vibrator(std::unique_ptr<HwApi> hwapi, std::unique_ptr<HwCal> hwcal)
} else {
if (hasExternalSteadyG) {
STEADY_TARGET_G[0] = externalSteadyTargetG[0];
STEADY_TARGET_G[2] = externalSteadyTargetG[2];
}
mSteadyTargetOdClamp[0] =
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({