From c049baabd26ce134b140b614c28bdcb7cd9f7354 Mon Sep 17 00:00:00 2001 From: Quentin Date: Wed, 3 Feb 2021 16:11:10 +0100 Subject: [PATCH 01/19] add bastyl mini --- keyboards/bastardkb/bastylmini/bastylmini.c | 18 +++++ keyboards/bastardkb/bastylmini/bastylmini.h | 37 ++++++++++ keyboards/bastardkb/bastylmini/config.h | 39 +++++++++++ keyboards/bastardkb/bastylmini/info.json | 55 +++++++++++++++ .../bastylmini/keymaps/default/keymap.c | 70 +++++++++++++++++++ keyboards/bastardkb/bastylmini/readme.md | 15 ++++ keyboards/bastardkb/bastylmini/rules.mk | 23 ++++++ 7 files changed, 257 insertions(+) create mode 100644 keyboards/bastardkb/bastylmini/bastylmini.c create mode 100644 keyboards/bastardkb/bastylmini/bastylmini.h create mode 100644 keyboards/bastardkb/bastylmini/config.h create mode 100644 keyboards/bastardkb/bastylmini/info.json create mode 100644 keyboards/bastardkb/bastylmini/keymaps/default/keymap.c create mode 100644 keyboards/bastardkb/bastylmini/readme.md create mode 100644 keyboards/bastardkb/bastylmini/rules.mk diff --git a/keyboards/bastardkb/bastylmini/bastylmini.c b/keyboards/bastardkb/bastylmini/bastylmini.c new file mode 100644 index 000000000000..634b0b4a98df --- /dev/null +++ b/keyboards/bastardkb/bastylmini/bastylmini.c @@ -0,0 +1,18 @@ +/* + * Copyright 2021 Quentin LEBASTARD + * + * 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 "bastylmini.h" diff --git a/keyboards/bastardkb/bastylmini/bastylmini.h b/keyboards/bastardkb/bastylmini/bastylmini.h new file mode 100644 index 000000000000..6d62137e6ed4 --- /dev/null +++ b/keyboards/bastardkb/bastylmini/bastylmini.h @@ -0,0 +1,37 @@ +/* + * Copyright 2021 Quentin LEBASTARD + * + * 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( \ + k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \ + k10, k11, k12, k13, k14, k15, k55, k54, k53, k52, k51, k50, \ + k20, k21, k22, k23, k24, k25, k65, k64, k63, k62, k61, k60, \ + k33, k34, k31, k71, k74, k73z \ +)\ +{\ + { k00, k01, k02, k03, k04, k05 }, \ + { k10, k11, k12, k13, k14, k15 }, \ + { k20, k21, k22, k23, k24, k25 }, \ + { KC_NO, k31, KC_NO, k33, k34, KC_NO }, \ + { k40, k41, k42, k43, k44, k45 }, \ + { k50, k51, k52, k53, k54, k55 }, \ + { k60, k61, k62, k63, k64, k65 }, \ + { KC_NO, k71, KC_NO, k73, k74, KC_NO }, \ +} diff --git a/keyboards/bastardkb/bastylmini/config.h b/keyboards/bastardkb/bastylmini/config.h new file mode 100644 index 000000000000..78428225d392 --- /dev/null +++ b/keyboards/bastardkb/bastylmini/config.h @@ -0,0 +1,39 @@ +/* + * Copyright 2021 Quentin LEBASTARD + * + * 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" +#define VENDOR_ID 0xA8F8 +#define PRODUCT_ID 0x1828 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Bastard Keyboards +#define PRODUCT Bastyl Mini + +#define MATRIX_ROWS 8 +#define MATRIX_COLS 6 +#define DIODE_DIRECTION ROW2COL +#define MATRIX_ROW_PINS { B5, F7, F6, B6 } +#define MATRIX_COL_PINS { B4, E6, C6, B1, B3, B2 } +#define RGB_DI_PIN D2 +#define RGBLED_NUM 21 +#define RGBLIGHT_SPLIT +#define RGBLIGHT_ANIMATIONS +#define DEBOUNCE 5 +#define SOFT_SERIAL_PIN D0 +#define LOCKING_SUPPORT_ENABLE +#define LOCKING_RESYNC_ENABLE +#define MASTER_RIGHT diff --git a/keyboards/bastardkb/bastylmini/info.json b/keyboards/bastardkb/bastylmini/info.json new file mode 100644 index 000000000000..ada4485c8de0 --- /dev/null +++ b/keyboards/bastardkb/bastylmini/info.json @@ -0,0 +1,55 @@ +{ + "keyboard_name": "Bastyl Mini", + "url": "https://www.bastardkb.com", + "maintainer": "Quentin Lebastard", + "width": 17, + "height": 8, + "layouts": { + "LAYOUT": { + "layout": [ + {"label":"L00", "x":0, "y":0}, + {"label":"L01", "x":1, "y":0}, + {"label":"L02", "x":2, "y":0}, + {"label":"L03", "x":3, "y":0}, + {"label":"L04", "x":4, "y":0}, + {"label":"L05", "x":5, "y":0}, + {"label":"R00", "x":11, "y":0}, + {"label":"R01", "x":12, "y":0}, + {"label":"R02", "x":13, "y":0}, + {"label":"R03", "x":14, "y":0}, + {"label":"R04", "x":15, "y":0}, + {"label":"R05", "x":16, "y":0}, + {"label":"L10", "x":0, "y":1}, + {"label":"L11", "x":1, "y":1}, + {"label":"L12", "x":2, "y":1}, + {"label":"L13", "x":3, "y":1}, + {"label":"L14", "x":4, "y":1}, + {"label":"L15", "x":5, "y":1}, + {"label":"R10", "x":11, "y":1}, + {"label":"R11", "x":12, "y":1}, + {"label":"R12", "x":13, "y":1}, + {"label":"R13", "x":14, "y":1}, + {"label":"R14", "x":15, "y":1}, + {"label":"R15", "x":16, "y":1}, + {"label":"L20", "x":0, "y":2}, + {"label":"L21", "x":1, "y":2}, + {"label":"L22", "x":2, "y":2}, + {"label":"L23", "x":3, "y":2}, + {"label":"L24", "x":4, "y":2}, + {"label":"L25", "x":5, "y":2}, + {"label":"R20", "x":11, "y":2}, + {"label":"R21", "x":12, "y":2}, + {"label":"R22", "x":13, "y":2}, + {"label":"R23", "x":14, "y":2}, + {"label":"R24", "x":15, "y":2}, + {"label":"R25", "x":16, "y":2}, + {"label":"L33", "x":5, "y":3}, + {"label":"L34", "x":6, "y":3}, + {"label":"L31", "x":7, "y":3}, + {"label":"R33", "x":9, "y":3}, + {"label":"R34", "x":10, "y":3}, + {"label":"R31", "x":11, "y":3} + ] + } + } +} diff --git a/keyboards/bastardkb/bastylmini/keymaps/default/keymap.c b/keyboards/bastardkb/bastylmini/keymaps/default/keymap.c new file mode 100644 index 000000000000..8d8f2ed2c160 --- /dev/null +++ b/keyboards/bastardkb/bastylmini/keymaps/default/keymap.c @@ -0,0 +1,70 @@ +/* + * Copyright 2021 Quentin LEBASTARD + * + * 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( + //,-----------------------------------------------------. ,-----------------------------------------------------. + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ESC, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LGUI, KC_SPC , MO(1), MO(2), KC_ENT , KC_RALT + //`--------------------------' `--------------------------' + + ), + + [1] = LAYOUT( + //,-----------------------------------------------------. ,-----------------------------------------------------. + KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,KC_RIGHT, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LGUI, KC_SPC, _______, MO(3), KC_ENT, KC_RALT + //`--------------------------' `--------------------------' + ), + + [2] = LAYOUT( + //,-----------------------------------------------------. ,-----------------------------------------------------. + KC_TAB, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LGUI, KC_SPC, MO(3), _______, KC_ENT, KC_RALT + //`--------------------------' `--------------------------' + ), + + [3] = LAYOUT( + //,-----------------------------------------------------. ,-----------------------------------------------------. + RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LGUI, KC_SPC, _______, _______, KC_ENT, KC_RALT + //`--------------------------' `--------------------------' + ) +}; diff --git a/keyboards/bastardkb/bastylmini/readme.md b/keyboards/bastardkb/bastylmini/readme.md new file mode 100644 index 000000000000..487e5cc64498 --- /dev/null +++ b/keyboards/bastardkb/bastylmini/readme.md @@ -0,0 +1,15 @@ +# Bastyl Mini + +A split, compact ergonomic keyboard. + +* Keyboard Maintainer: [BastardKb](https://github.com/Bastardkb/) +* Hardware Supported: elite-C V4 +* Hardware Availability: [Bastardkb.com](https://bastardkb.com/) + +Make example for this keyboard (after setting up your build environment): + + make bastardkb/bastylmini:default + +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). + +See the [keyboard build instructions](http://docs.bastardkb.com/) \ No newline at end of file diff --git a/keyboards/bastardkb/bastylmini/rules.mk b/keyboards/bastardkb/bastylmini/rules.mk new file mode 100644 index 000000000000..cc88208e33c1 --- /dev/null +++ b/keyboards/bastardkb/bastylmini/rules.mk @@ -0,0 +1,23 @@ +# 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 = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output +SPLIT_KEYBOARD = yes From 3d20cddf81aea9bf5e7543f46c18605bc958bb31 Mon Sep 17 00:00:00 2001 From: Quentin Date: Fri, 5 Feb 2021 11:37:43 +0100 Subject: [PATCH 02/19] Update keyboards/bastardkb/bastylmini/config.h Co-authored-by: Drashna Jaelre --- keyboards/bastardkb/bastylmini/config.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/keyboards/bastardkb/bastylmini/config.h b/keyboards/bastardkb/bastylmini/config.h index 78428225d392..259922f7cb81 100644 --- a/keyboards/bastardkb/bastylmini/config.h +++ b/keyboards/bastardkb/bastylmini/config.h @@ -25,15 +25,22 @@ #define MATRIX_ROWS 8 #define MATRIX_COLS 6 -#define DIODE_DIRECTION ROW2COL + #define MATRIX_ROW_PINS { B5, F7, F6, B6 } #define MATRIX_COL_PINS { B4, E6, C6, B1, B3, B2 } + +#define DIODE_DIRECTION ROW2COL + #define RGB_DI_PIN D2 #define RGBLED_NUM 21 #define RGBLIGHT_SPLIT #define RGBLIGHT_ANIMATIONS + #define DEBOUNCE 5 + #define SOFT_SERIAL_PIN D0 + #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE + #define MASTER_RIGHT From 6a67352c66c4d488776af32a4fa5b59c99947809 Mon Sep 17 00:00:00 2001 From: Quentin Date: Wed, 10 Feb 2021 11:51:47 +0100 Subject: [PATCH 03/19] Update keyboards/bastardkb/bastylmini/bastylmini.h Co-authored-by: Drashna Jaelre --- keyboards/bastardkb/bastylmini/bastylmini.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/bastardkb/bastylmini/bastylmini.h b/keyboards/bastardkb/bastylmini/bastylmini.h index 6d62137e6ed4..f3f14a16eed4 100644 --- a/keyboards/bastardkb/bastylmini/bastylmini.h +++ b/keyboards/bastardkb/bastylmini/bastylmini.h @@ -19,7 +19,7 @@ #pragma once #include "quantum.h" -#define LAYOUT( \ +#define LAYOUT_split_3x6_3( \ k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \ k10, k11, k12, k13, k14, k15, k55, k54, k53, k52, k51, k50, \ k20, k21, k22, k23, k24, k25, k65, k64, k63, k62, k61, k60, \ From fd7b3d1c2f65857cb8b0d2b89812b1c0d83b60ef Mon Sep 17 00:00:00 2001 From: Quentin Date: Wed, 10 Feb 2021 11:51:53 +0100 Subject: [PATCH 04/19] Update keyboards/bastardkb/bastylmini/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/bastardkb/bastylmini/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/bastardkb/bastylmini/keymaps/default/keymap.c b/keyboards/bastardkb/bastylmini/keymaps/default/keymap.c index 8d8f2ed2c160..d2d2df2dedb6 100644 --- a/keyboards/bastardkb/bastylmini/keymaps/default/keymap.c +++ b/keyboards/bastardkb/bastylmini/keymaps/default/keymap.c @@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_split_3x6_3( //,-----------------------------------------------------. ,-----------------------------------------------------. KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| From 9b998ef7ed983075d79a423220cf138f110b8c6c Mon Sep 17 00:00:00 2001 From: Quentin Date: Wed, 10 Feb 2021 11:55:01 +0100 Subject: [PATCH 05/19] Update keyboards/bastardkb/bastylmini/info.json Co-authored-by: Drashna Jaelre --- keyboards/bastardkb/bastylmini/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/bastardkb/bastylmini/info.json b/keyboards/bastardkb/bastylmini/info.json index ada4485c8de0..9970a60531e9 100644 --- a/keyboards/bastardkb/bastylmini/info.json +++ b/keyboards/bastardkb/bastylmini/info.json @@ -5,7 +5,7 @@ "width": 17, "height": 8, "layouts": { - "LAYOUT": { + "LAYOUT_split_3x6_3": { "layout": [ {"label":"L00", "x":0, "y":0}, {"label":"L01", "x":1, "y":0}, From a2f17babb92f397fdebb775156d9d3dd9db352d8 Mon Sep 17 00:00:00 2001 From: Quentin Date: Wed, 10 Feb 2021 11:55:09 +0100 Subject: [PATCH 06/19] Update keyboards/bastardkb/bastylmini/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/bastardkb/bastylmini/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/bastardkb/bastylmini/keymaps/default/keymap.c b/keyboards/bastardkb/bastylmini/keymaps/default/keymap.c index d2d2df2dedb6..3f8a7a9d8586 100644 --- a/keyboards/bastardkb/bastylmini/keymaps/default/keymap.c +++ b/keyboards/bastardkb/bastylmini/keymaps/default/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), - [1] = LAYOUT( + [1] = LAYOUT_split_3x6_3( //,-----------------------------------------------------. ,-----------------------------------------------------. KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| From 0f1517017bcb510548c51966cfe9e913b3f5d817 Mon Sep 17 00:00:00 2001 From: Quentin Date: Wed, 10 Feb 2021 11:55:14 +0100 Subject: [PATCH 07/19] Update keyboards/bastardkb/bastylmini/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/bastardkb/bastylmini/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/bastardkb/bastylmini/keymaps/default/keymap.c b/keyboards/bastardkb/bastylmini/keymaps/default/keymap.c index 3f8a7a9d8586..7ccb5367065d 100644 --- a/keyboards/bastardkb/bastylmini/keymaps/default/keymap.c +++ b/keyboards/bastardkb/bastylmini/keymaps/default/keymap.c @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`--------------------------' `--------------------------' ), - [2] = LAYOUT( + [2] = LAYOUT_split_3x6_3( //,-----------------------------------------------------. ,-----------------------------------------------------. KC_TAB, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| From 046c7504433980f38e33a92b2fd7ce6f001bebe9 Mon Sep 17 00:00:00 2001 From: Quentin Date: Wed, 10 Feb 2021 11:55:29 +0100 Subject: [PATCH 08/19] Update keyboards/bastardkb/bastylmini/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/bastardkb/bastylmini/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/bastardkb/bastylmini/keymaps/default/keymap.c b/keyboards/bastardkb/bastylmini/keymaps/default/keymap.c index 7ccb5367065d..8006f11ce71b 100644 --- a/keyboards/bastardkb/bastylmini/keymaps/default/keymap.c +++ b/keyboards/bastardkb/bastylmini/keymaps/default/keymap.c @@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //`--------------------------' `--------------------------' ), - [3] = LAYOUT( + [3] = LAYOUT_split_3x6_3( //,-----------------------------------------------------. ,-----------------------------------------------------. RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| From f5ef0f14f5b8d3e28e0c57caed4690e501c2a6cb Mon Sep 17 00:00:00 2001 From: Quentin Date: Wed, 10 Feb 2021 11:55:41 +0100 Subject: [PATCH 09/19] Update keyboards/bastardkb/bastylmini/rules.mk Co-authored-by: Drashna Jaelre --- keyboards/bastardkb/bastylmini/rules.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/keyboards/bastardkb/bastylmini/rules.mk b/keyboards/bastardkb/bastylmini/rules.mk index cc88208e33c1..c1525b7f266d 100644 --- a/keyboards/bastardkb/bastylmini/rules.mk +++ b/keyboards/bastardkb/bastylmini/rules.mk @@ -21,3 +21,9 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output SPLIT_KEYBOARD = yes + +AUDIO_SUPPORTED = no +RGB_MATRIX_SUPPORTED = no +RGBLIGHT_SUPPORTED = yes + +LAYOUTS = split_3x6_3 From 08115cba2c2381e80c8f039f4a0ebda88220340b Mon Sep 17 00:00:00 2001 From: Quentin Date: Wed, 10 Feb 2021 11:56:19 +0100 Subject: [PATCH 10/19] Update keyboards/bastardkb/bastylmini/config.h Co-authored-by: Drashna Jaelre --- keyboards/bastardkb/bastylmini/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/bastardkb/bastylmini/config.h b/keyboards/bastardkb/bastylmini/config.h index 259922f7cb81..9c7105cab3a2 100644 --- a/keyboards/bastardkb/bastylmini/config.h +++ b/keyboards/bastardkb/bastylmini/config.h @@ -32,8 +32,8 @@ #define DIODE_DIRECTION ROW2COL #define RGB_DI_PIN D2 -#define RGBLED_NUM 21 -#define RGBLIGHT_SPLIT +#define RGBLED_NUM 42 +#define RGBLED_SPLIT { 21, 21 } #define RGBLIGHT_ANIMATIONS #define DEBOUNCE 5 From 33626c9fbbb492c52a815d8107eb1a047d6f9026 Mon Sep 17 00:00:00 2001 From: Quentin Date: Wed, 10 Feb 2021 11:56:52 +0100 Subject: [PATCH 11/19] Update keyboards/bastardkb/bastylmini/bastylmini.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/bastardkb/bastylmini/bastylmini.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/bastardkb/bastylmini/bastylmini.h b/keyboards/bastardkb/bastylmini/bastylmini.h index f3f14a16eed4..66235f4f4d62 100644 --- a/keyboards/bastardkb/bastylmini/bastylmini.h +++ b/keyboards/bastardkb/bastylmini/bastylmini.h @@ -23,7 +23,7 @@ k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \ k10, k11, k12, k13, k14, k15, k55, k54, k53, k52, k51, k50, \ k20, k21, k22, k23, k24, k25, k65, k64, k63, k62, k61, k60, \ - k33, k34, k31, k71, k74, k73z \ + k33, k34, k31, k71, k74, k73 \ )\ {\ { k00, k01, k02, k03, k04, k05 }, \ From 84d33cc3038703183e0f7204304c78e0e74a457f Mon Sep 17 00:00:00 2001 From: Quentin Date: Wed, 10 Feb 2021 11:57:01 +0100 Subject: [PATCH 12/19] Update keyboards/bastardkb/bastylmini/info.json Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/bastardkb/bastylmini/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/bastardkb/bastylmini/info.json b/keyboards/bastardkb/bastylmini/info.json index 9970a60531e9..a30a2f8cdf18 100644 --- a/keyboards/bastardkb/bastylmini/info.json +++ b/keyboards/bastardkb/bastylmini/info.json @@ -3,7 +3,7 @@ "url": "https://www.bastardkb.com", "maintainer": "Quentin Lebastard", "width": 17, - "height": 8, + "height": 4, "layouts": { "LAYOUT_split_3x6_3": { "layout": [ From 1f51682f6c221266c28a1cce6132bda9f9492893 Mon Sep 17 00:00:00 2001 From: Quentin Date: Wed, 10 Feb 2021 11:57:07 +0100 Subject: [PATCH 13/19] Update keyboards/bastardkb/bastylmini/rules.mk Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/bastardkb/bastylmini/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/bastardkb/bastylmini/rules.mk b/keyboards/bastardkb/bastylmini/rules.mk index c1525b7f266d..8a85c9a032e0 100644 --- a/keyboards/bastardkb/bastylmini/rules.mk +++ b/keyboards/bastardkb/bastylmini/rules.mk @@ -17,7 +17,7 @@ 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 = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output SPLIT_KEYBOARD = yes From 0d1c08533d6526a046e4eceec0aa00d60d4ece6e Mon Sep 17 00:00:00 2001 From: Quentin Date: Wed, 10 Feb 2021 11:57:18 +0100 Subject: [PATCH 14/19] Update keyboards/bastardkb/bastylmini/config.h Co-authored-by: NullSense --- keyboards/bastardkb/bastylmini/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/bastardkb/bastylmini/config.h b/keyboards/bastardkb/bastylmini/config.h index 9c7105cab3a2..b79bb2fc9029 100644 --- a/keyboards/bastardkb/bastylmini/config.h +++ b/keyboards/bastardkb/bastylmini/config.h @@ -25,7 +25,7 @@ #define MATRIX_ROWS 8 #define MATRIX_COLS 6 - +#define RGBLIGHT_LIMIT_VAL 180 #define MATRIX_ROW_PINS { B5, F7, F6, B6 } #define MATRIX_COL_PINS { B4, E6, C6, B1, B3, B2 } From 99c1a108e20e01c2c53aa5814d491ebd1e649d33 Mon Sep 17 00:00:00 2001 From: Quentin Date: Wed, 10 Feb 2021 11:57:35 +0100 Subject: [PATCH 15/19] Update keyboards/bastardkb/bastylmini/config.h Co-authored-by: NullSense --- keyboards/bastardkb/bastylmini/config.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/keyboards/bastardkb/bastylmini/config.h b/keyboards/bastardkb/bastylmini/config.h index b79bb2fc9029..d72feb504f57 100644 --- a/keyboards/bastardkb/bastylmini/config.h +++ b/keyboards/bastardkb/bastylmini/config.h @@ -42,5 +42,7 @@ #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE - +#define ONESHOT_TIMEOUT 900 +#define F_SCL 400000L +#define USB_POLLING_INTERVAL_MS 1 #define MASTER_RIGHT From 37d7e15c70ccf2ba075e202bfb9f72311abb9ef0 Mon Sep 17 00:00:00 2001 From: Quentin Date: Wed, 10 Feb 2021 11:57:58 +0100 Subject: [PATCH 16/19] Update keyboards/bastardkb/bastylmini/rules.mk Co-authored-by: NullSense --- keyboards/bastardkb/bastylmini/rules.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/bastardkb/bastylmini/rules.mk b/keyboards/bastardkb/bastylmini/rules.mk index 8a85c9a032e0..d7850de44e69 100644 --- a/keyboards/bastardkb/bastylmini/rules.mk +++ b/keyboards/bastardkb/bastylmini/rules.mk @@ -21,6 +21,8 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output SPLIT_KEYBOARD = yes +TAP_DANCE_ENABLE = yes +LTO_ENABLE = yes AUDIO_SUPPORTED = no RGB_MATRIX_SUPPORTED = no From 7964bcc9137755a6eee3a42fdeb3b7a8fe3e2795 Mon Sep 17 00:00:00 2001 From: Quentin Date: Wed, 10 Feb 2021 11:58:07 +0100 Subject: [PATCH 17/19] Update keyboards/bastardkb/bastylmini/rules.mk Co-authored-by: NullSense --- keyboards/bastardkb/bastylmini/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/bastardkb/bastylmini/rules.mk b/keyboards/bastardkb/bastylmini/rules.mk index d7850de44e69..cf55de8d24ac 100644 --- a/keyboards/bastardkb/bastylmini/rules.mk +++ b/keyboards/bastardkb/bastylmini/rules.mk @@ -15,7 +15,7 @@ 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 +NKRO_ENABLE = yes # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth From ab3ea24953ece144a0da64cc2fc080c9e38309fa Mon Sep 17 00:00:00 2001 From: Quentin Date: Thu, 11 Feb 2021 14:00:11 +0100 Subject: [PATCH 18/19] remove tap dance --- keyboards/bastardkb/bastylmini/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/bastardkb/bastylmini/rules.mk b/keyboards/bastardkb/bastylmini/rules.mk index cf55de8d24ac..76f9cf11a401 100644 --- a/keyboards/bastardkb/bastylmini/rules.mk +++ b/keyboards/bastardkb/bastylmini/rules.mk @@ -21,7 +21,7 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output SPLIT_KEYBOARD = yes -TAP_DANCE_ENABLE = yes +TAP_DANCE_ENABLE = no LTO_ENABLE = yes AUDIO_SUPPORTED = no From 35976e64c30e06af91043368375b8ed13eb85768 Mon Sep 17 00:00:00 2001 From: Quentin Date: Thu, 11 Feb 2021 14:00:24 +0100 Subject: [PATCH 19/19] remove oneshot timeout --- keyboards/bastardkb/bastylmini/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/bastardkb/bastylmini/config.h b/keyboards/bastardkb/bastylmini/config.h index d72feb504f57..b23f64a0956d 100644 --- a/keyboards/bastardkb/bastylmini/config.h +++ b/keyboards/bastardkb/bastylmini/config.h @@ -42,7 +42,6 @@ #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE -#define ONESHOT_TIMEOUT 900 #define F_SCL 400000L #define USB_POLLING_INTERVAL_MS 1 #define MASTER_RIGHT