diff --git a/applications/data/SC828_DATA_table.h b/applications/data/SC828_DATA_table.h index 4e61c77..879230d 100644 --- a/applications/data/SC828_DATA_table.h +++ b/applications/data/SC828_DATA_table.h @@ -35,11 +35,11 @@ typedef struct { char StepID[4]; char StepName[20]; char ParameterName[50]; - int Parameter1; - int Parameter2; - int Parameter3; - int Parameter4; - int Parameter5; + double Parameter1; + double Parameter2; + double Parameter3; + double Parameter4; + double Parameter5; int P6; int P7; int P8; @@ -48,21 +48,21 @@ typedef struct { char StepID_S1[3]; char StepID_S2[3]; char StepID_S3[3]; - int Parameter1_S1; - int Parameter2_S1; - int Parameter3_S1; - int Parameter4_S1; - int Parameter5_S1; - int Parameter1_S2; - int Parameter2_S2; - int Parameter3_S2; - int Parameter4_S2; - int Parameter5_S2; - int Parameter1_S3; - int Parameter2_S3; - int Parameter3_S3; - int Parameter4_S3; - int Parameter5_S3; + double Parameter1_S1; + double Parameter2_S1; + double Parameter3_S1; + double Parameter4_S1; + double Parameter5_S1; + double Parameter1_S2; + double Parameter2_S2; + double Parameter3_S2; + double Parameter4_S2; + double Parameter5_S2; + double Parameter1_S3; + double Parameter2_S3; + double Parameter3_S3; + double Parameter4_S3; + double Parameter5_S3; } IO_STEP_DATA; extern IO_State_DIO di_table[]; diff --git a/applications/lvgl/ui_data_labels_step.c b/applications/lvgl/ui_data_labels_step.c index 72c366e..a900abd 100644 --- a/applications/lvgl/ui_data_labels_step.c +++ b/applications/lvgl/ui_data_labels_step.c @@ -83,6 +83,18 @@ static const int get_step_namer(char * step_id) #include "sql/DB_SQLite.h" #include"ui_data_csv.h" +void str_step_ui(char *buffer,double scaled_val) +{ + int integer_part = (int) scaled_val; + int fractional_part = (int)((scaled_val * 10)-(integer_part*10)); + + if (fractional_part == 0) { + lv_snprintf(buffer, sizeof(buffer), "%d", integer_part); + } else { + lv_snprintf(buffer, sizeof(buffer), "%d.%d", integer_part, fractional_part); + } +} + void STEP_DATA_set_ui(IO_STEP_DATA* STEPDATA_inf) { //步骤信息页面填入 @@ -94,35 +106,35 @@ void STEP_DATA_set_ui(IO_STEP_DATA* STEPDATA_inf) 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_s3,get_step_namer(STEPDATA_inf->StepID_S2)); - lv_snprintf(str_step, sizeof(str_step), "%d", STEPDATA_inf->Parameter1); + str_step_ui(str_step, 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); + str_step_ui(str_step, 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); + str_step_ui(str_step, 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); + str_step_ui(str_step, 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); + str_step_ui(str_step, 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); + str_step_ui(str_step, 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); + str_step_ui(str_step, 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); + str_step_ui(str_step, 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); + str_step_ui(str_step, 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); + str_step_ui(str_step, 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); + str_step_ui(str_step, 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); + str_step_ui(str_step, 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); + str_step_ui(str_step, 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); + str_step_ui(str_step, 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); + str_step_ui(str_step, 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);