Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

chore: apply QMK PR guidelines #3

Closed
wants to merge 1 commit into from
Closed

chore: apply QMK PR guidelines #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions keyboards/mechwild/bb65/bb65.c
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions keyboards/mechwild/bb65/bb65.h
View file
Open in desktop

This file was deleted.

207 changes: 138 additions & 69 deletions keyboards/mechwild/bb65/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"encoder": {
"rotary": [
{ "pin_a": "A3", "pin_b": "A2", "resolution": 4 }
{"pin_a": "A3", "pin_b": "A2"}
]
},
"rgblight": {
Expand All @@ -48,76 +48,145 @@
}
},
"layouts": {
"LAYOUT": {
"LAYOUT_all": {
"layout": [
{"matrix":[0,0], "x":0, "y":0},
{"matrix":[0,1], "x":1, "y":0},
{"matrix":[0,2], "x":2, "y":0},
{"matrix":[0,3], "x":3, "y":0},
{"matrix":[0,4], "x":4, "y":0},
{"matrix":[0,5], "x":5, "y":0},
{"matrix":[0,6], "x":6, "y":0},
{"matrix":[0,7], "x":7, "y":0},
{"matrix":[0,8], "x":8, "y":0},
{"matrix":[5,8], "x":9, "y":0},
{"matrix":[5,7], "x":10, "y":0},
{"matrix":[5,6], "x":11, "y":0},
{"matrix":[5,5], "x":12, "y":0},
{"matrix":[5,4], "x":13, "y":0, "w":2},
{"matrix":[1,0], "x":0, "y":1, "w":1.5},
{"matrix":[1,1], "x":1.5, "y":1},
{"matrix":[1,2], "x":2.5, "y":1},
{"matrix":[1,3], "x":3.5, "y":1},
{"matrix":[1,4], "x":4.5, "y":1},
{"matrix":[1,5], "x":5.5, "y":1},
{"matrix":[1,6], "x":6.5, "y":1},
{"matrix":[1,7], "x":7.5, "y":1},
{"matrix":[1,8], "x":8.5, "y":1},
{"matrix":[6,8], "x":9.5, "y":1},
{"matrix":[6,7], "x":10.5, "y":1},
{"matrix":[6,6], "x":11.5, "y":1},
{"matrix":[6,5], "x":12.5, "y":1},
{"matrix":[6,4], "x":13.5, "y":1, "w":1.5},
{"matrix":[2,0], "x":0, "y":2, "w":1.75},
{"matrix":[2,1], "x":1.75, "y":2},
{"matrix":[2,2], "x":2.75, "y":2},
{"matrix":[2,3], "x":3.75, "y":2},
{"matrix":[2,4], "x":4.75, "y":2},
{"matrix":[2,5], "x":5.75, "y":2},
{"matrix":[2,6], "x":6.75, "y":2},
{"matrix":[2,7], "x":7.75, "y":2},
{"matrix":[2,8], "x":8.75, "y":2},
{"matrix":[7,0], "x":9.75, "y":2},
{"matrix":[6,0], "x":10.75, "y":2},
{"matrix":[6,1], "x":11.75, "y":2},
{"matrix":[6,2], "x":12.75, "y":2},
{"matrix":[6,3], "x":13.75, "y":2, "w":1.25},
{"matrix":[3,0], "x":0, "y":3, "w":1.25},
{"matrix":[3,1], "x":1.25, "y":3},
{"matrix":[3,2], "x":2.25, "y":3},
{"matrix":[3,3], "x":3.25, "y":3},
{"matrix":[3,4], "x":4.25, "y":3},
{"matrix":[3,5], "x":5.25, "y":3},
{"matrix":[3,6], "x":6.25, "y":3},
{"matrix":[3,7], "x":7.25, "y":3},
{"matrix":[3,8], "x":8.25, "y":3},
{"matrix":[7,8], "x":9.25, "y":3},
{"matrix":[7,7], "x":10.25, "y":3},
{"matrix":[7,6], "x":11.25, "y":3},
{"matrix":[7,5], "x":12.25, "y":3, "w":1.75},
{"matrix":[7,4], "x":15.5, "y":3},
{"matrix":[7,3], "x":14.25, "y":3.25},
{"matrix":[4,0], "x":0, "y":4, "w":1.25},
{"matrix":[4,1], "x":1.25, "y":4, "w":1.25},
{"matrix":[4,2], "x":2.5, "y":4, "w":1.25},
{"matrix":[4,5], "x":3.75, "y":4, "w":6.25},
{"matrix":[4,3], "x":10, "y":4},
{"matrix":[4,4], "x":11, "y":4},
{"matrix":[4,6], "x":12, "y":4},
{"matrix":[4,7], "x":13.25, "y":4.25},
{"matrix":[4,8], "x":14.25, "y":4.25},
{"matrix":[0,0], "x":0, "y":0},
{"matrix":[0,1], "x":1, "y":0},
{"matrix":[0,2], "x":2, "y":0},
{"matrix":[0,3], "x":3, "y":0},
{"matrix":[0,4], "x":4, "y":0},
{"matrix":[0,5], "x":5, "y":0},
{"matrix":[0,6], "x":6, "y":0},
{"matrix":[0,7], "x":7, "y":0},
{"matrix":[0,8], "x":8, "y":0},
{"matrix":[5,8], "x":9, "y":0},
{"matrix":[5,7], "x":10, "y":0},
{"matrix":[5,6], "x":11, "y":0},
{"matrix":[5,5], "x":12, "y":0},
{"matrix":[5,4], "x":13, "y":0, "w":2},
{"matrix":[1,0], "x":0, "y":1, "w":1.5},
{"matrix":[1,1], "x":1.5, "y":1},
{"matrix":[1,2], "x":2.5, "y":1},
{"matrix":[1,3], "x":3.5, "y":1},
{"matrix":[1,4], "x":4.5, "y":1},
{"matrix":[1,5], "x":5.5, "y":1},
{"matrix":[1,6], "x":6.5, "y":1},
{"matrix":[1,7], "x":7.5, "y":1},
{"matrix":[1,8], "x":8.5, "y":1},
{"matrix":[6,8], "x":9.5, "y":1},
{"matrix":[6,7], "x":10.5, "y":1},
{"matrix":[6,6], "x":11.5, "y":1},
{"matrix":[6,5], "x":12.5, "y":1},
{"matrix":[6,4], "x":13.5, "y":1, "w":1.5},
{"matrix":[2,0], "x":0, "y":2, "w":1.75},
{"matrix":[2,1], "x":1.75, "y":2},
{"matrix":[2,2], "x":2.75, "y":2},
{"matrix":[2,3], "x":3.75, "y":2},
{"matrix":[2,4], "x":4.75, "y":2},
{"matrix":[2,5], "x":5.75, "y":2},
{"matrix":[2,6], "x":6.75, "y":2},
{"matrix":[2,7], "x":7.75, "y":2},
{"matrix":[2,8], "x":8.75, "y":2},
{"matrix":[7,0], "x":9.75, "y":2},
{"matrix":[6,0], "x":10.75, "y":2},
{"matrix":[6,1], "x":11.75, "y":2},
{"matrix":[6,2], "x":12.75, "y":2},
{"matrix":[6,3], "x":13.75, "y":2, "w":1.25},
{"matrix":[3,0], "x":0, "y":3, "w":1.25},
{"matrix":[3,1], "x":1.25, "y":3},
{"matrix":[3,2], "x":2.25, "y":3},
{"matrix":[3,3], "x":3.25, "y":3},
{"matrix":[3,4], "x":4.25, "y":3},
{"matrix":[3,5], "x":5.25, "y":3},
{"matrix":[3,6], "x":6.25, "y":3},
{"matrix":[3,7], "x":7.25, "y":3},
{"matrix":[3,8], "x":8.25, "y":3},
{"matrix":[7,8], "x":9.25, "y":3},
{"matrix":[7,7], "x":10.25, "y":3},
{"matrix":[7,6], "x":11.25, "y":3},
{"matrix":[7,5], "x":12.25, "y":3, "w":1.75},
{"matrix":[7,4], "x":15.5, "y":3},
{"matrix":[7,3], "x":14.25, "y":3.25},
{"matrix":[4,0], "x":0, "y":4, "w":1.25},
{"matrix":[4,1], "x":1.25, "y":4, "w":1.25},
{"matrix":[4,2], "x":2.5, "y":4, "w":1.25},
{"matrix":[4,5], "x":3.75, "y":4, "w":6.25},
{"matrix":[4,3], "x":10, "y":4},
{"matrix":[4,4], "x":11, "y":4},
{"matrix":[4,6], "x":12, "y":4},
{"matrix":[4,7], "x":13.25, "y":4.25},
{"matrix":[4,8], "x":14.25, "y":4.25},
{"matrix":[7,2], "x":15.25, "y":4.25}
]
},
"LAYOUT_ansi": {
"layout": [
{"matrix":[0,0], "x":0, "y":0},
{"matrix":[0,1], "x":1, "y":0},
{"matrix":[0,2], "x":2, "y":0},
{"matrix":[0,3], "x":3, "y":0},
{"matrix":[0,4], "x":4, "y":0},
{"matrix":[0,5], "x":5, "y":0},
{"matrix":[0,6], "x":6, "y":0},
{"matrix":[0,7], "x":7, "y":0},
{"matrix":[0,8], "x":8, "y":0},
{"matrix":[5,8], "x":9, "y":0},
{"matrix":[5,7], "x":10, "y":0},
{"matrix":[5,6], "x":11, "y":0},
{"matrix":[5,5], "x":12, "y":0},
{"matrix":[5,4], "x":13, "y":0, "w":2},
{"matrix":[1,0], "x":0, "y":1, "w":1.5},
{"matrix":[1,1], "x":1.5, "y":1},
{"matrix":[1,2], "x":2.5, "y":1},
{"matrix":[1,3], "x":3.5, "y":1},
{"matrix":[1,4], "x":4.5, "y":1},
{"matrix":[1,5], "x":5.5, "y":1},
{"matrix":[1,6], "x":6.5, "y":1},
{"matrix":[1,7], "x":7.5, "y":1},
{"matrix":[1,8], "x":8.5, "y":1},
{"matrix":[6,8], "x":9.5, "y":1},
{"matrix":[6,7], "x":10.5, "y":1},
{"matrix":[6,6], "x":11.5, "y":1},
{"matrix":[6,5], "x":12.5, "y":1},
{"matrix":[6,4], "x":13.5, "y":1, "w":1.5},
{"matrix":[2,0], "x":0, "y":2, "w":1.75},
{"matrix":[2,1], "x":1.75, "y":2},
{"matrix":[2,2], "x":2.75, "y":2},
{"matrix":[2,3], "x":3.75, "y":2},
{"matrix":[2,4], "x":4.75, "y":2},
{"matrix":[2,5], "x":5.75, "y":2},
{"matrix":[2,6], "x":6.75, "y":2},
{"matrix":[2,7], "x":7.75, "y":2},
{"matrix":[2,8], "x":8.75, "y":2},
{"matrix":[7,0], "x":9.75, "y":2},
{"matrix":[6,0], "x":10.75, "y":2},
{"matrix":[6,1], "x":11.75, "y":2},
{"matrix":[6,3], "x":12.75, "y":2, "w":2.25},
{"matrix":[3,0], "x":0, "y":3, "w":2.25},
{"matrix":[3,2], "x":2.25, "y":3},
{"matrix":[3,3], "x":3.25, "y":3},
{"matrix":[3,4], "x":4.25, "y":3},
{"matrix":[3,5], "x":5.25, "y":3},
{"matrix":[3,6], "x":6.25, "y":3},
{"matrix":[3,7], "x":7.25, "y":3},
{"matrix":[3,8], "x":8.25, "y":3},
{"matrix":[7,8], "x":9.25, "y":3},
{"matrix":[7,7], "x":10.25, "y":3},
{"matrix":[7,6], "x":11.25, "y":3},
{"matrix":[7,5], "x":12.25, "y":3, "w":1.75},
{"matrix":[7,4], "x":15.5, "y":3},
{"matrix":[7,3], "x":14.25, "y":3.25},
{"matrix":[4,0], "x":0, "y":4, "w":1.25},
{"matrix":[4,1], "x":1.25, "y":4, "w":1.25},
{"matrix":[4,2], "x":2.5, "y":4, "w":1.25},
{"matrix":[4,5], "x":3.75, "y":4, "w":6.25},
{"matrix":[4,3], "x":10, "y":4},
{"matrix":[4,4], "x":11, "y":4},
{"matrix":[4,6], "x":12, "y":4},
{"matrix":[4,7], "x":13.25, "y":4.25},
{"matrix":[4,8], "x":14.25, "y":4.25},
{"matrix":[7,2], "x":15.25, "y":4.25}
]
}
}
}
}
6 changes: 3 additions & 3 deletions keyboards/mechwild/bb65/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ enum layer_names {

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */
[_BASE] = LAYOUT(
[_BASE] = LAYOUT_all(
QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_TRNS, KC_ENT,
KC_LSFT, KC_TRNS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, RGB_TOG,
RGB_RMOD, KC_LGUI, RGB_MOD, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[_FN1] = LAYOUT(
[_FN1] = LAYOUT_all(
KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
Expand All @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};

#ifdef ENCODER_MAP_ENABLE
const uint16_t PROGMEM encoder_map[][1][2] = {
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
[_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
};
Expand Down
28 changes: 5 additions & 23 deletions keyboards/mechwild/bb65/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,49 +7,31 @@

enum layer_names {
_BASE,
_FN1,
_FN2,
_FN3
_FN1
};


const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */
[_BASE] = LAYOUT(
[_BASE] = LAYOUT_all(
QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_TRNS, KC_ENT,
KC_LSFT, KC_TRNS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, RGB_TOG,
RGB_RMOD, KC_LGUI, RGB_MOD, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[_FN1] = LAYOUT(
[_FN1] = LAYOUT_all(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END
),
[_FN2] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
[_FN3] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
)
};

#ifdef ENCODER_MAP_ENABLE
const uint16_t PROGMEM encoder_map[][1][2] = {
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
[_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
[_FN2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
[_FN3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
[_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
};
#endif