Personal user space and CRKBD R2G keymap (#15888)

* r2g folder groundwork

* Default mb keymap featuring mb logos

* Migrate Oled to keyboard folder

* Move rules configs to support config better

* update readmes

* Liscnece update

* Update config and fix issues caused by redef errs

* funciton name adjusts, define specific rgb modes

* move default oled font to postconfig

* update oled in line with develop merge

* fix return value

* Add some default rgb matrix defines

* del ugfx

* remove #include <stdio.h>

* create personal keymap for r2g

* reduce firmware size

* change keymap to follow physical layout

* remove RGBlight config lines to make both sides work (@Dasky on MechboardsUK Discord)

* strip down configuration, similar to crkbd/r2g:mb_via

* remove wrong oled code overwriting the r2g one

* broken code with RGB matrix (briks right side)

* remove high max brightness limit

* caps lock tap dance and RGB indicator for active caps lock

* fix caps lock led on right side

* add test macro

* remove latex macro which is too slow

* move caps lock tap dance to RALT and add space cadet shift

* switch CTL with ALT in first layer

* add tap dance for ESC/DEL

* space cadet tap dance with caps lock; shift works by needs a short pause

* add space cadet tap dance with caps lock on the right; shift works by needs a short pause and does not hold

* make more keys transparent

* enable auto shift and use logo on both oleds

* add user oled logo, slows down linking considerably

* oled name

* add arrow keys in usual configuration and add linear configuration to symbol layer

* add unicoede support

* add accents

* update to latest version

* add colemak dh layer

* report auto shift timeout

* define layer name shorcuts correctly

* disable VIA to enable more layers

* enable NKRO

* move some rules and unicode to user space

* move oled and tap dances to user space

* move tap dances fully out of keymap

* expand unicode map

* fix unicode code

* revert changes to r2g, make it equal to merged code

* revert changes to r2g, make it equal to merged code

* clang-format userspace

* clang-format config file

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

* replace define with enum

* add licenses
This commit is contained in:
Rocco Meli
2022-03-10 23:27:37 +00:00
committed by GitHub
parent b75f6691a1
commit ee71362f99
11 changed files with 701 additions and 0 deletions

View File

@@ -0,0 +1,139 @@
/*
Copyright 2021-2022 Rocco Meli <@RMeli>
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 "keyrecords/tap_dances.h"
// + ---------- +
// + TAP DANCES |
// + ---------- +
// Tap dances definitions
// Need to needs to be defined in a .c file to avoid a linker error (multiple definitions)
qk_tap_dance_action_t tap_dance_actions[] = {
[TD_LSPO_CAPS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, LSPO_CAPS_finished, LSPO_CAPS_reset),
[TD_RSPC_CAPS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, RSPC_CAPS_finished, RSPC_CAPS_reset),
[TD_ESC_DEL] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_DEL),
};
// + ------ +
// + DANCES |
// + ------ +
// https://github.com/qmk/qmk_firmware/blob/9294258c02d3e025e01935a06c4d9f1997535bda/users/gordon/gordon.c#L112-L135
td_state_t hold_cur_dance(qk_tap_dance_state_t *state) {
if (state->count == 1) {
if (state->interrupted) {
if (!state->pressed)
return TD_SINGLE_TAP;
else
return TD_SINGLE_HOLD;
} else {
if (!state->pressed)
return TD_SINGLE_TAP;
else
return TD_SINGLE_HOLD;
}
} else if (state->count == 2) {
if (state->pressed)
return TD_NONE;
else
return TD_DOUBLE_TAP;
} else
return TD_NONE;
}
// + ------------------------------------------------ +
// + LEFT SHIFT PARENTHESIS OPEN (LSPO) AND CAPS LOCK |
// + ------------------------------------------------ +
// Create an instance of 'td_tap_t' for the 'LSPO_CAPS' tap dance.
static td_tap_t LSPO_CAPS_state = {.is_press_action = true, .state = TD_NONE};
void LSPO_CAPS_finished(qk_tap_dance_state_t *state, void *user_data) {
LSPO_CAPS_state.state = hold_cur_dance(state);
switch (LSPO_CAPS_state.state) {
case TD_SINGLE_TAP:
register_code16(KC_LPRN);
break;
case TD_SINGLE_HOLD:
register_code16(KC_LSFT);
break;
case TD_DOUBLE_TAP:
register_code16(KC_CAPS);
break;
case TD_NONE:
break;
}
}
void LSPO_CAPS_reset(qk_tap_dance_state_t *state, void *user_data) {
switch (LSPO_CAPS_state.state) {
case TD_SINGLE_TAP:
unregister_code16(KC_LPRN);
break;
case TD_SINGLE_HOLD:
unregister_code16(KC_LSFT);
break;
case TD_DOUBLE_TAP:
unregister_code16(KC_CAPS);
break;
case TD_NONE:
break;
}
LSPO_CAPS_state.state = TD_NONE;
}
// + -------------------------------------------------- +
// + RIGHT SHIFT PARENTHESIS CLOSE (RSPC) AND CAPS LOCK |
// + -------------------------------------------------- +
// Create an instance of 'td_tap_t' for the 'RSPC_CAPS' tap dance.
static td_tap_t RSPC_CAPS_state = {.is_press_action = true, .state = TD_NONE};
void RSPC_CAPS_finished(qk_tap_dance_state_t *state, void *user_data) {
RSPC_CAPS_state.state = hold_cur_dance(state);
switch (RSPC_CAPS_state.state) {
case TD_SINGLE_TAP:
register_code16(KC_RPRN);
break;
case TD_SINGLE_HOLD:
register_code16(KC_RSFT);
break;
case TD_DOUBLE_TAP:
register_code16(KC_CAPS);
break;
case TD_NONE:
break;
}
}
void RSPC_CAPS_reset(qk_tap_dance_state_t *state, void *user_data) {
switch (RSPC_CAPS_state.state) {
case TD_SINGLE_TAP:
unregister_code16(KC_RPRN);
break;
case TD_SINGLE_HOLD:
unregister_code16(KC_RSFT);
break;
case TD_DOUBLE_TAP:
unregister_code16(KC_CAPS);
break;
case TD_NONE:
break;
}
RSPC_CAPS_state.state = TD_NONE;
}

View File

@@ -0,0 +1,70 @@
/*
Copyright 2021-2022 Rocco Meli <@RMeli>
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
#include QMK_KEYBOARD_H
// https://beta.docs.qmk.fm/using-qmk/software-features/feature_tap_dance#example-4-quad-function-tap-dance-id-example-4
// + ---------- +
// + TAP DANCES |
// + ---------- +
// Tap dance enums
enum {
TD_LSPO_CAPS, // Tap once for (, hold once for LSFT, tap twice for CAPS
TD_RSPC_CAPS, // Tap once for ), hold once for RSFT, tap twice for CAPS
TD_ESC_DEL, // Tap once for KC_ESC, twice for KC_DEL
};
// Rename tap dances for keymap with shortcuts
#define TD_LSPC TD(TD_LSPO_CAPS)
#define TD_RSPC TD(TD_RSPC_CAPS)
#define TD_ED TD(TD_ESC_DEL)
// + ----------- +
// + KEY PRESSES |
// + ----------- +
// Different types of key presses
typedef enum {
TD_NONE,
TD_SINGLE_TAP,
TD_SINGLE_HOLD,
TD_DOUBLE_TAP,
} td_state_t;
// Key press state
typedef struct {
bool is_press_action;
td_state_t state;
} td_tap_t;
// + --------- +
// + FUNCTIONS |
// + --------- +
// Tap dance for fast modifiers; favors being held over being tapped.
td_state_t hold_cur_dance(qk_tap_dance_state_t *state);
// Left Shift Parenthesis Open (LSPO) and Caps Lock (CAPS) on DOUBLE_TAP
void LSPO_CAPS_finished(qk_tap_dance_state_t *state, void *user_data);
void LSPO_CAPS_reset(qk_tap_dance_state_t *state, void *user_data);
// Right Shift Parenthesis Close (RSPC) and Caps Lock (CAPS) on DOUBLE_TAP
void RSPC_CAPS_finished(qk_tap_dance_state_t *state, void *user_data);
void RSPC_CAPS_reset(qk_tap_dance_state_t *state, void *user_data);

View File

@@ -0,0 +1,85 @@
/*
Copyright 2021-2022 Rocco Meli <@RMeli>
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
#include QMK_KEYBOARD_H
// Needs to be active on the OS side as well
// https://docs.qmk.fm/#/feature_unicode?id=input-modes
enum unicode_names {
aGRV,
AGRV,
aUML,
AUML,
eGRV,
EGRV,
eACT,
EACT,
iGRV,
IGRV,
iCIR,
ICIR,
oGRV,
OGRV,
oUML,
OUML,
uGRV,
UGRV,
uUML,
UUML,
};
const uint32_t PROGMEM unicode_map[] = {
// KC_A
[aGRV] = 0x00E0, // à
[AGRV] = 0x00C0, // À
[aUML] = 0x00E4, // ä
[AUML] = 0x00C4, // Ä
// KC_E
[eGRV] = 0x00E8, // è
[EGRV] = 0x00C8, // È
[eACT] = 0x00E9, // é
[EACT] = 0x00C9, // É
// KC_I
[iGRV] = 0x00EC, // ì
[IGRV] = 0x00CC, // Ì
[iCIR] = 0x00EE, // î
[ICIR] = 0x00CE, // Î
// KC_O
[oGRV] = 0x00F2, // ò
[OGRV] = 0x00D2, // Ò
[oUML] = 0x00F6, // ö
[OUML] = 0x00D6, // Ö
// KC_U
[uGRV] = 0x00F9, // ù
[UGRV] = 0x00D9, // Ù
[uUML] = 0x00FC, // ü
[UUML] = 0x00DC, // Ü
};
// Accents
#define A_GRV XP(aGRV, AGRV)
#define A_UML XP(aUML, AUML)
#define E_GRV XP(eGRV, EGRV)
#define E_ACT XP(eACT, EACT)
#define I_GRV XP(iGRV, IGRV)
#define I_CIR XP(iCIR, ICIR)
#define O_GRV XP(oGRV, OGRV)
#define O_UML XP(oUML, OUML)
#define U_GRV XP(uGRV, UGRV)
#define U_UML XP(uUML, UUML)