diff options
author | Scott Randolph <randolphs@google.com> | 2017-06-22 17:05:28 -0700 |
---|---|---|
committer | Scott Randolph <randolphs@google.com> | 2017-06-22 17:05:28 -0700 |
commit | c529bcba1d63acbdf6ba2dce9eeafa6600667c55 (patch) | |
tree | b06fbeeef23c1cfd8e2e124eeaf344ce201f2863 | |
parent | a0a0d823c691a4e8f11d475a1913373880aa9542 (diff) | |
download | Car-c529bcba1d63acbdf6ba2dce9eeafa6600667c55.tar.gz |
Tweaks to reduce evs_app log spam.
Remove a few repetitive messages. Stop checking turn signal state after
first failure to query.
Test: Run on gordon peak
Change-Id: I6e49f52fffe6bd123df3b5511c2fca39823999c3
-rw-r--r-- | evs/app/EvsStateControl.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/evs/app/EvsStateControl.cpp b/evs/app/EvsStateControl.cpp index 79533f7f76..1a925e6bab 100644 --- a/evs/app/EvsStateControl.cpp +++ b/evs/app/EvsStateControl.cpp @@ -203,8 +203,6 @@ void EvsStateControl::updateLoop() { bool EvsStateControl::selectStateForCurrentConditions() { - ALOGV("selectStateForCurrentConditions"); - static int32_t sDummyGear = int32_t(VehicleGear::GEAR_REVERSE); static int32_t sDummySignal = int32_t(VehicleTurnSignal::NONE); @@ -214,9 +212,10 @@ bool EvsStateControl::selectStateForCurrentConditions() { ALOGE("GEAR_SELECTION not available from vehicle. Exiting."); return false; } - if (invokeGet(&mTurnSignalValue) != StatusCode::OK) { + if ((mTurnSignalValue.prop == 0) || (invokeGet(&mTurnSignalValue) != StatusCode::OK)) { // Silently treat missing turn signal state as no turn signal active mTurnSignalValue.value.int32Values.setToExternal(&sDummySignal, 1); + mTurnSignalValue.prop = 0; } } else { // While testing without a vehicle, behave as if we're in reverse for the first 20 seconds @@ -236,7 +235,7 @@ bool EvsStateControl::selectStateForCurrentConditions() { } // Choose our desired EVS state based on the current car state - // TODO: Update this logic, and include user input when choosing if a view should be presented + // TODO: Update this logic, and consider user input when choosing if a view should be presented State desiredState = OFF; if (mGearValue.value.int32Values[0] == int32_t(VehicleGear::GEAR_REVERSE)) { desiredState = REVERSE; @@ -248,16 +247,12 @@ bool EvsStateControl::selectStateForCurrentConditions() { desiredState = PARKING; } - ALOGD("Selected state %d.", desiredState); - // Apply the desire state return configureEvsPipeline(desiredState); } StatusCode EvsStateControl::invokeGet(VehiclePropValue *pRequestedPropValue) { - ALOGV("invokeGet"); - StatusCode status = StatusCode::TRY_AGAIN; // Call the Vehicle HAL, which will block until the callback is complete @@ -265,7 +260,9 @@ StatusCode EvsStateControl::invokeGet(VehiclePropValue *pRequestedPropValue) { [pRequestedPropValue, &status] (StatusCode s, const VehiclePropValue& v) { status = s; - *pRequestedPropValue = v; + if (s == StatusCode::OK) { + *pRequestedPropValue = v; + } } ); @@ -274,13 +271,12 @@ StatusCode EvsStateControl::invokeGet(VehiclePropValue *pRequestedPropValue) { bool EvsStateControl::configureEvsPipeline(State desiredState) { - ALOGV("configureEvsPipeline"); - if (mCurrentState == desiredState) { // Nothing to do here... return true; } + ALOGD("Switching to state %d.", desiredState); ALOGD(" Current state %d has %zu cameras", mCurrentState, mCameraList[mCurrentState].size()); ALOGD(" Desired state %d has %zu cameras", desiredState, |