diff --git a/CMakeLists.txt b/CMakeLists.txt index 72c0413..a82f8ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,4 +5,4 @@ include($ENV{IDF_PATH}/tools/cmake/project.cmake) add_compile_options(-Wno-missing-field-initializers) -project(oxy_fluxdc_v02) +project(oxy_fluxdc) diff --git a/components/FluxUI/screens/ui_pageHome.c b/components/FluxUI/screens/ui_pageHome.c index 548d168..28109db 100644 --- a/components/FluxUI/screens/ui_pageHome.c +++ b/components/FluxUI/screens/ui_pageHome.c @@ -297,9 +297,9 @@ void ui_pageHome_screen_init(void) ui_pageHome_panelResult1 = lv_obj_create(ui_pageHome_panelCenter); lv_obj_set_width(ui_pageHome_panelResult1, 266); - lv_obj_set_height(ui_pageHome_panelResult1, 202); + lv_obj_set_height(ui_pageHome_panelResult1, 231); lv_obj_set_x(ui_pageHome_panelResult1, 0); - lv_obj_set_y(ui_pageHome_panelResult1, -103); + lv_obj_set_y(ui_pageHome_panelResult1, -93); lv_obj_set_align(ui_pageHome_panelResult1, LV_ALIGN_CENTER); lv_obj_clear_flag(ui_pageHome_panelResult1, LV_OBJ_FLAG_SCROLLABLE); /// Flags @@ -628,8 +628,6 @@ void ui_pageHome_screen_init(void) lv_obj_set_style_text_font(ui_pageHome_labelstr20, &ui_font_MiSansN14, LV_PART_MAIN | LV_STATE_DEFAULT); ui_pageHome_BarTestProgBS = lv_bar_create(ui_pageHome_panelResult1); - lv_bar_set_value(ui_pageHome_BarTestProgBS, 10, LV_ANIM_OFF); - lv_bar_set_start_value(ui_pageHome_BarTestProgBS, 0, LV_ANIM_OFF); lv_obj_set_width(ui_pageHome_BarTestProgBS, 164); lv_obj_set_height(ui_pageHome_BarTestProgBS, 10); lv_obj_set_x(ui_pageHome_BarTestProgBS, -5); @@ -641,7 +639,7 @@ void ui_pageHome_screen_init(void) lv_obj_set_width(ui_pageHome_DropdownTestTypeBS, 100); lv_obj_set_height(ui_pageHome_DropdownTestTypeBS, 30); lv_obj_set_x(ui_pageHome_DropdownTestTypeBS, -6); - lv_obj_set_y(ui_pageHome_DropdownTestTypeBS, 75); + lv_obj_set_y(ui_pageHome_DropdownTestTypeBS, 90); lv_obj_set_align(ui_pageHome_DropdownTestTypeBS, LV_ALIGN_CENTER); lv_obj_add_flag(ui_pageHome_DropdownTestTypeBS, LV_OBJ_FLAG_SCROLL_ON_FOCUS); /// Flags lv_obj_set_style_text_align(ui_pageHome_DropdownTestTypeBS, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN | LV_STATE_DEFAULT); @@ -656,31 +654,49 @@ void ui_pageHome_screen_init(void) lv_obj_set_x(ui_pageHome_labelstr21, 102); lv_obj_set_y(ui_pageHome_labelstr21, 40); lv_obj_set_align(ui_pageHome_labelstr21, LV_ALIGN_CENTER); - lv_label_set_text(ui_pageHome_labelstr21, "10%"); + lv_label_set_text(ui_pageHome_labelstr21, "0%"); lv_obj_set_style_text_font(ui_pageHome_labelstr21, &ui_font_MiSansN14, LV_PART_MAIN | LV_STATE_DEFAULT); ui_pageHome_labelstr7 = lv_label_create(ui_pageHome_panelResult1); lv_obj_set_width(ui_pageHome_labelstr7, LV_SIZE_CONTENT); /// 1 lv_obj_set_height(ui_pageHome_labelstr7, LV_SIZE_CONTENT); /// 1 lv_obj_set_x(ui_pageHome_labelstr7, -95); - lv_obj_set_y(ui_pageHome_labelstr7, 76); + lv_obj_set_y(ui_pageHome_labelstr7, 90); lv_obj_set_align(ui_pageHome_labelstr7, LV_ALIGN_CENTER); lv_label_set_text(ui_pageHome_labelstr7, "设备类型"); lv_obj_set_style_text_font(ui_pageHome_labelstr7, &ui_font_MiSansN14, LV_PART_MAIN | LV_STATE_DEFAULT); + ui_pageHome_labelBSInfo = lv_label_create(ui_pageHome_panelResult1); + lv_obj_set_width(ui_pageHome_labelBSInfo, LV_SIZE_CONTENT); /// 1 + lv_obj_set_height(ui_pageHome_labelBSInfo, LV_SIZE_CONTENT); /// 1 + lv_obj_set_x(ui_pageHome_labelBSInfo, 0); + lv_obj_set_y(ui_pageHome_labelBSInfo, 62); + lv_obj_set_align(ui_pageHome_labelBSInfo, LV_ALIGN_CENTER); + lv_label_set_text(ui_pageHome_labelBSInfo, "15BPM start instruction successfully issued"); + lv_obj_set_style_text_font(ui_pageHome_labelBSInfo, &lv_font_montserrat_10, LV_PART_MAIN | LV_STATE_DEFAULT); + + ui_pageHome_labelstr23 = lv_label_create(ui_pageHome_panelResult1); + lv_obj_set_width(ui_pageHome_labelstr23, LV_SIZE_CONTENT); /// 1 + lv_obj_set_height(ui_pageHome_labelstr23, LV_SIZE_CONTENT); /// 1 + lv_obj_set_x(ui_pageHome_labelstr23, -89); + lv_obj_set_y(ui_pageHome_labelstr23, -98); + lv_obj_set_align(ui_pageHome_labelstr23, LV_ALIGN_CENTER); + lv_label_set_text(ui_pageHome_labelstr23, "测试结果:"); + lv_obj_set_style_text_font(ui_pageHome_labelstr23, &ui_font_MiSansN, LV_PART_MAIN | LV_STATE_DEFAULT); + ui_pageHome_panelStageBS = lv_obj_create(ui_pageHome_panelCenter); lv_obj_set_width(ui_pageHome_panelStageBS, 266); - lv_obj_set_height(ui_pageHome_panelStageBS, 122); + lv_obj_set_height(ui_pageHome_panelStageBS, 98); lv_obj_set_x(ui_pageHome_panelStageBS, 0); - lv_obj_set_y(ui_pageHome_panelStageBS, 68); + lv_obj_set_y(ui_pageHome_panelStageBS, 78); lv_obj_set_align(ui_pageHome_panelStageBS, LV_ALIGN_CENTER); lv_obj_clear_flag(ui_pageHome_panelStageBS, LV_OBJ_FLAG_SCROLLABLE); /// Flags ui_pageHome_buttonMinusBS = lv_btn_create(ui_pageHome_panelStageBS); lv_obj_set_width(ui_pageHome_buttonMinusBS, 100); lv_obj_set_height(ui_pageHome_buttonMinusBS, 80); - lv_obj_set_x(ui_pageHome_buttonMinusBS, -79); - lv_obj_set_y(ui_pageHome_buttonMinusBS, 2); + lv_obj_set_x(ui_pageHome_buttonMinusBS, -78); + lv_obj_set_y(ui_pageHome_buttonMinusBS, 0); lv_obj_set_align(ui_pageHome_buttonMinusBS, LV_ALIGN_CENTER); lv_obj_set_style_text_color(ui_pageHome_buttonMinusBS, lv_color_hex(0x050000), LV_PART_MAIN | LV_STATE_DEFAULT); lv_obj_set_style_text_opa(ui_pageHome_buttonMinusBS, 255, LV_PART_MAIN | LV_STATE_DEFAULT); @@ -700,7 +716,7 @@ void ui_pageHome_screen_init(void) lv_obj_set_width(ui_pageHome_buttonAddBS, 100); lv_obj_set_height(ui_pageHome_buttonAddBS, 80); lv_obj_set_x(ui_pageHome_buttonAddBS, 78); - lv_obj_set_y(ui_pageHome_buttonAddBS, 1); + lv_obj_set_y(ui_pageHome_buttonAddBS, 0); lv_obj_set_align(ui_pageHome_buttonAddBS, LV_ALIGN_CENTER); lv_obj_set_style_text_color(ui_pageHome_buttonAddBS, lv_color_hex(0x050000), LV_PART_MAIN | LV_STATE_DEFAULT); lv_obj_set_style_text_opa(ui_pageHome_buttonAddBS, 255, LV_PART_MAIN | LV_STATE_DEFAULT); @@ -719,8 +735,8 @@ void ui_pageHome_screen_init(void) ui_pageHome_labelstr10 = lv_label_create(ui_pageHome_panelStageBS); lv_obj_set_width(ui_pageHome_labelstr10, LV_SIZE_CONTENT); /// 1 lv_obj_set_height(ui_pageHome_labelstr10, LV_SIZE_CONTENT); /// 1 - lv_obj_set_x(ui_pageHome_labelstr10, 1); - lv_obj_set_y(ui_pageHome_labelstr10, -40); + lv_obj_set_x(ui_pageHome_labelstr10, 0); + lv_obj_set_y(ui_pageHome_labelstr10, -24); lv_obj_set_align(ui_pageHome_labelstr10, LV_ALIGN_CENTER); lv_label_set_text(ui_pageHome_labelstr10, "挡位"); lv_obj_set_style_text_font(ui_pageHome_labelstr10, &ui_font_homeText, LV_PART_MAIN | LV_STATE_DEFAULT); @@ -728,8 +744,8 @@ void ui_pageHome_screen_init(void) ui_pageHome_spinboxStageBS = lv_spinbox_create(ui_pageHome_panelStageBS); lv_obj_set_width(ui_pageHome_spinboxStageBS, 40); lv_obj_set_height(ui_pageHome_spinboxStageBS, 40); - lv_obj_set_x(ui_pageHome_spinboxStageBS, 1); - lv_obj_set_y(ui_pageHome_spinboxStageBS, 5); + lv_obj_set_x(ui_pageHome_spinboxStageBS, 0); + lv_obj_set_y(ui_pageHome_spinboxStageBS, 10); lv_obj_set_align(ui_pageHome_spinboxStageBS, LV_ALIGN_CENTER); lv_obj_clear_flag(ui_pageHome_spinboxStageBS, LV_OBJ_FLAG_CLICKABLE); /// Flags lv_spinbox_set_digit_format(ui_pageHome_spinboxStageBS, 1, 1); diff --git a/components/FluxUI/ui.c b/components/FluxUI/ui.c index e6969c5..909493e 100644 --- a/components/FluxUI/ui.c +++ b/components/FluxUI/ui.c @@ -94,6 +94,8 @@ void ui_event_pageHome_DropdownTestTypeBS(lv_event_t * e); lv_obj_t * ui_pageHome_DropdownTestTypeBS; lv_obj_t * ui_pageHome_labelstr21; lv_obj_t * ui_pageHome_labelstr7; +lv_obj_t * ui_pageHome_labelBSInfo; +lv_obj_t * ui_pageHome_labelstr23; lv_obj_t * ui_pageHome_panelStageBS; void ui_event_pageHome_buttonMinusBS(lv_event_t * e); lv_obj_t * ui_pageHome_buttonMinusBS; diff --git a/components/FluxUI/ui.h b/components/FluxUI/ui.h index 2fdfa96..ed5cdab 100644 --- a/components/FluxUI/ui.h +++ b/components/FluxUI/ui.h @@ -104,6 +104,8 @@ void ui_event_pageHome_DropdownTestTypeBS(lv_event_t * e); extern lv_obj_t * ui_pageHome_DropdownTestTypeBS; extern lv_obj_t * ui_pageHome_labelstr21; extern lv_obj_t * ui_pageHome_labelstr7; +extern lv_obj_t * ui_pageHome_labelBSInfo; +extern lv_obj_t * ui_pageHome_labelstr23; extern lv_obj_t * ui_pageHome_panelStageBS; void ui_event_pageHome_buttonMinusBS(lv_event_t * e); extern lv_obj_t * ui_pageHome_buttonMinusBS; diff --git a/main/main.cc b/main/main.cc deleted file mode 100644 index 1cb2c15..0000000 --- a/main/main.cc +++ /dev/null @@ -1,19 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: CC0-1.0 - */ - -#include "main.h" - -/*ͷļ*/ -#include "FluxButton.h" - -extern "C" void app_main(void) -{ - - - -} - -