Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2023-12-06 03:52:28 +00:00
commit 51ce4ae8ad
8 changed files with 330 additions and 0 deletions

View file

@ -0,0 +1,37 @@
{
"development_board": "elite_c",
"encoder": {
"rotary": [
{"pin_a": "F0", "pin_b": "F1"}
]
},
"features": {
"bootmagic": true,
"encoder": true,
"extrakey": true,
"mousekey": true,
"nkro": true,
"oled": true,
"rgblight": true
},
"rgblight": {
"animations": {
"alternating": true,
"breathing": true,
"christmas": true,
"knight": true,
"rainbow_mood": true,
"rainbow_swirl": true,
"rgb_test": true,
"snake": true,
"static_gradient": true,
"twinkle": true
},
"led_count": 8,
"max_brightness": 175,
"sleep": true
},
"ws2812": {
"pin": "C7"
}
}

View file

@ -0,0 +1 @@
# This file intentionally left blank

View file

@ -0,0 +1,256 @@
{
"keyboard_name": "Fruitbar",
"maintainer": "blewis308",
"diode_direction": "COL2ROW",
"matrix_pins": {
"cols": ["D3", "D2", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3"],
"rows": ["F4", "F5", "F6", "F7", "B1"]
},
"qmk": {
"locking": {
"enabled": true,
"resync": true
}
},
"usb": {
"device_version": "1.0.0",
"pid": "0x6661"
},
"layout_aliases": {
"LAYOUT": "LAYOUT_all"
},
"layouts": {
"LAYOUT_625u": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
{"matrix": [0, 1], "x": 1.5, "y": 0},
{"matrix": [1, 1], "x": 2.5, "y": 0},
{"matrix": [0, 2], "x": 3.5, "y": 0},
{"matrix": [0, 3], "x": 4.5, "y": 0},
{"matrix": [0, 4], "x": 5.5, "y": 0},
{"matrix": [0, 5], "x": 6.5, "y": 0},
{"matrix": [1, 5], "x": 7.5, "y": 0},
{"matrix": [0, 6], "x": 8.5, "y": 0},
{"matrix": [1, 6], "x": 9.5, "y": 0},
{"matrix": [0, 7], "x": 10.5, "y": 0},
{"matrix": [0, 8], "x": 11.5, "y": 0},
{"matrix": [1, 8], "x": 12.5, "y": 0},
{"matrix": [0, 9], "x": 13.5, "y": 0, "w": 1.5},
{"matrix": [0, 10], "x": 15.5, "y": 0},
{"matrix": [1, 10], "x": 16.5, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
{"matrix": [2, 1], "x": 1.75, "y": 1},
{"matrix": [1, 2], "x": 2.75, "y": 1},
{"matrix": [2, 2], "x": 3.75, "y": 1},
{"matrix": [1, 3], "x": 4.75, "y": 1},
{"matrix": [1, 4], "x": 5.75, "y": 1},
{"matrix": [2, 5], "x": 6.75, "y": 1},
{"matrix": [3, 5], "x": 7.75, "y": 1},
{"matrix": [2, 6], "x": 8.75, "y": 1},
{"matrix": [1, 7], "x": 9.75, "y": 1},
{"matrix": [2, 7], "x": 10.75, "y": 1},
{"matrix": [2, 8], "x": 11.75, "y": 1},
{"matrix": [2, 9], "x": 12.75, "y": 1, "w": 2.25},
{"matrix": [2, 0], "x": 0, "y": 2, "w": 2.25},
{"matrix": [3, 1], "x": 2.25, "y": 2},
{"matrix": [3, 2], "x": 3.25, "y": 2},
{"matrix": [2, 3], "x": 4.25, "y": 2},
{"matrix": [3, 3], "x": 5.25, "y": 2},
{"matrix": [2, 4], "x": 6.25, "y": 2},
{"matrix": [3, 4], "x": 7.25, "y": 2},
{"matrix": [4, 5], "x": 8.25, "y": 2},
{"matrix": [3, 6], "x": 9.25, "y": 2},
{"matrix": [3, 7], "x": 10.25, "y": 2},
{"matrix": [3, 8], "x": 11.25, "y": 2},
{"matrix": [3, 9], "x": 12.25, "y": 2, "w": 2.25},
{"matrix": [2, 10], "x": 15.5, "y": 2},
{"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
{"matrix": [4, 0], "x": 1.25, "y": 3, "w": 1.25},
{"matrix": [4, 1], "x": 2.5, "y": 3, "w": 1.25},
{"matrix": [4, 2], "x": 3.75, "y": 3, "w": 2.25},
{"matrix": [4, 3], "x": 6, "y": 3, "w": 1.25},
{"matrix": [4, 4], "x": 7.25, "y": 3, "w": 2.75},
{"matrix": [4, 6], "x": 10, "y": 3, "w": 1.25},
{"matrix": [4, 7], "x": 11.25, "y": 3, "w": 1.25},
{"matrix": [4, 8], "x": 12.5, "y": 3, "w": 1.25},
{"matrix": [4, 9], "x": 14.5, "y": 3},
{"matrix": [3, 10], "x": 15.5, "y": 3},
{"matrix": [4, 10], "x": 16.5, "y": 3}
]
},
"LAYOUT_625u_split_enter": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
{"matrix": [0, 1], "x": 1.5, "y": 0},
{"matrix": [1, 1], "x": 2.5, "y": 0},
{"matrix": [0, 2], "x": 3.5, "y": 0},
{"matrix": [0, 3], "x": 4.5, "y": 0},
{"matrix": [0, 4], "x": 5.5, "y": 0},
{"matrix": [0, 5], "x": 6.5, "y": 0},
{"matrix": [1, 5], "x": 7.5, "y": 0},
{"matrix": [0, 6], "x": 8.5, "y": 0},
{"matrix": [1, 6], "x": 9.5, "y": 0},
{"matrix": [0, 7], "x": 10.5, "y": 0},
{"matrix": [0, 8], "x": 11.5, "y": 0},
{"matrix": [1, 8], "x": 12.5, "y": 0},
{"matrix": [0, 9], "x": 13.5, "y": 0, "w": 1.5},
{"matrix": [0, 10], "x": 15.5, "y": 0},
{"matrix": [1, 10], "x": 16.5, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
{"matrix": [2, 1], "x": 1.75, "y": 1},
{"matrix": [1, 2], "x": 2.75, "y": 1},
{"matrix": [2, 2], "x": 3.75, "y": 1},
{"matrix": [1, 3], "x": 4.75, "y": 1},
{"matrix": [1, 4], "x": 5.75, "y": 1},
{"matrix": [2, 5], "x": 6.75, "y": 1},
{"matrix": [3, 5], "x": 7.75, "y": 1},
{"matrix": [2, 6], "x": 8.75, "y": 1},
{"matrix": [1, 7], "x": 9.75, "y": 1},
{"matrix": [2, 7], "x": 10.75, "y": 1},
{"matrix": [2, 8], "x": 11.75, "y": 1},
{"matrix": [1, 9], "x": 12.75, "y": 1},
{"matrix": [2, 9], "x": 13.75, "y": 1, "w": 1.25},
{"matrix": [2, 0], "x": 0, "y": 2, "w": 2.25},
{"matrix": [3, 1], "x": 2.25, "y": 2},
{"matrix": [3, 2], "x": 3.25, "y": 2},
{"matrix": [2, 3], "x": 4.25, "y": 2},
{"matrix": [3, 3], "x": 5.25, "y": 2},
{"matrix": [2, 4], "x": 6.25, "y": 2},
{"matrix": [3, 4], "x": 7.25, "y": 2},
{"matrix": [4, 5], "x": 8.25, "y": 2},
{"matrix": [3, 6], "x": 9.25, "y": 2},
{"matrix": [3, 7], "x": 10.25, "y": 2},
{"matrix": [3, 8], "x": 11.25, "y": 2},
{"matrix": [3, 9], "x": 12.25, "y": 2, "w": 2.25},
{"matrix": [2, 10], "x": 15.5, "y": 2},
{"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
{"matrix": [4, 0], "x": 1.25, "y": 3, "w": 1.25},
{"matrix": [4, 1], "x": 2.5, "y": 3, "w": 1.25},
{"matrix": [4, 3], "x": 3.75, "y": 3, "w": 6.25},
{"matrix": [4, 6], "x": 10, "y": 3, "w": 1.25},
{"matrix": [4, 7], "x": 11.25, "y": 3, "w": 1.25},
{"matrix": [4, 8], "x": 12.5, "y": 3, "w": 1.25},
{"matrix": [4, 9], "x": 14.5, "y": 3},
{"matrix": [3, 10], "x": 15.5, "y": 3},
{"matrix": [4, 10], "x": 16.5, "y": 3}
]
},
"LAYOUT_all": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
{"matrix": [0, 1], "x": 1.5, "y": 0},
{"matrix": [1, 1], "x": 2.5, "y": 0},
{"matrix": [0, 2], "x": 3.5, "y": 0},
{"matrix": [0, 3], "x": 4.5, "y": 0},
{"matrix": [0, 4], "x": 5.5, "y": 0},
{"matrix": [0, 5], "x": 6.5, "y": 0},
{"matrix": [1, 5], "x": 7.5, "y": 0},
{"matrix": [0, 6], "x": 8.5, "y": 0},
{"matrix": [1, 6], "x": 9.5, "y": 0},
{"matrix": [0, 7], "x": 10.5, "y": 0},
{"matrix": [0, 8], "x": 11.5, "y": 0},
{"matrix": [1, 8], "x": 12.5, "y": 0},
{"matrix": [0, 9], "x": 13.5, "y": 0, "w": 1.5},
{"matrix": [0, 10], "x": 15.5, "y": 0},
{"matrix": [1, 10], "x": 16.5, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
{"matrix": [2, 1], "x": 1.75, "y": 1},
{"matrix": [1, 2], "x": 2.75, "y": 1},
{"matrix": [2, 2], "x": 3.75, "y": 1},
{"matrix": [1, 3], "x": 4.75, "y": 1},
{"matrix": [1, 4], "x": 5.75, "y": 1},
{"matrix": [2, 5], "x": 6.75, "y": 1},
{"matrix": [3, 5], "x": 7.75, "y": 1},
{"matrix": [2, 6], "x": 8.75, "y": 1},
{"matrix": [1, 7], "x": 9.75, "y": 1},
{"matrix": [2, 7], "x": 10.75, "y": 1},
{"matrix": [2, 8], "x": 11.75, "y": 1},
{"matrix": [1, 9], "x": 12.75, "y": 1},
{"matrix": [2, 9], "x": 13.75, "y": 1, "w": 1.25},
{"matrix": [2, 0], "x": 0, "y": 2, "w": 2.25},
{"matrix": [3, 1], "x": 2.25, "y": 2},
{"matrix": [3, 2], "x": 3.25, "y": 2},
{"matrix": [2, 3], "x": 4.25, "y": 2},
{"matrix": [3, 3], "x": 5.25, "y": 2},
{"matrix": [2, 4], "x": 6.25, "y": 2},
{"matrix": [3, 4], "x": 7.25, "y": 2},
{"matrix": [4, 5], "x": 8.25, "y": 2},
{"matrix": [3, 6], "x": 9.25, "y": 2},
{"matrix": [3, 7], "x": 10.25, "y": 2},
{"matrix": [3, 8], "x": 11.25, "y": 2},
{"matrix": [3, 9], "x": 12.25, "y": 2, "w": 2.25},
{"matrix": [2, 10], "x": 15.5, "y": 2},
{"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
{"matrix": [4, 0], "x": 1.25, "y": 3, "w": 1.25},
{"matrix": [4, 1], "x": 2.5, "y": 3, "w": 1.25},
{"matrix": [4, 2], "x": 3.75, "y": 3, "w": 2.25},
{"matrix": [4, 3], "x": 6, "y": 3, "w": 1.25},
{"matrix": [4, 4], "x": 7.25, "y": 3, "w": 2.75},
{"matrix": [4, 6], "x": 10, "y": 3, "w": 1.25},
{"matrix": [4, 7], "x": 11.25, "y": 3, "w": 1.25},
{"matrix": [4, 8], "x": 12.5, "y": 3, "w": 1.25},
{"matrix": [4, 9], "x": 14.5, "y": 3},
{"matrix": [3, 10], "x": 15.5, "y": 3},
{"matrix": [4, 10], "x": 16.5, "y": 3}
]
},
"LAYOUT_split_space": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
{"matrix": [0, 1], "x": 1.5, "y": 0},
{"matrix": [1, 1], "x": 2.5, "y": 0},
{"matrix": [0, 2], "x": 3.5, "y": 0},
{"matrix": [0, 3], "x": 4.5, "y": 0},
{"matrix": [0, 4], "x": 5.5, "y": 0},
{"matrix": [0, 5], "x": 6.5, "y": 0},
{"matrix": [1, 5], "x": 7.5, "y": 0},
{"matrix": [0, 6], "x": 8.5, "y": 0},
{"matrix": [1, 6], "x": 9.5, "y": 0},
{"matrix": [0, 7], "x": 10.5, "y": 0},
{"matrix": [0, 8], "x": 11.5, "y": 0},
{"matrix": [1, 8], "x": 12.5, "y": 0},
{"matrix": [0, 9], "x": 13.5, "y": 0, "w": 1.5},
{"matrix": [0, 10], "x": 15.5, "y": 0},
{"matrix": [1, 10], "x": 16.5, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
{"matrix": [2, 1], "x": 1.75, "y": 1},
{"matrix": [1, 2], "x": 2.75, "y": 1},
{"matrix": [2, 2], "x": 3.75, "y": 1},
{"matrix": [1, 3], "x": 4.75, "y": 1},
{"matrix": [1, 4], "x": 5.75, "y": 1},
{"matrix": [2, 5], "x": 6.75, "y": 1},
{"matrix": [3, 5], "x": 7.75, "y": 1},
{"matrix": [2, 6], "x": 8.75, "y": 1},
{"matrix": [1, 7], "x": 9.75, "y": 1},
{"matrix": [2, 7], "x": 10.75, "y": 1},
{"matrix": [2, 8], "x": 11.75, "y": 1},
{"matrix": [2, 9], "x": 12.75, "y": 1, "w": 2.25},
{"matrix": [2, 0], "x": 0, "y": 2, "w": 2.25},
{"matrix": [3, 1], "x": 2.25, "y": 2},
{"matrix": [3, 2], "x": 3.25, "y": 2},
{"matrix": [2, 3], "x": 4.25, "y": 2},
{"matrix": [3, 3], "x": 5.25, "y": 2},
{"matrix": [2, 4], "x": 6.25, "y": 2},
{"matrix": [3, 4], "x": 7.25, "y": 2},
{"matrix": [4, 5], "x": 8.25, "y": 2},
{"matrix": [3, 6], "x": 9.25, "y": 2},
{"matrix": [3, 7], "x": 10.25, "y": 2},
{"matrix": [3, 8], "x": 11.25, "y": 2},
{"matrix": [3, 9], "x": 12.25, "y": 2, "w": 2.25},
{"matrix": [2, 10], "x": 15.5, "y": 2},
{"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
{"matrix": [4, 0], "x": 1.25, "y": 3, "w": 1.25},
{"matrix": [4, 1], "x": 2.5, "y": 3, "w": 1.25},
{"matrix": [4, 2], "x": 3.75, "y": 3, "w": 2.25},
{"matrix": [4, 3], "x": 6, "y": 3, "w": 1.25},
{"matrix": [4, 4], "x": 7.25, "y": 3, "w": 2.75},
{"matrix": [4, 6], "x": 10, "y": 3, "w": 1.25},
{"matrix": [4, 7], "x": 11.25, "y": 3, "w": 1.25},
{"matrix": [4, 8], "x": 12.5, "y": 3, "w": 1.25},
{"matrix": [4, 9], "x": 14.5, "y": 3},
{"matrix": [3, 10], "x": 15.5, "y": 3},
{"matrix": [4, 10], "x": 16.5, "y": 3}
]
}
}
}

View file

@ -0,0 +1,20 @@
{
"keyboard": "fruitykeeb/fruitbar/r1",
"keymap": "default",
"version": 1,
"layout": "LAYOUT_all",
"layers": [
[
"KC_ESC", "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_BSPC", "KC_HOME", "KC_END",
"KC_TAB", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_NUBS", "KC_ENT",
"KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_UP",
"KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "KC_SPC", "KC_SPC", "KC_RALT", "MO(1)", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RIGHT"
],
[
"KC_GRV", "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_DEL", "KC_PGDN", "KC_PGUP",
"KC_CAPS", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_TRNS", "KC_F12",
"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",
"QK_BOOT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"
]
]
}

View file

@ -0,0 +1,10 @@
{
"development_board": "promicro",
"features": {
"bootmagic": true,
"extrakey": true,
"mousekey": true,
"nkro": true,
"oled": true
}
}

View file

@ -0,0 +1 @@
# This file intentionally left blank

View file

@ -0,0 +1 @@
DEFAULT_FOLDER = fruitykeeb/fruitbar/r1/promicro

View file

@ -6,6 +6,8 @@ A budget-oriented 40% with base kit compatibility. Perfect for those who have al
* Keyboard Maintainer: [The QMK Community](https://github.com/qmk)
* Hardware Supported:
* Fruitbar PCB R1 (atmega32u4)
* If the keyboard was built with an Elite-C, use the `fruitykeeb/fruitbar/r1/elite_c` firmware for RGB and encoder support.
* Fruitbar PCB R2 (RP2040, rp2040)
* Hardware Availability:
* R1 Group Buy took place between 2021-10-01 and 2021-10-24 on [FruityKeeb](https://fruitykeeb.xyz/).
@ -13,10 +15,12 @@ A budget-oriented 40% with base kit compatibility. Perfect for those who have al
Make example for this keyboard (after setting up your build environment):
make fruitykeeb/fruitbar/r1:default
make fruitykeeb/fruitbar/r2:default
Flashing example for this keyboard:
make fruitykeeb/fruitbar/r1:default:flash
make fruitykeeb/fruitbar/r2:default:flash
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).