Skip to content

Commit fb6557a

Browse files
3araht3araht
authored
New layer added to giabalanai keyboard (qmk#20118)
1 parent 2d7240f commit fb6557a

File tree

9 files changed

+183
-70
lines changed

9 files changed

+183
-70
lines changed

‎keyboards/giabalanai/config.h

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2020 3araht
2+
Copyright 2023 3araht
33
44
This program is free software: you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by
@@ -36,16 +36,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
3636
/* COL2ROW, ROW2COL */
3737
#define DIODE_DIRECTION COL2ROW
3838

39-
#define SELECT_SOFT_SERIAL_SPEED 1
40-
/*Sets the protocol speed when using serial communication*/
41-
//Speeds:
42-
//0: about 189kbps (Experimental only)
43-
//1: about 137kbps (default)
44-
//2: about 75kbps
45-
//3: about 39kbps
46-
//4: about 26kbps
47-
//5: about 20kbps
48-
4939
// Right side has to be the master since 1, LED data is output from right side, and 2, Audio pin is prepared on right side as a reserve.
5040
#define MASTER_RIGHT
5141

@@ -227,3 +217,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
227217
// #define NO_ACTION_TAPPING
228218
// NO_ACTION_ONESHOT -388 bytes
229219
#define NO_ACTION_ONESHOT
220+
/*
221+
* Encoder options
222+
*/
223+
#ifdef ENCODER_ENABLE
224+
# define ENCODER_RESOLUTIONS_RIGHT { 4 }
225+
#endif // ENCODER_ENABLE

‎keyboards/giabalanai/info.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,22 @@
88
"pid": "0xF4B0",
99
"device_version": "0.0.1"
1010
},
11+
"features": {
12+
"midi": true,
13+
"extrakey": true,
14+
"encoder": true,
15+
"bootmagic": false,
16+
"console": false,
17+
"mousekey": false,
18+
"nkro": false,
19+
"rgblight": false,
20+
"audio": false
21+
},
1122
"encoder": {
1223
"rotary": []
1324
},
1425
"split": {
26+
"enabled": true,
1527
"soft_serial_pin": "D2",
1628
"encoder": {
1729
"right": {

‎keyboards/giabalanai/keymaps/2firmware/config.h

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
Copyright 2023 3araht
3+
4+
This program is free software: you can redistribute it and/or modify
5+
it under the terms of the GNU General Public License as published by
6+
the Free Software Foundation, either version 2 of the License, or
7+
(at your option) any later version.
8+
9+
This program is distributed in the hope that it will be useful,
10+
but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
GNU General Public License for more details.
13+
14+
You should have received a copy of the GNU General Public License
15+
along with this program. If not, see <http://www.gnu.org/licenses/>.
16+
*/
117
#pragma once
218

319
//#define USE_MATRIX_I2C

‎keyboards/giabalanai/keymaps/3araht/keymap.c

Lines changed: 50 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,18 @@ user_config_t user_config;
5858

5959
// Defines names for use in layer keycodes and the keymap
6060
enum layer_names {
61-
_C_SYSTEM_BASE, // MIDI C-system
62-
_FAKE_B_SYSTEM, // MIDI fake B-system doesn't have correct assignments on top two rows. The bottom 3 rows are B-system.
63-
_C_SYSTEM_BASS2ROW, // counter bass system
64-
_C_SYSTEM_ENTIRELY, // single notes for both left and right keybaords.
65-
_C_SYSTEM_FREEBASS, // C-system Free Bass
61+
_C_SYSTEM_BASE, // MIDI C-system
62+
_FAKE_B_SYSTEM, // MIDI fake B-system doesn't have correct assignments on top two rows. The bottom 3 rows are B-system.
63+
_C_SYSTEM_BASS2ROW, // counter bass system
64+
_FAKE_B_SYSTEM_BASS2ROW, // MIDI fake B-system doesn't have correct assignments on top two rows. The bottom 3 rows are B-system. Counter bass version.
65+
_C_SYSTEM_ENTIRELY, // single notes for both left and right keybaords.
66+
_C_SYSTEM_FREEBASS, // C-system Free Bass
6667
_CHROMATONE,
67-
_CFLIP_BASS2ROW, // 180 degree flipped layout on right side keyboard
68+
_CFLIP_BASS2ROW, // 180 degree flipped layout on right side keyboard
6869
_QWERTY,
6970
_COLEMAK,
70-
_ADJUST, // for Fn keys, etc.
71-
_FN // for changing layers, octaves, etc.
71+
_ADJUST, // for Fn keys, etc.
72+
_FN // for changing layers, octaves, etc.
7273
};
7374

7475
// Defines the keycodes used by our macros in process_record_user
@@ -181,6 +182,7 @@ enum custom_keycodes {
181182
CSYSTEM, // C-SYSTEM layout
182183
BSYSTEM, // B-SYSTEM layout
183184
CNTBASC, // CouNTer BASs C-system layout
185+
CNTBASB, // CouNTer BASs B-system layout
184186
CSYSALL, // C-SYStem ALL layout
185187
CSYSFBS, // C-SYStem Free BaSs
186188
CHRTONE, // CHRomaTONE layout
@@ -240,6 +242,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
240242
MI_A2, MI_C3, MI_Eb3, MI_Fs3, MI_A3, MI_C4, MI_Eb4, MI_Fs4, MI_A4, MI_C5, MI_Eb5, MI_Fs5
241243
),
242244

245+
/* fake B-system */
246+
[_FAKE_B_SYSTEM_BASS2ROW] = LAYOUT(
247+
MI_CH_Fr, MI_CH_Cr, MI_CH_Gr, MI_CH_Dr, MI_CH_Ar, MI_CH_Er, MI_CH_Br, MI_CH_Fsr, MI_CH_Csr, MI_CH_Gsr, MI_CH_Dsr, MI_CH_Asr,
248+
MI_CH_Dbr, MI_CH_Abr, MI_CH_Ebr, MI_CH_Bbr, MI_CH_Fr, MI_CH_Cr, MI_CH_Gr, MI_CH_Dr, MI_CH_Ar, MI_CH_Er, MI_CH_Br, MI_CH_Fsr,
249+
MI_CH_Db, MI_CH_Ab, MI_CH_Eb, MI_CH_Bb, MI_CH_F, MI_CH_C, MI_CH_G, MI_CH_D, MI_CH_A, MI_CH_E, MI_CH_B, MI_CH_Fs,
250+
MI_CH_Dbm, MI_CH_Abm, MI_CH_Ebm, MI_CH_Bbm, MI_CH_Fm, MI_CH_Cm, MI_CH_Gm, MI_CH_Dm, MI_CH_Am, MI_CH_Em, MI_CH_Bm, MI_CH_Fsm,
251+
MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, MI_CH_FDom7, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_FsDom7,
252+
253+
MI_Ab2,
254+
MI_A2, MI_C3, MI_Eb3, MI_Gb3, MI_A3, MI_C4, MI_Eb4, MI_Gb4, MI_A4, MI_C5, MI_Eb5, MI_Gb5, _______,
255+
MI_G2, MI_Bb2, MI_Db3, MI_E3, MI_G3, MI_Bb3, MI_Db4, MI_E4, MI_G4, MI_Bb4, MI_Db5, MI_E5, MI_G5,
256+
MI_Ab2, MI_B2, MI_D3, MI_F3, MI_Ab3, MI_B3, MI_D4, MI_F4, MI_Ab4, MI_B4, MI_D5, MI_F5
257+
),
258+
243259
/* C-system entirely */
244260
[_C_SYSTEM_ENTIRELY] = LAYOUT(
245261
MI_BNDU, XXXXXXX, XXXXXXX, MI_Db, MI_E, MI_G, MI_Bb, MI_Db1, MI_E1, MI_G1, MI_Bb1, MI_Db2,
@@ -340,32 +356,33 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
340356

341357
/* Fn */
342358
[_FN] = LAYOUT(
343-
CSYSTEM, BSYSTEM, CNTBASC, CSYSALL, CHRTONE, CFLIP2B, CSYSFBS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG,
359+
CSYSTEM, BSYSTEM, CNTBASC, CSYSALL, CHRTONE, CFLIP2B, CSYSFBS, CNTBASB, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG,
344360
DF_QWER, TGLBASS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
345361
DF_COLE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TGLMICH,
346362
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
347363
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
348364

349365
XXXXXXX,
350366
MI_OCN2, MI_OCN1, MI_OC0, MI_OC1, MI_OC2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, VERSION, EE_CLR, _______,
351-
CSYSTEM, BSYSTEM, CNTBASC, CSYSALL, CHRTONE, CFLIP2B, CSYSFBS, XXXXXXX, XXXXXXX, MI_VELD, MI_VELU, XXXXXXX, RGB_TOG,
367+
CSYSTEM, BSYSTEM, CNTBASC, CSYSALL, CHRTONE, CFLIP2B, CSYSFBS, CNTBASB, XXXXXXX, MI_VELD, MI_VELU, XXXXXXX, RGB_TOG,
352368
XXXXXXX, TGLBASS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TGLUVEL, MELDYAL, MELODYS, MELDYAH
353369
)
354370
};
355371

356372
#if defined(ENCODER_MAP_ENABLE)
357373
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
358-
[_C_SYSTEM_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
359-
[_FAKE_B_SYSTEM] = { ENCODER_CCW_CW(_______, _______) },
360-
[_C_SYSTEM_BASS2ROW] = { ENCODER_CCW_CW(_______, _______) },
361-
[_C_SYSTEM_ENTIRELY] = { ENCODER_CCW_CW(_______, _______) },
362-
[_C_SYSTEM_FREEBASS] = { ENCODER_CCW_CW(_______, _______) },
363-
[_CHROMATONE] = { ENCODER_CCW_CW(_______, _______) },
364-
[_CFLIP_BASS2ROW] = { ENCODER_CCW_CW(_______, _______) },
365-
[_QWERTY] = { ENCODER_CCW_CW(_______, _______) },
366-
[_COLEMAK] = { ENCODER_CCW_CW(_______, _______) },
367-
[_ADJUST] = { ENCODER_CCW_CW(_______, _______) },
368-
[_FN] = { ENCODER_CCW_CW(_______, _______) },
374+
[_C_SYSTEM_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
375+
[_FAKE_B_SYSTEM] = { ENCODER_CCW_CW(_______, _______) },
376+
[_C_SYSTEM_BASS2ROW] = { ENCODER_CCW_CW(_______, _______) },
377+
[_FAKE_B_SYSTEM_BASS2ROW] = { ENCODER_CCW_CW(_______, _______) },
378+
[_C_SYSTEM_ENTIRELY] = { ENCODER_CCW_CW(_______, _______) },
379+
[_C_SYSTEM_FREEBASS] = { ENCODER_CCW_CW(_______, _______) },
380+
[_CHROMATONE] = { ENCODER_CCW_CW(_______, _______) },
381+
[_CFLIP_BASS2ROW] = { ENCODER_CCW_CW(_______, _______) },
382+
[_QWERTY] = { ENCODER_CCW_CW(_______, _______) },
383+
[_COLEMAK] = { ENCODER_CCW_CW(_______, _______) },
384+
[_ADJUST] = { ENCODER_CCW_CW(_______, _______) },
385+
[_FN] = { ENCODER_CCW_CW(_______, _______) },
369386
};
370387
#endif
371388

@@ -383,7 +400,7 @@ const rgblight_segment_t PROGMEM my_adjust_layer[] = RGBLIGHT_LAYER_SEGMENTS({1,
383400

384401
// Light up fn layer keys
385402
const rgblight_segment_t PROGMEM my_fn_layer[] = RGBLIGHT_LAYER_SEGMENTS( // left keyboard
386-
{0, 7, HSV_ORANGE}, // MIDI layouts
403+
{0, 8, HSV_ORANGE}, // MIDI layouts
387404
{11, 1, HSV_RED}, // RGB_TOG
388405
{12, 1, HSV_WHITE}, // DF_QWER
389406
{13, 1, HSV_CORAL}, // TGLBASS
@@ -410,15 +427,16 @@ const rgblight_segment_t PROGMEM my_fn_layer[] = RGBLIGHT_LAYER_SEGMENTS(
410427
{53, 1, HSV_PINK},
411428
#endif
412429
// right keyboard
413-
{60, 7, HSV_ORANGE}, // MIDI layouts
430+
{60, 8, HSV_ORANGE}, // MIDI layouts
414431
{74, 1, HSV_CORAL}, // TGLBASS
415432
{85, 1, HSV_BLUE}, // MIDI Oct
416433
{86, 1, HSV_CYAN}, // MIDI Oct
417434
{87, 1, HSV_SPRINGGREEN}, // MIDI Oct
418435
{88, 1, HSV_GREEN}, // MIDI Oct
419436
{89, 1, HSV_CHARTREUSE}, // MIDI Oct
437+
{95, 1, HSV_GOLD}, // VERSION
420438
{96, 1, HSV_PINK}, // EE_CLR
421-
{98, 7, HSV_ORANGE}, // MIDI layouts
439+
{98, 8, HSV_ORANGE}, // MIDI layouts
422440
{107, 1, HSV_YELLOW}, // MI_VELD
423441
{108, 1, HSV_GREEN}, // MI_VELU
424442
{110, 1, HSV_RED}, // RGB_TOG
@@ -530,6 +548,7 @@ void switch_keylight_color4bass(keyrecord_t *record, uint8_t keylocation){
530548
keylight_manager(record, HSV_ORANGE, keylocation);
531549
break;
532550
case _C_SYSTEM_BASS2ROW:
551+
case _FAKE_B_SYSTEM_BASS2ROW:
533552
keylight_manager(record, HSV_YELLOW, keylocation);
534553
break;
535554
case _CFLIP_BASS2ROW:
@@ -546,6 +565,7 @@ void switch_keylight_color4chords(keyrecord_t *record, uint8_t keylocation){
546565
keylight_manager(record, HSV_YELLOW, keylocation);
547566
break;
548567
case _C_SYSTEM_BASS2ROW:
568+
case _FAKE_B_SYSTEM_BASS2ROW:
549569
keylight_manager(record, HSV_GOLDENROD, keylocation);
550570
break;
551571
case _CFLIP_BASS2ROW:
@@ -596,6 +616,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
596616
}
597617
break;
598618

619+
case CNTBASB:
620+
if (record->event.pressed) {
621+
set_single_persistent_default_layer(_FAKE_B_SYSTEM_BASS2ROW);
622+
}
623+
break;
624+
599625
case CSYSALL:
600626
if (record->event.pressed) {
601627
set_single_persistent_default_layer(_C_SYSTEM_ENTIRELY);

‎keyboards/giabalanai/keymaps/default_giabarinaix2/config.h

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
Copyright 2023 3araht
3+
4+
This program is free software: you can redistribute it and/or modify
5+
it under the terms of the GNU General Public License as published by
6+
the Free Software Foundation, either version 2 of the License, or
7+
(at your option) any later version.
8+
9+
This program is distributed in the hope that it will be useful,
10+
but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
GNU General Public License for more details.
13+
14+
You should have received a copy of the GNU General Public License
15+
along with this program. If not, see <http://www.gnu.org/licenses/>.
16+
*/
117
#pragma once
218

319
#define GIABARINAIX2

‎keyboards/giabalanai/keymaps/giabarinaix2led/config.h

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
Copyright 2023 3araht
3+
4+
This program is free software: you can redistribute it and/or modify
5+
it under the terms of the GNU General Public License as published by
6+
the Free Software Foundation, either version 2 of the License, or
7+
(at your option) any later version.
8+
9+
This program is distributed in the hope that it will be useful,
10+
but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
GNU General Public License for more details.
13+
14+
You should have received a copy of the GNU General Public License
15+
along with this program. If not, see <http://www.gnu.org/licenses/>.
16+
*/
117
#pragma once
218

319
#define GIABARINAIX2

0 commit comments

Comments
 (0)