From 8ccb6900799482b630a21ec4dcb59c81c088cb5e Mon Sep 17 00:00:00 2001 From: Jan Altensen Date: Thu, 3 Oct 2019 18:36:49 +0200 Subject: [PATCH] sdm710-common: camera_motor: handle mid position state * oppo_motor gets initialized with position in "MID_STATE" Change-Id: I5bbe50b20910f9ea9950caa081577c7216ed8b06 --- camera_motor/CameraMotor.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/camera_motor/CameraMotor.cpp b/camera_motor/CameraMotor.cpp index 227cee6..e315251 100644 --- a/camera_motor/CameraMotor.cpp +++ b/camera_motor/CameraMotor.cpp @@ -31,6 +31,7 @@ #define DIRECTION_DOWN "0" #define DIRECTION_UP "1" #define HALL_CALIBRATION_DEFAULT "170,170,480,0,0,480,500,0,0,500,1500" +#define POSITION_MID "2" #define POSITION_DOWN "1" #define POSITION_UP "0" #define ENABLED "1" @@ -92,7 +93,7 @@ CameraMotor::CameraMotor() { Return CameraMotor::onConnect(const hidl_string& cameraId) { auto motorPosition = get(CAMERA_MOTOR_POSITION, ""); - if (cameraId == CAMERA_ID_FRONT && motorPosition == POSITION_DOWN) { + if (cameraId == CAMERA_ID_FRONT && (motorPosition == POSITION_DOWN || motorPosition == POSITION_MID)) { LOG(INFO) << "Popping out front camera"; set(CAMERA_MOTOR_DIRECTION, DIRECTION_UP);