diff --git a/sensor/v1_0/ISensorInterface.idl b/sensor/v1_0/ISensorInterface.idl index 0524106c66f87106c32e18ad93b89eb2d03f95a2..31e9f51376e58b1242c401e50250a40fdf9906fe 100644 --- a/sensor/v1_0/ISensorInterface.idl +++ b/sensor/v1_0/ISensorInterface.idl @@ -129,22 +129,22 @@ interface ISensorInterface { /** * @brief Registers the callback for reporting sensor data to the subscriber. * - * @param sensorId Indicates the sensor ID. For details, see {@link SensorTypeTag}. + * @param groupId Indicates the sensor group ID. * @param callbackObj Indicates the callback to register. For details, see {@link ISensorCallback}. * @return Returns 0 if the callback is successfully registered; returns a negative value otherwise. * * @since 2.2 * @version 1.0 */ - Register([in] int sensorId, [in] ISensorCallback callbackObj); + Register([in] int groupId, [in] ISensorCallback callbackObj); /** * @brief Deregisters the callback for reporting sensor data. - * @param sensorId Indicates the sensor ID. For details, see {@link SensorTypeTag}. + * @param groupId Indicates the sensor group ID. * @return Returns 0 if the callback is successfully deregistered; returns a negative value otherwise. * * @since 2.2 * @version 1.0 */ - Unregister([in] int sensorId, [in] ISensorCallback callbackObj); + Unregister([in] int groupId, [in] ISensorCallback callbackObj); } diff --git a/sensor/v1_0/SensorTypes.idl b/sensor/v1_0/SensorTypes.idl index 2d44d9a2f2eb1b12bcecb894c50514a55f5d49bd..96b72968c79d6d0ec56c1fc243672c641f48df37 100644 --- a/sensor/v1_0/SensorTypes.idl +++ b/sensor/v1_0/SensorTypes.idl @@ -76,3 +76,56 @@ struct HdfSensorEvents { unsigned char[] data; /**< Sensor data vector */ unsigned int dataLen; /**< Sensor data length */ }; + +/** + * @brief Enumerates sensor types. + * + * @since 2.2 + */ +enum HdfSensorTypeTag { + HDF_SENSOR_TYPE_NONE = 0, /**< None, for testing only */ + HDF_SENSOR_TYPE_ACCELEROMETER = 1, /**< Acceleration sensor */ + HDF_SENSOR_TYPE_GYROSCOPE = 2, /**< Gyroscope sensor */ + HDF_SENSOR_TYPE_PHOTOPLETHYSMOGRAPH = 3, /**< Photoplethysmography sensor */ + HDF_SENSOR_TYPE_ELECTROCARDIOGRAPH = 4, /**< Electrocardiogram (ECG) sensor */ + HDF_SENSOR_TYPE_AMBIENT_LIGHT = 5, /**< Ambient light sensor */ + HDF_SENSOR_TYPE_MAGNETIC_FIELD = 6, /**< Magnetic field sensor */ + HDF_SENSOR_TYPE_CAPACITIVE = 7, /**< Capacitive sensor */ + HDF_SENSOR_TYPE_BAROMETER = 8, /**< Barometric pressure sensor */ + HDF_SENSOR_TYPE_TEMPERATURE = 9, /**< Temperature sensor */ + HDF_SENSOR_TYPE_HALL = 10, /**< Hall effect sensor */ + HDF_SENSOR_TYPE_GESTURE = 11, /**< Gesture sensor */ + HDF_SENSOR_TYPE_PROXIMITY = 12, /**< Proximity sensor */ + HDF_SENSOR_TYPE_HUMIDITY = 13, /**< Humidity sensor */ + HDF_SENSOR_TYPE_MEDICAL_BEGIN = 128, /**< The begin of medical sensorId enumeration value range */ + HDF_SENSOR_TYPE_MEDICAL_END = 160, /**< The end of medical sensorId enumeration value range */ + HDF_SENSOR_TYPE_PHYSICAL_MAX = 255, /**< Maximum type of a physical sensor */ + HDF_SENSOR_TYPE_ORIENTATION = 256, /**< Orientation sensor */ + HDF_SENSOR_TYPE_GRAVITY = 257, /**< Gravity sensor */ + HDF_SENSOR_TYPE_LINEAR_ACCELERATION = 258, /**< Linear acceleration sensor */ + HDF_SENSOR_TYPE_ROTATION_VECTOR = 259, /**< Rotation vector sensor */ + HDF_SENSOR_TYPE_AMBIENT_TEMPERATURE = 260, /**< Ambient temperature sensor */ + HDF_SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED = 261, /**< Uncalibrated magnetic field sensor */ + HDF_SENSOR_TYPE_GAME_ROTATION_VECTOR = 262, /**< Game rotation vector sensor */ + HDF_SENSOR_TYPE_GYROSCOPE_UNCALIBRATED = 263, /**< Uncalibrated gyroscope sensor */ + HDF_SENSOR_TYPE_SIGNIFICANT_MOTION = 264, /**< Significant motion sensor */ + HDF_SENSOR_TYPE_PEDOMETER_DETECTION = 265, /**< Pedometer detection sensor */ + HDF_SENSOR_TYPE_PEDOMETER = 266, /**< Pedometer sensor */ + HDF_SENSOR_TYPE_GEOMAGNETIC_ROTATION_VECTOR = 277, /**< Geomagnetic rotation vector sensor */ + HDF_SENSOR_TYPE_HEART_RATE = 278, /**< Heart rate sensor */ + HDF_SENSOR_TYPE_DEVICE_ORIENTATION = 279, /**< Device orientation sensor */ + HDF_SENSOR_TYPE_WEAR_DETECTION = 280, /**< Wear detection sensor */ + HDF_SENSOR_TYPE_ACCELEROMETER_UNCALIBRATED = 281, /**< Uncalibrated acceleration sensor */ + HDF_SENSOR_TYPE_MAX, /**< Maximum number of sensor types */ +}; + +/** + * @brief Enumerates hardware service group for sensors + * + * @since 2.2 + */ +enum HdfSensorGroupType { + HDF_TRADITIONAL_SENSOR_TYPE = 0, /**< traditional sensor type, the sensorId enumeration value range is 128-160 */ + HDF_MEDICAL_SENSOR_TYPE = 1, /**< medical sensor type, the sensorId enumeration value range is not within 128-160 */ + HDF_SENSOR_GROUP_TYPE_MAX, /**< Maximum sensor group type*/ +};