diff --git a/radio/src/gui/colorlcd/color_editor.cpp b/radio/src/gui/colorlcd/color_editor.cpp index b8dca816a..8fe015c08 100644 --- a/radio/src/gui/colorlcd/color_editor.cpp +++ b/radio/src/gui/colorlcd/color_editor.cpp @@ -311,7 +311,7 @@ ColorEditor::ColorEditor(FormGroup *window, const rect_t rect, uint32_t color, lv_label_set_text_static(barLabels[i], _colorType->getLabelChars()[i]); barValLabels[i] = create_bar_value_label(lvobj, x + 10, y + 3); - lv_label_set_text_fmt(barValLabels[i], "%d", bar->value); + lv_label_set_text_fmt(barValLabels[i], "%" PRIu32, bar->value); } lv_obj_add_event_cb(lvobj, ColorEditor::value_changed, LV_EVENT_VALUE_CHANGED, nullptr); @@ -336,7 +336,7 @@ void ColorEditor::setRGB() // update bars & labels for (int i = 0; i < MAX_BARS; i++) { auto bar = _colorType->bars[i]; - lv_label_set_text_fmt(barValLabels[i], "%d", bar->value); + lv_label_set_text_fmt(barValLabels[i], "%" PRIu32, bar->value); bar->invalidate(); } diff --git a/radio/src/gui/colorlcd/mpm_settings.cpp b/radio/src/gui/colorlcd/mpm_settings.cpp index 66c453cf3..7da50159c 100644 --- a/radio/src/gui/colorlcd/mpm_settings.cpp +++ b/radio/src/gui/colorlcd/mpm_settings.cpp @@ -33,7 +33,7 @@ struct MPMProtoOption : public FormGroup::Line Choice* choice; NumberEdit* edit; CheckBox* cb; - DynamicNumber* rssi; + DynamicNumber* rssi; MPMProtoOption(FormGroup* form, FlexGridLayout *layout); void update(const MultiRfProtocols::RfProto* rfProto, ModuleData* md); @@ -51,8 +51,8 @@ MPMProtoOption::MPMProtoOption(FormGroup* form, FlexGridLayout *layout) : choice = new Choice(box, rect_t{}, 0, 0, nullptr); edit = new NumberEdit(box, rect_t{}, 0, 0, nullptr); cb = new CheckBox(box, rect_t{}, nullptr, nullptr); - rssi = new DynamicNumber( - box, rect_t{}, [] { return (int)TELEMETRY_RSSI(); }, 0, "RSSI: ", " db"); + rssi = new DynamicNumber( + box, rect_t{}, [] { return (uint16_t)TELEMETRY_RSSI(); }, 0, "RSSI: ", " db"); } void MPMProtoOption::update(const MultiRfProtocols::RfProto* rfProto, ModuleData* md) diff --git a/radio/src/gui/colorlcd/view_statistics.cpp b/radio/src/gui/colorlcd/view_statistics.cpp index 49b681516..14671cdf7 100644 --- a/radio/src/gui/colorlcd/view_statistics.cpp +++ b/radio/src/gui/colorlcd/view_statistics.cpp @@ -182,7 +182,7 @@ void DebugViewPage::build(FormWindow *window) // Free mem new StaticText(window, grid.getLabelSlot(), STR_FREE_MEM_LABEL, 0, COLOR_THEME_PRIMARY1); - new DynamicNumber( + new DynamicNumber( window, grid.getFieldSlot(), [] { return availableMemory(); }, COLOR_THEME_PRIMARY1, nullptr, "b"); grid.nextLine(); diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui index 321f76954..68573b9d9 160000 --- a/radio/src/thirdparty/libopenui +++ b/radio/src/thirdparty/libopenui @@ -1 +1 @@ -Subproject commit 321f76954083a7839203f2a0cd7243290bfe013c +Subproject commit 68573b9d9f28f9c15e2ba4002336fb7722a839af