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

对调试部分进行了更新

Browse Source
This commit is contained in:
jarvis 2025-03-19 18:46:29 +08:00
parent 82d34131e1
commit 2fa47cc217
22 changed files with 2080 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/settings.json vendored
View File

@ -12,7 +12,7 @@
"idf.openOcdConfigs": [
"board/esp32s3-builtin.cfg"
],
"idf.portWin": "COM6",
"idf.portWin": "COM5",
"idf.flashType": "UART",
"files.associations": {
"ledc.h": "c",

6
SquareLineProj/ESP32S3_UI.sll
View File

File diff suppressed because one or more lines are too long

1733
SquareLineProj/ESP32S3_UI.spj
View File

File diff suppressed because it is too large Load Diff

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

@ -101,11 +101,97 @@ void ui_pageDebug_screen_init(void)
lv_obj_set_align(ui_pageDebug_dropdownFunctionCode, LV_ALIGN_CENTER);
lv_obj_add_flag(ui_pageDebug_dropdownFunctionCode, LV_OBJ_FLAG_SCROLL_ON_FOCUS); /// Flags
ui_pageDebug_spinboxAddr = lv_spinbox_create(ui_pageDebug);
lv_obj_set_width(ui_pageDebug_spinboxAddr, 72);
lv_obj_set_height(ui_pageDebug_spinboxAddr, 42);
lv_obj_set_x(ui_pageDebug_spinboxAddr, -105);
lv_obj_set_y(ui_pageDebug_spinboxAddr, -57);
lv_obj_set_align(ui_pageDebug_spinboxAddr, LV_ALIGN_CENTER);
lv_spinbox_set_digit_format(ui_pageDebug_spinboxAddr, 4, 4);
lv_spinbox_set_range(ui_pageDebug_spinboxAddr, 1, 9999);
lv_spinbox_set_cursor_pos(ui_pageDebug_spinboxAddr, 1 - 1);
lv_spinbox_set_value(ui_pageDebug_spinboxAddr, 1);
ui_pageDebug_spinboxNum = lv_spinbox_create(ui_pageDebug);
lv_obj_set_width(ui_pageDebug_spinboxNum, 37);
lv_obj_set_height(ui_pageDebug_spinboxNum, 42);
lv_obj_set_x(ui_pageDebug_spinboxNum, -93);
lv_obj_set_y(ui_pageDebug_spinboxNum, 70);
lv_obj_set_align(ui_pageDebug_spinboxNum, LV_ALIGN_CENTER);
lv_spinbox_set_digit_format(ui_pageDebug_spinboxNum, 2, 4);
lv_spinbox_set_range(ui_pageDebug_spinboxNum, 1, 9999);
lv_spinbox_set_cursor_pos(ui_pageDebug_spinboxNum, 1 - 1);
lv_spinbox_set_value(ui_pageDebug_spinboxNum, 1);
ui_pageDebug_buttonClearTextarea1 = lv_btn_create(ui_pageDebug);
lv_obj_set_width(ui_pageDebug_buttonClearTextarea1, 78);
lv_obj_set_height(ui_pageDebug_buttonClearTextarea1, 30);
lv_obj_set_x(ui_pageDebug_buttonClearTextarea1, -105);
lv_obj_set_y(ui_pageDebug_buttonClearTextarea1, -12);
lv_obj_set_align(ui_pageDebug_buttonClearTextarea1, LV_ALIGN_CENTER);
ui_pageDebug_Label1 = lv_label_create(ui_pageDebug_buttonClearTextarea1);
lv_obj_set_width(ui_pageDebug_Label1, LV_SIZE_CONTENT); /// 1
lv_obj_set_height(ui_pageDebug_Label1, LV_SIZE_CONTENT); /// 1
lv_obj_set_align(ui_pageDebug_Label1, LV_ALIGN_CENTER);
lv_label_set_text(ui_pageDebug_Label1, "^");
ui_pageDebug_buttonClearTextarea2 = lv_btn_create(ui_pageDebug);
lv_obj_set_width(ui_pageDebug_buttonClearTextarea2, 78);
lv_obj_set_height(ui_pageDebug_buttonClearTextarea2, 30);
lv_obj_set_x(ui_pageDebug_buttonClearTextarea2, -104);
lv_obj_set_y(ui_pageDebug_buttonClearTextarea2, 23);
lv_obj_set_align(ui_pageDebug_buttonClearTextarea2, LV_ALIGN_CENTER);
ui_pageDebug_Label3 = lv_label_create(ui_pageDebug_buttonClearTextarea2);
lv_obj_set_width(ui_pageDebug_Label3, LV_SIZE_CONTENT); /// 1
lv_obj_set_height(ui_pageDebug_Label3, LV_SIZE_CONTENT); /// 1
lv_obj_set_align(ui_pageDebug_Label3, LV_ALIGN_CENTER);
lv_label_set_text(ui_pageDebug_Label3, "V");
ui_pageDebug_buttonClearTextarea3 = lv_btn_create(ui_pageDebug);
lv_obj_set_width(ui_pageDebug_buttonClearTextarea3, 78);
lv_obj_set_height(ui_pageDebug_buttonClearTextarea3, 30);
lv_obj_set_x(ui_pageDebug_buttonClearTextarea3, -102);
lv_obj_set_y(ui_pageDebug_buttonClearTextarea3, 145);
lv_obj_set_align(ui_pageDebug_buttonClearTextarea3, LV_ALIGN_CENTER);
ui_pageDebug_Label4 = lv_label_create(ui_pageDebug_buttonClearTextarea3);
lv_obj_set_width(ui_pageDebug_Label4, LV_SIZE_CONTENT); /// 1
lv_obj_set_height(ui_pageDebug_Label4, LV_SIZE_CONTENT); /// 1
lv_obj_set_align(ui_pageDebug_Label4, LV_ALIGN_CENTER);
lv_label_set_text(ui_pageDebug_Label4, "V");
ui_pageDebug_buttonClearTextarea4 = lv_btn_create(ui_pageDebug);
lv_obj_set_width(ui_pageDebug_buttonClearTextarea4, 78);
lv_obj_set_height(ui_pageDebug_buttonClearTextarea4, 30);
lv_obj_set_x(ui_pageDebug_buttonClearTextarea4, -102);
lv_obj_set_y(ui_pageDebug_buttonClearTextarea4, 109);
lv_obj_set_align(ui_pageDebug_buttonClearTextarea4, LV_ALIGN_CENTER);
ui_pageDebug_Label5 = lv_label_create(ui_pageDebug_buttonClearTextarea4);
lv_obj_set_width(ui_pageDebug_Label5, LV_SIZE_CONTENT); /// 1
lv_obj_set_height(ui_pageDebug_Label5, LV_SIZE_CONTENT); /// 1
lv_obj_set_align(ui_pageDebug_Label5, LV_ALIGN_CENTER);
lv_label_set_text(ui_pageDebug_Label5, "^");
ui_pageDebug_Label6 = lv_label_create(ui_pageDebug);
lv_obj_set_width(ui_pageDebug_Label6, LV_SIZE_CONTENT); /// 1
lv_obj_set_height(ui_pageDebug_Label6, LV_SIZE_CONTENT); /// 1
lv_obj_set_x(ui_pageDebug_Label6, -130);
lv_obj_set_y(ui_pageDebug_Label6, 72);
lv_obj_set_align(ui_pageDebug_Label6, LV_ALIGN_CENTER);
lv_label_set_text(ui_pageDebug_Label6, "num");
lv_obj_add_event_cb(ui_pageDebug_labelBack, ui_event_pageDebug_labelBack, LV_EVENT_ALL, NULL);
lv_obj_add_event_cb(ui_pageDebug_panelHeader, ui_event_pageDebug_panelHeader, LV_EVENT_ALL, NULL);
lv_obj_add_event_cb(ui_pageDebug_panelBody, ui_event_pageDebug_panelBody, LV_EVENT_ALL, NULL);
lv_obj_add_event_cb(ui_pageDebug_buttonFluxRead, ui_event_pageDebug_buttonFluxRead, LV_EVENT_ALL, NULL);
lv_obj_add_event_cb(ui_pageDebug_buttonClearTextarea, ui_event_pageDebug_buttonClearTextarea, LV_EVENT_ALL, NULL);
lv_obj_add_event_cb(ui_pageDebug_buttonClearTextarea1, ui_event_pageDebug_buttonClearTextarea1, LV_EVENT_ALL, NULL);
lv_obj_add_event_cb(ui_pageDebug_buttonClearTextarea2, ui_event_pageDebug_buttonClearTextarea2, LV_EVENT_ALL, NULL);
lv_obj_add_event_cb(ui_pageDebug_buttonClearTextarea3, ui_event_pageDebug_buttonClearTextarea3, LV_EVENT_ALL, NULL);
lv_obj_add_event_cb(ui_pageDebug_buttonClearTextarea4, ui_event_pageDebug_buttonClearTextarea4, LV_EVENT_ALL, NULL);
uic_pageDebug_dropdownFunctionCode = ui_pageDebug_dropdownFunctionCode;
}

51
SquareLineProj/Export/ui.c
View File

@ -189,6 +189,21 @@ void ui_event_pageDebug_buttonClearTextarea(lv_event_t * e);
lv_obj_t * ui_pageDebug_buttonClearTextarea;
lv_obj_t * ui_pageDebug_Label2;
lv_obj_t * ui_pageDebug_dropdownFunctionCode;
lv_obj_t * ui_pageDebug_spinboxAddr;
lv_obj_t * ui_pageDebug_spinboxNum;
void ui_event_pageDebug_buttonClearTextarea1(lv_event_t * e);
lv_obj_t * ui_pageDebug_buttonClearTextarea1;
lv_obj_t * ui_pageDebug_Label1;
void ui_event_pageDebug_buttonClearTextarea2(lv_event_t * e);
lv_obj_t * ui_pageDebug_buttonClearTextarea2;
lv_obj_t * ui_pageDebug_Label3;
void ui_event_pageDebug_buttonClearTextarea3(lv_event_t * e);
lv_obj_t * ui_pageDebug_buttonClearTextarea3;
lv_obj_t * ui_pageDebug_Label4;
void ui_event_pageDebug_buttonClearTextarea4(lv_event_t * e);
lv_obj_t * ui_pageDebug_buttonClearTextarea4;
lv_obj_t * ui_pageDebug_Label5;
lv_obj_t * ui_pageDebug_Label6;
// CUSTOM VARIABLES
lv_obj_t * uic_pageDebug_dropdownFunctionCode;
@ -585,6 +600,42 @@ void ui_event_pageDebug_buttonClearTextarea(lv_event_t * e)
}
}
void ui_event_pageDebug_buttonClearTextarea1(lv_event_t * e)
{
lv_event_code_t event_code = lv_event_get_code(e);
if(event_code == LV_EVENT_CLICKED) {
_ui_spinbox_step(ui_pageDebug_spinboxAddr, 1);
}
}
void ui_event_pageDebug_buttonClearTextarea2(lv_event_t * e)
{
lv_event_code_t event_code = lv_event_get_code(e);
if(event_code == LV_EVENT_CLICKED) {
_ui_spinbox_step(ui_pageDebug_spinboxAddr, -1);
}
}
void ui_event_pageDebug_buttonClearTextarea3(lv_event_t * e)
{
lv_event_code_t event_code = lv_event_get_code(e);
if(event_code == LV_EVENT_CLICKED) {
_ui_spinbox_step(ui_pageDebug_spinboxNum, -1);
}
}
void ui_event_pageDebug_buttonClearTextarea4(lv_event_t * e)
{
lv_event_code_t event_code = lv_event_get_code(e);
if(event_code == LV_EVENT_CLICKED) {
_ui_spinbox_step(ui_pageDebug_spinboxNum, 1);
}
}
void ui_event_pageWifiConnect_pannelHeader(lv_event_t * e)
{
lv_event_code_t event_code = lv_event_get_code(e);

15
SquareLineProj/Export/ui.h
View File

@ -197,6 +197,21 @@ void ui_event_pageDebug_buttonClearTextarea(lv_event_t * e);
extern lv_obj_t * ui_pageDebug_buttonClearTextarea;
extern lv_obj_t * ui_pageDebug_Label2;
extern lv_obj_t * ui_pageDebug_dropdownFunctionCode;
extern lv_obj_t * ui_pageDebug_spinboxAddr;
extern lv_obj_t * ui_pageDebug_spinboxNum;
void ui_event_pageDebug_buttonClearTextarea1(lv_event_t * e);
extern lv_obj_t * ui_pageDebug_buttonClearTextarea1;
extern lv_obj_t * ui_pageDebug_Label1;
void ui_event_pageDebug_buttonClearTextarea2(lv_event_t * e);
extern lv_obj_t * ui_pageDebug_buttonClearTextarea2;
extern lv_obj_t * ui_pageDebug_Label3;
void ui_event_pageDebug_buttonClearTextarea3(lv_event_t * e);
extern lv_obj_t * ui_pageDebug_buttonClearTextarea3;
extern lv_obj_t * ui_pageDebug_Label4;
void ui_event_pageDebug_buttonClearTextarea4(lv_event_t * e);
extern lv_obj_t * ui_pageDebug_buttonClearTextarea4;
extern lv_obj_t * ui_pageDebug_Label5;
extern lv_obj_t * ui_pageDebug_Label6;
// CUSTOM VARIABLES
extern lv_obj_t * uic_pageDebug_dropdownFunctionCode;

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.

24
components/FluxProtocol/FluxProtocol.h
View File

@ -47,6 +47,30 @@ typedef struct FluxProtocol
extern struct FluxProtocol fluxProtocol;
/*流量计通讯数据格式*/
typedef enum OperationMode
{
Normal,//正常模式,收到开始命令后开始进行累积计算，停止指令收到后停止积分
Timer,//计时模式,计算在设定时间内的累积值
Volume,//体积模式，体积到达后停止累积
};
/*地址0x0001处的启停指令*/
typedef enum MeasureCommand
{
StartMeasure=1,
StopMeasure=2,
};
typedef struct FluxCommand
{
uint16_t addr;
uint32_t PLC_ADDR;
};
#ifdef __cplusplus
} /*extern "C"*/
#endif

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

@ -101,11 +101,97 @@ void ui_pageDebug_screen_init(void)
lv_obj_set_align(ui_pageDebug_dropdownFunctionCode, LV_ALIGN_CENTER);
lv_obj_add_flag(ui_pageDebug_dropdownFunctionCode, LV_OBJ_FLAG_SCROLL_ON_FOCUS); /// Flags
ui_pageDebug_spinboxAddr = lv_spinbox_create(ui_pageDebug);
lv_obj_set_width(ui_pageDebug_spinboxAddr, 72);
lv_obj_set_height(ui_pageDebug_spinboxAddr, 42);
lv_obj_set_x(ui_pageDebug_spinboxAddr, -105);
lv_obj_set_y(ui_pageDebug_spinboxAddr, -57);
lv_obj_set_align(ui_pageDebug_spinboxAddr, LV_ALIGN_CENTER);
lv_spinbox_set_digit_format(ui_pageDebug_spinboxAddr, 4, 4);
lv_spinbox_set_range(ui_pageDebug_spinboxAddr, 1, 9999);
lv_spinbox_set_cursor_pos(ui_pageDebug_spinboxAddr, 1 - 1);
lv_spinbox_set_value(ui_pageDebug_spinboxAddr, 1);
ui_pageDebug_spinboxNum = lv_spinbox_create(ui_pageDebug);
lv_obj_set_width(ui_pageDebug_spinboxNum, 37);
lv_obj_set_height(ui_pageDebug_spinboxNum, 42);
lv_obj_set_x(ui_pageDebug_spinboxNum, -93);
lv_obj_set_y(ui_pageDebug_spinboxNum, 70);
lv_obj_set_align(ui_pageDebug_spinboxNum, LV_ALIGN_CENTER);
lv_spinbox_set_digit_format(ui_pageDebug_spinboxNum, 2, 4);
lv_spinbox_set_range(ui_pageDebug_spinboxNum, 1, 9999);
lv_spinbox_set_cursor_pos(ui_pageDebug_spinboxNum, 1 - 1);
lv_spinbox_set_value(ui_pageDebug_spinboxNum, 1);
ui_pageDebug_buttonClearTextarea1 = lv_btn_create(ui_pageDebug);
lv_obj_set_width(ui_pageDebug_buttonClearTextarea1, 78);
lv_obj_set_height(ui_pageDebug_buttonClearTextarea1, 30);
lv_obj_set_x(ui_pageDebug_buttonClearTextarea1, -105);
lv_obj_set_y(ui_pageDebug_buttonClearTextarea1, -12);
lv_obj_set_align(ui_pageDebug_buttonClearTextarea1, LV_ALIGN_CENTER);
ui_pageDebug_Label1 = lv_label_create(ui_pageDebug_buttonClearTextarea1);
lv_obj_set_width(ui_pageDebug_Label1, LV_SIZE_CONTENT); /// 1
lv_obj_set_height(ui_pageDebug_Label1, LV_SIZE_CONTENT); /// 1
lv_obj_set_align(ui_pageDebug_Label1, LV_ALIGN_CENTER);
lv_label_set_text(ui_pageDebug_Label1, "^");
ui_pageDebug_buttonClearTextarea2 = lv_btn_create(ui_pageDebug);
lv_obj_set_width(ui_pageDebug_buttonClearTextarea2, 78);
lv_obj_set_height(ui_pageDebug_buttonClearTextarea2, 30);
lv_obj_set_x(ui_pageDebug_buttonClearTextarea2, -104);
lv_obj_set_y(ui_pageDebug_buttonClearTextarea2, 23);
lv_obj_set_align(ui_pageDebug_buttonClearTextarea2, LV_ALIGN_CENTER);
ui_pageDebug_Label3 = lv_label_create(ui_pageDebug_buttonClearTextarea2);
lv_obj_set_width(ui_pageDebug_Label3, LV_SIZE_CONTENT); /// 1
lv_obj_set_height(ui_pageDebug_Label3, LV_SIZE_CONTENT); /// 1
lv_obj_set_align(ui_pageDebug_Label3, LV_ALIGN_CENTER);
lv_label_set_text(ui_pageDebug_Label3, "V");
ui_pageDebug_buttonClearTextarea3 = lv_btn_create(ui_pageDebug);
lv_obj_set_width(ui_pageDebug_buttonClearTextarea3, 78);
lv_obj_set_height(ui_pageDebug_buttonClearTextarea3, 30);
lv_obj_set_x(ui_pageDebug_buttonClearTextarea3, -102);
lv_obj_set_y(ui_pageDebug_buttonClearTextarea3, 145);
lv_obj_set_align(ui_pageDebug_buttonClearTextarea3, LV_ALIGN_CENTER);
ui_pageDebug_Label4 = lv_label_create(ui_pageDebug_buttonClearTextarea3);
lv_obj_set_width(ui_pageDebug_Label4, LV_SIZE_CONTENT); /// 1
lv_obj_set_height(ui_pageDebug_Label4, LV_SIZE_CONTENT); /// 1
lv_obj_set_align(ui_pageDebug_Label4, LV_ALIGN_CENTER);
lv_label_set_text(ui_pageDebug_Label4, "V");
ui_pageDebug_buttonClearTextarea4 = lv_btn_create(ui_pageDebug);
lv_obj_set_width(ui_pageDebug_buttonClearTextarea4, 78);
lv_obj_set_height(ui_pageDebug_buttonClearTextarea4, 30);
lv_obj_set_x(ui_pageDebug_buttonClearTextarea4, -102);
lv_obj_set_y(ui_pageDebug_buttonClearTextarea4, 109);
lv_obj_set_align(ui_pageDebug_buttonClearTextarea4, LV_ALIGN_CENTER);
ui_pageDebug_Label5 = lv_label_create(ui_pageDebug_buttonClearTextarea4);
lv_obj_set_width(ui_pageDebug_Label5, LV_SIZE_CONTENT); /// 1
lv_obj_set_height(ui_pageDebug_Label5, LV_SIZE_CONTENT); /// 1
lv_obj_set_align(ui_pageDebug_Label5, LV_ALIGN_CENTER);
lv_label_set_text(ui_pageDebug_Label5, "^");
ui_pageDebug_Label6 = lv_label_create(ui_pageDebug);
lv_obj_set_width(ui_pageDebug_Label6, LV_SIZE_CONTENT); /// 1
lv_obj_set_height(ui_pageDebug_Label6, LV_SIZE_CONTENT); /// 1
lv_obj_set_x(ui_pageDebug_Label6, -130);
lv_obj_set_y(ui_pageDebug_Label6, 72);
lv_obj_set_align(ui_pageDebug_Label6, LV_ALIGN_CENTER);
lv_label_set_text(ui_pageDebug_Label6, "num");
lv_obj_add_event_cb(ui_pageDebug_labelBack, ui_event_pageDebug_labelBack, LV_EVENT_ALL, NULL);
lv_obj_add_event_cb(ui_pageDebug_panelHeader, ui_event_pageDebug_panelHeader, LV_EVENT_ALL, NULL);
lv_obj_add_event_cb(ui_pageDebug_panelBody, ui_event_pageDebug_panelBody, LV_EVENT_ALL, NULL);
lv_obj_add_event_cb(ui_pageDebug_buttonFluxRead, ui_event_pageDebug_buttonFluxRead, LV_EVENT_ALL, NULL);
lv_obj_add_event_cb(ui_pageDebug_buttonClearTextarea, ui_event_pageDebug_buttonClearTextarea, LV_EVENT_ALL, NULL);
lv_obj_add_event_cb(ui_pageDebug_buttonClearTextarea1, ui_event_pageDebug_buttonClearTextarea1, LV_EVENT_ALL, NULL);
lv_obj_add_event_cb(ui_pageDebug_buttonClearTextarea2, ui_event_pageDebug_buttonClearTextarea2, LV_EVENT_ALL, NULL);
lv_obj_add_event_cb(ui_pageDebug_buttonClearTextarea3, ui_event_pageDebug_buttonClearTextarea3, LV_EVENT_ALL, NULL);
lv_obj_add_event_cb(ui_pageDebug_buttonClearTextarea4, ui_event_pageDebug_buttonClearTextarea4, LV_EVENT_ALL, NULL);
uic_pageDebug_dropdownFunctionCode = ui_pageDebug_dropdownFunctionCode;
}

51
components/FluxUI/ui.c
View File

@ -189,6 +189,21 @@ void ui_event_pageDebug_buttonClearTextarea(lv_event_t * e);
lv_obj_t * ui_pageDebug_buttonClearTextarea;
lv_obj_t * ui_pageDebug_Label2;
lv_obj_t * ui_pageDebug_dropdownFunctionCode;
lv_obj_t * ui_pageDebug_spinboxAddr;
lv_obj_t * ui_pageDebug_spinboxNum;
void ui_event_pageDebug_buttonClearTextarea1(lv_event_t * e);
lv_obj_t * ui_pageDebug_buttonClearTextarea1;
lv_obj_t * ui_pageDebug_Label1;
void ui_event_pageDebug_buttonClearTextarea2(lv_event_t * e);
lv_obj_t * ui_pageDebug_buttonClearTextarea2;
lv_obj_t * ui_pageDebug_Label3;
void ui_event_pageDebug_buttonClearTextarea3(lv_event_t * e);
lv_obj_t * ui_pageDebug_buttonClearTextarea3;
lv_obj_t * ui_pageDebug_Label4;
void ui_event_pageDebug_buttonClearTextarea4(lv_event_t * e);
lv_obj_t * ui_pageDebug_buttonClearTextarea4;
lv_obj_t * ui_pageDebug_Label5;
lv_obj_t * ui_pageDebug_Label6;
// CUSTOM VARIABLES
lv_obj_t * uic_pageDebug_dropdownFunctionCode;
@ -585,6 +600,42 @@ void ui_event_pageDebug_buttonClearTextarea(lv_event_t * e)
}
}
void ui_event_pageDebug_buttonClearTextarea1(lv_event_t * e)
{
lv_event_code_t event_code = lv_event_get_code(e);
if(event_code == LV_EVENT_CLICKED) {
_ui_spinbox_step(ui_pageDebug_spinboxAddr, 1);
}
}
void ui_event_pageDebug_buttonClearTextarea2(lv_event_t * e)
{
lv_event_code_t event_code = lv_event_get_code(e);
if(event_code == LV_EVENT_CLICKED) {
_ui_spinbox_step(ui_pageDebug_spinboxAddr, -1);
}
}
void ui_event_pageDebug_buttonClearTextarea3(lv_event_t * e)
{
lv_event_code_t event_code = lv_event_get_code(e);
if(event_code == LV_EVENT_CLICKED) {
_ui_spinbox_step(ui_pageDebug_spinboxNum, -1);
}
}
void ui_event_pageDebug_buttonClearTextarea4(lv_event_t * e)
{
lv_event_code_t event_code = lv_event_get_code(e);
if(event_code == LV_EVENT_CLICKED) {
_ui_spinbox_step(ui_pageDebug_spinboxNum, 1);
}
}
void ui_event_pageWifiConnect_pannelHeader(lv_event_t * e)
{
lv_event_code_t event_code = lv_event_get_code(e);

15
components/FluxUI/ui.h
View File

@ -197,6 +197,21 @@ void ui_event_pageDebug_buttonClearTextarea(lv_event_t * e);
extern lv_obj_t * ui_pageDebug_buttonClearTextarea;
extern lv_obj_t * ui_pageDebug_Label2;
extern lv_obj_t * ui_pageDebug_dropdownFunctionCode;
extern lv_obj_t * ui_pageDebug_spinboxAddr;
extern lv_obj_t * ui_pageDebug_spinboxNum;
void ui_event_pageDebug_buttonClearTextarea1(lv_event_t * e);
extern lv_obj_t * ui_pageDebug_buttonClearTextarea1;
extern lv_obj_t * ui_pageDebug_Label1;
void ui_event_pageDebug_buttonClearTextarea2(lv_event_t * e);
extern lv_obj_t * ui_pageDebug_buttonClearTextarea2;
extern lv_obj_t * ui_pageDebug_Label3;
void ui_event_pageDebug_buttonClearTextarea3(lv_event_t * e);
extern lv_obj_t * ui_pageDebug_buttonClearTextarea3;
extern lv_obj_t * ui_pageDebug_Label4;
void ui_event_pageDebug_buttonClearTextarea4(lv_event_t * e);
extern lv_obj_t * ui_pageDebug_buttonClearTextarea4;
extern lv_obj_t * ui_pageDebug_Label5;
extern lv_obj_t * ui_pageDebug_Label6;
// CUSTOM VARIABLES
extern lv_obj_t * uic_pageDebug_dropdownFunctionCode;

5
components/FluxUI/ui_events.c
View File

@ -54,7 +54,7 @@ void on_dropdownDeviceType_valueChanged(lv_event_t * e)
lv_dropdown_get_selected_str(e->target,buf,32);
lv_label_set_text(ui_pageHome_labelTitle, buf);
if (index == 0)
if (index == Spirit3)
{
lv_spinbox_set_range(ui_pageHome_spinboxStage,1,4);
}else{
@ -155,6 +155,9 @@ void on_buttonStartTest_clicked(lv_event_t * e)
void on_buttonFluxRead_clicked(lv_event_t * e)
{
flux_frame.DATA[1] = (unsigned char)lv_spinbox_get_value(ui_pageDebug_spinboxAddr);
flux_frame.DATA[3] = (unsigned char)lv_spinbox_get_value(ui_pageDebug_spinboxNum);
ESP_ERROR_CHECK(ModbusRTU_Send(ECHO_UART_PORT_NUM1,&flux_frame));
}

28
components/FluxUart/FluxUart.c
View File

@ -85,6 +85,7 @@ unsigned short CRC16(unsigned char* pchMsg, unsigned short wDataLen)
struct ModbusRTU_Frame flux_frame;
struct ModbusRTU_Frame breath_frame;
/*流量计服务函数*/
void uart1_echoTask(void* arg)
{
/* Configure parameters of an UART driver,
@ -109,9 +110,9 @@ void uart1_echoTask(void* arg)
flux_frame.ADDR = FLUX_ADDR;
flux_frame.FUNC = FLUX_FUNC_READ;
flux_frame.DATA[0] = 0x00;
flux_frame.DATA[1] = 0x00;
flux_frame.DATA[1] = 0x01;
flux_frame.DATA[2] = 0x00;
flux_frame.DATA[3] = 0x01;
flux_frame.DATA[3] = 0x02;
while (1)
{
@ -121,18 +122,26 @@ void uart1_echoTask(void* arg)
// 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
uart_write_bytes(ECHO_UART_PORT_NUM1, (const char *) data, len);
//uart_write_bytes(ECHO_UART_PORT_NUM1, (const char *) data, len);
if (len)
{
data[len] = '\0';
ESP_LOGI(TAG, "Recv str: %s", (char *) data);
ESP_LOGI(TAG, "CRC16: %04X", CRC16(data, len));
// lv_textarea_add_char(ui_pageDebug_textAreaContent,'\n');
// lv_textarea_add_text(ui_pageDebug_textAreaContent, (char *) data);
ESP_LOGI(TAG, "Recv str: %s", (char *) data);
for(int i=0;i<len;i++)
ESP_LOGI(TAG, "data[%d]:%02X", i, data[i]);
// ESP_LOGI(TAG, "Recv str: %s", (char *) data);
// ESP_LOGI(TAG, "CRC16: %04X", CRC16(data, len));
}
}
}
/*呼吸模拟器预留接口函数*/
void uart2_echoTask(void* arg)
{
/* Configure parameters of an UART driver,
@ -164,13 +173,8 @@ void uart2_echoTask(void* arg)
if (len)
{
data[len] = '\0';
lv_textarea_add_char(ui_pageDebug_textAreaContent,'\n');
lv_textarea_add_text(ui_pageDebug_textAreaContent, (char *) data);
ESP_LOGI(TAG, "Recv str: %s", (char *) data);
ESP_LOGI(TAG, "CRC16: %04X", CRC16(data, len));
}
}
@ -202,7 +206,7 @@ esp_err_t ModbusRTU_Send(uart_port_t uart_num, struct ModbusRTU_Frame *frame)
}
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]);
sprintf(text,"%02X %02X %02X %02X %02X %02X %02X %02X \n",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:");