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

解决了内存泄漏问题修改了部分UI

Browse Source
This commit is contained in:
jarvis 2025-03-15 17:03:59 +08:00
parent 9f9e88236f
commit 7f4a59a9f0
23 changed files with 289 additions and 639 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SquareLineProj/ESP32S3_UI.sll
View File

File diff suppressed because one or more lines are too long

738
SquareLineProj/ESP32S3_UI.spj
View File

@ -3657,6 +3657,17 @@
"strtype": "_style/StyleState",
"strval": "DEFAULT",
"childs": [
{
"nid": 11110,
"strtype": "_style/Padding",
"intarray": [
0,
0,
7,
0
],
"InheritedType": 7
},
{
"nid": 10430,
"strtype": "_style/Text_Align",
@ -3853,8 +3864,7 @@
"InheritedType": 11
}
],
"saved_objtypeKey": "PANEL",
"tree_closed": true
"saved_objtypeKey": "PANEL"
},
{
"guid": "GUID77843143-502753S622463",
@ -4089,13 +4099,11 @@
},
{
"nid": 90,
"flags": 1048576,
"strtype": "OBJECT/Flags",
"InheritedType": 1
},
{
"nid": 225,
"flags": 1048576,
"strtype": "OBJECT/Scrolling",
"InheritedType": 1
},
@ -4155,6 +4163,26 @@
"strtype": "_style/StyleState",
"strval": "DEFAULT",
"childs": [
{
"nid": 11110,
"strtype": "_style/Padding",
"intarray": [
0,
0,
7,
0
],
"InheritedType": 7
},
{
"nid": 11120,
"strtype": "_style/Padding_RowCol",
"intarray": [
10,
0
],
"InheritedType": 7
},
{
"nid": 10430,
"strtype": "_style/Text_Align",
@ -5022,8 +5050,7 @@
"InheritedType": 11
}
],
"saved_objtypeKey": "PANEL",
"tree_closed": true
"saved_objtypeKey": "PANEL"
},
{
"guid": "GUID47387928-502756S18364463",
@ -5250,13 +5277,11 @@
},
{
"nid": 90,
"flags": 1048576,
"strtype": "OBJECT/Flags",
"InheritedType": 1
},
{
"nid": 225,
"flags": 1048576,
"strtype": "OBJECT/Scrolling",
"InheritedType": 1
},
@ -5274,7 +5299,6 @@
},
{
"nid": 320,
"flags": 1048576,
"strtype": "OBJECT/States",
"InheritedType": 1
},
@ -5315,6 +5339,17 @@
"strtype": "_style/StyleState",
"strval": "DEFAULT",
"childs": [
{
"nid": 11110,
"strtype": "_style/Padding",
"intarray": [
0,
0,
7,
0
],
"InheritedType": 7
},
{
"nid": 10430,
"strtype": "_style/Text_Align",
@ -5502,8 +5537,7 @@
"InheritedType": 11
}
],
"saved_objtypeKey": "PANEL",
"tree_closed": true
"saved_objtypeKey": "PANEL"
},
{
"guid": "GUID64023593-781290S961474",
@ -6550,7 +6584,7 @@
"intarray": [
0,
0,
0,
7,
0
],
"InheritedType": 7
@ -6753,8 +6787,7 @@
"InheritedType": 11
}
],
"saved_objtypeKey": "PANEL",
"tree_closed": true
"saved_objtypeKey": "PANEL"
},
{
"guid": "GUID10723593-781291S942474",
@ -7506,7 +7539,7 @@
"strtype": "OBJECT/Position",
"intarray": [
111,
153
155
],
"InheritedType": 7
},
@ -7594,6 +7627,157 @@
"saved_objtypeKey": "PANEL",
"tree_closed": true
},
{
"guid": "GUID26706871-297447S167474",
"deepid": 1944903910,
"dont_export": false,
"locked": false,
"properties": [
{
"nid": 10,
"strtype": "OBJECT/Name",
"strval": "labelTestResult",
"childs": [
{
"nid": 15,
"strtype": "_codename/Codename",
"strval": "labelTestResult",
"InheritedType": 10
}
],
"InheritedType": 10
},
{
"nid": 20,
"strtype": "OBJECT/Layout",
"InheritedType": 1
},
{
"Flow": 0,
"Wrap": false,
"Reversed": false,
"MainAlignment": 0,
"CrossAlignment": 0,
"TrackAlignment": 0,
"LayoutType": 0,
"nid": 30,
"strtype": "OBJECT/Layout_type",
"strval": "No_layout",
"InheritedType": 13
},
{
"nid": 40,
"strtype": "OBJECT/Transform",
"InheritedType": 1
},
{
"nid": 50,
"flags": 17,
"strtype": "OBJECT/Position",
"intarray": [
111,
154
],
"InheritedType": 7
},
{
"nid": 60,
"flags": 51,
"strtype": "OBJECT/Size",
"intarray": [
1,
1
],
"InheritedType": 7
},
{
"nid": 70,
"strtype": "OBJECT/Align",
"strval": "CENTER",
"InheritedType": 3
},
{
"nid": 90,
"flags": 1048576,
"strtype": "OBJECT/Flags",
"InheritedType": 1
},
{
"nid": 110,
"strtype": "OBJECT/Clickable",
"strval": "False",
"InheritedType": 2
},
{
"nid": 225,
"flags": 1048576,
"strtype": "OBJECT/Scrolling",
"InheritedType": 1
},
{
"nid": 300,
"strtype": "OBJECT/Scrollbar_mode",
"strval": "AUTO",
"InheritedType": 3
},
{
"nid": 310,
"strtype": "OBJECT/Scroll_direction",
"strval": "ALL",
"InheritedType": 3
},
{
"nid": 314,
"strtype": "OBJECT/Scroll_snap_x",
"strval": "NONE",
"InheritedType": 3
},
{
"nid": 315,
"strtype": "OBJECT/Scroll_snap_y",
"strval": "NONE",
"InheritedType": 3
},
{
"nid": 320,
"flags": 1048576,
"strtype": "OBJECT/States",
"InheritedType": 1
},
{
"nid": 1010,
"strtype": "LABEL/Label",
"InheritedType": 1
},
{
"nid": 1020,
"strtype": "LABEL/Long_mode",
"strval": "WRAP",
"InheritedType": 3
},
{
"nid": 1030,
"strtype": "LABEL/Text",
"strval": "x",
"InheritedType": 10
},
{
"part": "lv.PART.MAIN",
"childs": [],
"nid": 1040,
"strtype": "LABEL/Style_main",
"strval": "lv.PART.MAIN, Text, Rectangle, Pad, Transform",
"InheritedType": 11
},
{
"nid": 1050,
"strtype": "LABEL/Recolor",
"strval": "False",
"InheritedType": 2
}
],
"saved_objtypeKey": "LABEL"
},
{
"guid": "GUID70334086-781297S602474",
"deepid": 203552275,
@ -7750,7 +7934,8 @@
"InheritedType": 2
}
],
"saved_objtypeKey": "LABEL"
"saved_objtypeKey": "LABEL",
"tree_closed": true
}
],
"dont_export": false,
@ -19575,514 +19760,6 @@
"saved_objtypeKey": "PANEL",
"tree_closed": true
},
{
"guid": "GUID57907189-416471S269470",
"deepid": -102409356,
"dont_export": false,
"locked": false,
"properties": [
{
"nid": 10,
"strtype": "OBJECT/Name",
"strval": "checkBoxWifi",
"InheritedType": 10
},
{
"nid": 20,
"strtype": "OBJECT/Layout",
"InheritedType": 1
},
{
"Flow": 0,
"Wrap": false,
"Reversed": false,
"MainAlignment": 0,
"CrossAlignment": 0,
"TrackAlignment": 0,
"LayoutType": 0,
"nid": 30,
"strtype": "OBJECT/Layout_type",
"strval": "No_layout",
"InheritedType": 13
},
{
"nid": 40,
"strtype": "OBJECT/Transform",
"InheritedType": 1
},
{
"nid": 50,
"flags": 17,
"strtype": "OBJECT/Position",
"intarray": [
-120,
-165
],
"InheritedType": 7
},
{
"nid": 60,
"flags": 51,
"strtype": "OBJECT/Size",
"intarray": [
1,
1
],
"InheritedType": 7
},
{
"nid": 70,
"strtype": "OBJECT/Align",
"strval": "CENTER",
"InheritedType": 3
},
{
"nid": 90,
"flags": 1048576,
"strtype": "OBJECT/Flags",
"InheritedType": 1
},
{
"nid": 225,
"flags": 1048576,
"strtype": "OBJECT/Scrolling",
"InheritedType": 1
},
{
"nid": 260,
"strtype": "OBJECT/Scroll_on_focus",
"strval": "True",
"InheritedType": 2
},
{
"nid": 314,
"strtype": "OBJECT/Scroll_snap_x",
"strval": "NONE",
"InheritedType": 3
},
{
"nid": 315,
"strtype": "OBJECT/Scroll_snap_y",
"strval": "NONE",
"InheritedType": 3
},
{
"nid": 320,
"flags": 1048576,
"strtype": "OBJECT/States",
"InheritedType": 1
},
{
"nid": 1010,
"strtype": "CHECKBOX/Checkbox",
"InheritedType": 1
},
{
"nid": 1020,
"strtype": "CHECKBOX/Title",
"strval": "wifi",
"InheritedType": 10
},
{
"part": "lv.PART.MAIN",
"childs": [],
"nid": 1030,
"strtype": "CHECKBOX/Style_main",
"strval": "lv.PART.MAIN, Text, Transform",
"InheritedType": 11
},
{
"part": "lv.PART.INDICATOR",
"childs": [],
"nid": 1040,
"strtype": "CHECKBOX/Style_bullet",
"strval": "lv.PART.INDICATOR, Rectangle, Pad",
"InheritedType": 11
}
],
"saved_objtypeKey": "CHECKBOX"
},
{
"guid": "GUID25875446-416474S51657470",
"deepid": -102409356,
"dont_export": false,
"locked": false,
"properties": [
{
"nid": 10,
"strtype": "OBJECT/Name",
"strval": "checkboxSerial1",
"InheritedType": 10
},
{
"nid": 20,
"strtype": "OBJECT/Layout",
"InheritedType": 1
},
{
"Flow": 0,
"Wrap": false,
"Reversed": false,
"MainAlignment": 0,
"CrossAlignment": 0,
"TrackAlignment": 0,
"LayoutType": 0,
"nid": 30,
"strtype": "OBJECT/Layout_type",
"strval": "No_layout",
"InheritedType": 13
},
{
"nid": 40,
"strtype": "OBJECT/Transform",
"InheritedType": 1
},
{
"nid": 50,
"flags": 17,
"strtype": "OBJECT/Position",
"intarray": [
-113,
-135
],
"InheritedType": 7
},
{
"nid": 60,
"flags": 51,
"strtype": "OBJECT/Size",
"intarray": [
1,
1
],
"InheritedType": 7
},
{
"nid": 70,
"strtype": "OBJECT/Align",
"strval": "CENTER",
"InheritedType": 3
},
{
"nid": 90,
"flags": 1048576,
"strtype": "OBJECT/Flags",
"InheritedType": 1
},
{
"nid": 225,
"flags": 1048576,
"strtype": "OBJECT/Scrolling",
"InheritedType": 1
},
{
"nid": 260,
"strtype": "OBJECT/Scroll_on_focus",
"strval": "True",
"InheritedType": 2
},
{
"nid": 314,
"strtype": "OBJECT/Scroll_snap_x",
"strval": "NONE",
"InheritedType": 3
},
{
"nid": 315,
"strtype": "OBJECT/Scroll_snap_y",
"strval": "NONE",
"InheritedType": 3
},
{
"nid": 320,
"flags": 1048576,
"strtype": "OBJECT/States",
"InheritedType": 1
},
{
"nid": 1010,
"strtype": "CHECKBOX/Checkbox",
"InheritedType": 1
},
{
"nid": 1020,
"strtype": "CHECKBOX/Title",
"strval": "serial1",
"InheritedType": 10
},
{
"part": "lv.PART.MAIN",
"childs": [],
"nid": 1030,
"strtype": "CHECKBOX/Style_main",
"strval": "lv.PART.MAIN, Text, Transform",
"InheritedType": 11
},
{
"part": "lv.PART.INDICATOR",
"childs": [],
"nid": 1040,
"strtype": "CHECKBOX/Style_bullet",
"strval": "lv.PART.INDICATOR, Rectangle, Pad",
"InheritedType": 11
}
],
"saved_objtypeKey": "CHECKBOX"
},
{
"guid": "GUID93935927-416475S951470",
"deepid": -102409356,
"dont_export": false,
"locked": false,
"properties": [
{
"nid": 10,
"strtype": "OBJECT/Name",
"strval": "checkBoxSerial2",
"InheritedType": 10
},
{
"nid": 20,
"strtype": "OBJECT/Layout",
"InheritedType": 1
},
{
"Flow": 0,
"Wrap": false,
"Reversed": false,
"MainAlignment": 0,
"CrossAlignment": 0,
"TrackAlignment": 0,
"LayoutType": 0,
"nid": 30,
"strtype": "OBJECT/Layout_type",
"strval": "No_layout",
"InheritedType": 13
},
{
"nid": 40,
"strtype": "OBJECT/Transform",
"InheritedType": 1
},
{
"nid": 50,
"flags": 17,
"strtype": "OBJECT/Position",
"intarray": [
-110,
-103
],
"InheritedType": 7
},
{
"nid": 60,
"flags": 51,
"strtype": "OBJECT/Size",
"intarray": [
1,
1
],
"InheritedType": 7
},
{
"nid": 70,
"strtype": "OBJECT/Align",
"strval": "CENTER",
"InheritedType": 3
},
{
"nid": 90,
"flags": 1048576,
"strtype": "OBJECT/Flags",
"InheritedType": 1
},
{
"nid": 225,
"flags": 1048576,
"strtype": "OBJECT/Scrolling",
"InheritedType": 1
},
{
"nid": 260,
"strtype": "OBJECT/Scroll_on_focus",
"strval": "True",
"InheritedType": 2
},
{
"nid": 314,
"strtype": "OBJECT/Scroll_snap_x",
"strval": "NONE",
"InheritedType": 3
},
{
"nid": 315,
"strtype": "OBJECT/Scroll_snap_y",
"strval": "NONE",
"InheritedType": 3
},
{
"nid": 320,
"flags": 1048576,
"strtype": "OBJECT/States",
"InheritedType": 1
},
{
"nid": 1010,
"strtype": "CHECKBOX/Checkbox",
"InheritedType": 1
},
{
"nid": 1020,
"strtype": "CHECKBOX/Title",
"strval": "serial2",
"InheritedType": 10
},
{
"part": "lv.PART.MAIN",
"childs": [],
"nid": 1030,
"strtype": "CHECKBOX/Style_main",
"strval": "lv.PART.MAIN, Text, Transform",
"InheritedType": 11
},
{
"part": "lv.PART.INDICATOR",
"childs": [],
"nid": 1040,
"strtype": "CHECKBOX/Style_bullet",
"strval": "lv.PART.INDICATOR, Rectangle, Pad",
"InheritedType": 11
}
],
"saved_objtypeKey": "CHECKBOX"
},
{
"guid": "GUID44499403-416476S21931470",
"deepid": -102409356,
"dont_export": false,
"locked": false,
"properties": [
{
"nid": 10,
"strtype": "OBJECT/Name",
"strval": "checkBoxPower",
"InheritedType": 10
},
{
"nid": 20,
"strtype": "OBJECT/Layout",
"InheritedType": 1
},
{
"Flow": 0,
"Wrap": false,
"Reversed": false,
"MainAlignment": 0,
"CrossAlignment": 0,
"TrackAlignment": 0,
"LayoutType": 0,
"nid": 30,
"strtype": "OBJECT/Layout_type",
"strval": "No_layout",
"InheritedType": 13
},
{
"nid": 40,
"strtype": "OBJECT/Transform",
"InheritedType": 1
},
{
"nid": 50,
"flags": 17,
"strtype": "OBJECT/Position",
"intarray": [
-110,
-69
],
"InheritedType": 7
},
{
"nid": 60,
"flags": 51,
"strtype": "OBJECT/Size",
"intarray": [
1,
1
],
"InheritedType": 7
},
{
"nid": 70,
"strtype": "OBJECT/Align",
"strval": "CENTER",
"InheritedType": 3
},
{
"nid": 90,
"flags": 1048576,
"strtype": "OBJECT/Flags",
"InheritedType": 1
},
{
"nid": 225,
"flags": 1048576,
"strtype": "OBJECT/Scrolling",
"InheritedType": 1
},
{
"nid": 260,
"strtype": "OBJECT/Scroll_on_focus",
"strval": "True",
"InheritedType": 2
},
{
"nid": 314,
"strtype": "OBJECT/Scroll_snap_x",
"strval": "NONE",
"InheritedType": 3
},
{
"nid": 315,
"strtype": "OBJECT/Scroll_snap_y",
"strval": "NONE",
"InheritedType": 3
},
{
"nid": 320,
"flags": 1048576,
"strtype": "OBJECT/States",
"InheritedType": 1
},
{
"nid": 1010,
"strtype": "CHECKBOX/Checkbox",
"InheritedType": 1
},
{
"nid": 1020,
"strtype": "CHECKBOX/Title",
"strval": "power",
"InheritedType": 10
},
{
"part": "lv.PART.MAIN",
"childs": [],
"nid": 1030,
"strtype": "CHECKBOX/Style_main",
"strval": "lv.PART.MAIN, Text, Transform",
"InheritedType": 11
},
{
"part": "lv.PART.INDICATOR",
"childs": [],
"nid": 1040,
"strtype": "CHECKBOX/Style_bullet",
"strval": "lv.PART.INDICATOR, Rectangle, Pad",
"InheritedType": 11
}
],
"saved_objtypeKey": "CHECKBOX"
},
{
"guid": "GUID90899674-304006S666472",
"deepid": 1169826023,
@ -20268,8 +19945,8 @@
"flags": 17,
"strtype": "OBJECT/Position",
"intarray": [
-109,
-32
-107,
-153
],
"InheritedType": 7
},
@ -20405,8 +20082,7 @@
"InheritedType": 4
}
],
"saved_objtypeKey": "BUTTON",
"tree_closed": true
"saved_objtypeKey": "BUTTON"
},
{
"guid": "GUID35442921-304010S582472",
@ -20781,8 +20457,8 @@
"flags": 17,
"strtype": "OBJECT/Position",
"intarray": [
-109,
14
-106,
-106
],
"InheritedType": 7
},
@ -28034,7 +27710,7 @@
"uiExportFolderPath": "D:\\yuwell_workspace\\FluxDC\\SquareLineProj\\Export",
"projectExportFolderPath": "D:\\yuwell_workspace\\FluxDC\\SquareLineProj\\Export",
"custom_variable_prefix": "uic",
"backup_cnt": 832,
"backup_cnt": 843,
"autosave_cnt": 0,
"group_color_cnt": 0,
"lvgl_version": "8.3.6",

44
SquareLineProj/Export/screens/ui_pageDebug.c
View File

@ -66,47 +66,11 @@ void ui_pageDebug_screen_init(void)
lv_obj_set_scrollbar_mode(ui_pageDebug_textAreaContent, LV_SCROLLBAR_MODE_ACTIVE);
lv_obj_set_scroll_dir(ui_pageDebug_textAreaContent, LV_DIR_VER);
ui_pageDebug_checkBoxWifi = lv_checkbox_create(ui_pageDebug);
lv_checkbox_set_text(ui_pageDebug_checkBoxWifi, "wifi");
lv_obj_set_width(ui_pageDebug_checkBoxWifi, LV_SIZE_CONTENT); /// 1
lv_obj_set_height(ui_pageDebug_checkBoxWifi, LV_SIZE_CONTENT); /// 1
lv_obj_set_x(ui_pageDebug_checkBoxWifi, -120);
lv_obj_set_y(ui_pageDebug_checkBoxWifi, -165);
lv_obj_set_align(ui_pageDebug_checkBoxWifi, LV_ALIGN_CENTER);
lv_obj_add_flag(ui_pageDebug_checkBoxWifi, LV_OBJ_FLAG_SCROLL_ON_FOCUS); /// Flags
ui_pageDebug_checkboxSerial1 = lv_checkbox_create(ui_pageDebug);
lv_checkbox_set_text(ui_pageDebug_checkboxSerial1, "serial1");
lv_obj_set_width(ui_pageDebug_checkboxSerial1, LV_SIZE_CONTENT); /// 1
lv_obj_set_height(ui_pageDebug_checkboxSerial1, LV_SIZE_CONTENT); /// 1
lv_obj_set_x(ui_pageDebug_checkboxSerial1, -113);
lv_obj_set_y(ui_pageDebug_checkboxSerial1, -135);
lv_obj_set_align(ui_pageDebug_checkboxSerial1, LV_ALIGN_CENTER);
lv_obj_add_flag(ui_pageDebug_checkboxSerial1, LV_OBJ_FLAG_SCROLL_ON_FOCUS); /// Flags
ui_pageDebug_checkBoxSerial2 = lv_checkbox_create(ui_pageDebug);
lv_checkbox_set_text(ui_pageDebug_checkBoxSerial2, "serial2");
lv_obj_set_width(ui_pageDebug_checkBoxSerial2, LV_SIZE_CONTENT); /// 1
lv_obj_set_height(ui_pageDebug_checkBoxSerial2, LV_SIZE_CONTENT); /// 1
lv_obj_set_x(ui_pageDebug_checkBoxSerial2, -110);
lv_obj_set_y(ui_pageDebug_checkBoxSerial2, -103);
lv_obj_set_align(ui_pageDebug_checkBoxSerial2, LV_ALIGN_CENTER);
lv_obj_add_flag(ui_pageDebug_checkBoxSerial2, LV_OBJ_FLAG_SCROLL_ON_FOCUS); /// Flags
ui_pageDebug_checkBoxPower = lv_checkbox_create(ui_pageDebug);
lv_checkbox_set_text(ui_pageDebug_checkBoxPower, "power");
lv_obj_set_width(ui_pageDebug_checkBoxPower, LV_SIZE_CONTENT); /// 1
lv_obj_set_height(ui_pageDebug_checkBoxPower, LV_SIZE_CONTENT); /// 1
lv_obj_set_x(ui_pageDebug_checkBoxPower, -110);
lv_obj_set_y(ui_pageDebug_checkBoxPower, -69);
lv_obj_set_align(ui_pageDebug_checkBoxPower, LV_ALIGN_CENTER);
lv_obj_add_flag(ui_pageDebug_checkBoxPower, LV_OBJ_FLAG_SCROLL_ON_FOCUS); /// Flags
ui_pageDebug_buttonFluxRead = lv_btn_create(ui_pageDebug);
lv_obj_set_width(ui_pageDebug_buttonFluxRead, 80);
lv_obj_set_height(ui_pageDebug_buttonFluxRead, 30);
lv_obj_set_x(ui_pageDebug_buttonFluxRead, -109);
lv_obj_set_y(ui_pageDebug_buttonFluxRead, -32);
lv_obj_set_x(ui_pageDebug_buttonFluxRead, -107);
lv_obj_set_y(ui_pageDebug_buttonFluxRead, -153);
lv_obj_set_align(ui_pageDebug_buttonFluxRead, LV_ALIGN_CENTER);
ui_pageDebug_labelReadFlux = lv_label_create(ui_pageDebug_buttonFluxRead);
@ -132,8 +96,8 @@ void ui_pageDebug_screen_init(void)
lv_dropdown_set_options(ui_pageDebug_dropdownFunctionCode, "Read\nSet");
lv_obj_set_width(ui_pageDebug_dropdownFunctionCode, 80);
lv_obj_set_height(ui_pageDebug_dropdownFunctionCode, LV_SIZE_CONTENT); /// 1
lv_obj_set_x(ui_pageDebug_dropdownFunctionCode, -109);
lv_obj_set_y(ui_pageDebug_dropdownFunctionCode, 14);
lv_obj_set_x(ui_pageDebug_dropdownFunctionCode, -106);
lv_obj_set_y(ui_pageDebug_dropdownFunctionCode, -106);
lv_obj_set_align(ui_pageDebug_dropdownFunctionCode, LV_ALIGN_CENTER);
lv_obj_add_flag(ui_pageDebug_dropdownFunctionCode, LV_OBJ_FLAG_SCROLL_ON_FOCUS); /// Flags

27
SquareLineProj/Export/screens/ui_pageHome.c
View File

@ -246,6 +246,10 @@ void ui_pageHome_screen_init(void)
lv_spinbox_set_digit_format(ui_pageHome_spinboxStandardValue, 4, 0);
lv_spinbox_set_range(ui_pageHome_spinboxStandardValue, 0, 9999);
lv_spinbox_set_cursor_pos(ui_pageHome_spinboxStandardValue, 1 - 1);
lv_obj_set_style_pad_left(ui_pageHome_spinboxStandardValue, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_right(ui_pageHome_spinboxStandardValue, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_top(ui_pageHome_spinboxStandardValue, 7, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_bottom(ui_pageHome_spinboxStandardValue, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_text_align(ui_pageHome_spinboxStandardValue, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_text_font(ui_pageHome_spinboxStandardValue, &ui_font_homePanelLabel, LV_PART_MAIN | LV_STATE_DEFAULT);
@ -282,6 +286,12 @@ void ui_pageHome_screen_init(void)
lv_spinbox_set_range(ui_pageHome_spinboxRate, 15, 40);
lv_spinbox_set_cursor_pos(ui_pageHome_spinboxRate, 1 - 1);
lv_spinbox_set_value(ui_pageHome_spinboxRate, 15);
lv_obj_set_style_pad_left(ui_pageHome_spinboxRate, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_right(ui_pageHome_spinboxRate, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_top(ui_pageHome_spinboxRate, 7, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_bottom(ui_pageHome_spinboxRate, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_row(ui_pageHome_spinboxRate, 10, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_column(ui_pageHome_spinboxRate, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_text_align(ui_pageHome_spinboxRate, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_text_font(ui_pageHome_spinboxRate, &ui_font_homePanelLabel, LV_PART_MAIN | LV_STATE_DEFAULT);
@ -348,6 +358,10 @@ void ui_pageHome_screen_init(void)
lv_spinbox_set_digit_format(ui_pageHome_spinboxResult, 3, 0);
lv_spinbox_set_range(ui_pageHome_spinboxResult, 0, 999);
lv_spinbox_set_cursor_pos(ui_pageHome_spinboxResult, 1 - 1);
lv_obj_set_style_pad_left(ui_pageHome_spinboxResult, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_right(ui_pageHome_spinboxResult, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_top(ui_pageHome_spinboxResult, 7, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_bottom(ui_pageHome_spinboxResult, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_text_align(ui_pageHome_spinboxResult, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_text_font(ui_pageHome_spinboxResult, &ui_font_homePanelLabel, LV_PART_MAIN | LV_STATE_DEFAULT);
@ -426,7 +440,7 @@ void ui_pageHome_screen_init(void)
lv_spinbox_set_value(ui_pageHome_spinboxStage, 1);
lv_obj_set_style_pad_left(ui_pageHome_spinboxStage, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_right(ui_pageHome_spinboxStage, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_top(ui_pageHome_spinboxStage, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_top(ui_pageHome_spinboxStage, 7, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_bottom(ui_pageHome_spinboxStage, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_text_color(ui_pageHome_spinboxStage, lv_color_hex(0x030000), LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_text_opa(ui_pageHome_spinboxStage, 255, LV_PART_MAIN | LV_STATE_DEFAULT);
@ -479,10 +493,18 @@ void ui_pageHome_screen_init(void)
lv_obj_set_width(ui_pageHome_panelTestResult, 30);
lv_obj_set_height(ui_pageHome_panelTestResult, 30);
lv_obj_set_x(ui_pageHome_panelTestResult, 111);
lv_obj_set_y(ui_pageHome_panelTestResult, 153);
lv_obj_set_y(ui_pageHome_panelTestResult, 155);
lv_obj_set_align(ui_pageHome_panelTestResult, LV_ALIGN_CENTER);
lv_obj_clear_flag(ui_pageHome_panelTestResult, LV_OBJ_FLAG_SCROLLABLE); /// Flags
ui_pageHome_labelTestResult = lv_label_create(ui_pageHome_panelLeft);
lv_obj_set_width(ui_pageHome_labelTestResult, LV_SIZE_CONTENT); /// 1
lv_obj_set_height(ui_pageHome_labelTestResult, LV_SIZE_CONTENT); /// 1
lv_obj_set_x(ui_pageHome_labelTestResult, 111);
lv_obj_set_y(ui_pageHome_labelTestResult, 154);
lv_obj_set_align(ui_pageHome_labelTestResult, LV_ALIGN_CENTER);
lv_label_set_text(ui_pageHome_labelTestResult, "x");
ui_pageHome_labelstr3 = lv_label_create(ui_pageHome_panelLeft);
lv_obj_set_width(ui_pageHome_labelstr3, LV_SIZE_CONTENT); /// 1
lv_obj_set_height(ui_pageHome_labelstr3, LV_SIZE_CONTENT); /// 1
@ -555,5 +577,6 @@ void ui_pageHome_screen_init(void)
uic_pageHome_spinboxRate = ui_pageHome_spinboxRate;
uic_pageHome_labelCurrentStage = ui_pageHome_labelCurrentStage;
uic_pageHome_textAreaResultStage = ui_pageHome_textAreaResultStage;
uic_pageHome_labelTestResult = ui_pageHome_labelTestResult;
}

6
SquareLineProj/Export/ui.c
View File

@ -70,6 +70,7 @@ lv_obj_t * ui_pageHome_textAreaResultStage;
lv_obj_t * ui_pageHome_labelstr2;
lv_obj_t * ui_pageHome_textAreaResultRate;
lv_obj_t * ui_pageHome_panelTestResult;
lv_obj_t * ui_pageHome_labelTestResult;
lv_obj_t * ui_pageHome_labelstr3;
void ui_event_pageHome_buttonStartTest(lv_event_t * e);
lv_obj_t * ui_pageHome_buttonStartTest;
@ -82,6 +83,7 @@ lv_obj_t * uic_panelNominal;
lv_obj_t * uic_pageHome_spinboxRate;
lv_obj_t * uic_pageHome_labelCurrentStage;
lv_obj_t * uic_pageHome_textAreaResultStage;
lv_obj_t * uic_pageHome_labelTestResult;
// SCREEN: ui_pageSetting
void ui_pageSetting_screen_init(void);
@ -177,10 +179,6 @@ lv_obj_t * ui_pageDebug_labelBack;
void ui_event_pageDebug_panelBody(lv_event_t * e);
lv_obj_t * ui_pageDebug_panelBody;
lv_obj_t * ui_pageDebug_textAreaContent;
lv_obj_t * ui_pageDebug_checkBoxWifi;
lv_obj_t * ui_pageDebug_checkboxSerial1;
lv_obj_t * ui_pageDebug_checkBoxSerial2;
lv_obj_t * ui_pageDebug_checkBoxPower;
void ui_event_pageDebug_buttonFluxRead(lv_event_t * e);
lv_obj_t * ui_pageDebug_buttonFluxRead;
lv_obj_t * ui_pageDebug_labelReadFlux;

6
SquareLineProj/Export/ui.h
View File

@ -78,6 +78,7 @@ extern lv_obj_t * ui_pageHome_textAreaResultStage;
extern lv_obj_t * ui_pageHome_labelstr2;
extern lv_obj_t * ui_pageHome_textAreaResultRate;
extern lv_obj_t * ui_pageHome_panelTestResult;
extern lv_obj_t * ui_pageHome_labelTestResult;
extern lv_obj_t * ui_pageHome_labelstr3;
void ui_event_pageHome_buttonStartTest(lv_event_t * e);
extern lv_obj_t * ui_pageHome_buttonStartTest;
@ -90,6 +91,7 @@ extern lv_obj_t * uic_panelNominal;
extern lv_obj_t * uic_pageHome_spinboxRate;
extern lv_obj_t * uic_pageHome_labelCurrentStage;
extern lv_obj_t * uic_pageHome_textAreaResultStage;
extern lv_obj_t * uic_pageHome_labelTestResult;
// SCREEN: ui_pageSetting
void ui_pageSetting_screen_init(void);
@ -185,10 +187,6 @@ extern lv_obj_t * ui_pageDebug_labelBack;
void ui_event_pageDebug_panelBody(lv_event_t * e);
extern lv_obj_t * ui_pageDebug_panelBody;
extern lv_obj_t * ui_pageDebug_textAreaContent;
extern lv_obj_t * ui_pageDebug_checkBoxWifi;
extern lv_obj_t * ui_pageDebug_checkboxSerial1;
extern lv_obj_t * ui_pageDebug_checkBoxSerial2;
extern lv_obj_t * ui_pageDebug_checkBoxPower;
void ui_event_pageDebug_buttonFluxRead(lv_event_t * e);
extern lv_obj_t * ui_pageDebug_buttonFluxRead;
extern lv_obj_t * ui_pageDebug_labelReadFlux;

BIN
SquareLineProj/backup/ESP32S3_UI_backup00.zip
View File

Binary file not shown.

BIN
SquareLineProj/backup/ESP32S3_UI_backup01.zip
View File

Binary file not shown.

BIN
SquareLineProj/backup/ESP32S3_UI_backup02.zip
View File

Binary file not shown.

BIN
SquareLineProj/backup/ESP32S3_UI_backup03.zip
View File

Binary file not shown.

BIN
SquareLineProj/backup/ESP32S3_UI_backup04.zip
View File

Binary file not shown.

BIN
SquareLineProj/backup/ESP32S3_UI_backup05.zip
View File

Binary file not shown.

BIN
SquareLineProj/backup/ESP32S3_UI_backup06.zip
View File

Binary file not shown.

BIN
SquareLineProj/backup/ESP32S3_UI_backup07.zip
View File

Binary file not shown.

BIN
SquareLineProj/backup/ESP32S3_UI_backup08.zip
View File

Binary file not shown.

BIN
SquareLineProj/backup/ESP32S3_UI_backup09.zip
View File

Binary file not shown.

44
components/FluxUI/screens/ui_pageDebug.c
View File

@ -66,47 +66,11 @@ void ui_pageDebug_screen_init(void)
lv_obj_set_scrollbar_mode(ui_pageDebug_textAreaContent, LV_SCROLLBAR_MODE_ACTIVE);
lv_obj_set_scroll_dir(ui_pageDebug_textAreaContent, LV_DIR_VER);
ui_pageDebug_checkBoxWifi = lv_checkbox_create(ui_pageDebug);
lv_checkbox_set_text(ui_pageDebug_checkBoxWifi, "wifi");
lv_obj_set_width(ui_pageDebug_checkBoxWifi, LV_SIZE_CONTENT); /// 1
lv_obj_set_height(ui_pageDebug_checkBoxWifi, LV_SIZE_CONTENT); /// 1
lv_obj_set_x(ui_pageDebug_checkBoxWifi, -120);
lv_obj_set_y(ui_pageDebug_checkBoxWifi, -165);
lv_obj_set_align(ui_pageDebug_checkBoxWifi, LV_ALIGN_CENTER);
lv_obj_add_flag(ui_pageDebug_checkBoxWifi, LV_OBJ_FLAG_SCROLL_ON_FOCUS); /// Flags
ui_pageDebug_checkboxSerial1 = lv_checkbox_create(ui_pageDebug);
lv_checkbox_set_text(ui_pageDebug_checkboxSerial1, "serial1");
lv_obj_set_width(ui_pageDebug_checkboxSerial1, LV_SIZE_CONTENT); /// 1
lv_obj_set_height(ui_pageDebug_checkboxSerial1, LV_SIZE_CONTENT); /// 1
lv_obj_set_x(ui_pageDebug_checkboxSerial1, -113);
lv_obj_set_y(ui_pageDebug_checkboxSerial1, -135);
lv_obj_set_align(ui_pageDebug_checkboxSerial1, LV_ALIGN_CENTER);
lv_obj_add_flag(ui_pageDebug_checkboxSerial1, LV_OBJ_FLAG_SCROLL_ON_FOCUS); /// Flags
ui_pageDebug_checkBoxSerial2 = lv_checkbox_create(ui_pageDebug);
lv_checkbox_set_text(ui_pageDebug_checkBoxSerial2, "serial2");
lv_obj_set_width(ui_pageDebug_checkBoxSerial2, LV_SIZE_CONTENT); /// 1
lv_obj_set_height(ui_pageDebug_checkBoxSerial2, LV_SIZE_CONTENT); /// 1
lv_obj_set_x(ui_pageDebug_checkBoxSerial2, -110);
lv_obj_set_y(ui_pageDebug_checkBoxSerial2, -103);
lv_obj_set_align(ui_pageDebug_checkBoxSerial2, LV_ALIGN_CENTER);
lv_obj_add_flag(ui_pageDebug_checkBoxSerial2, LV_OBJ_FLAG_SCROLL_ON_FOCUS); /// Flags
ui_pageDebug_checkBoxPower = lv_checkbox_create(ui_pageDebug);
lv_checkbox_set_text(ui_pageDebug_checkBoxPower, "power");
lv_obj_set_width(ui_pageDebug_checkBoxPower, LV_SIZE_CONTENT); /// 1
lv_obj_set_height(ui_pageDebug_checkBoxPower, LV_SIZE_CONTENT); /// 1
lv_obj_set_x(ui_pageDebug_checkBoxPower, -110);
lv_obj_set_y(ui_pageDebug_checkBoxPower, -69);
lv_obj_set_align(ui_pageDebug_checkBoxPower, LV_ALIGN_CENTER);
lv_obj_add_flag(ui_pageDebug_checkBoxPower, LV_OBJ_FLAG_SCROLL_ON_FOCUS); /// Flags
ui_pageDebug_buttonFluxRead = lv_btn_create(ui_pageDebug);
lv_obj_set_width(ui_pageDebug_buttonFluxRead, 80);
lv_obj_set_height(ui_pageDebug_buttonFluxRead, 30);
lv_obj_set_x(ui_pageDebug_buttonFluxRead, -109);
lv_obj_set_y(ui_pageDebug_buttonFluxRead, -32);
lv_obj_set_x(ui_pageDebug_buttonFluxRead, -107);
lv_obj_set_y(ui_pageDebug_buttonFluxRead, -153);
lv_obj_set_align(ui_pageDebug_buttonFluxRead, LV_ALIGN_CENTER);
ui_pageDebug_labelReadFlux = lv_label_create(ui_pageDebug_buttonFluxRead);
@ -132,8 +96,8 @@ void ui_pageDebug_screen_init(void)
lv_dropdown_set_options(ui_pageDebug_dropdownFunctionCode, "Read\nSet");
lv_obj_set_width(ui_pageDebug_dropdownFunctionCode, 80);
lv_obj_set_height(ui_pageDebug_dropdownFunctionCode, LV_SIZE_CONTENT); /// 1
lv_obj_set_x(ui_pageDebug_dropdownFunctionCode, -109);
lv_obj_set_y(ui_pageDebug_dropdownFunctionCode, 14);
lv_obj_set_x(ui_pageDebug_dropdownFunctionCode, -106);
lv_obj_set_y(ui_pageDebug_dropdownFunctionCode, -106);
lv_obj_set_align(ui_pageDebug_dropdownFunctionCode, LV_ALIGN_CENTER);
lv_obj_add_flag(ui_pageDebug_dropdownFunctionCode, LV_OBJ_FLAG_SCROLL_ON_FOCUS); /// Flags

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

@ -246,6 +246,10 @@ void ui_pageHome_screen_init(void)
lv_spinbox_set_digit_format(ui_pageHome_spinboxStandardValue, 4, 0);
lv_spinbox_set_range(ui_pageHome_spinboxStandardValue, 0, 9999);
lv_spinbox_set_cursor_pos(ui_pageHome_spinboxStandardValue, 1 - 1);
lv_obj_set_style_pad_left(ui_pageHome_spinboxStandardValue, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_right(ui_pageHome_spinboxStandardValue, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_top(ui_pageHome_spinboxStandardValue, 7, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_bottom(ui_pageHome_spinboxStandardValue, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_text_align(ui_pageHome_spinboxStandardValue, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_text_font(ui_pageHome_spinboxStandardValue, &ui_font_homePanelLabel, LV_PART_MAIN | LV_STATE_DEFAULT);
@ -282,6 +286,12 @@ void ui_pageHome_screen_init(void)
lv_spinbox_set_range(ui_pageHome_spinboxRate, 15, 40);
lv_spinbox_set_cursor_pos(ui_pageHome_spinboxRate, 1 - 1);
lv_spinbox_set_value(ui_pageHome_spinboxRate, 15);
lv_obj_set_style_pad_left(ui_pageHome_spinboxRate, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_right(ui_pageHome_spinboxRate, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_top(ui_pageHome_spinboxRate, 7, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_bottom(ui_pageHome_spinboxRate, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_row(ui_pageHome_spinboxRate, 10, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_column(ui_pageHome_spinboxRate, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_text_align(ui_pageHome_spinboxRate, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_text_font(ui_pageHome_spinboxRate, &ui_font_homePanelLabel, LV_PART_MAIN | LV_STATE_DEFAULT);
@ -348,6 +358,10 @@ void ui_pageHome_screen_init(void)
lv_spinbox_set_digit_format(ui_pageHome_spinboxResult, 3, 0);
lv_spinbox_set_range(ui_pageHome_spinboxResult, 0, 999);
lv_spinbox_set_cursor_pos(ui_pageHome_spinboxResult, 1 - 1);
lv_obj_set_style_pad_left(ui_pageHome_spinboxResult, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_right(ui_pageHome_spinboxResult, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_top(ui_pageHome_spinboxResult, 7, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_bottom(ui_pageHome_spinboxResult, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_text_align(ui_pageHome_spinboxResult, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_text_font(ui_pageHome_spinboxResult, &ui_font_homePanelLabel, LV_PART_MAIN | LV_STATE_DEFAULT);
@ -426,7 +440,7 @@ void ui_pageHome_screen_init(void)
lv_spinbox_set_value(ui_pageHome_spinboxStage, 1);
lv_obj_set_style_pad_left(ui_pageHome_spinboxStage, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_right(ui_pageHome_spinboxStage, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_top(ui_pageHome_spinboxStage, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_top(ui_pageHome_spinboxStage, 7, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_bottom(ui_pageHome_spinboxStage, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_text_color(ui_pageHome_spinboxStage, lv_color_hex(0x030000), LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_text_opa(ui_pageHome_spinboxStage, 255, LV_PART_MAIN | LV_STATE_DEFAULT);
@ -479,10 +493,18 @@ void ui_pageHome_screen_init(void)
lv_obj_set_width(ui_pageHome_panelTestResult, 30);
lv_obj_set_height(ui_pageHome_panelTestResult, 30);
lv_obj_set_x(ui_pageHome_panelTestResult, 111);
lv_obj_set_y(ui_pageHome_panelTestResult, 153);
lv_obj_set_y(ui_pageHome_panelTestResult, 155);
lv_obj_set_align(ui_pageHome_panelTestResult, LV_ALIGN_CENTER);
lv_obj_clear_flag(ui_pageHome_panelTestResult, LV_OBJ_FLAG_SCROLLABLE); /// Flags
ui_pageHome_labelTestResult = lv_label_create(ui_pageHome_panelLeft);
lv_obj_set_width(ui_pageHome_labelTestResult, LV_SIZE_CONTENT); /// 1
lv_obj_set_height(ui_pageHome_labelTestResult, LV_SIZE_CONTENT); /// 1
lv_obj_set_x(ui_pageHome_labelTestResult, 111);
lv_obj_set_y(ui_pageHome_labelTestResult, 154);
lv_obj_set_align(ui_pageHome_labelTestResult, LV_ALIGN_CENTER);
lv_label_set_text(ui_pageHome_labelTestResult, "x");
ui_pageHome_labelstr3 = lv_label_create(ui_pageHome_panelLeft);
lv_obj_set_width(ui_pageHome_labelstr3, LV_SIZE_CONTENT); /// 1
lv_obj_set_height(ui_pageHome_labelstr3, LV_SIZE_CONTENT); /// 1
@ -555,5 +577,6 @@ void ui_pageHome_screen_init(void)
uic_pageHome_spinboxRate = ui_pageHome_spinboxRate;
uic_pageHome_labelCurrentStage = ui_pageHome_labelCurrentStage;
uic_pageHome_textAreaResultStage = ui_pageHome_textAreaResultStage;
uic_pageHome_labelTestResult = ui_pageHome_labelTestResult;
}

6
components/FluxUI/ui.c
View File

@ -70,6 +70,7 @@ lv_obj_t * ui_pageHome_textAreaResultStage;
lv_obj_t * ui_pageHome_labelstr2;
lv_obj_t * ui_pageHome_textAreaResultRate;
lv_obj_t * ui_pageHome_panelTestResult;
lv_obj_t * ui_pageHome_labelTestResult;
lv_obj_t * ui_pageHome_labelstr3;
void ui_event_pageHome_buttonStartTest(lv_event_t * e);
lv_obj_t * ui_pageHome_buttonStartTest;
@ -82,6 +83,7 @@ lv_obj_t * uic_panelNominal;
lv_obj_t * uic_pageHome_spinboxRate;
lv_obj_t * uic_pageHome_labelCurrentStage;
lv_obj_t * uic_pageHome_textAreaResultStage;
lv_obj_t * uic_pageHome_labelTestResult;
// SCREEN: ui_pageSetting
void ui_pageSetting_screen_init(void);
@ -177,10 +179,6 @@ lv_obj_t * ui_pageDebug_labelBack;
void ui_event_pageDebug_panelBody(lv_event_t * e);
lv_obj_t * ui_pageDebug_panelBody;
lv_obj_t * ui_pageDebug_textAreaContent;
lv_obj_t * ui_pageDebug_checkBoxWifi;
lv_obj_t * ui_pageDebug_checkboxSerial1;
lv_obj_t * ui_pageDebug_checkBoxSerial2;
lv_obj_t * ui_pageDebug_checkBoxPower;
void ui_event_pageDebug_buttonFluxRead(lv_event_t * e);
lv_obj_t * ui_pageDebug_buttonFluxRead;
lv_obj_t * ui_pageDebug_labelReadFlux;

6
components/FluxUI/ui.h
View File

@ -78,6 +78,7 @@ extern lv_obj_t * ui_pageHome_textAreaResultStage;
extern lv_obj_t * ui_pageHome_labelstr2;
extern lv_obj_t * ui_pageHome_textAreaResultRate;
extern lv_obj_t * ui_pageHome_panelTestResult;
extern lv_obj_t * ui_pageHome_labelTestResult;
extern lv_obj_t * ui_pageHome_labelstr3;
void ui_event_pageHome_buttonStartTest(lv_event_t * e);
extern lv_obj_t * ui_pageHome_buttonStartTest;
@ -90,6 +91,7 @@ extern lv_obj_t * uic_panelNominal;
extern lv_obj_t * uic_pageHome_spinboxRate;
extern lv_obj_t * uic_pageHome_labelCurrentStage;
extern lv_obj_t * uic_pageHome_textAreaResultStage;
extern lv_obj_t * uic_pageHome_labelTestResult;
// SCREEN: ui_pageSetting
void ui_pageSetting_screen_init(void);
@ -185,10 +187,6 @@ extern lv_obj_t * ui_pageDebug_labelBack;
void ui_event_pageDebug_panelBody(lv_event_t * e);
extern lv_obj_t * ui_pageDebug_panelBody;
extern lv_obj_t * ui_pageDebug_textAreaContent;
extern lv_obj_t * ui_pageDebug_checkBoxWifi;
extern lv_obj_t * ui_pageDebug_checkboxSerial1;
extern lv_obj_t * ui_pageDebug_checkBoxSerial2;
extern lv_obj_t * ui_pageDebug_checkBoxPower;
void ui_event_pageDebug_buttonFluxRead(lv_event_t * e);
extern lv_obj_t * ui_pageDebug_buttonFluxRead;
extern lv_obj_t * ui_pageDebug_labelReadFlux;

3
components/FluxUI/ui_events.c
View File

@ -130,8 +130,7 @@ void on_buttonStartTest_clicked(lv_event_t * e)
void on_buttonFluxRead_clicked(lv_event_t * e)
{
ModbusRTU_Send(ECHO_UART_PORT_NUM1,&flux_frame);
ESP_ERROR_CHECK(ModbusRTU_Send(ECHO_UART_PORT_NUM1,&flux_frame));
}

13
components/FluxUart/FluxUart.c
View File

@ -115,6 +115,9 @@ void uart1_echoTask(void* arg)
while (1)
{
vTaskDelay(1000 / portTICK_PERIOD_MS);
// Read data from the UART
int len = uart_read_bytes(ECHO_UART_PORT_NUM1, data, (BUF_SIZE - 1), 20 / portTICK_PERIOD_MS);
// Write data back to the UART
@ -184,6 +187,7 @@ esp_err_t ModbusRTU_Send(uart_port_t uart_num, struct ModbusRTU_Frame *frame)
{
unsigned short crc;
char text[64];
int res=0;
if (lv_dropdown_get_selected(ui_pageDebug_dropdownFunctionCode) == 0)
{
@ -196,13 +200,18 @@ esp_err_t ModbusRTU_Send(uart_port_t uart_num, struct ModbusRTU_Frame *frame)
frame->CRC[1] = (crc & 0xFF);
frame->CRC[0] = (crc >> 8);
uart_write_bytes(uart_num, (const char *)frame, sizeof(struct ModbusRTU_Frame)/sizeof(unsigned char));
res = uart_write_bytes(uart_num, (const char *)frame, sizeof(struct ModbusRTU_Frame)/sizeof(unsigned char));
if (res == -1)
{
return ESP_FAIL;
}
sprintf(text,"addr:%02X, func:%02X, data:%02X %02X %02X %02X ,crc:%02X %02X",frame->ADDR,frame->FUNC,frame->DATA[0],frame->DATA[1],frame->DATA[2],frame->DATA[3],frame->CRC[0],frame->CRC[1]);
lv_textarea_add_char(ui_pageDebug_textAreaContent,'\n');
lv_textarea_add_text(ui_pageDebug_textAreaContent,"Send:");
lv_textarea_add_text(ui_pageDebug_textAreaContent,(char*)text);
//lv_textarea_add_text(ui_pageDebug_textAreaContent,(char*)text);
return ESP_OK;

4
main/main.cpp
View File

@ -31,7 +31,7 @@ extern "C" void app_main(void)
lv_bar_set_value(ui_pageWelCome_barStartProgress,5,LV_ANIM_ON);
example_lvgl_unlock();
}
/*开启电源 需要解锁屏幕之后*/
button_init();
@ -71,6 +71,6 @@ extern "C" void app_main(void)
lv_scr_load_anim(ui_pageHome, LV_SCR_LOAD_ANIM_OUT_TOP, 800, 0, false);
}
}