Skip to content

Commit

Permalink
feat(color): add 1+4 main view screen layout (#5308)
Browse files Browse the repository at this point in the history
  • Loading branch information
pfeerick authored Jul 19, 2024
1 parent f2db941 commit 2138900
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 0 deletions.
2 changes: 2 additions & 0 deletions companion/src/companion.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -1328,7 +1328,9 @@
<qresource prefix="/layouts/">
<file alias="mask_layout1p2.png">images/layouts/mask_layout1+2.png</file>
<file alias="mask_layout1p3.png">images/layouts/mask_layout1+3.png</file>
<file alias="mask_layout1p4.png">images/layouts/mask_layout1+4.png</file>
<file alias="mask_layout1x1.png">images/layouts/mask_layout1x1.png</file>
<file alias="mask_layout1x1am.png">images/layouts/mask_layout1x1.png</file>
<file alias="mask_layout1x2.png">images/layouts/mask_layout1x2.png</file>
<file alias="mask_layout1x3.png">images/layouts/mask_layout1x3.png</file>
<file alias="mask_layout1x4.png">images/layouts/mask_layout1x4.png</file>
Expand Down
Binary file added companion/src/images/layouts/mask_layout1+4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions radio/src/gui/colorlcd/layouts/layout1+4.cpp
Original file line number Diff line number Diff line change
@@ -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<Layout> Layout1P4("Layout1P4", "1 + 4", defaultZoneOptions, 5,
(uint8_t*)zmap);

0 comments on commit 2138900

Please sign in to comment.