From 88b3c14c02aa60e944a9b4a5a7fca4cdb59c10ef Mon Sep 17 00:00:00 2001
From: Peter Feerick <peter.feerick@gmail.com>
Date: Mon, 23 Aug 2021 22:38:45 +1000
Subject: [PATCH] Implement 2+3 layout

---
 radio/src/gui/colorlcd/layouts/layout2+3.cpp  |  72 ++++++++++++++++++
 .../gui/colorlcd/layouts/mask_layout2+3.png   | Bin 0 -> 207 bytes
 2 files changed, 72 insertions(+)
 create mode 100644 radio/src/gui/colorlcd/layouts/layout2+3.cpp
 create mode 100644 radio/src/gui/colorlcd/layouts/mask_layout2+3.png

diff --git a/radio/src/gui/colorlcd/layouts/layout2+3.cpp b/radio/src/gui/colorlcd/layouts/layout2+3.cpp
new file mode 100644
index 000000000..606a227b2
--- /dev/null
+++ b/radio/src/gui/colorlcd/layouts/layout2+3.cpp
@@ -0,0 +1,72 @@
+/*
+ * 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"
+
+const uint8_t LBM_LAYOUT_2P3[] = {
+#include "mask_layout2+3.lbm"
+};
+
+const ZoneOption OPTIONS_LAYOUT_2P3[] =  {
+  LAYOUT_COMMON_OPTIONS,
+  LAYOUT_OPTIONS_END
+};
+
+class Layout2P3: public Layout
+{
+  public:
+    Layout2P3(const LayoutFactory * factory, Layout::PersistentData * persistentData):
+      Layout(factory, persistentData)
+    {
+    }
+
+    unsigned int getZonesCount() const override
+    {
+      return 5;
+    }
+
+    rect_t getZone(unsigned int index) const override
+    {
+      rect_t zone = getMainZone();
+
+      zone.w /= 2;
+
+      if (index == 0 || index == 1) {
+        zone.h /= 2;
+        if (index == 1) zone.y += zone.h;
+        if (isMirrored()) {
+          zone.x += zone.w;
+        }
+      } else {
+        index -= 2;
+        zone.h /= 3;
+        zone.y += zone.h * (int)index;
+        if (!isMirrored()) {
+          zone.x += zone.w;
+        }
+      }
+
+      return zone;
+    }
+};
+
+BaseLayoutFactory<Layout2P3> Layout2P3("Layout2P3", "2 + 3", LBM_LAYOUT_2P3, OPTIONS_LAYOUT_2P3);
diff --git a/radio/src/gui/colorlcd/layouts/mask_layout2+3.png b/radio/src/gui/colorlcd/layouts/mask_layout2+3.png
new file mode 100644
index 0000000000000000000000000000000000000000..76e8d886cfda5cfc7acbdf09a4c10ed0c3d9f05f
GIT binary patch
literal 207
zcmeAS@N?(olHy`uVBq!ia0vp^#y~8|!3HGfOcSdDQjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`ISV`@i-DT2f-s})wTO>E!4yvy$B+p3x7Px>4k++2Unu#$|8v?^?l+4S
zTWkd0OlMge#c<D5=Z(SXm24rQ`UR^k_ns?$E+*s_dT7NaF6W)IB0rs5@#*zU<GF{e
z(q2l2R;K@Z@iyJ_{0c9LP|n4tw0NH8A7iX}!>Oex;+XdsXdi>8tDnm{r-UW|$ZJTX

literal 0
HcmV?d00001