新增BS中设备类型修改操作
This commit is contained in:
parent
5fdcb7ce87
commit
2dbed817f1
@ -25,7 +25,7 @@
|
|||||||
"uiExportFolderPath": "C:\\Users\\jarvis\\Documents\\FluxDC\\SquareLineProj\\Export",
|
"uiExportFolderPath": "C:\\Users\\jarvis\\Documents\\FluxDC\\SquareLineProj\\Export",
|
||||||
"projectExportFolderPath": "C:\\Users\\jarvis\\Documents\\FluxDC\\SquareLineProj\\Export",
|
"projectExportFolderPath": "C:\\Users\\jarvis\\Documents\\FluxDC\\SquareLineProj\\Export",
|
||||||
"custom_variable_prefix": "uic",
|
"custom_variable_prefix": "uic",
|
||||||
"backup_cnt": 1268,
|
"backup_cnt": 1270,
|
||||||
"autosave_cnt": 0,
|
"autosave_cnt": 0,
|
||||||
"group_color_cnt": 0,
|
"group_color_cnt": 0,
|
||||||
"lvgl_version": "8.3.6",
|
"lvgl_version": "8.3.6",
|
||||||
@ -42,5 +42,5 @@
|
|||||||
"drive_fatfs_path": "",
|
"drive_fatfs_path": "",
|
||||||
"naming": "_Screen_Name",
|
"naming": "_Screen_Name",
|
||||||
"naming_force_lowercase": false,
|
"naming_force_lowercase": false,
|
||||||
"nidcnt": 1000704
|
"nidcnt": 1000714
|
||||||
}
|
}
|
||||||
@ -10500,6 +10500,71 @@
|
|||||||
"strtype": "DROPDOWN/Style_list_selected",
|
"strtype": "DROPDOWN/Style_list_selected",
|
||||||
"strval": "{\"python\":\"{0}.get_list()\",\"c\":\"lv_dropdown_get_list({0})\"} lv.PART.SELECTED, Text, Rectangle",
|
"strval": "{\"python\":\"{0}.get_list()\",\"c\":\"lv_dropdown_get_list({0})\"} lv.PART.SELECTED, Text, Rectangle",
|
||||||
"InheritedType": 11
|
"InheritedType": 11
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"disabled": false,
|
||||||
|
"nid": 1000704,
|
||||||
|
"strtype": "_event/EventHandler",
|
||||||
|
"strval": "VALUE_CHANGED",
|
||||||
|
"childs": [
|
||||||
|
{
|
||||||
|
"nid": 1000705,
|
||||||
|
"strtype": "_event/name",
|
||||||
|
"strval": "Event46",
|
||||||
|
"InheritedType": 10
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"nid": 1000706,
|
||||||
|
"strtype": "_event/condition_C",
|
||||||
|
"strval": "",
|
||||||
|
"InheritedType": 10
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"nid": 1000707,
|
||||||
|
"strtype": "_event/condition_P",
|
||||||
|
"strval": "",
|
||||||
|
"InheritedType": 10
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"nid": 1000708,
|
||||||
|
"strtype": "_event/action",
|
||||||
|
"strval": "CALL FUNCTION",
|
||||||
|
"childs": [
|
||||||
|
{
|
||||||
|
"nid": 1000709,
|
||||||
|
"strtype": "CALL FUNCTION/Name",
|
||||||
|
"strval": "CALL FUNCTION",
|
||||||
|
"InheritedType": 10
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"nid": 1000710,
|
||||||
|
"strtype": "CALL FUNCTION/Call",
|
||||||
|
"strval": "<{Function_name}>( event_struct )",
|
||||||
|
"InheritedType": 10
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"nid": 1000711,
|
||||||
|
"strtype": "CALL FUNCTION/CallC",
|
||||||
|
"strval": "<{Function_name}>( e );",
|
||||||
|
"InheritedType": 10
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"nid": 1000712,
|
||||||
|
"strtype": "CALL FUNCTION/Function_name",
|
||||||
|
"strval": "on_dropdown_deviceTypeBS_valueChanged",
|
||||||
|
"InheritedType": 10
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"nid": 1000713,
|
||||||
|
"strtype": "CALL FUNCTION/Dont_export_function",
|
||||||
|
"strval": "False",
|
||||||
|
"InheritedType": 2
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"InheritedType": 10
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"InheritedType": 4
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"saved_objtypeKey": "DROPDOWN"
|
"saved_objtypeKey": "DROPDOWN"
|
||||||
@ -11316,7 +11381,8 @@
|
|||||||
"InheritedType": 4
|
"InheritedType": 4
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"saved_objtypeKey": "BUTTON"
|
"saved_objtypeKey": "BUTTON",
|
||||||
|
"tree_closed": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"guid": "GUID24497106-135392S257774112",
|
"guid": "GUID24497106-135392S257774112",
|
||||||
@ -12393,7 +12459,8 @@
|
|||||||
"InheritedType": 11
|
"InheritedType": 11
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"saved_objtypeKey": "PANEL"
|
"saved_objtypeKey": "PANEL",
|
||||||
|
"tree_closed": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"guid": "GUID16763883-502735S24514463",
|
"guid": "GUID16763883-502735S24514463",
|
||||||
@ -14438,8 +14505,7 @@
|
|||||||
"InheritedType": 11
|
"InheritedType": 11
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"saved_objtypeKey": "PANEL",
|
"saved_objtypeKey": "PANEL"
|
||||||
"tree_closed": true
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"guid": "GUID47387928-502756S18364463",
|
"guid": "GUID47387928-502756S18364463",
|
||||||
@ -16272,8 +16338,7 @@
|
|||||||
"InheritedType": 11
|
"InheritedType": 11
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"saved_objtypeKey": "PANEL",
|
"saved_objtypeKey": "PANEL"
|
||||||
"tree_closed": true
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"guid": "GUID10723593-781291S942474",
|
"guid": "GUID10723593-781291S942474",
|
||||||
@ -17644,7 +17709,8 @@
|
|||||||
"InheritedType": 11
|
"InheritedType": 11
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"saved_objtypeKey": "PANEL"
|
"saved_objtypeKey": "PANEL",
|
||||||
|
"tree_closed": true
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"dont_export": false,
|
"dont_export": false,
|
||||||
@ -47867,7 +47933,7 @@
|
|||||||
"uiExportFolderPath": "C:\\Users\\jarvis\\Documents\\FluxDC\\SquareLineProj\\Export",
|
"uiExportFolderPath": "C:\\Users\\jarvis\\Documents\\FluxDC\\SquareLineProj\\Export",
|
||||||
"projectExportFolderPath": "C:\\Users\\jarvis\\Documents\\FluxDC\\SquareLineProj\\Export",
|
"projectExportFolderPath": "C:\\Users\\jarvis\\Documents\\FluxDC\\SquareLineProj\\Export",
|
||||||
"custom_variable_prefix": "uic",
|
"custom_variable_prefix": "uic",
|
||||||
"backup_cnt": 1267,
|
"backup_cnt": 1269,
|
||||||
"autosave_cnt": 0,
|
"autosave_cnt": 0,
|
||||||
"group_color_cnt": 0,
|
"group_color_cnt": 0,
|
||||||
"lvgl_version": "8.3.6",
|
"lvgl_version": "8.3.6",
|
||||||
@ -47884,7 +47950,7 @@
|
|||||||
"drive_fatfs_path": "",
|
"drive_fatfs_path": "",
|
||||||
"naming": "_Screen_Name",
|
"naming": "_Screen_Name",
|
||||||
"naming_force_lowercase": false,
|
"naming_force_lowercase": false,
|
||||||
"nidcnt": 1000704,
|
"nidcnt": 1000714,
|
||||||
"BitDepth": 16,
|
"BitDepth": 16,
|
||||||
"Name": "ESP32S3_UI"
|
"Name": "ESP32S3_UI"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -154,3 +154,7 @@ def on_buttonGetTime_clicked(event_struct):
|
|||||||
def on_buttonTimeUpdate_clicked(event_struct):
|
def on_buttonTimeUpdate_clicked(event_struct):
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
||||||
|
def on_dropdown_deviceTypeBS_valueChanged(event_struct):
|
||||||
|
return
|
||||||
|
|
||||||
|
|||||||
@ -1088,6 +1088,7 @@ void ui_pageHome_screen_init(void)
|
|||||||
lv_obj_add_event_cb(ui_pageHome_labelDebug, ui_event_pageHome_labelDebug, LV_EVENT_ALL, NULL);
|
lv_obj_add_event_cb(ui_pageHome_labelDebug, ui_event_pageHome_labelDebug, LV_EVENT_ALL, NULL);
|
||||||
lv_obj_add_event_cb(ui_pageHome_imgbuttonFluxRead, ui_event_pageHome_imgbuttonFluxRead, LV_EVENT_ALL, NULL);
|
lv_obj_add_event_cb(ui_pageHome_imgbuttonFluxRead, ui_event_pageHome_imgbuttonFluxRead, LV_EVENT_ALL, NULL);
|
||||||
lv_obj_add_event_cb(ui_pageHome_labelFluxRead, ui_event_pageHome_labelFluxRead, LV_EVENT_ALL, NULL);
|
lv_obj_add_event_cb(ui_pageHome_labelFluxRead, ui_event_pageHome_labelFluxRead, LV_EVENT_ALL, NULL);
|
||||||
|
lv_obj_add_event_cb(ui_pageHome_DropdownTestTypeBS, ui_event_pageHome_DropdownTestTypeBS, LV_EVENT_ALL, NULL);
|
||||||
lv_obj_add_event_cb(ui_pageHome_buttonMinusBS, ui_event_pageHome_buttonMinusBS, LV_EVENT_ALL, NULL);
|
lv_obj_add_event_cb(ui_pageHome_buttonMinusBS, ui_event_pageHome_buttonMinusBS, LV_EVENT_ALL, NULL);
|
||||||
lv_obj_add_event_cb(ui_pageHome_buttonAddBS, ui_event_pageHome_buttonAddBS, LV_EVENT_ALL, NULL);
|
lv_obj_add_event_cb(ui_pageHome_buttonAddBS, ui_event_pageHome_buttonAddBS, LV_EVENT_ALL, NULL);
|
||||||
lv_obj_add_event_cb(ui_pageHome_spinboxStageBS, ui_event_pageHome_spinboxStageBS, LV_EVENT_ALL, NULL);
|
lv_obj_add_event_cb(ui_pageHome_spinboxStageBS, ui_event_pageHome_spinboxStageBS, LV_EVENT_ALL, NULL);
|
||||||
|
|||||||
@ -87,6 +87,7 @@ lv_obj_t * ui_pageHome_LabelRate35DOWN;
|
|||||||
lv_obj_t * ui_pageHome_LabelRate40DOWN;
|
lv_obj_t * ui_pageHome_LabelRate40DOWN;
|
||||||
lv_obj_t * ui_pageHome_labelstr20;
|
lv_obj_t * ui_pageHome_labelstr20;
|
||||||
lv_obj_t * ui_pageHome_BarTestProgBS;
|
lv_obj_t * ui_pageHome_BarTestProgBS;
|
||||||
|
void ui_event_pageHome_DropdownTestTypeBS(lv_event_t * e);
|
||||||
lv_obj_t * ui_pageHome_DropdownTestTypeBS;
|
lv_obj_t * ui_pageHome_DropdownTestTypeBS;
|
||||||
lv_obj_t * ui_pageHome_labelstr21;
|
lv_obj_t * ui_pageHome_labelstr21;
|
||||||
lv_obj_t * ui_pageHome_labelstr7;
|
lv_obj_t * ui_pageHome_labelstr7;
|
||||||
@ -513,6 +514,15 @@ void ui_event_pageHome_labelFluxRead(lv_event_t * e)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ui_event_pageHome_DropdownTestTypeBS(lv_event_t * e)
|
||||||
|
{
|
||||||
|
lv_event_code_t event_code = lv_event_get_code(e);
|
||||||
|
|
||||||
|
if(event_code == LV_EVENT_VALUE_CHANGED) {
|
||||||
|
on_dropdown_deviceTypeBS_valueChanged(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void ui_event_pageHome_buttonMinusBS(lv_event_t * e)
|
void ui_event_pageHome_buttonMinusBS(lv_event_t * e)
|
||||||
{
|
{
|
||||||
lv_event_code_t event_code = lv_event_get_code(e);
|
lv_event_code_t event_code = lv_event_get_code(e);
|
||||||
|
|||||||
@ -97,6 +97,7 @@ extern lv_obj_t * ui_pageHome_LabelRate35DOWN;
|
|||||||
extern lv_obj_t * ui_pageHome_LabelRate40DOWN;
|
extern lv_obj_t * ui_pageHome_LabelRate40DOWN;
|
||||||
extern lv_obj_t * ui_pageHome_labelstr20;
|
extern lv_obj_t * ui_pageHome_labelstr20;
|
||||||
extern lv_obj_t * ui_pageHome_BarTestProgBS;
|
extern lv_obj_t * ui_pageHome_BarTestProgBS;
|
||||||
|
void ui_event_pageHome_DropdownTestTypeBS(lv_event_t * e);
|
||||||
extern lv_obj_t * ui_pageHome_DropdownTestTypeBS;
|
extern lv_obj_t * ui_pageHome_DropdownTestTypeBS;
|
||||||
extern lv_obj_t * ui_pageHome_labelstr21;
|
extern lv_obj_t * ui_pageHome_labelstr21;
|
||||||
extern lv_obj_t * ui_pageHome_labelstr7;
|
extern lv_obj_t * ui_pageHome_labelstr7;
|
||||||
|
|||||||
@ -204,3 +204,8 @@ void on_buttonTimeUpdate_clicked(lv_event_t * e)
|
|||||||
{
|
{
|
||||||
// Your code here
|
// Your code here
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void on_dropdown_deviceTypeBS_valueChanged(lv_event_t * e)
|
||||||
|
{
|
||||||
|
// Your code here
|
||||||
|
}
|
||||||
|
|||||||
@ -10,6 +10,7 @@
|
|||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
void on_dropdown_deviceTypeBS_valueChanged(lv_event_t * e);
|
||||||
void on_spinboxStage_valueChanged(lv_event_t * e);
|
void on_spinboxStage_valueChanged(lv_event_t * e);
|
||||||
void on_spinboxRate_valueChanged(lv_event_t * e);
|
void on_spinboxRate_valueChanged(lv_event_t * e);
|
||||||
void on_buttonRateMinus_clicked(lv_event_t * e);
|
void on_buttonRateMinus_clicked(lv_event_t * e);
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user