From 51fcd6acedf5292b68f8583f8ff0f7b326d36e98 Mon Sep 17 00:00:00 2001 From: sunxuejiao Date: Tue, 8 Mar 2022 12:28:53 +0800 Subject: [PATCH 1/3] Sync code to OpenHarmony-3.1-Release Signed-off-by: sunxuejiao --- sensor/v1_0/ISensorInterface.idl | 8 ++--- sensor/v1_0/SensorTypes.idl | 53 ++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/sensor/v1_0/ISensorInterface.idl b/sensor/v1_0/ISensorInterface.idl index 0524106c..31e9f513 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 2d44d9a2..96b72968 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*/ +}; -- Gitee From 6e65358558eaf743160ba4b53f8ba36ba3c431ae Mon Sep 17 00:00:00 2001 From: zhouyanxu Date: Thu, 14 Apr 2022 16:22:53 +0800 Subject: [PATCH 2/3] Update light hcs lightId Signed-off-by: zhouyanxu --- light/v1_0.7z | Bin 0 -> 2058 bytes light/v1_0/LightTypes.idl | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100755 light/v1_0.7z diff --git a/light/v1_0.7z b/light/v1_0.7z new file mode 100755 index 0000000000000000000000000000000000000000..6f2ca544bf1309c03bbef826fd7d490096b77a32 GIT binary patch literal 2058 zcmV+l2=(_jdc3bE8~_B-?GZZ12LJ#70000Z0000000014!q~jv8zBb~T>ue?1nAk} zDSxux&LXecPI)H@w*RmqfSTXR_d9Q{ncPHd)uAlnr^pPXI}PsGl61b9euIO| zQ*j?1ODUgB@6v(M>n#fHnHseJkB*-rFo1SkJ>pOc>G*jA4XkeQf=N)Pu_yUp3tn5= z9}Y5u;d!=aInQ*jrxDJmmjORsm-Ut_iH@Vt?y7u{*tMzd@}q3o|24EcpoZG<63^wO z&r96s{Q#1fhV#gCzK99-)V-s+bY3iRSlFMz3_yfA$Z?}a-~_RSj}R(AEwu(N<#q8j z%kK*e?|;gcjNUfha?<|#$y1NJH6{U{=bXq4YuP6wQ({4JTmAf$mfRCBd>6S_6xj;Z>6 zi(3LLl5(aOCD>XMjae>oT^O$DZm%@~U5URC%$H+ka!89KY^*_-Xt!Sn(Wc`0g=?41 zUSM}y9JMK^`r4_itX_F8qw;kx)Rb#wavrG;h$lR;mxv5SfNZxq$WLF9fcls*-rpdP zMG(IY#L{6-m&lnqLj4Hc7Q5pw+AuW?-48X3W*07G)}nFfD~=lQs}BOyB0j>X zc1%@JQrzKQHeB2r;5}@J8v#tm7mZ{5x#@ritY(i`QRm%%WXH&JJ}%QI3s(anj-?Ze zw$ka95VjDQW;v=gg~@>w>ldPYIKatxr$hcX{Zx;cw}7GgamYe zdAKYW23?mnK>rsAk&j#0{E%aA>16e!|BATZ zoKQuEP7GlXmJOJYe^Iz^8{@3~F7d4`DfUC6@g#Xf$la;K8A>l}B7E8)RL$;~l5V#1tXVqD@UIlCVKSq&I+soBfVMW` z=MyQAr<;Xzwdbzl}+V4wa9Wqao-5 z0Ep_r?7NDaktI)3FatWO=%&}3Y6IAivC?i|V#FM=xe_Nne^Zta4w~C!nIoN_0of*# zlp4NHV7^xyT3czKo_-8B%Xl*PBi5a~UTN=`o#XPb`a%wz8W(wmT_3!E zKvKg1pz1acD?;C%zFJ{*nK!=k+?v{^orj)f{&_ z6X5KyML6SC;VnJOfpG3kH`*9fc&Th2_x=X>7hr~#QMUjX1~}mJ&T+S@=b*NDK-E3^ z Date: Thu, 14 Apr 2022 16:23:53 +0800 Subject: [PATCH 3/3] Update light hcs lightId Signed-off-by: zhouyanxu --- light/v1_0.7z | Bin 2058 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100755 light/v1_0.7z diff --git a/light/v1_0.7z b/light/v1_0.7z deleted file mode 100755 index 6f2ca544bf1309c03bbef826fd7d490096b77a32..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2058 zcmV+l2=(_jdc3bE8~_B-?GZZ12LJ#70000Z0000000014!q~jv8zBb~T>ue?1nAk} zDSxux&LXecPI)H@w*RmqfSTXR_d9Q{ncPHd)uAlnr^pPXI}PsGl61b9euIO| zQ*j?1ODUgB@6v(M>n#fHnHseJkB*-rFo1SkJ>pOc>G*jA4XkeQf=N)Pu_yUp3tn5= z9}Y5u;d!=aInQ*jrxDJmmjORsm-Ut_iH@Vt?y7u{*tMzd@}q3o|24EcpoZG<63^wO z&r96s{Q#1fhV#gCzK99-)V-s+bY3iRSlFMz3_yfA$Z?}a-~_RSj}R(AEwu(N<#q8j z%kK*e?|;gcjNUfha?<|#$y1NJH6{U{=bXq4YuP6wQ({4JTmAf$mfRCBd>6S_6xj;Z>6 zi(3LLl5(aOCD>XMjae>oT^O$DZm%@~U5URC%$H+ka!89KY^*_-Xt!Sn(Wc`0g=?41 zUSM}y9JMK^`r4_itX_F8qw;kx)Rb#wavrG;h$lR;mxv5SfNZxq$WLF9fcls*-rpdP zMG(IY#L{6-m&lnqLj4Hc7Q5pw+AuW?-48X3W*07G)}nFfD~=lQs}BOyB0j>X zc1%@JQrzKQHeB2r;5}@J8v#tm7mZ{5x#@ritY(i`QRm%%WXH&JJ}%QI3s(anj-?Ze zw$ka95VjDQW;v=gg~@>w>ldPYIKatxr$hcX{Zx;cw}7GgamYe zdAKYW23?mnK>rsAk&j#0{E%aA>16e!|BATZ zoKQuEP7GlXmJOJYe^Iz^8{@3~F7d4`DfUC6@g#Xf$la;K8A>l}B7E8)RL$;~l5V#1tXVqD@UIlCVKSq&I+soBfVMW` z=MyQAr<;Xzwdbzl}+V4wa9Wqao-5 z0Ep_r?7NDaktI)3FatWO=%&}3Y6IAivC?i|V#FM=xe_Nne^Zta4w~C!nIoN_0of*# zlp4NHV7^xyT3czKo_-8B%Xl*PBi5a~UTN=`o#XPb`a%wz8W(wmT_3!E zKvKg1pz1acD?;C%zFJ{*nK!=k+?v{^orj)f{&_ z6X5KyML6SC;VnJOfpG3kH`*9fc&Th2_x=X>7hr~#QMUjX1~}mJ&T+S@=b*NDK-E3^ z