openkylin
/
device_google_redfin
mirror of https://gitee.com/openkylin/device_google_redfin.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge changes I0ac830e0,I66a7adf5 into rvc-d1-dev 

* changes:
  vibrator: Update 1st version haptics tuning result
  vibrator: Support external target G input
Change-Id: Ie7d4f9e73540e8bcf20613c672bcdeb5ed4d7135
Change-Id: I01ff138edf23ef071f0bdf3744e07a881d38e2aa
Change-Id: I3736554b5bcdb9f5df4bde9b2ea17f474cd37957
Change-Id: Ife37f1d9812bd3c5676f942172376020cdd24469
This commit is contained in:
Chase Wu 2020-04-28 08:20:19 +00:00 committed by Cyan_Hsieh
parent c4df36cf1e ccacf4a4ab
commit 92cb177678
5 changed files with 75 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
device-redfin.mk
View File

@ -126,9 +126,9 @@ PRODUCT_COPY_FILES += \
# Vibrator HAL
PRODUCT_PRODUCT_PROPERTIES +=\
ro.vibrator.hal.config.dynamic=1 \
ro.vibrator.hal.click.duration=8 \
ro.vibrator.hal.tick.duration=8 \
ro.vibrator.hal.heavyclick.duration=8 \
ro.vibrator.hal.click.duration=6 \
ro.vibrator.hal.tick.duration=6 \
ro.vibrator.hal.heavyclick.duration=6 \
ro.vibrator.hal.short.voltage=161 \
ro.vibrator.hal.long.voltage=161 \
ro.vibrator.hal.long.frequency.shift=10 \

16
vibrator/drv2624/Hardware.h
View File

@ -100,12 +100,14 @@ class HwCal : public Vibrator::HwCal, private HwCalBase {
static constexpr char AUTOCAL_CONFIG[] = "autocal";
static constexpr char LRA_PERIOD_CONFIG[] = "lra_period";
static constexpr char EFFECT_COEFF_CONFIG[] = "haptic_coefficient";
static constexpr char EFFECT_TARGET_G[] = "haptic_target_G";
static constexpr char STEADY_AMP_MAX_CONFIG[] = "vibration_amp_max";
static constexpr char STEADY_COEFF_CONFIG[] = "vibration_coefficient";
static constexpr char STEADY_TARGET_G[] = "vibration_target_G";
static constexpr uint32_t WAVEFORM_CLICK_EFFECT_MS = 6;
static constexpr uint32_t WAVEFORM_TICK_EFFECT_MS = 2;
static constexpr uint32_t WAVEFORM_DOUBLE_CLICK_EFFECT_MS = 160;
static constexpr uint32_t WAVEFORM_DOUBLE_CLICK_EFFECT_MS = 159;
static constexpr uint32_t WAVEFORM_HEAVY_CLICK_EFFECT_MS = 8;
static constexpr uint32_t DEFAULT_LRA_PERIOD = 262;
@ -130,6 +132,12 @@ class HwCal : public Vibrator::HwCal, private HwCalBase {
}
return false;
}
bool getEffectTargetG(std::array<float, 5> *value) override {
if (getPersist(EFFECT_TARGET_G, value)) {
return true;
}
return false;
}
bool getSteadyAmpMax(float *value) override {
if (getPersist(STEADY_AMP_MAX_CONFIG, value)) {
return true;
@ -142,6 +150,12 @@ class HwCal : public Vibrator::HwCal, private HwCalBase {
}
return false;
}
bool getSteadyTargetG(std::array<float, 3> *value) override {
if (getPersist(STEADY_TARGET_G, value)) {
return true;
}
return false;
}
bool getCloseLoopThreshold(uint32_t *value) override {
return getProperty("closeloop.threshold", value, UINT32_MAX);
return true;

84
vibrator/drv2624/Vibrator.cpp
View File

@ -59,8 +59,8 @@ static constexpr char WAVEFORM_DOUBLE_CLICK_EFFECT_SEQ[] = "3 0";
static constexpr char WAVEFORM_HEAVY_CLICK_EFFECT_SEQ[] = "4 0";
// UT team design those target G values
static constexpr std::array<float, 5> EFFECT_TARGET_G = {0.22, 0.35, 0.42, 0.57, 0.67};
static constexpr std::array<float, 3> STEADY_TARGET_G = {1.2, 1.145, 0.4};
static std::array<float, 5> EFFECT_TARGET_G = {0.15, 0.27, 0.32, 0.48, 0.62};
static std::array<float, 3> STEADY_TARGET_G = {1.2, 1.145, 0.4};
struct SensorContext {
ASensorEventQueue *queue;
@ -277,9 +277,8 @@ Vibrator::Vibrator(std::unique_ptr<HwApi> hwapi, std::unique_ptr<HwCal> hwcal)
: mHwApi(std::move(hwapi)), mHwCal(std::move(hwcal)) {
std::string autocal;
uint32_t lraPeriod = 0, lpTrigSupport = 0;
bool hasEffectCoeffs = false, hasSteadyCoeffs = false;
std::array<float, 4> effectCoeffs = {0};
std::array<float, 4> steadyCoeffs = {0};
std::array<float, 4> effectCoeffs = {0.0f};
std::array<float, 4> steadyCoeffs = {0.0f};
if (!mHwApi->setState(true)) {
ALOGE("Failed to set state (%d): %s", errno, strerror(errno));
@ -295,30 +294,38 @@ Vibrator::Vibrator(std::unique_ptr<HwApi> hwapi, std::unique_ptr<HwCal> hwcal)
if (mDynamicConfig) {
uint8_t i = 0;
float tempVolLevel = 0.0f;
float tempAmpMax = 0.0f;
uint32_t longFreqencyShift = 0;
uint32_t shortVoltageMax = 0, longVoltageMax = 0;
uint32_t shape = 0;
bool hasEffectCoeffs = false, hasSteadyCoeffs = false,
hasExternalEffectG = false, hasExternalSteadyG = false;
std::array<float, 5> externalEffectTargetG = {0.0f};
std::array<float, 3> externalSteadyTargetG = {0.0f};
float tempVolLevel = 0.0f, tempAmpMax = 0.0f;
uint32_t longFreqencyShift = 0, shortVoltageMax = 0, longVoltageMax = 0,
shape = 0;
mHwCal->getLongFrequencyShift(&longFreqencyShift);
mHwCal->getShortVoltageMax(&shortVoltageMax);
mHwCal->getLongVoltageMax(&longVoltageMax);
hasEffectCoeffs = mHwCal->getEffectCoeffs(&effectCoeffs);
hasExternalEffectG = mHwCal->getEffectTargetG(&externalEffectTargetG);
for (i = 0; i < 5; i++) {
if (hasEffectCoeffs) {
// Use linear approach to get the target voltage levels
if ((effectCoeffs[2] == 0) && (effectCoeffs[3] == 0)) {
tempVolLevel =
targetGToVlevelsUnderLinearEquation(effectCoeffs, EFFECT_TARGET_G[i]);
mEffectTargetOdClamp[i] = convertLevelsToOdClamp(tempVolLevel, lraPeriod);
} else {
// Use cubic approach to get the target voltage levels
tempVolLevel =
targetGToVlevelsUnderCubicEquation(effectCoeffs, EFFECT_TARGET_G[i]);
mEffectTargetOdClamp[i] = convertLevelsToOdClamp(tempVolLevel, lraPeriod);
}
if (hasExternalEffectG) {
EFFECT_TARGET_G[i] = externalEffectTargetG[i];
}
// Use linear approach to get the target voltage levels
if ((effectCoeffs[2] == 0) && (effectCoeffs[3] == 0)) {
tempVolLevel = targetGToVlevelsUnderLinearEquation(
effectCoeffs, EFFECT_TARGET_G[i]);
mEffectTargetOdClamp[i] =
convertLevelsToOdClamp(tempVolLevel, lraPeriod);
} else {
// Use cubic approach to get the target voltage levels
tempVolLevel = targetGToVlevelsUnderCubicEquation(
effectCoeffs, EFFECT_TARGET_G[i]);
mEffectTargetOdClamp[i] =
convertLevelsToOdClamp(tempVolLevel, lraPeriod);
}
} else {
mEffectTargetOdClamp[i] = shortVoltageMax;
}
@ -337,20 +344,30 @@ Vibrator::Vibrator(std::unique_ptr<HwApi> hwapi, std::unique_ptr<HwCal> hwcal)
}));
hasSteadyCoeffs = mHwCal->getSteadyCoeffs(&steadyCoeffs);
hasExternalSteadyG = mHwCal->getSteadyTargetG(&externalSteadyTargetG);
if (hasSteadyCoeffs) {
for (i = 0; i < 3; i++) {
// Use cubic approach to get the target voltage levels
tempVolLevel = targetGToVlevelsUnderCubicEquation(steadyCoeffs, STEADY_TARGET_G[i]);
mSteadyTargetOdClamp[i] = convertLevelsToOdClamp(tempVolLevel, lraPeriod);
if ((mSteadyTargetOdClamp[i] <= 0) || (mSteadyTargetOdClamp[i] > longVoltageMax)) {
mSteadyTargetOdClamp[i] = longVoltageMax;
}
if (hasExternalSteadyG) {
STEADY_TARGET_G[i] = externalSteadyTargetG[i];
}
// Use cubic approach to get the target voltage levels
tempVolLevel = targetGToVlevelsUnderCubicEquation(
steadyCoeffs, STEADY_TARGET_G[i]);
mSteadyTargetOdClamp[i] =
convertLevelsToOdClamp(tempVolLevel, lraPeriod);
if ((mSteadyTargetOdClamp[i] <= 0) ||
(mSteadyTargetOdClamp[i] > longVoltageMax)) {
mSteadyTargetOdClamp[i] = longVoltageMax;
}
}
} else {
mSteadyTargetOdClamp[0] =
mHwCal->getSteadyAmpMax(&tempAmpMax)
? round((STEADY_TARGET_G[0] / tempAmpMax) * longVoltageMax)
: longVoltageMax;
if (hasExternalSteadyG) {
STEADY_TARGET_G[0] = externalSteadyTargetG[0];
}
mSteadyTargetOdClamp[0] =
mHwCal->getSteadyAmpMax(&tempAmpMax)
? round((STEADY_TARGET_G[0] / tempAmpMax) * longVoltageMax)
: longVoltageMax;
}
mHwCal->getSteadyShape(&shape);
mSteadyConfig.reset(new VibrationConfig({
@ -498,6 +515,8 @@ binder_status_t Vibrator::dump(int fd, const char **args, uint32_t numArgs) {
dprintf(fd, " Steady Shape: %" PRIu32 "\n", mSteadyConfig->shape);
dprintf(fd, " Steady OD Clamp: %" PRIu32 " %" PRIu32 " %" PRIu32 "\n",
mSteadyConfig->odClamp[0], mSteadyConfig->odClamp[1], mSteadyConfig->odClamp[2]);
dprintf(fd, " Steady target G: %f %f %f\n", STEADY_TARGET_G[0],
STEADY_TARGET_G[1], STEADY_TARGET_G[2]);
dprintf(fd, " Steady OL LRA Period: %" PRIu32 "\n", mSteadyConfig->olLraPeriod);
}
if (mEffectConfig) {
@ -506,6 +525,9 @@ binder_status_t Vibrator::dump(int fd, const char **args, uint32_t numArgs) {
" Effect OD Clamp: %" PRIu32 " %" PRIu32 " %" PRIu32 " %" PRIu32 " %" PRIu32 "\n",
mEffectConfig->odClamp[0], mEffectConfig->odClamp[1], mEffectConfig->odClamp[2],
mEffectConfig->odClamp[3], mEffectConfig->odClamp[4]);
dprintf(fd, " Effect target G: %f %f %f %f %f\n", EFFECT_TARGET_G[0],
EFFECT_TARGET_G[1], EFFECT_TARGET_G[2], EFFECT_TARGET_G[3],
EFFECT_TARGET_G[4]);
dprintf(fd, " Effect OL LRA Period: %" PRIu32 "\n", mEffectConfig->olLraPeriod);
}
dprintf(fd, " Click Duration: %" PRIu32 "\n", mClickDuration);

4
vibrator/drv2624/Vibrator.h
View File

@ -94,10 +94,14 @@ class Vibrator : public BnVibrator {
virtual bool getLraPeriod(uint32_t *value) = 0;
// Obtains the effect coeffs to calculate the target voltage
virtual bool getEffectCoeffs(std::array<float, 4> *value) = 0;
// Obtains the external effect target G
virtual bool getEffectTargetG(std::array<float, 5> *value) = 0;
// Obtain the max steady G value
virtual bool getSteadyAmpMax(float *value) = 0;
// Obtains the steady coeffs to calculate the target voltage
virtual bool getSteadyCoeffs(std::array<float, 4> *value) = 0;
// Obtains the external steady target G
virtual bool getSteadyTargetG(std::array<float, 3> *value) = 0;
// Obtains threshold in ms, above which close-loop should be used.
virtual bool getCloseLoopThreshold(uint32_t *value) = 0;
// Obtains dynamic/static configuration choice.

BIN
vibrator/drv2624/drv2624.bin
View File

Binary file not shown.