From 6ceb87a1d071147f0cd86a86fbade8e27c7a2b27 Mon Sep 17 00:00:00 2001 From: vin Date: Mon, 15 Jan 2024 20:23:48 -0500 Subject: [PATCH] merge workman keymap into default, and add toggleable 4th layer --- keyboards/crkbd/keymaps/default/keymap.c | 57 +++-- keyboards/crkbd/keymaps/workman/config.h | 17 -- keyboards/crkbd/keymaps/workman/glcdfont.c | 234 ------------------ keyboards/crkbd/keymaps/workman/keycodes.h | 16 -- keyboards/crkbd/keymaps/workman/keymap.c | 66 ----- keyboards/crkbd/keymaps/workman/layers.h | 10 - keyboards/crkbd/keymaps/workman/oled.c | 128 ---------- keyboards/crkbd/keymaps/workman/oled.h | 13 - .../crkbd/keymaps/workman/process_records.c | 21 -- .../crkbd/keymaps/workman/process_records.h | 5 - keyboards/crkbd/keymaps/workman/rules.mk | 11 - 11 files changed, 43 insertions(+), 535 deletions(-) delete mode 100644 keyboards/crkbd/keymaps/workman/config.h delete mode 100644 keyboards/crkbd/keymaps/workman/glcdfont.c delete mode 100644 keyboards/crkbd/keymaps/workman/keycodes.h delete mode 100644 keyboards/crkbd/keymaps/workman/keymap.c delete mode 100644 keyboards/crkbd/keymaps/workman/layers.h delete mode 100644 keyboards/crkbd/keymaps/workman/oled.c delete mode 100644 keyboards/crkbd/keymaps/workman/oled.h delete mode 100644 keyboards/crkbd/keymaps/workman/process_records.c delete mode 100644 keyboards/crkbd/keymaps/workman/process_records.h delete mode 100644 keyboards/crkbd/keymaps/workman/rules.mk diff --git a/keyboards/crkbd/keymaps/default/keymap.c b/keyboards/crkbd/keymaps/default/keymap.c index 84d7b33f49..bdfd4caf13 100644 --- a/keyboards/crkbd/keymaps/default/keymap.c +++ b/keyboards/crkbd/keymaps/default/keymap.c @@ -1,6 +1,8 @@ /* Copyright 2019 @foostan Copyright 2020 Drashna Jaelre <@drashna> +Copyright 2023 Álvaro "Gondolindrim" Volpato +Copyright 2024 Shokara Kou 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 @@ -18,53 +20,80 @@ along with this program. If not, see . #include QMK_KEYBOARD_H +/* OLED settings */ +#define SPLIT_LAYER_STATE_ENABLE +#define SPLIT_LED_STATE_ENABLE +#define SPLIT_MODS_ENABLE +#define SPLIT_OLED_ENABLE +#define OLED_TIMEOUT 60000 + +/* Tap-Hold keycodes */ +#define KC_LOWER LT(1, KC_ENT) /* Tap for Enter, Hold for LOWER layer */ +#define KC_RAISE LT(2, KC_SPC) /* Tap for Space, Hold for RAISE layer */ + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( //,-----------------------------------------------------. ,-----------------------------------------------------. - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_TAB, KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_SCLN, 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_BSPC, KC_A, KC_S, KC_H, KC_T, KC_G, KC_Y, KC_N, KC_E, KC_O, KC_I, KC_QUOT, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ESC, + KC_ESC, KC_Z, KC_X, KC_M, KC_C, KC_V, KC_K, KC_L, KC_COMM, KC_DOT, KC_SLSH, KC_ESC, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_LGUI, MO(1), KC_SPC, KC_ENT, MO(2), KC_RALT + KC_LALT, KC_LCTL,KC_RAISE, KC_LOWER, KC_LSFT, KC_LGUI //`--------------------------' `--------------------------' ), [1] = LAYOUT( //,-----------------------------------------------------. ,-----------------------------------------------------. - KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + _______, XXXXXXX, KC_7, KC_8, KC_9, KC_HOME, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,KC_RIGHT, XXXXXXX, XXXXXXX, + _______, XXXXXXX, KC_4, KC_5, KC_6, KC_END, KC_PGDN, KC_LEFT, KC_DOWN, KC_UP,KC_RIGHT, XXXXXXX, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + _______, KC_0, KC_1, KC_2, KC_3, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_LGUI, _______, KC_SPC, KC_ENT, MO(3), KC_RALT + _______, _______, _______, _______, _______, _______ //`--------------------------' `--------------------------' ), [2] = LAYOUT( //,-----------------------------------------------------. ,-----------------------------------------------------. - KC_TAB, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, + _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_F11, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_GRV, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_F12, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD, + _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TILD, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_LGUI, MO(3), KC_SPC, KC_ENT, _______, KC_RALT + _______, _______, _______, _______, _______, _______ //`--------------------------' `--------------------------' ), [3] = LAYOUT( //,-----------------------------------------------------. ,-----------------------------------------------------. - QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TO(4), 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, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_LGUI, _______, KC_SPC, KC_ENT, _______, KC_RALT + XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX + //`--------------------------' `--------------------------' + ), + + [4] = LAYOUT( + //,-----------------------------------------------------. ,-----------------------------------------------------. + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TO(0), 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, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX //`--------------------------' `--------------------------' ) }; + +layer_state_t layer_state_set_user(layer_state_t state) { + return update_tri_layer_state(state, 1, 2, 3); +} diff --git a/keyboards/crkbd/keymaps/workman/config.h b/keyboards/crkbd/keymaps/workman/config.h deleted file mode 100644 index 7a28bb5012..0000000000 --- a/keyboards/crkbd/keymaps/workman/config.h +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2022 Álvaro Cortés (@ACortesDev) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#define SPLIT_USB_DETECT // Added for Elite-C to work - -//#define QUICK_TAP_TERM 0 -//#define TAPPING_TERM 100 - -#ifdef OLED_ENABLE - #define SPLIT_LAYER_STATE_ENABLE - #define SPLIT_LED_STATE_ENABLE - #define SPLIT_MODS_ENABLE - #define SPLIT_OLED_ENABLE - #define OLED_TIMEOUT 60000 - #define OLED_FONT_H "keyboards/crkbd/keymaps/workman/glcdfont.c" -#endif diff --git a/keyboards/crkbd/keymaps/workman/glcdfont.c b/keyboards/crkbd/keymaps/workman/glcdfont.c deleted file mode 100644 index 3bf950e162..0000000000 --- a/keyboards/crkbd/keymaps/workman/glcdfont.c +++ /dev/null @@ -1,234 +0,0 @@ -// Copyright 2022 Álvaro Cortés (@ACortesDev) -// SPDX-License-Identifier: GPL-2.0-or-later -#include "progmem.h" - -// Corne 8x6 font with QMK Firmware Logo -// Online editor: https://helixfonteditor.netlify.com/ -// See also: https://github.com/soundmonster/glcdfont_converter - -const unsigned char font[] PROGMEM = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00, - 0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00, - 0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00, - 0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00, - 0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00, - 0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00, - 0x00, 0x18, 0x3C, 0x18, 0x00, 0x00, - 0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00, - 0x00, 0x18, 0x24, 0x18, 0x00, 0x00, - 0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00, - 0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00, - 0x26, 0x29, 0x79, 0x29, 0x26, 0x00, - 0x40, 0x7F, 0x05, 0x05, 0x07, 0x00, - 0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00, - 0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00, - 0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00, - 0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00, - 0x14, 0x22, 0x7F, 0x22, 0x14, 0x00, - 0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00, - 0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00, - 0x00, 0x66, 0x89, 0x95, 0x6A, 0x00, - 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, - 0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00, - 0x08, 0x04, 0x7E, 0x04, 0x08, 0x00, - 0x10, 0x20, 0x7E, 0x20, 0x10, 0x00, - 0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00, - 0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00, - 0x1E, 0x10, 0x10, 0x10, 0x10, 0x00, - 0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00, - 0x30, 0x38, 0x3E, 0x38, 0x30, 0x00, - 0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, - 0x00, 0x07, 0x00, 0x07, 0x00, 0x00, - 0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00, - 0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00, - 0x23, 0x13, 0x08, 0x64, 0x62, 0x00, - 0x36, 0x49, 0x56, 0x20, 0x50, 0x00, - 0x00, 0x08, 0x07, 0x03, 0x00, 0x00, - 0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, - 0x00, 0x41, 0x22, 0x1C, 0x00, 0x00, - 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00, - 0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, - 0x00, 0x80, 0x70, 0x30, 0x00, 0x00, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, - 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, - 0x20, 0x10, 0x08, 0x04, 0x02, 0x00, - 0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00, - 0x00, 0x42, 0x7F, 0x40, 0x00, 0x00, - 0x72, 0x49, 0x49, 0x49, 0x46, 0x00, - 0x21, 0x41, 0x49, 0x4D, 0x33, 0x00, - 0x18, 0x14, 0x12, 0x7F, 0x10, 0x00, - 0x27, 0x45, 0x45, 0x45, 0x39, 0x00, - 0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00, - 0x41, 0x21, 0x11, 0x09, 0x07, 0x00, - 0x36, 0x49, 0x49, 0x49, 0x36, 0x00, - 0x46, 0x49, 0x49, 0x29, 0x1E, 0x00, - 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, - 0x00, 0x40, 0x34, 0x00, 0x00, 0x00, - 0x00, 0x08, 0x14, 0x22, 0x41, 0x00, - 0x14, 0x14, 0x14, 0x14, 0x14, 0x00, - 0x00, 0x41, 0x22, 0x14, 0x08, 0x00, - 0x02, 0x01, 0x59, 0x09, 0x06, 0x00, - 0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00, - 0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00, - 0x7F, 0x49, 0x49, 0x49, 0x36, 0x00, - 0x3E, 0x41, 0x41, 0x41, 0x22, 0x00, - 0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00, - 0x7F, 0x49, 0x49, 0x49, 0x41, 0x00, - 0x7F, 0x09, 0x09, 0x09, 0x01, 0x00, - 0x3E, 0x41, 0x41, 0x51, 0x73, 0x00, - 0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, - 0x00, 0x41, 0x7F, 0x41, 0x00, 0x00, - 0x20, 0x40, 0x41, 0x3F, 0x01, 0x00, - 0x7F, 0x08, 0x14, 0x22, 0x41, 0x00, - 0x7F, 0x40, 0x40, 0x40, 0x40, 0x00, - 0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00, - 0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00, - 0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00, - 0x7F, 0x09, 0x09, 0x09, 0x06, 0x00, - 0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00, - 0x7F, 0x09, 0x19, 0x29, 0x46, 0x00, - 0x26, 0x49, 0x49, 0x49, 0x32, 0x00, - 0x03, 0x01, 0x7F, 0x01, 0x03, 0x00, - 0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00, - 0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00, - 0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00, - 0x63, 0x14, 0x08, 0x14, 0x63, 0x00, - 0x03, 0x04, 0x78, 0x04, 0x03, 0x00, - 0x61, 0x59, 0x49, 0x4D, 0x43, 0x00, - 0x00, 0x7F, 0x41, 0x41, 0x41, 0x00, - 0x02, 0x04, 0x08, 0x10, 0x20, 0x00, - 0x00, 0x41, 0x41, 0x41, 0x7F, 0x00, - 0x04, 0x02, 0x01, 0x02, 0x04, 0x00, - 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, - 0x00, 0x03, 0x07, 0x08, 0x00, 0x00, - 0x20, 0x54, 0x54, 0x78, 0x40, 0x00, - 0x7F, 0x28, 0x44, 0x44, 0x38, 0x00, - 0x38, 0x44, 0x44, 0x44, 0x28, 0x00, - 0x38, 0x44, 0x44, 0x28, 0x7F, 0x00, - 0x38, 0x54, 0x54, 0x54, 0x18, 0x00, - 0x00, 0x08, 0x7E, 0x09, 0x02, 0x00, - 0x18, 0x24, 0x24, 0x1C, 0x78, 0x00, - 0x7F, 0x08, 0x04, 0x04, 0x78, 0x00, - 0x00, 0x44, 0x7D, 0x40, 0x00, 0x00, - 0x20, 0x40, 0x40, 0x3D, 0x00, 0x00, - 0x7F, 0x10, 0x28, 0x44, 0x00, 0x00, - 0x00, 0x41, 0x7F, 0x40, 0x00, 0x00, - 0x7C, 0x04, 0x78, 0x04, 0x78, 0x00, - 0x7C, 0x08, 0x04, 0x04, 0x78, 0x00, - 0x38, 0x44, 0x44, 0x44, 0x38, 0x00, - 0x7C, 0x18, 0x24, 0x24, 0x18, 0x00, - 0x18, 0x24, 0x24, 0x18, 0x7C, 0x00, - 0x7C, 0x08, 0x04, 0x04, 0x08, 0x00, - 0x48, 0x54, 0x54, 0x54, 0x24, 0x00, - 0x04, 0x04, 0x3F, 0x44, 0x24, 0x00, - 0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00, - 0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00, - 0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00, - 0x44, 0x28, 0x10, 0x28, 0x44, 0x00, - 0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00, - 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00, - 0x00, 0x08, 0x36, 0x41, 0x00, 0x00, - 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, - 0x00, 0x41, 0x36, 0x08, 0x00, 0x00, - 0x02, 0x01, 0x02, 0x04, 0x02, 0x00, - 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, - 0xF8, 0x18, 0x00, 0xC0, 0xF0, 0xFC, - 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0x7E, 0x00, 0x00, 0x00, - 0xF8, 0xFC, 0x06, 0x03, 0x83, 0x43, - 0x23, 0x13, 0x23, 0x43, 0x83, 0x03, - 0x06, 0xFC, 0x00, 0x00, 0x00, 0x00, - 0xF8, 0xFC, 0x06, 0x03, 0xE3, 0x23, - 0x23, 0x03, 0x23, 0xE3, 0x23, 0x03, - 0xE3, 0xA3, 0x63, 0x03, 0xE3, 0x03, - 0x03, 0x03, 0x06, 0xFC, 0x00, 0x00, - 0xF8, 0xFC, 0x06, 0x03, 0xC3, 0x23, - 0x23, 0xC3, 0x03, 0x43, 0xA3, 0x23, - 0x43, 0x03, 0x06, 0xFC, 0x00, 0x00, - 0xF8, 0xFC, 0x06, 0x03, 0xE3, 0xA3, - 0xE3, 0x03, 0xE3, 0x03, 0x83, 0xE3, - 0x83, 0x03, 0x06, 0xFC, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, - 0x10, 0x10, 0x08, 0x08, 0x10, 0x10, - 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, - 0x80, 0x80, 0xC0, 0xC0, 0xE0, 0xE0, - 0xF0, 0xF0, 0xF8, 0xF8, 0xF0, 0xF0, - 0xE0, 0xE0, 0xC0, 0xC0, 0x80, 0x80, - 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, - 0x10, 0x10, 0x08, 0x08, 0x10, 0x10, - 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, - 0x80, 0x80, 0x40, 0xC0, 0x60, 0xA0, - 0x50, 0xB0, 0x58, 0xA8, 0x50, 0xB0, - 0x60, 0xA0, 0x40, 0xC0, 0x80, 0x80, - 0x00, 0xF8, 0xFC, 0xFE, 0xFF, 0xE0, - 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x1F, - 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, - 0x1F, 0x3F, 0x60, 0x41, 0x41, 0x4F, - 0x48, 0x48, 0x48, 0x4F, 0x41, 0x41, - 0x20, 0x1F, 0x00, 0x00, 0x00, 0x00, - 0x1F, 0x3F, 0x60, 0x40, 0x47, 0x44, - 0x44, 0x40, 0x40, 0x47, 0x40, 0x40, - 0x47, 0x40, 0x47, 0x40, 0x47, 0x44, - 0x44, 0x40, 0x20, 0x1F, 0x00, 0x00, - 0x1F, 0x3F, 0x60, 0x40, 0x43, 0x44, - 0x44, 0x43, 0x40, 0x42, 0x44, 0x45, - 0x42, 0x40, 0x20, 0x1F, 0x00, 0x00, - 0x1F, 0x3F, 0x60, 0x40, 0x47, 0x40, - 0x47, 0x40, 0x47, 0x44, 0x40, 0x47, - 0x44, 0x40, 0x20, 0x1F, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x88, 0x88, 0x5D, 0x5D, 0x3E, 0x3E, - 0x7C, 0x7C, 0xF8, 0xF8, 0x7C, 0x7C, - 0x3E, 0x3E, 0x5D, 0x5D, 0x88, 0x88, - 0x88, 0x88, 0x55, 0x55, 0x23, 0x23, - 0x47, 0x47, 0x8F, 0x8F, 0x47, 0x47, - 0x23, 0x23, 0x55, 0x55, 0x88, 0x88, - 0x88, 0x88, 0xD5, 0xD5, 0xE2, 0xE2, - 0xC4, 0xC4, 0x88, 0x88, 0xC4, 0xC4, - 0xE2, 0xE2, 0xD5, 0xD5, 0x88, 0x88, - 0x88, 0x88, 0x5D, 0xD5, 0x6B, 0xB6, - 0x6D, 0xD6, 0xAD, 0xDA, 0x6D, 0xD6, - 0x6B, 0xB6, 0x5D, 0xD5, 0x88, 0x88, - 0x00, 0x03, 0x0F, 0x1F, 0x3F, 0x3F, - 0x3F, 0x3F, 0x1F, 0x1F, 0x3F, 0x3F, - 0x7F, 0x7F, 0x7F, 0x3F, 0x3F, 0x1F, - 0x3F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7C, - 0x78, 0x78, 0x38, 0x1C, 0x0F, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, - 0x04, 0x04, 0x08, 0x08, 0x04, 0x04, - 0x02, 0x02, 0x01, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, - 0x04, 0x04, 0x08, 0x08, 0x04, 0x04, - 0x02, 0x02, 0x01, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, - 0x07, 0x07, 0x0F, 0x0F, 0x07, 0x07, - 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x01, 0x03, 0x02, - 0x05, 0x06, 0x0D, 0x0A, 0x05, 0x06, - 0x03, 0x02, 0x01, 0x01, 0x00, 0x00, -}; diff --git a/keyboards/crkbd/keymaps/workman/keycodes.h b/keyboards/crkbd/keymaps/workman/keycodes.h deleted file mode 100644 index 2d7db40ecd..0000000000 --- a/keyboards/crkbd/keymaps/workman/keycodes.h +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2022 Álvaro Cortés (@ACortesDev) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#include QMK_KEYBOARD_H -#include "layers.h" - -/* Tap-Hold keycodes */ -#define KC_LOWER LT(_LOWER, KC_ENT) /* Tap for Enter, Hold for LOWER layer */ -#define KC_RAISE LT(_RAISE, KC_SPC) /* Tap for Space, Hold for RAISE layer */ - -/* Macros */ -enum custom_keycodes { - VSCTERM = QK_USER, - CHNLANG -}; diff --git a/keyboards/crkbd/keymaps/workman/keymap.c b/keyboards/crkbd/keymaps/workman/keymap.c deleted file mode 100644 index f84b31a246..0000000000 --- a/keyboards/crkbd/keymaps/workman/keymap.c +++ /dev/null @@ -1,66 +0,0 @@ -// Copyright 2023 Shokara Kou -// SPDX-License-Identifier: GPL-2.0-or-later -#include QMK_KEYBOARD_H - -#include "layers.h" -#include "keycodes.h" -#include "process_records.h" - -#ifdef OLED_ENABLE - #include "oled.h" -#endif - -/* Layer keymaps */ -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_WORKMAN] = LAYOUT( - //,-----------------------------------------------------. ,-----------------------------------------------------. - KC_TAB, KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_SCLN, KC_BSLS, - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - KC_BSPC, KC_A, KC_S, KC_H, KC_T, KC_G, KC_Y, KC_N, KC_E, KC_O, KC_I, KC_QUOT, - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - KC_ESC, KC_Z, KC_X, KC_M, KC_C, KC_V, KC_K, KC_L, KC_COMM, KC_DOT, KC_SLSH, KC_ESC, - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - KC_LALT, KC_LCTL,KC_RAISE, KC_LOWER, KC_LSFT, KC_LGUI - // `-------------------------' `--------------------------' - ), - - [_LOWER] = LAYOUT( - //,-----------------------------------------------------. ,-----------------------------------------------------. - _______, KC_ASTR, KC_7, KC_8, KC_9, KC_MINS, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_ESC, XXXXXXX, - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - _______, KC_SLSH, KC_4, KC_5, KC_6, KC_PLUS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, XXXXXXX, - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - _______, KC_0, KC_1, KC_2, KC_3, KC_EQL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______ - // `-------------------------' `--------------------------' - ), - - [_RAISE] = LAYOUT( - //,-----------------------------------------------------. ,-----------------------------------------------------. - _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_F11, - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_GRV, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_F12, - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TILD, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______, - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - _______, _______, _______, _______, _______, _______ - // `-------------------------' `--------------------------' - ), - - [_ADJUST] = LAYOUT( - //,-----------------------------------------------------. ,-----------------------------------------------------. - XXXXXXX, XXXXXXX, KC_F13, KC_F14, KC_F15, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - XXXXXXX, KC_F16, KC_F17, KC_F18, KC_F19, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX - // `-------------------------' `--------------------------' - ) -}; - -layer_state_t layer_state_set_user(layer_state_t state) { - return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); -} diff --git a/keyboards/crkbd/keymaps/workman/layers.h b/keyboards/crkbd/keymaps/workman/layers.h deleted file mode 100644 index 95a29e4e44..0000000000 --- a/keyboards/crkbd/keymaps/workman/layers.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2022 Álvaro Cortés (@ACortesDev) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -enum custom_layers { - _WORKMAN, - _LOWER, - _RAISE, - _ADJUST, -}; diff --git a/keyboards/crkbd/keymaps/workman/oled.c b/keyboards/crkbd/keymaps/workman/oled.c deleted file mode 100644 index 8c5591184e..0000000000 --- a/keyboards/crkbd/keymaps/workman/oled.c +++ /dev/null @@ -1,128 +0,0 @@ -// Copyright 2022 Álvaro Cortés (@ACortesDev) -// SPDX-License-Identifier: GPL-2.0-or-later -#include QMK_KEYBOARD_H -#include "layers.h" -#include "oled.h" - -oled_rotation_t oled_init_user(oled_rotation_t rotation) { - return OLED_ROTATION_270; -} - -void render_layer_symbol(void) { - static const char PROGMEM default_layer[] = { - 0x20, 0x94, 0x95, 0x96, 0x20, - 0x20, 0xb4, 0xb5, 0xb6, 0x20, - 0x20, 0xd4, 0xd5, 0xd6, 0x20, 0}; - static const char PROGMEM raise_layer[] = { - 0x20, 0x97, 0x98, 0x99, 0x20, - 0x20, 0xb7, 0xb8, 0xb9, 0x20, - 0x20, 0xd7, 0xd8, 0xd9, 0x20, 0}; - static const char PROGMEM lower_layer[] = { - 0x20, 0x9a, 0x9b, 0x9c, 0x20, - 0x20, 0xba, 0xbb, 0xbc, 0x20, - 0x20, 0xda, 0xdb, 0xdc, 0x20, 0}; - static const char PROGMEM adjust_layer[] = { - 0x20, 0x9d, 0x9e, 0x9f, 0x20, - 0x20, 0xbd, 0xbe, 0xbf, 0x20, - 0x20, 0xdd, 0xde, 0xdf, 0x20, 0}; - if(layer_state_is(_ADJUST)) { - oled_write_P(adjust_layer, false); - } else if(layer_state_is(_LOWER)) { - oled_write_P(lower_layer, false); - } else if(layer_state_is(_RAISE)) { - oled_write_P(raise_layer, false); - } else { - oled_write_P(default_layer, false); - } -} - -void render_layer_name(void) { - bool lower = layer_state_is(_LOWER) & !layer_state_is(_ADJUST); - bool raise = layer_state_is(_RAISE) & !layer_state_is(_ADJUST); - bool adjust = layer_state_is(_ADJUST); - - if(lower){ - oled_write_P(PSTR("LOWER"), false); - } else if(raise){ - oled_write_P(PSTR("RAISE"), false); - } else if(adjust){ - oled_write_P(PSTR(" ADJ "), false); - } else { - oled_write_P(PSTR(" "), false); - } -} - -void render_mod_state(uint8_t modifiers) { - static const char PROGMEM shift_line_1[] = { - 0x85, 0x86, 0x87, 0}; - static const char PROGMEM shift_line_2[] = { - 0xa5, 0xa6, 0xa7, 0}; - - static const char PROGMEM ctrl_line_1[] = { - 0x88, 0x89, 0x8a, 0x8b, 0}; - static const char PROGMEM ctrl_line_2[] = { - 0xa8, 0xa9, 0xaa, 0xab, 0}; - - static const char PROGMEM os_line_1[] = { - 0x8c, 0x8d, 0x8e, 0}; - static const char PROGMEM os_line_2[] = { - 0xac, 0xad, 0xae, 0}; - - static const char PROGMEM alt_line_1[] = { - 0x8f, 0x90, 0x91, 0}; - static const char PROGMEM alt_line_2[] = { - 0xaf, 0xb0, 0xb1, 0}; - - if (modifiers & MOD_MASK_GUI) { - oled_write(" ", false); - oled_write_ln_P(os_line_1, false); - oled_write(" ", false); - oled_write_ln_P(os_line_2, false); - } else { - oled_write_ln("", false); - oled_write_ln("", false); - } - - if (modifiers & MOD_MASK_SHIFT) { - oled_write(" ", false); - oled_write_ln_P(shift_line_1, false); - oled_write(" ", false); - oled_write_ln_P(shift_line_2, false); - } else { - oled_write_ln("", false); - oled_write_ln("", false); - } - - if (modifiers & MOD_MASK_ALT) { - oled_write(" ", false); - oled_write_ln_P(alt_line_1, false); - oled_write(" ", false); - oled_write_ln_P(alt_line_2, false); - } else { - oled_write_ln("", false); - oled_write_ln("", false); - } - - if (modifiers & MOD_MASK_CTRL) { - oled_write_ln_P(ctrl_line_1, false); - oled_write_ln_P(ctrl_line_2, false); - } else { - oled_write_ln("", false); - oled_write_ln("", false); - } -} - -void render_status(void){ - render_layer_name(); - - render_layer_symbol(); - - oled_write_P(PSTR("\n\n\n"), false); - - render_mod_state(get_mods()|get_oneshot_mods()); -} - -bool oled_task_user(void) { - render_status(); - return false; -} diff --git a/keyboards/crkbd/keymaps/workman/oled.h b/keyboards/crkbd/keymaps/workman/oled.h deleted file mode 100644 index c096466e71..0000000000 --- a/keyboards/crkbd/keymaps/workman/oled.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2022 Álvaro Cortés (@ACortesDev) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#ifdef OLED_ENABLE - bool process_record_oled(uint16_t keycode, keyrecord_t *record); - oled_rotation_t oled_init_user(oled_rotation_t rotation); - void render_layer_symbol(void); - void render_layer_name(void); - void render_mod_state(uint8_t modifiers); - void render_status(void); - bool oled_task_user(void); -#endif \ No newline at end of file diff --git a/keyboards/crkbd/keymaps/workman/process_records.c b/keyboards/crkbd/keymaps/workman/process_records.c deleted file mode 100644 index 549dec2464..0000000000 --- a/keyboards/crkbd/keymaps/workman/process_records.c +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2022 Álvaro Cortés (@ACortesDev) -// SPDX-License-Identifier: GPL-2.0-or-later -#include "layers.h" -#include "keycodes.h" - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - /* Macros */ - switch (keycode) { - case VSCTERM: - if (record->event.pressed) { - SEND_STRING(SS_LCTL("`")); // Ctrl + ` (to toggle vscode terminal) - } - return false; - case CHNLANG: - if (record->event.pressed) { - SEND_STRING(SS_LCTL(SS_LSFT("n"))); // Ctrl + Shift + N (to change keyboard layout) - } - return false; - } - return true; -} diff --git a/keyboards/crkbd/keymaps/workman/process_records.h b/keyboards/crkbd/keymaps/workman/process_records.h deleted file mode 100644 index 7cedcfbe68..0000000000 --- a/keyboards/crkbd/keymaps/workman/process_records.h +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2022 Álvaro Cortés (@ACortesDev) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -bool process_record_user(uint16_t keycode, keyrecord_t *record); diff --git a/keyboards/crkbd/keymaps/workman/rules.mk b/keyboards/crkbd/keymaps/workman/rules.mk deleted file mode 100644 index 804d695e03..0000000000 --- a/keyboards/crkbd/keymaps/workman/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -RGB_MATRIX_ENABLE = no -RGBLIGHT_ENABLE = no -SPLIT_KEYBOARD = yes -TAP_DANCE_ENABLE = no -MOUSEKEY_ENABLE = no -OLED_ENABLE = yes - -# Link Time Optimization (Reduces compiled size) -LTO_ENABLE = yes - -SRC += ./process_records.c ./oled.c