diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2022-10-17 06:25:19 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2022-10-17 06:25:19 -0700 |
| commit | 8bfebba860b2372071c4cd7ad33fecee29a8527a (patch) | |
| tree | b7d0c68a3094e9b8c3c6c4d4a97d333682a762b9 | |
| parent | cf075a6077ba7aa554c8ac5437a0901c4189d684 (diff) | |
| parent | 77bceb0beb3de931bc3296db2a9104cc8d75c50f (diff) | |
Merge 77bceb0beb3de931bc3296db2a9104cc8d75c50f on remote branch
Change-Id: Ie71cecbfc01e502a9972ce42123288314a57cfb7
| -rw-r--r-- | modules/sensors/dynamic_sensor/HidRawSensor.cpp | 5 | ||||
| -rw-r--r-- | modules/sensors/dynamic_sensor/HidRawSensor.h | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/modules/sensors/dynamic_sensor/HidRawSensor.cpp b/modules/sensors/dynamic_sensor/HidRawSensor.cpp index 3759e7e9..c90f4f1a 100644 --- a/modules/sensors/dynamic_sensor/HidRawSensor.cpp +++ b/modules/sensors/dynamic_sensor/HidRawSensor.cpp @@ -1066,7 +1066,10 @@ bool HidRawSensor::getHeadTrackerEventData(const std::vector<uint8_t> &message, bool HidRawSensor::getSensorEventData(const std::vector<uint8_t> &message, sensors_event_t *event) { for (const auto &rec : mTranslateTable) { - int64_t v = (message[rec.byteOffset + rec.byteSize - 1] & 0x80) ? -1 : 0; + int64_t v = 0; + if (rec.minValue < 0) { + v = (message[rec.byteOffset + rec.byteSize - 1] & 0x80) ? -1 : 0; + } for (int i = static_cast<int>(rec.byteSize) - 1; i >= 0; --i) { v = (v << 8) | message[rec.byteOffset + i]; // HID is little endian } diff --git a/modules/sensors/dynamic_sensor/HidRawSensor.h b/modules/sensors/dynamic_sensor/HidRawSensor.h index 074482a8..e4564a0f 100644 --- a/modules/sensors/dynamic_sensor/HidRawSensor.h +++ b/modules/sensors/dynamic_sensor/HidRawSensor.h @@ -154,9 +154,11 @@ private: bool getReportFieldValue(const std::vector<uint8_t> &message, ReportTranslateRecord* rec, ValueType* value) { bool valid = true; - int64_t v; + int64_t v = 0; + if (rec->minValue < 0) { + v = (message[rec->byteOffset + rec->byteSize - 1] & 0x80) ? -1 : 0; + } - v = (message[rec->byteOffset + rec->byteSize - 1] & 0x80) ? -1 : 0; for (int i = static_cast<int>(rec->byteSize) - 1; i >= 0; --i) { v = (v << 8) | message[rec->byteOffset + i]; // HID is little endian } |