From 8910fb12cf36804dd17fc449c81e49fc546ba0e8 Mon Sep 17 00:00:00 2001 From: Sadek Baroudi Date: Mon, 10 Jan 2022 13:38:06 -0800 Subject: [PATCH] removed ISRT layer, and added sadekbaroudi keymap for the pinkies out --- bin/build-pinkies-out.sh | 8 ++--- keyboards/a_dux/keymaps/sadekbaroudi/keymap.c | 6 ---- .../absolem/keymaps/sadekbaroudi/keymap.c | 6 ---- keyboards/crkbd/keymaps/sadekbaroudi/keymap.c | 6 ---- .../draculad/keymaps/sadekbaroudi/keymap.c | 9 ----- .../free_willy/keymaps/sadekbaroudi/keymap.c | 6 ---- .../minidox/keymaps/sadekbaroudi/keymap.c | 6 ---- .../preonic/keymaps/sadekbaroudi/keymap.c | 6 ---- .../reviung39/keymaps/sadekbaroudi/keymap.c | 6 ---- .../reviung41/keymaps/sadekbaroudi/keymap.c | 6 ---- .../barobord/keymaps/sadekbaroudi/keymap.c | 9 ----- .../bgkeeb/keymaps/sadekbaroudi/keymap.c | 6 ---- .../euclid36/keymaps/sadekbaroudi/keymap.c | 9 ----- .../keymaps/sadekbaroudi/keymap.c | 6 ---- .../ffkb/keymaps/sadekbaroudi/keymap.c | 9 ----- .../barobordhw/keymaps/sadekbaroudi/keymap.c | 6 ---- .../enigma36/keymaps/sadekbaroudi/keymap.c | 6 ---- .../ffkbhw/keymaps/sadekbaroudi/keymap.c | 6 ---- .../pteron38/keymaps/sadekbaroudi/keymap.c | 6 ---- .../osprette/keymaps/sadekbaroudi/keymap.c | 6 ---- .../pinkiesout/keymaps/default/keymap.c | 2 +- .../pinkiesout/keymaps/sadekbaroudi/keymap.c | 35 ++++++++++++------- .../pinkiesout/keymaps/sadekbaroudi/rules.mk | 2 ++ users/sadekbaroudi/rgb_stuff.c | 6 ---- users/sadekbaroudi/rules.mk | 2 +- users/sadekbaroudi/sadekbaroudi.h | 1 - users/sadekbaroudi/wrappers.h | 15 ++------ 27 files changed, 33 insertions(+), 164 deletions(-) create mode 100644 keyboards/xoiviox/pinkiesout/keymaps/sadekbaroudi/rules.mk diff --git a/bin/build-pinkies-out.sh b/bin/build-pinkies-out.sh index 9d5c28f5fd..a4c075c3e8 100755 --- a/bin/build-pinkies-out.sh +++ b/bin/build-pinkies-out.sh @@ -2,11 +2,11 @@ # TODO: consolidate all the build files into one -make xoiviox/pinkiesout/rgbmatrix_oled:default -cp .build/xoiviox_pinkiesout_rgbmatrix_oled_default* /mnt/g/My\ Drive/qmk-keyboards/pinkiesout +#make xoiviox/pinkiesout/rgbmatrix_oled:default +#cp .build/xoiviox_pinkiesout_rgbmatrix_oled_default* /mnt/g/My\ Drive/qmk-keyboards/pinkiesout #make xoiviox/pinkiesout/rgblight_oled:sadekbaroudi #cp .build/xoiviox_pinkiesout_rgblight_oled_sadekbaroudi* /mnt/g/My\ Drive/qmk-keyboards/pinkiesout/rgblight_oled/ -#make xoiviox/pinkiesout/rgbmatrix_oled:sadekbaroudi -#cp .build/xoiviox_pinkiesout_rgbmatrix_oled_sadekbaroudi* /mnt/g/My\ Drive/qmk-keyboards/pinkiesout/rgbmatrix/ +make xoiviox/pinkiesout/rgbmatrix_oled:sadekbaroudi +cp .build/xoiviox_pinkiesout_rgbmatrix_oled_sadekbaroudi* /mnt/g/My\ Drive/qmk-keyboards/pinkiesout/rgbmatrix/ diff --git a/keyboards/a_dux/keymaps/sadekbaroudi/keymap.c b/keyboards/a_dux/keymaps/sadekbaroudi/keymap.c index ba6e2723c3..c13dc017f0 100644 --- a/keyboards/a_dux/keymaps/sadekbaroudi/keymap.c +++ b/keyboards/a_dux/keymaps/sadekbaroudi/keymap.c @@ -59,12 +59,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________ ), - [_ISRT] = LAYOUT_adux_base_wrapper( - _________________ISRT_L1________________, _________________ISRT_R1________________, - _________________ISRT_L2________________, _________________ISRT_R2________________, - _________________ISRT_L3________________, _________________ISRT_R3________________ - ), - [_NAVIGATION] = LAYOUT_wrapper( ________________NAVIGATION_1_______________, _________________NUMPAD_1__________________, ________________NAVIGATION_2_______________, _________________NUMPAD_2__________________, diff --git a/keyboards/absolem/keymaps/sadekbaroudi/keymap.c b/keyboards/absolem/keymaps/sadekbaroudi/keymap.c index 964949353b..273f156868 100644 --- a/keyboards/absolem/keymaps/sadekbaroudi/keymap.c +++ b/keyboards/absolem/keymaps/sadekbaroudi/keymap.c @@ -56,12 +56,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________ ), - [_ISRT] = LAYOUT_absolem_base_wrapper( - _________________ISRT_L1________________, _________________ISRT_R1________________, - _________________ISRT_L2________________, _________________ISRT_R2________________, - _________________ISRT_L3________________, _________________ISRT_R3________________ - ), - [_NAVIGATION] = LAYOUT_wrapper( ________________NAVIGATION_1_______________, _________________NUMPAD_1__________________, ________________NAVIGATION_2_______________, _________________NUMPAD_2__________________, diff --git a/keyboards/crkbd/keymaps/sadekbaroudi/keymap.c b/keyboards/crkbd/keymaps/sadekbaroudi/keymap.c index 03a3fe7b94..94b16113d6 100644 --- a/keyboards/crkbd/keymaps/sadekbaroudi/keymap.c +++ b/keyboards/crkbd/keymaps/sadekbaroudi/keymap.c @@ -60,12 +60,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________ ), - [_ISRT] = LAYOUT_crkbd_base_wrapper( - _________________ISRT_L1________________, _________________ISRT_R1________________, - _________________ISRT_L2________________, _________________ISRT_R2________________, - _________________ISRT_L3________________, _________________ISRT_R3________________ - ), - [_NAVIGATION] = LAYOUT_wrapper( _______, ________________NAVIGATION_1_______________, _________________NUMPAD_1__________________, _______, _______, ________________NAVIGATION_2_______________, _________________NUMPAD_2__________________, _______, diff --git a/keyboards/draculad/keymaps/sadekbaroudi/keymap.c b/keyboards/draculad/keymaps/sadekbaroudi/keymap.c index 4285191699..5d6d323fd6 100644 --- a/keyboards/draculad/keymaps/sadekbaroudi/keymap.c +++ b/keyboards/draculad/keymaps/sadekbaroudi/keymap.c @@ -45,12 +45,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________ ), - [_ISRT] = LAYOUT_draculad_base_wrapper( - _________________ISRT_L1________________, _________________ISRT_R1________________, - _________________ISRT_L2________________, _________________ISRT_R2________________, - _________________ISRT_L3________________, _________________ISRT_R3________________ - ), - [_NAVIGATION] = LAYOUT_wrapper( ________________NAVIGATION_1_______________, _________________NUMPAD_1__________________, ________________NAVIGATION_2_______________, _________________NUMPAD_2__________________, @@ -203,9 +197,6 @@ static void render_status(void) { case _COLEMAK: oled_write_P(PSTR("Colemak"), false); break; - case _ISRT: - oled_write_P(PSTR("Workman"), false); - break; case _NAVIGATION: oled_write_P(PSTR("Nav "), false); break; diff --git a/keyboards/free_willy/keymaps/sadekbaroudi/keymap.c b/keyboards/free_willy/keymaps/sadekbaroudi/keymap.c index 09e9859499..6ceef9e23f 100644 --- a/keyboards/free_willy/keymaps/sadekbaroudi/keymap.c +++ b/keyboards/free_willy/keymaps/sadekbaroudi/keymap.c @@ -55,12 +55,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________ ), - [_ISRT] = LAYOUT_freewilly_base_wrapper( - _________________ISRT_L1________________, _________________ISRT_R1________________, - _________________ISRT_L2________________, _________________ISRT_R2________________, - _________________ISRT_L3________________, _________________ISRT_R3________________ - ), - [_NAVIGATION] = LAYOUT_wrapper( ________________NAVIGATION_1_______________, _________________NUMPAD_1__________________, ________________NAVIGATION_2_______________, _________________NUMPAD_2__________________, diff --git a/keyboards/minidox/keymaps/sadekbaroudi/keymap.c b/keyboards/minidox/keymaps/sadekbaroudi/keymap.c index 1898741f83..f6484c4dd7 100644 --- a/keyboards/minidox/keymaps/sadekbaroudi/keymap.c +++ b/keyboards/minidox/keymaps/sadekbaroudi/keymap.c @@ -59,12 +59,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________ ), - [_ISRT] = LAYOUT_minidox_base_wrapper( - _________________ISRT_L1________________, _________________ISRT_R1________________, - _________________ISRT_L2________________, _________________ISRT_R2________________, - _________________ISRT_L3________________, _________________ISRT_R3________________ - ), - [_NAVIGATION] = LAYOUT_wrapper( ________________NAVIGATION_1_______________, _________________NUMPAD_1__________________, ________________NAVIGATION_2_______________, _________________NUMPAD_2__________________, diff --git a/keyboards/preonic/keymaps/sadekbaroudi/keymap.c b/keyboards/preonic/keymaps/sadekbaroudi/keymap.c index c21e65c198..9c567cf816 100755 --- a/keyboards/preonic/keymaps/sadekbaroudi/keymap.c +++ b/keyboards/preonic/keymaps/sadekbaroudi/keymap.c @@ -54,12 +54,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________ ), - [_ISRT] = LAYOUT_ortho_5x12_base_wrapper( - _________________ISRT_L1________________, _________________ISRT_R1________________, - _________________ISRT_L2________________, _________________ISRT_R2________________, - _________________ISRT_L3________________, _________________ISRT_R3________________ - ), - [_NAVIGATION] = LAYOUT_wrapper( _______, ___________________BLANK___________________, ___________________BLANK___________________, _______, _______, ________________NAVIGATION_1_______________, _________________NUMPAD_1__________________, _______, diff --git a/keyboards/reviung39/keymaps/sadekbaroudi/keymap.c b/keyboards/reviung39/keymaps/sadekbaroudi/keymap.c index d82c56c95e..1982ebbe2b 100755 --- a/keyboards/reviung39/keymaps/sadekbaroudi/keymap.c +++ b/keyboards/reviung39/keymaps/sadekbaroudi/keymap.c @@ -59,12 +59,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________ ), - [_ISRT] = LAYOUT_reviung39_base_wrapper( - _________________ISRT_L1________________, _________________ISRT_R1________________, - _________________ISRT_L2________________, _________________ISRT_R2________________, - _________________ISRT_L3________________, _________________ISRT_R3________________ - ), - [_NAVIGATION] = LAYOUT_wrapper( _______, ________________NAVIGATION_1_______________, _________________NUMPAD_1__________________, _______, _______, ________________NAVIGATION_2_______________, _________________NUMPAD_2__________________, _______, diff --git a/keyboards/reviung41/keymaps/sadekbaroudi/keymap.c b/keyboards/reviung41/keymaps/sadekbaroudi/keymap.c index 4af64d2201..e5613d1d97 100755 --- a/keyboards/reviung41/keymaps/sadekbaroudi/keymap.c +++ b/keyboards/reviung41/keymaps/sadekbaroudi/keymap.c @@ -59,12 +59,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________ ), - [_ISRT] = LAYOUT_reviung41_base_wrapper( - _________________ISRT_L1________________, _________________ISRT_R1________________, - _________________ISRT_L2________________, _________________ISRT_R2________________, - _________________ISRT_L3________________, _________________ISRT_R3________________ - ), - [_NAVIGATION] = LAYOUT_wrapper( _______, ________________NAVIGATION_1_______________, _________________NUMPAD_1__________________, _______, _______, ________________NAVIGATION_2_______________, _________________NUMPAD_2__________________, _______, diff --git a/keyboards/xoiviox/barobord/keymaps/sadekbaroudi/keymap.c b/keyboards/xoiviox/barobord/keymaps/sadekbaroudi/keymap.c index e6552a0996..b1d771a903 100644 --- a/keyboards/xoiviox/barobord/keymaps/sadekbaroudi/keymap.c +++ b/keyboards/xoiviox/barobord/keymaps/sadekbaroudi/keymap.c @@ -64,12 +64,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________ ), - [_ISRT] = LAYOUT_barobord_base_wrapper( - _________________ISRT_L1________________, _________________ISRT_R1________________, - _________________ISRT_L2________________, _________________ISRT_R2________________, - _________________ISRT_L3________________, _________________ISRT_R3________________ - ), - [_NAVIGATION] = LAYOUT_wrapper( ________________NAVIGATION_1_______________, _________________NUMPAD_1__________________, ________________NAVIGATION_2_______________, _________________NUMPAD_2__________________, @@ -189,9 +183,6 @@ static void render_status(void) { case _COLEMAK: oled_write_P(PSTR("Colemak"), false); break; - case _ISRT: - oled_write_P(PSTR("Workman"), false); - break; case _NAVIGATION: oled_write_P(PSTR("Nav "), false); break; diff --git a/keyboards/xoiviox/bgkeeb/keymaps/sadekbaroudi/keymap.c b/keyboards/xoiviox/bgkeeb/keymaps/sadekbaroudi/keymap.c index 2c9414974b..08f7146116 100644 --- a/keyboards/xoiviox/bgkeeb/keymaps/sadekbaroudi/keymap.c +++ b/keyboards/xoiviox/bgkeeb/keymaps/sadekbaroudi/keymap.c @@ -59,12 +59,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________ ), - [_ISRT] = LAYOUT_bgkeeb_base_wrapper( - _________________ISRT_L1________________, _________________ISRT_R1________________, - _________________ISRT_L2________________, _________________ISRT_R2________________, - _________________ISRT_L3________________, _________________ISRT_R3________________ - ), - [_NAVIGATION] = LAYOUT_wrapper( ________________NAVIGATION_1_______________, _________________NUMPAD_1__________________, ________________NAVIGATION_2_______________, _________________NUMPAD_2__________________, diff --git a/keyboards/xoiviox/euclid36/keymaps/sadekbaroudi/keymap.c b/keyboards/xoiviox/euclid36/keymaps/sadekbaroudi/keymap.c index 9fa568ca3b..6fd24b66ac 100644 --- a/keyboards/xoiviox/euclid36/keymaps/sadekbaroudi/keymap.c +++ b/keyboards/xoiviox/euclid36/keymaps/sadekbaroudi/keymap.c @@ -67,12 +67,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________ ), - [_ISRT] = LAYOUT_euclid36_base_wrapper( - _________________ISRT_L1________________, _________________ISRT_R1________________, - _________________ISRT_L2________________, _________________ISRT_R2________________, - _________________ISRT_L3________________, _________________ISRT_R3________________ - ), - [_NAVIGATION] = LAYOUT_wrapper( ________________NAVIGATION_1_______________, _________________NUMPAD_1__________________, ________________NAVIGATION_2_______________, _________________NUMPAD_2__________________, @@ -215,9 +209,6 @@ static void render_status(void) { case _COLEMAK: oled_write_P(PSTR("Colemak"), false); break; - case _ISRT: - oled_write_P(PSTR("Workman"), false); - break; case _NAVIGATION: oled_write_P(PSTR("Nav "), false); break; diff --git a/keyboards/xoiviox/euclid36proto/keymaps/sadekbaroudi/keymap.c b/keyboards/xoiviox/euclid36proto/keymaps/sadekbaroudi/keymap.c index 2d7a1b146c..0952c8ccab 100644 --- a/keyboards/xoiviox/euclid36proto/keymaps/sadekbaroudi/keymap.c +++ b/keyboards/xoiviox/euclid36proto/keymaps/sadekbaroudi/keymap.c @@ -56,12 +56,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________ ), - [_ISRT] = LAYOUT_euclid36proto_base_wrapper( - _________________ISRT_L1________________, _________________ISRT_R1________________, - _________________ISRT_L2________________, _________________ISRT_R2________________, - _________________ISRT_L3________________, _________________ISRT_R3________________ - ), - [_NAVIGATION] = LAYOUT_wrapper( ________________NAVIGATION_1_______________, _________________NUMPAD_1__________________, ________________NAVIGATION_2_______________, _________________NUMPAD_2__________________, diff --git a/keyboards/xoiviox/ffkb/keymaps/sadekbaroudi/keymap.c b/keyboards/xoiviox/ffkb/keymaps/sadekbaroudi/keymap.c index a806ddbcb9..68447c3a03 100644 --- a/keyboards/xoiviox/ffkb/keymaps/sadekbaroudi/keymap.c +++ b/keyboards/xoiviox/ffkb/keymaps/sadekbaroudi/keymap.c @@ -61,12 +61,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________ ), - [_ISRT] = LAYOUT_ffkb_base_wrapper( - _________________ISRT_L1________________, _________________ISRT_R1________________, - _________________ISRT_L2________________, _________________ISRT_R2________________, - _________________ISRT_L3________________, _________________ISRT_R3________________ - ), - [_NAVIGATION] = LAYOUT_wrapper( _______, ________________NAVIGATION_1_______________, _________________NUMPAD_1__________________, _______, _______, ________________NAVIGATION_2_______________, _________________NUMPAD_2__________________, _______, @@ -186,9 +180,6 @@ static void render_status(void) { case _COLEMAK: oled_write_P(PSTR("Colemak"), false); break; - case _ISRT: - oled_write_P(PSTR("ISRT"), false); - break; case _NAVIGATION: oled_write_P(PSTR("Nav "), false); break; diff --git a/keyboards/xoiviox/handwired/barobordhw/keymaps/sadekbaroudi/keymap.c b/keyboards/xoiviox/handwired/barobordhw/keymaps/sadekbaroudi/keymap.c index 8ad23b9ab7..8bc1c1c3b4 100644 --- a/keyboards/xoiviox/handwired/barobordhw/keymaps/sadekbaroudi/keymap.c +++ b/keyboards/xoiviox/handwired/barobordhw/keymaps/sadekbaroudi/keymap.c @@ -56,12 +56,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________ ), - [_ISRT] = LAYOUT_barobordhw_base_wrapper( - _________________ISRT_L1________________, _________________ISRT_R1________________, - _________________ISRT_L2________________, _________________ISRT_R2________________, - _________________ISRT_L3________________, _________________ISRT_R3________________ - ), - [_NAVIGATION] = LAYOUT_wrapper( ________________NAVIGATION_1_______________, _________________NUMPAD_1__________________, ________________NAVIGATION_2_______________, _________________NUMPAD_2__________________, diff --git a/keyboards/xoiviox/handwired/enigma36/keymaps/sadekbaroudi/keymap.c b/keyboards/xoiviox/handwired/enigma36/keymaps/sadekbaroudi/keymap.c index 356f5b6f2e..de40a6bfa1 100644 --- a/keyboards/xoiviox/handwired/enigma36/keymaps/sadekbaroudi/keymap.c +++ b/keyboards/xoiviox/handwired/enigma36/keymaps/sadekbaroudi/keymap.c @@ -56,12 +56,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________ ), - [_ISRT] = LAYOUT_enigma36_base_wrapper( - _________________ISRT_L1________________, _________________ISRT_R1________________, - _________________ISRT_L2________________, _________________ISRT_R2________________, - _________________ISRT_L3________________, _________________ISRT_R3________________ - ), - [_NAVIGATION] = LAYOUT_wrapper( ________________NAVIGATION_1_______________, _________________NUMPAD_1__________________, ________________NAVIGATION_2_______________, _________________NUMPAD_2__________________, diff --git a/keyboards/xoiviox/handwired/ffkbhw/keymaps/sadekbaroudi/keymap.c b/keyboards/xoiviox/handwired/ffkbhw/keymaps/sadekbaroudi/keymap.c index 258e1e4f49..beb252305b 100644 --- a/keyboards/xoiviox/handwired/ffkbhw/keymaps/sadekbaroudi/keymap.c +++ b/keyboards/xoiviox/handwired/ffkbhw/keymaps/sadekbaroudi/keymap.c @@ -56,12 +56,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________ ), - [_ISRT] = LAYOUT_ffkbhw_base_wrapper( - _________________ISRT_L1________________, _________________ISRT_R1________________, - _________________ISRT_L2________________, _________________ISRT_R2________________, - _________________ISRT_L3________________, _________________ISRT_R3________________ - ), - [_NAVIGATION] = LAYOUT_wrapper( ________________NAVIGATION_1_______________, _________________NUMPAD_1__________________, ________________NAVIGATION_2_______________, _________________NUMPAD_2__________________, diff --git a/keyboards/xoiviox/handwired/pteron38/keymaps/sadekbaroudi/keymap.c b/keyboards/xoiviox/handwired/pteron38/keymaps/sadekbaroudi/keymap.c index 43c2923579..458a674c37 100644 --- a/keyboards/xoiviox/handwired/pteron38/keymaps/sadekbaroudi/keymap.c +++ b/keyboards/xoiviox/handwired/pteron38/keymaps/sadekbaroudi/keymap.c @@ -60,12 +60,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________ ), - [_ISRT] = LAYOUT_pteron38_base_wrapper( - _________________ISRT_L1________________, _________________ISRT_R1________________, - _________________ISRT_L2________________, _________________ISRT_R2________________, - _________________ISRT_L3________________, _________________ISRT_R3________________ - ), - [_NAVIGATION] = LAYOUT_wrapper( ________________NAVIGATION_1_______________, _________________NUMPAD_1__________________, ________________NAVIGATION_2_______________, _________________NUMPAD_2__________________, diff --git a/keyboards/xoiviox/osprette/keymaps/sadekbaroudi/keymap.c b/keyboards/xoiviox/osprette/keymaps/sadekbaroudi/keymap.c index b7ee831eab..e293800154 100644 --- a/keyboards/xoiviox/osprette/keymaps/sadekbaroudi/keymap.c +++ b/keyboards/xoiviox/osprette/keymaps/sadekbaroudi/keymap.c @@ -55,12 +55,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________ ), - [_ISRT] = LAYOUT_osprette_base_wrapper( - _________________ISRT_L1________________, _________________ISRT_R1________________, - _________________ISRT_L2________________, _________________ISRT_R2________________, - _________________ISRT_L3________________, _________________ISRT_R3________________ - ), - [_NAVIGATION] = LAYOUT_wrapper( __META_NAV_1_K2__, __META_NAV_1_K3__, __META_NAV_1_K4__, __META_NAV_1_K5__, __NUMPAD_1_K1__, __NUMPAD_1_K2__, __NUMPAD_1_K3__, __NUMPAD_1_K4__, __META_NAV_1_K1__, ________________NAVIGATION_2_______________, _________________NUMPAD_2__________________, __NUMPAD_1_K5__, diff --git a/keyboards/xoiviox/pinkiesout/keymaps/default/keymap.c b/keyboards/xoiviox/pinkiesout/keymaps/default/keymap.c index c58b9c1852..a9ca3c7016 100644 --- a/keyboards/xoiviox/pinkiesout/keymaps/default/keymap.c +++ b/keyboards/xoiviox/pinkiesout/keymaps/default/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_ADJUST] = LAYOUT_pinkiesout( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, + KC_RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, _______, TG(_QWERTY), _______, _______, _______, _______, _______, KC_F11, KC_F12, _______, _______, RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI, TG(_COLEMAK), _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/xoiviox/pinkiesout/keymaps/sadekbaroudi/keymap.c b/keyboards/xoiviox/pinkiesout/keymaps/sadekbaroudi/keymap.c index f0a4e6f889..cd63ebf925 100644 --- a/keyboards/xoiviox/pinkiesout/keymaps/sadekbaroudi/keymap.c +++ b/keyboards/xoiviox/pinkiesout/keymaps/sadekbaroudi/keymap.c @@ -20,6 +20,9 @@ // Uncomment to set up WPM //char wpm_as_str[8]; +#define _GAME 8 +#define _KICAD 9 + /* * The `LAYOUT_pinkiesout_base` macro is a template to allow the use of identical * modifiers for the default layouts (eg QWERTY, Colemak, Dvorak, etc), so @@ -36,9 +39,9 @@ ) \ LAYOUT_wrapper( \ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LPRN, KC_RPRN, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ - KC_TAB, K01, K02, K03, LT(_FUNCTION, K04), K05, ywfulp, wyfupl, 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, ywfulp, wyfupl, LT(_MOUSE, K16), RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), KC_QUOT, \ - KC_LSFT, K21, K22, K23, K24, K25, ywfulp, wyfupl, K26, K27, K28, K29, K2A, KC_ENT, \ + KC_TAB, K01, K02, K03, LT(_FUNCTION, K04), K05, _______, TG(_GAME), 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, _______, TG(_KICAD), 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 \ ) @@ -59,12 +62,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________ ), - [_ISRT] = LAYOUT_pinkiesout_base_wrapper( - _________________ISRT_L1________________, _________________ISRT_R1________________, - _________________ISRT_L2________________, _________________ISRT_R2________________, - _________________ISRT_L3________________, _________________ISRT_R3________________ - ), - [_NAVIGATION] = LAYOUT_wrapper( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ________________NAVIGATION_1_______________, _______, _______, _________________NUMPAD_1__________________, _______, @@ -111,8 +108,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, __________________WIN_NAV_2________________, _______, _______, ___________________BLANK___________________, _______, _______, ___________________BLANK___________________, _______, _______, ___________________BLANK___________________, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) + ), + [_GAME] = LAYOUT_wrapper( + __GAMES_R0_L__, ___________________GAMES_0_________________, __GAMES_R0_R__, _______, _______, _______, _______, _______, _______, _______, \ + __GAMES_R1_L__, ___________________GAMES_1_________________, __GAMES_R1_R__, TG(_GAME), ___________________BLANK___________________, _______, \ + __GAMES_R2_L__, ___________________GAMES_2_________________, __GAMES_R2_R__, _______, ___________________BLANK___________________, _______, \ + __GAMES_R3_L__, ___________________GAMES_3_________________, __GAMES_R3_R__, _______, ___________________BLANK___________________, _______, \ + __GAMES_R4_1__, __GAMES_R4_3__, __GAMES_TH_L__, __GAMES_TH_C__, __GAMES_TH_R__, _______, _______, _______, _______, _______ \ + ), + + [_KICAD] = LAYOUT_wrapper( + __KICAD_R0_L__, ___________________KICAD_0_________________, __KICAD_R0_R__, _______, _______, _______, _______, _______, _______, _______, \ + __KICAD_R1_L__, ___________________KICAD_1_________________, __KICAD_R1_R__, _______, ___________________BLANK___________________, _______, \ + __KICAD_R2_L__, ___________________KICAD_2_________________, __KICAD_R2_R__, TG(_KICAD), ___________________BLANK___________________, _______, \ + __KICAD_R3_L__, ___________________KICAD_3_________________, __GAMES_R3_R__, _______, ___________________BLANK___________________, _______, \ + __KICAD_R4_1__, __KICAD_R4_3__, __KICAD_TH_L__, __KICAD_TH_C__, __KICAD_TH_R__, _______, _______, _______, _______, _______ \ + ) }; @@ -184,9 +196,6 @@ static void render_status(void) { case _COLEMAK: oled_write_P(PSTR("Colemak"), false); break; - case _ISRT: - oled_write_P(PSTR("Workman"), false); - break; case _NAVIGATION: oled_write_P(PSTR("Nav "), false); break; diff --git a/keyboards/xoiviox/pinkiesout/keymaps/sadekbaroudi/rules.mk b/keyboards/xoiviox/pinkiesout/keymaps/sadekbaroudi/rules.mk new file mode 100644 index 0000000000..b87c17260f --- /dev/null +++ b/keyboards/xoiviox/pinkiesout/keymaps/sadekbaroudi/rules.mk @@ -0,0 +1,2 @@ +OLED_DRIVER_ENABLE = no +OLED_ENABLE = no \ No newline at end of file diff --git a/users/sadekbaroudi/rgb_stuff.c b/users/sadekbaroudi/rgb_stuff.c index 4b8f1ddd24..307b2f6d1a 100755 --- a/users/sadekbaroudi/rgb_stuff.c +++ b/users/sadekbaroudi/rgb_stuff.c @@ -142,12 +142,6 @@ layer_state_t layer_state_set_rgb_light(layer_state_t state) { #endif rgblight_set_hsv_and_mode(10, 10, 255, mode); // white break; - case _ISRT: - #ifdef PIMORONI_TRACKBALL_ENABLE - trackball_set_rgbw(RGB_MAGENTA, 0x00); - #endif - rgblight_set_hsv_and_mode(HSV_MAGENTA, mode); - break; case _NAVIGATION: #ifdef PIMORONI_TRACKBALL_ENABLE trackball_set_rgbw(RGB_GREEN, 0x00); diff --git a/users/sadekbaroudi/rules.mk b/users/sadekbaroudi/rules.mk index 831761fad1..14ce2dde93 100755 --- a/users/sadekbaroudi/rules.mk +++ b/users/sadekbaroudi/rules.mk @@ -13,7 +13,7 @@ COMBO_ENABLE = yes #LTO_ENABLE = yes # UNCOMMENT TO DISABLE MACROS -#EXTRAFLAGS += -flto +EXTRAFLAGS += -flto # UNCOMMENT TO DISABLE MACROS SPACE_CADET_ENABLE = no diff --git a/users/sadekbaroudi/sadekbaroudi.h b/users/sadekbaroudi/sadekbaroudi.h index fe626ed333..7519579f52 100755 --- a/users/sadekbaroudi/sadekbaroudi.h +++ b/users/sadekbaroudi/sadekbaroudi.h @@ -32,7 +32,6 @@ enum userspace_layers { _COLEMAK = 0, _QWERTY, - _ISRT, _NAVIGATION, _SYMBOLS, _FUNCTION, diff --git a/users/sadekbaroudi/wrappers.h b/users/sadekbaroudi/wrappers.h index 483ec7eb7b..abc82a198e 100755 --- a/users/sadekbaroudi/wrappers.h +++ b/users/sadekbaroudi/wrappers.h @@ -131,15 +131,6 @@ NOTE: These are all the same length. If you do a search/replace #define ______________COLEMAK_MOD_DH_R2____________ KC_M, KC_N, KC_E, KC_I, KC_O #define ______________COLEMAK_MOD_DH_R3____________ KC_K, KC_H, KC_COMM, KC_DOT, KC_SLASH -// ISRT -#define _________________ISRT_L1________________ KC_Y, KC_C, KC_L, KC_M, KC_K -#define _________________ISRT_L2________________ KC_I, KC_S, KC_R, KC_T, KC_G -#define _________________ISRT_L3________________ KC_Q, KC_V, KC_W, KC_D, KC_J - -#define _________________ISRT_R1________________ KC_Z, KC_F, KC_U, KC_COMM, KC_SCLN -#define _________________ISRT_R2________________ KC_P, KC_N, KC_E, KC_A, KC_O -#define _________________ISRT_R3________________ KC_B, KC_H, KC_SLSH, KC_DOT, KC_X - // BLANK FULL LINE #define ___________________BLANK___________________ _______, _______, _______, _______, _______ @@ -306,7 +297,7 @@ NOTE: These are all the same length. If you do a search/replace #define __RGB_3_K2__ RGB_HUD #define __RGB_3_K3__ RGB_SAD #define __RGB_3_K4__ RGB_VAD -#define __RGB_3_K5__ TG(_ISRT) +#define __RGB_3_K5__ _______ #define ___________________RGB_1___________________ __RGB_1_K1__, __RGB_1_K2__, __RGB_1_K3__, __RGB_1_K4__, __RGB_1_K5__ #define ___________________RGB_2___________________ __RGB_2_K1__, __RGB_2_K2__, __RGB_2_K3__, __RGB_2_K4__, __RGB_2_K5__ @@ -416,12 +407,12 @@ NOTE: These are all the same length. If you do a search/replace #define __GAMES_R0_R__ KC_N #define __GAMES_R1_R__ KC_Y #define __GAMES_R2_R__ KC_F7 -#define __GAMES_R3_R__ _______ +#define __GAMES_R3_R__ KC_ESC #define __GAMES_TH_L__ KC_J #define __GAMES_TH_C__ KC_X #define __GAMES_TH_R__ KC_B #define __GAMES_R4_1__ KC_LCTL -#define __GAMES_R4_2__ KC_ESC +#define __GAMES_R4_2__ __GAMES_R3_R__ #define __GAMES_R4_3__ KC_LALT