commit 0940edaa47aa306a447948ba228c7ce7813d5d3b Author: Jake Walker Date: Mon Sep 11 20:45:48 2023 +0100 Initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f08343e --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +obj_* +*.hex +*.elf +*.map diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..8ad46ee --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "qmk_firmware"] + path = qmk_firmware + url = https://github.com/qmk/qmk_firmware.git diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..fc94351 --- /dev/null +++ b/Makefile @@ -0,0 +1,7 @@ +setup: + rm -rf qmk_firmware/keyboards/lily58/keymaps/jakew + + ln -s $(shell pwd)/lily58 qmk_firmware/keyboards/lily58/keymaps/jakew + +build: + docker run --rm -it --user $(shell id -u):$(shell id -g) -w /qmk_firmware -v $(shell pwd)/qmk_firmware:/qmk_firmware ghcr.io/qmk/qmk_cli qmk compile -kb lily58 -km jakew diff --git a/lily58/config.h b/lily58/config.h new file mode 100644 index 0000000..74eb791 --- /dev/null +++ b/lily58/config.h @@ -0,0 +1,5 @@ +#pragma once + +#define MASTER_LEFT +#define TAPPING_TERM 200 +#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY diff --git a/lily58/keymap.c b/lily58/keymap.c new file mode 100644 index 0000000..5686364 --- /dev/null +++ b/lily58/keymap.c @@ -0,0 +1,118 @@ +#include QMK_KEYBOARD_H +#include + +#define SY_EQL LT(_SYMBOL, KC_EQL) +#define SY_MIN LT(_SYMBOL, KC_MINS) +#define SY_SPC LT(_SYMBOL, KC_SPC) +#define G_COMM LGUI_T(KC_COMM) +#define A_DOT LALT_T(KC_DOT) +#define ADJ MO(_ADJUST) + +enum layer_names { + _QWERTY, + _SYMBOL, + _ADJUST +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* QWERTY + * ,-----------------------------------------. ,-----------------------------------------. + * | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Del | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | Tab | Q | W | E | R | T | | Y | U | I | O | P | \ | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | Ctrl | A | S | D | F | G |-------. ,-------| H | J | K | L | ; | ' | + * |------+------+------+------+------+------| SYM = | | SYM - |------+------+------+------+------+------| + * | Shift| Z | X | C | V | B |-------| |-------| N | M | , | . | / | Shift| + * `-----------------------------------------/ / \ Shift\-----------------------------------------' + * | ADJ | Alt | Cmd | / Space / \ Enter\ | Bksp | Left | Right| + * | | | , |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ + + [_QWERTY] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_LCTL, 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, SY_EQL, SY_MIN, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + ADJ, KC_LALT, G_COMM, KC_SPC, SC_SENT, KC_BSPC, KC_LEFT, KC_RGHT +), +/* SYMBOL + * ,-----------------------------------------. ,-----------------------------------------. + * | ` | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | Del | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | ! | @ | { | } | | | | & | + | up | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | # | $ | ( | ) | ` |-------. ,-------| = | left | down |right | | | + * |------+------+------+------+------+------| | | |------+------+------+------+------+------| + * | | % | ^ | [ | ] | ~ |-------| |-------| * | - | | | | | + * `-----------------------------------------/ / \ \-----------------------------------------' + * | | | | / / \ \ | | Home | End | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ +[_SYMBOL] = LAYOUT( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL, + _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_AMPR, KC_PPLS, KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, + _______, KC_NUHS, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV, KC_PEQL, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, + _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, _______, _______, KC_ASTR, KC_MINS, XXXXXXX, XXXXXXX, XXXXXXX, _______, + _______, _______, _______, _______, _______, _______, KC_HOME, KC_END +), +/* ADJUST + * ,-----------------------------------------. ,-----------------------------------------. + * | RST | | | | | | | | | | | | RST | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | | | | | V+ | | Br+ | | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | | | | | V- |-------. ,-------| Br- | << | play | >> | | | + * |------+------+------+------+------+------| | | |------+------+------+------+------+------| + * | | | | | | Mute |-------| |-------| | | | | | | + * `-----------------------------------------/ / \ \-----------------------------------------' + * | | | | / / \ \ | | | | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ +[_ADJUST] = LAYOUT( + EE_CLR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, KC_BRIU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD, KC_BRID, KC_MRWD, KC_MPLY, KC_MFFD, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX +) +}; + +bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case SY_SPC: + return false; + case QK_MOD_TAP ... QK_MOD_TAP_MAX: + return true; + default: + return false; + } +} + +#ifdef OLED_ENABLE +oled_rotation_t oled_init_user(oled_rotation_t rotation) { + if (!is_keyboard_master()) + return OLED_ROTATION_180; + return rotation; +} + +const char *read_layer_state(void); +const char *read_logo(void); +char wpm_str[10]; + +bool oled_task_user(void) { + if (is_keyboard_master()) { + oled_write_ln(read_layer_state(), false); + + sprintf(wpm_str, "WPM:%03d", get_current_wpm()); + oled_write_ln(wpm_str, false); + } else { + oled_write_ln(read_logo(), false); + } + return false; +} +#endif // OLED_ENABLE diff --git a/lily58/rules.mk b/lily58/rules.mk new file mode 100644 index 0000000..444a80f --- /dev/null +++ b/lily58/rules.mk @@ -0,0 +1,21 @@ +BOOTMAGIC_ENABLE = no +MOUSEKEY_ENABLE = no +COMMAND_ENABLE = no +NKRO_ENABLE = no +BACKLIGHT_ENABLE = no +AUDIO_ENABLE = no +RGBLIGHT_ENABLE = no +SWAP_HANDS_ENABLE = no + +AUTO_SHIFT_ENABLE = no +OLED_ENABLE = yes +WPM_ENABLE = yes + +EXTRAKEY_ENABLE = yes + +SRC += ./lib/layer_state_reader.c \ + ./lib/logo_reader.c \ +# ./lib/keylogger.c \ +# ./lib/mode_icon_reader.c \ +# ./lib/timelogger.c \ +# ./lib/host_led_state_reader.c \ diff --git a/qmk_firmware b/qmk_firmware new file mode 160000 index 0000000..9a29ddf --- /dev/null +++ b/qmk_firmware @@ -0,0 +1 @@ +Subproject commit 9a29ddf6aff4dd4356bf902cb6b4932ccec6639e