From 10cf27c40e0b847ad0b436b406a5bd578d49f203 Mon Sep 17 00:00:00 2001 From: junkyu han Date: Tue, 1 Nov 2016 20:49:36 +0900 Subject: [PATCH] Change vibration pattern Change-Id: I802364bd31e1ddf129498fd2b24df35bcbe81b67 --- src/control.c | 4 ++-- src/key_event.c | 40 ++++++++++++++++++++-------------------- src/timer.c | 20 ++++++++++---------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/control.c b/src/control.c index 3d18ecd..4e942e6 100755 --- a/src/control.c +++ b/src/control.c @@ -47,11 +47,11 @@ struct _control_s_info{ Eina_Bool reset_once; Eina_Bool show_once; Eina_Bool safety_limit; - Eina_Bool time_for_safety_limit; int current_angle; int viewport_width; int viewport_height; + int time_for_safety_limit; sound_type_e sound_type_at_show; }; @@ -65,11 +65,11 @@ static struct _control_s_info control_info = { .reset_once = EINA_FALSE, .show_once = EINA_FALSE, .safety_limit = EINA_TRUE, - .time_for_safety_limit = EINA_TRUE, .current_angle = 0, .viewport_width = 0, .viewport_height= 0, + .time_for_safety_limit = 0, .sound_type_at_show = SOUND_TYPE_RINGTONE, }; diff --git a/src/key_event.c b/src/key_event.c index 82816bb..d9004d2 100755 --- a/src/key_event.c +++ b/src/key_event.c @@ -257,28 +257,28 @@ static volume_error_e _volume_up_key_press(int status, sound_type_e sound_type, if (sound_type == SOUND_TYPE_MEDIA && (bt_opened || earphone_connected) && sound_level + 1 > SAFETY_LIMIT) { if (volume_control_get_safety_limit()) { display_state_e state; + volume_sound_level_set(sound_type, SAFETY_LIMIT); + volume_view_slider_value_set(SAFETY_LIMIT); + if (VOLUME_ERROR_OK != volume_view_send_warning_signal(EINA_TRUE)) { + _E("Failed to set warning status"); + } + if (VOLUME_ERROR_OK != volume_view_open_warning_popup()) { + _E("Failed to open waring popup!!"); + return VOLUME_ERROR_FAIL; + } if (device_display_get_state(&state) != DEVICE_ERROR_NONE) { _E("Failed to get display state"); } if (state == DISPLAY_STATE_SCREEN_OFF || state == DISPLAY_STATE_SCREEN_DIM) { device_display_change_state(DISPLAY_STATE_NORMAL); - if(FEEDBACK_ERROR_NONE != feedback_play_type(FEEDBACK_TYPE_VIBRATION, FEEDBACK_PATTERN_VIBRATION_ON)) { + if(FEEDBACK_ERROR_NONE != feedback_play_type(FEEDBACK_TYPE_VIBRATION, FEEDBACK_PATTERN_WAKEUP)) { _E("Failed to play vibration"); } } - if (VOLUME_ERROR_OK != volume_view_send_warning_signal(EINA_TRUE)) { - _E("Failed to set warning status"); - } if (status == LOCK_AND_MEDIA) { /* Check LCD */ volume_view_window_show(sound_type); } - volume_sound_level_set(sound_type, SAFETY_LIMIT); - volume_view_slider_value_set(SAFETY_LIMIT); - if (VOLUME_ERROR_OK != volume_view_open_warning_popup()) { - _E("Failed to open waring popup!!"); - return VOLUME_ERROR_FAIL; - } volume_timer_del(TYPE_TIMER_SU); volume_timer_del(TYPE_TIMER_SD); volume_timer_add(10.0, TYPE_TIMER_WARNING_POPUP); @@ -372,28 +372,28 @@ static volume_error_e _volume_down_key_press(int status, sound_type_e sound_type if (volume_control_get_safety_limit() && sound_type == SOUND_TYPE_MEDIA && (bt_opened || earphone_connected) && val > SAFETY_LIMIT) { display_state_e state; + volume_sound_level_set(sound_type, SAFETY_LIMIT); + volume_view_slider_value_set(SAFETY_LIMIT); + if (VOLUME_ERROR_OK != volume_view_send_warning_signal(EINA_TRUE)) { + _E("Failed to set warning status"); + } + if (VOLUME_ERROR_OK != volume_view_open_warning_popup()) { + _E("Failed to open waring popup!!"); + return VOLUME_ERROR_FAIL; + } if (device_display_get_state(&state) != DEVICE_ERROR_NONE) { _E("Failed to get display state"); } if (state == DISPLAY_STATE_SCREEN_OFF || state == DISPLAY_STATE_SCREEN_DIM) { device_display_change_state(DISPLAY_STATE_NORMAL); - if(FEEDBACK_ERROR_NONE != feedback_play_type(FEEDBACK_TYPE_VIBRATION, FEEDBACK_PATTERN_VIBRATION_ON)) { + if(FEEDBACK_ERROR_NONE != feedback_play_type(FEEDBACK_TYPE_VIBRATION, FEEDBACK_PATTERN_WAKEUP)) { _E("Failed to play vibration"); } } - if (VOLUME_ERROR_OK != volume_view_send_warning_signal(EINA_TRUE)) { - _E("Failed to set warning status"); - } if (status == LOCK_AND_MEDIA) { /* Check LCD */ volume_view_window_show(sound_type); } - volume_sound_level_set(sound_type, SAFETY_LIMIT); - volume_view_slider_value_set(SAFETY_LIMIT); - if (VOLUME_ERROR_OK != volume_view_open_warning_popup()) { - _E("Failed to open waring popup!!"); - return VOLUME_ERROR_FAIL; - } volume_timer_del(TYPE_TIMER_SU); volume_timer_del(TYPE_TIMER_SD); volume_timer_add(10.0, TYPE_TIMER_WARNING_POPUP); diff --git a/src/timer.c b/src/timer.c index c8986b3..49ed9f5 100755 --- a/src/timer.c +++ b/src/timer.c @@ -274,28 +274,28 @@ static Eina_Bool _timer_short_up_cb(void *data) display_state_e state; int lock = IDLELOCK_ON; int status = volume_control_check_status(&lock, &type); + volume_sound_level_set(sound_type, SAFETY_LIMIT); + volume_view_slider_value_set(SAFETY_LIMIT); + if (VOLUME_ERROR_OK != volume_view_send_warning_signal(EINA_TRUE)) { + _E("Failed to set warning status"); + } + if (VOLUME_ERROR_OK != volume_view_open_warning_popup()) { + _E("Failed to open waring popup!!"); + return VOLUME_ERROR_FAIL; + } if (device_display_get_state(&state) != DEVICE_ERROR_NONE) { _E("Failed to get display state"); } if (state == DISPLAY_STATE_SCREEN_OFF || state == DISPLAY_STATE_SCREEN_DIM) { device_display_change_state(DISPLAY_STATE_NORMAL); - if(FEEDBACK_ERROR_NONE != feedback_play_type(FEEDBACK_TYPE_VIBRATION, FEEDBACK_PATTERN_VIBRATION_ON)) { + if(FEEDBACK_ERROR_NONE != feedback_play_type(FEEDBACK_TYPE_VIBRATION, FEEDBACK_PATTERN_WAKEUP)) { _E("Failed to play vibration"); } } - if (VOLUME_ERROR_OK != volume_view_send_warning_signal(EINA_TRUE)) { - _E("Failed to set warning status"); - } if (status == LOCK_AND_MEDIA) { /* Check LCD */ volume_view_window_show(sound_type); } - volume_sound_level_set(sound_type, SAFETY_LIMIT); - volume_view_slider_value_set(SAFETY_LIMIT); - if (VOLUME_ERROR_OK != volume_view_open_warning_popup()) { - _E("Failed to open waring popup!!"); - return VOLUME_ERROR_FAIL; - } volume_timer_del(TYPE_TIMER_SU); volume_timer_del(TYPE_TIMER_SD); volume_timer_add(10.0, TYPE_TIMER_WARNING_POPUP); -- 2.7.4