Th3maz1ng/W800_Smart_Watch
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor changes + added the initialization code for the music player screen

Browse Source
This commit is contained in:
anschrammh 2023-05-11 07:19:19 +02:00
parent 42c01e1d08
commit 8aa309b0c6
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lvgl_win_sim/lv_port_win_codeblocks/altimeter_screen.c
View File

@ -349,7 +349,7 @@ void altimeter_screen_create(AltimeterScreen_t * const altimeterScreen)
}
altimeterScreen->display = lv_obj_create(NULL);
lv_obj_set_style_bg_color(altimeterScreen->display, lv_color_make(0xFF,0xFF,0xFF), LV_PART_MAIN);/*
lv_obj_set_style_bg_color(altimeterScreen->display, lv_color_white(), LV_PART_MAIN);/*
lv_obj_set_style_radius(altimeterScreen->display, LV_RADIUS_CIRCLE, LV_PART_MAIN);*/
if(altimeterScreen->inner_circle)

4
src/lvgl_win_sim/lv_port_win_codeblocks/find_my_phone_screen.c
View File

@ -127,7 +127,7 @@ void find_my_phone_screen_create(FindMyPhoneScreen_t * const findMyPhoneScreen)
findMyPhoneScreen->display = NULL;
}
findMyPhoneScreen->display = lv_obj_create(NULL);
lv_obj_set_style_bg_color(findMyPhoneScreen->display, lv_color_make(0xFF,0xFF,0xFF), LV_PART_MAIN);
lv_obj_set_style_bg_color(findMyPhoneScreen->display, lv_color_white(), LV_PART_MAIN);
if(findMyPhoneScreen->innerCircle)
{
@ -138,7 +138,7 @@ void find_my_phone_screen_create(FindMyPhoneScreen_t * const findMyPhoneScreen)
findMyPhoneScreen->innerCircle = lv_obj_create(findMyPhoneScreen->display);
lv_obj_center(findMyPhoneScreen->innerCircle);
lv_obj_set_size(findMyPhoneScreen->innerCircle, 240, 240);
lv_obj_set_style_bg_color(findMyPhoneScreen->innerCircle, lv_color_make(0xFF,0xFF,0xFF), LV_PART_MAIN);
lv_obj_set_style_bg_color(findMyPhoneScreen->innerCircle, lv_color_white(), LV_PART_MAIN);
lv_obj_set_style_radius(findMyPhoneScreen->innerCircle, LV_RADIUS_CIRCLE, LV_PART_MAIN);
lv_obj_set_style_border_width(findMyPhoneScreen->innerCircle, 15, LV_PART_MAIN);

2
src/lvgl_win_sim/lv_port_win_codeblocks/find_my_phone_screen.h
View File

@ -31,6 +31,6 @@ void find_my_phone_screen_notify_BLE_connection_state(FindMyPhoneScreen_t * cons
void find_my_phone_screen_create(FindMyPhoneScreen_t * const findMyPhoneScreen);
void find_my__phone_screen_destroy(FindMyPhoneScreen_t * const findMyPhoneScreen);
void find_my_phone_screen_destroy(FindMyPhoneScreen_t * const findMyPhoneScreen);
#endif //FIND_PHONE_SCREEN_H

3
src/lvgl_win_sim/lv_port_win_codeblocks/main.c
View File

@ -21,6 +21,7 @@
#include "compass_screen.h"
#include "altimeter_screen.h"
#include "find_my_phone_screen.h"
#include "music_player_screen.h"
/*********************
@ -79,6 +80,7 @@ CompassScreen_t compassScreen;
SettingsScreen_t settingsScreen;
AltimeterScreen_t altimeterScreen;
FindMyPhoneScreen_t findMyPhoneScreen;
MusicPlayerScreen_t musicPlayerScreen;
int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLine, int nCmdShow)
{
@ -108,6 +110,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLi
find_my_phone_screen_init(&findMyPhoneScreen);
find_my_phone_screen_register_BLE_command_send_cb(&findMyPhoneScreen, &(sendMyFindPhoneBLECommandCb));
find_my_phone_screen_notify_BLE_connection_state(&findMyPhoneScreen, true);
music_player_screen_init(&musicPlayerScreen);
altimeter_screen_register_measurement_cb(&altimeterScreen, &(alti_meas_cb));

9
src/lvgl_win_sim/lv_port_win_codeblocks/menu_screen.c
View File

@ -6,6 +6,7 @@
#include "compass_screen.h"
#include "altimeter_screen.h"
#include "find_my_phone_screen.h"
#include "music_player_screen.h"
#define array_size(array) (sizeof(array)/sizeof(array[0]))
@ -25,6 +26,12 @@ static void menu_item_cb(lv_event_t *e)
}
break;
case 2:
{
extern MusicPlayerScreen_t musicPlayerScreen;
music_player_screen_create(&musicPlayerScreen);
//lv_scr_load_anim(watchFace.display, LV_SCR_LOAD_ANIM_FADE_ON, 400, 0, true);
lv_scr_load_anim(musicPlayerScreen.display, LV_SCR_LOAD_ANIM_MOVE_LEFT, 400, 0, true);
}
break;
case 3:
{
@ -142,7 +149,7 @@ void menu_screen_create(MenuScreen_t * const menuScreen)
common_screen_header_component(menuScreen->display, "Menu", 50);
lv_obj_t *scroll_item_container = lv_obj_create(menuScreen->display);
lv_obj_set_style_bg_color(scroll_item_container, lv_color_make(0xFF,0xFF,0xFF), LV_PART_MAIN);
lv_obj_set_style_bg_color(scroll_item_container, lv_color_white(), LV_PART_MAIN);
lv_obj_set_size(scroll_item_container, lv_pct(100), 240-50);
lv_obj_set_pos(scroll_item_container, 0, 50);
lv_obj_set_style_pad_all(scroll_item_container, 0, LV_PART_MAIN);