Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[keymap] ninjonas keymap for crkbd & ninjonas userspace updates #6797

Merged
merged 31 commits into from
Sep 26, 2019
Merged

[keymap] ninjonas keymap for crkbd & ninjonas userspace updates #6797

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
d0c24c6
[keymap(crkbd)] introducing crkbd keymap on ninjonas profile
Sep 15, 2019
0824844
Merge branch 'master' of https://github.com/qmk/qmk_firmware into key…
Sep 15, 2019
ed70936
[keymap(crkbd)] introducing crkbd keymap on ninjonas profile
Sep 15, 2019
2fc40c7
[refactor(crkbd)] reducing file size by selecting RGB animations
ninjonas Sep 15, 2019
f3a0ede
[refactor(crkbd)] added shiftit key
ninjonas Sep 15, 2019
a395886
[refactor(crkbd)] added shiftit key
ninjonas Sep 15, 2019
da6a51f
[chore(crkbd)] adding SLEEP_LED_ENABLE on rules.mk
ninjonas Sep 16, 2019
91e5597
[refactor(crkbd)] added keylog & removed static rainbow RGB
Sep 16, 2019
dfc69eb
[feat(crkbd)] introduced em-dash '—' keymap
Sep 16, 2019
6b605dc
[feat(crkbd)] added screenshot functionality
Sep 16, 2019
86c59ba
[refactor(lily58,pinky3)] moving media keys
ninjonas Sep 20, 2019
86bf8c6
[refactor(lily58)] Added emdash key
Sep 23, 2019
fd06b86
[chore] removing NUMBERS & FUNCTIONS layers as they're useless
Sep 23, 2019
7bc6483
[chore] removing NUMBERS & FUNCTIONS layers as they're useless
Sep 23, 2019
30cdff0
[chore(crkbd,lily48)] Updating README.md
Sep 24, 2019
6930ce0
[feat] added K_LAPP & K_RAPP to mimic command + tab
Sep 24, 2019
05a1386
[feat] added K_LAPP & K_RAPP to mimic command + tab
Sep 24, 2019
6e0c035
Merge branch 'master' of https://github.com/qmk/qmk_firmware into key…
Sep 24, 2019
e90a6ef
[fix(#6797)] resolving changes requested by @drashna
ninjonas Sep 24, 2019
a576ee4
[fix(#6797)] first cut on using QMK OLED Driver
ninjonas Sep 25, 2019
bcdf03e
[fix(#6797)] cleaning up rules.mk
ninjonas Sep 25, 2019
8106dd5
[fix(#6797)] making scrolling logo work
ninjonas Sep 25, 2019
9ce235b
[fix(#6797)] Using OLED Driver for Lily58
ninjonas Sep 25, 2019
0978a2e
[fix(#6797)] Moved OLED driver implementation to ninjonas userspace
ninjonas Sep 25, 2019
f8de504
[fix(#6797)] Bringing back crkbd & lily58 logos
ninjonas Sep 25, 2019
717f2e6
[fix(#6797)] Turning off OLED based off @drashna's workaround in #5982
ninjonas Sep 25, 2019
26e8d3b
[fix(#6797)] whoops! forgot to checkin crkbd/config.h
ninjonas Sep 25, 2019
118f20f
[fix(#6797)] fixing issue with OLED randomly turning on
ninjonas Sep 25, 2019
7b24bae
[fix(#6797)] using default glcdfont.c for lily58 & crkbd
ninjonas Sep 25, 2019
013a52f
[fix(#6797)] Using LINK_TIME_OPTIMIZATION_ENABLE rather than EXTRAFLA…
Sep 25, 2019
5767d8c
[fix(#6797)] updating M_MALL macro as per code review by @fauxpark
Sep 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[refactor(crkbd)] added keylog & removed static rainbow RGB
  • Loading branch information
Jonas Avellana committed Sep 16, 2019
commit 91e55977f9d1d3f38b1d37228d9465019eeea928
1 change: 0 additions & 1 deletion keyboards/crkbd/keymaps/ninjonas/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#undef RGBLIGHT_ANIMATIONS // https://docs.qmk.fm/#/feature_rgblight?id=effect-and-animation-toggles
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLED_NUM 27
#define RGBLIGHT_LIMIT_VAL 120
#define RGBLIGHT_HUE_STEP 10
Expand Down
2 changes: 1 addition & 1 deletion keyboards/crkbd/keymaps/ninjonas/crkbd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ void matrix_render_user(struct CharacterMatrix *matrix) {
// If you want to change the display of OLED, you need to change here
matrix_write_ln(matrix, read_layer_state());
matrix_write_ln(matrix, read_keylog());
//matrix_write_ln(matrix, read_keylogs());
matrix_write_ln(matrix, read_keylogs());
//matrix_write_ln(matrix, read_mode_icon(keymap_config.swap_lalt_lgui));
//matrix_write_ln(matrix, read_host_led_state());
//matrix_write_ln(matrix, read_timelog());
Expand Down
12 changes: 6 additions & 6 deletions keyboards/crkbd/keymaps/ninjonas/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include QMK_KEYBOARD_H
#include "ninjonas.h"
#include "ninjonas.h"

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT_wrapper(
[_QWERTY] = LAYOUT_wrapper(
//,----------------------------------------------------. ,----------------------------------------------------.
_____________________QWERTY_L1______________________, _____________________QWERTY_R1______________________,
//|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
Expand All @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//`---------------------' `---------------------'
),

[_DVORAK] = LAYOUT_wrapper(
[_DVORAK] = LAYOUT_wrapper(
//,----------------------------------------------------. ,----------------------------------------------------.
_____________________DVORAK_L1______________________, _____________________DVORAK_R1______________________,
//|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
Expand All @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//`---------------------' `---------------------'
),

[_COLEMAK] = LAYOUT_wrapper(
[_COLEMAK] = LAYOUT_wrapper(
//,----------------------------------------------------. ,----------------------------------------------------.
_____________________COLEMAK_L1_____________________, _____________________COLEMAK_R1_____________________,
//|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
Expand All @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//`---------------------' `---------------------'
),

[_LOWER] = LAYOUT_wrapper(
[_LOWER] = LAYOUT_wrapper(
//,----------------------------------------------------. ,----------------------------------------------------.
XXXXXXX, XXXXXXX, _________MEDIA_1_________, XXXXXXX, _______________NAV_1______________, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
Expand Down Expand Up @@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
M_VRSN, M_MALL, XXXXXXX, RGB_SAI, RGB_HUI, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
M_FLSH, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_VAD, RGB_M_P, RGB_M_B, RGB_M_G,RGB_M_SW, XXXXXXX, XXXXXXX,
M_FLSH, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_VAD, RGB_M_P, RGB_M_B,RGB_M_SW, XXXXXXX, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------+-------| |--------+--------+--------+--------+--------+-------|
_______,_______,_______, _______,_______,_______
//`---------------------' `---------------------'
Expand Down