From 24a56d8b903873c3068ae2d9a1db29fc7817ca60 Mon Sep 17 00:00:00 2001
From: Johannes Marbach <n0-0ne+gitlab@mailbox.org>
Date: Tue, 2 Jan 2024 20:43:40 +0100
Subject: [PATCH] Set up submodules

---
 .gitmodules                  | 6 ++++++
 unl0kr/config.c              | 2 +-
 unl0kr/lv_drivers            | 1 +
 unl0kr/lvgl                  | 1 +
 unl0kr/main.c                | 2 +-
 unl0kr/meson.build           | 2 +-
 unl0kr/regenerate-layouts.sh | 4 ++--
 7 files changed, 13 insertions(+), 5 deletions(-)
 create mode 160000 unl0kr/lv_drivers
 create mode 160000 unl0kr/lvgl

diff --git a/.gitmodules b/.gitmodules
index 4e35374..731ce7b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,9 @@
 [submodule "buffyboard/lvgl"]
 	path = buffyboard/lvgl
 	url = https://github.com/littlevgl/lvgl.git
+[submodule "unl0kr/lvgl"]
+	path = unl0kr/lvgl
+	url = https://github.com/littlevgl/lvgl.git
+[submodule "unl0kr/lv_drivers"]
+	path = unl0kr/lv_drivers
+	url = git@github.com:calebccff/lv_drivers.git
diff --git a/unl0kr/config.c b/unl0kr/config.c
index b422f1b..af7d229 100644
--- a/unl0kr/config.c
+++ b/unl0kr/config.c
@@ -28,7 +28,7 @@
 #include <ini.h>
 #include <stdlib.h>
 
-#include "squeek2lvgl/sq2lv.h"
+#include "../squeek2lvgl/sq2lv.h"
 
 
 /**
diff --git a/unl0kr/lv_drivers b/unl0kr/lv_drivers
new file mode 160000
index 0000000..71dbdf0
--- /dev/null
+++ b/unl0kr/lv_drivers
@@ -0,0 +1 @@
+Subproject commit 71dbdf07c4ab808bc6f04251d58f78bb57869bf9
diff --git a/unl0kr/lvgl b/unl0kr/lvgl
new file mode 160000
index 0000000..2f294aa
--- /dev/null
+++ b/unl0kr/lvgl
@@ -0,0 +1 @@
+Subproject commit 2f294aa76c8fece98a4fa72304bc6f267ed2a228
diff --git a/unl0kr/main.c b/unl0kr/main.c
index de166bf..32a3ef7 100644
--- a/unl0kr/main.c
+++ b/unl0kr/main.c
@@ -39,7 +39,7 @@
 
 #include "lvgl/lvgl.h"
 
-#include "squeek2lvgl/sq2lv.h"
+#include "../squeek2lvgl/sq2lv.h"
 
 #include <signal.h>
 #include <stdio.h>
diff --git a/unl0kr/meson.build b/unl0kr/meson.build
index feb771f..bff0d67 100644
--- a/unl0kr/meson.build
+++ b/unl0kr/meson.build
@@ -42,7 +42,7 @@ unl0kr_sources = [
 ]
 
 squeek2lvgl_sources = [
-  'squeek2lvgl/sq2lv.c',
+  '../squeek2lvgl/sq2lv.c',
 ]
 
 man_files = [
diff --git a/unl0kr/regenerate-layouts.sh b/unl0kr/regenerate-layouts.sh
index 2bf3734..304c763 100755
--- a/unl0kr/regenerate-layouts.sh
+++ b/unl0kr/regenerate-layouts.sh
@@ -18,7 +18,7 @@
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 
-cd squeek2lvgl
+cd ../squeek2lvgl
 pipenv install
 pipenv run python squeek2lvgl.py \
     --input us.yaml \
@@ -31,6 +31,6 @@ pipenv run python squeek2lvgl.py \
       --name "Français" \
     --extra-top-row-base "1 2 3 4 5 6 7 8 9 0" \
     --extra-top-row-upper "! @ # $ % ^ & * ( )" \
-    --output .. \
+    --output ../unl0kr \
     --surround-space-with-arrows \
     --shift-keycap '\xef\x8d\x9b'