From ba42a5ae68a59ad514027d819c6b58ee86944e75 Mon Sep 17 00:00:00 2001 From: fauxpark Date: Tue, 16 Jul 2019 17:26:38 +1000 Subject: Remove commented out MCUs in rules.mk (#5884) --- keyboards/lily58/rules.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/lily58') diff --git a/keyboards/lily58/rules.mk b/keyboards/lily58/rules.mk index f2947c81cc..0ef951872e 100644 --- a/keyboards/lily58/rules.mk +++ b/keyboards/lily58/rules.mk @@ -6,7 +6,6 @@ SRC += ssd1306.c # CFLAGS += -flto # MCU name -#MCU = at90usb1287 MCU = atmega32u4 # Processor frequency. -- cgit v1.2.3 From 72f382fc02b3c5c81c54fd2d239d653fe2f8083c Mon Sep 17 00:00:00 2001 From: fauxpark Date: Fri, 2 Aug 2019 13:47:52 +1000 Subject: Remove unused _BOOTLOADER defines --- keyboards/lily58/rev1/config.h | 4 +--- keyboards/lily58/rules.mk | 11 +++++++---- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'keyboards/lily58') diff --git a/keyboards/lily58/rev1/config.h b/keyboards/lily58/rev1/config.h index 8fd42070e0..4e8e3a7c9c 100644 --- a/keyboards/lily58/rev1/config.h +++ b/keyboards/lily58/rev1/config.h @@ -36,8 +36,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } #define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 } -#define CATERINA_BOOTLOADER - /* define tapping term */ #define TAPPING_TERM 100 @@ -72,4 +70,4 @@ along with this program. If not, see . //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT //#define NO_ACTION_MACRO -//#define NO_ACTION_FUNCTION \ No newline at end of file +//#define NO_ACTION_FUNCTION diff --git a/keyboards/lily58/rules.mk b/keyboards/lily58/rules.mk index 0ef951872e..d13c88ba69 100644 --- a/keyboards/lily58/rules.mk +++ b/keyboards/lily58/rules.mk @@ -40,10 +40,13 @@ ARCH = AVR8 # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. F_USB = $(F_CPU) -# Bootloader -# This definition is optional, and if your keyboard supports multiple bootloaders of -# different sizes, comment this out, and the correct address will be loaded -# automatically (+60). See bootloader.mk for all options. +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# atmega32a bootloadHID BOOTLOADER = caterina # Interrupt driven control endpoint task(+60) -- cgit v1.2.3 From 9bb4e63a1123861515c1196a624b4a0f04129601 Mon Sep 17 00:00:00 2001 From: fauxpark Date: Wed, 21 Aug 2019 11:05:08 +1000 Subject: Remove old promicro_bootloader_jmp() declarations (#6444) --- keyboards/lily58/rev1/rev1.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'keyboards/lily58') diff --git a/keyboards/lily58/rev1/rev1.h b/keyboards/lily58/rev1/rev1.h index 4949bf5372..aa9f5727c2 100644 --- a/keyboards/lily58/rev1/rev1.h +++ b/keyboards/lily58/rev1/rev1.h @@ -2,7 +2,6 @@ #include "lily58.h" -//void promicro_bootloader_jmp(bool program); #include "quantum.h" #ifdef RGBLIGHT_ENABLE @@ -18,8 +17,6 @@ #endif #endif - -//void promicro_bootloader_jmp(bool program); #ifndef FLIP_HALF #define LAYOUT( \ L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ @@ -62,4 +59,4 @@ { R30, R31, R32, R33, R34, R35 }, \ { KC_NO, R41, R42, R43, R44, R45 } \ } -#endif \ No newline at end of file +#endif -- cgit v1.2.3 From f2ea65db6b8834dcb2a21462f43c1d89add6b101 Mon Sep 17 00:00:00 2001 From: Jonas Avellana <14019120+ninjonas@users.noreply.github.com> Date: Mon, 2 Sep 2019 08:40:01 -0600 Subject: [keymap] ninjonas userspace and keymaps for hotdox, lily58, & pinky3 (#6649) * [keyboard] introducing ninjonas userspace & keymaps for hotdox, lily58, and pinky3 * [fix(#6649)] removed M_EPRM and used builtin EEP_RST keycode as-per review. * [chore(#6649)] forgot to update keymap legend on lily58 --- keyboards/lily58/keymaps/ninjonas/README.md | 136 ++++++++++++++++++ keyboards/lily58/keymaps/ninjonas/config.h | 31 +++++ keyboards/lily58/keymaps/ninjonas/keymap.c | 152 +++++++++++++++++++++ .../lily58/keymaps/ninjonas/layer_state_reader.c | 37 +++++ keyboards/lily58/keymaps/ninjonas/rules.mk | 5 + 5 files changed, 361 insertions(+) create mode 100644 keyboards/lily58/keymaps/ninjonas/README.md create mode 100644 keyboards/lily58/keymaps/ninjonas/config.h create mode 100644 keyboards/lily58/keymaps/ninjonas/keymap.c create mode 100644 keyboards/lily58/keymaps/ninjonas/layer_state_reader.c create mode 100644 keyboards/lily58/keymaps/ninjonas/rules.mk (limited to 'keyboards/lily58') diff --git a/keyboards/lily58/keymaps/ninjonas/README.md b/keyboards/lily58/keymaps/ninjonas/README.md new file mode 100644 index 0000000000..73f7f9d942 --- /dev/null +++ b/keyboards/lily58/keymaps/ninjonas/README.md @@ -0,0 +1,136 @@ +# ninjonas Keymap for [Lily58 Pro](https://github.com/kata0510/Lily58) + +## Keymap +This keymap is designed based off my typing habits and is subject to change. Information about custom user macros and tap dances can be found [here](../../../../users/ninjonas). + +> Make sure you update QMK's lily58 config.h TAPPING_TERM to 200ms or this won't compile + +More information about the Lily58 pro keyboard can be found [here](https://yuchi-kbd.hatenablog.com/entry/2018/12/23/214342) + +### QWERTY +```c +/* QWERTY + * ,-----------------------------------------. ,-----------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | Tab | Q | W | E | R | T | | Y | U | I | O | P | \ | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | ESC | A | S | D | F | G |-------. ,-------| H | J | K | L | ; | ' | + * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| + * |LShift| Z | X | C | V | B |-------| |-------| N | M | , | . | / | = | + * `-----------------------------------------/ / \ \-----------------------------------------' + * | Alt |  | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ +``` + +### DVORAK +```c +/* DVORAK + * ,-----------------------------------------. ,-----------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | Tab | ' | , | . | P | Y | | F | G | C | R | L | \ | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | ESC | A | O | E | U | I |-------. ,-------| D | H | T | N | S | / | + * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| + * |LShift| ; | Q | J | K | X |-------| |-------| B | M | W | V | Z | = | + * `-----------------------------------------/ / \ \-----------------------------------------' + * | Alt |  | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ +``` + +### COLEMAK +```c +/* COLEMAK + * ,-----------------------------------------. ,-----------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | Tab | Q | W | F | P | G | | J | L | U | Y | ; | \ | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | ESC | A | R | S | T | D |-------. ,-------| H | N | E | I | O | ' | + * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| + * |LShift| Z | X | C | V | B |-------| |-------| K | M | , | . | / | = | + * `-----------------------------------------/ / \ \-----------------------------------------' + * | Alt |  | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ +``` + +### LOWER +```c +/* LOWER + * ,------------------------------------------. ,------------------------------------------. + * | F11 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F12 | + * |------+------+------+-------+------+------| |------+------+------+------+-------+------| + * | | | |KC_BRIU| Play | Mute | | PgUp | Home | Up | End | | | + * |------+------+------+-------+------+------| |------+------+------+------+-------+------| + * | | | |KC_BRID| Next |VolUp |-------. ,-------| PgDn | Left | Down |Right |K_LOCK | | + * |------+------+------+-------+------+------| | | |------+------+------+------+-------+------| + * | |M_SHFT| | | Prev |VolDn |-------| |-------| | | | |M_ZOOM |M_PYNV| + * `------------------------------------------/ / \ \------------------------------------------' + * | | | | / / \ \ | |M_CODE| | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ +``` + +### RAISE +```c +/* RAISE + * ,-----------------------------------------. ,-----------------------------------------. + * | | | | |K_CSCN| | | | | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | | MS_1 | MS_U | MS_2 | WH_U | | | | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | | MS_L | MS_D | MS_R | WH_D |-------. ,-------| | | | | | | + * |------+------+------+------+------+------| | | |------+------+------+------+------+------| + * | | | | | | |-------| |-------| | | | | | | + * `-----------------------------------------/ / \ \-----------------------------------------' + * | | | | / / \ \ | | | | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ +``` + +### ADJUST +```c +/* ADJUST + * ,------------------------------------------. ,-----------------------------------------. + * |EEP_RST| | | | | | | | | |COLMAK|DVORAK|QWERTY| + * |-------+------+------+------+------+------| |------+------+------+------+------+------| + * |M_MAKE | | | | | | | | | | | | | + * |-------+------+------+------+------+------| |------+------+------+------+------+------| + * |M_VRSN | | | | | |-------. ,-------| | | | | | | + * |-------+------+------+------+------+------| | | |------+------+------+------+------+------| + * |M_FLSH | | | | | |-------| |-------| | | | | | | + * `------------------------------------------/ / \ \-----------------------------------------' + * | | | | / / \ \ | | | | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ +``` + + \ No newline at end of file diff --git a/keyboards/lily58/keymaps/ninjonas/config.h b/keyboards/lily58/keymaps/ninjonas/config.h new file mode 100644 index 0000000000..7a5587d560 --- /dev/null +++ b/keyboards/lily58/keymaps/ninjonas/config.h @@ -0,0 +1,31 @@ +/* +This is the c configuration file for the keymap + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +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 . +*/ + +#pragma once + +/* Select hand configuration */ + +#define MASTER_LEFT +// #define MASTER_RIGHT +// #define EE_HANDS + +#define SSD1306OLED +#define USE_SERIAL_PD2 +#define TAPPING_FORCE_HOLD \ No newline at end of file diff --git a/keyboards/lily58/keymaps/ninjonas/keymap.c b/keyboards/lily58/keymaps/ninjonas/keymap.c new file mode 100644 index 0000000000..81436aee3e --- /dev/null +++ b/keyboards/lily58/keymaps/ninjonas/keymap.c @@ -0,0 +1,152 @@ +/* Copyright 2019 @ninjonas + * + * 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 . + */ +#include QMK_KEYBOARD_H +#include "ninjonas.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* QWERTY + * ,-----------------------------------------. ,-----------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | Tab | Q | W | E | R | T | | Y | U | I | O | P | \ | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | ESC | A | S | D | F | G |-------. ,-------| H | J | K | L | ; | ' | + * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| + * |LShift| Z | X | C | V | B |-------| |-------| N | M | , | . | / | = | + * `-----------------------------------------/ / \ \-----------------------------------------' + * | Alt |  | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ + [_QWERTY] = LAYOUT_wrapper( + _____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________, \ + _____________________QWERTY_L1______________________, _____________________QWERTY_R1______________________, \ + _____________________QWERTY_L2______________________, _____________________QWERTY_R2______________________, \ + _____________________QWERTY_L3______________________, T_LBRC, T_RBRC, _____________________QWERTY_R3______________________, \ + ________MOD_LEFT_________, LT_RAI, LT_LOW, ________MOD_RIGHT________ \ + ), + +/* DVORAK + * ,-----------------------------------------. ,-----------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | Tab | ' | , | . | P | Y | | F | G | C | R | L | \ | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | ESC | A | O | E | U | I |-------. ,-------| D | H | T | N | S | / | + * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| + * |LShift| ; | Q | J | K | X |-------| |-------| B | M | W | V | Z | = | + * `-----------------------------------------/ / \ \-----------------------------------------' + * | Alt |  | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ + [_DVORAK] = LAYOUT_wrapper( + _____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________, \ + _____________________DVORAK_L1______________________, _____________________DVORAK_R1______________________, \ + _____________________DVORAK_L2______________________, _____________________DVORAK_R2______________________, \ + _____________________DVORAK_L3______________________, T_LBRC, T_RBRC, _____________________DVORAK_R3______________________, \ + ________MOD_LEFT_________, LT_RAI, LT_LOW, ________MOD_RIGHT________ \ + ), + +/* COLEMAK + * ,-----------------------------------------. ,-----------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | Tab | Q | W | F | P | G | | J | L | U | Y | ; | \ | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | ESC | A | R | S | T | D |-------. ,-------| H | N | E | I | O | ' | + * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| + * |LShift| Z | X | C | V | B |-------| |-------| K | M | , | . | / | = | + * `-----------------------------------------/ / \ \-----------------------------------------' + * | Alt |  | Ctrl | /Space / \Enter \ |BackSP| Del |LOWER | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ + [_COLEMAK] = LAYOUT_wrapper( + _____________________NUM_LEFT_______________________, _____________________NUM_RIGHT______________________, \ + _____________________COLEMAK_L1_____________________, _____________________COLEMAK_R1_____________________, \ + _____________________COLEMAK_L2_____________________, _____________________COLEMAK_R2_____________________, \ + _____________________COLEMAK_L3_____________________, T_LBRC, T_RBRC, _____________________COLEMAK_R3_____________________, \ + ________MOD_LEFT_________, LT_RAI, LT_LOW, ________MOD_RIGHT________ \ + ), + +/* LOWER + * ,------------------------------------------. ,------------------------------------------. + * | F11 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F12 | + * |------+------+------+-------+------+------| |------+------+------+------+-------+------| + * | | | |KC_BRIU| Play | Mute | | PgUp | Home | Up | End | | | + * |------+------+------+-------+------+------| |------+------+------+------+-------+------| + * | | | |KC_BRID| Next |VolUp |-------. ,-------| PgDn | Left | Down |Right |K_LOCK | | + * |------+------+------+-------+------+------| | | |------+------+------+------+-------+------| + * |M_SHFT| | | | Prev |VolDn |-------| |-------| | | | |M_ZOOM |M_PYNV| + * `------------------------------------------/ / \ \------------------------------------------' + * | | | | / / \ \ | |M_CODE| | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ +[_LOWER] = LAYOUT_wrapper( \ + _____________________FUNC_LEFT______________________, _____________________FUNC_RIGHT_____________________, \ + _______, _______, _______, _________MEDIA_1_________, _______________NAV_1______________, _______, _______, \ + _______, _______, _______, _________MEDIA_2_________, _______________NAV_2______________, K_LOCK, _______, \ + M_SHFT, _______, _______, _________MEDIA_3_________, _______, _______, _______, _______, _______, _______, M_ZOOM, M_PYNV, \ + __________________________________, _______, _______, M_CODE, _______ \ + ), + +/* RAISE + * ,-----------------------------------------. ,-----------------------------------------. + * | | | | |K_CSCN| | | | | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | | MS_1 | MS_U | MS_2 | WH_U | | | | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | | MS_L | MS_D | MS_R | WH_D |-------. ,-------| | | | | | | + * |------+------+------+------+------+------| | | |------+------+------+------+------+------| + * | | | | | | |-------| |-------| | | | | | | + * `-----------------------------------------/ / \ \-----------------------------------------' + * | | | | / / \ \ | | | | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ +[_RAISE] = LAYOUT_wrapper( \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, K_CSCN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, _____________MOUSE_1______________, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, _____________MOUSE_2______________, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\ + __________________________________, __________________________________ \ + ), + +/* ADJUST + * ,------------------------------------------. ,-----------------------------------------. + * |EEP_RST| | | | | | | | | |COLMAK|DVORAK|QWERTY| + * |-------+------+------+------+------+------| |------+------+------+------+------+------| + * | M_MAKE| | | | | | | | | | | | | + * |-------+------+------+------+------+------| |------+------+------+------+------+------| + * | M_VRSN| | | | | |-------. ,-------| | | | | | | + * |-------+------+------+------+------+------| | | |------+------+------+------+------+------| + * | M_FLSH| | | | | |-------| |-------| | | | | | | + * `------------------------------------------/ / \ \-----------------------------------------' + * | | | | / / \ \ | | | | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' + */ +[_ADJUST] = LAYOUT_wrapper( \ + EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, COLEMAK, DVORAK, QWERTY, \ + M_MAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + M_VRSN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + M_FLSH, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\ + __________________________________, __________________________________ \ + ), +}; \ No newline at end of file diff --git a/keyboards/lily58/keymaps/ninjonas/layer_state_reader.c b/keyboards/lily58/keymaps/ninjonas/layer_state_reader.c new file mode 100644 index 0000000000..883eaca036 --- /dev/null +++ b/keyboards/lily58/keymaps/ninjonas/layer_state_reader.c @@ -0,0 +1,37 @@ +#include QMK_KEYBOARD_H +#include +#include "lily58.h" +#include "ninjonas.h" + +char layer_state_str[24]; + +const char *read_layer_state(void) { + switch (biton32(layer_state)) + { + case _RAISE: + snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Raise"); + break; + case _LOWER: + snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Lower"); + break; + case _ADJUST: + snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Adjust"); + break; + default: + switch (biton32(default_layer_state)) { + case _COLEMAK: + snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Colemak"); + break; + case _DVORAK: + snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Dvorak"); + break; + case _QWERTY: + snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Qwerty"); + break; + default: + snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Undef-%ld", layer_state); + } + } + + return layer_state_str; +} \ No newline at end of file diff --git a/keyboards/lily58/keymaps/ninjonas/rules.mk b/keyboards/lily58/keymaps/ninjonas/rules.mk new file mode 100644 index 0000000000..4ea023572f --- /dev/null +++ b/keyboards/lily58/keymaps/ninjonas/rules.mk @@ -0,0 +1,5 @@ +# If you want to change the display of OLED, you need to change here +SRC += ./lib/glcdfont.c \ + layer_state_reader.c \ + ./lib/logo_reader.c \ + ./lib/keylogger.c \ -- cgit v1.2.3 From ff854565ce012a325ad04b09a7bcb7c8bb9d43c5 Mon Sep 17 00:00:00 2001 From: Jonas Avellana <14019120+ninjonas@users.noreply.github.com> Date: Wed, 25 Sep 2019 22:28:06 -0600 Subject: [Keymap] ninjonas keymap for crkbd & ninjonas userspace updates (#6797) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [keymap(crkbd)] introducing crkbd keymap on ninjonas profile * [keymap(crkbd)] introducing crkbd keymap on ninjonas profile * [refactor(crkbd)] reducing file size by selecting RGB animations * [refactor(crkbd)] added shiftit key * [refactor(crkbd)] added shiftit key * [chore(crkbd)] adding SLEEP_LED_ENABLE on rules.mk * [refactor(crkbd)] added keylog & removed static rainbow RGB * [feat(crkbd)] introduced em-dash '—' keymap * [feat(crkbd)] added screenshot functionality * [refactor(lily58,pinky3)] moving media keys * [refactor(lily58)] Added emdash key * [chore] removing NUMBERS & FUNCTIONS layers as they're useless * [chore] removing NUMBERS & FUNCTIONS layers as they're useless * [chore(crkbd,lily48)] Updating README.md * [feat] added K_LAPP & K_RAPP to mimic command + tab * [feat] added K_LAPP & K_RAPP to mimic command + tab * [fix(#6797)] resolving changes requested by @drashna * [fix(#6797)] first cut on using QMK OLED Driver * [fix(#6797)] cleaning up rules.mk * [fix(#6797)] making scrolling logo work * [fix(#6797)] Using OLED Driver for Lily58 * [fix(#6797)] Moved OLED driver implementation to ninjonas userspace * [fix(#6797)] Bringing back crkbd & lily58 logos * [fix(#6797)] Turning off OLED based off @drashna's workaround in #5982 * [fix(#6797)] whoops! forgot to checkin crkbd/config.h * [fix(#6797)] fixing issue with OLED randomly turning on * [fix(#6797)] using default glcdfont.c for lily58 & crkbd * [fix(#6797)] Using LINK_TIME_OPTIMIZATION_ENABLE rather than EXTRAFLAGS as per code review * [fix(#6797)] updating M_MALL macro as per code review by @fauxpark --- keyboards/lily58/keymaps/ninjonas/README.md | 6 ++-- keyboards/lily58/keymaps/ninjonas/config.h | 6 ++-- keyboards/lily58/keymaps/ninjonas/keymap.c | 26 +++++++-------- .../lily58/keymaps/ninjonas/layer_state_reader.c | 37 ---------------------- keyboards/lily58/keymaps/ninjonas/rules.mk | 6 +--- 5 files changed, 21 insertions(+), 60 deletions(-) delete mode 100644 keyboards/lily58/keymaps/ninjonas/layer_state_reader.c (limited to 'keyboards/lily58') diff --git a/keyboards/lily58/keymaps/ninjonas/README.md b/keyboards/lily58/keymaps/ninjonas/README.md index 73f7f9d942..ef6322db4d 100644 --- a/keyboards/lily58/keymaps/ninjonas/README.md +++ b/keyboards/lily58/keymaps/ninjonas/README.md @@ -67,11 +67,11 @@ More information about the Lily58 pro keyboard can be found [here](https://yuchi * ,------------------------------------------. ,------------------------------------------. * | F11 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F12 | * |------+------+------+-------+------+------| |------+------+------+------+-------+------| - * | | | |KC_BRIU| Play | Mute | | PgUp | Home | Up | End | | | + * | | |KC_BRIU| Play | Mute | | | PgUp | Home | Up | End | |K_MDSH| * |------+------+------+-------+------+------| |------+------+------+------+-------+------| - * | | | |KC_BRID| Next |VolUp |-------. ,-------| PgDn | Left | Down |Right |K_LOCK | | + * | | |KC_BRID| Next |VolUp | |-------. ,-------| PgDn | Left | Down |Right |K_LOCK | | * |------+------+------+-------+------+------| | | |------+------+------+------+-------+------| - * | |M_SHFT| | | Prev |VolDn |-------| |-------| | | | |M_ZOOM |M_PYNV| + * |M_SHFT| | | Prev |VolDn | |-------| |-------| | | | |M_ZOOM |M_PYNV| * `------------------------------------------/ / \ \------------------------------------------' * | | | | / / \ \ | |M_CODE| | * | | | |/ / \ \ | | | | diff --git a/keyboards/lily58/keymaps/ninjonas/config.h b/keyboards/lily58/keymaps/ninjonas/config.h index 7a5587d560..19fb5cd92b 100644 --- a/keyboards/lily58/keymaps/ninjonas/config.h +++ b/keyboards/lily58/keymaps/ninjonas/config.h @@ -26,6 +26,8 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS -#define SSD1306OLED #define USE_SERIAL_PD2 -#define TAPPING_FORCE_HOLD \ No newline at end of file +#define TAPPING_FORCE_HOLD + +#define OLED_FONT_H "keyboards/lily58/lib/glcdfont.c" +#define OLED_DISABLE_TIMEOUT \ No newline at end of file diff --git a/keyboards/lily58/keymaps/ninjonas/keymap.c b/keyboards/lily58/keymaps/ninjonas/keymap.c index 81436aee3e..5ef607564e 100644 --- a/keyboards/lily58/keymaps/ninjonas/keymap.c +++ b/keyboards/lily58/keymaps/ninjonas/keymap.c @@ -88,11 +88,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,------------------------------------------. ,------------------------------------------. * | F11 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F12 | * |------+------+------+-------+------+------| |------+------+------+------+-------+------| - * | | | |KC_BRIU| Play | Mute | | PgUp | Home | Up | End | | | + * | | |KC_BRIU| Play | Mute | | | PgUp | Home | Up | End | |K_MDSH| * |------+------+------+-------+------+------| |------+------+------+------+-------+------| - * | | | |KC_BRID| Next |VolUp |-------. ,-------| PgDn | Left | Down |Right |K_LOCK | | + * | | |KC_BRID| Next |VolUp | |-------. ,-------| PgDn | Left | Down |Right |K_LOCK | | * |------+------+------+-------+------+------| | | |------+------+------+------+-------+------| - * |M_SHFT| | | | Prev |VolDn |-------| |-------| | | | |M_ZOOM |M_PYNV| + * |M_SHFT| | | Prev |VolDn | |-------| |-------| | | | |M_ZOOM |M_PYNV| * `------------------------------------------/ / \ \------------------------------------------' * | | | | / / \ \ | |M_CODE| | * | | | |/ / \ \ | | | | @@ -100,9 +100,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_LOWER] = LAYOUT_wrapper( \ _____________________FUNC_LEFT______________________, _____________________FUNC_RIGHT_____________________, \ - _______, _______, _______, _________MEDIA_1_________, _______________NAV_1______________, _______, _______, \ - _______, _______, _______, _________MEDIA_2_________, _______________NAV_2______________, K_LOCK, _______, \ - M_SHFT, _______, _______, _________MEDIA_3_________, _______, _______, _______, _______, _______, _______, M_ZOOM, M_PYNV, \ + _______, _______, _________MEDIA_1_________, _______, _______________NAV_1______________, _______, K_MDSH, \ + _______, _______, _________MEDIA_2_________, _______, _______________NAV_2______________, K_LOCK, _______, \ + M_SHFT, _______, _________MEDIA_3_________, _______, _______, _______, _______, _______, _______, _______, M_ZOOM, M_PYNV, \ __________________________________, _______, _______, M_CODE, _______ \ ), @@ -132,20 +132,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,------------------------------------------. ,-----------------------------------------. * |EEP_RST| | | | | | | | | |COLMAK|DVORAK|QWERTY| * |-------+------+------+------+------+------| |------+------+------+------+------+------| - * | M_MAKE| | | | | | | | | | | | | + * |M_MAKE | | | | | | | | | | | | | * |-------+------+------+------+------+------| |------+------+------+------+------+------| - * | M_VRSN| | | | | |-------. ,-------| | | | | | | + * |M_VRSN |M_MALL| | | | |-------. ,-------| | | | | | | * |-------+------+------+------+------+------| | | |------+------+------+------+------+------| - * | M_FLSH| | | | | |-------| |-------| | | | | | | + * |M_FLSH | | | | | |-------| |-------| | | | | | | * `------------------------------------------/ / \ \-----------------------------------------' - * | | | | / / \ \ | | | | - * | | | |/ / \ \ | | | | - * `----------------------------' '------''--------------------' + * | | | | / / \ \ | | | | + * | | | |/ / \ \ | | | | + * `----------------------------' '------''--------------------' */ [_ADJUST] = LAYOUT_wrapper( \ EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, COLEMAK, DVORAK, QWERTY, \ M_MAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - M_VRSN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + M_VRSN, M_MALL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ M_FLSH, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\ __________________________________, __________________________________ \ ), diff --git a/keyboards/lily58/keymaps/ninjonas/layer_state_reader.c b/keyboards/lily58/keymaps/ninjonas/layer_state_reader.c deleted file mode 100644 index 883eaca036..0000000000 --- a/keyboards/lily58/keymaps/ninjonas/layer_state_reader.c +++ /dev/null @@ -1,37 +0,0 @@ -#include QMK_KEYBOARD_H -#include -#include "lily58.h" -#include "ninjonas.h" - -char layer_state_str[24]; - -const char *read_layer_state(void) { - switch (biton32(layer_state)) - { - case _RAISE: - snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Raise"); - break; - case _LOWER: - snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Lower"); - break; - case _ADJUST: - snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Adjust"); - break; - default: - switch (biton32(default_layer_state)) { - case _COLEMAK: - snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Colemak"); - break; - case _DVORAK: - snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Dvorak"); - break; - case _QWERTY: - snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Qwerty"); - break; - default: - snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Undef-%ld", layer_state); - } - } - - return layer_state_str; -} \ No newline at end of file diff --git a/keyboards/lily58/keymaps/ninjonas/rules.mk b/keyboards/lily58/keymaps/ninjonas/rules.mk index 4ea023572f..c582662134 100644 --- a/keyboards/lily58/keymaps/ninjonas/rules.mk +++ b/keyboards/lily58/keymaps/ninjonas/rules.mk @@ -1,5 +1 @@ -# If you want to change the display of OLED, you need to change here -SRC += ./lib/glcdfont.c \ - layer_state_reader.c \ - ./lib/logo_reader.c \ - ./lib/keylogger.c \ +OLED_DRIVER_ENABLE = yes -- cgit v1.2.3 From cffe671a61e8187b39a508556c7a5b5f04835d24 Mon Sep 17 00:00:00 2001 From: Jonas Avellana <14019120+ninjonas@users.noreply.github.com> Date: Mon, 30 Sep 2019 11:50:27 -0600 Subject: [Keymap] Updating crkbd RGB keymap implementation & ninjonas userspace updates (#6834) * [keymap] Updating crkbd RGB implementation & ninjonas userspace updates * [chore] adding process_record_oled method to process_records.h --- keyboards/lily58/keymaps/ninjonas/README.md | 4 +--- keyboards/lily58/keymaps/ninjonas/keymap.c | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'keyboards/lily58') diff --git a/keyboards/lily58/keymaps/ninjonas/README.md b/keyboards/lily58/keymaps/ninjonas/README.md index ef6322db4d..8622528400 100644 --- a/keyboards/lily58/keymaps/ninjonas/README.md +++ b/keyboards/lily58/keymaps/ninjonas/README.md @@ -3,8 +3,6 @@ ## Keymap This keymap is designed based off my typing habits and is subject to change. Information about custom user macros and tap dances can be found [here](../../../../users/ninjonas). -> Make sure you update QMK's lily58 config.h TAPPING_TERM to 200ms or this won't compile - More information about the Lily58 pro keyboard can be found [here](https://yuchi-kbd.hatenablog.com/entry/2018/12/23/214342) ### QWERTY @@ -71,7 +69,7 @@ More information about the Lily58 pro keyboard can be found [here](https://yuchi * |------+------+------+-------+------+------| |------+------+------+------+-------+------| * | | |KC_BRID| Next |VolUp | |-------. ,-------| PgDn | Left | Down |Right |K_LOCK | | * |------+------+------+-------+------+------| | | |------+------+------+------+-------+------| - * |M_SHFT| | | Prev |VolDn | |-------| |-------| | | | |M_ZOOM |M_PYNV| + * |M_SHFT| | | Prev |VolDn | |-------| |-------| | | | | |M_PYNV| * `------------------------------------------/ / \ \------------------------------------------' * | | | | / / \ \ | |M_CODE| | * | | | |/ / \ \ | | | | diff --git a/keyboards/lily58/keymaps/ninjonas/keymap.c b/keyboards/lily58/keymaps/ninjonas/keymap.c index 5ef607564e..6c6a41b3b7 100644 --- a/keyboards/lily58/keymaps/ninjonas/keymap.c +++ b/keyboards/lily58/keymaps/ninjonas/keymap.c @@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+-------+------+------| |------+------+------+------+-------+------| * | | |KC_BRID| Next |VolUp | |-------. ,-------| PgDn | Left | Down |Right |K_LOCK | | * |------+------+------+-------+------+------| | | |------+------+------+------+-------+------| - * |M_SHFT| | | Prev |VolDn | |-------| |-------| | | | |M_ZOOM |M_PYNV| + * | |M_SHFT| | Prev |VolDn | |-------| |-------| | M | | | |M_PYNV| * `------------------------------------------/ / \ \------------------------------------------' * | | | | / / \ \ | |M_CODE| | * | | | |/ / \ \ | | | | @@ -100,9 +100,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_LOWER] = LAYOUT_wrapper( \ _____________________FUNC_LEFT______________________, _____________________FUNC_RIGHT_____________________, \ - _______, _______, _________MEDIA_1_________, _______, _______________NAV_1______________, _______, K_MDSH, \ - _______, _______, _________MEDIA_2_________, _______, _______________NAV_2______________, K_LOCK, _______, \ - M_SHFT, _______, _________MEDIA_3_________, _______, _______, _______, _______, _______, _______, _______, M_ZOOM, M_PYNV, \ + M_XXX2, M_XXX3, _________MEDIA_1_________, _______, _______________NAV_1______________, _______, K_MDSH, \ + M_XXX4, M_XXX5, _________MEDIA_2_________, _______, _______________NAV_2______________, K_LOCK, _______, \ + _______, M_SHFT, _________MEDIA_3_________, _______, _______, _______, _______, KC_M, _______, _______, M_XXX1, M_PYNV, \ __________________________________, _______, _______, M_CODE, _______ \ ), -- cgit v1.2.3 From c23581d985430c2571af958c4aca43499737fb72 Mon Sep 17 00:00:00 2001 From: Jonathan Rascher Date: Sat, 5 Oct 2019 14:40:08 -0500 Subject: [Keymap] Initial personal keymap for Lily58 (#6908) * Initial Lily58 keymap * Still not sure if these thumb key placements are optimal or not. I might want to move space (enter) one key to the left (right), respectively. * Also unsure how I feel about Esc on a mod tap key with Ctrl... might move it back to its own key and relocate the = key. * Missing bindings for Print Screen, Scroll Lock, Pause/Break. * Make Lily58 layout support operation without numrow * Move some Lily58 modifiers around * Move nav keys to more consistent locations * Rebinding shift on Raise is stupid * Don't stomp Ctrl on the Lower layer * Tweak bottom row a little bit --- keyboards/lily58/keymaps/bcat/config.h | 3 ++ keyboards/lily58/keymaps/bcat/keymap.c | 51 ++++++++++++++++++++++++++++++++++ keyboards/lily58/keymaps/bcat/rules.mk | 1 + 3 files changed, 55 insertions(+) create mode 100644 keyboards/lily58/keymaps/bcat/config.h create mode 100644 keyboards/lily58/keymaps/bcat/keymap.c create mode 100644 keyboards/lily58/keymaps/bcat/rules.mk (limited to 'keyboards/lily58') diff --git a/keyboards/lily58/keymaps/bcat/config.h b/keyboards/lily58/keymaps/bcat/config.h new file mode 100644 index 0000000000..1809262044 --- /dev/null +++ b/keyboards/lily58/keymaps/bcat/config.h @@ -0,0 +1,3 @@ +#pragma once + +#define EE_HANDS diff --git a/keyboards/lily58/keymaps/bcat/keymap.c b/keyboards/lily58/keymaps/bcat/keymap.c new file mode 100644 index 0000000000..562aad3fd0 --- /dev/null +++ b/keyboards/lily58/keymaps/bcat/keymap.c @@ -0,0 +1,51 @@ +#include QMK_KEYBOARD_H + +enum layer { + LAYER_DEFAULT, + LAYER_LOWER, + LAYER_RAISE, + LAYER_ADJUST, +}; + +#define LY_LWR MO(LAYER_LOWER) +#define LY_RSE MO(LAYER_RAISE) + +#define KY_CESC LCTL_T(KC_ESC) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [LAYER_DEFAULT] = LAYOUT( + KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KY_CESC, 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, KC_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LALT, LY_LWR, KC_SPC, KC_ENT, LY_RSE, KC_RGUI, KC_APP + ), + + [LAYER_LOWER] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, KC_F12, KC_INS, KC_DEL, _______, _______, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, _______, KC_LBRC, KC_RBRC, KC_GRV, KC_BSLS, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [LAYER_RAISE] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_PLUS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, + _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_HOME, KC_PGUP, + _______, _______, KC_CAPS, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, KC_LCBR, KC_RCBR, KC_TILD, KC_PIPE, KC_END, KC_PGDN, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [LAYER_ADJUST] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_MPLY, KC_VOLU, KC_MSTP, _______, _______, EEP_RST, RESET, _______, _______, _______, _______, + _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), +}; + +layer_state_t layer_state_set_user(layer_state_t state) { + return update_tri_layer_state(state, LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST); +} diff --git a/keyboards/lily58/keymaps/bcat/rules.mk b/keyboards/lily58/keymaps/bcat/rules.mk new file mode 100644 index 0000000000..c87b447c1e --- /dev/null +++ b/keyboards/lily58/keymaps/bcat/rules.mk @@ -0,0 +1 @@ +BOOTLOADER = atmel-dfu # Elite-C -- cgit v1.2.3 From 2881f53dd49d3fe70fefe9f05a618ac713c8529b Mon Sep 17 00:00:00 2001 From: Jonas Avellana <14019120+ninjonas@users.noreply.github.com> Date: Mon, 7 Oct 2019 11:42:03 -0600 Subject: [Keymap] updating ninjonas userspace (#6903) * [refactor] updating ninjonas layout blocks and standardized LOWER & ADJUST * [feat] added new macro M_TERM to open MacOS terminal app * [feat] introducing mod-tap functionality on keymap * [fix] fixing oled turning on when it feels like it. thanks @drashna for helping * [feat] updating OLED to rotate logo 180 degrees * [feat] updating keymaps to reflect VSCode frequent habits * [refactor] converting crkbd modifier keys to layer blocks * [fix(#6903)] converting _delay_ms to wait_ms on launching terminal macro --- keyboards/lily58/keymaps/ninjonas/keymap.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'keyboards/lily58') diff --git a/keyboards/lily58/keymaps/ninjonas/keymap.c b/keyboards/lily58/keymaps/ninjonas/keymap.c index 6c6a41b3b7..0ed197c141 100644 --- a/keyboards/lily58/keymaps/ninjonas/keymap.c +++ b/keyboards/lily58/keymaps/ninjonas/keymap.c @@ -100,9 +100,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_LOWER] = LAYOUT_wrapper( \ _____________________FUNC_LEFT______________________, _____________________FUNC_RIGHT_____________________, \ - M_XXX2, M_XXX3, _________MEDIA_1_________, _______, _______________NAV_1______________, _______, K_MDSH, \ - M_XXX4, M_XXX5, _________MEDIA_2_________, _______, _______________NAV_2______________, K_LOCK, _______, \ - _______, M_SHFT, _________MEDIA_3_________, _______, _______, _______, _______, KC_M, _______, _______, M_XXX1, M_PYNV, \ + _____________________LOWER_L1_______________________, _____________________LOWER_R1_______________________, \ + _____________________LOWER_L2_______________________, _____________________LOWER_R2_______________________, \ + _____________________LOWER_L3_______________________, _______, _______, _____________________LOWER_R3_______________________, \ __________________________________, _______, _______, M_CODE, _______ \ ), @@ -121,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `----------------------------' '------''--------------------' */ [_RAISE] = LAYOUT_wrapper( \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, K_CSCN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, _____________MOUSE_1______________, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, _____________MOUSE_2______________, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\ @@ -130,9 +130,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* ADJUST * ,------------------------------------------. ,-----------------------------------------. - * |EEP_RST| | | | | | | | | |COLMAK|DVORAK|QWERTY| + * | | | | | | | | | | | | | | * |-------+------+------+------+------+------| |------+------+------+------+------+------| - * |M_MAKE | | | | | | | | | | | | | + * |M_MAKE |EEPRST| | | | | | | | |COLMAK|DVORAK|QWERTY| * |-------+------+------+------+------+------| |------+------+------+------+------+------| * |M_VRSN |M_MALL| | | | |-------. ,-------| | | | | | | * |-------+------+------+------+------+------| | | |------+------+------+------+------+------| @@ -143,10 +143,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `----------------------------' '------''--------------------' */ [_ADJUST] = LAYOUT_wrapper( \ - EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, COLEMAK, DVORAK, QWERTY, \ - M_MAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - M_VRSN, M_MALL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - M_FLSH, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\ - __________________________________, __________________________________ \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + _____________________ADJUST_L1______________________, _____________________ADJUST_R1______________________, \ + _____________________ADJUST_L2______________________, _____________________ADJUST_R2______________________, \ + _____________________ADJUST_L3______________________, XXXXXXX, XXXXXXX, _____________________ADJUST_R3______________________,\ + __________________________________, __________________________________ \ ), }; \ No newline at end of file -- cgit v1.2.3 From 7662ee71f0d1df7cee03a563f52dba21854fd0be Mon Sep 17 00:00:00 2001 From: Jonathan Rascher Date: Wed, 16 Oct 2019 14:08:45 -0500 Subject: [Keymap] Various improvements to my Lily58 keymap (#7045) * Fix off-by-one error in Lily58 function keys * Swap number and symbol layers * Move grave/tilde to the left of brackets/braces * Add KLE links * Move function keys to Raise layer * Move symbols nearer to home row * Add readme for Lily58 layout --- keyboards/lily58/keymaps/bcat/keymap.c | 18 ++++++---- keyboards/lily58/keymaps/bcat/readme.md | 59 +++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 7 deletions(-) create mode 100644 keyboards/lily58/keymaps/bcat/readme.md (limited to 'keyboards/lily58') diff --git a/keyboards/lily58/keymaps/bcat/keymap.c b/keyboards/lily58/keymaps/bcat/keymap.c index 562aad3fd0..110ba0d4ba 100644 --- a/keyboards/lily58/keymaps/bcat/keymap.c +++ b/keyboards/lily58/keymaps/bcat/keymap.c @@ -13,30 +13,34 @@ enum layer { #define KY_CESC LCTL_T(KC_ESC) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Default layer: http://www.keyboard-layout-editor.com/#/gists/e0eb3af65961e9fd612dcff3ddd88e4f */ [LAYER_DEFAULT] = LAYOUT( - KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KY_CESC, 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, KC_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LCTL, KC_LALT, LY_LWR, KC_SPC, KC_ENT, LY_RSE, KC_RGUI, KC_APP ), + /* Lower layer: http://www.keyboard-layout-editor.com/#/gists/19ad0d3b5d745fbb2818db09740f5a11 */ [LAYER_LOWER] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, KC_F12, KC_INS, KC_DEL, _______, _______, - _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, _______, KC_LBRC, KC_RBRC, KC_GRV, KC_BSLS, _______, _______, + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, + _______, _______, _______, _______, _______, _______, KC_PIPE, KC_LCBR, KC_RCBR, KC_UNDS, KC_PLUS, _______, + _______, _______, KC_CAPS, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, KC_BSLS, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), + /* Raise layer: http://www.keyboard-layout-editor.com/#/gists/912be7955f781cdaf692cc4d4c0b5823 */ [LAYER_RAISE] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - KC_PLUS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, - _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_HOME, KC_PGUP, - _______, _______, KC_CAPS, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, KC_LCBR, KC_RCBR, KC_TILD, KC_PIPE, KC_END, KC_PGDN, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_HOME, KC_PGUP, + _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, KC_F11, KC_F12, KC_INS, KC_DEL, KC_END, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______ ), + /* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/8f6a3f08350a9bbe1d414b22bca4e6c7 */ [LAYER_ADJUST] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLU, KC_MSTP, _______, _______, EEP_RST, RESET, _______, _______, _______, _______, diff --git a/keyboards/lily58/keymaps/bcat/readme.md b/keyboards/lily58/keymaps/bcat/readme.md new file mode 100644 index 0000000000..4b269706a7 --- /dev/null +++ b/keyboards/lily58/keymaps/bcat/readme.md @@ -0,0 +1,59 @@ +# bcat's Lily58 layout + +This split ergo layout is standard QWERTY on the default layer, with symbols on +the lower layer, numbers/navigation on the raise layer, and media keys centered +around the WASD cluster in the adjust (raise + lower) layer. A few general +principles went into this layout: + +* The number row is optional, as are the outermost bottom row keys and the +"extra" keys on the innnermost columns below the controllers. This will enable +easy translation to a Crkbd or similar 40% ortho if I go that route. + +* Space and Enter are on the big thumb keys so they're easy to press +(particularly with G20 or other low-profile keycaps there). + +* There are two shift keys because really, Right Shift is important. + +* Arrow keys are on VIM-style HJKL keys. + +* Home/End and Page Up/Page Down are easy to reach and in a square kind of like +on the HHKB. + +* Escape is easy to reach because Vim. + +* Since most of the modifiers are on the left half, keys frequently pressed +together with mods (e.g., numbers, function keys, etc.) are on the Raise layer +activated by the right thumb. + +* Every key on a TKL has a binding. + +* Backspace is bound in the same place on every layer to avoid having to let go +of layer-shift keys to fix a mistake. + +* Brackets and braces are on or near the home row for quick access when coding. + +* Other than Right Shift (sorry), modifiers aren't rebound on layers. + +## Default layer + +![Default layer layout](https://i.imgur.com/NjIp4Qr.png) + +([KLE](http://www.keyboard-layout-editor.com/#/gists/e0eb3af65961e9fd612dcff3ddd88e4f)) + +## Lower layer + +![Lower layer layout](https://i.imgur.com/FyioHWW.png) + +([KLE](http://www.keyboard-layout-editor.com/#/gists/19ad0d3b5d745fbb2818db09740f5a11)) + +## Raise layer + +![Raise layer layout](https://i.imgur.com/8Mrz4FF.png) + +([KLE](http://www.keyboard-layout-editor.com/#/gists/912be7955f781cdaf692cc4d4c0b5823)) + +## Adjust layer + +![Adjust layer layout](https://i.imgur.com/FRKNqZp.png) + +([KLE](http://www.keyboard-layout-editor.com/#/gists/8f6a3f08350a9bbe1d414b22bca4e6c7)) -- cgit v1.2.3 From a41066beedebefc12245c3eee4bb90116c11f7cd Mon Sep 17 00:00:00 2001 From: Jonathan Rascher Date: Sun, 20 Oct 2019 13:41:36 -0500 Subject: [Keymap] Assorted personal keymap and layout updates (#7082) * Enable PERMISSIVE_HOLD and TAPPING_FORCE_HOLD * Fix indentation in userspace * Shuffle around more Lily58 symbol keys * Reformat KBD67 keymap and KLE images * Fix Lily58 lower layer image * Reformat Quefrency keymap and KLE images * Fix KBD67 KLE images... again * Add KLE links for Quefrency * Reformat 60% layouts and KLE images * Move Super key back to right half of Lily58 * Move Lily58 ins/del out of the way of numbers * Fix bottom row of Lily58 KLE image --- keyboards/lily58/keymaps/bcat/keymap.c | 14 +++++++------- keyboards/lily58/keymaps/bcat/readme.md | 17 +++++++++++++---- 2 files changed, 20 insertions(+), 11 deletions(-) (limited to 'keyboards/lily58') diff --git a/keyboards/lily58/keymaps/bcat/keymap.c b/keyboards/lily58/keymaps/bcat/keymap.c index 110ba0d4ba..67aa3a4143 100644 --- a/keyboards/lily58/keymaps/bcat/keymap.c +++ b/keyboards/lily58/keymaps/bcat/keymap.c @@ -15,7 +15,7 @@ enum layer { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Default layer: http://www.keyboard-layout-editor.com/#/gists/e0eb3af65961e9fd612dcff3ddd88e4f */ [LAYER_DEFAULT] = LAYOUT( - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KY_CESC, 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, KC_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, @@ -25,25 +25,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Lower layer: http://www.keyboard-layout-editor.com/#/gists/19ad0d3b5d745fbb2818db09740f5a11 */ [LAYER_LOWER] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, - _______, _______, _______, _______, _______, _______, KC_PIPE, KC_LCBR, KC_RCBR, KC_UNDS, KC_PLUS, _______, - _______, _______, KC_CAPS, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, KC_BSLS, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, _______, + _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, + _______, _______, _______, _______, KC_DEL, _______, KC_TILD, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, + _______, _______, _______, _______, KC_INS, _______, _______, _______, KC_GRV, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, _______, _______, _______, _______, _______, _______ ), /* Raise layer: http://www.keyboard-layout-editor.com/#/gists/912be7955f781cdaf692cc4d4c0b5823 */ [LAYER_RAISE] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, + _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_HOME, KC_PGUP, - _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, KC_F11, KC_F12, KC_INS, KC_DEL, KC_END, KC_PGDN, + _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, KC_F11, KC_F12, _______, _______, KC_END, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______ ), /* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/8f6a3f08350a9bbe1d414b22bca4e6c7 */ [LAYER_ADJUST] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, KC_MPLY, KC_VOLU, KC_MSTP, _______, _______, EEP_RST, RESET, _______, _______, _______, _______, + KC_CAPS, KC_MPLY, KC_VOLU, KC_MSTP, _______, _______, EEP_RST, RESET, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/lily58/keymaps/bcat/readme.md b/keyboards/lily58/keymaps/bcat/readme.md index 4b269706a7..ac475c6760 100644 --- a/keyboards/lily58/keymaps/bcat/readme.md +++ b/keyboards/lily58/keymaps/bcat/readme.md @@ -19,6 +19,11 @@ easy translation to a Crkbd or similar 40% ortho if I go that route. * Home/End and Page Up/Page Down are easy to reach and in a square kind of like on the HHKB. +* Navigation should be usable with just the right hand, to enable left-handed +mousing at the same time. Additionally, Web page scrolling (Space, Shift+Space) +should be possible with just the left hand, for writing at the same time as +scrolling. + * Escape is easy to reach because Vim. * Since most of the modifiers are on the left half, keys frequently pressed @@ -30,30 +35,34 @@ activated by the right thumb. * Backspace is bound in the same place on every layer to avoid having to let go of layer-shift keys to fix a mistake. +* Likewise, the comma and period keys are not rebound on the raise layer to +allow typing numbers with thousand separators and decimal points without +releasing the layer key. + * Brackets and braces are on or near the home row for quick access when coding. * Other than Right Shift (sorry), modifiers aren't rebound on layers. ## Default layer -![Default layer layout](https://i.imgur.com/NjIp4Qr.png) +![Default layer layout](https://i.imgur.com/KlzNei7.png) ([KLE](http://www.keyboard-layout-editor.com/#/gists/e0eb3af65961e9fd612dcff3ddd88e4f)) ## Lower layer -![Lower layer layout](https://i.imgur.com/FyioHWW.png) +![Lower layer layout](https://i.imgur.com/zjYwqtv.png) ([KLE](http://www.keyboard-layout-editor.com/#/gists/19ad0d3b5d745fbb2818db09740f5a11)) ## Raise layer -![Raise layer layout](https://i.imgur.com/8Mrz4FF.png) +![Raise layer layout](https://i.imgur.com/S7S29G6.png) ([KLE](http://www.keyboard-layout-editor.com/#/gists/912be7955f781cdaf692cc4d4c0b5823)) ## Adjust layer -![Adjust layer layout](https://i.imgur.com/FRKNqZp.png) +![Adjust layer layout](https://i.imgur.com/tU72bSZ.png) ([KLE](http://www.keyboard-layout-editor.com/#/gists/8f6a3f08350a9bbe1d414b22bca4e6c7)) -- cgit v1.2.3 From e96cac0814995e2a0735708727cbab599d6cf5f1 Mon Sep 17 00:00:00 2001 From: fauxpark Date: Fri, 25 Oct 2019 07:50:13 +1100 Subject: Cleanup rules.mk for 32U4 keyboards, L-M (#7120) * Cleanup rules.mk for 32U4 keyboards, L-M * Move some stuff to keyboard level --- keyboards/lily58/rev1/rules.mk | 2 +- keyboards/lily58/rules.mk | 52 ++++++++---------------------------------- 2 files changed, 10 insertions(+), 44 deletions(-) (limited to 'keyboards/lily58') diff --git a/keyboards/lily58/rev1/rules.mk b/keyboards/lily58/rev1/rules.mk index 7fc101bf2b..6028b5a5b9 100644 --- a/keyboards/lily58/rev1/rules.mk +++ b/keyboards/lily58/rev1/rules.mk @@ -1,3 +1,3 @@ SRC += rev1/matrix.c SRC += rev1/split_util.c -SRC += rev1/split_scomm.c \ No newline at end of file +SRC += rev1/split_scomm.c diff --git a/keyboards/lily58/rules.mk b/keyboards/lily58/rules.mk index d13c88ba69..af25531ecd 100644 --- a/keyboards/lily58/rules.mk +++ b/keyboards/lily58/rules.mk @@ -1,57 +1,16 @@ -SRC += i2c.c -SRC += serial.c -SRC += ssd1306.c - -# if firmware size over limit, try this option -# CFLAGS += -flto - # MCU name MCU = atmega32u4 -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. -F_CPU = 16000000 - -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -# This will define a symbol, F_USB, in all source code files equal to the -# input clock frequency (before any prescaling is performed) in Hz. This value may -# differ from F_CPU if prescaling is used on the latter, and is required as the -# raw input clock is fed directly to the PLL sections of the AVR for high speed -# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' -# at the end, this will be done automatically to create a 32-bit value in your -# source code. -# -# If no clock division is performed on the input clock inside the AVR (via the -# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -F_USB = $(F_CPU) - # Bootloader selection # Teensy halfkay # Pro Micro caterina # Atmel DFU atmel-dfu # LUFA DFU lufa-dfu # QMK DFU qmk-dfu -# atmega32a bootloadHID +# ATmega32A bootloadHID +# ATmega328P USBasp BOOTLOADER = caterina -# Interrupt driven control endpoint task(+60) -OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT - # 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 @@ -73,4 +32,11 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend CUSTOM_MATRIX = yes +SRC += i2c.c +SRC += serial.c +SRC += ssd1306.c + +# if firmware size over limit, try this option +# CFLAGS += -flto + DEFAULT_FOLDER = lily58/rev1 -- cgit v1.2.3 From 92be2439ec280c46c4babb60087a93b96b6e94ab Mon Sep 17 00:00:00 2001 From: Jonathan Rascher Date: Sun, 27 Oct 2019 21:53:49 -0500 Subject: Couple more minor Lily58 keymap tweaks (#7175) * Move grave/tilde and backslash/pipe to left hand * Shift media keys to be aligned with home row * Update KLE images * Mention new media key location in readme * Turn off a couple more features for explicitness --- keyboards/lily58/keymaps/bcat/keymap.c | 10 +++++----- keyboards/lily58/keymaps/bcat/readme.md | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'keyboards/lily58') diff --git a/keyboards/lily58/keymaps/bcat/keymap.c b/keyboards/lily58/keymaps/bcat/keymap.c index 67aa3a4143..905e4ed76a 100644 --- a/keyboards/lily58/keymaps/bcat/keymap.c +++ b/keyboards/lily58/keymaps/bcat/keymap.c @@ -26,8 +26,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [LAYER_LOWER] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, - _______, _______, _______, _______, KC_DEL, _______, KC_TILD, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, - _______, _______, _______, _______, KC_INS, _______, _______, _______, KC_GRV, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + _______, _______, _______, KC_PIPE, KC_TILD, KC_DEL, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______, + _______, _______, _______, KC_BSLS, KC_GRV, KC_INS, _______, _______, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), @@ -43,9 +43,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/8f6a3f08350a9bbe1d414b22bca4e6c7 */ [LAYER_ADJUST] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - KC_CAPS, KC_MPLY, KC_VOLU, KC_MSTP, _______, _______, EEP_RST, RESET, KC_PSCR, KC_SLCK, KC_PAUS, _______, - _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_CAPS, _______, KC_MPLY, KC_VOLU, KC_MSTP, _______, EEP_RST, RESET, KC_PSCR, KC_SLCK, KC_PAUS, _______, + _______, _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/lily58/keymaps/bcat/readme.md b/keyboards/lily58/keymaps/bcat/readme.md index ac475c6760..5e0d6153a4 100644 --- a/keyboards/lily58/keymaps/bcat/readme.md +++ b/keyboards/lily58/keymaps/bcat/readme.md @@ -2,7 +2,7 @@ This split ergo layout is standard QWERTY on the default layer, with symbols on the lower layer, numbers/navigation on the raise layer, and media keys centered -around the WASD cluster in the adjust (raise + lower) layer. A few general +around the ESDF cluster in the adjust (raise + lower) layer. A few general principles went into this layout: * The number row is optional, as are the outermost bottom row keys and the @@ -51,7 +51,7 @@ releasing the layer key. ## Lower layer -![Lower layer layout](https://i.imgur.com/zjYwqtv.png) +![Lower layer layout](https://i.imgur.com/ytNFySG.png) ([KLE](http://www.keyboard-layout-editor.com/#/gists/19ad0d3b5d745fbb2818db09740f5a11)) @@ -63,6 +63,6 @@ releasing the layer key. ## Adjust layer -![Adjust layer layout](https://i.imgur.com/tU72bSZ.png) +![Adjust layer layout](https://i.imgur.com/fCIySG2.png) ([KLE](http://www.keyboard-layout-editor.com/#/gists/8f6a3f08350a9bbe1d414b22bca4e6c7)) -- cgit v1.2.3 From afc5cb7f0abafd75c178b188a5fc1b9138fba956 Mon Sep 17 00:00:00 2001 From: Jonathan Rascher Date: Mon, 28 Oct 2019 20:08:48 -0500 Subject: Fix Lily58 build with link-time optimization (#7181) --- keyboards/lily58/config.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'keyboards/lily58') diff --git a/keyboards/lily58/config.h b/keyboards/lily58/config.h index fb1cdf3962..50bf2beb32 100644 --- a/keyboards/lily58/config.h +++ b/keyboards/lily58/config.h @@ -24,5 +24,9 @@ along with this program. If not, see . #define USE_I2C #define USE_SERIAL -#define NO_ACTION_MACRO -#define NO_ACTION_FUNCTION +#if !defined(NO_ACTION_MACRO) + #define NO_ACTION_MACRO +#endif +#if !defined(NO_ACTION_FUNCTION) + #define NO_ACTION_FUNCTION +#endif -- cgit v1.2.3 From 1f6cb53fb34867827c487e523f7134bab1acab04 Mon Sep 17 00:00:00 2001 From: Jonathan Rascher Date: Fri, 1 Nov 2019 20:48:58 -0500 Subject: [Keymap] Moar personal keymap and userspace tweaks (#7238) * Enable link-time optimization * Make RGB static gradient ranges shorter * Shift Quefrency media keys to the right * Shift KBD67 media keys to the right * Move some 60% keys from function to adjust layer * Set "extra" Lily58 keys to browser back/forward * Remove Instant60 EEPROM hack after #6968 * Remove unnecessary bits from macropad keymaps * Update KLE images --- keyboards/lily58/keymaps/bcat/keymap.c | 2 +- keyboards/lily58/keymaps/bcat/readme.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/lily58') diff --git a/keyboards/lily58/keymaps/bcat/keymap.c b/keyboards/lily58/keymaps/bcat/keymap.c index 905e4ed76a..9a85a55e1b 100644 --- a/keyboards/lily58/keymaps/bcat/keymap.c +++ b/keyboards/lily58/keymaps/bcat/keymap.c @@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KY_CESC, 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, KC_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_WBAK, KC_WFWD, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LCTL, KC_LALT, LY_LWR, KC_SPC, KC_ENT, LY_RSE, KC_RGUI, KC_APP ), diff --git a/keyboards/lily58/keymaps/bcat/readme.md b/keyboards/lily58/keymaps/bcat/readme.md index 5e0d6153a4..f90c5110bc 100644 --- a/keyboards/lily58/keymaps/bcat/readme.md +++ b/keyboards/lily58/keymaps/bcat/readme.md @@ -45,7 +45,7 @@ releasing the layer key. ## Default layer -![Default layer layout](https://i.imgur.com/KlzNei7.png) +![Default layer layout](https://i.imgur.com/wx1brJV.png) ([KLE](http://www.keyboard-layout-editor.com/#/gists/e0eb3af65961e9fd612dcff3ddd88e4f)) -- cgit v1.2.3 From 363cdb5fc00519a4eb45a4401b93451949c59d6a Mon Sep 17 00:00:00 2001 From: fauxpark Date: Mon, 4 Nov 2019 09:35:43 +1100 Subject: Remove duplicate pro_micro.h (#7246) --- keyboards/lily58/serial.c | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/lily58') diff --git a/keyboards/lily58/serial.c b/keyboards/lily58/serial.c index 325c29a3f7..f6293c3dc2 100755 --- a/keyboards/lily58/serial.c +++ b/keyboards/lily58/serial.c @@ -17,7 +17,6 @@ #include #include #include "serial.h" -//#include #ifdef SOFT_SERIAL_PIN -- cgit v1.2.3 From e6b9980bd45c186f7360df68c24b6e05a80c10dc Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Wed, 20 Nov 2019 14:31:36 -0800 Subject: Remove keymap_config extern from default keymaps (#7399) * Remove keymap_config extern from default keymaps * Revert unicode Apparently VSCode does not like unicode, I didn't actually edit these lines, so it must have been automatic... :( Co-Authored-By: fauxpark --- keyboards/lily58/keymaps/default/keymap.c | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/lily58') diff --git a/keyboards/lily58/keymaps/default/keymap.c b/keyboards/lily58/keymaps/default/keymap.c index b8dda17d53..f36248e12d 100644 --- a/keyboards/lily58/keymaps/default/keymap.c +++ b/keyboards/lily58/keymaps/default/keymap.c @@ -9,7 +9,6 @@ #endif -extern keymap_config_t keymap_config; #ifdef RGBLIGHT_ENABLE //Following line allows macro to read current RGB settings -- cgit v1.2.3