leo/pse-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix flow and syringe display

Browse Source
This commit is contained in:
leo 2023-10-28 17:07:40 +02:00
parent 5014f18501
commit b26745aa1b
Signed by: leo
GPG Key ID: 0DD993BFB2B307DB
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Core/Src/PSE_unit_edit_screen.c
View File

@ -70,7 +70,7 @@ lv_obj_t* flow_widget_label;
static void update_flow(keypad_data* data){ static void update_flow(keypad_data* data){
pse_unit* unit = data->user_data; pse_unit* unit = data->user_data;
unit->flow = data->value; unit->flow = data->value;
lv_label_set_text_fmt(flow_widget_label, "Debit : \n%lu.%lu\nmL/mn", unit->flow / 1000, unit->flow % 1000); lv_label_set_text_fmt(flow_widget_label, "Debit : \n%lu.%03lu\nmL/mn", unit->flow / 1000, unit->flow % 1000);
} }
static void flow_edit_handler(lv_event_t* e){ static void flow_edit_handler(lv_event_t* e){
lv_event_code_t code = lv_event_get_code(e); lv_event_code_t code = lv_event_get_code(e);
@ -92,12 +92,13 @@ static lv_obj_t* flow_widget(lv_obj_t* parent, pse_unit* unit){
lv_obj_set_size(cont, lv_pct(24), lv_pct(100)); lv_obj_set_size(cont, lv_pct(24), lv_pct(100));
lv_obj_set_flex_flow(cont, LV_FLEX_FLOW_COLUMN); lv_obj_set_flex_flow(cont, LV_FLEX_FLOW_COLUMN);
lv_obj_add_event_cb(cont, flow_edit_handler, LV_EVENT_ALL, unit); lv_obj_add_event_cb(cont, flow_edit_handler, LV_EVENT_ALL, unit);
lv_obj_set_style_pad_all(cont, 5, 0);
// flow setting // flow setting
lv_obj_t* flow = lv_label_create(cont); lv_obj_t* flow = lv_label_create(cont);
lv_obj_set_width(flow, lv_pct(100)); lv_obj_set_width(flow, lv_pct(100));
lv_obj_set_flex_grow(flow, 1); lv_obj_set_flex_grow(flow, 1);
lv_label_set_text_fmt(flow, "Debit : \n%lu.%lu\nmL/mn", unit->flow / 1000, unit->flow % 1000); lv_label_set_text_fmt(flow, "Debit : \n%lu.%03lu\nmL/mn", unit->flow / 1000, unit->flow % 1000);
flow_widget_label = flow; flow_widget_label = flow;
return cont; return cont;
} }
@ -138,6 +139,7 @@ static lv_obj_t* volume_widget(lv_obj_t* parent, pse_unit* unit){
lv_obj_set_size(cont, lv_pct(24), lv_pct(100)); lv_obj_set_size(cont, lv_pct(24), lv_pct(100));
lv_obj_set_flex_flow(cont, LV_FLEX_FLOW_COLUMN); lv_obj_set_flex_flow(cont, LV_FLEX_FLOW_COLUMN);
lv_obj_add_event_cb(cont, volume_edit_handler, LV_EVENT_ALL, unit); lv_obj_add_event_cb(cont, volume_edit_handler, LV_EVENT_ALL, unit);
lv_obj_set_style_pad_all(cont, 5, 0);
// volume setting // volume setting
lv_obj_t* vol = lv_label_create(cont); lv_obj_t* vol = lv_label_create(cont);
@ -164,7 +166,7 @@ static void update_syringe(keypad_data* data){
pse_unit* unit = data->user_data; pse_unit* unit = data->user_data;
unit->syringe->diameter = data->value; unit->syringe->diameter = data->value;
pse_syringe* syringe = unit->syringe; pse_syringe* syringe = unit->syringe;
lv_label_set_text_fmt(syringe_widget_label, "Seringue : \n%s\nD %d.%d mm", syringe->name, syringe->diameter/1000, syringe->diameter%1000); lv_label_set_text_fmt(syringe_widget_label, "Seringue D :\n%d.%03d mm", syringe->diameter/1000, syringe->diameter%1000);
} }
static void syringe_edit_handler(lv_event_t* e){ static void syringe_edit_handler(lv_event_t* e){
lv_event_code_t code = lv_event_get_code(e); lv_event_code_t code = lv_event_get_code(e);
@ -185,13 +187,14 @@ static lv_obj_t* syringe_widget(lv_obj_t* parent, pse_unit* unit){
lv_obj_set_size(cont, lv_pct(24), lv_pct(100)); lv_obj_set_size(cont, lv_pct(24), lv_pct(100));
lv_obj_set_flex_flow(cont, LV_FLEX_FLOW_COLUMN); lv_obj_set_flex_flow(cont, LV_FLEX_FLOW_COLUMN);
lv_obj_add_event_cb(cont, syringe_edit_handler, LV_EVENT_ALL, unit); lv_obj_add_event_cb(cont, syringe_edit_handler, LV_EVENT_ALL, unit);
lv_obj_set_style_pad_all(cont, 5, 0);
pse_syringe* syringe = unit->syringe; pse_syringe* syringe = unit->syringe;
// syringe setting // syringe setting
lv_obj_t* vol = lv_label_create(cont); lv_obj_t* vol = lv_label_create(cont);
lv_obj_set_width(vol, lv_pct(100)); lv_obj_set_width(vol, lv_pct(100));
lv_obj_set_flex_grow(vol, 1); lv_obj_set_flex_grow(vol, 1);
lv_label_set_text_fmt(vol, "Seringue : \n%s\nD %d.%d mm", syringe->name, syringe->diameter/1000, syringe->diameter%1000); lv_label_set_text_fmt(vol, "Seringue D :\n%d.%03d mm", syringe->diameter/1000, syringe->diameter%1000);
syringe_widget_label = vol; syringe_widget_label = vol;
return cont; return cont;
} }