From cef4bc40c387af26a21e6ce2e1517191dc24a8b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=9A=E6=99=96?= <593245898@qq.com> Date: Mon, 1 Mar 2021 23:10:56 +0800 Subject: [PATCH] [Fw] Remove lv_bmp related codes. --- 2.Firmware/HoloCubic_fw/HoloCubic_fw.ino | 2 +- 2.Firmware/HoloCubic_fw/lv_cubic_gui.c | 5 +++++ 2.Firmware/HoloCubic_fw/lv_port_fatfs.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/2.Firmware/HoloCubic_fw/HoloCubic_fw.ino b/2.Firmware/HoloCubic_fw/HoloCubic_fw.ino index 15d005b..26f12ae 100644 --- a/2.Firmware/HoloCubic_fw/HoloCubic_fw.ino +++ b/2.Firmware/HoloCubic_fw/HoloCubic_fw.ino @@ -7,7 +7,6 @@ #include "lv_port_indev.h" #include "lv_port_fatfs.h" #include "lv_cubic_gui.h" - #include "lv_demo_encoder.h" @@ -40,6 +39,7 @@ void setup() tf.init(); lv_fs_if_init(); + String ssid = tf.readFileLine("/wifi.txt", 1); // line-1 for WiFi ssid String password = tf.readFileLine("/wifi.txt", 2); // line-2 for WiFi password diff --git a/2.Firmware/HoloCubic_fw/lv_cubic_gui.c b/2.Firmware/HoloCubic_fw/lv_cubic_gui.c index 865c712..554813d 100644 --- a/2.Firmware/HoloCubic_fw/lv_cubic_gui.c +++ b/2.Firmware/HoloCubic_fw/lv_cubic_gui.c @@ -28,4 +28,9 @@ void lv_holo_cubic_gui(void) lv_obj_t* img2 = lv_img_create(scr2, NULL); lv_img_set_src(img2, &cat); lv_obj_align(img2, NULL, LV_ALIGN_CENTER, 0, 0); + + lv_obj_t* imgbtn = lv_imgbtn_create(lv_scr_act(), NULL); + lv_imgbtn_set_src(imgbtn, LV_BTN_STATE_PRESSED, "S:/dir/icon_press.bin"); + lv_imgbtn_set_src(imgbtn, LV_BTN_STATE_RELEASED, "S:/dir/icon_press.bin"); + lv_obj_align(imgbtn, NULL, LV_ALIGN_CENTER, 0, 0); } \ No newline at end of file diff --git a/2.Firmware/HoloCubic_fw/lv_port_fatfs.h b/2.Firmware/HoloCubic_fw/lv_port_fatfs.h index 1451e0d..cf199df 100644 --- a/2.Firmware/HoloCubic_fw/lv_port_fatfs.h +++ b/2.Firmware/HoloCubic_fw/lv_port_fatfs.h @@ -18,6 +18,7 @@ extern "C" { *********************/ #include "lvgl.h" #include "ff.h" +#include "lv_bmp.h" /********************* * DEFINES *********************/