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

3 files changed, 56 insertions, 10 deletions

diff --git a/keyboards/lazydesigners/the40/keymaps/via/keymap.c b/keyboards/lazydesigners/the40/keymaps/via/keymap.c
new file mode 100644
index 0000000000..4317c663c1
--- /dev/null
+++ b/keyboards/lazydesigners/the40/keymaps/via/keymap.c
@@ -0,0 +1,44 @@
+/* Copyright 2020 LAZYDESIGNERS
+ *
+ * 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_all(
+        KC_ESC,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        KC_TAB,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,
+        KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_DOT,  KC_UP,   MO(1),
+        KC_LCTL,   KC_LGUI, KC_RALT,          KC_SPC,          KC_SPC,            KC_LEFT, KC_DOWN, KC_RGHT
+        ),
+    [1] = LAYOUT_all(
+        KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NO,
+        RESET,     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, 
+        KC_NO,     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,   KC_NO,   KC_NO,  
+        KC_VOLD,   KC_MUTE, KC_VOLU,          KC_TRNS,          KC_TRNS,          KC_NO,   KC_NO,   KC_NO
+        ),
+    [2] = LAYOUT_all(
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, 
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,  
+        KC_NO,     KC_NO,   KC_NO,            KC_NO,            KC_NO,            KC_NO,   KC_NO,   KC_NO
+        ),
+    [3] = LAYOUT_all(
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, 
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,  
+        KC_NO,     KC_NO,   KC_NO,            KC_NO,            KC_NO,            KC_NO,   KC_NO,   KC_NO
+        ),
+};
diff --git a/keyboards/lazydesigners/the40/keymaps/via/rules.mk b/keyboards/lazydesigners/the40/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/lazydesigners/the40/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/lazydesigners/the40/the40.h b/keyboards/lazydesigners/the40/the40.h
index c41166f2e2..38da7bdfb1 100644
--- a/keyboards/lazydesigners/the40/the40.h
+++ b/keyboards/lazydesigners/the40/the40.h
@@ -33,27 +33,27 @@
 }
 
 #define LAYOUT_hhkb( \
-    K000,    K001,   K002,   K003,   K004,   K005,   K006,   K007,   K008,   K009,   K010,   K011,  \
-    K100,    K101,   K102,   K103,   K104,   K105,   K106,   K107,   K108,   K109,   K110,          \
-    K200,    K201,   K202,   K203,   K204,   K205,   K206,   K207,   K208,   K209,   K210,          \
-             K301,   K302,           K304,           K306,           K308,   K309                   \
+    K000,   K001,   K002,   K003,   K004,   K005,   K006,   K007,   K008,   K009,   K010,   K011,  \
+    K100,   K101,   K102,   K103,   K104,   K105,   K106,   K107,   K108,   K109,   K110,          \
+    K200,   K201,   K202,   K203,   K204,   K205,   K206,   K207,   K208,   K209,   K210,          \
+            K301,   K302,           K304,           K306,           K308,   K309                   \
 ) \
 { \
   { K000,   K001,   K002,   K003,   K004,   K005,   K006,   K007,   K008,   K009,   K010,   K011  }, \
   { K100,   K101,   K102,   K103,   K104,   K105,   K106,   K107,   K108,   K109,   K110,   KC_NO }, \
   { K200,   K201,   K202,   K203,   K204,   K205,   K206,   K207,   K208,   K209,   K210,   KC_NO }, \
-  { K300,   K301,   K302,   KC_NO,  K304,   KC_NO,  K306,   KC_NO,  K308,   K309,   K310,   KC_NO }, \
+  { KC_NO,  K301,   K302,   KC_NO,  K304,   KC_NO,  K306,   KC_NO,  K308,   K309,   KC_NO,  KC_NO }, \
 }
 
 #define LAYOUT_wkl( \
-    K000,    K001,   K002,   K003,   K004,   K005,   K006,   K007,   K008,   K009,   K010,   K011,  \
-    K100,    K101,   K102,   K103,   K104,   K105,   K106,   K107,   K108,   K109,   K110,          \
-    K200,    K201,   K202,   K203,   K204,   K205,   K206,   K207,   K208,   K209,   K210,          \
-    K300,            K302,           K304,           K306,           K308,           K310           \
+    K000,   K001,   K002,   K003,   K004,   K005,   K006,   K007,   K008,   K009,   K010,   K011,  \
+    K100,   K101,   K102,   K103,   K104,   K105,   K106,   K107,   K108,   K109,   K110,          \
+    K200,   K201,   K202,   K203,   K204,   K205,   K206,   K207,   K208,   K209,   K210,          \
+    K300,           K302,           K304,           K306,           K308,           K310           \
 ) \
 { \
   { K000,   K001,   K002,   K003,   K004,   K005,   K006,   K007,   K008,   K009,   K010,   K011  }, \
   { K100,   K101,   K102,   K103,   K104,   K105,   K106,   K107,   K108,   K109,   K110,   KC_NO }, \
   { K200,   K201,   K202,   K203,   K204,   K205,   K206,   K207,   K208,   K209,   K210,   KC_NO }, \
-  { K300,   K301,   K302,   KC_NO,  K304,   KC_NO,  K306,   KC_NO,  K308,   K309,   K310,   KC_NO }, \
+  { K300,   KC_NO,  K302,   KC_NO,  K304,   KC_NO,  K306,   KC_NO,  K308,   KC_NO,  K310,   KC_NO }, \
 }