From 2012316cca0ec3f6802d9c9618a399937881d4a3 Mon Sep 17 00:00:00 2001
From: Nick Winans <nick@winans.codes>
Date: Sun, 25 Sep 2022 17:09:16 -0500
Subject: [PATCH] Use two shield system

---
 app/boards/shields/nice_view/nice_view.conf   |  1 -
 app/boards/shields/nice_view/nice_view.dtsi   | 22 -------------------
 .../shields/nice_view/nice_view.overlay       | 18 ++++++++++++++-
 .../shields/nice_view_oled/Kconfig.defconfig  |  2 ++
 .../shields/nice_view_oled/Kconfig.shield     |  5 +++++
 .../boards/nice_nano.overlay                  |  2 --
 .../boards/nice_nano_v2.overlay               |  2 --
 .../nice_view_oled/nice_view_oled.conf        |  2 ++
 .../nice_view_oled/nice_view_oled.overlay     |  6 +++++
 .../nice_view_oled/nice_view_oled.zmk.yml     |  9 ++++++++
 10 files changed, 41 insertions(+), 28 deletions(-)
 delete mode 100644 app/boards/shields/nice_view/nice_view.dtsi
 create mode 100644 app/boards/shields/nice_view_oled/Kconfig.defconfig
 create mode 100644 app/boards/shields/nice_view_oled/Kconfig.shield
 rename app/boards/shields/{nice_view => nice_view_oled}/boards/nice_nano.overlay (91%)
 rename app/boards/shields/{nice_view => nice_view_oled}/boards/nice_nano_v2.overlay (91%)
 create mode 100644 app/boards/shields/nice_view_oled/nice_view_oled.conf
 create mode 100644 app/boards/shields/nice_view_oled/nice_view_oled.overlay
 create mode 100644 app/boards/shields/nice_view_oled/nice_view_oled.zmk.yml

diff --git a/app/boards/shields/nice_view/nice_view.conf b/app/boards/shields/nice_view/nice_view.conf
index fc19f48c..368e848a 100644
--- a/app/boards/shields/nice_view/nice_view.conf
+++ b/app/boards/shields/nice_view/nice_view.conf
@@ -1,5 +1,4 @@
 # Enable nice!view
 CONFIG_ZMK_DISPLAY=y
-CONFIG_SSD1306=n
 CONFIG_LVGL_THEME_DEFAULT_FONT_SMALL_MONTSERRAT_26=y
 CONFIG_LVGL_THEME_DEFAULT_FONT_NORMAL_MONTSERRAT_26=y
diff --git a/app/boards/shields/nice_view/nice_view.dtsi b/app/boards/shields/nice_view/nice_view.dtsi
deleted file mode 100644
index 99ce98f9..00000000
--- a/app/boards/shields/nice_view/nice_view.dtsi
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2022 The ZMK Contributors
- *
- * SPDX-License-Identifier: MIT
- */
-
-&nice_view_spi {
-	nice_view: ls0xx@0 {
-		compatible = "sharp,ls0xx";
-		label = "DISPLAY";
-		spi-max-frequency = <1000000>;
-		reg = <0>;
-		width = <160>;
-		height = <68>;
-	};
-};
-
-/ {
-	chosen {
-		zephyr,display = &nice_view;
-	};
-};
diff --git a/app/boards/shields/nice_view/nice_view.overlay b/app/boards/shields/nice_view/nice_view.overlay
index 6840921f..99ce98f9 100644
--- a/app/boards/shields/nice_view/nice_view.overlay
+++ b/app/boards/shields/nice_view/nice_view.overlay
@@ -3,4 +3,20 @@
  *
  * SPDX-License-Identifier: MIT
  */
- 
\ No newline at end of file
+
+&nice_view_spi {
+	nice_view: ls0xx@0 {
+		compatible = "sharp,ls0xx";
+		label = "DISPLAY";
+		spi-max-frequency = <1000000>;
+		reg = <0>;
+		width = <160>;
+		height = <68>;
+	};
+};
+
+/ {
+	chosen {
+		zephyr,display = &nice_view;
+	};
+};
diff --git a/app/boards/shields/nice_view_oled/Kconfig.defconfig b/app/boards/shields/nice_view_oled/Kconfig.defconfig
new file mode 100644
index 00000000..fb23f20c
--- /dev/null
+++ b/app/boards/shields/nice_view_oled/Kconfig.defconfig
@@ -0,0 +1,2 @@
+# Copyright (c) 2022 The ZMK Contributors
+# SPDX-License-Identifier: MIT
diff --git a/app/boards/shields/nice_view_oled/Kconfig.shield b/app/boards/shields/nice_view_oled/Kconfig.shield
new file mode 100644
index 00000000..a7e195df
--- /dev/null
+++ b/app/boards/shields/nice_view_oled/Kconfig.shield
@@ -0,0 +1,5 @@
+# Copyright (c) 2022 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+config SHIELD_NICE_VIEW_OLED
+	def_bool $(shields_list_contains,nice_view_oled)
diff --git a/app/boards/shields/nice_view/boards/nice_nano.overlay b/app/boards/shields/nice_view_oled/boards/nice_nano.overlay
similarity index 91%
rename from app/boards/shields/nice_view/boards/nice_nano.overlay
rename to app/boards/shields/nice_view_oled/boards/nice_nano.overlay
index ae5a8eb2..3606a8a4 100644
--- a/app/boards/shields/nice_view/boards/nice_nano.overlay
+++ b/app/boards/shields/nice_view_oled/boards/nice_nano.overlay
@@ -16,5 +16,3 @@ nice_view_spi: &spi0 {
 &pro_micro_i2c {
 	status = "disabled";
 };
-
-#include "../nice_view.dtsi"
diff --git a/app/boards/shields/nice_view/boards/nice_nano_v2.overlay b/app/boards/shields/nice_view_oled/boards/nice_nano_v2.overlay
similarity index 91%
rename from app/boards/shields/nice_view/boards/nice_nano_v2.overlay
rename to app/boards/shields/nice_view_oled/boards/nice_nano_v2.overlay
index ae5a8eb2..3606a8a4 100644
--- a/app/boards/shields/nice_view/boards/nice_nano_v2.overlay
+++ b/app/boards/shields/nice_view_oled/boards/nice_nano_v2.overlay
@@ -16,5 +16,3 @@ nice_view_spi: &spi0 {
 &pro_micro_i2c {
 	status = "disabled";
 };
-
-#include "../nice_view.dtsi"
diff --git a/app/boards/shields/nice_view_oled/nice_view_oled.conf b/app/boards/shields/nice_view_oled/nice_view_oled.conf
new file mode 100644
index 00000000..c5fe224e
--- /dev/null
+++ b/app/boards/shields/nice_view_oled/nice_view_oled.conf
@@ -0,0 +1,2 @@
+# Disable OLED
+CONFIG_SSD1306=n
diff --git a/app/boards/shields/nice_view_oled/nice_view_oled.overlay b/app/boards/shields/nice_view_oled/nice_view_oled.overlay
new file mode 100644
index 00000000..6840921f
--- /dev/null
+++ b/app/boards/shields/nice_view_oled/nice_view_oled.overlay
@@ -0,0 +1,6 @@
+/*
+ * Copyright (c) 2022 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+ 
\ No newline at end of file
diff --git a/app/boards/shields/nice_view_oled/nice_view_oled.zmk.yml b/app/boards/shields/nice_view_oled/nice_view_oled.zmk.yml
new file mode 100644
index 00000000..bb057e92
--- /dev/null
+++ b/app/boards/shields/nice_view_oled/nice_view_oled.zmk.yml
@@ -0,0 +1,9 @@
+file_format: "1"
+id: nice_view_oled
+name: nice!view
+type: shield
+url: https://nicekeyboards.com/nice-view
+requires: [i2c_oled]
+exposes: [nice_view]
+features:
+  - display