1
0
Fork 0

[Keymap] Updates - Unikorn/Curiosity/Prime_E/Ferris/Corne (#10925)

* update keymap for unikorn

* add new map

* update keymap

* update keymap

* update map

* update the current keymap

* update keymap so it accounts for mouse keys as well

* add extra control and shift, for when we need to use the other keys

* get me square and curly braces

* remove unused macros

* update these changes so far

* update ilpse keymap

* rmove a layer and simplify my layers a bit

* I think there's a working keymap now for the corne. let's leave this here.

* I thought maybe that helped? but who knows

* save changes made so far

* update madhatter keymap to match what I want

* switch to use lcmd for main alt

* update my curiosity keymap

* make curiosity via enabled

* add via keymap

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/primekb/prime_e/keymaps/madhatter/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* stick to enum

* add bootmagic stuff and update keymap

* switch to bootmagic lite

* fix typo

* cleanup for writing to LED

* consistency

* fix led pins

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* fix build issue

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/crkbd/keymaps/madhatter/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Khader Syed <khader.syed@aicure.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
This commit is contained in:
Sid Carter 2020-11-25 13:09:15 -05:00 committed by GitHub
parent 8897ab9b11
commit 1bf657be41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 281 additions and 159 deletions

View file

@ -1,18 +1,46 @@
/*
This is the c configuration file for the keymap
Copyright 2012 Jun Wako <wakojun@gmail.com>
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 <http://www.gnu.org/licenses/>.
*/
#pragma once
#define EE_HANDS
//#define USE_MATRIX_I2C
/* Select hand configuration */
#define MASTER_LEFT
// #define MASTER_RIGHT
// #define EE_HANDS
#define SSD1306OLED
#ifdef RGBLIGHT_ENABLE
# undef RGBLED_NUM
# define RGBLIGHT_ANIMATIONS
# define RGBLED_NUM 27
# define RGBLIGHT_LIMIT_VAL 120
# define RGBLIGHT_HUE_STEP 10
# define RGBLIGHT_SAT_STEP 17
# define RGBLIGHT_VAL_STEP 17
#endif
#define USE_SERIAL_PD2
#undef PRODUCT
#define PRODUCT MadHatter Hacked Corne Keyboard
#define TAPPING_FORCE_HOLD
#define TAPPING_TERM 100
#ifdef RGBLIGHT_ENABLE
#undef RGBLED_NUM
#define RGBLIGHT_ANIMATIONS
#define RGBLED_NUM 27
#define RGBLIGHT_LIMIT_VAL 120
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
#endif

View file

@ -1,112 +1,96 @@
/*
Copyright 2019 @foostan
Copyright 2020 Drashna Jaelre <@drashna>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
#ifdef OLED_DRIVER_ENABLE
# define KEYLOGGER_LENGTH 5
static uint32_t oled_timer = 0;
static char keylog_str[KEYLOGGER_LENGTH + 1] = {"\n"};
static uint16_t log_timer = 0;
// clang-format off
static const char PROGMEM code_to_name[0xFF] = {
// 0 1 2 3 4 5 6 7 8 9 A B c D E F
' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', // 0x
'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '1', '2', // 1x
'3', '4', '5', '6', '7', '8', '9', '0', 20, 19, 27, 26, 22, '-', '=', '[', // 2x
']','\\', '#', ';','\'', '`', ',', '.', '/', 128, ' ', ' ', ' ', ' ', ' ', ' ', // 3x
' ', ' ', ' ', ' ', ' ', ' ', 'P', 'S', ' ', ' ', ' ', ' ', 16, ' ', ' ', ' ', // 4x
' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // 5x
' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // 6x
' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // 7x
' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // 8x
' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // 9x
' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // Ax
' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // Bx
' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // Cx
' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // Dx
'C', 'S', 'A', 'C', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // Ex
' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' // Fx
};
void add_keylog(uint16_t keycode);
#endif
extern uint8_t is_master;
enum corny_layers {
_QWERTY,
_LOWER,
_RAISE,
_ADJUST,
_QWERTY,
_LOWER,
_RAISE,
_ADJUST
};
enum custom_keycodes {
enum corny_keycodes {
QWERTY = SAFE_RANGE,
LOWER,
RAISE,
ADJUST,
BACKLIT,
RGBRST
};
#define LY_LWR MO(_LOWER)
#define LY_RSE MO(_RAISE)
#define KY_CESC LCTL_T(KC_ESC)
enum macro_keycodes {
KC_SAMPLEMACRO,
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT(
[_QWERTY] = LAYOUT_split_3x6_3(
//,-----------------------------------------------------. ,-----------------------------------------------------.
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_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
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_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,\
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
KC_LALT, LY_LWR, KC_LCMD, KC_SPC, LY_RSE, KC_ENT
KC_LCTL, LOWER, KC_BSPC, KC_SPC, RAISE, KC_RCMD
//`--------------------------' `--------------------------'
),
[_LOWER] = LAYOUT(
[_LOWER] = LAYOUT_split_3x6_3(
//,-----------------------------------------------------. ,-----------------------------------------------------.
KC_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
KC_LCTL, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,KC_RIGHT, KC_MINS, KC_EQL, KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV,
KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,KC_RIGHT, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UNDS, KC_PLUS, KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD,
KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
KC_LALT, LY_LWR, KC_LCMD, KC_SPC, LY_RSE, KC_ENT
//`--------------------------' `--------------------------'
),
[_RAISE] = LAYOUT(
//,-----------------------------------------------------. ,-----------------------------------------------------.
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
KC_LCTL, XXXXXXX, KC_PGUP, KC_HOME, KC_END,KC_PGDN, KC_MINS, KC_EQL, KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UNDS, KC_PLUS, KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD,
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
KC_LALT, LY_LWR, KC_LCMD, KC_SPC, LY_RSE, KC_ENT
KC_TRNS, LOWER, KC_TRNS, KC_TRNS, RAISE, KC_TRNS
//`--------------------------' `--------------------------'
),
[_ADJUST] = LAYOUT(
[_RAISE] = LAYOUT_split_3x6_3(
//,-----------------------------------------------------. ,-----------------------------------------------------.
RESET, KC_BTN1, KC_MS_U, KC_BTN2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
KC_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,
KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_EQL, KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
XXXXXXX, RGBRST, EEP_RST, AG_TOGG, XXXXXXX, XXXXXXX, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,
KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UNDS, KC_PLUS, KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD,
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
KC_LALT, LY_LWR, KC_LCMD, KC_SPC, LY_RSE, KC_ENT
KC_TRNS, LOWER, KC_BSPC, KC_TRNS, RAISE, KC_TRNS
//`--------------------------' `--------------------------'
),
[_ADJUST] = LAYOUT_split_3x6_3(
//,-----------------------------------------------------. ,-----------------------------------------------------.
XXXXXXX, RGBRST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
KC_TRNS, LOWER, KC_TRNS, KC_TRNS, RAISE, KC_TRNS
//`--------------------------' `--------------------------'
)
};
layer_state_t layer_state_set_user(layer_state_t state) {
return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
}
int RGB_current_mode;
// Setting ADJUST layer RGB back to default
@ -185,6 +169,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
switch (keycode) {
case QWERTY:
if (record->event.pressed) {
set_single_persistent_default_layer(_QWERTY);
}
break;
case LOWER:
if (record->event.pressed) {
layer_on(_LOWER);
@ -210,6 +199,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
layer_off(_ADJUST);
}
return false;
case RGB_MOD:
#ifdef RGBLIGHT_ENABLE
if (record->event.pressed) {
rgblight_mode(RGB_current_mode);
rgblight_step();
RGB_current_mode = rgblight_get_mode();
}
#endif
return false;
case RGBRST:
#ifdef RGBLIGHT_ENABLE
if (record->event.pressed) {
eeconfig_update_rgblight_default();
rgblight_enable();
RGB_current_mode = rgblight_get_mode();
}
#endif
break;
}
return true;
}

View file

@ -1,11 +1,10 @@
BOOTLOADER = atmel-dfu # Elite-C
MOUSEKEY_ENABLE = yes
RGBLIGHT_ENABLE = yes
# If you want to change the display of OLED, you need to change here
SRC += ./lib/glcdfont.c \
./lib/rgb_state_reader.c \
./lib/layer_state_reader.c \
./lib/logo_reader.c \
./lib/keylogger.c
./lib/keylogger.c \
# ./lib/mode_icon_reader.c \
# ./lib/host_led_state_reader.c \
# ./lib/timelogger.c \