From 57d510977276629ec3ef3d45bad8ade38501e071 Mon Sep 17 00:00:00 2001 From: yyl Date: Thu, 11 Jan 2024 01:16:01 +0000 Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yyl --- sensors/miscdevice/vibrator/include/vibrator.h | 10 ++++++---- sensors/miscdevice/vibrator/include/vibrator_type.h | 5 ++--- sensors/sensor/oh_sensor.h | 1 + sensors/sensor/oh_sensor_type.h | 3 ++- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/sensors/miscdevice/vibrator/include/vibrator.h b/sensors/miscdevice/vibrator/include/vibrator.h index 0dd94c32023..bcf5a7468e5 100644 --- a/sensors/miscdevice/vibrator/include/vibrator.h +++ b/sensors/miscdevice/vibrator/include/vibrator.h @@ -35,12 +35,14 @@ #include "vibrator_type.h" +#include + #ifdef __cplusplus extern "C" { #endif -namespace OHOS { -namespace Sensors { +namespace ohos { +namespace sensors { /** * @brief Controls the vibrator to vibrate continuously for a given duration. * @@ -80,8 +82,8 @@ int32_t OH_Vibrator_PlayVibrationCustom(Vibrator_FileDescription fileDescription * @since 11 */ int32_t OH_Vibrator_Cancel(); -} // namespace Sensors -} // namespace OHOS +} // namespace sensors +} // namespace ohos #ifdef __cplusplus }; #endif diff --git a/sensors/miscdevice/vibrator/include/vibrator_type.h b/sensors/miscdevice/vibrator/include/vibrator_type.h index 9be871278d3..991a6bf14d2 100644 --- a/sensors/miscdevice/vibrator/include/vibrator_type.h +++ b/sensors/miscdevice/vibrator/include/vibrator_type.h @@ -16,7 +16,7 @@ #ifndef VIBRATOR_TYPE_H #define VIBRATOR_TYPE_H -#include +#include #ifdef __cplusplus extern "C" { @@ -83,9 +83,8 @@ typedef struct Vibrator_FileDescription { /**< Total length of the custom vibration sequence. */ int64_t length; } Vibrator_FileDescription; -/** @} */ #ifdef __cplusplus -}; +} #endif #endif // endif VIBRATOR_TYPE_H \ No newline at end of file diff --git a/sensors/sensor/oh_sensor.h b/sensors/sensor/oh_sensor.h index ee0d78c6a15..2f63c219789 100644 --- a/sensors/sensor/oh_sensor.h +++ b/sensors/sensor/oh_sensor.h @@ -96,4 +96,5 @@ Sensor_Result OH_Sensor_Unsubscribe(const Sensor_SubscriptionId *id, const Senso #ifdef __cplusplus } #endif +/** @} */ #endif // OH_SENSOR_H \ No newline at end of file diff --git a/sensors/sensor/oh_sensor_type.h b/sensors/sensor/oh_sensor_type.h index f8ca2c4db3c..51c232af6c9 100644 --- a/sensors/sensor/oh_sensor_type.h +++ b/sensors/sensor/oh_sensor_type.h @@ -34,7 +34,7 @@ #ifndef OH_SENSOR_TYPE_H #define OH_SENSOR_TYPE_H -#include +#include #ifdef __cplusplus extern "C" { @@ -493,4 +493,5 @@ int32_t OH_SensorSubscriber_GetCallback(Sensor_Subscriber* subscriber, Sensor_Ev #ifdef __cplusplus } #endif +/** @} */ #endif // OH_SENSOR_TYPE_H \ No newline at end of file -- Gitee From 3fc38fa0d246e3550877efdb7645fa8924ca4ba2 Mon Sep 17 00:00:00 2001 From: yyl Date: Thu, 11 Jan 2024 01:20:56 +0000 Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=8F=90=E4=BA=A41?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yyl --- sensors/miscdevice/vibrator/include/vibrator.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sensors/miscdevice/vibrator/include/vibrator.h b/sensors/miscdevice/vibrator/include/vibrator.h index bcf5a7468e5..90657c0ed9c 100644 --- a/sensors/miscdevice/vibrator/include/vibrator.h +++ b/sensors/miscdevice/vibrator/include/vibrator.h @@ -85,7 +85,7 @@ int32_t OH_Vibrator_Cancel(); } // namespace sensors } // namespace ohos #ifdef __cplusplus -}; +} #endif /** @} */ #endif // endif VIBRATOR_H \ No newline at end of file -- Gitee From 308788a1954f07cdb59fa0d6a905eb3c2c730f9d Mon Sep 17 00:00:00 2001 From: yang123 Date: Fri, 12 Jan 2024 07:16:55 +0000 Subject: [PATCH 3/5] update sensors/miscdevice/vibrator/include/vibrator.h. Signed-off-by: yang123 --- sensors/miscdevice/vibrator/include/vibrator.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sensors/miscdevice/vibrator/include/vibrator.h b/sensors/miscdevice/vibrator/include/vibrator.h index 90657c0ed9c..7cfc1a96932 100644 --- a/sensors/miscdevice/vibrator/include/vibrator.h +++ b/sensors/miscdevice/vibrator/include/vibrator.h @@ -41,8 +41,6 @@ extern "C" { #endif -namespace ohos { -namespace sensors { /** * @brief Controls the vibrator to vibrate continuously for a given duration. * @@ -82,8 +80,6 @@ int32_t OH_Vibrator_PlayVibrationCustom(Vibrator_FileDescription fileDescription * @since 11 */ int32_t OH_Vibrator_Cancel(); -} // namespace sensors -} // namespace ohos #ifdef __cplusplus } #endif -- Gitee From 9686681b6189eeeeb36cee9e2d512b17e1a635db Mon Sep 17 00:00:00 2001 From: yang123 Date: Fri, 12 Jan 2024 08:24:08 +0000 Subject: [PATCH 4/5] update sensors/miscdevice/vibrator/include/vibrator.h. Signed-off-by: yang123 --- sensors/miscdevice/vibrator/include/vibrator.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sensors/miscdevice/vibrator/include/vibrator.h b/sensors/miscdevice/vibrator/include/vibrator.h index 7cfc1a96932..9ecc597266f 100644 --- a/sensors/miscdevice/vibrator/include/vibrator.h +++ b/sensors/miscdevice/vibrator/include/vibrator.h @@ -41,6 +41,8 @@ extern "C" { #endif +namespace OHOS { +namespace Sensors { /** * @brief Controls the vibrator to vibrate continuously for a given duration. * @@ -80,6 +82,8 @@ int32_t OH_Vibrator_PlayVibrationCustom(Vibrator_FileDescription fileDescription * @since 11 */ int32_t OH_Vibrator_Cancel(); +} // namespace Sensors +} // namespace OHOS #ifdef __cplusplus } #endif -- Gitee From 1418d96309a7fbbea0a9d606024f0db8b715f71b Mon Sep 17 00:00:00 2001 From: yang123 Date: Wed, 17 Jan 2024 07:11:42 +0000 Subject: [PATCH 5/5] update sensors/miscdevice/vibrator/include/vibrator.h. Signed-off-by: yang123 --- sensors/miscdevice/vibrator/include/vibrator.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sensors/miscdevice/vibrator/include/vibrator.h b/sensors/miscdevice/vibrator/include/vibrator.h index 9ecc597266f..74c61e51fcf 100644 --- a/sensors/miscdevice/vibrator/include/vibrator.h +++ b/sensors/miscdevice/vibrator/include/vibrator.h @@ -35,8 +35,6 @@ #include "vibrator_type.h" -#include - #ifdef __cplusplus extern "C" { #endif -- Gitee