Merge remote-tracking branch 'origin/master' into develop

1 files changed, 27 insertions, 0 deletions

diff --git a/keyboards/merge/uc1/uc1.h b/keyboards/merge/uc1/uc1.h
new file mode 100644
index 0000000000..84e655d1b9
--- /dev/null
+++ b/keyboards/merge/uc1/uc1.h
@@ -0,0 +1,27 @@
+ /* Copyright 2021 duoshock 
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * 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. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+      k11, k00, k01, k10 \
+) \
+{ \
+    { k00, k01 }, \
+    { k10, k11 }  \
+}