summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-09-08 23:55:47 +0000
committerQMK Bot <hello@qmk.fm>2021-09-08 23:55:47 +0000
commitcab0d7955f13246d9bea44e1a56eb7b7db61bd07 (patch)
treee27f36f431eac54d68ad7a3c7952c3cae8e579be
parent24000ef2e1f71ba0ba1c496b95beab9f6d6ceebc (diff)
parentd510f6afa97801ea53078ac7fbdbd24824d77f4e (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/lily58/keymaps/gaston/config.h26
-rw-r--r--keyboards/lily58/keymaps/gaston/keymap.c58
-rw-r--r--keyboards/lily58/keymaps/gaston/readme.md67
-rw-r--r--keyboards/lily58/keymaps/gaston/rules.mk9
4 files changed, 160 insertions, 0 deletions
diff --git a/keyboards/lily58/keymaps/gaston/config.h b/keyboards/lily58/keymaps/gaston/config.h
new file mode 100644
index 0000000000..621a0a9295
--- /dev/null
+++ b/keyboards/lily58/keymaps/gaston/config.h
@@ -0,0 +1,26 @@
+/* Copyright 2012 Jun Wako <wakojun@gmail.com>
+ * Copyright 2015 Jack Humbert
+ * Copyright 2021 Gaston Jorquera
+ *
+ * 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/>.
+ */
+
+/* This is the c configuration file for the keymap. */
+
+#pragma once
+
+#define MASTER_LEFT
+
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 150 /* ms */
diff --git a/keyboards/lily58/keymaps/gaston/keymap.c b/keyboards/lily58/keymaps/gaston/keymap.c
new file mode 100644
index 0000000000..234b283a91
--- /dev/null
+++ b/keyboards/lily58/keymaps/gaston/keymap.c
@@ -0,0 +1,58 @@
+/* Copyright 2021 Gaston Jorquera
+ *
+ * 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/>.
+ */
+
+/* This is the keymap configuration. */
+
+#include QMK_KEYBOARD_H
+
+enum layer_number {
+ _QWERTY = 0,
+ _LOWER,
+ _MOUSE,
+};
+
+#define EN_LOWER LT(_LOWER, KC_SPC)
+#define EN_MOUSE MO(_MOUSE)
+
+/* See the readme.md file for an ASCII representation of this keymap. */
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_QWERTY] = LAYOUT(
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS,
+ KC_LCTRL,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, EN_MOUSE,KC_EQL, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
+ KC_RALT, KC_LALT, KC_LGUI, EN_LOWER,EN_LOWER, KC_LBRC, KC_RBRC, KC_BSLS
+),
+
+[_LOWER] = LAYOUT(
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+ XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, KC_HOME, KC_PGDN, KC_PGUP, KC_END, XXXXXXX, KC_F12,
+ XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX,
+ XXXXXXX, XXXXXXX, XXXXXXX, KC_BRID, KC_BRIU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, KC_DEL, XXXXXXX, XXXXXXX, XXXXXXX,
+ XXXXXXX, XXXXXXX, XXXXXXX, KC_TRNS, KC_TRNS, XXXXXXX, XXXXXXX, XXXXXXX
+),
+
+[_MOUSE] = LAYOUT(
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BTN1, KC_BTN2, XXXXXXX, XXXXXXX, KC_ACL0, XXXXXXX,
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_ACL1, XXXXXXX,
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_TRNS, XXXXXXX, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_ACL2, XXXXXXX,
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+)
+
+};
diff --git a/keyboards/lily58/keymaps/gaston/readme.md b/keyboards/lily58/keymaps/gaston/readme.md
new file mode 100644
index 0000000000..2d28be00af
--- /dev/null
+++ b/keyboards/lily58/keymaps/gaston/readme.md
@@ -0,0 +1,67 @@
+# Gaston's Lily58 Keymap
+
+A simple three layers keymap to improve typing performance by reducing
+cognitive load.
+
+The main characteristics of this keymap are:
+
+* The QWERTY layer tries to be as normal as possible, without having to use
+ modifiers.
+ * The main thumb buttons are spaces when tapped and enable the LOWER layer
+ when held.
+ * Vim style arrow keys.
+ * Left and right ALT in case you need different behaviors. (For example, the
+ default Option and readline's Alt behavior in macOS.)
+* The LOWER layer has mostly meta keys.
+* The MOUSE layer controls the mouse.
+
+## QWERTY Layer
+
+```plain
+,-----------------------------------------. ,-----------------------------------------.
+| ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | BSPC |
+|------+------+------+------+------+------| |------+------+------+------+------+------|
+| TAB | Q | W | E | R | T | | Y | U | I | O | P | - |
+|------+------+------+------+------+------| |------+------+------+------+------+------|
+|LCTRL | A | S | D | F | G |-------. ,-------| H | J | K | L | ; | ' |
+|------+------+------+------+------+------| MOUSE | | = |------+------+------+------+------+------|
+| LSFT | Z | X | C | V | B |-------| |-------| N | M | , | . | / | ENT |
+`-----------------------------------------/ LT / \ LT \----------------------------------------'
+ | RALT | LALT | LGUI | / LOWER / \ LOWER \ | [ | ] | \ |
+ | | | |/ SPC / \ SPC \ | | | |
+ `----------------------------' '-----------------------------'
+```
+
+## LOWER Layer
+
+```plain
+,-----------------------------------------. ,-----------------------------------------.
+| ESC | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 |
+|------+------+------+------+------+------| |------+------+------+------+------+------|
+| | | MUTE | VOLD | VOLU | | | HOME | PGDN | PGUP | END | | F12 |
+|------+------+------+------+------+------| |------+------+------+------+------+------|
+| | | MPRV | MPLY | MNXT | |-------. ,-------| LEFT | DOWN | UP | RGHT | | |
+|------+------+------+------+------+------| | | |------+------+------+------+------+------|
+| | | | BRID | BRIU | |-------| |-------| | INS | DEL | | | |
+`-----------------------------------------/ / \ \----------------------------------------'
+ | | | | / TRNS / \ TRNS \ | | | |
+ | | | |/ / \ \ | | | |
+ `----------------------------' '-----------------------------'
+```
+
+## MOUSE Layer
+
+```plain
+,-----------------------------------------. ,-----------------------------------------.
+| | | | | | | | | | | | | |
+|------+------+------+------+------+------| |------+------+------+------+------+------|
+| | | | | | | | BTN1 | BTN2 | | | ACL0 | |
+|------+------+------+------+------+------| |------+------+------+------+------+------|
+| | | | | | |-------. ,-------| MS_L | MS_D | MS_U | MS_R | ACL1 | |
+|------+------+------+------+------+------| TRNS | | |------+------+------+------+------+------|
+| | | | | | |-------| |-------| WH_L | WH_D | WH_U | WH_R | ACL2 | |
+`-----------------------------------------/ / \ \----------------------------------------'
+ | | | | / / \ \ | | | |
+ | | | |/ / \ \ | | | |
+ `----------------------------' '-----------------------------'
+```
diff --git a/keyboards/lily58/keymaps/gaston/rules.mk b/keyboards/lily58/keymaps/gaston/rules.mk
new file mode 100644
index 0000000000..4d566ddb79
--- /dev/null
+++ b/keyboards/lily58/keymaps/gaston/rules.mk
@@ -0,0 +1,9 @@
+MOUSEKEY_ENABLE = yes
+EXTRAKEY_ENABLE = yes
+RGBLIGHT_ENABLE = no
+OLED_ENABLE = no
+
+SRC += ./lib/rgb_state_reader.c \
+ ./lib/layer_state_reader.c \
+ ./lib/logo_reader.c \
+ ./lib/keylogger.c \