diff --git a/keyboards/a_dux/keymaps/sadekbaroudi/keymap.c b/keyboards/a_dux/keymaps/sadekbaroudi/keymap.c
index ef2e83c459..59fe5162b2 100644
--- a/keyboards/a_dux/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/a_dux/keymaps/sadekbaroudi/keymap.c
@@ -33,13 +33,14 @@
#define LAYOUT_adux_base( \
K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
- K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
+ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
+ K34, K35, K36, K37 \
) \
LAYOUT_wrapper( \
K01, K02, K03, LT(_FUNCTION, K04), K05, K06, LT(_FUNCTION, K07), LT(_WINNAV,K08), K09, K0A, \
LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, LT(_MOUSE, K16), RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), \
K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
- LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB), LT(_MEDIA,KC_BSPC), LT(_SYMBOLS,KC_SPACE) \
+ LT(_NAVIGATION,K34), LT(_FUNCTION,K35), LT(_MEDIA,K36), LT(_SYMBOLS,K37) \
)
/* Re-pass though to allow templates to be used */
@@ -50,13 +51,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ALPHA_ALT] = LAYOUT_adux_base_wrapper(
_________________ALPHA_ALT_L1_________________, _________________ALPHA_ALT_R1_________________,
_________________ALPHA_ALT_L2_________________, _________________ALPHA_ALT_R2_________________,
- _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________
+ _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________,
+ __ALPHA_ALT_THUMBS_4__
),
[_ALPHA] = LAYOUT_adux_base_wrapper(
__________________ALPHA_L1____________________, __________________ALPHA_R1____________________,
__________________ALPHA_L2____________________, __________________ALPHA_R2____________________,
- __________________ALPHA_L3____________________, __________________ALPHA_R3____________________
+ __________________ALPHA_L3____________________, __________________ALPHA_R3____________________,
+ __ALPHA_THUMBS_4__
),
[_NAVIGATION] = LAYOUT_wrapper(
diff --git a/keyboards/absolem/keymaps/sadekbaroudi/keymap.c b/keyboards/absolem/keymaps/sadekbaroudi/keymap.c
index 5491e1e9c1..3ab00d61cc 100644
--- a/keyboards/absolem/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/absolem/keymaps/sadekbaroudi/keymap.c
@@ -30,13 +30,14 @@
#define LAYOUT_absolem_base( \
K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, \
K11, K12, K13, K14, K15, K16, K17, K18, K19, K20, \
- K21, K22, K23, K24, K25, K26, K27, K28, K29, K30 \
+ K21, K22, K23, K24, K25, K26, K27, K28, K29, K30, \
+ K33, K34, K35, K36, K37, K38 \
) \
LAYOUT_wrapper( \
K01, K02, K03, LT(_FUNCTION, K04), K05, K06, LT(_FUNCTION, K07), LT(_WINNAV,K08), K09, K10, \
LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, LT(_MOUSE, K16), RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K20), \
K21, K22, K23, K24, K25, K26, K27, K28, K29, K30, \
- KC_DEL, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB), LT(_MEDIA,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT \
+ K33, LT(_NAVIGATION,K34), LT(_FUNCTION,K35), LT(_MEDIA,K36), LT(_SYMBOLS,K37), K38 \
)
/* Re-pass though to allow templates to be used */
@@ -47,13 +48,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ALPHA_ALT] = LAYOUT_absolem_base_wrapper(
_________________ALPHA_ALT_L1_________________, _________________ALPHA_ALT_R1_________________,
_________________ALPHA_ALT_L2_________________, _________________ALPHA_ALT_R2_________________,
- _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________
+ _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________,
+ __ALPHA_ALT_THUMBS_6__
),
[_ALPHA] = LAYOUT_absolem_base_wrapper(
__________________ALPHA_L1____________________, __________________ALPHA_R1____________________,
__________________ALPHA_L2____________________, __________________ALPHA_R2____________________,
- __________________ALPHA_L3____________________, __________________ALPHA_R3____________________
+ __________________ALPHA_L3____________________, __________________ALPHA_R3____________________,
+ __ALPHA_THUMBS_6__
),
[_NAVIGATION] = LAYOUT_wrapper(
diff --git a/keyboards/boardsource/technik_o/keymaps/sadekbaroudi/keymap.c b/keyboards/boardsource/technik_o/keymaps/sadekbaroudi/keymap.c
index 24e1eb2cee..39998c56cd 100644
--- a/keyboards/boardsource/technik_o/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/boardsource/technik_o/keymaps/sadekbaroudi/keymap.c
@@ -17,11 +17,6 @@
#include "sadekbaroudi.h"
#include QMK_KEYBOARD_H
-#ifndef UNICODE_ENABLE
-# define UC(x) KC_NO
-#endif
-
-
/*
* The `LAYOUT_technik_o_base` macro is a template to allow the use of identical
* modifiers for the default layouts (eg ALPHA_ALT, Colemak, Dvorak, etc), so
@@ -34,13 +29,14 @@
#define LAYOUT_ortho_4x12_base( \
K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
- K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
+ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
+ K33, K34, K35, K36, K37, K38 \
) \
LAYOUT_wrapper( \
_______, K01, K02, K03, LT(_FUNCTION, K04), K05, K06, LT(_FUNCTION, K07), LT(_WINNAV,K08), K09, K0A, _______, \
_______, LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, LT(_MOUSE, K16), RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), _______, \
_______, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, _______, \
- _______, _______, _______, KC_DEL, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB), LT(_MEDIA,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT, _______, _______, _______ \
+ _______, _______, _______, K33, LT(_NAVIGATION,K34), LT(_FUNCTION,K35), LT(_MEDIA,K36), LT(_SYMBOLS,K37), K38, _______, _______, _______ \
)
/* Re-pass though to allow templates to be used */
@@ -51,13 +47,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ALPHA_ALT] = LAYOUT_ortho_4x12_base_wrapper(
_________________ALPHA_ALT_L1_________________, _________________ALPHA_ALT_R1_________________,
_________________ALPHA_ALT_L2_________________, _________________ALPHA_ALT_R2_________________,
- _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________
+ _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________,
+ __ALPHA_ALT_THUMBS_6__
),
[_ALPHA] = LAYOUT_ortho_4x12_base_wrapper(
__________________ALPHA_L1____________________, __________________ALPHA_R1____________________,
__________________ALPHA_L2____________________, __________________ALPHA_R2____________________,
- __________________ALPHA_L3____________________, __________________ALPHA_R3____________________
+ __________________ALPHA_L3____________________, __________________ALPHA_R3____________________,
+ __ALPHA_THUMBS_6__
),
[_NAVIGATION] = LAYOUT_wrapper(
diff --git a/keyboards/crkbd/keymaps/sadekbaroudi/keymap.c b/keyboards/crkbd/keymaps/sadekbaroudi/keymap.c
index 7858ad080d..3135d0f4d7 100644
--- a/keyboards/crkbd/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/crkbd/keymaps/sadekbaroudi/keymap.c
@@ -20,10 +20,6 @@ along with this program. If not, see .
#include QMK_KEYBOARD_H
-#ifndef UNICODE_ENABLE
-# define UC(x) KC_NO
-#endif
-
/*
* The `LAYOUT_crkbd_base` macro is a template to allow the use of identical
* modifiers for the default layouts (eg ALPHA_ALT, Colemak, Dvorak, etc), so
@@ -36,13 +32,14 @@ along with this program. If not, see .
#define LAYOUT_crkbd_base( \
K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
- K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
+ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
+ K33, K34, K35, K36, K37, K38 \
) \
LAYOUT_wrapper( \
_______, K01, K02, K03, LT(_FUNCTION, K04), K05, K06, LT(_FUNCTION, K07), LT(_WINNAV,K08), K09, K0A, _______, \
_______, LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, LT(_MOUSE, K16), RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), _______, \
_______, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, _______, \
- KC_DEL, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB), LT(_FUNCTION,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT \
+ K33, LT(_NAVIGATION,K34), LT(_FUNCTION,K35), LT(_MEDIA,K36), LT(_SYMBOLS,K37), K38 \
)
/* Re-pass though to allow templates to be used */
#define LAYOUT_crkbd_base_wrapper(...) LAYOUT_crkbd_base(__VA_ARGS__)
@@ -51,13 +48,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ALPHA_ALT] = LAYOUT_crkbd_base_wrapper(
_________________ALPHA_ALT_L1_________________, _________________ALPHA_ALT_R1_________________,
_________________ALPHA_ALT_L2_________________, _________________ALPHA_ALT_R2_________________,
- _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________
+ _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________,
+ __ALPHA_ALT_THUMBS_6__
),
[_ALPHA] = LAYOUT_crkbd_base_wrapper(
__________________ALPHA_L1____________________, __________________ALPHA_R1____________________,
__________________ALPHA_L2____________________, __________________ALPHA_R2____________________,
- __________________ALPHA_L3____________________, __________________ALPHA_R3____________________
+ __________________ALPHA_L3____________________, __________________ALPHA_R3____________________,
+ __ALPHA_THUMBS_6__
),
[_NAVIGATION] = LAYOUT_wrapper(
diff --git a/keyboards/draculad/keymaps/sadekbaroudi/keymap.c b/keyboards/draculad/keymaps/sadekbaroudi/keymap.c
index 6b846dc775..0ad9f75a1e 100644
--- a/keyboards/draculad/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/draculad/keymaps/sadekbaroudi/keymap.c
@@ -19,13 +19,14 @@ char wpm_as_str[8];
#define LAYOUT_draculad_base( \
K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
- K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
+ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
+ K33, K34, K35, K36, K37, K38 \
) \
LAYOUT_wrapper( \
K01, K02, K03, LT(_FUNCTION, K04), K05, K06, LT(_FUNCTION, K07), LT(_WINNAV,K08), K09, K0A, \
LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, LT(_MOUSE, K16), RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), \
K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
- KC_MUTE, KC_DEL, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB), LT(_MEDIA,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT, LCTL(KC_BSPC) \
+ KC_MUTE, K33, LT(_NAVIGATION,K34), LT(_FUNCTION,K35), LT(_MEDIA,K36), LT(_SYMBOLS,K37), K38, LCTL(KC_BSPC) \
)
/* Re-pass though to allow templates to be used */
@@ -36,13 +37,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ALPHA_ALT] = LAYOUT_draculad_base_wrapper(
_________________ALPHA_ALT_L1_________________, _________________ALPHA_ALT_R1_________________,
_________________ALPHA_ALT_L2_________________, _________________ALPHA_ALT_R2_________________,
- _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________
+ _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________,
+ __ALPHA_ALT_THUMBS_6__
),
[_ALPHA] = LAYOUT_draculad_base_wrapper(
__________________ALPHA_L1____________________, __________________ALPHA_R1____________________,
__________________ALPHA_L2____________________, __________________ALPHA_R2____________________,
- __________________ALPHA_L3____________________, __________________ALPHA_R3____________________
+ __________________ALPHA_L3____________________, __________________ALPHA_R3____________________,
+ __ALPHA_THUMBS_6__
),
[_NAVIGATION] = LAYOUT_wrapper(
diff --git a/keyboards/fingerpunch/barobord/keymaps/sadekbaroudi/keymap.c b/keyboards/fingerpunch/barobord/keymaps/sadekbaroudi/keymap.c
index f169a666f3..facd9f56ee 100644
--- a/keyboards/fingerpunch/barobord/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/fingerpunch/barobord/keymaps/sadekbaroudi/keymap.c
@@ -37,13 +37,14 @@
#define LAYOUT_barobord_base( \
K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
- K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
+ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
+ K33, K34, K35, K36, K37, K38 \
) \
LAYOUT_wrapper( \
K01, K02, K03, LT(_FUNCTION, K04), K05, K06, LT(_FUNCTION, K07), LT(_WINNAV,K08), K09, K0A, \
LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, LT(_MOUSE, K16), RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), \
K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
- _______, _______, KC_DEL, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB), LT(_MEDIA,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT, _______, _______, \
+ _______, _______, K33, LT(_NAVIGATION,K34), LT(_FUNCTION,K35), LT(_MEDIA,K36), LT(_SYMBOLS,K37), K38, _______, _______, \
KC_MUTE, LCTL(KC_BSPC) \
)
@@ -55,13 +56,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ALPHA_ALT] = LAYOUT_barobord_base_wrapper(
_________________ALPHA_ALT_L1_________________, _________________ALPHA_ALT_R1_________________,
_________________ALPHA_ALT_L2_________________, _________________ALPHA_ALT_R2_________________,
- _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________
+ _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________,
+ __ALPHA_ALT_THUMBS_6__
),
[_ALPHA] = LAYOUT_barobord_base_wrapper(
__________________ALPHA_L1____________________, __________________ALPHA_R1____________________,
__________________ALPHA_L2____________________, __________________ALPHA_R2____________________,
- __________________ALPHA_L3____________________, __________________ALPHA_R3____________________
+ __________________ALPHA_L3____________________, __________________ALPHA_R3____________________,
+ __ALPHA_THUMBS_6__
),
[_NAVIGATION] = LAYOUT_wrapper(
diff --git a/keyboards/fingerpunch/bgkeeb/keymaps/sadekbaroudi/keymap.c b/keyboards/fingerpunch/bgkeeb/keymaps/sadekbaroudi/keymap.c
index f4c95fd2f7..21e51dc7a1 100644
--- a/keyboards/fingerpunch/bgkeeb/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/fingerpunch/bgkeeb/keymaps/sadekbaroudi/keymap.c
@@ -33,13 +33,14 @@
#define LAYOUT_bgkeeb_base( \
K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
- K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
+ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
+ K33, K34, K35, K36, K37, K38 \
) \
LAYOUT_wrapper( \
K01, K02, K03, LT(_FUNCTION, K04), K05, K06, LT(_FUNCTION, K07), LT(_WINNAV,K08), K09, K0A, \
LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, LT(_MOUSE, K16), RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), \
K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
- KC_MUTE, KC_DEL, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB), LT(_MEDIA,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT, LCTL(KC_BSPC) \
+ KC_MUTE, K33, LT(_NAVIGATION,K34), LT(_FUNCTION,K35), LT(_MEDIA,K36), LT(_SYMBOLS,K37), K38, LCTL(KC_BSPC) \
)
/* Re-pass though to allow templates to be used */
@@ -50,13 +51,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ALPHA_ALT] = LAYOUT_bgkeeb_base_wrapper(
_________________ALPHA_ALT_L1_________________, _________________ALPHA_ALT_R1_________________,
_________________ALPHA_ALT_L2_________________, _________________ALPHA_ALT_R2_________________,
- _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________
+ _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________,
+ __ALPHA_ALT_THUMBS_6__
),
[_ALPHA] = LAYOUT_bgkeeb_base_wrapper(
__________________ALPHA_L1____________________, __________________ALPHA_R1____________________,
__________________ALPHA_L2____________________, __________________ALPHA_R2____________________,
- __________________ALPHA_L3____________________, __________________ALPHA_R3____________________
+ __________________ALPHA_L3____________________, __________________ALPHA_R3____________________,
+ __ALPHA_THUMBS_6__
),
[_NAVIGATION] = LAYOUT_wrapper(
diff --git a/keyboards/fingerpunch/euclid36/keymaps/sadekbaroudi/keymap.c b/keyboards/fingerpunch/euclid36/keymaps/sadekbaroudi/keymap.c
index decead97b6..1aa47bcef3 100644
--- a/keyboards/fingerpunch/euclid36/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/fingerpunch/euclid36/keymaps/sadekbaroudi/keymap.c
@@ -17,10 +17,6 @@
#include "sadekbaroudi.h"
#include QMK_KEYBOARD_H
-#ifndef UNICODE_ENABLE
-# define UC(x) KC_NO
-#endif
-
#ifdef THUMBSTICK_ENABLE
# include "thumbstick.h"
#endif
@@ -41,13 +37,14 @@
#define LAYOUT_euclid36_base( \
K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
- K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
+ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
+ K33, K34, K35, K36, K37, K38 \
) \
LAYOUT_wrapper( \
K01, K02, K03, LT(_FUNCTION, K04), K05, K06, LT(_FUNCTION, K07), LT(_WINNAV,K08), K09, K0A, \
LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, LT(_MOUSE, K16), RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), \
K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
- KC_MUTE, KC_DEL, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB), LT(_MEDIA,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT, LCTL(KC_BSPC) \
+ KC_MUTE, K33, LT(_NAVIGATION,K34), LT(_FUNCTION,K35), LT(_MEDIA,K36), LT(_SYMBOLS,K37), K38, LCTL(KC_BSPC) \
)
/* Re-pass though to allow templates to be used */
@@ -58,13 +55,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ALPHA_ALT] = LAYOUT_euclid36_base_wrapper(
_________________ALPHA_ALT_L1_________________, _________________ALPHA_ALT_R1_________________,
_________________ALPHA_ALT_L2_________________, _________________ALPHA_ALT_R2_________________,
- _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________
+ _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________,
+ __ALPHA_ALT_THUMBS_6__
),
[_ALPHA] = LAYOUT_euclid36_base_wrapper(
__________________ALPHA_L1____________________, __________________ALPHA_R1____________________,
__________________ALPHA_L2____________________, __________________ALPHA_R2____________________,
- __________________ALPHA_L3____________________, __________________ALPHA_R3____________________
+ __________________ALPHA_L3____________________, __________________ALPHA_R3____________________,
+ __ALPHA_THUMBS_6__
),
[_NAVIGATION] = LAYOUT_wrapper(
diff --git a/keyboards/fingerpunch/euclid36proto/keymaps/sadekbaroudi/keymap.c b/keyboards/fingerpunch/euclid36proto/keymaps/sadekbaroudi/keymap.c
index 235672ea75..18dfd7b8bf 100644
--- a/keyboards/fingerpunch/euclid36proto/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/fingerpunch/euclid36proto/keymaps/sadekbaroudi/keymap.c
@@ -30,13 +30,14 @@
#define LAYOUT_euclid36proto_base( \
K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
- K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
+ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
+ K33, K34, K35, K36, K37, K38 \
) \
LAYOUT_wrapper( \
K01, K02, K03, LT(_FUNCTION, K04), K05, K06, LT(_FUNCTION, K07), LT(_WINNAV,K08), K09, K0A, \
LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, LT(_MOUSE, K16), RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), \
K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
- KC_DEL, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB), LT(_MEDIA,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT \
+ K33, LT(_NAVIGATION,K34), LT(_FUNCTION,K35), LT(_MEDIA,K36), LT(_SYMBOLS,K37), K38 \
)
/* Re-pass though to allow templates to be used */
@@ -47,13 +48,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ALPHA_ALT] = LAYOUT_euclid36proto_base_wrapper(
_________________ALPHA_ALT_L1_________________, _________________ALPHA_ALT_R1_________________,
_________________ALPHA_ALT_L2_________________, _________________ALPHA_ALT_R2_________________,
- _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________
+ _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________,
+ __ALPHA_ALT_THUMBS_6__
),
[_ALPHA] = LAYOUT_euclid36proto_base_wrapper(
__________________ALPHA_L1____________________, __________________ALPHA_R1____________________,
__________________ALPHA_L2____________________, __________________ALPHA_R2____________________,
- __________________ALPHA_L3____________________, __________________ALPHA_R3____________________
+ __________________ALPHA_L3____________________, __________________ALPHA_R3____________________,
+ __ALPHA_THUMBS_6__
),
[_NAVIGATION] = LAYOUT_wrapper(
diff --git a/keyboards/fingerpunch/ffkb/keymaps/sadekbaroudi/keymap.c b/keyboards/fingerpunch/ffkb/keymaps/sadekbaroudi/keymap.c
index 0c7b9a7920..a49802a81e 100644
--- a/keyboards/fingerpunch/ffkb/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/fingerpunch/ffkb/keymaps/sadekbaroudi/keymap.c
@@ -34,14 +34,15 @@
#define LAYOUT_ffkb_base( \
K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
- K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
+ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
+ K33, K34, K35, K36, K37, K38 \
) \
LAYOUT_wrapper( \
N_SEL_LINE, K01, K02, K03, LT(_FUNCTION, K04), K05, K06, LT(_FUNCTION, K07), LT(_WINNAV,K08), K09, K0A, KC_BSLS, \
LCTL(KC_C), LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, LT(_MOUSE, K16), RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), LCTL(KC_V), \
TG(_NAVIGATION), K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, S_ALT_TAB, \
- KC_MUTE, KC_DEL, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB), LT(_MEDIA,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT, LCTL(KC_BSPC), \
- N_DEL_LINE \
+ KC_MUTE, K33, LT(_NAVIGATION,K34), LT(_FUNCTION,K35), LT(_MEDIA,K36), LT(_SYMBOLS,K37), K38, LCTL(KC_BSPC), \
+ N_DEL_LINE \
)
/* Re-pass though to allow templates to be used */
@@ -52,13 +53,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ALPHA_ALT] = LAYOUT_ffkb_base_wrapper(
_________________ALPHA_ALT_L1_________________, _________________ALPHA_ALT_R1_________________,
_________________ALPHA_ALT_L2_________________, _________________ALPHA_ALT_R2_________________,
- _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________
+ _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________,
+ __ALPHA_ALT_THUMBS_6__
),
[_ALPHA] = LAYOUT_ffkb_base_wrapper(
__________________ALPHA_L1____________________, __________________ALPHA_R1____________________,
__________________ALPHA_L2____________________, __________________ALPHA_R2____________________,
- __________________ALPHA_L3____________________, __________________ALPHA_R3____________________
+ __________________ALPHA_L3____________________, __________________ALPHA_R3____________________,
+ __ALPHA_THUMBS_6__
),
[_NAVIGATION] = LAYOUT_wrapper(
diff --git a/keyboards/fingerpunch/handwired/barobordhw/keymaps/sadekbaroudi/keymap.c b/keyboards/fingerpunch/handwired/barobordhw/keymaps/sadekbaroudi/keymap.c
index 7f843ded89..5cfd5684c8 100644
--- a/keyboards/fingerpunch/handwired/barobordhw/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/fingerpunch/handwired/barobordhw/keymaps/sadekbaroudi/keymap.c
@@ -30,13 +30,14 @@
#define LAYOUT_barobordhw_base( \
K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
- K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
+ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
+ K33, K34, K35, K36, K37, K38 \
) \
LAYOUT_wrapper( \
K01, K02, K03, LT(_FUNCTION, K04), K05, K06, LT(_FUNCTION, K07), LT(_WINNAV,K08), K09, K0A, \
LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, LT(_MOUSE, K16), RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), \
K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
- _______, _______, KC_DEL, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB), LT(_MEDIA,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT, _______, _______ \
+ _______, _______, K33, LT(_NAVIGATION,K34), LT(_FUNCTION,K35), LT(_MEDIA,K36), LT(_SYMBOLS,K37), K38, _______, _______ \
)
/* Re-pass though to allow templates to be used */
@@ -47,13 +48,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ALPHA_ALT] = LAYOUT_barobordhw_base_wrapper(
_________________ALPHA_ALT_L1_________________, _________________ALPHA_ALT_R1_________________,
_________________ALPHA_ALT_L2_________________, _________________ALPHA_ALT_R2_________________,
- _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________
+ _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________,
+ __ALPHA_ALT_THUMBS_6__
),
[_ALPHA] = LAYOUT_barobordhw_base_wrapper(
__________________ALPHA_L1____________________, __________________ALPHA_R1____________________,
__________________ALPHA_L2____________________, __________________ALPHA_R2____________________,
- __________________ALPHA_L3____________________, __________________ALPHA_R3____________________
+ __________________ALPHA_L3____________________, __________________ALPHA_R3____________________,
+ __ALPHA_THUMBS_6__
),
[_NAVIGATION] = LAYOUT_wrapper(
diff --git a/keyboards/fingerpunch/handwired/enigma36/keymaps/sadekbaroudi/keymap.c b/keyboards/fingerpunch/handwired/enigma36/keymaps/sadekbaroudi/keymap.c
index ad437e4320..1253149533 100644
--- a/keyboards/fingerpunch/handwired/enigma36/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/fingerpunch/handwired/enigma36/keymaps/sadekbaroudi/keymap.c
@@ -30,13 +30,14 @@
#define LAYOUT_enigma36_base( \
K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
- K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
+ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
+ K33, K34, K35, K36, K37, K38 \
) \
LAYOUT_wrapper( \
K01, K02, K03, LT(_FUNCTION, K04), K05, K06, LT(_FUNCTION, K07), LT(_WINNAV,K08), K09, K0A, \
LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, LT(_MOUSE, K16), RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), \
K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
- KC_DEL, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB), LT(_MEDIA,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT \
+ K33, LT(_NAVIGATION,K34), LT(_FUNCTION,K35), LT(_MEDIA,K36), LT(_SYMBOLS,K37), K38 \
)
/* Re-pass though to allow templates to be used */
@@ -47,13 +48,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ALPHA_ALT] = LAYOUT_enigma36_base_wrapper(
_________________ALPHA_ALT_L1_________________, _________________ALPHA_ALT_R1_________________,
_________________ALPHA_ALT_L2_________________, _________________ALPHA_ALT_R2_________________,
- _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________
+ _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________,
+ __ALPHA_ALT_THUMBS_6__
),
[_ALPHA] = LAYOUT_enigma36_base_wrapper(
__________________ALPHA_L1____________________, __________________ALPHA_R1____________________,
__________________ALPHA_L2____________________, __________________ALPHA_R2____________________,
- __________________ALPHA_L3____________________, __________________ALPHA_R3____________________
+ __________________ALPHA_L3____________________, __________________ALPHA_R3____________________,
+ __ALPHA_THUMBS_6__
),
[_NAVIGATION] = LAYOUT_wrapper(
diff --git a/keyboards/fingerpunch/handwired/ffkbhw/keymaps/sadekbaroudi/keymap.c b/keyboards/fingerpunch/handwired/ffkbhw/keymaps/sadekbaroudi/keymap.c
index 4cdfa94037..386a5e4da4 100644
--- a/keyboards/fingerpunch/handwired/ffkbhw/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/fingerpunch/handwired/ffkbhw/keymaps/sadekbaroudi/keymap.c
@@ -30,13 +30,14 @@
#define LAYOUT_ffkbhw_base( \
K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
- K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
+ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
+ K33, K34, K35, K36, K37, K38 \
) \
LAYOUT_wrapper( \
- K01, K02, K03, LT(_FUNCTION, K04), K05, K06, LT(_FUNCTION, K07), LT(_WINNAV,K08), K09, K0A, \
- LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, LT(_MOUSE, K16), RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), \
- K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
- KC_MUTE, KC_DEL, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB), LT(_MEDIA,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT, LCTL(KC_DEL) \
+ K01, K02, K03, LT(_FUNCTION, K04), K05, K06, LT(_FUNCTION, K07), LT(_WINNAV,K08), K09, K0A, \
+ LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, LT(_MOUSE, K16), RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), \
+ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
+ KC_MUTE, K33, LT(_NAVIGATION,K34), LT(_FUNCTION,K35), LT(_MEDIA,K36), LT(_SYMBOLS,K37), K38, LCTL(KC_DEL) \
)
/* Re-pass though to allow templates to be used */
@@ -47,13 +48,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ALPHA_ALT] = LAYOUT_ffkbhw_base_wrapper(
_________________ALPHA_ALT_L1_________________, _________________ALPHA_ALT_R1_________________,
_________________ALPHA_ALT_L2_________________, _________________ALPHA_ALT_R2_________________,
- _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________
+ _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________,
+ __ALPHA_ALT_THUMBS_6__
),
[_ALPHA] = LAYOUT_ffkbhw_base_wrapper(
__________________ALPHA_L1____________________, __________________ALPHA_R1____________________,
__________________ALPHA_L2____________________, __________________ALPHA_R2____________________,
- __________________ALPHA_L3____________________, __________________ALPHA_R3____________________
+ __________________ALPHA_L3____________________, __________________ALPHA_R3____________________,
+ __ALPHA_THUMBS_6__
),
[_NAVIGATION] = LAYOUT_wrapper(
diff --git a/keyboards/fingerpunch/handwired/pteron38/keymaps/sadekbaroudi/keymap.c b/keyboards/fingerpunch/handwired/pteron38/keymaps/sadekbaroudi/keymap.c
index aa068c59ca..b2976d6eb8 100644
--- a/keyboards/fingerpunch/handwired/pteron38/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/fingerpunch/handwired/pteron38/keymaps/sadekbaroudi/keymap.c
@@ -18,10 +18,6 @@
#include "casemodes.h"
#include QMK_KEYBOARD_H
-#ifndef UNICODE_ENABLE
-# define UC(x) KC_NO
-#endif
-
/*
* The `LAYOUT_pteron38_base` macro is a template to allow the use of identical
* modifiers for the default layouts (eg ALPHA_ALT, Colemak, Dvorak, etc), so
@@ -34,13 +30,14 @@
#define LAYOUT_pteron38_base( \
K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
- K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
+ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
+ K33, K34, K35, K36, K37, K38 \
) \
LAYOUT_wrapper( \
K01, K02, K03, LT(_FUNCTION, K04), K05, K06, LT(_FUNCTION, K07), LT(_WINNAV,K08), K09, K0A, \
LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, LT(_MOUSE, K16), RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), \
K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
- KC_DEL, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB), _______, _______, LT(_MEDIA,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT \
+ K33, LT(_NAVIGATION,K34), LT(_FUNCTION,K35), _______, _______, LT(_MEDIA,K36), LT(_SYMBOLS,K37), K38 \
)
/* Re-pass though to allow templates to be used */
@@ -51,13 +48,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ALPHA_ALT] = LAYOUT_pteron38_base_wrapper(
_________________ALPHA_ALT_L1_________________, _________________ALPHA_ALT_R1_________________,
_________________ALPHA_ALT_L2_________________, _________________ALPHA_ALT_R2_________________,
- _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________
+ _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________,
+ __ALPHA_ALT_THUMBS_6__
),
[_ALPHA] = LAYOUT_pteron38_base_wrapper(
__________________ALPHA_L1____________________, __________________ALPHA_R1____________________,
__________________ALPHA_L2____________________, __________________ALPHA_R2____________________,
- __________________ALPHA_L3____________________, __________________ALPHA_R3____________________
+ __________________ALPHA_L3____________________, __________________ALPHA_R3____________________,
+ __ALPHA_THUMBS_6__
),
[_NAVIGATION] = LAYOUT_wrapper(
diff --git a/keyboards/fingerpunch/osprette/keymaps/sadekbaroudi/keymap.c b/keyboards/fingerpunch/osprette/keymaps/sadekbaroudi/keymap.c
index f3426e18d4..b3ea9199af 100644
--- a/keyboards/fingerpunch/osprette/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/fingerpunch/osprette/keymaps/sadekbaroudi/keymap.c
@@ -29,13 +29,14 @@
#define LAYOUT_osprette_base( \
K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
- K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
+ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
+ K34, K35, K36, K37 \
) \
LAYOUT_wrapper( \
K02, K03, LT(_FUNCTION, K04), K05, K06, LT(_FUNCTION, K07), LT(_WINNAV,K08), K09, \
K01, LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, LT(_MOUSE, K16), RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), K0A, \
K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
- LT(_FUNCTION,KC_TAB), LT(_NAVIGATION,KC_ENT), LT(_SYMBOLS,KC_SPACE), LT(_MEDIA,KC_QUOT) \
+ LT(_FUNCTION,K34), LT(_NAVIGATION,K35), LT(_SYMBOLS,K36), LT(_MEDIA,K37) \
)
/* Re-pass though to allow templates to be used */
@@ -46,13 +47,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ALPHA_ALT] = LAYOUT_osprette_base_wrapper(
_________________ALPHA_ALT_L1_________________, _________________ALPHA_ALT_R1_________________,
_________________ALPHA_ALT_L2_________________, _________________ALPHA_ALT_R2_________________,
- _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________
+ _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________,
+ __ALPHA_ALT_THUMB_L3__, __ALPHA_ALT_THUMB_L2__, __ALPHA_ALT_THUMB_R2__, __ALPHA_ALT_THUMB_R3__
+
),
[_ALPHA] = LAYOUT_osprette_base_wrapper(
__________________ALPHA_L1____________________, __________________ALPHA_R1____________________,
__________________ALPHA_L2____________________, __________________ALPHA_R2____________________,
- __________________ALPHA_L3____________________, __________________ALPHA_R3____________________
+ __________________ALPHA_L3____________________, __________________ALPHA_R3____________________,
+ __ALPHA_THUMB_L3__, __ALPHA_THUMB_L2__, __ALPHA_THUMB_R2__, __ALPHA_THUMB_R3__
),
[_NAVIGATION] = LAYOUT_wrapper(
diff --git a/keyboards/fingerpunch/pinkiesout/keymaps/sadekbaroudi/keymap.c b/keyboards/fingerpunch/pinkiesout/keymaps/sadekbaroudi/keymap.c
index 379f4fea98..b6e58dead8 100644
--- a/keyboards/fingerpunch/pinkiesout/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/fingerpunch/pinkiesout/keymaps/sadekbaroudi/keymap.c
@@ -35,14 +35,15 @@
#define LAYOUT_pinkiesout_base( \
K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
- K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
+ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
+ K33, K34, K35, K36, K37, K38 \
) \
LAYOUT_wrapper( \
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, _______, TO(_KICAD), KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \
KC_TAB, K01, K02, K03, LT(_FUNCTION, K04), K05, _______, TO(_NAVIGATION), K06, LT(_FUNCTION, K07), LT(_WINNAV,K08), K09, K0A, KC_BSLS, \
KC_CAPS, LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, _______, TO(_ALPHA), LT(_MOUSE, K16), RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), KC_QUOT, \
KC_LSFT, K21, K22, K23, K24, K25, _______, _______, K26, K27, K28, K29, K2A, KC_ENT, \
- KC_LCTL, KC_LGUI, KC_DEL, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB), LT(_MEDIA,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT, KC_RGUI, KC_RCTL \
+ KC_LCTL, KC_LGUI, K33, LT(_NAVIGATION,K34), LT(_FUNCTION,K35), LT(_MEDIA,K36), LT(_SYMBOLS,K37), K38, KC_RGUI, KC_RCTL \
)
/* Re-pass though to allow templates to be used */
@@ -53,13 +54,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ALPHA_ALT] = LAYOUT_pinkiesout_base_wrapper(
_________________ALPHA_ALT_L1_________________, _________________ALPHA_ALT_R1_________________,
_________________ALPHA_ALT_L2_________________, _________________ALPHA_ALT_R2_________________,
- _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________
+ _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________,
+ __ALPHA_ALT_THUMBS_6__
),
[_ALPHA] = LAYOUT_pinkiesout_base_wrapper(
__________________ALPHA_L1____________________, __________________ALPHA_R1____________________,
__________________ALPHA_L2____________________, __________________ALPHA_R2____________________,
- __________________ALPHA_L3____________________, __________________ALPHA_R3____________________
+ __________________ALPHA_L3____________________, __________________ALPHA_R3____________________,
+ __ALPHA_THUMBS_6__
),
[_NAVIGATION] = LAYOUT_wrapper(
diff --git a/keyboards/free_willy/keymaps/sadekbaroudi/keymap.c b/keyboards/free_willy/keymaps/sadekbaroudi/keymap.c
index 19f4a87190..8572da063b 100644
--- a/keyboards/free_willy/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/free_willy/keymaps/sadekbaroudi/keymap.c
@@ -29,13 +29,14 @@
#define LAYOUT_freewilly_base( \
K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
- K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
+ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
+ K33, K34, K35, K36, K37, K38 \
) \
LAYOUT_wrapper( \
K01, K02, K03, LT(_FUNCTION, K04), K05, K06, LT(_FUNCTION, K07), LT(_WINNAV,K08), K09, K0A, \
LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, LT(_MOUSE, K16), RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), \
K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
- KC_DEL, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB), LT(_MEDIA,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT \
+ K33, LT(_NAVIGATION,K34), LT(_FUNCTION,K35), LT(_MEDIA,K36), LT(_SYMBOLS,K37), K38 \
)
/* Re-pass though to allow templates to be used */
@@ -46,13 +47,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ALPHA_ALT] = LAYOUT_freewilly_base_wrapper(
_________________ALPHA_ALT_L1_________________, _________________ALPHA_ALT_R1_________________,
_________________ALPHA_ALT_L2_________________, _________________ALPHA_ALT_R2_________________,
- _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________
+ _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________,
+ __ALPHA_ALT_THUMBS_6__
),
[_ALPHA] = LAYOUT_freewilly_base_wrapper(
__________________ALPHA_L1____________________, __________________ALPHA_R1____________________,
__________________ALPHA_L2____________________, __________________ALPHA_R2____________________,
- __________________ALPHA_L3____________________, __________________ALPHA_R3____________________
+ __________________ALPHA_L3____________________, __________________ALPHA_R3____________________,
+ __ALPHA_THUMBS_6__
),
[_NAVIGATION] = LAYOUT_wrapper(
diff --git a/keyboards/minidox/keymaps/sadekbaroudi/keymap.c b/keyboards/minidox/keymaps/sadekbaroudi/keymap.c
index 44e43fc99f..74dd562942 100644
--- a/keyboards/minidox/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/minidox/keymaps/sadekbaroudi/keymap.c
@@ -33,13 +33,14 @@
#define LAYOUT_minidox_base( \
K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
- K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
+ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
+ K33, K34, K35, K36, K37, K38 \
) \
LAYOUT_wrapper( \
K01, K02, K03, LT(_FUNCTION, K04), K05, K06, LT(_FUNCTION, K07), LT(_WINNAV,K08), K09, K0A, \
LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, LT(_MOUSE, K16), RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), \
K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
- KC_DEL, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB), LT(_MEDIA,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT \
+ K33, LT(_NAVIGATION,K34), LT(_FUNCTION,K35), LT(_MEDIA,K36), LT(_SYMBOLS,K37), K38 \
)
/* Re-pass though to allow templates to be used */
@@ -50,13 +51,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ALPHA_ALT] = LAYOUT_minidox_base_wrapper(
_________________ALPHA_ALT_L1_________________, _________________ALPHA_ALT_R1_________________,
_________________ALPHA_ALT_L2_________________, _________________ALPHA_ALT_R2_________________,
- _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________
+ _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________,
+ __ALPHA_ALT_THUMBS_6__
),
[_ALPHA] = LAYOUT_minidox_base_wrapper(
__________________ALPHA_L1____________________, __________________ALPHA_R1____________________,
__________________ALPHA_L2____________________, __________________ALPHA_R2____________________,
- __________________ALPHA_L3____________________, __________________ALPHA_R3____________________
+ __________________ALPHA_L3____________________, __________________ALPHA_R3____________________,
+ __ALPHA_THUMBS_6__
),
[_NAVIGATION] = LAYOUT_wrapper(
diff --git a/keyboards/preonic/keymaps/sadekbaroudi/keymap.c b/keyboards/preonic/keymaps/sadekbaroudi/keymap.c
index 92ca025ecf..31d5df0292 100755
--- a/keyboards/preonic/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/preonic/keymaps/sadekbaroudi/keymap.c
@@ -18,23 +18,19 @@
#include QMK_KEYBOARD_H
#include "muse.h"
-#ifndef UNICODE_ENABLE
-# define UC(x) KC_NO
-#endif
-
-
// clang-format off
#define LAYOUT_ortho_5x12_base( \
K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
- K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
+ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
+ K33, K34, K35, K36, K37, K38 \
) \
LAYOUT_ortho_5x12_wrapper( \
_______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \
_______, K01, K02, K03, LT(_FUNCTION, K04), K05, K06, LT(_FUNCTION, K07), LT(_WINNAV,K08), K09, K0A, _______, \
_______, LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, LT(_MOUSE, K16), RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), _______, \
_______, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, _______, \
- _______, _______, _______, KC_DEL, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB), LT(_MEDIA,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT, _______, _______, _______ \
+ _______, _______, _______, K33, LT(_NAVIGATION,K34), LT(_FUNCTION,K35), LT(_MEDIA,K36), LT(_SYMBOLS,K37), K38, _______, _______, _______ \
)
/* Re-pass though to allow templates to be used */
@@ -45,13 +41,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ALPHA_ALT] = LAYOUT_ortho_5x12_base_wrapper(
_________________ALPHA_ALT_L1_________________, _________________ALPHA_ALT_R1_________________,
_________________ALPHA_ALT_L2_________________, _________________ALPHA_ALT_R2_________________,
- _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________
+ _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________,
+ __ALPHA_ALT_THUMBS_6__
),
[_ALPHA] = LAYOUT_ortho_5x12_base_wrapper(
__________________ALPHA_L1____________________, __________________ALPHA_R1____________________,
__________________ALPHA_L2____________________, __________________ALPHA_R2____________________,
- __________________ALPHA_L3____________________, __________________ALPHA_R3____________________
+ __________________ALPHA_L3____________________, __________________ALPHA_R3____________________,
+ __ALPHA_THUMBS_6__
),
[_NAVIGATION] = LAYOUT_wrapper(
diff --git a/keyboards/reviung39/keymaps/sadekbaroudi/keymap.c b/keyboards/reviung39/keymaps/sadekbaroudi/keymap.c
index d0810a1122..29f89270e6 100755
--- a/keyboards/reviung39/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/reviung39/keymaps/sadekbaroudi/keymap.c
@@ -18,10 +18,6 @@
#include QMK_KEYBOARD_H
-#ifndef UNICODE_ENABLE
-# define UC(x) KC_NO
-#endif
-
/*
* The `LAYOUT_reviung39_base` macro is a template to allow the use of identical
* modifiers for the default layouts (eg ALPHA_ALT, Colemak, Dvorak, etc), so
@@ -34,13 +30,14 @@
#define LAYOUT_reviung39_base( \
K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
- K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
+ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
+ K33, K34, K35 \
) \
LAYOUT_wrapper( \
_______, K01, K02, K03, LT(_FUNCTION, K04), K05, K06, LT(_FUNCTION, K07), LT(_WINNAV,K08), K09, K0A, _______, \
KC_TAB, LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, LT(_MOUSE, K16), RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), _______, \
_______, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, _______, \
- LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_BSPC), LT(_SYMBOLS,KC_SPACE) \
+ LT(_NAVIGATION,K33), LT(_FUNCTION,K34), LT(_SYMBOLS,K35) \
)
/* Re-pass though to allow templates to be used */
#define LAYOUT_reviung39_base_wrapper(...) LAYOUT_reviung39_base(__VA_ARGS__)
@@ -50,13 +47,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ALPHA_ALT] = LAYOUT_reviung39_base_wrapper(
_________________ALPHA_ALT_L1_________________, _________________ALPHA_ALT_R1_________________,
_________________ALPHA_ALT_L2_________________, _________________ALPHA_ALT_R2_________________,
- _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________
+ _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________,
+ __ALPHA_ALT_THUMB_L2__, __ALPHA_ALT_THUMB_R1__, __ALPHA_ALT_THUMB_R2__
),
[_ALPHA] = LAYOUT_reviung39_base_wrapper(
__________________ALPHA_L1____________________, __________________ALPHA_R1____________________,
__________________ALPHA_L2____________________, __________________ALPHA_R2____________________,
- __________________ALPHA_L3____________________, __________________ALPHA_R3____________________
+ __________________ALPHA_L3____________________, __________________ALPHA_R3____________________,
+ __ALPHA_THUMB_L2__, __ALPHA_THUMB_R1__, __ALPHA_THUMB_R2__
),
[_NAVIGATION] = LAYOUT_wrapper(
diff --git a/keyboards/reviung41/keymaps/sadekbaroudi/keymap.c b/keyboards/reviung41/keymaps/sadekbaroudi/keymap.c
index a68781ec29..1ffe297088 100755
--- a/keyboards/reviung41/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/reviung41/keymaps/sadekbaroudi/keymap.c
@@ -18,10 +18,6 @@
#include QMK_KEYBOARD_H
-#ifndef UNICODE_ENABLE
-# define UC(x) KC_NO
-#endif
-
/*
* The `LAYOUT_reviung41_base` macro is a template to allow the use of identical
* modifiers for the default layouts (eg ALPHA_ALT, Colemak, Dvorak, etc), so
@@ -34,13 +30,14 @@
#define LAYOUT_reviung41_base( \
K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
- K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
+ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
+ K33, K34, K35, K36, K37 \
) \
LAYOUT_wrapper( \
_______, K01, K02, K03, LT(_FUNCTION, K04), K05, K06, LT(_FUNCTION, K07), LT(_WINNAV,K08), K09, K0A, _______, \
KC_TAB, LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, LT(_MOUSE, K16), RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), _______, \
_______, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, _______, \
- KC_DEL, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT \
+ K33, LT(_NAVIGATION,K34), LT(_FUNCTION,K35), LT(_SYMBOLS,K36), K37 \
)
/* Re-pass though to allow templates to be used */
#define LAYOUT_reviung41_base_wrapper(...) LAYOUT_reviung41_base(__VA_ARGS__)
@@ -50,13 +47,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ALPHA_ALT] = LAYOUT_reviung41_base_wrapper(
_________________ALPHA_ALT_L1_________________, _________________ALPHA_ALT_R1_________________,
_________________ALPHA_ALT_L2_________________, _________________ALPHA_ALT_R2_________________,
- _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________
+ _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________,
+ __ALPHA_ALT_THUMBS_5__
),
[_ALPHA] = LAYOUT_reviung41_base_wrapper(
__________________ALPHA_L1____________________, __________________ALPHA_R1____________________,
__________________ALPHA_L2____________________, __________________ALPHA_R2____________________,
- __________________ALPHA_L3____________________, __________________ALPHA_R3____________________
+ __________________ALPHA_L3____________________, __________________ALPHA_R3____________________,
+ __ALPHA_THUMBS_5__
),
[_NAVIGATION] = LAYOUT_wrapper(
diff --git a/users/sadekbaroudi/wrappers.h b/users/sadekbaroudi/wrappers.h
index bf0d883322..47f5b50822 100755
--- a/users/sadekbaroudi/wrappers.h
+++ b/users/sadekbaroudi/wrappers.h
@@ -113,14 +113,47 @@ NOTE: These are all the same length. If you do a search/replace
*/
-// ALPHA_ALT
-#define _________________ALPHA_ALT_L1_________________ KC_Q, KC_W, KC_E, KC_R, KC_T
-#define _________________ALPHA_ALT_L2_________________ KC_A, KC_S, KC_D, KC_F, KC_G
-#define _________________ALPHA_ALT_L3_________________ KC_Z, KC_X, KC_C, KC_V, KC_B
+#define __ALPHA_THUMB_L1__ KC_DEL
+#define __ALPHA_THUMB_L2__ KC_ENT
+#define __ALPHA_THUMB_L3__ KC_TAB
+#define __ALPHA_THUMB_R1__ KC_BSPC
+#define __ALPHA_THUMB_R2__ KC_SPACE
+#define __ALPHA_THUMB_R3__ KC_QUOT
-#define _________________ALPHA_ALT_R1_________________ KC_Y, KC_U, KC_I, KC_O, KC_P
-#define _________________ALPHA_ALT_R2_________________ KC_H, KC_J, KC_K, KC_L, KC_SCLN
-#define _________________ALPHA_ALT_R3_________________ KC_N, KC_M, KC_COMM, KC_DOT, KC_SLASH
+#define __ALPHA_THUMBS_LEFT_2__ __ALPHA_THUMB_L2__, __ALPHA_THUMB_L3__
+#define __ALPHA_THUMBS_RIGHT_2__ __ALPHA_THUMB_R1__, __ALPHA_THUMB_R2__
+
+#define __ALPHA_THUMBS_LEFT_3__ __ALPHA_THUMB_L1__, __ALPHA_THUMB_L2__, __ALPHA_THUMB_L3__
+#define __ALPHA_THUMBS_RIGHT_3__ __ALPHA_THUMB_R1__, __ALPHA_THUMB_R2__, __ALPHA_THUMB_R3__
+
+#define __ALPHA_THUMBS_4__ __ALPHA_THUMBS_LEFT_2__, __ALPHA_THUMBS_RIGHT_2__
+#define __ALPHA_THUMBS_5__ __ALPHA_THUMB_L1__, __ALPHA_THUMB_L2__, __ALPHA_THUMB_R1__, __ALPHA_THUMB_R2__, __ALPHA_THUMB_R3__
+#define __ALPHA_THUMBS_6__ __ALPHA_THUMBS_LEFT_3__, __ALPHA_THUMBS_RIGHT_3__
+
+#define __ALPHA_ALT_THUMB_L1__ __ALPHA_THUMB_L1__
+#define __ALPHA_ALT_THUMB_L2__ KC_O
+#define __ALPHA_ALT_THUMB_L3__ __ALPHA_THUMB_L3__
+#define __ALPHA_ALT_THUMB_R1__ __ALPHA_THUMB_R1__
+#define __ALPHA_ALT_THUMB_R2__ __ALPHA_THUMB_R2__
+#define __ALPHA_ALT_THUMB_R3__ __ALPHA_THUMB_R3__
+
+#define __ALPHA_ALT_THUMBS_LEFT_2__ __ALPHA_ALT_THUMB_L2__, __ALPHA_ALT_THUMB_L3__
+#define __ALPHA_ALT_THUMBS_RIGHT_2__ __ALPHA_ALT_THUMB_R1__, __ALPHA_ALT_THUMB_R2__
+
+#define __ALPHA_ALT_THUMBS_LEFT_3__ __ALPHA_ALT_THUMB_L1__, __ALPHA_ALT_THUMB_L2__, __ALPHA_ALT_THUMB_L3__
+#define __ALPHA_ALT_THUMBS_RIGHT_3__ __ALPHA_ALT_THUMB_R1__, __ALPHA_ALT_THUMB_R2__, __ALPHA_ALT_THUMB_R3__
+
+#define __ALPHA_ALT_THUMBS_4__ __ALPHA_ALT_THUMBS_LEFT_2__, __ALPHA_ALT_THUMBS_RIGHT_2__
+#define __ALPHA_ALT_THUMBS_5__ __ALPHA_ALT_THUMB_L1__, __ALPHA_ALT_THUMB_L2__, __ALPHA_ALT_THUMB_R1__, __ALPHA_ALT_THUMB_R2__, __ALPHA_ALT_THUMB_R3__
+#define __ALPHA_ALT_THUMBS_6__ __ALPHA_ALT_THUMBS_LEFT_3__, __ALPHA_ALT_THUMBS_RIGHT_3__
+
+#define _________________ALPHA_ALT_L1_________________ KC_ENT, KC_Q, KC_W, KC_P, KC_B
+#define _________________ALPHA_ALT_L2_________________ KC_A, KC_R, KC_S, KC_T, KC_G
+#define _________________ALPHA_ALT_L3_________________ KC_Z, KC_X, KC_C, KC_D, KC_V
+
+#define _________________ALPHA_ALT_R1_________________ KC_J, KC_L, KC_U, KC_Y, KC_SCLN
+#define _________________ALPHA_ALT_R2_________________ KC_F, KC_N, KC_E, KC_I, KC_H
+#define _________________ALPHA_ALT_R3_________________ KC_K, KC_M, KC_COMM, KC_DOT, KC_SLASH
// ALPHA
#define __________________ALPHA_L1____________________ KC_Q, KC_W, KC_F, KC_P, KC_B