From c75126bd1fe0ed96d56f31fbb0cabc3b0353567c Mon Sep 17 00:00:00 2001 From: MudkipMao Date: Mon, 21 Sep 2020 14:52:39 -0700 Subject: [PATCH 1/5] Squashed Bear 65 Ergo commit --- keyboards/bear_65/bear_65.c | 17 +++++ keyboards/bear_65/bear_65.h | 49 +++++++++++++ keyboards/bear_65/config.h | 80 +++++++++++++++++++++ keyboards/bear_65/info.json | 17 +++++ keyboards/bear_65/keymaps/default/keymap.c | 38 ++++++++++ keyboards/bear_65/keymaps/default/readme.md | 1 + keyboards/bear_65/keymaps/via/keymap.c | 47 ++++++++++++ keyboards/bear_65/keymaps/via/readme.md | 1 + keyboards/bear_65/keymaps/via/rules.mk | 1 + keyboards/bear_65/readme.md | 19 +++++ keyboards/bear_65/rules.mk | 31 ++++++++ 11 files changed, 301 insertions(+) create mode 100644 keyboards/bear_65/bear_65.c create mode 100644 keyboards/bear_65/bear_65.h create mode 100644 keyboards/bear_65/config.h create mode 100644 keyboards/bear_65/info.json create mode 100644 keyboards/bear_65/keymaps/default/keymap.c create mode 100644 keyboards/bear_65/keymaps/default/readme.md create mode 100644 keyboards/bear_65/keymaps/via/keymap.c create mode 100644 keyboards/bear_65/keymaps/via/readme.md create mode 100644 keyboards/bear_65/keymaps/via/rules.mk create mode 100644 keyboards/bear_65/readme.md create mode 100644 keyboards/bear_65/rules.mk diff --git a/keyboards/bear_65/bear_65.c b/keyboards/bear_65/bear_65.c new file mode 100644 index 000000000000..a2ae572b82da --- /dev/null +++ b/keyboards/bear_65/bear_65.c @@ -0,0 +1,17 @@ +/* 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 . + */ + +#include "bear_65.h" diff --git a/keyboards/bear_65/bear_65.h b/keyboards/bear_65/bear_65.h new file mode 100644 index 000000000000..0ef554ccb7f4 --- /dev/null +++ b/keyboards/bear_65/bear_65.h @@ -0,0 +1,49 @@ +/* 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 . + */ +#pragma once + +#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 }, \ +} + +// generated by KBFirmware JSON to QMK Parser +// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/bear_65/config.h b/keyboards/bear_65/config.h new file mode 100644 index 000000000000..bfe1b6a4dc0d --- /dev/null +++ b/keyboards/bear_65/config.h @@ -0,0 +1,80 @@ +/* +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 . +*/ + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xA13B // Jacky's vendor ID, arbitrarily selected by MudkipMao +#define PRODUCT_ID 0x000A +#define DEVICE_VER 0x0001 +#define MANUFACTURER Jacky +#define PRODUCT Jacky Bear 65 Ergo +#define DESCRIPTION A gasket-mounted 65% Alice style board + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#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 + +#define DIODE_DIRECTION ROW2COL + +#define BACKLIGHT_PIN B6 +// #define BACKLIGHT_BREATHING +#define BACKLIGHT_LEVELS 4 + +#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 */ +/*== all animations enable ==*/ + #define RGBLIGHT_ANIMATIONS +// /*== or choose animations ==*/ +// #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_RGB_TEST +// #define RGBLIGHT_EFFECT_ALTERNATING +#endif + +// generated by KBFirmware JSON to QMK Parser +// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/bear_65/info.json b/keyboards/bear_65/info.json new file mode 100644 index 000000000000..eec444879c4b --- /dev/null +++ b/keyboards/bear_65/info.json @@ -0,0 +1,17 @@ +{ + "keyboard_name": "Bear 65", + "url": "https://qmk.fm/keyboards", + "maintainer": "qmk", + "width": 19.75, + "height": 6.014620257184662, + "layouts": { + "LAYOUT_all": { + "key_count": 69, + "layout": [{"label":"Esc", "x":0.55, "y":0.9}, {"label":"@", "x":3.7, "y":0.9}, {"label":"_", "x":13.25, "y":0.9}, {"label":"~", "x":1.7, "y":1.0}, {"label":"!", "x":2.7, "y":1.0}, {"label":"+", "x":14.25, "y":1.0}, {"label":"Bkspc", "x":15.25, "y":1.0}, {"label":"~", "x":16.25, "y":1}, {"label":"Del", "x":17.85, "y":1}, {"label":"PgUp", "x":0.35, "y":1.9}, {"label":"P", "x":12.95, "y":1.95}, {"label":"Tab", "x":1.5, "y":2.0, "w":1.5}, {"label":"Q", "x":3, "y":2.0}, {"label":"{", "x":13.95, "y":2.0}, {"label":"}", "x":14.95, "y":2.0}, {"label":"|", "x":15.95, "y":2.0, "w":1.5}, {"label":"PgDn", "x":0.15, "y":2.9}, {"label":"Caps Lock", "x":1.3, "y":3.0, "w":1.75}, {"label":"A", "x":3.05, "y":3.0}, {"label":":", "x":13.4, "y":3.0}, {"label":"\"", "x":14.4, "y":3.0}, {"label":"Enter", "x":15.4, "y":3.0, "w":2.25}, {"label":"Shift", "x":1.1, "y":4.0, "w":2.25}, {"label":"Z", "x":3.35, "y":4.0}, {"label":">", "x":13.1, "y":4.0}, {"label":"?", "x":14.1, "y":4.0}, {"label":"Shift", "x":15.1, "y":4.0, "w":1.75}, {"label":"Up", "x":16.85, "y":4.0}, {"label":"Ctrl", "x":1.1, "y":5.0, "w":1.5}, {"label":"Left", "x":15.85, "y":5.0}, {"label":"Down", "x":16.85, "y":5.0}, {"label":"Right", "x":17.85, "y":5.0}, {"label":"#", "x":5, "y":5.5511151231e-17}, {"label":"$", "x":6, "y":5.5511151231e-17}, {"label":"%", "x":7, "y":5.5511151231e-17}, {"label":"^", "x":8, "y":5.5511151231e-17}, {"label":"W", "x":4.5, "y":1.0}, {"label":"E", "x":5.5, "y":1.0}, {"label":"R", "x":6.5, "y":1.0}, {"label":"T", "x":7.5, "y":1.0}, {"label":"S", "x":4.8, "y":2.0}, {"label":"D", "x":5.8, "y":2.0}, {"label":"F", "x":6.8, "y":2.0}, {"label":"G", "x":7.8, "y":2.0}, {"label":"X", "x":5.3, "y":3.0}, {"label":"C", "x":6.3, "y":3.0}, {"label":"V", "x":7.3, "y":3.0}, {"label":"B", "x":8.3, "y":3.0}, {"x":6.45, "y":4.0, "w":2.25}, {"label":"Win", "x":8.7, "y":4.0}, {"label":"Alt", "x":4.95, "y":4.05, "w":1.5}, {"label":"&", "x":8.55, "y":3.6}, {"label":"*", "x":9.55, "y":3.6}, {"label":"(", "x":10.55, "y":3.6}, {"label":")", "x":11.55, "y":3.6}, {"label":"Y", "x":8.05, "y":4.6000000000000005}, {"label":"U", "x":9.05, "y":4.6000000000000005}, {"label":"I", "x":10.05, "y":4.6000000000000005}, {"label":"O", "x":11.05, "y":4.6000000000000005}, {"label":"H", "x":8.2, "y":5.6000000000000005}, {"label":"J", "x":9.2, "y":5.6000000000000005}, {"label":"K", "x":10.2, "y":5.6000000000000005}, {"label":"L", "x":11.2, "y":5.6000000000000005}, {"label":"B", "x":7.75, "y":6.6000000000000005}, {"label":"N", "x":8.75, "y":6.6000000000000005}, {"label":"M", "x":9.75, "y":6.6000000000000005}, {"label":"<", "x":10.75, "y":6.6000000000000005}, {"x":7.75, "y":7.6000000000000005, "w":2.75}, {"label":"Alt", "x":10.5, "y":7.65, "w":1.5}] + }, + "LAYOUT_full_bs": { + "key_count": 68, + "layout": [{"label":"Esc", "x":0.55, "y":0.9}, {"label":"@", "x":3.7, "y":0.9}, {"label":"_", "x":13.25, "y":0.9}, {"label":"~", "x":1.7, "y":1.0}, {"label":"!", "x":2.7, "y":1.0}, {"label":"+", "x":14.25, "y":1.0}, {"label":"Backspace", "x":15.25, "y":1.0, "w":2}, {"label":"Del", "x":17.85, "y":1}, {"label":"PgUp", "x":0.35, "y":1.9}, {"label":"P", "x":12.95, "y":1.95}, {"label":"Tab", "x":1.5, "y":2.0, "w":1.5}, {"label":"Q", "x":3, "y":2.0}, {"label":"{", "x":13.95, "y":2.0}, {"label":"}", "x":14.95, "y":2.0}, {"label":"|", "x":15.95, "y":2.0, "w":1.5}, {"label":"PgDn", "x":0.15, "y":2.9}, {"label":"Caps Lock", "x":1.3, "y":3.0, "w":1.75}, {"label":"A", "x":3.05, "y":3.0}, {"label":":", "x":13.4, "y":3.0}, {"label":"\"", "x":14.4, "y":3.0}, {"label":"Enter", "x":15.4, "y":3.0, "w":2.25}, {"label":"Shift", "x":1.1, "y":4.0, "w":2.25}, {"label":"Z", "x":3.35, "y":4.0}, {"label":">", "x":13.1, "y":4.0}, {"label":"?", "x":14.1, "y":4.0}, {"label":"Shift", "x":15.1, "y":4.0, "w":1.75}, {"label":"Up", "x":16.85, "y":4.0}, {"label":"Ctrl", "x":1.1, "y":5.0, "w":1.5}, {"label":"Left", "x":15.85, "y":5.0}, {"label":"Down", "x":16.85, "y":5.0}, {"label":"Right", "x":17.85, "y":5.0}, {"label":"#", "x":5, "y":5.5511151231e-17}, {"label":"$", "x":6, "y":5.5511151231e-17}, {"label":"%", "x":7, "y":5.5511151231e-17}, {"label":"^", "x":8, "y":5.5511151231e-17}, {"label":"W", "x":4.5, "y":1.0}, {"label":"E", "x":5.5, "y":1.0}, {"label":"R", "x":6.5, "y":1.0}, {"label":"T", "x":7.5, "y":1.0}, {"label":"S", "x":4.8, "y":2.0}, {"label":"D", "x":5.8, "y":2.0}, {"label":"F", "x":6.8, "y":2.0}, {"label":"G", "x":7.8, "y":2.0}, {"label":"X", "x":5.3, "y":3.0}, {"label":"C", "x":6.3, "y":3.0}, {"label":"V", "x":7.3, "y":3.0}, {"label":"B", "x":8.3, "y":3.0}, {"x":6.45, "y":4.0, "w":2.25}, {"label":"Win", "x":8.7, "y":4.0}, {"label":"Alt", "x":4.95, "y":4.05, "w":1.5}, {"label":"&", "x":8.55, "y":3.6}, {"label":"*", "x":9.55, "y":3.6}, {"label":"(", "x":10.55, "y":3.6}, {"label":")", "x":11.55, "y":3.6}, {"label":"Y", "x":8.05, "y":4.6000000000000005}, {"label":"U", "x":9.05, "y":4.6000000000000005}, {"label":"I", "x":10.05, "y":4.6000000000000005}, {"label":"O", "x":11.05, "y":4.6000000000000005}, {"label":"H", "x":8.2, "y":5.6000000000000005}, {"label":"J", "x":9.2, "y":5.6000000000000005}, {"label":"K", "x":10.2, "y":5.6000000000000005}, {"label":"L", "x":11.2, "y":5.6000000000000005}, {"label":"B", "x":7.75, "y":6.6000000000000005}, {"label":"N", "x":8.75, "y":6.6000000000000005}, {"label":"M", "x":9.75, "y":6.6000000000000005}, {"label":"<", "x":10.75, "y":6.6000000000000005}, {"x":7.75, "y":7.6000000000000005, "w":2.75}, {"label":"Alt", "x":10.5, "y":7.65, "w":1.5}] + } + } +} diff --git a/keyboards/bear_65/keymaps/default/keymap.c b/keyboards/bear_65/keymaps/default/keymap.c new file mode 100644 index 000000000000..917203236fd3 --- /dev/null +++ b/keyboards/bear_65/keymaps/default/keymap.c @@ -0,0 +1,38 @@ +/* Copyright 2020 REPLACE_WITH_YOUR_NAME + * + * 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 . + */ +#include QMK_KEYBOARD_H + +// Defines names for use in layer keycodes and the keymap +enum layer_names { + _BASE, + _FN }; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT_all( + KC_ESC, 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_BSPC, KC_GRV, KC_DEL, \ + KC_PGUP, 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_PGDN, 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_ENT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ + KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT + ), + [_FN] = LAYOUT_all( + RESET, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, \ + RGB_MOD, _______, KC_BRID, KC_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______, \ + RGB_TOG, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______,_______ + ) +}; diff --git a/keyboards/bear_65/keymaps/default/readme.md b/keyboards/bear_65/keymaps/default/readme.md new file mode 100644 index 000000000000..d51734855773 --- /dev/null +++ b/keyboards/bear_65/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for bear_65 diff --git a/keyboards/bear_65/keymaps/via/keymap.c b/keyboards/bear_65/keymaps/via/keymap.c new file mode 100644 index 000000000000..7dd0dd30e7e4 --- /dev/null +++ b/keyboards/bear_65/keymaps/via/keymap.c @@ -0,0 +1,47 @@ +/* Copyright 2020 REPLACE_WITH_YOUR_NAME + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_full_bs( + KC_ESC, 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_BSPC, KC_DEL, \ + KC_PGUP, 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_PGDN, 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_ENT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ + KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_full_bs( + RESET, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, \ + RGB_MOD, _______, KC_BRID, KC_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______, \ + RGB_TOG, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______,_______ + ), + [2] = LAYOUT_full_bs( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______,_______ + ), + [3] = LAYOUT_full_bs( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______,_______ + ) +}; diff --git a/keyboards/bear_65/keymaps/via/readme.md b/keyboards/bear_65/keymaps/via/readme.md new file mode 100644 index 000000000000..d51734855773 --- /dev/null +++ b/keyboards/bear_65/keymaps/via/readme.md @@ -0,0 +1 @@ +# The default keymap for bear_65 diff --git a/keyboards/bear_65/keymaps/via/rules.mk b/keyboards/bear_65/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/bear_65/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/bear_65/readme.md b/keyboards/bear_65/readme.md new file mode 100644 index 000000000000..5b7e5ad73f9b --- /dev/null +++ b/keyboards/bear_65/readme.md @@ -0,0 +1,19 @@ +# Bear 65 + +![Bear 65](https://i.imgur.com/W1sVP1T.jpg) + +A gasket-mounted 65% keyboard inspired by the [TGR Alice](https://github.com/qmk/qmk_firmware/tree/master/keyboards/tgr/alice). Designed and produced by [jacky](https://geekhack.org/index.php?action=profile;u=63864) from Geekhack. + +* Keyboard Maintainer: QMK Community +* Hardware Supported: Bear 65 +* Hardware Availability: The GB happened July 15th 2020, units are still in production + +Make example for this keyboard (after setting up your build environment): + + make bear_65:default + +Flashing example for this keyboard: + + make bear_65: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). diff --git a/keyboards/bear_65/rules.mk b/keyboards/bear_65/rules.mk new file mode 100644 index 000000000000..b928081580aa --- /dev/null +++ b/keyboards/bear_65/rules.mk @@ -0,0 +1,31 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +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 +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # USB Nkey Rollover +BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +MIDI_ENABLE = no # MIDI support +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches + +KEY_LOCK_ENABLE = no # Enable KC_LOCK support +LTO_ENABLE = yes # Use LTO flags to reduce firmware size + +# generated by KBFirmware JSON to QMK Parser +# https://noroadsleft.github.io/kbf_qmk_converter/ From 72cc7c558a5601ba7168926b974c93a68a708104 Mon Sep 17 00:00:00 2001 From: George Mao Date: Mon, 21 Sep 2020 22:58:28 -0700 Subject: [PATCH 2/5] Apply suggestions from code review Co-authored-by: Drashna Jaelre --- keyboards/bear_65/info.json | 2 -- keyboards/bear_65/keymaps/default/keymap.c | 3 ++- keyboards/bear_65/rules.mk | 7 ++----- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/keyboards/bear_65/info.json b/keyboards/bear_65/info.json index eec444879c4b..2e935000618c 100644 --- a/keyboards/bear_65/info.json +++ b/keyboards/bear_65/info.json @@ -6,11 +6,9 @@ "height": 6.014620257184662, "layouts": { "LAYOUT_all": { - "key_count": 69, "layout": [{"label":"Esc", "x":0.55, "y":0.9}, {"label":"@", "x":3.7, "y":0.9}, {"label":"_", "x":13.25, "y":0.9}, {"label":"~", "x":1.7, "y":1.0}, {"label":"!", "x":2.7, "y":1.0}, {"label":"+", "x":14.25, "y":1.0}, {"label":"Bkspc", "x":15.25, "y":1.0}, {"label":"~", "x":16.25, "y":1}, {"label":"Del", "x":17.85, "y":1}, {"label":"PgUp", "x":0.35, "y":1.9}, {"label":"P", "x":12.95, "y":1.95}, {"label":"Tab", "x":1.5, "y":2.0, "w":1.5}, {"label":"Q", "x":3, "y":2.0}, {"label":"{", "x":13.95, "y":2.0}, {"label":"}", "x":14.95, "y":2.0}, {"label":"|", "x":15.95, "y":2.0, "w":1.5}, {"label":"PgDn", "x":0.15, "y":2.9}, {"label":"Caps Lock", "x":1.3, "y":3.0, "w":1.75}, {"label":"A", "x":3.05, "y":3.0}, {"label":":", "x":13.4, "y":3.0}, {"label":"\"", "x":14.4, "y":3.0}, {"label":"Enter", "x":15.4, "y":3.0, "w":2.25}, {"label":"Shift", "x":1.1, "y":4.0, "w":2.25}, {"label":"Z", "x":3.35, "y":4.0}, {"label":">", "x":13.1, "y":4.0}, {"label":"?", "x":14.1, "y":4.0}, {"label":"Shift", "x":15.1, "y":4.0, "w":1.75}, {"label":"Up", "x":16.85, "y":4.0}, {"label":"Ctrl", "x":1.1, "y":5.0, "w":1.5}, {"label":"Left", "x":15.85, "y":5.0}, {"label":"Down", "x":16.85, "y":5.0}, {"label":"Right", "x":17.85, "y":5.0}, {"label":"#", "x":5, "y":5.5511151231e-17}, {"label":"$", "x":6, "y":5.5511151231e-17}, {"label":"%", "x":7, "y":5.5511151231e-17}, {"label":"^", "x":8, "y":5.5511151231e-17}, {"label":"W", "x":4.5, "y":1.0}, {"label":"E", "x":5.5, "y":1.0}, {"label":"R", "x":6.5, "y":1.0}, {"label":"T", "x":7.5, "y":1.0}, {"label":"S", "x":4.8, "y":2.0}, {"label":"D", "x":5.8, "y":2.0}, {"label":"F", "x":6.8, "y":2.0}, {"label":"G", "x":7.8, "y":2.0}, {"label":"X", "x":5.3, "y":3.0}, {"label":"C", "x":6.3, "y":3.0}, {"label":"V", "x":7.3, "y":3.0}, {"label":"B", "x":8.3, "y":3.0}, {"x":6.45, "y":4.0, "w":2.25}, {"label":"Win", "x":8.7, "y":4.0}, {"label":"Alt", "x":4.95, "y":4.05, "w":1.5}, {"label":"&", "x":8.55, "y":3.6}, {"label":"*", "x":9.55, "y":3.6}, {"label":"(", "x":10.55, "y":3.6}, {"label":")", "x":11.55, "y":3.6}, {"label":"Y", "x":8.05, "y":4.6000000000000005}, {"label":"U", "x":9.05, "y":4.6000000000000005}, {"label":"I", "x":10.05, "y":4.6000000000000005}, {"label":"O", "x":11.05, "y":4.6000000000000005}, {"label":"H", "x":8.2, "y":5.6000000000000005}, {"label":"J", "x":9.2, "y":5.6000000000000005}, {"label":"K", "x":10.2, "y":5.6000000000000005}, {"label":"L", "x":11.2, "y":5.6000000000000005}, {"label":"B", "x":7.75, "y":6.6000000000000005}, {"label":"N", "x":8.75, "y":6.6000000000000005}, {"label":"M", "x":9.75, "y":6.6000000000000005}, {"label":"<", "x":10.75, "y":6.6000000000000005}, {"x":7.75, "y":7.6000000000000005, "w":2.75}, {"label":"Alt", "x":10.5, "y":7.65, "w":1.5}] }, "LAYOUT_full_bs": { - "key_count": 68, "layout": [{"label":"Esc", "x":0.55, "y":0.9}, {"label":"@", "x":3.7, "y":0.9}, {"label":"_", "x":13.25, "y":0.9}, {"label":"~", "x":1.7, "y":1.0}, {"label":"!", "x":2.7, "y":1.0}, {"label":"+", "x":14.25, "y":1.0}, {"label":"Backspace", "x":15.25, "y":1.0, "w":2}, {"label":"Del", "x":17.85, "y":1}, {"label":"PgUp", "x":0.35, "y":1.9}, {"label":"P", "x":12.95, "y":1.95}, {"label":"Tab", "x":1.5, "y":2.0, "w":1.5}, {"label":"Q", "x":3, "y":2.0}, {"label":"{", "x":13.95, "y":2.0}, {"label":"}", "x":14.95, "y":2.0}, {"label":"|", "x":15.95, "y":2.0, "w":1.5}, {"label":"PgDn", "x":0.15, "y":2.9}, {"label":"Caps Lock", "x":1.3, "y":3.0, "w":1.75}, {"label":"A", "x":3.05, "y":3.0}, {"label":":", "x":13.4, "y":3.0}, {"label":"\"", "x":14.4, "y":3.0}, {"label":"Enter", "x":15.4, "y":3.0, "w":2.25}, {"label":"Shift", "x":1.1, "y":4.0, "w":2.25}, {"label":"Z", "x":3.35, "y":4.0}, {"label":">", "x":13.1, "y":4.0}, {"label":"?", "x":14.1, "y":4.0}, {"label":"Shift", "x":15.1, "y":4.0, "w":1.75}, {"label":"Up", "x":16.85, "y":4.0}, {"label":"Ctrl", "x":1.1, "y":5.0, "w":1.5}, {"label":"Left", "x":15.85, "y":5.0}, {"label":"Down", "x":16.85, "y":5.0}, {"label":"Right", "x":17.85, "y":5.0}, {"label":"#", "x":5, "y":5.5511151231e-17}, {"label":"$", "x":6, "y":5.5511151231e-17}, {"label":"%", "x":7, "y":5.5511151231e-17}, {"label":"^", "x":8, "y":5.5511151231e-17}, {"label":"W", "x":4.5, "y":1.0}, {"label":"E", "x":5.5, "y":1.0}, {"label":"R", "x":6.5, "y":1.0}, {"label":"T", "x":7.5, "y":1.0}, {"label":"S", "x":4.8, "y":2.0}, {"label":"D", "x":5.8, "y":2.0}, {"label":"F", "x":6.8, "y":2.0}, {"label":"G", "x":7.8, "y":2.0}, {"label":"X", "x":5.3, "y":3.0}, {"label":"C", "x":6.3, "y":3.0}, {"label":"V", "x":7.3, "y":3.0}, {"label":"B", "x":8.3, "y":3.0}, {"x":6.45, "y":4.0, "w":2.25}, {"label":"Win", "x":8.7, "y":4.0}, {"label":"Alt", "x":4.95, "y":4.05, "w":1.5}, {"label":"&", "x":8.55, "y":3.6}, {"label":"*", "x":9.55, "y":3.6}, {"label":"(", "x":10.55, "y":3.6}, {"label":")", "x":11.55, "y":3.6}, {"label":"Y", "x":8.05, "y":4.6000000000000005}, {"label":"U", "x":9.05, "y":4.6000000000000005}, {"label":"I", "x":10.05, "y":4.6000000000000005}, {"label":"O", "x":11.05, "y":4.6000000000000005}, {"label":"H", "x":8.2, "y":5.6000000000000005}, {"label":"J", "x":9.2, "y":5.6000000000000005}, {"label":"K", "x":10.2, "y":5.6000000000000005}, {"label":"L", "x":11.2, "y":5.6000000000000005}, {"label":"B", "x":7.75, "y":6.6000000000000005}, {"label":"N", "x":8.75, "y":6.6000000000000005}, {"label":"M", "x":9.75, "y":6.6000000000000005}, {"label":"<", "x":10.75, "y":6.6000000000000005}, {"x":7.75, "y":7.6000000000000005, "w":2.75}, {"label":"Alt", "x":10.5, "y":7.65, "w":1.5}] } } diff --git a/keyboards/bear_65/keymaps/default/keymap.c b/keyboards/bear_65/keymaps/default/keymap.c index 917203236fd3..2e96633d7d75 100644 --- a/keyboards/bear_65/keymaps/default/keymap.c +++ b/keyboards/bear_65/keymaps/default/keymap.c @@ -18,7 +18,8 @@ // Defines names for use in layer keycodes and the keymap enum layer_names { _BASE, - _FN }; + _FN, +}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_all( diff --git a/keyboards/bear_65/rules.mk b/keyboards/bear_65/rules.mk index b928081580aa..03fae554e219 100644 --- a/keyboards/bear_65/rules.mk +++ b/keyboards/bear_65/rules.mk @@ -19,12 +19,9 @@ NKRO_ENABLE = no # USB Nkey Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow MIDI_ENABLE = no # MIDI support -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE = no # Audio output on port C6 -FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output -KEY_LOCK_ENABLE = no # Enable KC_LOCK support LTO_ENABLE = yes # Use LTO flags to reduce firmware size # generated by KBFirmware JSON to QMK Parser From 9292091a9d2afe24dde3efaf2da8480344e181de Mon Sep 17 00:00:00 2001 From: MudkipMao Date: Mon, 21 Sep 2020 23:01:51 -0700 Subject: [PATCH 3/5] fixed funky formatting on y values in info.json --- keyboards/bear_65/info.json | 4 ++-- keyboards/bear_65/keymaps/via/readme.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/bear_65/info.json b/keyboards/bear_65/info.json index 2e935000618c..53031ef774e7 100644 --- a/keyboards/bear_65/info.json +++ b/keyboards/bear_65/info.json @@ -6,10 +6,10 @@ "height": 6.014620257184662, "layouts": { "LAYOUT_all": { - "layout": [{"label":"Esc", "x":0.55, "y":0.9}, {"label":"@", "x":3.7, "y":0.9}, {"label":"_", "x":13.25, "y":0.9}, {"label":"~", "x":1.7, "y":1.0}, {"label":"!", "x":2.7, "y":1.0}, {"label":"+", "x":14.25, "y":1.0}, {"label":"Bkspc", "x":15.25, "y":1.0}, {"label":"~", "x":16.25, "y":1}, {"label":"Del", "x":17.85, "y":1}, {"label":"PgUp", "x":0.35, "y":1.9}, {"label":"P", "x":12.95, "y":1.95}, {"label":"Tab", "x":1.5, "y":2.0, "w":1.5}, {"label":"Q", "x":3, "y":2.0}, {"label":"{", "x":13.95, "y":2.0}, {"label":"}", "x":14.95, "y":2.0}, {"label":"|", "x":15.95, "y":2.0, "w":1.5}, {"label":"PgDn", "x":0.15, "y":2.9}, {"label":"Caps Lock", "x":1.3, "y":3.0, "w":1.75}, {"label":"A", "x":3.05, "y":3.0}, {"label":":", "x":13.4, "y":3.0}, {"label":"\"", "x":14.4, "y":3.0}, {"label":"Enter", "x":15.4, "y":3.0, "w":2.25}, {"label":"Shift", "x":1.1, "y":4.0, "w":2.25}, {"label":"Z", "x":3.35, "y":4.0}, {"label":">", "x":13.1, "y":4.0}, {"label":"?", "x":14.1, "y":4.0}, {"label":"Shift", "x":15.1, "y":4.0, "w":1.75}, {"label":"Up", "x":16.85, "y":4.0}, {"label":"Ctrl", "x":1.1, "y":5.0, "w":1.5}, {"label":"Left", "x":15.85, "y":5.0}, {"label":"Down", "x":16.85, "y":5.0}, {"label":"Right", "x":17.85, "y":5.0}, {"label":"#", "x":5, "y":5.5511151231e-17}, {"label":"$", "x":6, "y":5.5511151231e-17}, {"label":"%", "x":7, "y":5.5511151231e-17}, {"label":"^", "x":8, "y":5.5511151231e-17}, {"label":"W", "x":4.5, "y":1.0}, {"label":"E", "x":5.5, "y":1.0}, {"label":"R", "x":6.5, "y":1.0}, {"label":"T", "x":7.5, "y":1.0}, {"label":"S", "x":4.8, "y":2.0}, {"label":"D", "x":5.8, "y":2.0}, {"label":"F", "x":6.8, "y":2.0}, {"label":"G", "x":7.8, "y":2.0}, {"label":"X", "x":5.3, "y":3.0}, {"label":"C", "x":6.3, "y":3.0}, {"label":"V", "x":7.3, "y":3.0}, {"label":"B", "x":8.3, "y":3.0}, {"x":6.45, "y":4.0, "w":2.25}, {"label":"Win", "x":8.7, "y":4.0}, {"label":"Alt", "x":4.95, "y":4.05, "w":1.5}, {"label":"&", "x":8.55, "y":3.6}, {"label":"*", "x":9.55, "y":3.6}, {"label":"(", "x":10.55, "y":3.6}, {"label":")", "x":11.55, "y":3.6}, {"label":"Y", "x":8.05, "y":4.6000000000000005}, {"label":"U", "x":9.05, "y":4.6000000000000005}, {"label":"I", "x":10.05, "y":4.6000000000000005}, {"label":"O", "x":11.05, "y":4.6000000000000005}, {"label":"H", "x":8.2, "y":5.6000000000000005}, {"label":"J", "x":9.2, "y":5.6000000000000005}, {"label":"K", "x":10.2, "y":5.6000000000000005}, {"label":"L", "x":11.2, "y":5.6000000000000005}, {"label":"B", "x":7.75, "y":6.6000000000000005}, {"label":"N", "x":8.75, "y":6.6000000000000005}, {"label":"M", "x":9.75, "y":6.6000000000000005}, {"label":"<", "x":10.75, "y":6.6000000000000005}, {"x":7.75, "y":7.6000000000000005, "w":2.75}, {"label":"Alt", "x":10.5, "y":7.65, "w":1.5}] + "layout": [{"label":"Esc", "x":0.55, "y":0.9}, {"label":"@", "x":3.7, "y":0.9}, {"label":"_", "x":13.25, "y":0.9}, {"label":"~", "x":1.7, "y":1.0}, {"label":"!", "x":2.7, "y":1.0}, {"label":"+", "x":14.25, "y":1.0}, {"label":"Bkspc", "x":15.25, "y":1.0}, {"label":"~", "x":16.25, "y":1}, {"label":"Del", "x":17.85, "y":1}, {"label":"PgUp", "x":0.35, "y":1.9}, {"label":"P", "x":12.95, "y":1.95}, {"label":"Tab", "x":1.5, "y":2.0, "w":1.5}, {"label":"Q", "x":3, "y":2.0}, {"label":"{", "x":13.95, "y":2.0}, {"label":"}", "x":14.95, "y":2.0}, {"label":"|", "x":15.95, "y":2.0, "w":1.5}, {"label":"PgDn", "x":0.15, "y":2.9}, {"label":"Caps Lock", "x":1.3, "y":3.0, "w":1.75}, {"label":"A", "x":3.05, "y":3.0}, {"label":":", "x":13.4, "y":3.0}, {"label":"\"", "x":14.4, "y":3.0}, {"label":"Enter", "x":15.4, "y":3.0, "w":2.25}, {"label":"Shift", "x":1.1, "y":4.0, "w":2.25}, {"label":"Z", "x":3.35, "y":4.0}, {"label":">", "x":13.1, "y":4.0}, {"label":"?", "x":14.1, "y":4.0}, {"label":"Shift", "x":15.1, "y":4.0, "w":1.75}, {"label":"Up", "x":16.85, "y":4.0}, {"label":"Ctrl", "x":1.1, "y":5.0, "w":1.5}, {"label":"Left", "x":15.85, "y":5.0}, {"label":"Down", "x":16.85, "y":5.0}, {"label":"Right", "x":17.85, "y":5.0}, {"label":"#", "x":5, "y":0}, {"label":"$", "x":6, "y":0}, {"label":"%", "x":7, "y":0}, {"label":"^", "x":8, "y":0}, {"label":"W", "x":4.5, "y":1.0}, {"label":"E", "x":5.5, "y":1.0}, {"label":"R", "x":6.5, "y":1.0}, {"label":"T", "x":7.5, "y":1.0}, {"label":"S", "x":4.8, "y":2.0}, {"label":"D", "x":5.8, "y":2.0}, {"label":"F", "x":6.8, "y":2.0}, {"label":"G", "x":7.8, "y":2.0}, {"label":"X", "x":5.3, "y":3.0}, {"label":"C", "x":6.3, "y":3.0}, {"label":"V", "x":7.3, "y":3.0}, {"label":"B", "x":8.3, "y":3.0}, {"x":6.45, "y":4.0, "w":2.25}, {"label":"Win", "x":8.7, "y":4.0}, {"label":"Alt", "x":4.95, "y":4.05, "w":1.5}, {"label":"&", "x":8.55, "y":3.6}, {"label":"*", "x":9.55, "y":3.6}, {"label":"(", "x":10.55, "y":3.6}, {"label":")", "x":11.55, "y":3.6}, {"label":"Y", "x":8.05, "y":4.6}, {"label":"U", "x":9.05, "y":4.6}, {"label":"I", "x":10.05, "y":4.6}, {"label":"O", "x":11.05, "y":4.6}, {"label":"H", "x":8.2, "y":5.6}, {"label":"J", "x":9.2, "y":5.6}, {"label":"K", "x":10.2, "y":5.6}, {"label":"L", "x":11.2, "y":5.6}, {"label":"B", "x":7.75, "y":6.6}, {"label":"N", "x":8.75, "y":6.6}, {"label":"M", "x":9.75, "y":6.6}, {"label":"<", "x":10.75, "y":6.6}, {"x":7.75, "y":7.6, "w":2.75}, {"label":"Alt", "x":10.5, "y":7.65, "w":1.5}] }, "LAYOUT_full_bs": { - "layout": [{"label":"Esc", "x":0.55, "y":0.9}, {"label":"@", "x":3.7, "y":0.9}, {"label":"_", "x":13.25, "y":0.9}, {"label":"~", "x":1.7, "y":1.0}, {"label":"!", "x":2.7, "y":1.0}, {"label":"+", "x":14.25, "y":1.0}, {"label":"Backspace", "x":15.25, "y":1.0, "w":2}, {"label":"Del", "x":17.85, "y":1}, {"label":"PgUp", "x":0.35, "y":1.9}, {"label":"P", "x":12.95, "y":1.95}, {"label":"Tab", "x":1.5, "y":2.0, "w":1.5}, {"label":"Q", "x":3, "y":2.0}, {"label":"{", "x":13.95, "y":2.0}, {"label":"}", "x":14.95, "y":2.0}, {"label":"|", "x":15.95, "y":2.0, "w":1.5}, {"label":"PgDn", "x":0.15, "y":2.9}, {"label":"Caps Lock", "x":1.3, "y":3.0, "w":1.75}, {"label":"A", "x":3.05, "y":3.0}, {"label":":", "x":13.4, "y":3.0}, {"label":"\"", "x":14.4, "y":3.0}, {"label":"Enter", "x":15.4, "y":3.0, "w":2.25}, {"label":"Shift", "x":1.1, "y":4.0, "w":2.25}, {"label":"Z", "x":3.35, "y":4.0}, {"label":">", "x":13.1, "y":4.0}, {"label":"?", "x":14.1, "y":4.0}, {"label":"Shift", "x":15.1, "y":4.0, "w":1.75}, {"label":"Up", "x":16.85, "y":4.0}, {"label":"Ctrl", "x":1.1, "y":5.0, "w":1.5}, {"label":"Left", "x":15.85, "y":5.0}, {"label":"Down", "x":16.85, "y":5.0}, {"label":"Right", "x":17.85, "y":5.0}, {"label":"#", "x":5, "y":5.5511151231e-17}, {"label":"$", "x":6, "y":5.5511151231e-17}, {"label":"%", "x":7, "y":5.5511151231e-17}, {"label":"^", "x":8, "y":5.5511151231e-17}, {"label":"W", "x":4.5, "y":1.0}, {"label":"E", "x":5.5, "y":1.0}, {"label":"R", "x":6.5, "y":1.0}, {"label":"T", "x":7.5, "y":1.0}, {"label":"S", "x":4.8, "y":2.0}, {"label":"D", "x":5.8, "y":2.0}, {"label":"F", "x":6.8, "y":2.0}, {"label":"G", "x":7.8, "y":2.0}, {"label":"X", "x":5.3, "y":3.0}, {"label":"C", "x":6.3, "y":3.0}, {"label":"V", "x":7.3, "y":3.0}, {"label":"B", "x":8.3, "y":3.0}, {"x":6.45, "y":4.0, "w":2.25}, {"label":"Win", "x":8.7, "y":4.0}, {"label":"Alt", "x":4.95, "y":4.05, "w":1.5}, {"label":"&", "x":8.55, "y":3.6}, {"label":"*", "x":9.55, "y":3.6}, {"label":"(", "x":10.55, "y":3.6}, {"label":")", "x":11.55, "y":3.6}, {"label":"Y", "x":8.05, "y":4.6000000000000005}, {"label":"U", "x":9.05, "y":4.6000000000000005}, {"label":"I", "x":10.05, "y":4.6000000000000005}, {"label":"O", "x":11.05, "y":4.6000000000000005}, {"label":"H", "x":8.2, "y":5.6000000000000005}, {"label":"J", "x":9.2, "y":5.6000000000000005}, {"label":"K", "x":10.2, "y":5.6000000000000005}, {"label":"L", "x":11.2, "y":5.6000000000000005}, {"label":"B", "x":7.75, "y":6.6000000000000005}, {"label":"N", "x":8.75, "y":6.6000000000000005}, {"label":"M", "x":9.75, "y":6.6000000000000005}, {"label":"<", "x":10.75, "y":6.6000000000000005}, {"x":7.75, "y":7.6000000000000005, "w":2.75}, {"label":"Alt", "x":10.5, "y":7.65, "w":1.5}] + "layout": [{"label":"Esc", "x":0.55, "y":0.9}, {"label":"@", "x":3.7, "y":0.9}, {"label":"_", "x":13.25, "y":0.9}, {"label":"~", "x":1.7, "y":1.0}, {"label":"!", "x":2.7, "y":1.0}, {"label":"+", "x":14.25, "y":1.0}, {"label":"Backspace", "x":15.25, "y":1.0, "w":2}, {"label":"Del", "x":17.85, "y":1}, {"label":"PgUp", "x":0.35, "y":1.9}, {"label":"P", "x":12.95, "y":1.95}, {"label":"Tab", "x":1.5, "y":2.0, "w":1.5}, {"label":"Q", "x":3, "y":2.0}, {"label":"{", "x":13.95, "y":2.0}, {"label":"}", "x":14.95, "y":2.0}, {"label":"|", "x":15.95, "y":2.0, "w":1.5}, {"label":"PgDn", "x":0.15, "y":2.9}, {"label":"Caps Lock", "x":1.3, "y":3.0, "w":1.75}, {"label":"A", "x":3.05, "y":3.0}, {"label":":", "x":13.4, "y":3.0}, {"label":"\"", "x":14.4, "y":3.0}, {"label":"Enter", "x":15.4, "y":3.0, "w":2.25}, {"label":"Shift", "x":1.1, "y":4.0, "w":2.25}, {"label":"Z", "x":3.35, "y":4.0}, {"label":">", "x":13.1, "y":4.0}, {"label":"?", "x":14.1, "y":4.0}, {"label":"Shift", "x":15.1, "y":4.0, "w":1.75}, {"label":"Up", "x":16.85, "y":4.0}, {"label":"Ctrl", "x":1.1, "y":5.0, "w":1.5}, {"label":"Left", "x":15.85, "y":5.0}, {"label":"Down", "x":16.85, "y":5.0}, {"label":"Right", "x":17.85, "y":5.0}, {"label":"#", "x":5, "y":0}, {"label":"$", "x":6, "y":0}, {"label":"%", "x":7, "y":0}, {"label":"^", "x":8, "y":0}, {"label":"W", "x":4.5, "y":1.0}, {"label":"E", "x":5.5, "y":1.0}, {"label":"R", "x":6.5, "y":1.0}, {"label":"T", "x":7.5, "y":1.0}, {"label":"S", "x":4.8, "y":2.0}, {"label":"D", "x":5.8, "y":2.0}, {"label":"F", "x":6.8, "y":2.0}, {"label":"G", "x":7.8, "y":2.0}, {"label":"X", "x":5.3, "y":3.0}, {"label":"C", "x":6.3, "y":3.0}, {"label":"V", "x":7.3, "y":3.0}, {"label":"B", "x":8.3, "y":3.0}, {"x":6.45, "y":4.0, "w":2.25}, {"label":"Win", "x":8.7, "y":4.0}, {"label":"Alt", "x":4.95, "y":4.05, "w":1.5}, {"label":"&", "x":8.55, "y":3.6}, {"label":"*", "x":9.55, "y":3.6}, {"label":"(", "x":10.55, "y":3.6}, {"label":")", "x":11.55, "y":3.6}, {"label":"Y", "x":8.05, "y":4.6}, {"label":"U", "x":9.05, "y":4.6}, {"label":"I", "x":10.05, "y":4.6}, {"label":"O", "x":11.05, "y":4.6}, {"label":"H", "x":8.2, "y":5.6}, {"label":"J", "x":9.2, "y":5.6}, {"label":"K", "x":10.2, "y":5.6}, {"label":"L", "x":11.2, "y":5.6}, {"label":"B", "x":7.75, "y":6.6}, {"label":"N", "x":8.75, "y":6.6}, {"label":"M", "x":9.75, "y":6.6}, {"label":"<", "x":10.75, "y":6.6}, {"x":7.75, "y":7.6, "w":2.75}, {"label":"Alt", "x":10.5, "y":7.65, "w":1.5}] } } } diff --git a/keyboards/bear_65/keymaps/via/readme.md b/keyboards/bear_65/keymaps/via/readme.md index d51734855773..5cb67ab25f39 100644 --- a/keyboards/bear_65/keymaps/via/readme.md +++ b/keyboards/bear_65/keymaps/via/readme.md @@ -1 +1 @@ -# The default keymap for bear_65 +# The via keymap for bear_65 From 8e2dc837d725abb7b5bc905d8dc1563402f515ae Mon Sep 17 00:00:00 2001 From: MudkipMao Date: Tue, 22 Sep 2020 20:56:58 -0700 Subject: [PATCH 4/5] Integrated suggestions and fixed the info.json layout --- keyboards/bear_65/config.h | 1 - keyboards/bear_65/info.json | 4 +-- keyboards/bear_65/keymaps/default/keymap.c | 16 +++++------ keyboards/bear_65/keymaps/via/keymap.c | 32 +++++++++++----------- keyboards/bear_65/rules.mk | 1 - 5 files changed, 26 insertions(+), 28 deletions(-) diff --git a/keyboards/bear_65/config.h b/keyboards/bear_65/config.h index bfe1b6a4dc0d..4eb752cffc68 100644 --- a/keyboards/bear_65/config.h +++ b/keyboards/bear_65/config.h @@ -25,7 +25,6 @@ along with this program. If not, see . #define DEVICE_VER 0x0001 #define MANUFACTURER Jacky #define PRODUCT Jacky Bear 65 Ergo -#define DESCRIPTION A gasket-mounted 65% Alice style board /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/bear_65/info.json b/keyboards/bear_65/info.json index 53031ef774e7..785f9e3ecff8 100644 --- a/keyboards/bear_65/info.json +++ b/keyboards/bear_65/info.json @@ -6,10 +6,10 @@ "height": 6.014620257184662, "layouts": { "LAYOUT_all": { - "layout": [{"label":"Esc", "x":0.55, "y":0.9}, {"label":"@", "x":3.7, "y":0.9}, {"label":"_", "x":13.25, "y":0.9}, {"label":"~", "x":1.7, "y":1.0}, {"label":"!", "x":2.7, "y":1.0}, {"label":"+", "x":14.25, "y":1.0}, {"label":"Bkspc", "x":15.25, "y":1.0}, {"label":"~", "x":16.25, "y":1}, {"label":"Del", "x":17.85, "y":1}, {"label":"PgUp", "x":0.35, "y":1.9}, {"label":"P", "x":12.95, "y":1.95}, {"label":"Tab", "x":1.5, "y":2.0, "w":1.5}, {"label":"Q", "x":3, "y":2.0}, {"label":"{", "x":13.95, "y":2.0}, {"label":"}", "x":14.95, "y":2.0}, {"label":"|", "x":15.95, "y":2.0, "w":1.5}, {"label":"PgDn", "x":0.15, "y":2.9}, {"label":"Caps Lock", "x":1.3, "y":3.0, "w":1.75}, {"label":"A", "x":3.05, "y":3.0}, {"label":":", "x":13.4, "y":3.0}, {"label":"\"", "x":14.4, "y":3.0}, {"label":"Enter", "x":15.4, "y":3.0, "w":2.25}, {"label":"Shift", "x":1.1, "y":4.0, "w":2.25}, {"label":"Z", "x":3.35, "y":4.0}, {"label":">", "x":13.1, "y":4.0}, {"label":"?", "x":14.1, "y":4.0}, {"label":"Shift", "x":15.1, "y":4.0, "w":1.75}, {"label":"Up", "x":16.85, "y":4.0}, {"label":"Ctrl", "x":1.1, "y":5.0, "w":1.5}, {"label":"Left", "x":15.85, "y":5.0}, {"label":"Down", "x":16.85, "y":5.0}, {"label":"Right", "x":17.85, "y":5.0}, {"label":"#", "x":5, "y":0}, {"label":"$", "x":6, "y":0}, {"label":"%", "x":7, "y":0}, {"label":"^", "x":8, "y":0}, {"label":"W", "x":4.5, "y":1.0}, {"label":"E", "x":5.5, "y":1.0}, {"label":"R", "x":6.5, "y":1.0}, {"label":"T", "x":7.5, "y":1.0}, {"label":"S", "x":4.8, "y":2.0}, {"label":"D", "x":5.8, "y":2.0}, {"label":"F", "x":6.8, "y":2.0}, {"label":"G", "x":7.8, "y":2.0}, {"label":"X", "x":5.3, "y":3.0}, {"label":"C", "x":6.3, "y":3.0}, {"label":"V", "x":7.3, "y":3.0}, {"label":"B", "x":8.3, "y":3.0}, {"x":6.45, "y":4.0, "w":2.25}, {"label":"Win", "x":8.7, "y":4.0}, {"label":"Alt", "x":4.95, "y":4.05, "w":1.5}, {"label":"&", "x":8.55, "y":3.6}, {"label":"*", "x":9.55, "y":3.6}, {"label":"(", "x":10.55, "y":3.6}, {"label":")", "x":11.55, "y":3.6}, {"label":"Y", "x":8.05, "y":4.6}, {"label":"U", "x":9.05, "y":4.6}, {"label":"I", "x":10.05, "y":4.6}, {"label":"O", "x":11.05, "y":4.6}, {"label":"H", "x":8.2, "y":5.6}, {"label":"J", "x":9.2, "y":5.6}, {"label":"K", "x":10.2, "y":5.6}, {"label":"L", "x":11.2, "y":5.6}, {"label":"B", "x":7.75, "y":6.6}, {"label":"N", "x":8.75, "y":6.6}, {"label":"M", "x":9.75, "y":6.6}, {"label":"<", "x":10.75, "y":6.6}, {"x":7.75, "y":7.6, "w":2.75}, {"label":"Alt", "x":10.5, "y":7.65, "w":1.5}] + "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.55, "y":0.9}, {"label":"@", "x":3.7, "y":0.9}, {"label":"_", "x":13.25, "y":0.9}, {"label":"~", "x":1.7, "y":1.0}, {"label":"!", "x":2.7, "y":1.0}, {"label":"+", "x":14.25, "y":1.0}, {"label":"Backspace", "x":15.25, "y":1.0, "w":2}, {"label":"Del", "x":17.85, "y":1}, {"label":"PgUp", "x":0.35, "y":1.9}, {"label":"P", "x":12.95, "y":1.95}, {"label":"Tab", "x":1.5, "y":2.0, "w":1.5}, {"label":"Q", "x":3, "y":2.0}, {"label":"{", "x":13.95, "y":2.0}, {"label":"}", "x":14.95, "y":2.0}, {"label":"|", "x":15.95, "y":2.0, "w":1.5}, {"label":"PgDn", "x":0.15, "y":2.9}, {"label":"Caps Lock", "x":1.3, "y":3.0, "w":1.75}, {"label":"A", "x":3.05, "y":3.0}, {"label":":", "x":13.4, "y":3.0}, {"label":"\"", "x":14.4, "y":3.0}, {"label":"Enter", "x":15.4, "y":3.0, "w":2.25}, {"label":"Shift", "x":1.1, "y":4.0, "w":2.25}, {"label":"Z", "x":3.35, "y":4.0}, {"label":">", "x":13.1, "y":4.0}, {"label":"?", "x":14.1, "y":4.0}, {"label":"Shift", "x":15.1, "y":4.0, "w":1.75}, {"label":"Up", "x":16.85, "y":4.0}, {"label":"Ctrl", "x":1.1, "y":5.0, "w":1.5}, {"label":"Left", "x":15.85, "y":5.0}, {"label":"Down", "x":16.85, "y":5.0}, {"label":"Right", "x":17.85, "y":5.0}, {"label":"#", "x":5, "y":0}, {"label":"$", "x":6, "y":0}, {"label":"%", "x":7, "y":0}, {"label":"^", "x":8, "y":0}, {"label":"W", "x":4.5, "y":1.0}, {"label":"E", "x":5.5, "y":1.0}, {"label":"R", "x":6.5, "y":1.0}, {"label":"T", "x":7.5, "y":1.0}, {"label":"S", "x":4.8, "y":2.0}, {"label":"D", "x":5.8, "y":2.0}, {"label":"F", "x":6.8, "y":2.0}, {"label":"G", "x":7.8, "y":2.0}, {"label":"X", "x":5.3, "y":3.0}, {"label":"C", "x":6.3, "y":3.0}, {"label":"V", "x":7.3, "y":3.0}, {"label":"B", "x":8.3, "y":3.0}, {"x":6.45, "y":4.0, "w":2.25}, {"label":"Win", "x":8.7, "y":4.0}, {"label":"Alt", "x":4.95, "y":4.05, "w":1.5}, {"label":"&", "x":8.55, "y":3.6}, {"label":"*", "x":9.55, "y":3.6}, {"label":"(", "x":10.55, "y":3.6}, {"label":")", "x":11.55, "y":3.6}, {"label":"Y", "x":8.05, "y":4.6}, {"label":"U", "x":9.05, "y":4.6}, {"label":"I", "x":10.05, "y":4.6}, {"label":"O", "x":11.05, "y":4.6}, {"label":"H", "x":8.2, "y":5.6}, {"label":"J", "x":9.2, "y":5.6}, {"label":"K", "x":10.2, "y":5.6}, {"label":"L", "x":11.2, "y":5.6}, {"label":"B", "x":7.75, "y":6.6}, {"label":"N", "x":8.75, "y":6.6}, {"label":"M", "x":9.75, "y":6.6}, {"label":"<", "x":10.75, "y":6.6}, {"x":7.75, "y":7.6, "w":2.75}, {"label":"Alt", "x":10.5, "y":7.65, "w":1.5}] + "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}] } } } diff --git a/keyboards/bear_65/keymaps/default/keymap.c b/keyboards/bear_65/keymaps/default/keymap.c index 2e96633d7d75..da130e646aba 100644 --- a/keyboards/bear_65/keymaps/default/keymap.c +++ b/keyboards/bear_65/keymaps/default/keymap.c @@ -23,17 +23,17 @@ enum layer_names { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_all( - KC_ESC, 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_BSPC, KC_GRV, KC_DEL, \ - KC_PGUP, 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_PGDN, 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_ENT, \ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ + KC_ESC, 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_BSPC, KC_GRV, KC_DEL, + KC_PGUP, 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_PGDN, 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_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT ), [_FN] = LAYOUT_all( - RESET, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, \ - RGB_MOD, _______, KC_BRID, KC_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______, \ - RGB_TOG, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + RESET, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + RGB_MOD, _______, KC_BRID, KC_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______, + RGB_TOG, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______ ) }; diff --git a/keyboards/bear_65/keymaps/via/keymap.c b/keyboards/bear_65/keymaps/via/keymap.c index 7dd0dd30e7e4..b222d61f25f3 100644 --- a/keyboards/bear_65/keymaps/via/keymap.c +++ b/keyboards/bear_65/keymaps/via/keymap.c @@ -17,31 +17,31 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_full_bs( - KC_ESC, 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_BSPC, KC_DEL, \ - KC_PGUP, 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_PGDN, 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_ENT, \ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ + KC_ESC, 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_BSPC, KC_DEL, + KC_PGUP, 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_PGDN, 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_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_full_bs( - RESET, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, \ - RGB_MOD, _______, KC_BRID, KC_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______, \ - RGB_TOG, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + RESET, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + RGB_MOD, _______, KC_BRID, KC_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______, + RGB_TOG, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______ ), [2] = LAYOUT_full_bs( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______ ), [3] = LAYOUT_full_bs( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______ ) }; diff --git a/keyboards/bear_65/rules.mk b/keyboards/bear_65/rules.mk index 03fae554e219..72f4819acc5e 100644 --- a/keyboards/bear_65/rules.mk +++ b/keyboards/bear_65/rules.mk @@ -18,7 +18,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend NKRO_ENABLE = no # USB Nkey Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -MIDI_ENABLE = no # MIDI support BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output From 69a413f87c5a1f47f6645aa9bb9c7b3961088a5a Mon Sep 17 00:00:00 2001 From: George Mao Date: Wed, 23 Sep 2020 20:33:22 -0700 Subject: [PATCH 5/5] Apply noroadsleft's suggestions from code review Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/bear_65/bear_65.h | 3 --- keyboards/bear_65/config.h | 5 +---- keyboards/bear_65/info.json | 4 ++-- keyboards/bear_65/keymaps/default/keymap.c | 2 +- keyboards/bear_65/keymaps/via/keymap.c | 2 +- keyboards/bear_65/readme.md | 2 +- keyboards/bear_65/rules.mk | 3 --- 7 files changed, 6 insertions(+), 15 deletions(-) diff --git a/keyboards/bear_65/bear_65.h b/keyboards/bear_65/bear_65.h index 0ef554ccb7f4..94ec89c889db 100644 --- a/keyboards/bear_65/bear_65.h +++ b/keyboards/bear_65/bear_65.h @@ -44,6 +44,3 @@ { 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 }, \ } - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/bear_65/config.h b/keyboards/bear_65/config.h index 4eb752cffc68..1b7524f074bb 100644 --- a/keyboards/bear_65/config.h +++ b/keyboards/bear_65/config.h @@ -50,7 +50,7 @@ along with this program. If not, see . #define DIODE_DIRECTION ROW2COL #define BACKLIGHT_PIN B6 -// #define BACKLIGHT_BREATHING +#define BACKLIGHT_BREATHING #define BACKLIGHT_LEVELS 4 #define RGB_DI_PIN E2 @@ -74,6 +74,3 @@ along with this program. If not, see . // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING #endif - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/bear_65/info.json b/keyboards/bear_65/info.json index 785f9e3ecff8..67fc090af832 100644 --- a/keyboards/bear_65/info.json +++ b/keyboards/bear_65/info.json @@ -2,8 +2,8 @@ "keyboard_name": "Bear 65", "url": "https://qmk.fm/keyboards", "maintainer": "qmk", - "width": 19.75, - "height": 6.014620257184662, + "width": 20.75, + "height": 5, "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}] diff --git a/keyboards/bear_65/keymaps/default/keymap.c b/keyboards/bear_65/keymaps/default/keymap.c index da130e646aba..b7d5cdf61cc9 100644 --- a/keyboards/bear_65/keymaps/default/keymap.c +++ b/keyboards/bear_65/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2020 REPLACE_WITH_YOUR_NAME +/* 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 diff --git a/keyboards/bear_65/keymaps/via/keymap.c b/keyboards/bear_65/keymaps/via/keymap.c index b222d61f25f3..2ddc5b43d8b7 100644 --- a/keyboards/bear_65/keymaps/via/keymap.c +++ b/keyboards/bear_65/keymaps/via/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2020 REPLACE_WITH_YOUR_NAME +/* 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 diff --git a/keyboards/bear_65/readme.md b/keyboards/bear_65/readme.md index 5b7e5ad73f9b..44a5e95537e1 100644 --- a/keyboards/bear_65/readme.md +++ b/keyboards/bear_65/readme.md @@ -1,6 +1,6 @@ # Bear 65 -![Bear 65](https://i.imgur.com/W1sVP1T.jpg) +![Bear 65](https://i.imgur.com/W1sVP1Tl.jpg) A gasket-mounted 65% keyboard inspired by the [TGR Alice](https://github.com/qmk/qmk_firmware/tree/master/keyboards/tgr/alice). Designed and produced by [jacky](https://geekhack.org/index.php?action=profile;u=63864) from Geekhack. diff --git a/keyboards/bear_65/rules.mk b/keyboards/bear_65/rules.mk index 72f4819acc5e..339c37c7ee03 100644 --- a/keyboards/bear_65/rules.mk +++ b/keyboards/bear_65/rules.mk @@ -22,6 +22,3 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output LTO_ENABLE = yes # Use LTO flags to reduce firmware size - -# generated by KBFirmware JSON to QMK Parser -# https://noroadsleft.github.io/kbf_qmk_converter/