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

This commit is contained in:
QMK Bot 2023-03-16 17:12:47 +00:00
commit 23313c5976
9 changed files with 611 additions and 0 deletions

View file

@ -0,0 +1,17 @@
/* Copyright 2023 Toffee Studio
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "blueberry.h"

View file

@ -0,0 +1,37 @@
/* Copyright 2023 Toffee Studio
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "quantum.h"
#define LAYOUT( \
K00, K10, K05, K15, K04, K14, K03, K13, K02, K12, K01, K11, K06, K16, K07, \
K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, \
K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K47, \
K70, K60, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, K67, \
K80, K81, K82, K83, K84, K85, K86, K56, K77 \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07 },\
{ K10, K11, K12, K13, K14, K15, K16, KC_NO },\
{ K20, K21, K22, K23, K24, K25, K26, K27 },\
{ K30, K31, K32, K33, K34, K35, K36, KC_NO },\
{ K40, K41, K42, K43, K44, K45, K46, K47 },\
{ K50, K51, K52, K53, K54, K55, K56, KC_NO },\
{ K60, K61, K62, K63, K64, K65, K66, K67 },\
{ K70, K71, K72, K73, K74, K75, K76, K77 },\
{ K80, K81, K82, K83, K84, K85, K86, KC_NO } \
}

View file

@ -0,0 +1,46 @@
/* Copyright 2023 Toffee Studio
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#define RGB_DI_PIN D0
#ifdef RGB_DI_PIN
# define RGBLED_NUM 22
/* RGB LED logical order map */
/* Top->Bottom, Right->Left */
#define RGBLIGHT_LED_MAP { \
19, 18, 17, 16, 15, 14, 13, 12, 11, \
20, 10, \
21, 9, \
0, 1, 2, 3, 4, 5, 6, 7, 8 }
/* The maximum brightness level up to 255 */
#define RGBLIGHT_LIMIT_VAL 192 //limited to 75% brightness
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
# define RGBLIGHT_EFFECT_SNAKE
# define RGBLIGHT_EFFECT_KNIGHT
# define RGBLIGHT_EFFECT_CHRISTMAS
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_ALTERNATING
#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

View file

@ -0,0 +1,376 @@
{
"keyboard_name": "Blueberry",
"manufacturer": "Toffee Studio",
"url": "",
"maintainer": "Toffee Studio",
"usb": {
"vid": "0x1067",
"pid": "0x626C",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["B6", "D4", "D6", "D7", "B4", "B5", "C6", "C7"],
"rows": ["E6", "B0", "B1", "F6", "F5", "F1", "F7", "F0", "F4"]
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"diode_direction": "COL2ROW",
"layouts": {
"LAYOUT": {
"layout": [
{
"label": "0,0",
"x": 0,
"y": 0
},
{
"label": "1,0",
"x": 1,
"y": 0
},
{
"label": "0,5",
"x": 2,
"y": 0
},
{
"label": "1,5",
"x": 3,
"y": 0
},
{
"label": "0,4",
"x": 4,
"y": 0
},
{
"label": "1,4",
"x": 5,
"y": 0
},
{
"label": "0,3",
"x": 6,
"y": 0
},
{
"label": "1,3",
"x": 7,
"y": 0
},
{
"label": "0,2",
"x": 8,
"y": 0
},
{
"label": "1,2",
"x": 9,
"y": 0
},
{
"label": "0,1",
"x": 10,
"y": 0
},
{
"label": "1,1",
"x": 11,
"y": 0
},
{
"label": "0,6",
"x": 12,
"y": 0
},
{
"label": "0,7",
"x": 13,
"y": 0
},
{
"label": "1,6",
"x": 14,
"y": 0
},
{
"label": "2,0",
"x": 0,
"y": 1,
"w": 1.5
},
{
"label": "3,0",
"x": 1.5,
"y": 1
},
{
"label": "2,1",
"x": 2.5,
"y": 1
},
{
"label": "3,1",
"x": 3.5,
"y": 1
},
{
"label": "2,2",
"x": 4.5,
"y": 1
},
{
"label": "3,2",
"x": 5.5,
"y": 1
},
{
"label": "2,3",
"x": 6.5,
"y": 1
},
{
"label": "3,3",
"x": 7.5,
"y": 1
},
{
"label": "2,4",
"x": 8.5,
"y": 1
},
{
"label": "3,4",
"x": 9.5,
"y": 1
},
{
"label": "2,5",
"x": 10.5,
"y": 1
},
{
"label": "3,5",
"x": 11.5,
"y": 1
},
{
"label": "2,6",
"x": 12.5,
"y": 1
},
{
"label": "3,6",
"x": 13.5,
"y": 1,
"w": 1.5
},
{
"label": "2,7",
"x": 15,
"y": 1
},
{
"label": "4,0",
"x": 0,
"y": 2,
"w": 1.75
},
{
"label": "5,0",
"x": 1.75,
"y": 2
},
{
"label": "4,1",
"x": 2.75,
"y": 2
},
{
"label": "5,1",
"x": 3.75,
"y": 2
},
{
"label": "4,2",
"x": 4.75,
"y": 2
},
{
"label": "5,2",
"x": 5.75,
"y": 2
},
{
"label": "4,3",
"x": 6.75,
"y": 2
},
{
"label": "5,3",
"x": 7.75,
"y": 2
},
{
"label": "4,4",
"x": 8.75,
"y": 2
},
{
"label": "5,4",
"x": 9.75,
"y": 2
},
{
"label": "4,5",
"x": 10.75,
"y": 2
},
{
"label": "5,5",
"x": 11.75,
"y": 2
},
{
"label": "4,6",
"x": 12.75,
"y": 2,
"w": 2.25
},
{
"label": "4,7",
"x": 15,
"y": 2
},
{
"label": "7,0",
"x": 0,
"y": 3,
"w": 1.25
},
{
"label": "6,0",
"x": 1.25,
"y": 3
},
{
"label": "6,1",
"x": 2.25,
"y": 3
},
{
"label": "7,1",
"x": 3.25,
"y": 3
},
{
"label": "6,2",
"x": 4.25,
"y": 3
},
{
"label": "7,2",
"x": 5.25,
"y": 3
},
{
"label": "6,3",
"x": 6.25,
"y": 3
},
{
"label": "7,3",
"x": 7.25,
"y": 3
},
{
"label": "6,4",
"x": 8.25,
"y": 3
},
{
"label": "7,4",
"x": 9.25,
"y": 3
},
{
"label": "6,5",
"x": 10.25,
"y": 3
},
{
"label": "7,5",
"x": 11.25,
"y": 3
},
{
"label": "6,6",
"x": 12.25,
"y": 3,
"w": 1.75
},
{
"label": "7,6",
"x": 14,
"y": 3
},
{
"label": "6,7",
"x": 15,
"y": 3
},
{
"label": "8,0",
"x": 0,
"y": 4,
"w": 1.25
},
{
"label": "8,1",
"x": 1.25,
"y": 4,
"w": 1.25
},
{
"label": "8,2",
"x": 2.5,
"y": 4,
"w": 1.25
},
{
"label": "8,3",
"x": 3.75,
"y": 4,
"w": 6.25
},
{
"label": "8,4",
"x": 10,
"y": 4,
"w": 1.25
},
{
"label": "8,5",
"x": 11.25,
"y": 4,
"w": 1.25
},
{
"label": "8,6",
"x": 13,
"y": 4
},
{
"label": "5,6",
"x": 14,
"y": 4
},
{
"label": "7,7",
"x": 15,
"y": 4
}
]
}
}
}

View file

@ -0,0 +1,44 @@
/* Copyright 2022 Toffee Studio
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */
[0] = LAYOUT(
KC_ESC, 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_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, KC_PGUP,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER, KC_PGDN,
KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT
),
[1] = LAYOUT(
KC_GRV, 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_BSPC, KC_DEL,
_______, KC_BTN1, KC_MS_U, KC_BTN2, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, RGB_SPI,
KC_WH_U, KC_MS_L, KC_MS_D, KC_MS_R, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER, RGB_SPD,
KC_WH_D, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, RGB_VAI, RGB_TOG,
_______, _______, _______, KC_SPC, MO(2), _______, RGB_RMOD, RGB_VAD, RGB_MOD
),
[2] = LAYOUT(
QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
)
};

View file

@ -0,0 +1,52 @@
/* Copyright 2022 Toffee Studio
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */
[0] = LAYOUT(
KC_ESC, 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_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, KC_PGUP,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER, KC_PGDN,
KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT
),
[1] = LAYOUT(
KC_GRV, 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_BSPC, KC_DEL,
_______, KC_BTN1, KC_MS_U, KC_BTN2, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, RGB_SPI,
KC_WH_U, KC_MS_L, KC_MS_D, KC_MS_R, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER, RGB_SPD,
KC_WH_D, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, RGB_VAI, RGB_TOG,
_______, _______, _______, KC_SPC, MO(2), _______, RGB_RMOD, RGB_VAD, RGB_MOD
),
[2] = LAYOUT(
QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
),
[3] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
)
};

View file

@ -0,0 +1 @@
VIA_ENABLE = yes

View file

@ -0,0 +1,24 @@
# blueberry
A springy, gasket-mounted 65% featuring a seamless wave profile & Blue PVD.
* Keyboard Maintainer: [Toffee Studio](https://github.com/Toffee Studio)
* Hardware Supported: Blueberry65
Make example for this keyboard (after setting up your build environment):
make toffee_studio/blueberry:default
Flashing example for this keyboard:
make toffee_studio/blueberry: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).
## Bootloader
Enter the bootloader in 3 ways:
* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

View file

@ -0,0 +1,14 @@
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
LTO_ENABLE = yes