From 5f311e6a7f09af8e320693d040ab3a0e99cbb69b Mon Sep 17 00:00:00 2001 From: Jan Altensen Date: Fri, 4 Oct 2019 05:08:20 +0200 Subject: [PATCH] sdm710-common: camera_motor: dont calibrate * we have no calibration data available and our "defaults" are wrong Change-Id: I6c5eabc90a7d62b68aa5895a56c5aee1caaa4c04 --- camera_motor/CameraMotor.cpp | 9 --------- camera_motor/CameraMotor.h | 2 -- 2 files changed, 11 deletions(-) diff --git a/camera_motor/CameraMotor.cpp b/camera_motor/CameraMotor.cpp index e315251..285b467 100644 --- a/camera_motor/CameraMotor.cpp +++ b/camera_motor/CameraMotor.cpp @@ -25,12 +25,9 @@ #define CAMERA_MOTOR_ENABLE "/sys/devices/platform/vendor/vendor:motor_pl/enable" #define CAMERA_MOTOR_DIRECTION "/sys/devices/platform/vendor/vendor:motor_pl/direction" -#define CAMERA_MOTOR_HALL_CALIBRATION "/sys/bus/platform/devices/vendor:motor_pl/hall_calibration" #define CAMERA_MOTOR_POSITION "/sys/devices/platform/vendor/vendor:motor_pl/position" -#define CAMERA_PERSIST_HALL_CALIBRATION "/mnt/vendor/persist/engineermode/hall_calibration" #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" @@ -84,12 +81,6 @@ static void waitUntilFileChange(const std::string& path, const std::string &val, } } -CameraMotor::CameraMotor() { - // Load motor hall calibration data - set(CAMERA_MOTOR_HALL_CALIBRATION, - get(CAMERA_PERSIST_HALL_CALIBRATION, HALL_CALIBRATION_DEFAULT)); -} - Return CameraMotor::onConnect(const hidl_string& cameraId) { auto motorPosition = get(CAMERA_MOTOR_POSITION, ""); diff --git a/camera_motor/CameraMotor.h b/camera_motor/CameraMotor.h index adb3928..fbe04b5 100644 --- a/camera_motor/CameraMotor.h +++ b/camera_motor/CameraMotor.h @@ -31,8 +31,6 @@ using ::android::hardware::Void; class CameraMotor : public ICameraMotor { public: - CameraMotor(); - Return onConnect(const hidl_string& cameraId) override; Return onDisconnect(const hidl_string& cameraId) override; };