更新:
1、部分英文文本错误修复; 2、上下限指示框尺寸调整,图例位置调整; 3、修复负数精度异常的问题(四舍五入);
This commit is contained in:
parent
9b7de39574
commit
c7fae1073a
|
@ -1223,7 +1223,7 @@ void set_output(float32 sto)
|
|||
sto *= 1000;
|
||||
|
||||
//配合 set_output_array(int32_t) 进行四舍五入取整
|
||||
sto += (float32)0.5;
|
||||
sto = (sto >= 0)?( sto + (float32)0.5 ):( sto - (float32)0.5 );
|
||||
|
||||
//更新缓存
|
||||
set_output_array(sto);
|
||||
|
|
|
@ -503,19 +503,19 @@ void set_item2_text(uint8_t con)
|
|||
{
|
||||
case 0:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "not saved");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "Not save");
|
||||
}
|
||||
break;
|
||||
|
||||
case 1:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "saving");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "Saving");
|
||||
}
|
||||
break;
|
||||
|
||||
case 2:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "saved");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "Finished");
|
||||
}
|
||||
break;
|
||||
|
||||
|
@ -570,7 +570,7 @@ void set_item2_text(uint8_t con)
|
|||
|
||||
case 1:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "< saving >");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_01, "< Saving >");
|
||||
}
|
||||
break;
|
||||
|
||||
|
@ -636,7 +636,7 @@ void set_item2_text(uint8_t con)
|
|||
|
||||
case 1:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_31, "resetting");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_31, "Resetting");
|
||||
}
|
||||
break;
|
||||
|
||||
|
@ -697,7 +697,7 @@ void set_item2_text(uint8_t con)
|
|||
|
||||
case 1:
|
||||
{
|
||||
lv_label_set_text(guider_ui.screen_setting_label_31, "< resetting >");
|
||||
lv_label_set_text(guider_ui.screen_setting_label_31, "< Resetting >");
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
|
@ -505,7 +505,7 @@ void setup_scr_screen_main(lv_ui *ui)
|
|||
lv_label_set_text(ui->screen_main_label_area_IN, "0/30");
|
||||
lv_label_set_long_mode(ui->screen_main_label_area_IN, LV_LABEL_LONG_WRAP);
|
||||
lv_obj_set_pos(ui->screen_main_label_area_IN, 0, 155);
|
||||
lv_obj_set_size(ui->screen_main_label_area_IN, 82, 17);
|
||||
lv_obj_set_size(ui->screen_main_label_area_IN, 86, 17);
|
||||
|
||||
//Write style for screen_main_label_area_IN, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT.
|
||||
lv_obj_set_style_border_width(ui->screen_main_label_area_IN, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
|
@ -528,7 +528,7 @@ void setup_scr_screen_main(lv_ui *ui)
|
|||
lv_label_set_text(ui->screen_main_label_area_OUT, "0/30");
|
||||
lv_label_set_long_mode(ui->screen_main_label_area_OUT, LV_LABEL_LONG_WRAP);
|
||||
lv_obj_set_pos(ui->screen_main_label_area_OUT, 0, 200);
|
||||
lv_obj_set_size(ui->screen_main_label_area_OUT, 82, 17);
|
||||
lv_obj_set_size(ui->screen_main_label_area_OUT, 86, 17);
|
||||
|
||||
//Write style for screen_main_label_area_OUT, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT.
|
||||
lv_obj_set_style_border_width(ui->screen_main_label_area_OUT, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||
|
@ -550,7 +550,7 @@ void setup_scr_screen_main(lv_ui *ui)
|
|||
ui->screen_main_line_legend_IN = lv_line_create(ui->screen_main);
|
||||
static lv_point_t screen_main_line_legend_IN[] = {{320, 0},{0, 0},};
|
||||
lv_line_set_points(ui->screen_main_line_legend_IN, screen_main_line_legend_IN, 2);
|
||||
lv_obj_set_pos(ui->screen_main_line_legend_IN, 26, 182);
|
||||
lv_obj_set_pos(ui->screen_main_line_legend_IN, 28, 182);
|
||||
lv_obj_set_size(ui->screen_main_line_legend_IN, 30, 1);
|
||||
|
||||
//Write style for screen_main_line_legend_IN, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT.
|
||||
|
@ -562,7 +562,7 @@ void setup_scr_screen_main(lv_ui *ui)
|
|||
ui->screen_main_line_legend_OUT = lv_line_create(ui->screen_main);
|
||||
static lv_point_t screen_main_line_legend_OUT[] = {{320, 0},{0, 0},};
|
||||
lv_line_set_points(ui->screen_main_line_legend_OUT, screen_main_line_legend_OUT, 2);
|
||||
lv_obj_set_pos(ui->screen_main_line_legend_OUT, 26, 227);
|
||||
lv_obj_set_pos(ui->screen_main_line_legend_OUT, 28, 227);
|
||||
lv_obj_set_size(ui->screen_main_line_legend_OUT, 30, 1);
|
||||
|
||||
//Write style for screen_main_line_legend_OUT, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT.
|
||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue