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

Jump to bottom

Keyboard/bear65 v2 #19578

Merged
merged 11 commits into from
Feb 8, 2023
Merged

Keyboard/bear65 v2 #19578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7fa11e5
saved legacy data as rev1
beelzebubi Jan 12, 2023
3c78359
added rev2 for Bear 65 V2
beelzebubi Jan 12, 2023
6ae3e2d
add Bear65 V2 keymap and user scripts
beelzebubi Jan 12, 2023
cabd849
minor bugfix
beelzebubi Jan 12, 2023
c927ca2
Update keyboards/jacky_studio/bear_65/rev1/rules.mk
beelzebubi Jan 13, 2023
9890987
Update keyboards/jacky_studio/bear_65/rev1/info.json
beelzebubi Jan 13, 2023
8002063
Update keyboards/jacky_studio/bear_65/rev2/info.json
beelzebubi Jan 13, 2023
68fe936
removed user space from pr
beelzebubi Jan 13, 2023
761c030
removed user space dependent keymap
beelzebubi Jan 13, 2023
53b956c
removed c macro for revisions
beelzebubi Jan 13, 2023
5349185
updates to rules.mk
beelzebubi Jan 13, 2023
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
32 changes: 5 additions & 27 deletions keyboards/jacky_studio/bear_65/bear_65.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,30 +18,8 @@

#include "quantum.h"

#define LAYOUT_all( \
K31, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
K1E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
K2E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
K40, K43, K45, K46, K48, K4A, K4B, K4C, K4D \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
{ K40, KC_NO, KC_NO, K43, KC_NO, K45, K46, KC_NO, K48, KC_NO, K4A, K4B, K4C, K4D, K4E }, \
}

#define LAYOUT_full_bs( \
K31, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4E, \
K1E, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
K2E, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
K40, K43, K45, K46, K48, K4A, K4B, K4C, K4D \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
{ K40, KC_NO, KC_NO, K43, KC_NO, K45, K46, KC_NO, K48, KC_NO, K4A, K4B, K4C, K4D, K4E }, \
}
#if defined(KEYBOARD_jacky_studio_bear_65_rev1)
#include "rev1.h"
#elif defined(KEYBOARD_jacky_studio_bear_65_rev2)
#include "rev2.h"
#endif
59 changes: 25 additions & 34 deletions keyboards/jacky_studio/bear_65/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
/* Copyright 2020 MudkipMao
*
* 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/>.
*/
// Copyright 2017-2021 QMK
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once

Expand All @@ -35,26 +22,31 @@
#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 }

/* Setting the matrix value of top left key for bootmagic lite */
#define BOOTMAGIC_LITE_ROW 3
#define BOOTMAGIC_LITE_COLUMN 1

/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION ROW2COL

#define LED_CAPS_LOCK_PIN C7
#define LED_PIN_ON_STATE 0

/* number of backlight levels */
#define BACKLIGHT_PIN B6
#define BACKLIGHT_BREATHING
#define BACKLIGHT_LEVELS 4
#ifdef BACKLIGHT_PIN
#define BACKLIGHT_LEVELS 3
#endif

/* Set 0 if debouncing isn't needed */
#define DEBOUNCE 5

/* 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

#define RGB_DI_PIN E2
#ifdef RGB_DI_PIN
#define RGBLED_NUM 15
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 139 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
#define RGBLIGHT_LIMIT_VAL 200
#define RGBLIGHT_DEFAULT_VAL 50
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
Expand All @@ -65,12 +57,11 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#endif
#define RGBLED_NUM 20
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
/* If defined, the RGB lighting will be switched off when the host goes to sleep */
#define RGBLIGHT_SLEEP

/* RGB matrix support */
#ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 220
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_LED_COUNT 12 // Number of LEDs
#endif
19 changes: 0 additions & 19 deletions keyboards/jacky_studio/bear_65/info.json
View file
Open in desktop

This file was deleted.

165 changes: 165 additions & 0 deletions keyboards/jacky_studio/bear_65/rev1/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
{
"keyboard_name": "Bear 65",
"manufacturer": "Jacky",
"url": "https://qmk.fm/keyboards",
"maintainer": "qmk",
beelzebubi marked this conversation as resolved.
Show resolved Hide resolved
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"usb": {
"vid": "0xA13B",
"pid": "0x000A",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_all": {
"layout": [
{"label":"Esc", "x":0.5, "y":0},
{"label":"~", "x":1.75, "y":0},
{"label":"!", "x":2.75, "y":0},
{"label":"@", "x":3.75, "y":0},
{"label":"#", "x":4.75, "y":0},
{"label":"$", "x":5.75, "y":0},
{"label":"%", "x":6.75, "y":0},
{"label":"^", "x":7.75, "y":0},
{"label":"&", "x":11.25, "y":0},
{"label":"*", "x":12.25, "y":0},
{"label":"(", "x":13.25, "y":0},
{"label":")", "x":14.25, "y":0},
{"label":"_", "x":15.25, "y":0},
{"label":"+", "x":16.25, "y":0},
{"label":"|", "x":17.25, "y":0},
{"label":"~", "x":18.25, "y":0},
{"label":"Del", "x":19.75, "y":0},

{"label":"PgUp", "x":0.25, "y":1},
{"label":"Tab", "x":1.75, "y":1, "w":1.5},
{"label":"Q", "x":3.25, "y":1},
{"label":"W", "x":4.25, "y":1},
{"label":"E", "x":5.25, "y":1},
{"label":"R", "x":6.25, "y":1},
{"label":"T", "x":7.25, "y":1},
{"label":"Y", "x":10.75, "y":1},
{"label":"U", "x":11.75, "y":1},
{"label":"I", "x":12.75, "y":1},
{"label":"O", "x":13.75, "y":1},
{"label":"P", "x":14.75, "y":1},
{"label":"{", "x":15.75, "y":1},
{"label":"}", "x":16.75, "y":1},
{"label":"Backspace", "x":17.75, "y":1, "w":1.5},

{"label":"PgDn", "x":0, "y":2},
{"label":"Caps Lock", "x":1.75, "y":2, "w":1.75},
{"label":"A", "x":3.5, "y":2},
{"label":"S", "x":4.5, "y":2},
{"label":"D", "x":5.5, "y":2},
{"label":"F", "x":6.5, "y":2},
{"label":"G", "x":7.5, "y":2},
{"label":"H", "x":11, "y":2},
{"label":"J", "x":12, "y":2},
{"label":"K", "x":13, "y":2},
{"label":"L", "x":14, "y":2},
{"label":":", "x":15, "y":2},
{"label":"\"", "x":16, "y":2},
{"label":"Enter", "x":17, "y":2, "w":2.25},

{"label":"Shift", "x":1.75, "y":3, "w":2.25},
{"label":"Z", "x":4, "y":3},
{"label":"X", "x":5, "y":3},
{"label":"C", "x":6, "y":3},
{"label":"V", "x":7, "y":3},
{"label":"B", "x":8, "y":3},
{"label":"B", "x":10.5, "y":3},
{"label":"N", "x":11.5, "y":3},
{"label":"M", "x":12.5, "y":3},
{"label":"<", "x":13.5, "y":3},
{"label":">", "x":14.5, "y":3},
{"label":"?", "x":15.5, "y":3},
{"label":"Shift", "x":16.5, "y":3, "w":1.75},
{"label":"Up", "x":18.25, "y":3},

{"label":"Ctrl", "x":1.75, "y":4, "w":1.5},
{"label":"Alt", "x":4.75, "y":4, "w":1.25},
{"x":6, "y":4, "w":2.25},
{"label":"Win", "x":8.25, "y":4},
{"x":10.5, "y":4, "w":2.75},
{"label":"Alt", "x":13.25, "y":4, "w":1.5},
{"label":"Left", "x":17.25, "y":4},
{"label":"Down", "x":18.25, "y":4},
{"label":"Right", "x":19.25, "y":4}]
},
"LAYOUT_full_bs": {
"layout": [
{"label":"Esc", "x":0.5, "y":0},
{"label":"~", "x":1.75, "y":0},
{"label":"!", "x":2.75, "y":0},
{"label":"@", "x":3.75, "y":0},
{"label":"#", "x":4.75, "y":0},
{"label":"$", "x":5.75, "y":0},
{"label":"%", "x":6.75, "y":0},
{"label":"^", "x":7.75, "y":0},
{"label":"&", "x":11.25, "y":0},
{"label":"*", "x":12.25, "y":0},
{"label":"(", "x":13.25, "y":0},
{"label":")", "x":14.25, "y":0},
{"label":"_", "x":15.25, "y":0},
{"label":"+", "x":16.25, "y":0},
{"label":"Backspace", "x":17.25, "y":0, "w":2},
{"label":"Del", "x":19.75, "y":0},

{"label":"PgUp", "x":0.25, "y":1},
{"label":"Tab", "x":1.75, "y":1, "w":1.5},
{"label":"Q", "x":3.25, "y":1},
{"label":"W", "x":4.25, "y":1},
{"label":"E", "x":5.25, "y":1},
{"label":"R", "x":6.25, "y":1},
{"label":"T", "x":7.25, "y":1},
{"label":"Y", "x":10.75, "y":1},
{"label":"U", "x":11.75, "y":1},
{"label":"I", "x":12.75, "y":1},
{"label":"O", "x":13.75, "y":1},
{"label":"P", "x":14.75, "y":1},
{"label":"{", "x":15.75, "y":1},
{"label":"}", "x":16.75, "y":1},
{"label":"|", "x":17.75, "y":1, "w":1.5},

{"label":"PgDn", "x":0, "y":2},
{"label":"Caps Lock", "x":1.75, "y":2, "w":1.75},
{"label":"A", "x":3.5, "y":2},
{"label":"S", "x":4.5, "y":2},
{"label":"D", "x":5.5, "y":2},
{"label":"F", "x":6.5, "y":2},
{"label":"G", "x":7.5, "y":2},
{"label":"H", "x":11, "y":2},
{"label":"J", "x":12, "y":2},
{"label":"K", "x":13, "y":2},
{"label":"L", "x":14, "y":2},
{"label":":", "x":15, "y":2},
{"label":"\"", "x":16, "y":2},
{"label":"Enter", "x":17, "y":2, "w":2.25},

{"label":"Shift", "x":1.75, "y":3, "w":2.25},
{"label":"Z", "x":4, "y":3},
{"label":"X", "x":5, "y":3},
{"label":"C", "x":6, "y":3},
{"label":"V", "x":7, "y":3},
{"label":"B", "x":8, "y":3},
{"label":"B", "x":10.5, "y":3}, {"label":"N", "x":11.5, "y":3},
{"label":"M", "x":12.5, "y":3},
{"label":"<", "x":13.5, "y":3},
{"label":">", "x":14.5, "y":3},
{"label":"?", "x":15.5, "y":3},
{"label":"Shift", "x":16.5, "y":3, "w":1.75},
{"label":"Up", "x":18.25, "y":3},

{"label":"Ctrl", "x":1.75, "y":4, "w":1.5},
{"label":"Alt", "x":4.75, "y":4, "w":1.25},
{"x":6, "y":4, "w":2.25},
{"label":"Win", "x":8.25, "y":4},
{"x":10.5, "y":4, "w":2.75},
{"label":"Alt", "x":13.25, "y":4, "w":1.5},
{"label":"Left", "x":17.25, "y":4},
{"label":"Down", "x":18.25, "y":4},
{"label":"Right", "x":19.25, "y":4}]
}
}
}
Loading