From a9b4b025a6b3f0f8c7b282c891d5c373e86c8ed5 Mon Sep 17 00:00:00 2001
From: Karolis Stasaitis <contact@carlossless.io>
Date: Sun, 19 May 2024 01:51:46 +0200
Subject: [PATCH] cleanup to not have to set matrix-size in two place

---
 src/keyboards/example/layouts/default/layout.c     |  1 +
 src/keyboards/eyooso-z11/layouts/default/layout.c  |  1 +
 src/keyboards/nuphy-air60/layouts/default/layout.c |  1 +
 src/smk/layout.h                                   |  9 +++++++++
 src/smk/matrix.c                                   |  1 +
 src/smk/report.c                                   |  1 +
 src/user/layout_process_record.c                   |  2 +-
 src/user/{layout.h => user_layout.h}               | 11 +++--------
 8 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 src/smk/layout.h
 rename src/user/{layout.h => user_layout.h} (57%)

diff --git a/src/keyboards/example/layouts/default/layout.c b/src/keyboards/example/layouts/default/layout.c
index f8a483a..9afd226 100644
--- a/src/keyboards/example/layouts/default/layout.c
+++ b/src/keyboards/example/layouts/default/layout.c
@@ -1,5 +1,6 @@
 #include "kbdef.h"
 #include "layout.h"
+#include "user_layout.h"
 #include <stdint.h>
 
 // clang-format off
diff --git a/src/keyboards/eyooso-z11/layouts/default/layout.c b/src/keyboards/eyooso-z11/layouts/default/layout.c
index 1001016..24a2bbb 100644
--- a/src/keyboards/eyooso-z11/layouts/default/layout.c
+++ b/src/keyboards/eyooso-z11/layouts/default/layout.c
@@ -1,5 +1,6 @@
 #include "kbdef.h"
 #include "layout.h"
+#include "user_layout.h"
 #include "report.h"
 #include <stdint.h>
 
diff --git a/src/keyboards/nuphy-air60/layouts/default/layout.c b/src/keyboards/nuphy-air60/layouts/default/layout.c
index 1182486..c21dd1c 100644
--- a/src/keyboards/nuphy-air60/layouts/default/layout.c
+++ b/src/keyboards/nuphy-air60/layouts/default/layout.c
@@ -1,5 +1,6 @@
 #include "kbdef.h"
 #include "layout.h"
+#include "user_layout.h"
 #include "report.h"
 #include <stdint.h>
 
diff --git a/src/smk/layout.h b/src/smk/layout.h
new file mode 100644
index 0000000..6d31a52
--- /dev/null
+++ b/src/smk/layout.h
@@ -0,0 +1,9 @@
+#ifndef LAYOUT_H
+#define LAYOUT_H
+
+#include "kbdef.h"
+#include <stdbool.h>
+
+extern const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS];
+
+#endif
diff --git a/src/smk/matrix.c b/src/smk/matrix.c
index e889446..8f09911 100644
--- a/src/smk/matrix.c
+++ b/src/smk/matrix.c
@@ -2,6 +2,7 @@
 #include "report.h"
 #include "debug.h"
 #include "layout.h"
+#include "user_layout.h"
 #include "indicators.h"
 #include "user_matrix.h"
 #include "kbdef.h"
diff --git a/src/smk/report.c b/src/smk/report.c
index 81a559b..18d64be 100644
--- a/src/smk/report.c
+++ b/src/smk/report.c
@@ -1,6 +1,7 @@
 #include "report.h"
 #include "host.h"
 #include "layout.h"
+#include "keycodes.h"
 #include <string.h>
 
 static uint8_t real_mods = 0;
diff --git a/src/user/layout_process_record.c b/src/user/layout_process_record.c
index 1820940..499b825 100644
--- a/src/user/layout_process_record.c
+++ b/src/user/layout_process_record.c
@@ -1,4 +1,4 @@
-#include "layout.h"
+#include "user_layout.h"
 
 bool layout_process_record(uint16_t keycode, bool key_pressed)
 {
diff --git a/src/user/layout.h b/src/user/user_layout.h
similarity index 57%
rename from src/user/layout.h
rename to src/user/user_layout.h
index 08350fa..0b3f477 100644
--- a/src/user/layout.h
+++ b/src/user/user_layout.h
@@ -1,15 +1,10 @@
-#ifndef LAYOUT_H
-#define LAYOUT_H
+#ifndef USER_LAYOUT_H
+#define USER_LAYOUT_H
 
-#include "matrix.h"
 #include "keycodes.h"
+#include <stdint.h>
 #include <stdbool.h>
 
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
-extern const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS];
-
 /*
   returns a boolean value to instruct whether further key process should continue or end here
 */