Skip to content

Commit

Permalink
add features back to BM40, improve symbol layers and KLE representation
Browse files Browse the repository at this point in the history
  • Loading branch information
@rafaelromao
rafaelromao committed Oct 3, 2023
1 parent deea1cd commit 3a71b5b
Show file tree
Hide file tree
Showing 28 changed files with 297 additions and 319 deletions.
Binary file modified img/overview.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 11 additions & 11 deletions src/qmk/keyboards/handwired/rafaelromao/fauxberry/keymaps/rafaelromao/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
____ALPHA2_L4____ , XXXXXXX , XXXXXXX , ____ALPHA2_R4____),
// |___________________________________________________________________________________________________|

[_SYMBOLS] = LAYOUT_wrapper(
// |___________________________________________________________________________________________________|
_________________SYMBOLS_L1__________ , XXXXXXX , XXXXXXX , _______SYMBOLS_R1____________________ ,
// |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
_________________SYMBOLS_L2____________________ , _________________SYMBOLS_R2____________________ ,
// |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
XXXXXXX , _______SYMBOLS_L3____________________ , _________________SYMBOLS_R3__________ , XXXXXXX ,
// |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
__SYMBOLS_L4_____ , XXXXXXX , XXXXXXX , __SYMBOLS_R4_____),
// |___________________________________________________________________________________________________|

[_LOWER] = LAYOUT_wrapper(
// |___________________________________________________________________________________________________|
___________________LOWER_L1__________ , XXXXXXX , XXXXXXX , _________LOWER_R1____________________ ,
Expand All @@ -109,6 +98,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
____RAISE_L4_____ , XXXXXXX , XXXXXXX , ____RAISE_R4_____),
// |___________________________________________________________________________________________________|

[_SYMBOLS] = LAYOUT_wrapper(
// |___________________________________________________________________________________________________|
_________________SYMBOLS_L1__________ , XXXXXXX , XXXXXXX , _______SYMBOLS_R1____________________ ,
// |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
_________________SYMBOLS_L2____________________ , _________________SYMBOLS_R2____________________ ,
// |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
XXXXXXX , _______SYMBOLS_L3____________________ , _________________SYMBOLS_R3__________ , XXXXXXX ,
// |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
__SYMBOLS_L4_____ , XXXXXXX , XXXXXXX , __SYMBOLS_R4_____),
// |___________________________________________________________________________________________________|

[_FIXED_NAV] = LAYOUT_wrapper(
// |___________________________________________________________________________________________________|
___________________NAVIGATION_L1_____ , XXXXXXX , XXXXXXX , _________NAVIGATION_R1_______________ ,
Expand Down
7 changes: 1 addition & 6 deletions src/qmk/keyboards/handwired/rafaelromao/fauxberry/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
SRC += features/leader.c
SRC += features/sentence_case.c
SRC += features/dynamic_macro.c
SRC += features/swapper.c

BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
WS2812_DRIVER = vendor
ENCODER_MAP_ENABLE = yes
MOUSEKEY_ENABLE = yes
OLED_DRIVER = SSD1306
DYNAMIC_MACRO_ENABLE = yes
LEADER_ENABLE = yes
DYNAMIC_MACRO_ENABLE = yes
22 changes: 11 additions & 11 deletions src/qmk/keyboards/handwired/rafaelromao/rommana/keymaps/rafaelromao/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
____ALPHA2_L4____ , ____ALPHA2_R4____),
// |___________________________________________________________________________________________________|

[_SYMBOLS] = LAYOUT_wrapper(
// |___________________________________________________________________________________________________|
_________________SYMBOLS_L1__________ , _______SYMBOLS_R1____________________ ,
// |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
_________________SYMBOLS_L2____________________ , _________________SYMBOLS_R2____________________ ,
// |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
_______SYMBOLS_L3____________________ , _________________SYMBOLS_R3__________ ,
// |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
__SYMBOLS_L4_____ , __SYMBOLS_R4_____),
// |___________________________________________________________________________________________________|

[_LOWER] = LAYOUT_wrapper(
// |___________________________________________________________________________________________________|
___________________LOWER_L1__________ , _________LOWER_R1____________________ ,
Expand All @@ -109,6 +98,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
____RAISE_L4_____ , ____RAISE_R4_____),
// |___________________________________________________________________________________________________|

[_SYMBOLS] = LAYOUT_wrapper(
// |___________________________________________________________________________________________________|
_________________SYMBOLS_L1__________ , _______SYMBOLS_R1____________________ ,
// |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
_________________SYMBOLS_L2____________________ , _________________SYMBOLS_R2____________________ ,
// |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
_______SYMBOLS_L3____________________ , _________________SYMBOLS_R3__________ ,
// |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
__SYMBOLS_L4_____ , __SYMBOLS_R4_____),
// |___________________________________________________________________________________________________|

[_FIXED_NAV] = LAYOUT_wrapper(
// |___________________________________________________________________________________________________|
___________________NAVIGATION_L1_____ , _________NAVIGATION_R1_______________ ,
Expand Down
4 changes: 0 additions & 4 deletions src/qmk/keyboards/handwired/rafaelromao/rommana/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
SRC += features/leader.c
SRC += features/sentence_case.c
SRC += features/dynamic_macro.c
SRC += features/swapper.c

DYNAMIC_MACRO_ENABLE = yes
LEADER_ENABLE = yes
WS2812_DRIVER = vendor
22 changes: 11 additions & 11 deletions src/qmk/keyboards/handwired/rafaelromao/wizza/keymaps/rafaelromao/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
____ALPHA2_L4____ , ____ALPHA2_R4____),
// |___________________________________________________________________________________________________|

[_SYMBOLS] = LAYOUT_wrapper(
// |___________________________________________________________________________________________________|
_________________SYMBOLS_L1__________ , _______SYMBOLS_R1____________________ ,
// |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
_________________SYMBOLS_L2____________________ , _________________SYMBOLS_R2____________________ ,
// |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
_______SYMBOLS_L3____________________ , _________________SYMBOLS_R3__________ ,
// |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
__SYMBOLS_L4_____ , __SYMBOLS_R4_____),
// |___________________________________________________________________________________________________|

[_LOWER] = LAYOUT_wrapper(
// |___________________________________________________________________________________________________|
___________________LOWER_L1__________ , _________LOWER_R1____________________ ,
Expand All @@ -109,6 +98,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
____RAISE_L4_____ , ____RAISE_R4_____),
// |___________________________________________________________________________________________________|

[_SYMBOLS] = LAYOUT_wrapper(
// |___________________________________________________________________________________________________|
_________________SYMBOLS_L1__________ , _______SYMBOLS_R1____________________ ,
// |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
_________________SYMBOLS_L2____________________ , _________________SYMBOLS_R2____________________ ,
// |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
_______SYMBOLS_L3____________________ , _________________SYMBOLS_R3__________ ,
// |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
__SYMBOLS_L4_____ , __SYMBOLS_R4_____),
// |___________________________________________________________________________________________________|

[_FIXED_NAV] = LAYOUT_wrapper(
// |___________________________________________________________________________________________________|
___________________NAVIGATION_L1_____ , _________NAVIGATION_R1_______________ ,
Expand Down
4 changes: 0 additions & 4 deletions src/qmk/keyboards/handwired/rafaelromao/wizza/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
SRC += features/leader.c
SRC += features/sentence_case.c
SRC += features/dynamic_macro.c
SRC += features/swapper.c

DYNAMIC_MACRO_ENABLE = yes
LEADER_ENABLE = yes
WS2812_DRIVER = vendor
5 changes: 1 addition & 4 deletions src/qmk/keyboards/kprepublic/bm40hsrgb/keymaps/rafaelromao/config.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
#pragma once

// Configure RGB
#define RGBLIGHT_HUE_STEP 20

// Remove Non-Essential features to save memory
#define SAVE_MEMORY
#define RGBLIGHT_HUE_STEP 20
85 changes: 12 additions & 73 deletions src/qmk/keyboards/kprepublic/bm40hsrgb/keymaps/rafaelromao/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
XXXXXXX , XXXXXXX , XXXXXXX , ____ALPHA2_L4____ , XXXXXXX , ____ALPHA2_R4____ , XXXXXXX , XXXXXXX , XXXXXXX),
// |_______________________________________________________________________________________________________________________|

[_SYMBOLS] = LAYOUT_wrapper(
// |_______________________________________________________________________________________________________________________|
_________________SYMBOLS_L1__________ , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , _______SYMBOLS_R1____________________ ,
// |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
_________________SYMBOLS_L2____________________ , XXXXXXX , XXXXXXX , _________________SYMBOLS_R2____________________ ,
// |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
XXXXXXX , _______SYMBOLS_L3____________________ , XXXXXXX , XXXXXXX , _________________SYMBOLS_R3__________ , XXXXXXX ,
// |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
XXXXXXX , XXXXXXX , XXXXXXX , __SYMBOLS_L4_____ , XXXXXXX , __SYMBOLS_R4_____ , XXXXXXX , XXXXXXX , XXXXXXX),
// |_______________________________________________________________________________________________________________________|

[_LOWER] = LAYOUT_wrapper(
// |_______________________________________________________________________________________________________________________|
___________________LOWER_L1__________ , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , _________LOWER_R1____________________ ,
Expand All @@ -109,6 +98,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
XXXXXXX , XXXXXXX , XXXXXXX , ____RAISE_L4_____ , XXXXXXX , ____RAISE_R4_____ , XXXXXXX , XXXXXXX , XXXXXXX),
// |_______________________________________________________________________________________________________________________|

[_SYMBOLS] = LAYOUT_wrapper(
// |_______________________________________________________________________________________________________________________|
_________________SYMBOLS_L1__________ , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , _______SYMBOLS_R1____________________ ,
// |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
_________________SYMBOLS_L2____________________ , XXXXXXX , XXXXXXX , _________________SYMBOLS_R2____________________ ,
// |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
XXXXXXX , _______SYMBOLS_L3____________________ , XXXXXXX , XXXXXXX , _________________SYMBOLS_R3__________ , XXXXXXX ,
// |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
XXXXXXX , XXXXXXX , XXXXXXX , __SYMBOLS_L4_____ , XXXXXXX , __SYMBOLS_R4_____ , XXXXXXX , XXXXXXX , XXXXXXX),
// |_______________________________________________________________________________________________________________________|

[_FIXED_NAV] = LAYOUT_wrapper(
// |_______________________________________________________________________________________________________________________|
___________________NAVIGATION_L1_____ , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , _________NAVIGATION_R1_______________ ,
Expand Down Expand Up @@ -165,65 +165,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// |_______________________________________________________________________________________________________________________|
};

// clang-format on

// RGB Indicators

// extern os_t os;
// extern select_word_t select_word;
// const int led_count = 47;

// void set_rgblight_by_layer(uint32_t layer) {
// for (int i = 0; i < led_count; i++) {
// switch (layer) {
// case _LOCK:
// case _ALPHA1:
// break;
// case _NUMPAD:
// rgb_matrix_set_color(i, RGB_PURPLE);
// break;
// case _SYSTEM:
// rgb_matrix_set_color(i, RGB_RED);
// break;
// default:
// rgb_matrix_set_color(i, RGB_BLUE);
// break;
// }
// }
// }

// void set_current_layer_rgb(void) {
// set_rgblight_by_layer(get_highest_layer(layer_state | default_layer_state));
// }

// layer_state_t layer_state_set_user(layer_state_t state) {
// set_rgblight_by_layer(biton32(state));
// return state;
// }

// bool rgb_matrix_indicators_user(void) {
// uint8_t mods = get_mods();
// uint8_t oneshot_mods = get_oneshot_mods();
// uint8_t oneshot_locked_mods = get_oneshot_locked_mods();

// bool isShift = mods & MOD_MASK_SHIFT || oneshot_mods & MOD_MASK_SHIFT || oneshot_locked_mods & MOD_MASK_SHIFT;
// bool isCtrl = mods & MOD_MASK_CTRL || oneshot_mods & MOD_MASK_CTRL || oneshot_locked_mods & MOD_MASK_CTRL;
// bool isAlt = mods & MOD_MASK_ALT || oneshot_mods & MOD_MASK_ALT || oneshot_locked_mods & MOD_MASK_ALT;
// bool isGui = mods & MOD_MASK_GUI || oneshot_mods & MOD_MASK_GUI || oneshot_locked_mods & MOD_MASK_GUI;

// for (int i = 0; i < led_count; i++) {
// if (select_word.state != STATE_NONE) {
// rgb_matrix_set_color(i, RGB_GREEN);
// } else if (has_any_smart_case()) {
// rgb_matrix_set_color(i, RGB_YELLOW);
// } else if (isShift) {
// rgb_matrix_set_color(i, RGB_BLUE);
// } else if (isCtrl || isAlt || isGui) {
// rgb_matrix_set_color(i, RGB_WHITE);
// } else {
// set_current_layer_rgb();
// }
// }

// return false;
// }
// clang-format on
1 change: 0 additions & 1 deletion src/qmk/keyboards/kprepublic/bm40hsrgb/keymaps/rafaelromao/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
DYNAMIC_MACRO_ENABLE = no
LEADER_ENABLE = no
RGB_MATRIX_ENABLE = no
9 changes: 6 additions & 3 deletions src/qmk/users/rafaelromao/definitions/keycodes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ enum {
DQU_FIN,
EXL_EEX,
AND_EAN,
#ifndef SAVE_MEMORY
#ifdef DYNAMIC_MACRO_ENABLE
REC_MAC,
#endif
COM_LEA,
Expand All @@ -36,6 +36,7 @@ enum {
GRT_EGT,
OR_EOR,
SAR_ESA,
HAS_SQO,
TD_CODE_END
};

Expand Down Expand Up @@ -71,6 +72,7 @@ enum {
#define TD_LT TD(LET_ELT)
#define TD_GT TD(GRT_EGT)
#define TD_SARR TD(SAR_ESA)
#define TD_HASH TD(HAS_SQO)

// Custom keycodes

Expand Down Expand Up @@ -105,8 +107,8 @@ enum {
STR_MACRO_START,

MC_BTIC, MC_DQUO, MC_SQUO, MC_CIRC, MC_TILD, REPEAT, MC_EUR,
MC_ENT, MC_TAB, MC_ESC, MC_ESCC, MC_NSEN, MC_CANC, TG_NUMC,
MC_ESAV, MC_SENT, MC_CUR, MC_SAR, MC_DEQ, MC_NEQ, MC_BRAC,
MC_ENT, MC_TAB, MC_ESC, MC_ESCC, MC_NSEN, MC_CANC, TG_NUMC, MC_EXLM, MC_QUES,
MC_ESAV, MC_SENT, MC_CUR, MC_CURS, MC_SAR, MC_DEQ, MC_NEQ, MC_BRAC,
MC_DAND, MC_DPIP, MC_OESC, MC_SOES, MC_LTGT, MC_EPA, MC_SEC,

// End macros that can be shifted
Expand Down Expand Up @@ -206,6 +208,7 @@ enum {
#define LOW_NSE LT(_LOWER, MC_NSEN)
#define RAI_TA2 LT(_RAISE, TG_ACNT)
#define RAI_SPC LT(_RAISE, KC_SPC)
#define SYM_SPC LT(_SYMBOLS, KC_SPC)
#define RAI_A2 OSL(_ALPHA2) // Hold behavior is implemented in intercepted code

#define SHO_KCD LT(_SHORTCUTS, KC_D)
Expand Down
Loading

0 comments on commit 3a71b5b

Please sign in to comment.