From a191effcf6e5af45fcd6c57df77398c6bd6a13b5 Mon Sep 17 00:00:00 2001
From: Peter Feerick <peter.feerick@gmail.com>
Date: Mon, 23 Aug 2021 22:47:09 +1000
Subject: [PATCH] Implement 2x3 layout

---
 radio/src/gui/colorlcd/layouts/layout2x3.cpp  |  66 ++++++++++++++++++
 .../gui/colorlcd/layouts/mask_layout2x3.png   | Bin 0 -> 196 bytes
 2 files changed, 66 insertions(+)
 create mode 100644 radio/src/gui/colorlcd/layouts/layout2x3.cpp
 create mode 100644 radio/src/gui/colorlcd/layouts/mask_layout2x3.png

diff --git a/radio/src/gui/colorlcd/layouts/layout2x3.cpp b/radio/src/gui/colorlcd/layouts/layout2x3.cpp
new file mode 100644
index 000000000..d31f65cd6
--- /dev/null
+++ b/radio/src/gui/colorlcd/layouts/layout2x3.cpp
@@ -0,0 +1,66 @@
+/*
+ * 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_2x3[] = {
+#include "mask_layout2x3.lbm"
+};
+
+const ZoneOption OPTIONS_LAYOUT_2x3[] = {
+  LAYOUT_COMMON_OPTIONS,
+  LAYOUT_OPTIONS_END
+};
+
+class Layout2x3: public Layout
+{
+  public:
+    Layout2x3(const LayoutFactory * factory, Layout::PersistentData * persistentData):
+      Layout(factory, persistentData)
+    {
+    }
+
+    unsigned int getZonesCount() const override
+    {
+      return 6;
+    }
+
+    rect_t getZone(unsigned int index) const override
+    {
+      rect_t zone = getMainZone();
+
+      zone.w /= 2;
+      zone.h /= 3;
+
+      if (index == 1 || index == 3)
+        zone.y += zone.h;
+      else if (index == 2 || index == 4)
+        zone.y += zone.h * 2;
+
+      if ((!isMirrored() && index > 2) || (isMirrored() && index < 3))
+        zone.x += zone.w;
+
+      return zone;
+    }
+};
+
+BaseLayoutFactory<Layout2x3> layout2x3("Layout2x3", "2 x 3", LBM_LAYOUT_2x3, OPTIONS_LAYOUT_2x3);
diff --git a/radio/src/gui/colorlcd/layouts/mask_layout2x3.png b/radio/src/gui/colorlcd/layouts/mask_layout2x3.png
new file mode 100644
index 0000000000000000000000000000000000000000..add3081c0230641c46a867e59a45814994d81d21
GIT binary patch
literal 196
zcmeAS@N?(olHy`uVBq!ia0vp^#y~8|!3HGfOcSdDQjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`ISV`@i-DT2fH33xiMvFBf{~ssjv*25Z?AfCF(`^KU#xjw|GX?ie}O_v
z06$Bt=h~o2`wErT%y?LD8xZ=r`EOPFzsuijnGDx;6pD%-J~t;JT~F|Fmqd7=;hQs@
iWzU2l62e=IgV=+QOR7pg;&KOC!r<xZ=d#Wzp$Pz>AwDDk

literal 0
HcmV?d00001