summaryrefslogtreecommitdiffstats
path: root/keyboards
diff options
context:
space:
mode:
authorHarley Laue <losinggeneration@gmail.com>2018-05-18 13:58:23 -0700
committerDrashna Jaelre <drashna@live.com>2018-05-18 13:58:23 -0700
commit8cdb4a91501fab114ae55def050d06c7b9569f30 (patch)
tree7cd77bef9b0740420c899c979b2fbc50be081bd8 /keyboards
parente721deb4a60403e338382dbd3bf9e829439d67ac (diff)
Add Contra layout & cleanup a few things (#2998)
* Have Del become backspace on the bottom layer for grid layouts * Fix modtap for ESC * Add sleep to Adjust layer
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/contra/keymaps/losinggeneration/README.md30
-rw-r--r--keyboards/contra/keymaps/losinggeneration/config.h27
-rw-r--r--keyboards/contra/keymaps/losinggeneration/keymap.c40
-rw-r--r--keyboards/contra/keymaps/losinggeneration/rules.mk17
-rw-r--r--keyboards/levinson/keymaps/losinggeneration/README.md2
-rw-r--r--keyboards/levinson/keymaps/losinggeneration/keymap.c4
-rw-r--r--keyboards/nyquist/keymaps/losinggeneration/README.md2
-rw-r--r--keyboards/nyquist/keymaps/losinggeneration/keymap.c4
8 files changed, 120 insertions, 6 deletions
diff --git a/keyboards/contra/keymaps/losinggeneration/README.md b/keyboards/contra/keymaps/losinggeneration/README.md
new file mode 100644
index 0000000000..affd2fb9b4
--- /dev/null
+++ b/keyboards/contra/keymaps/losinggeneration/README.md
@@ -0,0 +1,30 @@
+losinggeneration's Contra Layout
+============================
+
+This build uses the MIT layout.
+
+See description of the layout in the common folder
+[here](../../../../users/losinggeneration/README.md)
+
+## Features
+- Adjust
+ - Removed AGSwap, AGNorm, & Del
+ - Added Caps Lock, F1-F12 in a 4x3 grid, arrow cluster,
+ and layer transitions to the new layers.
+ - Moved Reset & Audio control to the right side
+
+## Layouts
+
+### Adjust (Lower + Raise)
+
+```
+ ,-----------------------------------------------------------------------------------.
+ | | F1 | F2 | F3 | F4 | | RESET| Game |Numpad|Mouse | |Sleep |
+ |------+------+------+------+------+------+------+------+------+------+------+------|
+ | | F5 | F6 | F7 | F8 | | |Qwerty|Colmak|Workmn|Dvorak| |
+ |------+------+------+------+------+------+------+------+------+------+------+------|
+ | CAPS | F9 | F10 | F11 | F12 | | | | | | Up | |
+ |------+------+------+------+------+-------------+------+------+------+------+------|
+ | | | | | | | | XXX | Left | Down |Right |
+ `-----------------------------------------------------------------------------------'
+```
diff --git a/keyboards/contra/keymaps/losinggeneration/config.h b/keyboards/contra/keymaps/losinggeneration/config.h
new file mode 100644
index 0000000000..759b1d9a00
--- /dev/null
+++ b/keyboards/contra/keymaps/losinggeneration/config.h
@@ -0,0 +1,27 @@
+/*
+Copyright 2017 Danny Nguyen <danny@hexwire.com>
+Copyright 2018 Harley Laue <losinggeneration@gmail.com>
+
+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
+long with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#include QMK_KEYBOARD_CONFIG_H
+#define USE_MIT_LAYOUT
+
+#define TAPPING_TERM 250
+
+#endif
diff --git a/keyboards/contra/keymaps/losinggeneration/keymap.c b/keyboards/contra/keymaps/losinggeneration/keymap.c
new file mode 100644
index 0000000000..d4a336c338
--- /dev/null
+++ b/keyboards/contra/keymaps/losinggeneration/keymap.c
@@ -0,0 +1,40 @@
+#include QMK_KEYBOARD_H
+#include "losinggeneration-config.h"
+#include "losinggeneration-keymap.h"
+
+extern keymap_config_t keymap_config;
+
+#define MT_CAPS LSFT_T(KC_CAPS)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_QWERTY] = CATMAP( QWERTY_LAYER ),
+[_COLEMAK] = CATMAP( COLEMAK_LAYER ),
+[_WORKMAN] = CATMAP( WORKMAN_LAYER ),
+[_DVORAK] = CATMAP( DVORAK_LAYER ),
+[_GAME] = CATMAP( GAME_LAYER ),
+[_NUMPAD] = CATMAP( NUMPAD_LAYER ),
+[_MOUSE] = CATMAP( MOUSE_LAYER ),
+[_LOWER] = CATMAP( LOWER_LAYER ),
+[_RAISE] = CATMAP( RAISE_LAYER ),
+
+/* Adjust (Lower + Raise)
+ * ,-----------------------------------------------------------------------------------.
+ * | | F1 | F2 | F3 | F4 | | RESET| Game |Numpad|Mouse | |Sleep |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | | F5 | F6 | F7 | F8 | | |Qwerty|Colmak|Workmn|Dvorak| |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | CAPS | F9 | F10 | F11 | F12 | | | | | | Up | |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | | | | | | | | XXX | Left | Down |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_ADJUST] = CATMAP( \
+ _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , _______, RESET , TO_GAME, TO_NUM , TO_MS , _______, KC_SLEP, \
+ _______, KC_F5 , KC_F6 , KC_F7 , KC_F8 , _______, _______, QWERTY , COLEMAK, WORKMAN, DVORAK , _______, \
+ MT_CAPS, KC_F9 , KC_F10, KC_F11 , KC_F12 , _______, _______, _______, _______, _______, KC_UP , _______, \
+ _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT \
+)
+
+};
+
diff --git a/keyboards/contra/keymaps/losinggeneration/rules.mk b/keyboards/contra/keymaps/losinggeneration/rules.mk
new file mode 100644
index 0000000000..1728afd85c
--- /dev/null
+++ b/keyboards/contra/keymaps/losinggeneration/rules.mk
@@ -0,0 +1,17 @@
+# Build Options
+# change to "no" to disable the options, or define them in the Makefile in
+# the appropriate keymap folder that will get included automatically
+#
+AUDIO_ENABLE = no # Audio output on port C6
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
+BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
+COMMAND_ENABLE = no # Commands for debug and configuration
+CONSOLE_ENABLE = no # Console for debug(+400)
+MIDI_ENABLE = no # MIDI controls
+NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
+
+ifndef QUANTUM_DIR
+ include ../../../../Makefile
+endif
diff --git a/keyboards/levinson/keymaps/losinggeneration/README.md b/keyboards/levinson/keymaps/losinggeneration/README.md
index b406d50008..44c904508a 100644
--- a/keyboards/levinson/keymaps/losinggeneration/README.md
+++ b/keyboards/levinson/keymaps/losinggeneration/README.md
@@ -17,7 +17,7 @@ See description of the layout in the common folder
```
,-----------------------------------------..-----------------------------------------.
- | | F1 | F2 | F3 | F4 |BL Off|| RESET| Game |Numpad|Mouse | | |
+ | | F1 | F2 | F3 | F4 |BL Off|| RESET| Game |Numpad|Mouse | |Sleep |
|------+------+------+------+------+------||------+------+------+------+------+------|
| | F5 | F6 | F7 | F8 |BL Tg ||Aud on|Qwerty|Colmak|Workmn|Dvorak| |
|------+------+------+------+------+------||------+------+------+------+------+------|
diff --git a/keyboards/levinson/keymaps/losinggeneration/keymap.c b/keyboards/levinson/keymaps/losinggeneration/keymap.c
index 3512f59f1c..aea6aed78c 100644
--- a/keyboards/levinson/keymaps/losinggeneration/keymap.c
+++ b/keyboards/levinson/keymaps/losinggeneration/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Adjust (Lower + Raise)
* ,-----------------------------------------..-----------------------------------------.
- * | | F1 | F2 | F3 | F4 |BL Off|| RESET| Game |Numpad|Mouse | | |
+ * | | F1 | F2 | F3 | F4 |BL Off|| RESET| Game |Numpad|Mouse | |Sleep |
* |------+------+------+------+------+------||------+------+------+------+------+------|
* | | F5 | F6 | F7 | F8 |BL Tg ||Aud on|Qwerty|Colmak|Workmn|Dvorak| |
* |------+------+------+------+------+------||------+------+------+------+------+------|
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----------------------------------------''-----------------------------------------'
*/
[_ADJUST] = CATMAP( \
- _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , BL_OFF , RESET , TO_GAME, TO_NUM , TO_MS , _______, _______, \
+ _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , BL_OFF , RESET , TO_GAME, TO_NUM , TO_MS , _______, KC_SLEP, \
_______, KC_F5 , KC_F6 , KC_F7 , KC_F8 , BL_TOGG, AU_ON , QWERTY , COLEMAK, WORKMAN, DVORAK , _______, \
KC_CAPS, KC_F9 , KC_F10, KC_F11 , KC_F12 , BL_ON , AU_OFF , _______, _______, _______, KC_UP , _______, \
_______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT \
diff --git a/keyboards/nyquist/keymaps/losinggeneration/README.md b/keyboards/nyquist/keymaps/losinggeneration/README.md
index be55af2e0a..a51b94e407 100644
--- a/keyboards/nyquist/keymaps/losinggeneration/README.md
+++ b/keyboards/nyquist/keymaps/losinggeneration/README.md
@@ -18,7 +18,7 @@ See description of the layout in the common folder
,-----------------------------------------..-----------------------------------------.
| RESET|DEBUG | | | | || | | | | | |
|------+------+------+------+------+------||------+------+------+------+------+------|
- | | F1 | F2 | F3 | F4 | || | Game |Numpad| Mouse| | |
+ | | F1 | F2 | F3 | F4 | || | Game |Numpad| Mouse| |Sleep |
|------+------+------+------+------+------||------+------+------+------+------+------|
| | F5 | F6 | F7 | F8 | || |Qwerty|Colmak|Workmn|Dvorak| |
|------+------+------+------+------+------||------+------+------+------+------+------|
diff --git a/keyboards/nyquist/keymaps/losinggeneration/keymap.c b/keyboards/nyquist/keymaps/losinggeneration/keymap.c
index 65fbb9cdd4..3e2c6edb70 100644
--- a/keyboards/nyquist/keymaps/losinggeneration/keymap.c
+++ b/keyboards/nyquist/keymaps/losinggeneration/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* ,-----------------------------------------..-----------------------------------------.
* | RESET|DEBUG | | | | || | | | | | |
* |------+------+------+------+------+------||------+------+------+------+------+------|
- * | | F1 | F2 | F3 | F4 | || | Game |Numpad| Mouse| | |
+ * | | F1 | F2 | F3 | F4 | || | Game |Numpad| Mouse| |Sleep |
* |------+------+------+------+------+------||------+------+------+------+------+------|
* | | F5 | F6 | F7 | F8 | || |Qwerty|Colmak|Workmn|Dvorak| |
* |------+------+------+------+------+------||------+------+------+------+------+------|
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_ADJUST] = CATMAP( \
RESET , DEBUG , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
- _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , _______, _______, TO_GAME, TO_NUM , TO_MS , _______, _______, \
+ _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , _______, _______, TO_GAME, TO_NUM , TO_MS , _______, KC_SLEP, \
_______, KC_F5 , KC_F6 , KC_F7 , KC_F8 , _______, _______, QWERTY , COLEMAK, WORKMAN, DVORAK , _______, \
KC_CAPS, KC_F9 , KC_F10, KC_F11 , KC_F12 , _______, _______, _______, _______, _______, KC_UP , _______, \
_______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT \