jarvis/FluxDC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

根据SquareLine工程修改了Component中的代码

Browse Source
This commit is contained in:
ipason 2025-04-22 15:45:06 +08:00
parent c113f9ef94
commit 3f3ab57f78
5 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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)

48
components/FluxUI/screens/ui_pageHome.c
View File

@ -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);

2
components/FluxUI/ui.c
View File

@ -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;

2
components/FluxUI/ui.h
View File

@ -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;

19
main/main.cc
View File

@ -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)
{
}