步骤编辑页面添加功能
This commit is contained in:
1 parent
281662556f
commit
e8966f0764
6 files changed
+1081
-330
No files matched your search
@@ -35,11 +35,11 @@ typedef struct {
|
|||||||
char StepID[4];
|
char StepID[4];
|
||||||
char StepName[20];
|
char StepName[20];
|
||||||
char ParameterName[50];
|
char ParameterName[50];
|
||||||
double Parameter1;
|
int Parameter1;
|
||||||
double Parameter2;
|
int Parameter2;
|
||||||
double Parameter3;
|
int Parameter3;
|
||||||
double Parameter4;
|
int Parameter4;
|
||||||
double Parameter5;
|
int Parameter5;
|
||||||
int P6;
|
int P6;
|
||||||
int P7;
|
int P7;
|
||||||
int P8;
|
int P8;
|
||||||
@@ -48,21 +48,21 @@ typedef struct {
|
|||||||
char StepID_S1[3];
|
char StepID_S1[3];
|
||||||
char StepID_S2[3];
|
char StepID_S2[3];
|
||||||
char StepID_S3[3];
|
char StepID_S3[3];
|
||||||
double Parameter1_S1;
|
int Parameter1_S1;
|
||||||
double Parameter2_S1;
|
int Parameter2_S1;
|
||||||
double Parameter3_S1;
|
int Parameter3_S1;
|
||||||
double Parameter4_S1;
|
int Parameter4_S1;
|
||||||
double Parameter5_S1;
|
int Parameter5_S1;
|
||||||
double Parameter1_S2;
|
int Parameter1_S2;
|
||||||
double Parameter2_S2;
|
int Parameter2_S2;
|
||||||
double Parameter3_S2;
|
int Parameter3_S2;
|
||||||
double Parameter4_S2;
|
int Parameter4_S2;
|
||||||
double Parameter5_S2;
|
int Parameter5_S2;
|
||||||
double Parameter1_S3;
|
int Parameter1_S3;
|
||||||
double Parameter2_S3;
|
int Parameter2_S3;
|
||||||
double Parameter3_S3;
|
int Parameter3_S3;
|
||||||
double Parameter4_S3;
|
int Parameter4_S3;
|
||||||
double Parameter5_S3;
|
int Parameter5_S3;
|
||||||
} IO_STEP_DATA;
|
} IO_STEP_DATA;
|
||||||
|
|
||||||
extern IO_State_DIO di_table[];
|
extern IO_State_DIO di_table[];
|
||||||
|
|||||||
@@ -366,6 +366,9 @@ static void screen_stepinf_s1_event_handler (lv_event_t *e)
|
|||||||
lv_obj_clear_flag(guider_ui.screen_stepinf_s1b, LV_OBJ_FLAG_HIDDEN);
|
lv_obj_clear_flag(guider_ui.screen_stepinf_s1b, LV_OBJ_FLAG_HIDDEN);
|
||||||
lv_obj_add_flag(guider_ui.screen_stepinf_s2b, LV_OBJ_FLAG_HIDDEN);
|
lv_obj_add_flag(guider_ui.screen_stepinf_s2b, LV_OBJ_FLAG_HIDDEN);
|
||||||
lv_obj_add_flag(guider_ui.screen_stepinf_s3b, LV_OBJ_FLAG_HIDDEN);
|
lv_obj_add_flag(guider_ui.screen_stepinf_s3b, LV_OBJ_FLAG_HIDDEN);
|
||||||
|
lv_obj_clear_flag(guider_ui.screen_stepinf_steps1, LV_OBJ_FLAG_HIDDEN);
|
||||||
|
lv_obj_add_flag(guider_ui.screen_stepinf_steps2, LV_OBJ_FLAG_HIDDEN);
|
||||||
|
lv_obj_add_flag(guider_ui.screen_stepinf_steps3, LV_OBJ_FLAG_HIDDEN);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
@@ -383,6 +386,9 @@ static void screen_stepinf_s2_event_handler (lv_event_t *e)
|
|||||||
lv_obj_add_flag(guider_ui.screen_stepinf_s1b, LV_OBJ_FLAG_HIDDEN);
|
lv_obj_add_flag(guider_ui.screen_stepinf_s1b, LV_OBJ_FLAG_HIDDEN);
|
||||||
lv_obj_clear_flag(guider_ui.screen_stepinf_s2b, LV_OBJ_FLAG_HIDDEN);
|
lv_obj_clear_flag(guider_ui.screen_stepinf_s2b, LV_OBJ_FLAG_HIDDEN);
|
||||||
lv_obj_add_flag(guider_ui.screen_stepinf_s3b, LV_OBJ_FLAG_HIDDEN);
|
lv_obj_add_flag(guider_ui.screen_stepinf_s3b, LV_OBJ_FLAG_HIDDEN);
|
||||||
|
lv_obj_add_flag(guider_ui.screen_stepinf_steps1, LV_OBJ_FLAG_HIDDEN);
|
||||||
|
lv_obj_clear_flag(guider_ui.screen_stepinf_steps2, LV_OBJ_FLAG_HIDDEN);
|
||||||
|
lv_obj_add_flag(guider_ui.screen_stepinf_steps3, LV_OBJ_FLAG_HIDDEN);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
@@ -400,6 +406,9 @@ static void screen_stepinf_s3_event_handler (lv_event_t *e)
|
|||||||
lv_obj_add_flag(guider_ui.screen_stepinf_s1b, LV_OBJ_FLAG_HIDDEN);
|
lv_obj_add_flag(guider_ui.screen_stepinf_s1b, LV_OBJ_FLAG_HIDDEN);
|
||||||
lv_obj_add_flag(guider_ui.screen_stepinf_s2b, LV_OBJ_FLAG_HIDDEN);
|
lv_obj_add_flag(guider_ui.screen_stepinf_s2b, LV_OBJ_FLAG_HIDDEN);
|
||||||
lv_obj_clear_flag(guider_ui.screen_stepinf_s3b, LV_OBJ_FLAG_HIDDEN);
|
lv_obj_clear_flag(guider_ui.screen_stepinf_s3b, LV_OBJ_FLAG_HIDDEN);
|
||||||
|
lv_obj_add_flag(guider_ui.screen_stepinf_steps1, LV_OBJ_FLAG_HIDDEN);
|
||||||
|
lv_obj_add_flag(guider_ui.screen_stepinf_steps2, LV_OBJ_FLAG_HIDDEN);
|
||||||
|
lv_obj_clear_flag(guider_ui.screen_stepinf_steps3, LV_OBJ_FLAG_HIDDEN);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -456,21 +456,44 @@ typedef struct
|
|||||||
lv_obj_t *screen_stepinf_s1;
|
lv_obj_t *screen_stepinf_s1;
|
||||||
lv_obj_t *screen_stepinf_s2;
|
lv_obj_t *screen_stepinf_s2;
|
||||||
lv_obj_t *screen_stepinf_s3;
|
lv_obj_t *screen_stepinf_s3;
|
||||||
lv_obj_t *screen_stepinf_p1;
|
|
||||||
lv_obj_t *screen_stepinf_p2;
|
|
||||||
lv_obj_t *screen_stepinf_p3;
|
|
||||||
lv_obj_t *screen_stepinf_p4;
|
|
||||||
lv_obj_t *screen_stepinf_p5;
|
|
||||||
lv_obj_t *screen_btn_1;
|
lv_obj_t *screen_btn_1;
|
||||||
lv_obj_t *screen_btn_1_label;
|
lv_obj_t *screen_btn_1_label;
|
||||||
lv_obj_t *screen_btn_2;
|
lv_obj_t *screen_btn_2;
|
||||||
lv_obj_t *screen_btn_2_label;
|
lv_obj_t *screen_btn_2_label;
|
||||||
lv_obj_t *screen_label_42;
|
lv_obj_t *screen_label_42;
|
||||||
lv_obj_t *screen_stepinf_p1n;
|
lv_obj_t *screen_stepinf_steps1;
|
||||||
lv_obj_t *screen_stepinf_p2n;
|
lv_obj_t *screen_stepinf_p5;
|
||||||
lv_obj_t *screen_stepinf_p3n;
|
lv_obj_t *screen_stepinf_p4;
|
||||||
lv_obj_t *screen_stepinf_p4n;
|
lv_obj_t *screen_stepinf_p3;
|
||||||
|
lv_obj_t *screen_stepinf_p2;
|
||||||
|
lv_obj_t *screen_stepinf_p1;
|
||||||
lv_obj_t *screen_stepinf_p5n;
|
lv_obj_t *screen_stepinf_p5n;
|
||||||
|
lv_obj_t *screen_stepinf_p4n;
|
||||||
|
lv_obj_t *screen_stepinf_p3n;
|
||||||
|
lv_obj_t *screen_stepinf_p2n;
|
||||||
|
lv_obj_t *screen_stepinf_p1n;
|
||||||
|
lv_obj_t *screen_stepinf_steps2;
|
||||||
|
lv_obj_t *screen_stepinf_p5b1;
|
||||||
|
lv_obj_t *screen_stepinf_p4b1;
|
||||||
|
lv_obj_t *screen_stepinf_p3b1;
|
||||||
|
lv_obj_t *screen_stepinf_p2b1;
|
||||||
|
lv_obj_t *screen_stepinf_p1b1;
|
||||||
|
lv_obj_t *screen_stepinf_p5n1;
|
||||||
|
lv_obj_t *screen_stepinf_p4n1;
|
||||||
|
lv_obj_t *screen_stepinf_p3n1;
|
||||||
|
lv_obj_t *screen_stepinf_p2n1;
|
||||||
|
lv_obj_t *screen_stepinf_p1n1;
|
||||||
|
lv_obj_t *screen_stepinf_steps3;
|
||||||
|
lv_obj_t *screen_stepinf_p5b2;
|
||||||
|
lv_obj_t *screen_stepinf_p4b2;
|
||||||
|
lv_obj_t *screen_stepinf_p3b2;
|
||||||
|
lv_obj_t *screen_stepinf_p2b2;
|
||||||
|
lv_obj_t *screen_stepinf_p1b2;
|
||||||
|
lv_obj_t *screen_stepinf_p5n2;
|
||||||
|
lv_obj_t *screen_stepinf_p4n2;
|
||||||
|
lv_obj_t *screen_stepinf_p3n2;
|
||||||
|
lv_obj_t *screen_stepinf_p2n2;
|
||||||
|
lv_obj_t *screen_stepinf_p1n2;
|
||||||
lv_obj_t *screen_line_1;
|
lv_obj_t *screen_line_1;
|
||||||
lv_obj_t *screen_label_48;
|
lv_obj_t *screen_label_48;
|
||||||
lv_obj_t *screen_label_49;
|
lv_obj_t *screen_label_49;
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
@@ -372,21 +372,21 @@ IO_STEP_DATA step_csv_to_table(const char *csv_data) {
|
|||||||
rt_snprintf(temp.StepID ,3,csv_get_cell(user, 1, 1));
|
rt_snprintf(temp.StepID ,3,csv_get_cell(user, 1, 1));
|
||||||
rt_snprintf(temp.StepID_S1 ,3,csv_get_cell(user, 1, 2));
|
rt_snprintf(temp.StepID_S1 ,3,csv_get_cell(user, 1, 2));
|
||||||
rt_snprintf(temp.StepID_S2 ,3,csv_get_cell(user, 1, 3));
|
rt_snprintf(temp.StepID_S2 ,3,csv_get_cell(user, 1, 3));
|
||||||
temp.Parameter1 = atof(csv_get_cell(user, 1, 4));
|
temp.Parameter1 = atoi(csv_get_cell(user, 1, 4));
|
||||||
temp.Parameter2 = atof(csv_get_cell(user, 1, 5));
|
temp.Parameter2 = atoi(csv_get_cell(user, 1, 5));
|
||||||
temp.Parameter3 = atof(csv_get_cell(user, 1, 6));
|
temp.Parameter3 = atoi(csv_get_cell(user, 1, 6));
|
||||||
temp.Parameter4 = atof(csv_get_cell(user, 1, 7));
|
temp.Parameter4 = atoi(csv_get_cell(user, 1, 7));
|
||||||
temp.Parameter5 = atof(csv_get_cell(user, 1, 8));
|
temp.Parameter5 = atoi(csv_get_cell(user, 1, 8));
|
||||||
temp.Parameter1_S1 = atof(csv_get_cell(user, 1, 9));
|
temp.Parameter1_S1 = atoi(csv_get_cell(user, 1, 9));
|
||||||
temp.Parameter2_S1 = atof(csv_get_cell(user, 1, 10));
|
temp.Parameter2_S1 = atoi(csv_get_cell(user, 1, 10));
|
||||||
temp.Parameter3_S1 = atof(csv_get_cell(user, 1, 11));
|
temp.Parameter3_S1 = atoi(csv_get_cell(user, 1, 11));
|
||||||
temp.Parameter4_S1 = atof(csv_get_cell(user, 1, 12));
|
temp.Parameter4_S1 = atoi(csv_get_cell(user, 1, 12));
|
||||||
temp.Parameter5_S1 = atof(csv_get_cell(user, 1, 13));
|
temp.Parameter5_S1 = atoi(csv_get_cell(user, 1, 13));
|
||||||
temp.Parameter1_S2 = atof(csv_get_cell(user, 1, 14));
|
temp.Parameter1_S2 = atoi(csv_get_cell(user, 1, 14));
|
||||||
temp.Parameter2_S2 = atof(csv_get_cell(user, 1, 15));
|
temp.Parameter2_S2 = atoi(csv_get_cell(user, 1, 15));
|
||||||
temp.Parameter3_S2 = atof(csv_get_cell(user, 1, 16));
|
temp.Parameter3_S2 = atoi(csv_get_cell(user, 1, 16));
|
||||||
temp.Parameter4_S2 = atof(csv_get_cell(user, 1, 17));
|
temp.Parameter4_S2 = atoi(csv_get_cell(user, 1, 17));
|
||||||
temp.Parameter5_S2 = atof(csv_get_cell(user, 1, 18));
|
temp.Parameter5_S2 = atoi(csv_get_cell(user, 1, 18));
|
||||||
|
|
||||||
// 释放内存
|
// 释放内存
|
||||||
rt_memheap_free(user);
|
rt_memheap_free(user);
|
||||||
|
|||||||
@@ -85,13 +85,45 @@ static const int get_step_namer(char * step_id)
|
|||||||
|
|
||||||
void STEP_DATA_set_ui(IO_STEP_DATA* STEPDATA_inf)
|
void STEP_DATA_set_ui(IO_STEP_DATA* STEPDATA_inf)
|
||||||
{
|
{
|
||||||
|
//步骤信息页面填入
|
||||||
char str_str[4];
|
char str_str[4];
|
||||||
|
char str_step[5];
|
||||||
lv_snprintf(str_str, sizeof(str_str), "%03d", STEPDATA_inf->Step);
|
lv_snprintf(str_str, sizeof(str_str), "%03d", STEPDATA_inf->Step);
|
||||||
lv_label_set_text(guider_ui.screen_stepinf_step,(const char *)str_str);
|
lv_label_set_text(guider_ui.screen_stepinf_step,(const char *)str_str);
|
||||||
lv_label_set_text(guider_ui.screen_stepinf_name,(const char *)STEPDATA_inf->Program);
|
lv_label_set_text(guider_ui.screen_stepinf_name,(const char *)STEPDATA_inf->Program);
|
||||||
lv_dropdown_set_selected(guider_ui.screen_stepinf_s1,get_step_name(STEPDATA_inf->StepID));
|
lv_dropdown_set_selected(guider_ui.screen_stepinf_s1,get_step_name(STEPDATA_inf->StepID));
|
||||||
lv_dropdown_set_selected(guider_ui.screen_stepinf_s2,get_step_namer(STEPDATA_inf->StepID_S1));
|
lv_dropdown_set_selected(guider_ui.screen_stepinf_s2,get_step_namer(STEPDATA_inf->StepID_S1));
|
||||||
lv_dropdown_set_selected(guider_ui.screen_stepinf_s3,get_step_namer(STEPDATA_inf->StepID_S2));
|
lv_dropdown_set_selected(guider_ui.screen_stepinf_s3,get_step_namer(STEPDATA_inf->StepID_S2));
|
||||||
|
lv_snprintf(str_step, sizeof(str_step), "%d", STEPDATA_inf->Parameter1);
|
||||||
|
lv_textarea_set_text(guider_ui.screen_stepinf_p1,(const char *)str_step);
|
||||||
|
lv_snprintf(str_step, sizeof(str_step), "%d", STEPDATA_inf->Parameter2);
|
||||||
|
lv_textarea_set_text(guider_ui.screen_stepinf_p2,(const char *)str_step);
|
||||||
|
lv_snprintf(str_step, sizeof(str_step), "%d", STEPDATA_inf->Parameter3);
|
||||||
|
lv_textarea_set_text(guider_ui.screen_stepinf_p3,(const char *)str_step);
|
||||||
|
lv_snprintf(str_step, sizeof(str_step), "%d", STEPDATA_inf->Parameter4);
|
||||||
|
lv_textarea_set_text(guider_ui.screen_stepinf_p4,(const char *)str_step);
|
||||||
|
lv_snprintf(str_step, sizeof(str_step), "%d", STEPDATA_inf->Parameter5);
|
||||||
|
lv_textarea_set_text(guider_ui.screen_stepinf_p5,(const char *)str_step);
|
||||||
|
lv_snprintf(str_step, sizeof(str_step), "%d", STEPDATA_inf->Parameter1_S1);
|
||||||
|
lv_textarea_set_text(guider_ui.screen_stepinf_p1b1,(const char *)str_step);
|
||||||
|
lv_snprintf(str_step, sizeof(str_step), "%d", STEPDATA_inf->Parameter2_S1);
|
||||||
|
lv_textarea_set_text(guider_ui.screen_stepinf_p2b1,(const char *)str_step);
|
||||||
|
lv_snprintf(str_step, sizeof(str_step), "%d", STEPDATA_inf->Parameter3_S1);
|
||||||
|
lv_textarea_set_text(guider_ui.screen_stepinf_p3b1,(const char *)str_step);
|
||||||
|
lv_snprintf(str_step, sizeof(str_step), "%d", STEPDATA_inf->Parameter4_S1);
|
||||||
|
lv_textarea_set_text(guider_ui.screen_stepinf_p4b1,(const char *)str_step);
|
||||||
|
lv_snprintf(str_step, sizeof(str_step), "%d", STEPDATA_inf->Parameter5_S1);
|
||||||
|
lv_textarea_set_text(guider_ui.screen_stepinf_p5b1,(const char *)str_step);
|
||||||
|
lv_snprintf(str_step, sizeof(str_step), "%d", STEPDATA_inf->Parameter1_S2);
|
||||||
|
lv_textarea_set_text(guider_ui.screen_stepinf_p1b2,(const char *)str_step);
|
||||||
|
lv_snprintf(str_step, sizeof(str_step), "%d", STEPDATA_inf->Parameter2_S2);
|
||||||
|
lv_textarea_set_text(guider_ui.screen_stepinf_p2b2,(const char *)str_step);
|
||||||
|
lv_snprintf(str_step, sizeof(str_step), "%d", STEPDATA_inf->Parameter3_S2);
|
||||||
|
lv_textarea_set_text(guider_ui.screen_stepinf_p3b2,(const char *)str_step);
|
||||||
|
lv_snprintf(str_step, sizeof(str_step), "%d", STEPDATA_inf->Parameter4_S2);
|
||||||
|
lv_textarea_set_text(guider_ui.screen_stepinf_p4b2,(const char *)str_step);
|
||||||
|
lv_snprintf(str_step, sizeof(str_step), "%d", STEPDATA_inf->Parameter5_S2);
|
||||||
|
lv_textarea_set_text(guider_ui.screen_stepinf_p5b2,(const char *)str_step);
|
||||||
|
|
||||||
lv_obj_clear_flag(guider_ui.screen_stepinf_s1b, LV_OBJ_FLAG_HIDDEN);
|
lv_obj_clear_flag(guider_ui.screen_stepinf_s1b, LV_OBJ_FLAG_HIDDEN);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user