projects_leo/ttgo_smartwatch_prox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup powermgm and add haptic feedback

Browse Source
This commit is contained in:
sharandac
2020-08-03 09:04:33 +02:00
parent 69b9a54408
commit ae45eac491
24 changed files with 168 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/mainbar/setup_tile/battery_settings/battery_settings.cpp
View File

@@ -106,6 +106,7 @@ void battery_settings_tile_setup( void ) {
lv_obj_add_style( battery_percent_switch_cont, LV_OBJ_PART_MAIN, &battery_settings_style );
lv_obj_align( battery_percent_switch_cont, battery_setup_label_cont, LV_ALIGN_OUT_BOTTOM_MID, 0, 0 );
battery_percent_switch = lv_switch_create( battery_percent_switch_cont, NULL );
lv_obj_add_protect( battery_percent_switch, LV_PROTECT_CLICK_FOCUS);
lv_obj_add_style( battery_percent_switch, LV_SWITCH_PART_INDIC, mainbar_get_switch_style() );
lv_switch_off( battery_percent_switch, LV_ANIM_ON );
lv_obj_align( battery_percent_switch, battery_percent_switch_cont, LV_ALIGN_IN_RIGHT_MID, -5, 0 );
@@ -120,6 +121,7 @@ void battery_settings_tile_setup( void ) {
lv_obj_add_style( battery_experimental_switch_cont, LV_OBJ_PART_MAIN, &battery_settings_style );
lv_obj_align( battery_experimental_switch_cont, battery_percent_switch_cont, LV_ALIGN_OUT_BOTTOM_MID, 0, 0 );
battery_experimental_switch = lv_switch_create( battery_experimental_switch_cont, NULL );
lv_obj_add_protect( battery_experimental_switch, LV_PROTECT_CLICK_FOCUS);
lv_obj_add_style( battery_experimental_switch, LV_SWITCH_PART_INDIC, mainbar_get_switch_style() );
lv_switch_off( battery_experimental_switch, LV_ANIM_ON );
lv_obj_align( battery_experimental_switch, battery_experimental_switch_cont, LV_ALIGN_IN_RIGHT_MID, -5, 0 );
@@ -144,16 +146,14 @@ void battery_settings_tile_setup( void ) {
static void battery_percent_switch_event_handler( lv_obj_t * obj, lv_event_t event ) {
switch( event ) {
case( LV_EVENT_VALUE_CHANGED ): motor_vibe( 1 );
pmu_set_calculated_percent( lv_switch_get_state( obj ) );
case( LV_EVENT_VALUE_CHANGED ): pmu_set_calculated_percent( lv_switch_get_state( obj ) );
break;
}
}
static void battery_experimental_switch_event_handler( lv_obj_t * obj, lv_event_t event ) {
switch( event ) {
case( LV_EVENT_VALUE_CHANGED ): motor_vibe( 1 );
pmu_set_experimental_power_save( lv_switch_get_state( obj ) );
case( LV_EVENT_VALUE_CHANGED ): pmu_set_experimental_power_save( lv_switch_get_state( obj ) );
if ( pmu_get_experimental_power_save() )
lv_obj_set_hidden( battery_setup_info_img, false );
else
@@ -164,8 +164,7 @@ static void battery_experimental_switch_event_handler( lv_obj_t * obj, lv_event_
static void enter_battery_setup_event_cb( lv_obj_t * obj, lv_event_t event ) {
switch( event ) {
case( LV_EVENT_CLICKED ): motor_vibe( 1 );
mainbar_jump_to_tilenumber( battery_settings_tile_num, LV_ANIM_OFF );
case( LV_EVENT_CLICKED ): mainbar_jump_to_tilenumber( battery_settings_tile_num, LV_ANIM_OFF );
break;
}
@@ -173,8 +172,7 @@ static void enter_battery_setup_event_cb( lv_obj_t * obj, lv_event_t event ) {
static void exit_battery_setup_event_cb( lv_obj_t * obj, lv_event_t event ) {
switch( event ) {
case( LV_EVENT_CLICKED ): motor_vibe( 1 );
mainbar_jump_to_tilenumber( battery_settings_tile_num, LV_ANIM_OFF );
case( LV_EVENT_CLICKED ): mainbar_jump_to_tilenumber( battery_settings_tile_num, LV_ANIM_OFF );
break;
}
}

9
src/gui/mainbar/setup_tile/battery_settings/battery_view.cpp
View File

@@ -168,8 +168,7 @@ void battery_view_tile_setup( uint32_t tile_num ) {
static void enter_battery_view_event_cb( lv_obj_t * obj, lv_event_t event ) {
switch( event ) {
case( LV_EVENT_CLICKED ): motor_vibe( 1 );
mainbar_jump_to_tilenumber( battery_view_tile_num, LV_ANIM_OFF );
case( LV_EVENT_CLICKED ): mainbar_jump_to_tilenumber( battery_view_tile_num, LV_ANIM_OFF );
break;
}
@@ -177,8 +176,7 @@ static void enter_battery_view_event_cb( lv_obj_t * obj, lv_event_t event ) {
static void enter_battery_settings_event_cb( lv_obj_t * obj, lv_event_t event ) {
switch( event ) {
case( LV_EVENT_CLICKED ): motor_vibe( 1 );
mainbar_jump_to_tilenumber( battery_view_tile_num + 1, LV_ANIM_OFF );
case( LV_EVENT_CLICKED ): mainbar_jump_to_tilenumber( battery_view_tile_num + 1, LV_ANIM_OFF );
break;
}
@@ -186,8 +184,7 @@ static void enter_battery_settings_event_cb( lv_obj_t * obj, lv_event_t event )
static void exit_battery_view_event_cb( lv_obj_t * obj, lv_event_t event ) {
switch( event ) {
case( LV_EVENT_CLICKED ): motor_vibe( 1 );
mainbar_jump_to_tilenumber( setup_get_tile_num() , LV_ANIM_OFF );
case( LV_EVENT_CLICKED ): mainbar_jump_to_tilenumber( setup_get_tile_num() , LV_ANIM_OFF );
break;
}
}

8
src/gui/mainbar/setup_tile/display_settings/display_setting.cpp
View File

@@ -88,6 +88,7 @@ void display_settings_tile_setup( void ) {
lv_obj_add_style( brightness_cont, LV_OBJ_PART_MAIN, &display_settings_style );
lv_obj_align( brightness_cont, display_settings_tile, LV_ALIGN_IN_TOP_RIGHT, 0, 75 );
display_brightness_slider = lv_slider_create( brightness_cont, NULL );
lv_obj_add_protect( display_brightness_slider, LV_PROTECT_CLICK_FOCUS);
lv_obj_add_style( display_brightness_slider, LV_SLIDER_PART_INDIC, mainbar_get_slider_style() );
lv_obj_add_style( display_brightness_slider, LV_SLIDER_PART_KNOB, mainbar_get_slider_style() );
lv_slider_set_range( display_brightness_slider, DISPLAY_MIN_BRIGHTNESS, DISPLAY_MAX_BRIGHTNESS );
@@ -103,6 +104,7 @@ void display_settings_tile_setup( void ) {
lv_obj_add_style( timeout_cont, LV_OBJ_PART_MAIN, &display_settings_style );
lv_obj_align( timeout_cont, brightness_cont, LV_ALIGN_OUT_BOTTOM_MID, 0, 0 );
display_timeout_slider = lv_slider_create( timeout_cont, NULL );
lv_obj_add_protect( display_timeout_slider, LV_PROTECT_CLICK_FOCUS);
lv_obj_add_style( display_timeout_slider, LV_SLIDER_PART_INDIC, mainbar_get_slider_style() );
lv_obj_add_style( display_timeout_slider, LV_SLIDER_PART_KNOB, mainbar_get_slider_style() );
lv_slider_set_range( display_timeout_slider, DISPLAY_MIN_TIMEOUT, DISPLAY_MAX_TIMEOUT );
@@ -147,8 +149,7 @@ void display_settings_tile_setup( void ) {
static void enter_display_setup_event_cb( lv_obj_t * obj, lv_event_t event ) {
switch( event ) {
case( LV_EVENT_CLICKED ): motor_vibe( 1 );
mainbar_jump_to_tilenumber( display_tile_num, LV_ANIM_OFF );
case( LV_EVENT_CLICKED ): mainbar_jump_to_tilenumber( display_tile_num, LV_ANIM_OFF );
break;
}
@@ -156,8 +157,7 @@ static void enter_display_setup_event_cb( lv_obj_t * obj, lv_event_t event ) {
static void exit_display_setup_event_cb( lv_obj_t * obj, lv_event_t event ) {
switch( event ) {
case( LV_EVENT_CLICKED ): motor_vibe( 1 );
mainbar_jump_to_tilenumber( setup_get_tile_num(), LV_ANIM_OFF );
case( LV_EVENT_CLICKED ): mainbar_jump_to_tilenumber( setup_get_tile_num(), LV_ANIM_OFF );
display_save_config();
break;
}

8
src/gui/mainbar/setup_tile/move_settings/move_settings.cpp
View File

@@ -82,6 +82,7 @@ void move_settings_tile_setup( void ) {
lv_obj_add_style( stepcounter_cont, LV_OBJ_PART_MAIN, &move_settings_style );
lv_obj_align( stepcounter_cont, move_settings_tile, LV_ALIGN_IN_TOP_RIGHT, 0, 75 );
stepcounter_onoff = lv_switch_create( stepcounter_cont, NULL );
lv_obj_add_protect( stepcounter_onoff, LV_PROTECT_CLICK_FOCUS);
lv_obj_add_style( stepcounter_onoff, LV_SWITCH_PART_INDIC, mainbar_get_switch_style() );
lv_switch_off( stepcounter_onoff, LV_ANIM_ON );
lv_obj_align( stepcounter_onoff, stepcounter_cont, LV_ALIGN_IN_RIGHT_MID, -5, 0 );
@@ -96,6 +97,7 @@ void move_settings_tile_setup( void ) {
lv_obj_add_style( doubleclick_cont, LV_OBJ_PART_MAIN, &move_settings_style );
lv_obj_align( doubleclick_cont, stepcounter_cont, LV_ALIGN_OUT_BOTTOM_MID, 0, 0 );
doubleclick_onoff = lv_switch_create( doubleclick_cont, NULL );
lv_obj_add_protect( doubleclick_onoff, LV_PROTECT_CLICK_FOCUS);
lv_obj_add_style( doubleclick_onoff, LV_SWITCH_PART_INDIC, mainbar_get_switch_style() );
lv_switch_off( doubleclick_onoff, LV_ANIM_ON );
lv_obj_align( doubleclick_onoff, doubleclick_cont, LV_ALIGN_IN_RIGHT_MID, -5, 0 );
@@ -119,16 +121,14 @@ void move_settings_tile_setup( void ) {
static void enter_move_setup_event_cb( lv_obj_t * obj, lv_event_t event ) {
switch( event ) {
case( LV_EVENT_CLICKED ): motor_vibe( 1 );
mainbar_jump_to_tilenumber( move_tile_num, LV_ANIM_OFF );
case( LV_EVENT_CLICKED ): mainbar_jump_to_tilenumber( move_tile_num, LV_ANIM_OFF );
break;
}
}
static void exit_move_setup_event_cb( lv_obj_t * obj, lv_event_t event ) {
switch( event ) {
case( LV_EVENT_CLICKED ): motor_vibe( 1 );
mainbar_jump_to_tilenumber( setup_get_tile_num(), LV_ANIM_OFF );
case( LV_EVENT_CLICKED ): mainbar_jump_to_tilenumber( setup_get_tile_num(), LV_ANIM_OFF );
break;
}
}

8
src/gui/mainbar/setup_tile/time_settings/time_settings.cpp
View File

@@ -86,6 +86,7 @@ void time_settings_tile_setup( void ) {
lv_obj_add_style( wifisync_cont, LV_OBJ_PART_MAIN, &time_settings_style );
lv_obj_align( wifisync_cont, time_settings_tile, LV_ALIGN_IN_TOP_RIGHT, 0, 75 );
wifisync_onoff = lv_switch_create( wifisync_cont, NULL );
lv_obj_add_protect( wifisync_onoff, LV_PROTECT_CLICK_FOCUS);
lv_obj_add_style( wifisync_onoff, LV_SWITCH_PART_INDIC, mainbar_get_switch_style() );
lv_switch_off( wifisync_onoff, LV_ANIM_ON );
lv_obj_align( wifisync_onoff, wifisync_cont, LV_ALIGN_IN_RIGHT_MID, -5, 0 );
@@ -100,6 +101,7 @@ void time_settings_tile_setup( void ) {
lv_obj_add_style( daylight_cont, LV_OBJ_PART_MAIN, &time_settings_style );
lv_obj_align( daylight_cont, wifisync_cont, LV_ALIGN_OUT_BOTTOM_MID, 0, 0 );
daylight_onoff = lv_switch_create( daylight_cont, NULL );
lv_obj_add_protect( daylight_onoff, LV_PROTECT_CLICK_FOCUS);
lv_obj_add_style( daylight_onoff, LV_SWITCH_PART_INDIC, mainbar_get_switch_style() );
lv_switch_off( daylight_onoff, LV_ANIM_ON );
lv_obj_align( daylight_onoff, daylight_cont, LV_ALIGN_IN_RIGHT_MID, -5, 0 );
@@ -138,16 +140,14 @@ void time_settings_tile_setup( void ) {
static void enter_time_setup_event_cb( lv_obj_t * obj, lv_event_t event ) {
switch( event ) {
case( LV_EVENT_CLICKED ): motor_vibe( 1 );
mainbar_jump_to_tilenumber( time_tile_num, LV_ANIM_OFF );
case( LV_EVENT_CLICKED ): mainbar_jump_to_tilenumber( time_tile_num, LV_ANIM_OFF );
break;
}
}
static void exit_time_setup_event_cb( lv_obj_t * obj, lv_event_t event ) {
switch( event ) {
case( LV_EVENT_CLICKED ): motor_vibe( 1 );
mainbar_jump_to_tilenumber( setup_get_tile_num(), LV_ANIM_OFF );
case( LV_EVENT_CLICKED ): mainbar_jump_to_tilenumber( setup_get_tile_num(), LV_ANIM_OFF );
break;
}
}

9
src/gui/mainbar/setup_tile/update/update.cpp
View File

@@ -147,23 +147,20 @@ void update_tile_setup( void ) {
static void enter_update_setup_setup_event_cb( lv_obj_t * obj, lv_event_t event ) {
switch( event ) {
case( LV_EVENT_CLICKED ): motor_vibe( 1 );
mainbar_jump_to_tilenumber( update_tile_num + 1, LV_ANIM_OFF );
case( LV_EVENT_CLICKED ): mainbar_jump_to_tilenumber( update_tile_num + 1, LV_ANIM_OFF );
break;
}
}
static void enter_update_setup_event_cb( lv_obj_t * obj, lv_event_t event ) {
switch( event ) {
case( LV_EVENT_CLICKED ): motor_vibe( 1 );
mainbar_jump_to_tilenumber( update_tile_num, LV_ANIM_OFF );
case( LV_EVENT_CLICKED ): mainbar_jump_to_tilenumber( update_tile_num, LV_ANIM_OFF );
break;
}
}
static void exit_update_setup_event_cb( lv_obj_t * obj, lv_event_t event ) {
switch( event ) {
case( LV_EVENT_CLICKED ): motor_vibe( 1 );
mainbar_jump_to_tilenumber( setup_get_tile_num(), LV_ANIM_OFF );
case( LV_EVENT_CLICKED ): mainbar_jump_to_tilenumber( setup_get_tile_num(), LV_ANIM_OFF );
break;
}
}

7
src/gui/mainbar/setup_tile/update/update_setup.cpp
View File

@@ -80,6 +80,7 @@ void update_setup_tile_setup( uint32_t tile_num ) {
lv_obj_align( update_check_autosync_cont, update_setup_tile, LV_ALIGN_IN_TOP_RIGHT, 0, 75 );
update_check_autosync_onoff = lv_switch_create( update_check_autosync_cont, NULL );
lv_obj_add_protect( update_check_autosync_onoff, LV_PROTECT_CLICK_FOCUS);
lv_obj_add_style( update_check_autosync_onoff, LV_SWITCH_PART_INDIC, mainbar_get_switch_style() );
lv_switch_off( update_check_autosync_onoff, LV_ANIM_ON );
lv_obj_align( update_check_autosync_onoff, update_check_autosync_cont, LV_ALIGN_IN_RIGHT_MID, -5, 0 );
@@ -99,8 +100,7 @@ void update_setup_tile_setup( uint32_t tile_num ) {
static void update_check_autosync_onoff_event_handler( lv_obj_t * obj, lv_event_t event ) {
switch (event) {
case (LV_EVENT_VALUE_CHANGED): motor_vibe( 1 );
update_config.autosync = lv_switch_get_state( obj );
case (LV_EVENT_VALUE_CHANGED): update_config.autosync = lv_switch_get_state( obj );
update_save_config();
break;
}
@@ -108,8 +108,7 @@ static void update_check_autosync_onoff_event_handler( lv_obj_t * obj, lv_event_
static void exit_update_check_setup_event_cb( lv_obj_t * obj, lv_event_t event ) {
switch( event ) {
case( LV_EVENT_CLICKED ): motor_vibe( 1 );
mainbar_jump_to_tilenumber( update_setup_tile_num - 1, false );
case( LV_EVENT_CLICKED ): mainbar_jump_to_tilenumber( update_setup_tile_num - 1, false );
break;
}
}

11
src/gui/mainbar/setup_tile/wlan_settings/wlan_settings.cpp
View File

@@ -99,6 +99,7 @@ void wlan_settings_tile_setup( void ) {
/*Copy the first switch and turn it ON*/
wifi_onoff = lv_switch_create( wifi_settings_tile, NULL );
lv_obj_add_protect( wifi_onoff, LV_PROTECT_CLICK_FOCUS);
lv_obj_add_style( wifi_onoff, LV_SWITCH_PART_INDIC, mainbar_get_switch_style() );
lv_switch_off( wifi_onoff, LV_ANIM_ON );
lv_obj_align( wifi_onoff, exit_label, LV_ALIGN_OUT_RIGHT_MID, 30, 0 );
@@ -245,8 +246,7 @@ void wlan_password_tile_setup( uint32_t wifi_password_tile_num ) {
static void apply_wifi_password_event_cb( lv_obj_t * obj, lv_event_t event ) {
switch( event ) {
case( LV_EVENT_CLICKED ): motor_vibe( 1 );
wifictl_insert_network( lv_label_get_text( wifi_password_name_label ), lv_textarea_get_text( wifi_password_pass_textfield ) );
case( LV_EVENT_CLICKED ): wifictl_insert_network( lv_label_get_text( wifi_password_name_label ), lv_textarea_get_text( wifi_password_pass_textfield ) );
keyboard_hide();
mainbar_jump_to_tilenumber( wifi_settings_tile_num, LV_ANIM_ON );
break;
@@ -255,8 +255,7 @@ static void apply_wifi_password_event_cb( lv_obj_t * obj, lv_event_t event ) {
static void delete_wifi_password_event_cb( lv_obj_t * obj, lv_event_t event ) {
switch( event ) {
case( LV_EVENT_CLICKED ): motor_vibe( 1 );
wifictl_delete_network( lv_label_get_text( wifi_password_name_label ) );
case( LV_EVENT_CLICKED ): wifictl_delete_network( lv_label_get_text( wifi_password_name_label ) );
keyboard_hide();
mainbar_jump_to_tilenumber( wifi_settings_tile_num, LV_ANIM_ON );
break;
@@ -265,8 +264,7 @@ static void delete_wifi_password_event_cb( lv_obj_t * obj, lv_event_t event ) {
static void wlan_password_event_cb( lv_obj_t * obj, lv_event_t event ) {
switch( event ) {
case( LV_EVENT_CLICKED ): motor_vibe( 1 );
keyboard_set_textarea( obj );
case( LV_EVENT_CLICKED ): keyboard_set_textarea( obj );
break;
}
}
@@ -274,7 +272,6 @@ static void wlan_password_event_cb( lv_obj_t * obj, lv_event_t event ) {
static void exit_wifi_password_event_cb( lv_obj_t * obj, lv_event_t event ) {
switch( event ) {
case( LV_EVENT_CLICKED ): keyboard_hide();
motor_vibe( 1 );
mainbar_jump_to_tilenumber( wifi_settings_tile_num, LV_ANIM_ON );
break;
}