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

2 files changed, 71 insertions, 0 deletions

diff --git a/keyboards/atset/at1/keymaps/default/keymap.c b/keyboards/atset/at1/keymaps/default/keymap.c
new file mode 100644
index 0000000000..56e8e3afff
--- /dev/null
+++ b/keyboards/atset/at1/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+/* 
+ * it under the terms of the GNU General Public License as published by 
+ * This program is free software: you can redistribute it and/or modify 
+ * 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/>. 
+ */ 
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+
+[0] = LAYOUT(
+  KC_4
+),
+
+	
+[1] = LAYOUT(
+  KC_NO
+),
+
+	
+[2] = LAYOUT(
+  KC_NO
+)
+
+
+};
diff --git a/keyboards/atset/at1/keymaps/via/keymap.c b/keyboards/atset/at1/keymaps/via/keymap.c
new file mode 100644
index 0000000000..f4806baee5
--- /dev/null
+++ b/keyboards/atset/at1/keymaps/via/keymap.c
@@ -0,0 +1,35 @@
+/* 
+ * 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/>. 
+ */ 
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] =
+        LAYOUT( 
+                KC_4
+              ),
+    [1] =
+        LAYOUT(
+                KC_NO
+              ),
+    [2] =
+        LAYOUT(
+                KC_NO
+              ),
+    [3] =
+        LAYOUT(
+                KC_NO
+              )
+};