diff --git a/radio/src/gui/colorlcd/controls/input_source.cpp b/radio/src/gui/colorlcd/controls/input_source.cpp index 39cfceb1a..db547d6a7 100644 --- a/radio/src/gui/colorlcd/controls/input_source.cpp +++ b/radio/src/gui/colorlcd/controls/input_source.cpp @@ -71,7 +71,7 @@ class SensorValue : public StaticText } protected: - getvalue_t lastSensorVal; + getvalue_t lastSensorVal = INT32_MAX; ExpoData *input; }; @@ -99,18 +99,22 @@ InputSource::InputSource(Window *parent, ExpoData *input) : sensor_form->setFlexLayout(); FlexGridLayout grid(col_dsc, row_dsc); - auto line = sensor_form->newLine(grid); - line->padAll(PAD_ZERO); // Value + auto line = sensor_form->newLine(grid); + line->padAll(PAD_ZERO); + line->setWidth(SENSOR_W); + new StaticText(line, rect_t{}, STR_VALUE); auto sensor = new SensorValue(line, rect_t{}, input); // Scale line = sensor_form->newLine(grid); - line->padAll(PAD_TINY); + line->padAll(PAD_OUTLINE); + line->setWidth(SENSOR_W); + new StaticText(line, rect_t{}, STR_SCALE); - new NumberEdit(line, rect_t{0, 0, EdgeTxStyles::EDIT_FLD_WIDTH_NARROW, 0}, 0, + new NumberEdit(line, {0, 0, EdgeTxStyles::EDIT_FLD_WIDTH_NARROW, 0}, 0, maxTelemValue(input->srcRaw - MIXSRC_FIRST_TELEM + 1), GET_SET_DEFAULT(input->scale), sensor->getSensorPrec()); diff --git a/radio/src/gui/colorlcd/controls/input_source.h b/radio/src/gui/colorlcd/controls/input_source.h index 6669b9ad0..d3c110e40 100644 --- a/radio/src/gui/colorlcd/controls/input_source.h +++ b/radio/src/gui/colorlcd/controls/input_source.h @@ -33,6 +33,8 @@ class InputSource : public Window void update(); + static LAYOUT_ORIENTATION(SENSOR_W, LV_PCT(60), LV_PCT(100)) + public: InputSource(Window* parent, ExpoData* input); }; diff --git a/radio/src/gui/colorlcd/model/input_edit.cpp b/radio/src/gui/colorlcd/model/input_edit.cpp index 341e84042..87d64d333 100644 --- a/radio/src/gui/colorlcd/model/input_edit.cpp +++ b/radio/src/gui/colorlcd/model/input_edit.cpp @@ -33,8 +33,13 @@ #define SET_DIRTY() storageDirty(EE_MODEL) +#if LANDSCAPE +static const lv_coord_t col_dsc[] = {LV_GRID_FR(3), LV_GRID_FR(8), + LV_GRID_TEMPLATE_LAST}; +#else static const lv_coord_t col_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(2), LV_GRID_TEMPLATE_LAST}; +#endif static const lv_coord_t row_dsc[] = {LV_GRID_CONTENT, LV_GRID_TEMPLATE_LAST}; class InputEditAdvanced : public Page diff --git a/radio/src/gui/colorlcd/model/input_edit.h b/radio/src/gui/colorlcd/model/input_edit.h index b32a2898c..acdf2e624 100644 --- a/radio/src/gui/colorlcd/model/input_edit.h +++ b/radio/src/gui/colorlcd/model/input_edit.h @@ -32,7 +32,8 @@ class InputEditWindow : public Page void previewUpdate() { updatePreview = true; } - static LAYOUT_ORIENTATION_SCALED(INPUT_EDIT_CURVE_WIDTH, 138, 176) + static LAYOUT_SIZE(CURVE_W_LANDSCAPE, 138, 120) + static LAYOUT_ORIENTATION_SCALED(INPUT_EDIT_CURVE_WIDTH, CURVE_W_LANDSCAPE, 176) static LAYOUT_ORIENTATION(INPUT_EDIT_CURVE_HEIGHT, INPUT_EDIT_CURVE_WIDTH, LAYOUT_SCALE(132)) protected: