Add big spacebar defaults to Underscore33 (#10731)

* add big spacebar default * add rev1 big space * add big spacebar default * add rev1 big space * Fixed copyright statements Removed unused RGBRST keycode and bootmagic swaps
author: TJ <tom.campie@gmail.com> 2020-11-07 22:04:32 -0600
committer: GitHub <noreply@github.com> 2020-11-07 20:04:32 -0800
commit: db829c9453af7b7de802fad844b56358dce594df (patch)
tree: 9e7808b59ef822b35d004d454bd8752501a7e5c4
parent: bd1c048a76e0ba84513caf1d59573dc55618c99a (diff)
download: qmk_firmware-db829c9453af7b7de802fad844b56358dce594df.tar.gz
qmk_firmware-db829c9453af7b7de802fad844b56358dce594df.zip
12 files changed, 244 insertions, 10 deletions
diff --git a/keyboards/underscore33/rev1/keymaps/default/config.h b/keyboards/underscore33/rev1/keymaps/default/config.h
index 5708a439a..82cbcc42c 100644
--- a/keyboards/underscore33/rev1/keymaps/default/config.h
+++ b/keyboards/underscore33/rev1/keymaps/default/config.h
@@ -1,3 +1,18 @@
+/* Copyright 2020 tominabox1
+ *
+ * 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
 /* Combos */
diff --git a/keyboards/underscore33/rev1/keymaps/default/keymap.c b/keyboards/underscore33/rev1/keymaps/default/keymap.c
index 148e840fa..beaa8d92f 100644
--- a/keyboards/underscore33/rev1/keymaps/default/keymap.c
+++ b/keyboards/underscore33/rev1/keymaps/default/keymap.c
@@ -21,10 +21,6 @@ enum layers{
  _NAV
 };
-enum custom_keycodes{
-  RGBRST = SAFE_RANGE,
-};
 #define KC_NUM_SPC LT(_NUM_SYM, KC_SPC)
 #define KC_NAV_ENT LT(_NAV, KC_ENT)
 #define KC_GA LGUI_T(KC_A)
@@ -60,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  ),
  [_NAV] = LAYOUT_33_split_space(
-      RESET,   RGBRST,  AG_NORM,  AG_SWAP,  DEBUG,   KC_GRV,  KC_PGDN,    KC_UP,  KC_PGUP,  KC_SCLN,
+      RESET,    KC_NO,    KC_NO,    KC_NO,  KC_NO,   KC_GRV,  KC_PGDN,    KC_UP,  KC_PGUP,  KC_SCLN,
    RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_NO,  KC_HOME,  KC_LEFT,  KC_DOWN,  KC_RGHT,   KC_END,
    RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_NO,  KC_MINS,    KC_RO,  KC_COMM,   KC_DOT,  KC_BSLS,
                   KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS
diff --git a/keyboards/underscore33/rev1/keymaps/default_big_space/config.h b/keyboards/underscore33/rev1/keymaps/default_big_space/config.h
new file mode 100644
index 000000000..82cbcc42c
--- /dev/null
+++ b/keyboards/underscore33/rev1/keymaps/default_big_space/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2020 tominabox1
+ *
+ * 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
+/* Combos */
+#define COMBO_COUNT 5
+#define COMBO_TERM 50
diff --git a/keyboards/underscore33/rev1/keymaps/default_big_space/keymap.c b/keyboards/underscore33/rev1/keymaps/default_big_space/keymap.c
new file mode 100644
index 000000000..09547fa06
--- /dev/null
+++ b/keyboards/underscore33/rev1/keymaps/default_big_space/keymap.c
@@ -0,0 +1,82 @@
+/* Copyright 2020 tominabox1
+ *
+ * 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
+enum layers{
+  _BASE,
+  _NUM_SYM,
+  _NAV
+};
+#define KC_NUM_SPC LT(_NUM_SYM, KC_SPC)
+#define KC_NAV_ENT LT(_NAV, KC_ENT)
+#define KC_GA LGUI_T(KC_A)
+#define KC_AS LALT_T(KC_S)
+#define KC_CD LCTL_T(KC_D)
+#define KC_SF LSFT_T(KC_F)
+#define KC_SJ RSFT_T(KC_J)
+#define KC_CK RCTL_T(KC_K)
+#define KC_AL RALT_T(KC_L)
+#define KC_GSCLN RGUI_T(KC_SCLN)
+enum combo_events {
+  COMBO_BSPC,
+  COMBO_NUMBAK,
+  COMBO_TAB,
+  COMBO_ESC,
+  COMBO_DEL,
+};
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_33_big_space(
+    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,    KC_I,   KC_O,     KC_P,
+   KC_GA,  KC_AS,  KC_CD,  KC_SF,   KC_G,   KC_H,  KC_SJ,   KC_CK,  KC_AL, KC_GSCLN,
+    KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M, KC_COMM, KC_DOT,  KC_SLSH,
+                        KC_LCTL, KC_NUM_SPC, KC_NAV_ENT
+  ),
+  [_NUM_SYM] = LAYOUT_33_big_space(
+       KC_1,     KC_2,     KC_3,     KC_4,      KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,
+    KC_EXLM,    KC_AT,  KC_HASH,   KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR, KC_EQUAL,  KC_MINS,
+    KC_BSLS,  KC_LCBR,  KC_LBRC,  KC_LPRN,   KC_UNDS,  KC_RPRN,  KC_RBRC,  KC_RCBR,   KC_DOT,   KC_GRV,
+                        KC_TRNS, KC_TRNS,   KC_TRNS
+  ),
+  [_NAV] = LAYOUT_33_big_space(
+      RESET,    KC_NO,    KC_NO,    KC_NO,  KC_NO,   KC_GRV,  KC_PGDN,    KC_UP,  KC_PGUP,  KC_SCLN,
+    RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_NO,  KC_HOME,  KC_LEFT,  KC_DOWN,  KC_RGHT,   KC_END,
+    RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_NO,  KC_MINS,    KC_RO,  KC_COMM,   KC_DOT,  KC_BSLS,
+                        KC_TRNS,   KC_TRNS,   KC_TRNS
+  ),
+};
+#ifdef COMBO_ENABLE
+const uint16_t PROGMEM combo_bspc[] = {KC_O, KC_P, COMBO_END};
+const uint16_t PROGMEM combo_numbak[] = {KC_0, KC_9, COMBO_END};
+const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END};
+const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END};
+const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END};
+combo_t key_combos[COMBO_COUNT] = {
+  [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
+  [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC),
+  [COMBO_TAB] = COMBO(combo_tab,KC_TAB),
+  [COMBO_ESC] = COMBO(combo_esc,KC_ESC),
+  [COMBO_DEL] = COMBO(combo_del,KC_DEL),
+};
+#endif
diff --git a/keyboards/underscore33/rev1/keymaps/default_big_space/readme.md b/keyboards/underscore33/rev1/keymaps/default_big_space/readme.md
new file mode 100644
index 000000000..3f22df7c2
--- /dev/null
+++ b/keyboards/underscore33/rev1/keymaps/default_big_space/readme.md
@@ -0,0 +1,3 @@
+# Default _33 Rev1 Layout (with big spacebar)
+This is the recommended default layout. 
diff --git a/keyboards/underscore33/rev1/keymaps/default_big_space/rules.mk b/keyboards/underscore33/rev1/keymaps/default_big_space/rules.mk
new file mode 100644
index 000000000..ab1e43818
--- /dev/null
+++ b/keyboards/underscore33/rev1/keymaps/default_big_space/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/underscore33/rev2/keymaps/default/config.h b/keyboards/underscore33/rev2/keymaps/default/config.h
index 5708a439a..82cbcc42c 100644
--- a/keyboards/underscore33/rev2/keymaps/default/config.h
+++ b/keyboards/underscore33/rev2/keymaps/default/config.h
@@ -1,3 +1,18 @@
+/* Copyright 2020 tominabox1
+ *
+ * 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
 /* Combos */
diff --git a/keyboards/underscore33/rev2/keymaps/default/keymap.c b/keyboards/underscore33/rev2/keymaps/default/keymap.c
index 32a6f4863..ebacea413 100644
--- a/keyboards/underscore33/rev2/keymaps/default/keymap.c
+++ b/keyboards/underscore33/rev2/keymaps/default/keymap.c
@@ -21,10 +21,6 @@ enum layers{
  _NAV
 };
-enum custom_keycodes{
-  RGBRST = SAFE_RANGE,
-};
 #define KC_NUM_SPC LT(_NUM_SYM, KC_SPC)
 #define KC_NAV_ENT LT(_NAV, KC_ENT)
 #define KC_GA LGUI_T(KC_A)
@@ -60,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  ),
  [_NAV] = LAYOUT_33_split_space(
-      RESET,   RGBRST,  AG_NORM,  AG_SWAP,  DEBUG,   KC_GRV,  KC_PGDN,    KC_UP,  KC_PGUP,  KC_SCLN,
+    RESET,    KC_NO,    KC_NO,    KC_NO,  KC_NO,   KC_GRV,  KC_PGDN,    KC_UP,  KC_PGUP,  KC_SCLN,
    RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_NO,  KC_HOME,  KC_LEFT,  KC_DOWN,  KC_RGHT,   KC_END,
    RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_NO,  KC_MINS,    KC_RO,  KC_COMM,   KC_DOT,  KC_BSLS,
                   KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS
diff --git a/keyboards/underscore33/rev2/keymaps/default_big_space/config.h b/keyboards/underscore33/rev2/keymaps/default_big_space/config.h
new file mode 100644
index 000000000..82cbcc42c
--- /dev/null
+++ b/keyboards/underscore33/rev2/keymaps/default_big_space/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2020 tominabox1
+ *
+ * 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
+/* Combos */
+#define COMBO_COUNT 5
+#define COMBO_TERM 50
diff --git a/keyboards/underscore33/rev2/keymaps/default_big_space/keymap.c b/keyboards/underscore33/rev2/keymaps/default_big_space/keymap.c
new file mode 100644
index 000000000..09547fa06
--- /dev/null
+++ b/keyboards/underscore33/rev2/keymaps/default_big_space/keymap.c
@@ -0,0 +1,82 @@
+/* Copyright 2020 tominabox1
+ *
+ * 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
+enum layers{
+  _BASE,
+  _NUM_SYM,
+  _NAV
+};
+#define KC_NUM_SPC LT(_NUM_SYM, KC_SPC)
+#define KC_NAV_ENT LT(_NAV, KC_ENT)
+#define KC_GA LGUI_T(KC_A)
+#define KC_AS LALT_T(KC_S)
+#define KC_CD LCTL_T(KC_D)
+#define KC_SF LSFT_T(KC_F)
+#define KC_SJ RSFT_T(KC_J)
+#define KC_CK RCTL_T(KC_K)
+#define KC_AL RALT_T(KC_L)
+#define KC_GSCLN RGUI_T(KC_SCLN)
+enum combo_events {
+  COMBO_BSPC,
+  COMBO_NUMBAK,
+  COMBO_TAB,
+  COMBO_ESC,
+  COMBO_DEL,
+};
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_33_big_space(
+    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,    KC_I,   KC_O,     KC_P,
+   KC_GA,  KC_AS,  KC_CD,  KC_SF,   KC_G,   KC_H,  KC_SJ,   KC_CK,  KC_AL, KC_GSCLN,
+    KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M, KC_COMM, KC_DOT,  KC_SLSH,
+                        KC_LCTL, KC_NUM_SPC, KC_NAV_ENT
+  ),
+  [_NUM_SYM] = LAYOUT_33_big_space(
+       KC_1,     KC_2,     KC_3,     KC_4,      KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,
+    KC_EXLM,    KC_AT,  KC_HASH,   KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR, KC_EQUAL,  KC_MINS,
+    KC_BSLS,  KC_LCBR,  KC_LBRC,  KC_LPRN,   KC_UNDS,  KC_RPRN,  KC_RBRC,  KC_RCBR,   KC_DOT,   KC_GRV,
+                        KC_TRNS, KC_TRNS,   KC_TRNS
+  ),
+  [_NAV] = LAYOUT_33_big_space(
+      RESET,    KC_NO,    KC_NO,    KC_NO,  KC_NO,   KC_GRV,  KC_PGDN,    KC_UP,  KC_PGUP,  KC_SCLN,
+    RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_NO,  KC_HOME,  KC_LEFT,  KC_DOWN,  KC_RGHT,   KC_END,
+    RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_NO,  KC_MINS,    KC_RO,  KC_COMM,   KC_DOT,  KC_BSLS,
+                        KC_TRNS,   KC_TRNS,   KC_TRNS
+  ),
+};
+#ifdef COMBO_ENABLE
+const uint16_t PROGMEM combo_bspc[] = {KC_O, KC_P, COMBO_END};
+const uint16_t PROGMEM combo_numbak[] = {KC_0, KC_9, COMBO_END};
+const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END};
+const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END};
+const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END};
+combo_t key_combos[COMBO_COUNT] = {
+  [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
+  [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC),
+  [COMBO_TAB] = COMBO(combo_tab,KC_TAB),
+  [COMBO_ESC] = COMBO(combo_esc,KC_ESC),
+  [COMBO_DEL] = COMBO(combo_del,KC_DEL),
+};
+#endif
diff --git a/keyboards/underscore33/rev2/keymaps/default_big_space/readme.md b/keyboards/underscore33/rev2/keymaps/default_big_space/readme.md
new file mode 100644
index 000000000..f11d18ece
--- /dev/null
+++ b/keyboards/underscore33/rev2/keymaps/default_big_space/readme.md
@@ -0,0 +1,3 @@
+# Default _33 Rev2 Layout (with big spacebar)
+This is the recommended default layout. 
diff --git a/keyboards/underscore33/rev2/keymaps/default_big_space/rules.mk b/keyboards/underscore33/rev2/keymaps/default_big_space/rules.mk
new file mode 100644
index 000000000..ab1e43818
--- /dev/null
+++ b/keyboards/underscore33/rev2/keymaps/default_big_space/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
author	TJ <tom.campie@gmail.com>	2020-11-07 22:04:32 -0600
committer	GitHub <noreply@github.com>	2020-11-07 20:04:32 -0800
commit	db829c9453af7b7de802fad844b56358dce594df (patch)
tree	9e7808b59ef822b35d004d454bd8752501a7e5c4
parent	bd1c048a76e0ba84513caf1d59573dc55618c99a (diff)
download	qmk_firmware-db829c9453af7b7de802fad844b56358dce594df.tar.gz qmk_firmware-db829c9453af7b7de802fad844b56358dce594df.zip

diff --git a/keyboards/underscore33/rev1/keymaps/default/config.h b/keyboards/underscore33/rev1/keymaps/default/config.h index 5708a439a..82cbcc42c 100644 --- a/keyboards/underscore33/rev1/keymaps/default/config.h +++ b/keyboards/underscore33/rev1/keymaps/default/config.h
@@ -1,3 +1,18 @@
		1	/* Copyright 2020 tominabox1
		2	*
		3	* This program is free software: you can redistribute it and/or modify
		4	* it under the terms of the GNU General Public License as published by
		5	* the Free Software Foundation, either version 2 of the License, or
		6	* (at your option) any later version.
		7	*
		8	* This program is distributed in the hope that it will be useful,
		9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
		10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		11	* GNU General Public License for more details.
		12	*
		13	* You should have received a copy of the GNU General Public License
		14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
		15	*/
1	#pragma once	16	#pragma once
2		17
3	/* Combos */	18	/* Combos */


diff --git a/keyboards/underscore33/rev1/keymaps/default/keymap.c b/keyboards/underscore33/rev1/keymaps/default/keymap.c index 148e840fa..beaa8d92f 100644 --- a/keyboards/underscore33/rev1/keymaps/default/keymap.c +++ b/keyboards/underscore33/rev1/keymaps/default/keymap.c
@@ -21,10 +21,6 @@ enum layers{
21	_NAV	21	_NAV
22	};	22	};
23		23
24	enum custom_keycodes{
25	RGBRST = SAFE_RANGE,
26	};
27
28	#define KC_NUM_SPC LT(_NUM_SYM, KC_SPC)	24	#define KC_NUM_SPC LT(_NUM_SYM, KC_SPC)
29	#define KC_NAV_ENT LT(_NAV, KC_ENT)	25	#define KC_NAV_ENT LT(_NAV, KC_ENT)
30	#define KC_GA LGUI_T(KC_A)	26	#define KC_GA LGUI_T(KC_A)
@@ -60,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
60	),	56	),
61		57
62	[_NAV] = LAYOUT_33_split_space(	58	[_NAV] = LAYOUT_33_split_space(
63	RESET, RGBRST, AG_NORM, AG_SWAP, DEBUG, KC_GRV, KC_PGDN, KC_UP, KC_PGUP, KC_SCLN,	59	RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_GRV, KC_PGDN, KC_UP, KC_PGUP, KC_SCLN,
64	RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,	60	RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,
65	RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_NO, KC_MINS, KC_RO, KC_COMM, KC_DOT, KC_BSLS,	61	RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_NO, KC_MINS, KC_RO, KC_COMM, KC_DOT, KC_BSLS,
66	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS	62	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS


diff --git a/keyboards/underscore33/rev1/keymaps/default_big_space/config.h b/keyboards/underscore33/rev1/keymaps/default_big_space/config.h new file mode 100644 index 000000000..82cbcc42c --- /dev/null +++ b/keyboards/underscore33/rev1/keymaps/default_big_space/config.h
@@ -0,0 +1,20 @@
		1	/* Copyright 2020 tominabox1
		2	*
		3	* This program is free software: you can redistribute it and/or modify
		4	* it under the terms of the GNU General Public License as published by
		5	* the Free Software Foundation, either version 2 of the License, or
		6	* (at your option) any later version.
		7	*
		8	* This program is distributed in the hope that it will be useful,
		9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
		10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		11	* GNU General Public License for more details.
		12	*
		13	* You should have received a copy of the GNU General Public License
		14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
		15	*/
		16	#pragma once
		17
		18	/* Combos */
		19	#define COMBO_COUNT 5
		20	#define COMBO_TERM 50


diff --git a/keyboards/underscore33/rev1/keymaps/default_big_space/keymap.c b/keyboards/underscore33/rev1/keymaps/default_big_space/keymap.c new file mode 100644 index 000000000..09547fa06 --- /dev/null +++ b/keyboards/underscore33/rev1/keymaps/default_big_space/keymap.c
@@ -0,0 +1,82 @@
		1	/* Copyright 2020 tominabox1
		2	*
		3	* This program is free software: you can redistribute it and/or modify
		4	* it under the terms of the GNU General Public License as published by
		5	* the Free Software Foundation, either version 2 of the License, or
		6	* (at your option) any later version.
		7	*
		8	* This program is distributed in the hope that it will be useful,
		9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
		10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		11	* GNU General Public License for more details.
		12	*
		13	* You should have received a copy of the GNU General Public License
		14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
		15	*/
		16	#include QMK_KEYBOARD_H
		17
		18	enum layers{
		19	_BASE,
		20	_NUM_SYM,
		21	_NAV
		22	};
		23
		24	#define KC_NUM_SPC LT(_NUM_SYM, KC_SPC)
		25	#define KC_NAV_ENT LT(_NAV, KC_ENT)
		26	#define KC_GA LGUI_T(KC_A)
		27	#define KC_AS LALT_T(KC_S)
		28	#define KC_CD LCTL_T(KC_D)
		29	#define KC_SF LSFT_T(KC_F)
		30	#define KC_SJ RSFT_T(KC_J)
		31	#define KC_CK RCTL_T(KC_K)
		32	#define KC_AL RALT_T(KC_L)
		33	#define KC_GSCLN RGUI_T(KC_SCLN)
		34
		35	enum combo_events {
		36	COMBO_BSPC,
		37	COMBO_NUMBAK,
		38	COMBO_TAB,
		39	COMBO_ESC,
		40	COMBO_DEL,
		41	};
		42
		43	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
		44	[_BASE] = LAYOUT_33_big_space(
		45	KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
		46	KC_GA, KC_AS, KC_CD, KC_SF, KC_G, KC_H, KC_SJ, KC_CK, KC_AL, KC_GSCLN,
		47	KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
		48	KC_LCTL, KC_NUM_SPC, KC_NAV_ENT
		49	),
		50
		51	[_NUM_SYM] = LAYOUT_33_big_space(
		52	KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
		53	KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
		54	KC_BSLS, KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_RPRN, KC_RBRC, KC_RCBR, KC_DOT, KC_GRV,
		55	KC_TRNS, KC_TRNS, KC_TRNS
		56	),
		57
		58	[_NAV] = LAYOUT_33_big_space(
		59	RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_GRV, KC_PGDN, KC_UP, KC_PGUP, KC_SCLN,
		60	RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,
		61	RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_NO, KC_MINS, KC_RO, KC_COMM, KC_DOT, KC_BSLS,
		62	KC_TRNS, KC_TRNS, KC_TRNS
		63	),
		64	};
		65
		66
		67	#ifdef COMBO_ENABLE
		68	const uint16_t PROGMEM combo_bspc[] = {KC_O, KC_P, COMBO_END};
		69	const uint16_t PROGMEM combo_numbak[] = {KC_0, KC_9, COMBO_END};
		70	const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END};
		71	const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END};
		72	const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END};
		73
		74	combo_t key_combos[COMBO_COUNT] = {
		75	[COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
		76	[COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC),
		77	[COMBO_TAB] = COMBO(combo_tab,KC_TAB),
		78	[COMBO_ESC] = COMBO(combo_esc,KC_ESC),
		79	[COMBO_DEL] = COMBO(combo_del,KC_DEL),
		80
		81	};
		82	#endif


diff --git a/keyboards/underscore33/rev1/keymaps/default_big_space/readme.md b/keyboards/underscore33/rev1/keymaps/default_big_space/readme.md new file mode 100644 index 000000000..3f22df7c2 --- /dev/null +++ b/keyboards/underscore33/rev1/keymaps/default_big_space/readme.md
@@ -0,0 +1,3 @@
		1	# Default _33 Rev1 Layout (with big spacebar)
		2
		3	This is the recommended default layout.


diff --git a/keyboards/underscore33/rev1/keymaps/default_big_space/rules.mk b/keyboards/underscore33/rev1/keymaps/default_big_space/rules.mk new file mode 100644 index 000000000..ab1e43818 --- /dev/null +++ b/keyboards/underscore33/rev1/keymaps/default_big_space/rules.mk
@@ -0,0 +1 @@
			COMBO_ENABLE = yes


diff --git a/keyboards/underscore33/rev2/keymaps/default/config.h b/keyboards/underscore33/rev2/keymaps/default/config.h index 5708a439a..82cbcc42c 100644 --- a/keyboards/underscore33/rev2/keymaps/default/config.h +++ b/keyboards/underscore33/rev2/keymaps/default/config.h
@@ -1,3 +1,18 @@
		1	/* Copyright 2020 tominabox1
		2	*
		3	* This program is free software: you can redistribute it and/or modify
		4	* it under the terms of the GNU General Public License as published by
		5	* the Free Software Foundation, either version 2 of the License, or
		6	* (at your option) any later version.
		7	*
		8	* This program is distributed in the hope that it will be useful,
		9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
		10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		11	* GNU General Public License for more details.
		12	*
		13	* You should have received a copy of the GNU General Public License
		14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
		15	*/
1	#pragma once	16	#pragma once
2		17
3	/* Combos */	18	/* Combos */


diff --git a/keyboards/underscore33/rev2/keymaps/default/keymap.c b/keyboards/underscore33/rev2/keymaps/default/keymap.c index 32a6f4863..ebacea413 100644 --- a/keyboards/underscore33/rev2/keymaps/default/keymap.c +++ b/keyboards/underscore33/rev2/keymaps/default/keymap.c
@@ -21,10 +21,6 @@ enum layers{
21	_NAV	21	_NAV
22	};	22	};
23		23
24	enum custom_keycodes{
25	RGBRST = SAFE_RANGE,
26	};
27
28	#define KC_NUM_SPC LT(_NUM_SYM, KC_SPC)	24	#define KC_NUM_SPC LT(_NUM_SYM, KC_SPC)
29	#define KC_NAV_ENT LT(_NAV, KC_ENT)	25	#define KC_NAV_ENT LT(_NAV, KC_ENT)
30	#define KC_GA LGUI_T(KC_A)	26	#define KC_GA LGUI_T(KC_A)
@@ -60,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
60	),	56	),
61		57
62	[_NAV] = LAYOUT_33_split_space(	58	[_NAV] = LAYOUT_33_split_space(
63	RESET, RGBRST, AG_NORM, AG_SWAP, DEBUG, KC_GRV, KC_PGDN, KC_UP, KC_PGUP, KC_SCLN,	59	RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_GRV, KC_PGDN, KC_UP, KC_PGUP, KC_SCLN,
64	RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,	60	RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,
65	RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_NO, KC_MINS, KC_RO, KC_COMM, KC_DOT, KC_BSLS,	61	RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_NO, KC_MINS, KC_RO, KC_COMM, KC_DOT, KC_BSLS,
66	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS	62	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS


diff --git a/keyboards/underscore33/rev2/keymaps/default_big_space/config.h b/keyboards/underscore33/rev2/keymaps/default_big_space/config.h new file mode 100644 index 000000000..82cbcc42c --- /dev/null +++ b/keyboards/underscore33/rev2/keymaps/default_big_space/config.h
@@ -0,0 +1,20 @@
		1	/* Copyright 2020 tominabox1
		2	*
		3	* This program is free software: you can redistribute it and/or modify
		4	* it under the terms of the GNU General Public License as published by
		5	* the Free Software Foundation, either version 2 of the License, or
		6	* (at your option) any later version.
		7	*
		8	* This program is distributed in the hope that it will be useful,
		9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
		10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		11	* GNU General Public License for more details.
		12	*
		13	* You should have received a copy of the GNU General Public License
		14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
		15	*/
		16	#pragma once
		17
		18	/* Combos */
		19	#define COMBO_COUNT 5
		20	#define COMBO_TERM 50


diff --git a/keyboards/underscore33/rev2/keymaps/default_big_space/keymap.c b/keyboards/underscore33/rev2/keymaps/default_big_space/keymap.c new file mode 100644 index 000000000..09547fa06 --- /dev/null +++ b/keyboards/underscore33/rev2/keymaps/default_big_space/keymap.c
@@ -0,0 +1,82 @@
		1	/* Copyright 2020 tominabox1
		2	*
		3	* This program is free software: you can redistribute it and/or modify
		4	* it under the terms of the GNU General Public License as published by
		5	* the Free Software Foundation, either version 2 of the License, or
		6	* (at your option) any later version.
		7	*
		8	* This program is distributed in the hope that it will be useful,
		9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
		10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		11	* GNU General Public License for more details.
		12	*
		13	* You should have received a copy of the GNU General Public License
		14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
		15	*/
		16	#include QMK_KEYBOARD_H
		17
		18	enum layers{
		19	_BASE,
		20	_NUM_SYM,
		21	_NAV
		22	};
		23
		24	#define KC_NUM_SPC LT(_NUM_SYM, KC_SPC)
		25	#define KC_NAV_ENT LT(_NAV, KC_ENT)
		26	#define KC_GA LGUI_T(KC_A)
		27	#define KC_AS LALT_T(KC_S)
		28	#define KC_CD LCTL_T(KC_D)
		29	#define KC_SF LSFT_T(KC_F)
		30	#define KC_SJ RSFT_T(KC_J)
		31	#define KC_CK RCTL_T(KC_K)
		32	#define KC_AL RALT_T(KC_L)
		33	#define KC_GSCLN RGUI_T(KC_SCLN)
		34
		35	enum combo_events {
		36	COMBO_BSPC,
		37	COMBO_NUMBAK,
		38	COMBO_TAB,
		39	COMBO_ESC,
		40	COMBO_DEL,
		41	};
		42
		43	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
		44	[_BASE] = LAYOUT_33_big_space(
		45	KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
		46	KC_GA, KC_AS, KC_CD, KC_SF, KC_G, KC_H, KC_SJ, KC_CK, KC_AL, KC_GSCLN,
		47	KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
		48	KC_LCTL, KC_NUM_SPC, KC_NAV_ENT
		49	),
		50
		51	[_NUM_SYM] = LAYOUT_33_big_space(
		52	KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
		53	KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
		54	KC_BSLS, KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_RPRN, KC_RBRC, KC_RCBR, KC_DOT, KC_GRV,
		55	KC_TRNS, KC_TRNS, KC_TRNS
		56	),
		57
		58	[_NAV] = LAYOUT_33_big_space(
		59	RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_GRV, KC_PGDN, KC_UP, KC_PGUP, KC_SCLN,
		60	RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,
		61	RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_NO, KC_MINS, KC_RO, KC_COMM, KC_DOT, KC_BSLS,
		62	KC_TRNS, KC_TRNS, KC_TRNS
		63	),
		64	};
		65
		66
		67	#ifdef COMBO_ENABLE
		68	const uint16_t PROGMEM combo_bspc[] = {KC_O, KC_P, COMBO_END};
		69	const uint16_t PROGMEM combo_numbak[] = {KC_0, KC_9, COMBO_END};
		70	const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END};
		71	const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END};
		72	const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END};
		73
		74	combo_t key_combos[COMBO_COUNT] = {
		75	[COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
		76	[COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC),
		77	[COMBO_TAB] = COMBO(combo_tab,KC_TAB),
		78	[COMBO_ESC] = COMBO(combo_esc,KC_ESC),
		79	[COMBO_DEL] = COMBO(combo_del,KC_DEL),
		80
		81	};
		82	#endif


diff --git a/keyboards/underscore33/rev2/keymaps/default_big_space/readme.md b/keyboards/underscore33/rev2/keymaps/default_big_space/readme.md new file mode 100644 index 000000000..f11d18ece --- /dev/null +++ b/keyboards/underscore33/rev2/keymaps/default_big_space/readme.md
@@ -0,0 +1,3 @@
		1	# Default _33 Rev2 Layout (with big spacebar)
		2
		3	This is the recommended default layout.


diff --git a/keyboards/underscore33/rev2/keymaps/default_big_space/rules.mk b/keyboards/underscore33/rev2/keymaps/default_big_space/rules.mk new file mode 100644 index 000000000..ab1e43818 --- /dev/null +++ b/keyboards/underscore33/rev2/keymaps/default_big_space/rules.mk
@@ -0,0 +1 @@
			COMBO_ENABLE = yes