Skip to content

Commit

Permalink
Removed Lena,m put in Philips test image
Browse files Browse the repository at this point in the history
  • Loading branch information
rzeldent committed Mar 25, 2024
1 parent 37ca3a1 commit bf0e8f1
Show file tree
Hide file tree
Showing 10 changed files with 164 additions and 8 deletions.
4 changes: 2 additions & 2 deletions SquareLine_Project.spj
Original file line number Diff line number Diff line change
Expand Up @@ -3223,7 +3223,7 @@
{
"nid": 1573988665,
"strtype": "IMAGE/Asset",
"strval": "assets\\Lena80x80.png",
"strval": "assets/Philips_80x106.png",
"InheritedType": 5
},
{
Expand Down Expand Up @@ -3779,7 +3779,7 @@
"theme_color2": 0,
"uiExportFolderPath": "C:\\Users\\rzeld\\source\\repos\\esp32-smartdisplay-demo\\src\\ui",
"projectExportFolderPath": "C:\\Users\\rzeld\\source\\repos\\esp32-smartdisplay-demo",
"backup_cnt": 71,
"backup_cnt": 72,
"autosave_cnt": 0,
"lvgl_version": "8.3.6",
"callfuncsexport": "CPP_FILE",
Expand Down
Binary file removed assets/Lena80x80.png
Binary file not shown.
Binary file added assets/Philips_80x106.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion boards
Submodule boards updated 1 files
+2 −1 esp32-2432S028R.json
2 changes: 1 addition & 1 deletion src/ui/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ SET(SOURCES screens/ui_scrMain.c
components/ui_comp_hook.c
ui_helpers.c
ui_events.cpp
images/ui_img_lena80x80_png.c)
images/ui_img_philips_80x106_png.c)

add_library(ui ${SOURCES})
2 changes: 1 addition & 1 deletion src/ui/filelist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ ui.c
components/ui_comp_hook.c
ui_helpers.c
ui_events.cpp
images/ui_img_lena80x80_png.c
images/ui_img_philips_80x106_png.c
156 changes: 156 additions & 0 deletions src/ui/images/ui_img_philips_80x106_png.c

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/ui/screens/ui_scrMain.c
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ void ui_scrMain_screen_init(void)
lv_label_set_text(ui_lblCountValue, "0");

ui_Image1 = lv_img_create(ui_pnlMain);
lv_img_set_src(ui_Image1, &ui_img_lena80x80_png);
lv_img_set_src(ui_Image1, &ui_img_philips_80x106_png);
lv_obj_set_width(ui_Image1, LV_SIZE_CONTENT); /// 1
lv_obj_set_height(ui_Image1, LV_SIZE_CONTENT); /// 1
lv_obj_set_align(ui_Image1, LV_ALIGN_BOTTOM_RIGHT);
Expand Down
2 changes: 1 addition & 1 deletion src/ui/ui.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ lv_obj_t * ui_lblCount;
lv_obj_t * ui_lblCountValue;
lv_obj_t * ui_Image1;
lv_obj_t * ui____initial_actions0;
const lv_img_dsc_t * ui_imgset_lenax[1] = {&ui_img_lena80x80_png};
const lv_img_dsc_t * ui_imgset_philips_80x[1] = {&ui_img_philips_80x106_png};

///////////////////// TEST LVGL SETTINGS ////////////////////
#if LV_COLOR_DEPTH != 16
Expand Down
2 changes: 1 addition & 1 deletion src/ui/ui.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ extern lv_obj_t * ui_Image1;
extern lv_obj_t * ui____initial_actions0;


LV_IMG_DECLARE(ui_img_lena80x80_png); // assets/Lena80x80.png
LV_IMG_DECLARE(ui_img_philips_80x106_png); // assets/Philips_80x106.png



Expand Down

0 comments on commit bf0e8f1

Please sign in to comment.