aboutsummaryrefslogtreecommitdiff
path: root/keyboards/naked48
diff options
context:
space:
mode:
authorSalicylic-acid3 <46864619+Salicylic-acid3@users.noreply.github.com>2019-10-24 02:18:59 +0900
committernoroadsleft <18669334+noroadsleft@users.noreply.github.com>2019-10-23 10:18:59 -0700
commit68cf2725aa30eaa18db9c6149e5e361860db01d7 (patch)
treedb2d56405aef72473ff7d15117d2dfdefdb1ec3b /keyboards/naked48
parent6d95082cbf11728bbd035d533ef3efebcf29f933 (diff)
downloadqmk_firmware-68cf2725aa30eaa18db9c6149e5e361860db01d7.tar.gz
qmk_firmware-68cf2725aa30eaa18db9c6149e5e361860db01d7.zip
[Keyboard] Naked48/60 Configurator bugfix (#7131)
Support for QMK configurator of keyboard Naked48 / 60. Related: Pull request to configurator [Keyboard] Add keyboard Naked48 / 60 # 549
Diffstat (limited to 'keyboards/naked48')
-rw-r--r--keyboards/naked48/keymaps/default/config.h2
-rw-r--r--keyboards/naked48/keymaps/default/keymap.c6
-rw-r--r--keyboards/naked48/keymaps/default_with_nafuda/config.h4
-rw-r--r--keyboards/naked48/keymaps/default_with_nafuda/keymap.c16
-rw-r--r--keyboards/naked48/keymaps/default_with_setta21/config.h4
-rw-r--r--keyboards/naked48/keymaps/default_with_setta21/keymap.c13
-rw-r--r--keyboards/naked48/keymaps/default_with_setta21/readme.md4
-rw-r--r--keyboards/naked48/keymaps/salicylic/config.h4
-rw-r--r--keyboards/naked48/keymaps/salicylic/keymap.c16
-rw-r--r--keyboards/naked48/keymaps/salicylic/readme.md79
-rw-r--r--keyboards/naked48/keymaps/salicylic_with_nafuda/config.h4
-rw-r--r--keyboards/naked48/keymaps/salicylic_with_nafuda/keymap.c27
-rw-r--r--keyboards/naked48/keymaps/salicylic_with_setta21/config.h4
-rw-r--r--keyboards/naked48/keymaps/salicylic_with_setta21/keymap.c21
-rw-r--r--keyboards/naked48/keymaps/salicylic_with_setta21/readme.md77
-rw-r--r--keyboards/naked48/rev1/config.h18
16 files changed, 128 insertions, 171 deletions
diff --git a/keyboards/naked48/keymaps/default/config.h b/keyboards/naked48/keymaps/default/config.h
index a568a5f12..0e452bdb4 100644
--- a/keyboards/naked48/keymaps/default/config.h
+++ b/keyboards/naked48/keymaps/default/config.h
@@ -26,5 +26,3 @@
26 26
27#define TAPPING_FORCE_HOLD 27#define TAPPING_FORCE_HOLD
28#define TAPPING_TERM 180 28#define TAPPING_TERM 180
29
30#define RGBLED_NUM 48 // Number of LEDs \ No newline at end of file
diff --git a/keyboards/naked48/keymaps/default/keymap.c b/keyboards/naked48/keymaps/default/keymap.c
index 91c61b5f4..686685e26 100644
--- a/keyboards/naked48/keymaps/default/keymap.c
+++ b/keyboards/naked48/keymaps/default/keymap.c
@@ -24,10 +24,6 @@ enum custom_keycodes {
24 RGB_RST = SAFE_RANGE 24 RGB_RST = SAFE_RANGE
25}; 25};
26 26
27// Layer Mode aliases
28#define KC_SNUBS S(KC_NUBS)
29#define KC_SNUHS S(KC_NUHS)
30
31const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 27const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
32 [_QWERTY] = LAYOUT( 28 [_QWERTY] = LAYOUT(
33 //,-----------------------------------------------------| |-----------------------------------------------------. 29 //,-----------------------------------------------------| |-----------------------------------------------------.
@@ -48,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
48 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 44 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
49 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, 45 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
50 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 46 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
51 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,KC_SNUHS,KC_SNUBS, _______, _______, _______, 47 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______,_______,_______,
52 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 48 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
53 _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY 49 _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
54 //`------------------------------------------------------------------------------------------------------------' 50 //`------------------------------------------------------------------------------------------------------------'
diff --git a/keyboards/naked48/keymaps/default_with_nafuda/config.h b/keyboards/naked48/keymaps/default_with_nafuda/config.h
index 264ad0877..314fe55c3 100644
--- a/keyboards/naked48/keymaps/default_with_nafuda/config.h
+++ b/keyboards/naked48/keymaps/default_with_nafuda/config.h
@@ -26,6 +26,10 @@
26#define TAPPING_FORCE_HOLD 26#define TAPPING_FORCE_HOLD
27#define TAPPING_TERM 180 27#define TAPPING_TERM 180
28 28
29#ifdef RGBLED_NUM
30 #undef RGBLED_NUM
31#endif
32
29#define RGBLED_NUM 55 // Number of LEDs 33#define RGBLED_NUM 55 // Number of LEDs
30#define RGBLIGHT_SPLIT 34#define RGBLIGHT_SPLIT
31#define RGBLED_SPLIT { 48, 7 } 35#define RGBLED_SPLIT { 48, 7 }
diff --git a/keyboards/naked48/keymaps/default_with_nafuda/keymap.c b/keyboards/naked48/keymaps/default_with_nafuda/keymap.c
index e4b616e70..f5d0772aa 100644
--- a/keyboards/naked48/keymaps/default_with_nafuda/keymap.c
+++ b/keyboards/naked48/keymaps/default_with_nafuda/keymap.c
@@ -26,18 +26,12 @@ enum custom_keycodes {
26 RGB_RST = SAFE_RANGE 26 RGB_RST = SAFE_RANGE
27}; 27};
28 28
29// Fillers to make layering more clear
30#define KC_SNUBS S(KC_NUBS)
31#define KC_SNUHS S(KC_NUHS)
32
33#define KC_BSAD LT(_ADJUST, KC_BSPC)
34
35const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 29const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
36 [_QWERTY] = LAYOUT_with_nafuda( 30 [_QWERTY] = LAYOUT_with_nafuda(
37 //,-----------------------------------------------------| |-----------------------------------------------------. |--------------------------| 31 //,-----------------------------------------------------| |-----------------------------------------------------. |--------------------------|
38 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, TG(_MOUSE), 32 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, TG(_MOUSE),
39 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------| 33 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------|
40 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSAD, KC_UP,TG(_BROWSER), 34 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,LT(_ADJUST, KC_BSPC),KC_UP,TG(_BROWSER),
41 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------| 35 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------|
42 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_LEFT, KC_DOWN,KC_RIGHT, 36 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_LEFT, KC_DOWN,KC_RIGHT,
43 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------------------------| 37 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------------------------|
@@ -73,9 +67,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
73 //,-----------------------------------------------------| |-----------------------------------------------------. |--------------------------| 67 //,-----------------------------------------------------| |-----------------------------------------------------. |--------------------------|
74 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR,KC_LPRN, KC_RPRN, KC_DEL, TG(_MOUSE), 68 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR,KC_LPRN, KC_RPRN, KC_DEL, TG(_MOUSE),
75 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------| 69 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------|
76 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_BSAD, KC_UP,TG(_MOUSE), 70 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,LT(_ADJUST, KC_BSPC),KC_UP,TG(_MOUSE),
77 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------| 71 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------|
78 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,KC_SNUHS,KC_SNUBS, _______, _______, _______, KC_LEFT, KC_DOWN,KC_RIGHT, 72 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______,_______,_______, KC_LEFT, KC_DOWN,KC_RIGHT,
79 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------------------------| 73 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------------------------|
80 _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY 74 _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
81 //`------------------------------------------------------------------------------------------------------------' 75 //`------------------------------------------------------------------------------------------------------------'
@@ -85,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
85 //,-----------------------------------------------------| |-----------------------------------------------------. |--------------------------| 79 //,-----------------------------------------------------| |-----------------------------------------------------. |--------------------------|
86 KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, TG(_MOUSE), 80 KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, TG(_MOUSE),
87 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------| 81 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------|
88 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_BSAD, KC_UP,TG(_MOUSE), 82 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,LT(_ADJUST, KC_BSPC),KC_UP,TG(_MOUSE),
89 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------| 83 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------|
90 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, KC_LEFT, KC_DOWN,KC_RIGHT, 84 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, KC_LEFT, KC_DOWN,KC_RIGHT,
91 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------------------------| 85 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------------------------|
@@ -95,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
95 89
96 [_ADJUST] = LAYOUT_with_nafuda( /* Base */ 90 [_ADJUST] = LAYOUT_with_nafuda( /* Base */
97 //,-----------------------------------------------------| |-----------------------------------------------------. |--------------------------| 91 //,-----------------------------------------------------| |-----------------------------------------------------. |--------------------------|
98 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_VAD, 92 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_VAD,
99 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------| 93 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------|
100 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR, _ADJUST, RGB_SAD, RGB_VAI, 94 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR, _ADJUST, RGB_SAD, RGB_VAI,
101 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------| 95 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------|
diff --git a/keyboards/naked48/keymaps/default_with_setta21/config.h b/keyboards/naked48/keymaps/default_with_setta21/config.h
index 1e86c6bb7..2ad4d0ade 100644
--- a/keyboards/naked48/keymaps/default_with_setta21/config.h
+++ b/keyboards/naked48/keymaps/default_with_setta21/config.h
@@ -26,6 +26,10 @@
26#define TAPPING_FORCE_HOLD 26#define TAPPING_FORCE_HOLD
27#define TAPPING_TERM 180 27#define TAPPING_TERM 180
28 28
29#ifdef RGBLED_NUM
30 #undef RGBLED_NUM
31#endif
32
29#define RGBLED_NUM 69 // Number of LEDs 33#define RGBLED_NUM 69 // Number of LEDs
30#define RGBLIGHT_SPLIT 34#define RGBLIGHT_SPLIT
31#define RGBLED_SPLIT { 48, 21 } 35#define RGBLED_SPLIT { 48, 21 }
diff --git a/keyboards/naked48/keymaps/default_with_setta21/keymap.c b/keyboards/naked48/keymaps/default_with_setta21/keymap.c
index 26278b79b..f6e460588 100644
--- a/keyboards/naked48/keymaps/default_with_setta21/keymap.c
+++ b/keyboards/naked48/keymaps/default_with_setta21/keymap.c
@@ -29,21 +29,14 @@ enum custom_keycodes {
29 SEND_MIN 29 SEND_MIN
30}; 30};
31 31
32// Fillers to make layering more clear
33#define KC_SNUBS S(KC_NUBS)
34#define KC_SNUHS S(KC_NUHS)
35
36#define KC_RADO LT(_RAISE, KC_PDOT)
37#define KC_LOP0 LT(_LOWER, KC_P0)
38
39const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 32const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
40 [_QWERTY] = LAYOUT_with_setta21( 33 [_QWERTY] = LAYOUT_with_setta21(
41 //,-----------------------------------------------------| |-----------------------------------------------------. |-----------------------------------------------| 34 //,-----------------------------------------------------| |-----------------------------------------------------. |-----------------------------------------------|
42 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_LOP0, KC_P1, KC_P4, KC_P7,KC_NLCK, KC_ESC, 35 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,LT(_LOWER, KC_P0),KC_P1, KC_P4, KC_P7,KC_NLCK, KC_ESC,
43 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| 36 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------|
44 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_P2, KC_P5, KC_P8,KC_PSLS, KC_F2, 37 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_P2, KC_P5, KC_P8,KC_PSLS, KC_F2,
45 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| 38 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------|
46 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_RADO, KC_P3, KC_P6, KC_P9,KC_PAST, KC_EQL, 39 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,LT(_RAISE, KC_PDOT),KC_P3,KC_P6, KC_P9,KC_PAST, KC_EQL,
47 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |---------------+---------------+-------+-------| 40 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |---------------+---------------+-------+-------|
48 MO(_ADJUST),KC_LCTRL, KC_LALT, KC_LGUI,MO(_LOWER), KC_SPC, KC_SPC,MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP,KC_RIGHT, KC_PENT, KC_PPLS,KC_PMNS, KC_DEL 41 MO(_ADJUST),KC_LCTRL, KC_LALT, KC_LGUI,MO(_LOWER), KC_SPC, KC_SPC,MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP,KC_RIGHT, KC_PENT, KC_PPLS,KC_PMNS, KC_DEL
49 //`------------------------------------------------------------------------------------------------------------' |-----------------------------------------------| 42 //`------------------------------------------------------------------------------------------------------------' |-----------------------------------------------|
@@ -55,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
55 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |-------+-------+-------+--------+-------+-------| 48 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |-------+-------+-------+--------+-------+-------|
56 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_DOWN,KC_DOWN, KC_UP,KC_PSLS, KC_F2, 49 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_DOWN,KC_DOWN, KC_UP,KC_PSLS, KC_F2,
57 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |-------+-------+-------+--------+-------+-------| 50 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |-------+-------+-------+--------+-------+-------|
58 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,KC_SNUHS,KC_SNUBS, _______, _______, _______, MO(_RAISE),XXXXXXX,KC_RIGHT,XXXXXXX,KC_PAST, KC_EQL, 51 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______,_______,_______, MO(_RAISE),XXXXXXX,KC_RIGHT,XXXXXXX,KC_PAST, KC_EQL,
59 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |---------------+----------------+-------+-------| 52 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |---------------+----------------+-------+-------|
60 _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, KC_PENT, KC_PPLS,KC_PMNS, KC_DEL 53 _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, KC_PENT, KC_PPLS,KC_PMNS, KC_DEL
61 //`------------------------------------------------------------------------------------------------------------' |------------------------------------------------| 54 //`------------------------------------------------------------------------------------------------------------' |------------------------------------------------|
diff --git a/keyboards/naked48/keymaps/default_with_setta21/readme.md b/keyboards/naked48/keymaps/default_with_setta21/readme.md
index 365219739..6e2a3441d 100644
--- a/keyboards/naked48/keymaps/default_with_setta21/readme.md
+++ b/keyboards/naked48/keymaps/default_with_setta21/readme.md
@@ -6,7 +6,7 @@ Add Setta21 maps to the default layout.
6| 1 | 2 | 3 | 4 | 6| 1 | 2 | 3 | 4 |
7|:----:|:----:|:----:|:----:| 7|:----:|:----:|:----:|:----:|
8| ESC| F2| =| DEL| 8| ESC| F2| =| DEL|
9|Ad+Num| /| *| -| 9| Num| /| *| -|
10| 7| 8| 9| | 10| 7| 8| 9| |
11| 4| 5| 6| +| 11| 4| 5| 6| +|
12| 1| 2| 3| | 12| 1| 2| 3| |
@@ -36,7 +36,7 @@ Add Setta21 maps to the default layout.
36| 1 | 2 | 3 | 4 | 36| 1 | 2 | 3 | 4 |
37|:----:|:----:|:----:|:----:| 37|:----:|:----:|:----:|:----:|
38| ESC| F2| =| DEL| 38| ESC| F2| =| DEL|
39|ADJUST| XXXXX| XXXXX| -| 39| XXXXX| XXXXX| XXXXX| -|
40|LED_SAD|LED_SAI| XXXXX| | 40|LED_SAD|LED_SAI| XXXXX| |
41|LED_HUD|LED_HUI| XXXXX| +| 41|LED_HUD|LED_HUI| XXXXX| +|
42|LED_VAD|LED_VAI| XXXXX| | 42|LED_VAD|LED_VAI| XXXXX| |
diff --git a/keyboards/naked48/keymaps/salicylic/config.h b/keyboards/naked48/keymaps/salicylic/config.h
index 5eceec73b..b6372db3b 100644
--- a/keyboards/naked48/keymaps/salicylic/config.h
+++ b/keyboards/naked48/keymaps/salicylic/config.h
@@ -21,6 +21,10 @@
21#define TAPPING_FORCE_HOLD 21#define TAPPING_FORCE_HOLD
22#define TAPPING_TERM 180 22#define TAPPING_TERM 180
23 23
24#ifdef RGBLED_NUM
25 #undef RGBLED_NUM
26#endif
27
24#define DRIVER_LED_TOTAL 48 28#define DRIVER_LED_TOTAL 48
25 29
26#ifdef RGB_MATRIX_ENABLE 30#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/naked48/keymaps/salicylic/keymap.c b/keyboards/naked48/keymaps/salicylic/keymap.c
index 995e8bd29..8b5e15c13 100644
--- a/keyboards/naked48/keymaps/salicylic/keymap.c
+++ b/keyboards/naked48/keymaps/salicylic/keymap.c
@@ -26,12 +26,6 @@ enum custom_keycodes {
26 RGB_RST = SAFE_RANGE 26 RGB_RST = SAFE_RANGE
27}; 27};
28 28
29// Fillers to make layering more clear
30#define KC_CT11 LCTL_T(KC_F11)
31#define KC_SF12 SFT_T(KC_F12)
32#define KC_LOEN LT(_LOWER, KC_ENT)
33#define KC_RASP LT(_RAISE, KC_SPC)
34
35const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 29const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
36 [_QWERTY] = LAYOUT( 30 [_QWERTY] = LAYOUT(
37 //,-----------------------------------------------------| |-----------------------------------------------------. 31 //,-----------------------------------------------------| |-----------------------------------------------------.
@@ -41,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
41 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 35 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
42 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, JP_COMM, JP_DOT, JP_SLSH, JP_BSLS, 36 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, JP_COMM, JP_DOT, JP_SLSH, JP_BSLS,
43 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 37 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
44 KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN, KC_LOEN, KC_BSPC, KC_DEL, KC_RASP, KC_HENK, KC_LALT, KC_DOWN, KC_UP 38 KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN,LT(_LOWER, KC_ENT), KC_BSPC, KC_DEL,LT(_RAISE, KC_SPC),KC_HENK, KC_LALT, KC_DOWN, KC_UP
45 //`------------------------------------------------------------------------------------------------------------' 39 //`------------------------------------------------------------------------------------------------------------'
46 ), 40 ),
47 41
@@ -63,11 +57,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
63 //,-----------------------------------------------------| |-----------------------------------------------------. 57 //,-----------------------------------------------------| |-----------------------------------------------------.
64 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, XXXXXXX, KC_UP, XXXXXXX, KC_PGUP, KC_DEL, 58 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, XXXXXXX, KC_UP, XXXXXXX, KC_PGUP, KC_DEL,
65 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 59 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
66 KC_CT11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, KC_LSFT, KC_ENT, 60LCTL_T(KC_F11), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, KC_LSFT, KC_ENT,
67 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 61 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
68 KC_SF12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX, 62SFT_T(KC_F12), KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX,
69 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 63 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
70 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 64 _______, _______, _______, KC_MHEN, _______, _______, _______, _______, KC_HENK, _______, _______, _______
71 //`------------------------------------------------------------------------------------------------------------' 65 //`------------------------------------------------------------------------------------------------------------'
72 ), 66 ),
73 67
@@ -101,7 +95,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
101 RGB_current_mode = rgblight_config.mode; 95 RGB_current_mode = rgblight_config.mode;
102 } 96 }
103 break; 97 break;
104 case RGBRST: 98 case RGB_RST:
105 if (record->event.pressed) { 99 if (record->event.pressed) {
106 eeconfig_update_rgblight_default(); 100 eeconfig_update_rgblight_default();
107 rgblight_enable(); 101 rgblight_enable();
diff --git a/keyboards/naked48/keymaps/salicylic/readme.md b/keyboards/naked48/keymaps/salicylic/readme.md
index cd5e6e729..6563bb46f 100644
--- a/keyboards/naked48/keymaps/salicylic/readme.md
+++ b/keyboards/naked48/keymaps/salicylic/readme.md
@@ -1,46 +1,37 @@
1# The salicylic keymap for naked48 1# The salicylic keymap for naked48
2 2
3Default 3## Default
4 //,-----------------------------------------| |-----------------------------------------. 4| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 |
5 TAB, Q, W, E, R, T, Y, U, I, O, P, [, 5|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
6 //|------+------+------+------+------+------| |------+------+------+------+------+------| 6| TAB | Q| W| E| R| T| | | Y| U| I| O| P| [|
7 LSFT, A, S, D, F, G, H, J, K, L, -, ], 7|LCTRL | A| S| D| F| G| | | H| J| K| L| -| ]|
8 //|------+------+------+------+------+------| |------+------+------+------+------+------| 8| LSFT | Z| X| C| V| B| | | N| M| ,| .| /| \|
9 LCTRL, Z, X, C, V, B, N, M, ,, ., /, \, 9| | LEFT| RIGHT| LGUI| MHEN|LOWER, ENT|BSPC|DEL|RAISE,SPC|HENK| LALT| DOWN| UP| |
10 //|------+------+------+------+------+-------|------+-----+-------+-----+------+------+------| 10
11 LEFT, RIGHT, LGUI, MHEN,Low+Ent, BSPC, DEL,Rai+SPC, HENK, LALT, UP, DOWN 11
12 //`----------------------------------------------------------------------------------' 12## Lower
13 13| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 |
14Lower 14|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
15 //,-----------------------------------------| |-----------------------------------------. 15| ESC| !| ?| [| ]| ~| | | 6| 7| 8| 9| *| /|
16 ESC, EXLM, JQUES, JLBRC, JRBRC, JTILD, 6, 7, 8, 9, *, /, 16| '| #| "| (| )| @| | | XXXXX| 4| 5| 6| -| =|
17 //|------+------+------+------+------+------| |------+------+------+------+------+------| 17| ^| %| &| ;| :| PIPE| | | 0| 1| 2| 3| +| ENT|
18 JQUOT, HASH, JDQUO, JLPRN, JRPRN, JAT, XXXXX, 4, 5, 6, -, =, 18| | LEFT| RIGHT| LGUI| ZKHK| LOWER| BSPC| DEL| RAISE| HENK| LALT| DOWN| UP| |
19 //|------+------+------+------+------+------| |------+------+------+------+------+------| 19
20 JHAT, PERC, JAMPR, SCLN, JCLON, JPIPE, 0, 1, 2, 3, +, ENT, 20
21 //|------+------+------+------+------+------|------+------+------+------+------+------+------| 21## Raise
22 LEFT, RIGHT, LGUI, ZKHK, LOWER, BSPC, DEL, RAISE, 0, DOT, UP, DOWN 22| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 |
23 //`----------------------------------------------------------------------------------' 23|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
24 24| ESC| 1| 2| 3| 4| 5| | | 6| XXXXX| UP| XXXXX| PGUP| DEL|
25Raise 25|F11,LCTRL| F1| F2| F3| F4| F5| | | XXXXX| LEFT| DOWN| RIGHT| LSFT| ENT|
26 //,-----------------------------------------| |-----------------------------------------. 26|F12,LSFT| F6| F7| F8| F9| F10| | | XXXXX| XXXXX| XXXXX| XXXXX| PGDN| XXXXX|
27 ESC, 1, 2, 3, 4, 5, 6, XXXXX, UP, XXXXX, PGUP, BSPC, 27| | LEFT| RIGHT| LGUI| MHEN| LOWER| BSPC| DEL| RAISE| HENK| LALT| DOWN| UP| |
28 //|------+------+------+------+------+------| |------+------+------+------+------+------| 28
29 Ctrl F11, F1, F2, F3, F4, F5, XXXXX, LEFT, DOWN, RIGHT, LSFT, ENT, 29
30 //|------+------+------+------+------+------| |------+------+------+------+------+------| 30## Adjust
31 Shift F12, F6, F7, F8, F9, F10, XXXXX, XXXXX, XXXXX, XXXXX, PGDN, XXXXX, 31| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 |
32 //|------+------+------+------+------+------|------+------+------+------+------+------+------| 32|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:------:|:------:|:------:|:------:|:-------:|:------:|
33 LEFT, RIGHT, LGUI, ZKHK, LOWER, BSPC, DEL, RAISE, 0, DOT, UP, DOWN 33| ESC| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX| | | RGB_RST| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX|
34 //`----------------------------------------------------------------------------------' 34| LCTRL| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX| | | RGB_TOG| RGB_MOD| XXXXX| C+A+D| Alt+PSCR| PSCR|
35 35| LSFT| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX| | | RGB_VAD| RGB_VAI| RGB_HUD| RGB_HUI| RGB_SAD| RGB_SAI|
36Adjust 36| | LEFT| RIGHT| LGUI| MHEN| LOWER| BSPC| DEL| RAISE| HENK| LALT| DOWN| UP| |
37 //,-----------------------------------------| |----------------------------------------------. 37
38 ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, DEL,
39 //|------+------+------+------+------+------| |------+-------+-------+-------+-------+-------|
40 Ctrl F11, F1, F2, F3, F4, F5, LED ON/Off,LED MOD, XXXXX, C+A+D,Alt+PSCR, PSCR,
41 //|------+------+------+------+------+------| |------+-------+-------+-------+-------+-------|
42 Shift F12, F6, F7, F8, F9, F10, LED VAD,LED VAI,LED HUD,LED HUI,LED SAD,LED SAI,
43 //|------+------+------+------+------+------|------+------+------+-------+-------+-------+-------|
44 LEFT, RIGHT, LGUI, ZKHK, LOWER, BSPC, DEL, RAISE, 0, DOT, UP, DOWN
45 //`--------------------------------------------------------------------------------------'
46 ) \ No newline at end of file
diff --git a/keyboards/naked48/keymaps/salicylic_with_nafuda/config.h b/keyboards/naked48/keymaps/salicylic_with_nafuda/config.h
index a2ce42ea5..7ce641601 100644
--- a/keyboards/naked48/keymaps/salicylic_with_nafuda/config.h
+++ b/keyboards/naked48/keymaps/salicylic_with_nafuda/config.h
@@ -27,6 +27,10 @@
27#define TAPPING_FORCE_HOLD 27#define TAPPING_FORCE_HOLD
28#define TAPPING_TERM 180 28#define TAPPING_TERM 180
29 29
30#ifdef RGBLED_NUM
31 #undef RGBLED_NUM
32#endif
33
30#define RGBLED_NUM 55 // Number of LEDs 34#define RGBLED_NUM 55 // Number of LEDs
31#define RGBLIGHT_SPLIT 35#define RGBLIGHT_SPLIT
32#define RGBLED_SPLIT { 48, 7 } 36#define RGBLED_SPLIT { 48, 7 }
diff --git a/keyboards/naked48/keymaps/salicylic_with_nafuda/keymap.c b/keyboards/naked48/keymaps/salicylic_with_nafuda/keymap.c
index dbb1797ce..5a99b8c0a 100644
--- a/keyboards/naked48/keymaps/salicylic_with_nafuda/keymap.c
+++ b/keyboards/naked48/keymaps/salicylic_with_nafuda/keymap.c
@@ -27,25 +27,16 @@ enum custom_keycodes {
27 RGB_RST = SAFE_RANGE 27 RGB_RST = SAFE_RANGE
28}; 28};
29 29
30// Fillers to make layering more clear
31#define KC_CT11 LCTL_T(KC_F11)
32#define KC_SF12 SFT_T(KC_F12)
33#define KC_LOEN LT(_LOWER, KC_ENT)
34#define KC_RASP LT(_RAISE, KC_SPC)
35
36#define KC_BSAD LT(_ADJUST, KC_BSPC)
37
38
39const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 30const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
40 [_QWERTY] = LAYOUT_with_nafuda( 31 [_QWERTY] = LAYOUT_with_nafuda(
41 //,-----------------------------------------------------| |-----------------------------------------------------. |--------------------------| 32 //,-----------------------------------------------------| |-----------------------------------------------------. |--------------------------|
42 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, JP_LBRC, TG(_MOUSE), 33 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, JP_LBRC, TG(_MOUSE),
43 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------| 34 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------|
44 KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, JP_MINS, JP_RBRC, KC_BSAD, KC_UP,TG(_BROWSER), 35 KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, JP_MINS, JP_RBRC,LT(_ADJUST, KC_BSPC),KC_UP,TG(_BROWSER),
45 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------| 36 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------|
46 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, JP_COMM, JP_DOT, JP_SLSH, JP_BSLS, KC_LEFT, KC_DOWN,KC_RIGHT, 37 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, JP_COMM, JP_DOT, JP_SLSH, JP_BSLS, KC_LEFT, KC_DOWN,KC_RIGHT,
47 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------------------------| 38 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------------------------|
48 KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN, KC_LOEN, KC_BSPC, KC_DEL, KC_RASP, KC_HENK, KC_LALT, KC_DOWN, KC_UP 39 KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN,LT(_LOWER, KC_ENT), KC_BSPC, KC_DEL,LT(_RAISE, KC_SPC),KC_HENK, KC_LALT, KC_DOWN, KC_UP
49 //`------------------------------------------------------------------------------------------------------------' 40 //`------------------------------------------------------------------------------------------------------------'
50 ), 41 ),
51 42
@@ -57,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
57 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------| 48 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------|
58 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, JP_COMM, JP_DOT, JP_SLSH, JP_BSLS, KC_MS_L, KC_MS_D, KC_MS_R, 49 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, JP_COMM, JP_DOT, JP_SLSH, JP_BSLS, KC_MS_L, KC_MS_D, KC_MS_R,
59 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------------------------| 50 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------------------------|
60 KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN, KC_LOEN, KC_BSPC, KC_DEL, KC_RASP, KC_HENK, KC_LALT, KC_DOWN, KC_UP 51 KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN,LT(_LOWER, KC_ENT), KC_BSPC, KC_DEL,LT(_RAISE, KC_SPC),KC_HENK, KC_LALT, KC_DOWN, KC_UP
61 //`------------------------------------------------------------------------------------------------------------' 52 //`------------------------------------------------------------------------------------------------------------'
62 ), 53 ),
63 54
@@ -69,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
69 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------| 60 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------|
70 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, JP_COMM, JP_DOT, JP_SLSH, JP_BSLS,LCTL(LSFT(KC_TAB)), KC_WH_D,LCTL(KC_TAB), 61 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, JP_COMM, JP_DOT, JP_SLSH, JP_BSLS,LCTL(LSFT(KC_TAB)), KC_WH_D,LCTL(KC_TAB),
71 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------------------------| 62 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------------------------|
72 KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN, KC_LOEN, KC_BSPC, KC_DEL, KC_RASP, KC_HENK, KC_LALT, KC_DOWN, KC_UP 63 KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN,LT(_LOWER, KC_ENT), KC_BSPC, KC_DEL,LT(_RAISE, KC_SPC),KC_HENK, KC_LALT, KC_DOWN, KC_UP
73 //`------------------------------------------------------------------------------------------------------------' 64 //`------------------------------------------------------------------------------------------------------------'
74 ), 65 ),
75 66
@@ -77,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
77 //,-----------------------------------------------------| |-----------------------------------------------------. |--------------------------| 68 //,-----------------------------------------------------| |-----------------------------------------------------. |--------------------------|
78 KC_ESC, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD, KC_6, KC_7, KC_8, KC_9, JP_ASTR, JP_SLSH, TG(_MOUSE), 69 KC_ESC, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD, KC_6, KC_7, KC_8, KC_9, JP_ASTR, JP_SLSH, TG(_MOUSE),
79 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------| 70 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------|
80 JP_QUOT, JP_HASH, JP_DQT, JP_LPRN, JP_RPRN, JP_AT, XXXXXXX, KC_4, KC_5, KC_6, JP_MINS, JP_EQL, KC_BSAD, KC_UP,TG(_BROWSER), 71 JP_QUOT, JP_HASH, JP_DQT, JP_LPRN, JP_RPRN, JP_AT, XXXXXXX, KC_4, KC_5, KC_6, JP_MINS, JP_EQL,LT(_ADJUST, KC_BSPC),KC_UP,TG(_BROWSER),
81 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------| 72 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------|
82 JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE, KC_0, KC_1, KC_2, KC_3, JP_PLUS, KC_ENT, KC_LEFT, KC_DOWN,KC_RIGHT, 73 JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE, KC_0, KC_1, KC_2, KC_3, JP_PLUS, KC_ENT, KC_LEFT, KC_DOWN,KC_RIGHT,
83 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------------------------| 74 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------------------------|
@@ -89,17 +80,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
89 //,-----------------------------------------------------| |-----------------------------------------------------. |--------------------------| 80 //,-----------------------------------------------------| |-----------------------------------------------------. |--------------------------|
90 KC_ESC, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD, KC_6, KC_7, KC_8, KC_9, JP_ASTR, JP_SLSH, TG(_MOUSE), 81 KC_ESC, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD, KC_6, KC_7, KC_8, KC_9, JP_ASTR, JP_SLSH, TG(_MOUSE),
91 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------| 82 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------|
92 KC_CT11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, KC_LSFT, KC_ENT, KC_BSAD, KC_UP,TG(_BROWSER), 83LCTL_T(KC_F11), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, KC_LSFT, KC_ENT,LT(_ADJUST, KC_BSPC),KC_UP,TG(_BROWSER),
93 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------| 84 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------|
94 KC_SF12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, 85SFT_T(KC_F12), KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT,
95 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------------------------| 86 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------------------------|
96 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 87 _______, _______, _______, KC_MHEN, _______, _______, _______, _______, KC_HENK, _______, _______, _______
97 //`------------------------------------------------------------------------------------------------------------' 88 //`------------------------------------------------------------------------------------------------------------'
98 ), 89 ),
99 90
100 [_ADJUST] = LAYOUT_with_nafuda( /* Base */ 91 [_ADJUST] = LAYOUT_with_nafuda( /* Base */
101 //,-----------------------------------------------------| |-----------------------------------------------------. |--------------------------| 92 //,-----------------------------------------------------| |-----------------------------------------------------. |--------------------------|
102 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_VAD, 93 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD,
103 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------| 94 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------|
104 KC_LCTRL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR, _ADJUST, RGB_SAD, RGB_VAI, 95 KC_LCTRL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR, _ADJUST, RGB_SAD, RGB_VAI,
105 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------| 96 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------|
diff --git a/keyboards/naked48/keymaps/salicylic_with_setta21/config.h b/keyboards/naked48/keymaps/salicylic_with_setta21/config.h
index 1e86c6bb7..2ad4d0ade 100644
--- a/keyboards/naked48/keymaps/salicylic_with_setta21/config.h
+++ b/keyboards/naked48/keymaps/salicylic_with_setta21/config.h
@@ -26,6 +26,10 @@
26#define TAPPING_FORCE_HOLD 26#define TAPPING_FORCE_HOLD
27#define TAPPING_TERM 180 27#define TAPPING_TERM 180
28 28
29#ifdef RGBLED_NUM
30 #undef RGBLED_NUM
31#endif
32
29#define RGBLED_NUM 69 // Number of LEDs 33#define RGBLED_NUM 69 // Number of LEDs
30#define RGBLIGHT_SPLIT 34#define RGBLIGHT_SPLIT
31#define RGBLED_SPLIT { 48, 21 } 35#define RGBLED_SPLIT { 48, 21 }
diff --git a/keyboards/naked48/keymaps/salicylic_with_setta21/keymap.c b/keyboards/naked48/keymaps/salicylic_with_setta21/keymap.c
index d04b53d7b..cbe65fe66 100644
--- a/keyboards/naked48/keymaps/salicylic_with_setta21/keymap.c
+++ b/keyboards/naked48/keymaps/salicylic_with_setta21/keymap.c
@@ -30,25 +30,16 @@ enum custom_keycodes {
30 SEND_MIN 30 SEND_MIN
31}; 31};
32 32
33// Fillers to make layering more clear
34#define KC_CT11 LCTL_T(KC_F11)
35#define KC_SF12 SFT_T(KC_F12)
36#define KC_LOEN LT(_LOWER, KC_ENT)
37#define KC_RASP LT(_RAISE, KC_SPC)
38
39#define KC_RADO LT(_RAISE, KC_PDOT)
40#define KC_LOP0 LT(_LOWER, KC_P0)
41
42const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 33const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
43 [_QWERTY] = LAYOUT_with_setta21( 34 [_QWERTY] = LAYOUT_with_setta21(
44 //,-----------------------------------------------------| |-----------------------------------------------------. |-----------------------------------------------| 35 //,-----------------------------------------------------| |-----------------------------------------------------. |-----------------------------------------------|
45 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, JP_LBRC, KC_LOP0, KC_P1, KC_P4, KC_P7,KC_NLCK, KC_ESC, 36 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, JP_LBRC,LT(_LOWER, KC_P0),KC_P1, KC_P4, KC_P7,KC_NLCK, KC_ESC,
46 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| 37 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------|
47 KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, JP_MINS, JP_RBRC, KC_P2, KC_P5, KC_P8,KC_PSLS, KC_F2, 38 KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, JP_MINS, JP_RBRC, KC_P2, KC_P5, KC_P8,KC_PSLS, KC_F2,
48 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| 39 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------|
49 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, JP_COMM, JP_DOT, JP_SLSH, JP_BSLS, KC_RADO, KC_P3, KC_P6, KC_P9,KC_PAST, JP_EQL, 40 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, JP_COMM, JP_DOT, JP_SLSH, JP_BSLS,LT(_RAISE, KC_PDOT),KC_P3,KC_P6, KC_P9,KC_PAST, JP_EQL,
50 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |---------------+---------------+-------+-------| 41 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |---------------+---------------+-------+-------|
51 KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN, KC_LOEN, KC_BSPC, KC_DEL, KC_RASP, KC_HENK, KC_LALT, KC_DOWN, KC_UP, KC_PENT, KC_PPLS,KC_PMNS, KC_DEL 42 KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN,LT(_LOWER, KC_ENT), KC_BSPC, KC_DEL,LT(_RAISE, KC_SPC),KC_HENK, KC_LALT, KC_DOWN, KC_UP, KC_PENT, KC_PPLS,KC_PMNS, KC_DEL
52 //`------------------------------------------------------------------------------------------------------------' |-----------------------------------------------| 43 //`------------------------------------------------------------------------------------------------------------' |-----------------------------------------------|
53 ), 44 ),
54 45
@@ -68,11 +59,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
68 //,-----------------------------------------------------| |-----------------------------------------------------. |-----------------------------------------------| 59 //,-----------------------------------------------------| |-----------------------------------------------------. |-----------------------------------------------|
69 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, XXXXXXX, KC_UP, XXXXXXX, KC_PGUP, KC_DEL, _______, KC_F11, KC_F4, KC_F7,SEND_MIN, KC_ESC, 60 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, XXXXXXX, KC_UP, XXXXXXX, KC_PGUP, KC_DEL, _______, KC_F11, KC_F4, KC_F7,SEND_MIN, KC_ESC,
70 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| 61 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------|
71 KC_CT11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, KC_LSFT, KC_ENT, KC_F12, KC_F5, KC_F8,SEND_MAX, KC_F2, 62LCTL_T(KC_F11), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, KC_LSFT, KC_ENT, KC_F12, KC_F5, KC_F8,SEND_MAX, KC_F2,
72 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------| 63 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------|
73 KC_SF12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX, _______, KC_F3, KC_F6, KC_F9,SEND_CIF, JP_EQL, 64SFT_T(KC_F12), KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX, _______, KC_F3, KC_F6, KC_F9,SEND_CIF, JP_EQL,
74 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |---------------+---------------+-------+-------| 65 //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |---------------+---------------+-------+-------|
75 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, JP_RPRN, SEND_SUM,SEND_AVE, KC_DEL 66 _______, _______, _______, KC_MHEN, _______, _______, _______, _______, KC_HENK, _______, _______, _______, JP_RPRN, SEND_SUM,SEND_AVE, KC_DEL
76 //`------------------------------------------------------------------------------------------------------------' |-----------------------------------------------| 67 //`------------------------------------------------------------------------------------------------------------' |-----------------------------------------------|
77 ), 68 ),
78 69
diff --git a/keyboards/naked48/keymaps/salicylic_with_setta21/readme.md b/keyboards/naked48/keymaps/salicylic_with_setta21/readme.md
index fa7ece5d9..2c76bc290 100644
--- a/keyboards/naked48/keymaps/salicylic_with_setta21/readme.md
+++ b/keyboards/naked48/keymaps/salicylic_with_setta21/readme.md
@@ -2,46 +2,43 @@
2 2
3Add Setta21 maps to the salicylic layout. 3Add Setta21 maps to the salicylic layout.
4 4
5Default 5## Default
6 //|-----------------------------------------| 6| 1 | 2 | 3 | 4 |
7 Rai+0, 1, 4, 7,Ad+Num, ESC, 7|:----:|:----:|:----:|:----:|
8 //|------+------+------+------+------+------| 8| ESC| F2| =| DEL|
9 2, 5, 8, /, F2, 9| Num| /| *| -|
10 //|------+------+------+------+------+------| 10| 7| 8| 9| |
11 Low+., 3, 6, 9, *, =, 11| 4| 5| 6| +|
12 //|-------------+-------------+------+------| 12| 1| 2| 3| |
13 ENT, +, -, DEL 13| Rai+0| | LOW + .| ENT|
14 //|-----------------------------------------|
15 14
16Lower 15## Lower
17 //|-----------------------------------------| 16| 1 | 2 | 3 | 4 |
18 RAISE, F11, F4, F7, "=MIN(", ESC, 17|:----:|:----:|:----:|:----:|
19 //|------+------+------+------+-----------+------| 18| ESC| F2| =| DEL|
20 F12, F5, F8, "=MAX(", F2, 19| =MIN(| =MAX(|=COUNTIF(|=AVERAGE(|
21 //|------+------+------+------+-----------+------| 20| F7| F8| F9| |
22 LOWER, F3, F6, F9,"=COUNTIF(", =, 21| F4| F5| F6| =SUM(|
23 //|-------------+-------------+-----------+------| 22| F11| F12| F3| |
24 ), "=SUM(","=AVERAGE(", DEL 23| RAISE| | LOWER| )|
25 //|-----------------------------------------|
26 24
27Raise 25## Raise
28 //|-----------------------------------------| 26| 1 | 2 | 3 | 4 |
29 RAISE, XXXXX, LEFT, XXXXX, XXXXX, ESC, 27|:----:|:----:|:----:|:----:|
30 //|------+------+------+------+------+------| 28| ESC| F2| =| DEL|
31 DOWN, DOWN, UP, /, F2, 29| XXXXX| /| *| -|
32 //|------+------+------+------+------+------| 30| XXXXX| UP| XXXXX| |
33 LOWER, XXXXX, RIGHT, XXXXX, *, =, 31| LEFT| DOWN| RIGHT| +|
34 //|-------------+-------------+------+------| 32| XXXXX| DOWN| XXXXX| |
35 ENT, +, -, DEL 33| RAISE| | LOWER| ENT|
36 //|-----------------------------------------| 34
35## Adjust
36| 1 | 2 | 3 | 4 |
37|:----:|:----:|:----:|:----:|
38| ESC| F2| =| DEL|
39| XXXXX| XXXXX| XXXXX| -|
40|LED_SAD|LED_SAI| XXXXX| |
41|LED_HUD|LED_HUI| XXXXX| +|
42|LED_VAD|LED_VAI| XXXXX| |
43|LED_ON/Off| | XXXXX|LED_MOD|
37 44
38Adjust
39 //|------------------------------------------------|
40 LED ON/Off,LED VAD,LED HUD,LED SAD, ADJUST, ESC,
41 //|--------+-------+-------+-------+-------+-------|
42 LED VAI,LED HUI,LED SAI, XXXXX, F2,
43 //|--------+-------+-------+-------+-------+-------|
44 XXXXX, XXXXX, XXXXX, XXXXX, XXXXX, =,
45 //|----------------+---------------+-------+-------|
46 LED MOD, +, -, DEL
47 //|------------------------------------------------|
diff --git a/keyboards/naked48/rev1/config.h b/keyboards/naked48/rev1/config.h
index 9afa87511..0d0390366 100644
--- a/keyboards/naked48/rev1/config.h
+++ b/keyboards/naked48/rev1/config.h
@@ -52,6 +52,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
52 52
53/* ws2812 RGB LED */ 53/* ws2812 RGB LED */
54#define RGB_DI_PIN D3 54#define RGB_DI_PIN D3
55
56#ifndef RGBLED_NUM
57 #define RGBLED_NUM 48
58#endif
59
55#define RGBLIGHT_ANIMATIONS 60#define RGBLIGHT_ANIMATIONS
56 61
57#ifndef IOS_DEVICE_ENABLE 62#ifndef IOS_DEVICE_ENABLE
@@ -64,19 +69,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
64#define RGBLIGHT_HUE_STEP 10 69#define RGBLIGHT_HUE_STEP 10
65#define RGBLIGHT_SAT_STEP 17 70#define RGBLIGHT_SAT_STEP 17
66 71
67// Selection of RGBLIGHT MODE to use.
68#if defined(LED_ANIMATIONS)
69 //#define RGBLIGHT_EFFECT_BREATHING
70 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
71 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
72 //#define RGBLIGHT_EFFECT_SNAKE
73 #define RGBLIGHT_EFFECT_KNIGHT
74 //#define RGBLIGHT_EFFECT_CHRISTMAS
75 #define RGBLIGHT_EFFECT_STATIC_GRADIENT
76 //#define RGBLIGHT_EFFECT_RGB_TEST
77 //#define RGBLIGHT_EFFECT_ALTERNATING
78#endif
79
80#if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE) 72#if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
81// USB_MAX_POWER_CONSUMPTION value for naked48 keyboard 73// USB_MAX_POWER_CONSUMPTION value for naked48 keyboard
82// 120 RGBoff, OLEDoff 74// 120 RGBoff, OLEDoff
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-18 11:49:08 +0000