From b2dde636dd08b5c6a987c1cdf17d94902d989ea8 Mon Sep 17 00:00:00 2001 From: SGCMarkus Date: Sat, 29 Oct 2022 19:53:43 +0200 Subject: [PATCH] eqs: sensors: implement and enable UDFPS sensor --- .../eqs/Frameworks/res/values/config.xml | 3 ++ sensors/Sensor.cpp | 50 ++++++++++--------- sensors/Sensor.h | 36 +++++++++++-- sensors/SensorsSubHal.cpp | 1 + 4 files changed, 63 insertions(+), 27 deletions(-) diff --git a/resource-overlay/eqs/Frameworks/res/values/config.xml b/resource-overlay/eqs/Frameworks/res/values/config.xml index b7fafeb..d251c63 100644 --- a/resource-overlay/eqs/Frameworks/res/values/config.xml +++ b/resource-overlay/eqs/Frameworks/res/values/config.xml @@ -278,4 +278,7 @@ org.lineageos.sensor.dt2w + + + org.lineageos.sensor.udfps diff --git a/sensors/Sensor.cpp b/sensors/Sensor.cpp index 0df0108..7d4edfe 100644 --- a/sensors/Sensor.cpp +++ b/sensors/Sensor.cpp @@ -22,7 +22,6 @@ #include #include -#include static bool readEvent(int fd, struct input_event *event) { int rc; @@ -227,24 +226,21 @@ OneShotSensor::OneShotSensor(int32_t sensorHandle, ISensorsEventCallback* callba mSensorInfo.flags |= SensorFlagBits::ONE_SHOT_MODE; } -#define INPUT_DT2W_SENSOR_PATH "/dev/input/event10" -#define INPUT_TOUCHSCREEN_PATH "/dev/input/event11" - -#define GESTURE_PATH "/sys/class/touchscreen/primary/gesture" - -InputEventDT2WSensor::InputEventDT2WSensor( - int32_t sensorHandle, ISensorsEventCallback* callback) +InputEventOneShotSensor::InputEventOneShotSensor( + int32_t sensorHandle, ISensorsEventCallback* callback, const std::string& pollPath, + const std::string& enablePath, int enableValue, short keyValue, const std::string& name, + const std::string& typeAsString, SensorType type) : OneShotSensor(sensorHandle, callback) { - mSensorInfo.name = "DT2W sensor"; - mSensorInfo.type = static_cast(static_cast(SensorType::DEVICE_PRIVATE_BASE) + 1); - mSensorInfo.typeAsString = "org.lineageos.sensor.dt2w"; + mSensorInfo.name = name; + mSensorInfo.type = type; + mSensorInfo.typeAsString = typeAsString; mSensorInfo.maxRange = 2048.0f; mSensorInfo.resolution = 1.0f; mSensorInfo.power = 0; mSensorInfo.flags |= SensorFlagBits::WAKE_UP; std::ofstream mGestureEnable; - mGestureEnable.open(GESTURE_PATH); + mGestureEnable.open(enablePath); if(!mGestureEnable) { ALOGE("could not open gesture path"); @@ -252,7 +248,7 @@ InputEventDT2WSensor::InputEventDT2WSensor( return; } - mGestureEnable << "49" << std::flush; + mGestureEnable << enableValue << std::flush; int rc; @@ -263,7 +259,7 @@ InputEventDT2WSensor::InputEventDT2WSensor( ALOGE("failed to open wait pipe: %d", rc); } - mPollFds[0] = open(INPUT_DT2W_SENSOR_PATH, O_RDONLY | O_NONBLOCK); + mPollFds[0] = open(pollPath.c_str(), O_RDONLY | O_NONBLOCK); if (mPollFds[0] < 0) { ALOGE("failed to open poll fd: %d", mPollFds[0]); } @@ -282,15 +278,17 @@ InputEventDT2WSensor::InputEventDT2WSensor( .fd = mPollFds[0], .events = POLLIN, }; + + mKeyValue = keyValue; } -InputEventDT2WSensor::~InputEventDT2WSensor() { +InputEventOneShotSensor::~InputEventOneShotSensor() { interruptPoll(); } -void InputEventDT2WSensor::activate(bool enable) { +void InputEventOneShotSensor::activate(bool enable) { std::lock_guard lock(mRunMutex); - + ALOGE("Activated for key %d", mKeyValue); if (mIsEnabled != enable) { mIsEnabled = enable; interruptPoll(); @@ -298,12 +296,12 @@ void InputEventDT2WSensor::activate(bool enable) { } } -void InputEventDT2WSensor::setOperationMode(OperationMode mode) { +void InputEventOneShotSensor::setOperationMode(OperationMode mode) { Sensor::setOperationMode(mode); interruptPoll(); } -void InputEventDT2WSensor::run() { +void InputEventOneShotSensor::run() { std::unique_lock runLock(mRunMutex); while (!mStopThread) { @@ -326,7 +324,7 @@ void InputEventDT2WSensor::run() { } if((mPolls[1].revents == mPolls[1].events) && readEvent(mPolls[1].fd, &event)) { - if(event.type == EV_KEY && event.value == 1 && event.code == KEY_F4) { + if(event.type == EV_KEY && event.value == 1 && event.code == mKeyValue) { mIsEnabled = false; mCallback->postEvents(readEvents(), isWakeUpSensor()); } @@ -337,21 +335,25 @@ void InputEventDT2WSensor::run() { } } -void InputEventDT2WSensor::interruptPoll() { +void InputEventOneShotSensor::interruptPoll() { if (mWaitPipeFd[1] < 0) return; char c = '1'; write(mWaitPipeFd[1], &c, sizeof(c)); } -std::vector InputEventDT2WSensor::readEvents() { +void InputEventOneShotSensor::fillEventData(Event& event) { + event.u.data[0] = 0; + event.u.data[1] = 0; +} + +std::vector InputEventOneShotSensor::readEvents() { std::vector events; Event event; event.sensorHandle = mSensorInfo.sensorHandle; event.sensorType = mSensorInfo.type; event.timestamp = ::android::elapsedRealtimeNano(); - event.u.data[0] = 0; - event.u.data[1] = 0; + fillEventData(event); events.push_back(event); return events; } diff --git a/sensors/Sensor.h b/sensors/Sensor.h index 436c419..68d9456 100644 --- a/sensors/Sensor.h +++ b/sensors/Sensor.h @@ -27,6 +27,7 @@ #include #include #include +#include using ::android::hardware::sensors::V1_0::OperationMode; using ::android::hardware::sensors::V1_0::Result; @@ -92,14 +93,18 @@ class OneShotSensor : public Sensor { virtual Result flush() override { return Result::BAD_VALUE; } }; -class InputEventDT2WSensor : public OneShotSensor { +class InputEventOneShotSensor : public OneShotSensor { public: - InputEventDT2WSensor(int32_t sensorHandle, ISensorsEventCallback* callback); - virtual ~InputEventDT2WSensor() override; + InputEventOneShotSensor(int32_t sensorHandle, ISensorsEventCallback* callback, + const std::string& pollPath, const std::string& enablePath, + int enableValue, short keyValue, const std::string& name, + const std::string& typeAsString, SensorType type); + virtual ~InputEventOneShotSensor() override; virtual void activate(bool enable) override; virtual void setOperationMode(OperationMode mode) override; virtual std::vector readEvents() override; + virtual void fillEventData(Event& event); protected: virtual void run() override; @@ -112,6 +117,31 @@ class InputEventDT2WSensor : public OneShotSensor { struct pollfd mPolls[2]; int mWaitPipeFd[2]; int mPollFds[1]; + short mKeyValue; +}; + +const std::string kDoubleTapInputEventPath = "/dev/input/event10"; +const std::string kGestureEnablePath = "/sys/class/touchscreen/primary/gesture"; + +const int kEnableDt2w = 49; +const int kEnableFodPressed = 17; + +class InputEventDT2WSensor : public InputEventOneShotSensor { + public: + InputEventDT2WSensor(int32_t sensorHandle, ISensorsEventCallback* callback) + : InputEventOneShotSensor( + sensorHandle, callback, kDoubleTapInputEventPath, + kGestureEnablePath, kEnableDt2w, KEY_F4, "DT2W sensor", + "org.lineageos.sensor.dt2w", static_cast(static_cast(SensorType::DEVICE_PRIVATE_BASE) + 1)) {} +}; + +class InputEventUdfpsSensor : public InputEventOneShotSensor { + public: + InputEventUdfpsSensor(int32_t sensorHandle, ISensorsEventCallback* callback) + : InputEventOneShotSensor( + sensorHandle, callback, kDoubleTapInputEventPath, + kGestureEnablePath, kEnableFodPressed, KEY_F2, "UDFPS sensor", + "org.lineageos.sensor.udfps", static_cast(static_cast(SensorType::DEVICE_PRIVATE_BASE) + 2)) {} }; } // namespace implementation diff --git a/sensors/SensorsSubHal.cpp b/sensors/SensorsSubHal.cpp index 0e638a4..089e379 100644 --- a/sensors/SensorsSubHal.cpp +++ b/sensors/SensorsSubHal.cpp @@ -34,6 +34,7 @@ using ::android::hardware::sensors::V2_0::implementation::ScopedWakelock; SensorsSubHal::SensorsSubHal() : mCallback(nullptr), mNextHandle(1) { AddSensor(); + AddSensor(); } Return SensorsSubHal::getSensorsList_2_1(ISensors::getSensorsList_2_1_cb _hidl_cb) {