From 21389006dd034bf200844ef20635a49762ef91d2 Mon Sep 17 00:00:00 2001
From: Peter Feerick <pfeerick@users.noreply.github.com>
Date: Fri, 19 Jul 2024 17:49:00 +1000
Subject: [PATCH] feat(color): add 1+4 main view screen layout (#5308)

---
 companion/src/companion.qrc                   |   2 ++
 .../src/images/layouts/mask_layout1+4.png     | Bin 0 -> 6625 bytes
 radio/src/gui/colorlcd/layouts/layout1+4.cpp  |  34 ++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 companion/src/images/layouts/mask_layout1+4.png
 create mode 100644 radio/src/gui/colorlcd/layouts/layout1+4.cpp

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 @@
   <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>
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 0000000000000000000000000000000000000000..a9439283dbfd02dfc87022e983d2cdb303d1d5ed
GIT binary patch
literal 6625
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

literal 0
HcmV?d00001

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<Layout> Layout1P4("Layout1P4", "1 + 4", defaultZoneOptions, 5,
+                                    (uint8_t*)zmap);