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

add docu and silence wakeup option

Browse Source
This commit is contained in:
sharandac
2020-08-10 20:33:13 +02:00
parent eb813a2799
commit 20d2daefce
13 changed files with 160 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/mainbar/main_tile/main_tile.cpp
View File

@@ -44,7 +44,7 @@ LV_FONT_DECLARE(Ubuntu_16px);
lv_task_t * task;
void main_tile_task( lv_task_t * task );
void main_tile_aling_widgets( void );
void main_tile_align_widgets( void );
void main_tile_setup( void ) {
main_tile_num = mainbar_add_tile( 0, 0 );
@@ -104,7 +104,7 @@ lv_obj_t *main_tile_register_widget( void ) {
if ( widget_entry[ widget ].active == false ) {
widget_entry[ widget ].active = true;
lv_obj_set_hidden( widget_entry[ widget ].widget, false );
main_tile_aling_widgets();
main_tile_align_widgets();
return( widget_entry[ widget ].widget );
}
}
@@ -112,7 +112,7 @@ lv_obj_t *main_tile_register_widget( void ) {
return( NULL );
}
void main_tile_aling_widgets( void ) {
void main_tile_align_widgets( void ) {
int active_widgets = 0;
lv_coord_t xpos = 0;

8
src/gui/mainbar/mainbar.h
View File

@@ -106,9 +106,13 @@
* @return lv_style_t
*/
lv_style_t *mainbar_get_slider_style( void );
/*
* @brief
*/
lv_obj_t * mainbar_obj_create(lv_obj_t *parent);
/*
* @brief
*/
void mainbar_add_slide_element(lv_obj_t *element);
#endif // _MAINBAR_H

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

@@ -37,6 +37,7 @@ uint32_t battery_settings_tile_num;
lv_obj_t *battery_setup_icon_cont = NULL;
lv_obj_t *battery_setup_info_img = NULL;
lv_obj_t *battery_silence_wakeup_switch = NULL;
lv_obj_t *battery_percent_switch = NULL;
lv_obj_t *battery_experimental_switch = NULL;
@@ -46,6 +47,7 @@ LV_IMG_DECLARE(info_update_16px);
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 );
static void battery_silence_wakeup_switch_event_handler( lv_obj_t * obj, lv_event_t event );
static void battery_percent_switch_event_handler( lv_obj_t * obj, lv_event_t event );
static void battery_experimental_switch_event_handler( lv_obj_t * obj, lv_event_t event );
void battery_set_experimental_indicator( void );
@@ -91,13 +93,28 @@ void battery_settings_tile_setup( void ) {
lv_obj_t *exit_label = lv_label_create( battery_settings_tile, NULL );
lv_obj_add_style( exit_label, LV_OBJ_PART_MAIN, &battery_settings_style );
lv_label_set_text( exit_label, "battery settings");
lv_label_set_text( exit_label, "energy settings");
lv_obj_align( exit_label, exit_btn, LV_ALIGN_OUT_RIGHT_MID, 5, 0 );
lv_obj_t *battery_silence_wakeup_switch_cont = lv_obj_create( battery_settings_tile, NULL );
lv_obj_set_size(battery_silence_wakeup_switch_cont, LV_HOR_RES_MAX , 40);
lv_obj_add_style( battery_silence_wakeup_switch_cont, LV_OBJ_PART_MAIN, &battery_settings_style );
lv_obj_align( battery_silence_wakeup_switch_cont, battery_settings_tile, LV_ALIGN_IN_TOP_RIGHT, 0, 75 );
battery_silence_wakeup_switch = lv_switch_create( battery_silence_wakeup_switch_cont, NULL );
lv_obj_add_protect( battery_silence_wakeup_switch, LV_PROTECT_CLICK_FOCUS);
lv_obj_add_style( battery_silence_wakeup_switch, LV_SWITCH_PART_INDIC, mainbar_get_switch_style() );
lv_switch_off( battery_silence_wakeup_switch, LV_ANIM_ON );
lv_obj_align( battery_silence_wakeup_switch, battery_silence_wakeup_switch_cont, LV_ALIGN_IN_RIGHT_MID, -5, 0 );
lv_obj_set_event_cb( battery_silence_wakeup_switch, battery_silence_wakeup_switch_event_handler );
lv_obj_t *battery_silence_wakeup_label = lv_label_create( battery_silence_wakeup_switch_cont, NULL);
lv_obj_add_style( battery_silence_wakeup_label, LV_OBJ_PART_MAIN, &battery_settings_style );
lv_label_set_text( battery_silence_wakeup_label, "silence wakeup");
lv_obj_align( battery_silence_wakeup_label, battery_silence_wakeup_switch_cont, LV_ALIGN_IN_LEFT_MID, 5, 0 );
lv_obj_t *battery_setup_label_cont = lv_obj_create( battery_settings_tile, NULL );
lv_obj_set_size(battery_setup_label_cont, LV_HOR_RES_MAX , 40);
lv_obj_add_style( battery_setup_label_cont, LV_OBJ_PART_MAIN, &battery_settings_style );
lv_obj_align( battery_setup_label_cont, battery_settings_tile, LV_ALIGN_IN_TOP_RIGHT, 0, 75 );
lv_obj_align( battery_setup_label_cont, battery_silence_wakeup_switch_cont, LV_ALIGN_OUT_BOTTOM_MID, 0, 0 );
lv_obj_t *battery_setup_label = lv_label_create( battery_setup_label_cont, NULL);
lv_obj_add_style( battery_setup_label, LV_OBJ_PART_MAIN, &battery_settings_style );
lv_label_set_text( battery_setup_label, "experimental functions");
@@ -144,6 +161,12 @@ void battery_settings_tile_setup( void ) {
else
lv_switch_off( battery_experimental_switch, LV_ANIM_OFF);
if ( pmu_get_silence_wakeup() ) {
lv_switch_on( battery_silence_wakeup_switch, LV_ANIM_OFF);
}
else
lv_switch_off( battery_silence_wakeup_switch, LV_ANIM_OFF);
battery_set_experimental_indicator();
}
@@ -155,6 +178,14 @@ void battery_set_experimental_indicator( void ) {
lv_obj_set_hidden( battery_setup_info_img, true );
}
}
static void battery_silence_wakeup_switch_event_handler( lv_obj_t * obj, lv_event_t event ) {
switch( event ) {
case( LV_EVENT_VALUE_CHANGED ): pmu_set_silence_wakeup( lv_switch_get_state( obj ) );
break;
}
}
static void battery_percent_switch_event_handler( lv_obj_t * obj, lv_event_t event ) {
switch( event ) {
case( LV_EVENT_VALUE_CHANGED ): pmu_set_calculated_percent( lv_switch_get_state( obj ) );

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

@@ -82,7 +82,7 @@ void battery_view_tile_setup( uint32_t tile_num ) {
lv_obj_t *exit_label = lv_label_create( battery_view_tile, NULL);
lv_obj_add_style( exit_label, LV_OBJ_PART_MAIN, &battery_view_style );
lv_label_set_text( exit_label, "battery");
lv_label_set_text( exit_label, "battery / energy");
lv_obj_align( exit_label, exit_btn, LV_ALIGN_OUT_RIGHT_MID, 5, 0 );
lv_obj_t *battery_design_cont = lv_obj_create( battery_view_tile, NULL );