diff --git a/companion/src/companion.qrc b/companion/src/companion.qrc index 17c6a48cf..63d60eff0 100644 --- a/companion/src/companion.qrc +++ b/companion/src/companion.qrc @@ -1328,7 +1328,9 @@ images/layouts/mask_layout1+2.png images/layouts/mask_layout1+3.png + images/layouts/mask_layout1+4.png images/layouts/mask_layout1x1.png + images/layouts/mask_layout1x1.png images/layouts/mask_layout1x2.png images/layouts/mask_layout1x3.png images/layouts/mask_layout1x4.png diff --git a/companion/src/images/layouts/mask_layout1+4.png b/companion/src/images/layouts/mask_layout1+4.png new file mode 100644 index 000000000..a9439283d Binary files /dev/null and b/companion/src/images/layouts/mask_layout1+4.png differ diff --git a/radio/src/gui/colorlcd/layouts/layout1+4.cpp b/radio/src/gui/colorlcd/layouts/layout1+4.cpp new file mode 100644 index 000000000..29289c2b7 --- /dev/null +++ b/radio/src/gui/colorlcd/layouts/layout1+4.cpp @@ -0,0 +1,34 @@ +/* + * Copyright (C) EdgeTX + * + * Based on code named + * opentx - https://github.com/opentx/opentx + * th9x - http://code.google.com/p/th9x + * er9x - http://code.google.com/p/er9x + * gruvin9x - http://code.google.com/p/gruvin9x + * + * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include "layout.h" +#include "layout_factory_impl.h" + +static const uint8_t zmap[] = { + LAYOUT_MAP_0, LAYOUT_MAP_0, LAYOUT_MAP_HALF, LAYOUT_MAP_FULL, + LAYOUT_MAP_HALF, LAYOUT_MAP_0, LAYOUT_MAP_HALF, LAYOUT_MAP_1QTR, + LAYOUT_MAP_HALF, LAYOUT_MAP_1QTR, LAYOUT_MAP_HALF, LAYOUT_MAP_1QTR, + LAYOUT_MAP_HALF, LAYOUT_MAP_HALF, LAYOUT_MAP_HALF, LAYOUT_MAP_1QTR, + LAYOUT_MAP_HALF, LAYOUT_MAP_3QTR, LAYOUT_MAP_HALF, LAYOUT_MAP_1QTR, +}; + +BaseLayoutFactory Layout1P4("Layout1P4", "1 + 4", defaultZoneOptions, 5, + (uint8_t*)zmap);