From b48ee789e08a67e33bb027157d123ebb68911107 Mon Sep 17 00:00:00 2001 From: cff-gite Date: Wed, 25 Sep 2024 17:27:55 +0800 Subject: [PATCH 1/2] Example Modify the stop interface of the motor Signed-off-by: cff-gite Change-Id: Iffb895ec351b1325b20d7ac3ea9bd9ccdc0e6286 --- services/miscdevice_service/src/vibrator_thread.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/services/miscdevice_service/src/vibrator_thread.cpp b/services/miscdevice_service/src/vibrator_thread.cpp index 283259f..fa9871b 100644 --- a/services/miscdevice_service/src/vibrator_thread.cpp +++ b/services/miscdevice_service/src/vibrator_thread.cpp @@ -76,10 +76,10 @@ int32_t VibratorThread::PlayOnce(const VibrateInfo &info) return ERROR; } cv_.wait_for(vibrateLck, std::chrono::milliseconds(info.duration), [this] { return exitFlag_.load(); }); -#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR - VibratorDevice.Stop(HDF_VIBRATOR_MODE_ONCE); -#endif // HDF_DRIVERS_INTERFACE_VIBRATOR if (exitFlag_) { + #ifdef HDF_DRIVERS_INTERFACE_VIBRATOR + VibratorDevice.Stop(HDF_VIBRATOR_MODE_ONCE); + #endif // HDF_DRIVERS_INTERFACE_VIBRATOR MISC_HILOGD("Stop duration:%{public}d, package:%{public}s", info.duration, info.packageName.c_str()); return SUCCESS; } @@ -97,10 +97,10 @@ int32_t VibratorThread::PlayEffect(const VibrateInfo &info) return ERROR; } cv_.wait_for(vibrateLck, std::chrono::milliseconds(info.duration), [this] { return exitFlag_.load(); }); -#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR - VibratorDevice.Stop(HDF_VIBRATOR_MODE_PRESET); -#endif // HDF_DRIVERS_INTERFACE_VIBRATOR if (exitFlag_) { + #ifdef HDF_DRIVERS_INTERFACE_VIBRATOR + VibratorDevice.Stop(HDF_VIBRATOR_MODE_PRESET); + #endif // HDF_DRIVERS_INTERFACE_VIBRATOR MISC_HILOGD("Stop effect:%{public}s, package:%{public}s", effect.c_str(), info.packageName.c_str()); return SUCCESS; } -- Gitee From 6446828f18dc4dbb5ca5ffad73aa1bd7bc08d024 Mon Sep 17 00:00:00 2001 From: cff-gite Date: Thu, 26 Sep 2024 11:23:54 +0800 Subject: [PATCH 2/2] Example Modify the stop interface of the motor Signed-off-by: cff-gite Change-Id: Ife991be3d91a1681a6d1adb142b7f60bfa6c19b0 --- services/miscdevice_service/src/vibrator_thread.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/services/miscdevice_service/src/vibrator_thread.cpp b/services/miscdevice_service/src/vibrator_thread.cpp index fa9871b..45e48c9 100644 --- a/services/miscdevice_service/src/vibrator_thread.cpp +++ b/services/miscdevice_service/src/vibrator_thread.cpp @@ -77,9 +77,9 @@ int32_t VibratorThread::PlayOnce(const VibrateInfo &info) } cv_.wait_for(vibrateLck, std::chrono::milliseconds(info.duration), [this] { return exitFlag_.load(); }); if (exitFlag_) { - #ifdef HDF_DRIVERS_INTERFACE_VIBRATOR - VibratorDevice.Stop(HDF_VIBRATOR_MODE_ONCE); - #endif // HDF_DRIVERS_INTERFACE_VIBRATOR +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR + VibratorDevice.Stop(HDF_VIBRATOR_MODE_ONCE); +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR MISC_HILOGD("Stop duration:%{public}d, package:%{public}s", info.duration, info.packageName.c_str()); return SUCCESS; } @@ -98,9 +98,9 @@ int32_t VibratorThread::PlayEffect(const VibrateInfo &info) } cv_.wait_for(vibrateLck, std::chrono::milliseconds(info.duration), [this] { return exitFlag_.load(); }); if (exitFlag_) { - #ifdef HDF_DRIVERS_INTERFACE_VIBRATOR - VibratorDevice.Stop(HDF_VIBRATOR_MODE_PRESET); - #endif // HDF_DRIVERS_INTERFACE_VIBRATOR +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR + VibratorDevice.Stop(HDF_VIBRATOR_MODE_PRESET); +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR MISC_HILOGD("Stop effect:%{public}s, package:%{public}s", effect.c_str(), info.packageName.c_str()); return SUCCESS; } -- Gitee