Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba02cd2f authored by Mathias Agopian's avatar Mathias Agopian
Browse files

improve sensorservice's dumpsys 

it now displays the reported trigger mode properly, as well as
the number and type of the last received data

Change-Id: I2ff64b32ab71f1332bc2e09671c8c02bb9550490
parent cf90bad4

include/android/sensor.h

+14 −9
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ typedef struct ASensorEvent { 
    int32_t type;

    int32_t reserved0;

    int64_t timestamp;

    union {

        union {

            float           data[16];

            ASensorVector   vector;
@@ -122,7 +123,11 @@ typedef struct ASensorEvent { 
            float           distance;

            float           light;

            float           pressure;

        float           step_counter;

        };

        union {

            uint64_t        data[8];

            uint64_t        step_counter;

        } u64;

    };

    int32_t reserved1[4];

} ASensorEvent;

services/sensorservice/SensorDevice.cpp

+5 −9
Original line number Diff line number Diff line
@@ -65,30 +65,26 @@ SensorDevice::SensorDevice() 
    }

}



void SensorDevice::dump(String8& result, char* buffer, size_t SIZE)

void SensorDevice::dump(String8& result)

{

    if (!mSensorModule) return;

    sensor_t const* list;

    ssize_t count = mSensorModule->get_sensors_list(mSensorModule, &list);



    snprintf(buffer, SIZE, "%d h/w sensors:\n", int(count));

    result.append(buffer);

    result.appendFormat("%d h/w sensors:\n", int(count));



    Mutex::Autolock _l(mLock);

    for (size_t i=0 ; i<size_t(count) ; i++) {

        const Info& info = mActivationCount.valueFor(list[i].handle);

        snprintf(buffer, SIZE, "handle=0x%08x, active-count=%d, rates(ms)={ ",

        result.appendFormat("handle=0x%08x, active-count=%d, rates(ms)={ ",

                list[i].handle,

                info.rates.size());

        result.append(buffer);

        for (size_t j=0 ; j<info.rates.size() ; j++) {

            snprintf(buffer, SIZE, "%4.1f%s",

            result.appendFormat("%4.1f%s",

                    info.rates.valueAt(j) / 1e6f,

                    j<info.rates.size()-1 ? ", " : "");

            result.append(buffer);

        }

        snprintf(buffer, SIZE, " }, selected=%4.1f ms\n",  info.delay / 1e6f);

        result.append(buffer);

        result.appendFormat(" }, selected=%4.1f ms\n",  info.delay / 1e6f);

    }

}

services/sensorservice/SensorDevice.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ public: 
    status_t activate(void* ident, int handle, int enabled);

    status_t setDelay(void* ident, int handle, int64_t ns);

    status_t resetStateWithoutActuatingHardware(void *ident, int handle);

    void dump(String8& result, char* buffer, size_t SIZE);

    void dump(String8& result);

};



// ---------------------------------------------------------------------------

services/sensorservice/SensorFusion.cpp

+2 −3
Original line number Diff line number Diff line
@@ -136,9 +136,9 @@ int32_t SensorFusion::getMinDelay() const { 
    return mAcc.getMinDelay();

}



void SensorFusion::dump(String8& result, char* buffer, size_t SIZE) {

void SensorFusion::dump(String8& result) {

    const Fusion& fusion(mFusion);

    snprintf(buffer, SIZE, "9-axis fusion %s (%d clients), gyro-rate=%7.2fHz, "

    result.appendFormat("9-axis fusion %s (%d clients), gyro-rate=%7.2fHz, "

            "q=< %g, %g, %g, %g > (%g), "

            "b=< %g, %g, %g >\n",

            mEnabled ? "enabled" : "disabled",
@@ -152,7 +152,6 @@ void SensorFusion::dump(String8& result, char* buffer, size_t SIZE) { 
            fusion.getBias().x,

            fusion.getBias().y,

            fusion.getBias().z);

    result.append(buffer);

}



// ---------------------------------------------------------------------------

services/sensorservice/SensorFusion.h

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ public: 
    float getPowerUsage() const;

    int32_t getMinDelay() const;



    void dump(String8& result, char* buffer, size_t SIZE);

    void dump(String8& result);

};