summaryrefslogtreecommitdiffstats
path: root/layouts
diff options
context:
space:
mode:
authorJoe Wasson <joe@talljoe.com>2020-11-06 17:16:22 -0800
committerGitHub <noreply@github.com>2020-11-06 17:16:22 -0800
commit7ce5402417b0332569bf48cf2c51e412cd35a18a (patch)
tree9ec2352ebf316591930cad680dd3a4ba4068abc6 /layouts
parentb5ebdf1b3a29119e1a414aaf7e2cf7a583853430 (diff)
Updates to Talljoe's Keymaps (#10115)
* Minor Tweak * Refactor spacebar defines. * Add TMO50 layout * Rename Atreus keymap. * Refactor Atreus for readability. * Eliminate tapdance quote and tweak maltroff. * Factor out tapdance. * Add some fancy combos and keys. * Remove combos for now because they cause pain. * WIP visualizer * Alternate method for reset * WIP2 visualizer * Layer text tweak. * Add made-up layout Nortron as a combination of Norman and Maltron. * Add backspace. * Add Talljoe keymap to Prime E. * Fix double-colon so it doesn't press enter if shift is released early. * Use new make command. * Bring some modern standards into code and add licenses. * Remove QMK_KEYBOARD_CONFIG_H and fixup QMK_KEYBOARD_H. * Move from `biton32` to `get_highest_layer`. * Remove PREVENT_STUCK_MODIFIERS * Update keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/config.h
Diffstat (limited to 'layouts')
-rw-r--r--layouts/community/60_ansi/talljoe-ansi/config.h23
-rw-r--r--layouts/community/60_ansi_split_bs_rshift/talljoe/config.h25
-rw-r--r--layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.c16
-rw-r--r--layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.h21
-rw-r--r--layouts/community/60_hhkb/talljoe-hhkb/config.h22
-rw-r--r--layouts/community/ortho_4x12/talljoe/config.h23
-rw-r--r--layouts/community/tkl_ansi/talljoe-tkl/config.h23
7 files changed, 122 insertions, 31 deletions
diff --git a/layouts/community/60_ansi/talljoe-ansi/config.h b/layouts/community/60_ansi/talljoe-ansi/config.h
index 4326a2fd10..79cc190014 100644
--- a/layouts/community/60_ansi/talljoe-ansi/config.h
+++ b/layouts/community/60_ansi/talljoe-ansi/config.h
@@ -1,5 +1,20 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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 QMK_KEYBOARD_CONFIG_H
@@ -16,7 +31,5 @@
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
- K40, K41, K42, K45, K48, K49, K4B, K4C \
+ K40, K41, K42, K46, K48, K49, K4B, K4C \
)
-
-#endif //CONFIG_USER_H
diff --git a/layouts/community/60_ansi_split_bs_rshift/talljoe/config.h b/layouts/community/60_ansi_split_bs_rshift/talljoe/config.h
index 65568d3abf..2a2ead2273 100644
--- a/layouts/community/60_ansi_split_bs_rshift/talljoe/config.h
+++ b/layouts/community/60_ansi_split_bs_rshift/talljoe/config.h
@@ -1,7 +1,20 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include QMK_KEYBOARD_CONFIG_H
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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
#define ENABLE_GAME_LAYER
@@ -16,7 +29,7 @@
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
- K40, K41, K42, K45, K48, K49, K4B, K4C \
+ K40, K41, K42, K46, K48, K49, K4B, K4C \
)
/* Color Map */
@@ -68,5 +81,3 @@
#define BACKLIGHT_ALPHAS_MODS_ROW_2 0b0011000000000001
#endif //KEYBOARD_zeal60
-
-#endif //CONFIG_USER_H
diff --git a/layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.c b/layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.c
index 3e9e726b95..617132d4ef 100644
--- a/layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.c
+++ b/layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.c
@@ -1,3 +1,19 @@
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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 "solarized.h"
#define MAKE_COLOR(_H, _S, _V) \
diff --git a/layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.h b/layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.h
index 3b00caea70..15e3d588b1 100644
--- a/layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.h
+++ b/layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.h
@@ -1,5 +1,20 @@
-#ifndef SOLARIZED_H
-#define SOLARIZED_H
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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/color.h"
@@ -23,5 +38,3 @@ typedef struct {
} solarized_t;
extern solarized_t solarized;
-
-#endif
diff --git a/layouts/community/60_hhkb/talljoe-hhkb/config.h b/layouts/community/60_hhkb/talljoe-hhkb/config.h
index 54756a940b..0424fee1f3 100644
--- a/layouts/community/60_hhkb/talljoe-hhkb/config.h
+++ b/layouts/community/60_hhkb/talljoe-hhkb/config.h
@@ -1,5 +1,20 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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 QMK_KEYBOARD_CONFIG_H
@@ -16,10 +31,9 @@
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
- K41, K42, K45, K48, K4C \
+ K41, K42, K46, K48, K4C \
)
#ifdef RGB_BACKLIGHT_M60_A
#define ZEAL_RGB
#endif
-#endif //CONFIG_USER_H
diff --git a/layouts/community/ortho_4x12/talljoe/config.h b/layouts/community/ortho_4x12/talljoe/config.h
index 61229e7f6c..34c24b8624 100644
--- a/layouts/community/ortho_4x12/talljoe/config.h
+++ b/layouts/community/ortho_4x12/talljoe/config.h
@@ -1,7 +1,21 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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 QMK_KEYBOARD_CONFIG_H
#define SPACE_COUNT 3
#define TEMPLATE( \
@@ -17,6 +31,3 @@ LAYOUT_ortho_4x12( \
K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
K40, K41, K0D, K42, K44, K45, K45, K46, K48, K49, K4B, K4C \
)
-
-
-#endif //CONFIG_USER_H
diff --git a/layouts/community/tkl_ansi/talljoe-tkl/config.h b/layouts/community/tkl_ansi/talljoe-tkl/config.h
index 02f8a94e39..15869ed0b6 100644
--- a/layouts/community/tkl_ansi/talljoe-tkl/config.h
+++ b/layouts/community/tkl_ansi/talljoe-tkl/config.h
@@ -1,5 +1,20 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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 QMK_KEYBOARD_CONFIG_H
@@ -18,7 +33,5 @@
KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3, KK4, KO7, KQ7, \
KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6, KB1, \
KN2, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0, KN3, KO6, \
- KA4, KP2, KC6, KK6, KC0, KM3, KD0, KA1, KO0, KK0, KL0 \
+ KA4, KP2, KC6, KX2, KC0, KM3, KD0, KA1, KO0, KK0, KL0 \
)
-
-#endif //CONFIG_USER_H