From f3fbc4df8b37b947b96a40a179812918b7dc75e3 Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Fri, 5 Nov 2021 18:32:24 -0400 Subject: [PATCH 01/10] Initial creation of BAMFK-1 --- keyboards/keebio/bamfk1/bamfk1.c | 4 + keyboards/keebio/bamfk1/bamfk1.h | 22 +++ keyboards/keebio/bamfk1/config.h | 138 ++++++++++++++++++ keyboards/keebio/bamfk1/info.json | 17 +++ .../keebio/bamfk1/keymaps/default/keymap.c | 22 +++ .../keebio/bamfk1/keymaps/default/readme.md | 1 + keyboards/keebio/bamfk1/readme.md | 27 ++++ keyboards/keebio/bamfk1/rules.mk | 21 +++ 8 files changed, 252 insertions(+) create mode 100644 keyboards/keebio/bamfk1/bamfk1.c create mode 100644 keyboards/keebio/bamfk1/bamfk1.h create mode 100644 keyboards/keebio/bamfk1/config.h create mode 100644 keyboards/keebio/bamfk1/info.json create mode 100644 keyboards/keebio/bamfk1/keymaps/default/keymap.c create mode 100644 keyboards/keebio/bamfk1/keymaps/default/readme.md create mode 100644 keyboards/keebio/bamfk1/readme.md create mode 100644 keyboards/keebio/bamfk1/rules.mk diff --git a/keyboards/keebio/bamfk1/bamfk1.c b/keyboards/keebio/bamfk1/bamfk1.c new file mode 100644 index 000000000000..eddd7e624efb --- /dev/null +++ b/keyboards/keebio/bamfk1/bamfk1.c @@ -0,0 +1,4 @@ +// Copyright 2021 Danny Nguyen (@nooges) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "bamfk1.h" diff --git a/keyboards/keebio/bamfk1/bamfk1.h b/keyboards/keebio/bamfk1/bamfk1.h new file mode 100644 index 000000000000..39a73d6e2e6f --- /dev/null +++ b/keyboards/keebio/bamfk1/bamfk1.h @@ -0,0 +1,22 @@ +// Copyright 2021 Danny Nguyen (@nooges) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "quantum.h" + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ +#define LAYOUT( \ + k00, k01, k02, \ + k10, k12 \ +) { \ + { k00, k01, k02 }, \ + { k10, KC_NO, k12 } \ +} diff --git a/keyboards/keebio/bamfk1/config.h b/keyboards/keebio/bamfk1/config.h new file mode 100644 index 000000000000..eda9d0d9dd7a --- /dev/null +++ b/keyboards/keebio/bamfk1/config.h @@ -0,0 +1,138 @@ +// Copyright 2021 Danny Nguyen (@nooges) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x0000 +#define DEVICE_VER 0x0001 +#define MANUFACTURER nooges +#define PRODUCT bamfk1 + +/* key matrix size */ +#define MATRIX_ROWS 2 +#define MATRIX_COLS 3 + +/* + * 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 { D0, D5 } +#define MATRIX_COL_PINS { F1, F0, B0 } +#define UNUSED_PINS + +/* COL2ROW, ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* + * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. + */ +#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 + +//#define LED_NUM_LOCK_PIN B0 +//#define LED_CAPS_LOCK_PIN B1 +//#define LED_SCROLL_LOCK_PIN B2 +//#define LED_COMPOSE_PIN B3 +//#define LED_KANA_PIN B4 + +//#define BACKLIGHT_PIN B7 +//#define BACKLIGHT_LEVELS 3 +//#define BACKLIGHT_BREATHING + +//#define RGB_DI_PIN E2 +//#ifdef RGB_DI_PIN +//# define RGBLED_NUM 16 +//# define RGBLIGHT_HUE_STEP 8 +//# define RGBLIGHT_SAT_STEP 8 +//# define RGBLIGHT_VAL_STEP 8 +//# define RGBLIGHT_LIMIT_VAL 255 /* 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 +/*== customize breathing effect ==*/ +/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ +//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 +/*==== use exp() and sin() ====*/ +//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 +//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 +//#endif + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. + * This is useful for the Windows task manager shortcut (ctrl+shift+esc). + */ +//#define GRAVE_ESC_CTRL_OVERRIDE + +/* + * Force NKRO + * + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the + * makefile for this to work.) + * + * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) + * until the next keyboard reset. + * + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * fully operational during normal computer usage. + * + * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) + * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by + * bootmagic, NKRO mode will always be enabled until it is toggled again during a + * power-up. + * + */ +//#define FORCE_NKRO + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT + +/* disable these deprecated features by default */ +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION + +/* Bootmagic Lite key configuration */ +//#define BOOTMAGIC_LITE_ROW 0 +//#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/keebio/bamfk1/info.json b/keyboards/keebio/bamfk1/info.json new file mode 100644 index 000000000000..7bd4beb08519 --- /dev/null +++ b/keyboards/keebio/bamfk1/info.json @@ -0,0 +1,17 @@ +{ + "keyboard_name": "bamfk1", + "url": "", + "maintainer": "nooges", + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "k00", "x": 0, "y": 0}, + {"label": "k01", "x": 1, "y": 0}, + {"label": "k02", "x": 2, "y": 0}, + + {"label": "k10", "x": 0, "y": 1, "w": 1.5}, + {"label": "k12", "x": 1.5, "y": 1, "w": 1.5} + ] + } + } +} diff --git a/keyboards/keebio/bamfk1/keymaps/default/keymap.c b/keyboards/keebio/bamfk1/keymaps/default/keymap.c new file mode 100644 index 000000000000..30ff161fccaa --- /dev/null +++ b/keyboards/keebio/bamfk1/keymaps/default/keymap.c @@ -0,0 +1,22 @@ +// Copyright 2021 Danny Nguyen (@nooges) +// SPDX-License-Identifier: GPL-2.0-or-later + +#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 */ + [_BASE] = LAYOUT( + KC_A, KC_1, MO(_FN), + KC_TAB, KC_SPC + ), + [_FN] = LAYOUT( + _______, _______, _______, + RESET, XXXXXXX + ) +}; diff --git a/keyboards/keebio/bamfk1/keymaps/default/readme.md b/keyboards/keebio/bamfk1/keymaps/default/readme.md new file mode 100644 index 000000000000..d201a5a8c9dc --- /dev/null +++ b/keyboards/keebio/bamfk1/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for bamfk1 diff --git a/keyboards/keebio/bamfk1/readme.md b/keyboards/keebio/bamfk1/readme.md new file mode 100644 index 000000000000..ceb808b89328 --- /dev/null +++ b/keyboards/keebio/bamfk1/readme.md @@ -0,0 +1,27 @@ +# bamfk1 + +![bamfk1](imgur.com image replace me!) + +*A short description of the keyboard/project* + +* Keyboard Maintainer: [Danny Nguyen](https://github.com/nooges) +* Hardware Supported: *The PCBs, controllers supported* +* Hardware Availability: *Links to where you can find this hardware* + +Make example for this keyboard (after setting up your build environment): + + make bamfk1:default + +Flashing example for this keyboard: + + make bamfk1:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `RESET` if it is available diff --git a/keyboards/keebio/bamfk1/rules.mk b/keyboards/keebio/bamfk1/rules.mk new file mode 100644 index 000000000000..9906266f4822 --- /dev/null +++ b/keyboards/keebio/bamfk1/rules.mk @@ -0,0 +1,21 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# 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 = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output From d47de36fb92209488a3a360c1f9c509720d95551 Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Sat, 6 Nov 2021 14:25:04 -0400 Subject: [PATCH 02/10] Initial configuration of BAMFK-1 --- keyboards/keebio/bamfk1/bamfk1.h | 8 +- keyboards/keebio/bamfk1/config.h | 83 ++++++------------- keyboards/keebio/bamfk1/info.json | 3 + .../keebio/bamfk1/keymaps/default/keymap.c | 45 ++++++++-- keyboards/keebio/bamfk1/rules.mk | 7 +- 5 files changed, 71 insertions(+), 75 deletions(-) diff --git a/keyboards/keebio/bamfk1/bamfk1.h b/keyboards/keebio/bamfk1/bamfk1.h index 39a73d6e2e6f..3aa64c9db562 100644 --- a/keyboards/keebio/bamfk1/bamfk1.h +++ b/keyboards/keebio/bamfk1/bamfk1.h @@ -14,9 +14,9 @@ * represents the switch matrix. */ #define LAYOUT( \ - k00, k01, k02, \ - k10, k12 \ + k00, e01, e02, \ + e01a, e01b, e02a, e02b \ ) { \ - { k00, k01, k02 }, \ - { k10, KC_NO, k12 } \ + { k00, e01, e02, KC_NO }, \ + { e01a, e01b, e02a, e02b } \ } diff --git a/keyboards/keebio/bamfk1/config.h b/keyboards/keebio/bamfk1/config.h index eda9d0d9dd7a..daea99504ea8 100644 --- a/keyboards/keebio/bamfk1/config.h +++ b/keyboards/keebio/bamfk1/config.h @@ -6,75 +6,40 @@ #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 +#define VENDOR_ID 0xCB10 +#define PRODUCT_ID 0x1111 #define DEVICE_VER 0x0001 -#define MANUFACTURER nooges -#define PRODUCT bamfk1 +#define MANUFACTURER Keebio +#define PRODUCT BAMFK-1 /* key matrix size */ #define MATRIX_ROWS 2 -#define MATRIX_COLS 3 +#define MATRIX_COLS 4 /* * 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 { D0, D5 } -#define MATRIX_COL_PINS { F1, F0, B0 } -#define UNUSED_PINS - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW -/* - * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. - */ -#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 - -//#define LED_NUM_LOCK_PIN B0 -//#define LED_CAPS_LOCK_PIN B1 -//#define LED_SCROLL_LOCK_PIN B2 -//#define LED_COMPOSE_PIN B3 -//#define LED_KANA_PIN B4 - -//#define BACKLIGHT_PIN B7 -//#define BACKLIGHT_LEVELS 3 -//#define BACKLIGHT_BREATHING - -//#define RGB_DI_PIN E2 -//#ifdef RGB_DI_PIN -//# define RGBLED_NUM 16 -//# define RGBLIGHT_HUE_STEP 8 -//# define RGBLIGHT_SAT_STEP 8 -//# define RGBLIGHT_VAL_STEP 8 -//# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ -//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +#define DIRECT_PINS { \ + { E6, D6, B6, NO_PIN }, \ + { NO_PIN, NO_PIN, NO_PIN, NO_PIN } \ +} +#define AUDIO_PIN C6 +#define ENCODERS_PAD_A { B5, D4 } +#define ENCODERS_PAD_B { C7, D7 } + +#define RGB_DI_PIN D3 +#ifdef RGB_DI_PIN +# define RGBLED_NUM 16 +# define RGBLIGHT_HUE_STEP 8 +# define RGBLIGHT_SAT_STEP 8 +# define RGBLIGHT_VAL_STEP 8 +# define RGBLIGHT_LIMIT_VAL 255 /* 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 -/*== customize breathing effect ==*/ -/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -/*==== use exp() and sin() ====*/ -//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 -//#endif +# define RGBLIGHT_ANIMATIONS +#endif +#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 diff --git a/keyboards/keebio/bamfk1/info.json b/keyboards/keebio/bamfk1/info.json index 7bd4beb08519..896aa20a7afa 100644 --- a/keyboards/keebio/bamfk1/info.json +++ b/keyboards/keebio/bamfk1/info.json @@ -11,6 +11,9 @@ {"label": "k10", "x": 0, "y": 1, "w": 1.5}, {"label": "k12", "x": 1.5, "y": 1, "w": 1.5} + + {"label": "k10", "x": 0, "y": 1, "w": 1.5}, + {"label": "k12", "x": 1.5, "y": 1, "w": 1.5} ] } } diff --git a/keyboards/keebio/bamfk1/keymaps/default/keymap.c b/keyboards/keebio/bamfk1/keymaps/default/keymap.c index 30ff161fccaa..2ff37f5c544a 100644 --- a/keyboards/keebio/bamfk1/keymaps/default/keymap.c +++ b/keyboards/keebio/bamfk1/keymaps/default/keymap.c @@ -5,18 +5,45 @@ // Defines names for use in layer keycodes and the keymap enum layer_names { - _BASE, - _FN + _MAIN, + _FN1, + _FN2, + _FN3 }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Base */ - [_BASE] = LAYOUT( - KC_A, KC_1, MO(_FN), - KC_TAB, KC_SPC + [_MAIN] = LAYOUT( + KC_A, // Big Switch + FN_MO13, KC_MUTE, // Encoder presses + KC_UP, KC_DOWN, // Left encoder turns + KC_VOLU, KC_VOLD // Right encoder turns ), - [_FN] = LAYOUT( - _______, _______, _______, - RESET, XXXXXXX + [_FN1] = LAYOUT( + KC_B, // Big Switch + _______, KC_C, // Encoder presses + KC_UP, KC_DOWN, // Left encoder turns + KC_VOLU, KC_VOLD // Right encoder turns + ), + [_FN2] = LAYOUT( + KC_B, // Big Switch + _______, KC_C, // Encoder presses + KC_UP, KC_DOWN, // Left encoder turns + KC_VOLU, KC_VOLD // Right encoder turns + ), + [_FN3] = LAYOUT( + KC_B, // Big Switch + _______, KC_C, // Encoder presses + KC_UP, KC_DOWN, // Left encoder turns + KC_VOLU, KC_VOLD // Right encoder turns ) }; + +bool encoder_update_user(uint8_t index, bool clockwise) { + uint8_t layer = get_highest_layer(layer_state); + if (clockwise) { + tap_code16(dynamic_keymap_get_keycode(layer, 1, 2 * index + 1)); + } else { + tap_code16(dynamic_keymap_get_keycode(layer, 1, 2 * index)); + } + return true; +} diff --git a/keyboards/keebio/bamfk1/rules.mk b/keyboards/keebio/bamfk1/rules.mk index 9906266f4822..0f569ca706b5 100644 --- a/keyboards/keebio/bamfk1/rules.mk +++ b/keyboards/keebio/bamfk1/rules.mk @@ -10,12 +10,13 @@ BOOTLOADER = atmel-dfu BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug +CONSOLE_ENABLE = yes # 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +ENCODER_ENABLE = yes From bd1656b1cfd1dfadfee11b6264aecb671a0e249c Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Thu, 9 Dec 2021 12:32:59 -0500 Subject: [PATCH 03/10] Update rules --- keyboards/keebio/bamfk1/keymaps/default/rules.mk | 2 ++ keyboards/keebio/bamfk1/rules.mk | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 keyboards/keebio/bamfk1/keymaps/default/rules.mk diff --git a/keyboards/keebio/bamfk1/keymaps/default/rules.mk b/keyboards/keebio/bamfk1/keymaps/default/rules.mk new file mode 100644 index 000000000000..36b7ba9cbc98 --- /dev/null +++ b/keyboards/keebio/bamfk1/keymaps/default/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/keebio/bamfk1/rules.mk b/keyboards/keebio/bamfk1/rules.mk index 0f569ca706b5..1bb75c0399b1 100644 --- a/keyboards/keebio/bamfk1/rules.mk +++ b/keyboards/keebio/bamfk1/rules.mk @@ -8,7 +8,7 @@ BOOTLOADER = atmel-dfu # change yes to no to disable # BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys +MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = yes # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration @@ -18,5 +18,5 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend NKRO_ENABLE = no # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output +AUDIO_ENABLE = yes # Audio output ENCODER_ENABLE = yes From 6bc070c24a71c96f96d5c67750f5791126eb98b7 Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Sun, 19 Dec 2021 00:07:38 -0500 Subject: [PATCH 04/10] Adjust keymap --- keyboards/keebio/bamfk1/config.h | 9 ++-- .../keebio/bamfk1/keymaps/default/keymap.c | 33 ++++++------- .../keebio/bamfk1/keymaps/default/readme.md | 1 - .../keebio/bamfk1/keymaps/default/rules.mk | 1 - keyboards/keebio/bamfk1/keymaps/via/keymap.c | 49 +++++++++++++++++++ keyboards/keebio/bamfk1/keymaps/via/rules.mk | 2 + 6 files changed, 72 insertions(+), 23 deletions(-) delete mode 100644 keyboards/keebio/bamfk1/keymaps/default/readme.md create mode 100644 keyboards/keebio/bamfk1/keymaps/via/keymap.c create mode 100644 keyboards/keebio/bamfk1/keymaps/via/rules.mk diff --git a/keyboards/keebio/bamfk1/config.h b/keyboards/keebio/bamfk1/config.h index daea99504ea8..093dffce38a4 100644 --- a/keyboards/keebio/bamfk1/config.h +++ b/keyboards/keebio/bamfk1/config.h @@ -21,12 +21,15 @@ */ #define DIRECT_PINS { \ - { E6, D6, B6, NO_PIN }, \ + { E6, B6, D6, NO_PIN }, \ { NO_PIN, NO_PIN, NO_PIN, NO_PIN } \ } #define AUDIO_PIN C6 -#define ENCODERS_PAD_A { B5, D4 } -#define ENCODERS_PAD_B { C7, D7 } +#ifdef AUDIO_ENABLE +# define STARTUP_SONG SONG(STARTUP_SOUND) +#endif +#define ENCODERS_PAD_A { C7, D7 } +#define ENCODERS_PAD_B { B5, D4 } #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN diff --git a/keyboards/keebio/bamfk1/keymaps/default/keymap.c b/keyboards/keebio/bamfk1/keymaps/default/keymap.c index 2ff37f5c544a..01ba8cc55c53 100644 --- a/keyboards/keebio/bamfk1/keymaps/default/keymap.c +++ b/keyboards/keebio/bamfk1/keymaps/default/keymap.c @@ -14,36 +14,33 @@ enum layer_names { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_MAIN] = LAYOUT( KC_A, // Big Switch - FN_MO13, KC_MUTE, // Encoder presses - KC_UP, KC_DOWN, // Left encoder turns - KC_VOLU, KC_VOLD // Right encoder turns + MO(1), KC_MUTE, // Encoder presses + KC_DOWN, KC_UP, // Left encoder turns + KC_VOLD, KC_VOLU // Right encoder turns ), [_FN1] = LAYOUT( KC_B, // Big Switch - _______, KC_C, // Encoder presses - KC_UP, KC_DOWN, // Left encoder turns + _______, KC_C, // Encoder presses + KC_PGDN, KC_PGUP, // Left encoder turns KC_VOLU, KC_VOLD // Right encoder turns ), [_FN2] = LAYOUT( - KC_B, // Big Switch - _______, KC_C, // Encoder presses - KC_UP, KC_DOWN, // Left encoder turns - KC_VOLU, KC_VOLD // Right encoder turns + _______, // Big Switch + _______, _______, // Encoder presses + _______, _______, // Left encoder turns + _______, _______ // Right encoder turns ), [_FN3] = LAYOUT( - KC_B, // Big Switch - _______, KC_C, // Encoder presses - KC_UP, KC_DOWN, // Left encoder turns - KC_VOLU, KC_VOLD // Right encoder turns + _______, // Big Switch + _______, _______, // Encoder presses + _______, _______, // Left encoder turns + _______, _______ // Right encoder turns ) }; bool encoder_update_user(uint8_t index, bool clockwise) { uint8_t layer = get_highest_layer(layer_state); - if (clockwise) { - tap_code16(dynamic_keymap_get_keycode(layer, 1, 2 * index + 1)); - } else { - tap_code16(dynamic_keymap_get_keycode(layer, 1, 2 * index)); - } + uint16_t code = pgm_read_word(&(keymaps[layer][1][2 * index + clockwise])); + tap_code16(code); return true; } diff --git a/keyboards/keebio/bamfk1/keymaps/default/readme.md b/keyboards/keebio/bamfk1/keymaps/default/readme.md deleted file mode 100644 index d201a5a8c9dc..000000000000 --- a/keyboards/keebio/bamfk1/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for bamfk1 diff --git a/keyboards/keebio/bamfk1/keymaps/default/rules.mk b/keyboards/keebio/bamfk1/keymaps/default/rules.mk index 36b7ba9cbc98..4da205a168c7 100644 --- a/keyboards/keebio/bamfk1/keymaps/default/rules.mk +++ b/keyboards/keebio/bamfk1/keymaps/default/rules.mk @@ -1,2 +1 @@ -VIA_ENABLE = yes LTO_ENABLE = yes diff --git a/keyboards/keebio/bamfk1/keymaps/via/keymap.c b/keyboards/keebio/bamfk1/keymaps/via/keymap.c new file mode 100644 index 000000000000..869f4132e8df --- /dev/null +++ b/keyboards/keebio/bamfk1/keymaps/via/keymap.c @@ -0,0 +1,49 @@ +// Copyright 2021 Danny Nguyen (@nooges) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +// Defines names for use in layer keycodes and the keymap +enum layer_names { + _MAIN, + _FN1, + _FN2, + _FN3 +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_MAIN] = LAYOUT( + RGB_MOD, // Big Switch + FN_MO13, KC_MUTE, // Encoder presses + KC_DOWN, KC_UP, // Left encoder turns + KC_VOLD, KC_VOLU // Right encoder turns + ), + [_FN1] = LAYOUT( + KC_B, // Big Switch + _______, KC_C, // Encoder presses + KC_PGDN, KC_PGUP, // Left encoder turns + KC_VOLU, KC_VOLD // Right encoder turns + ), + [_FN2] = LAYOUT( + _______, // Big Switch + _______, _______, // Encoder presses + _______, _______, // Left encoder turns + _______, _______ // Right encoder turns + ), + [_FN3] = LAYOUT( + _______, // Big Switch + _______, _______, // Encoder presses + _______, _______, // Left encoder turns + _______, _______ // Right encoder turns + ) +}; + +bool encoder_update_user(uint8_t index, bool clockwise) { + uint8_t layer = get_highest_layer(layer_state); + if (clockwise) { + tap_code16(dynamic_keymap_get_keycode(layer, 1, 2 * index + 1)); + } else { + tap_code16(dynamic_keymap_get_keycode(layer, 1, 2 * index)); + } + return true; +} diff --git a/keyboards/keebio/bamfk1/keymaps/via/rules.mk b/keyboards/keebio/bamfk1/keymaps/via/rules.mk new file mode 100644 index 000000000000..36b7ba9cbc98 --- /dev/null +++ b/keyboards/keebio/bamfk1/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes From 8a4a4a0c87afd846d4fb5e9cc987d04dabe42efe Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Sun, 20 Feb 2022 16:17:29 -0500 Subject: [PATCH 05/10] Update encoder reading from keymap --- keyboards/keebio/bamfk1/bamfk1.c | 8 ++++++++ keyboards/keebio/bamfk1/bamfk1.h | 8 -------- keyboards/keebio/bamfk1/keymaps/default/keymap.c | 7 ------- keyboards/keebio/bamfk1/keymaps/via/keymap.c | 2 +- 4 files changed, 9 insertions(+), 16 deletions(-) diff --git a/keyboards/keebio/bamfk1/bamfk1.c b/keyboards/keebio/bamfk1/bamfk1.c index eddd7e624efb..0caaefab97b0 100644 --- a/keyboards/keebio/bamfk1/bamfk1.c +++ b/keyboards/keebio/bamfk1/bamfk1.c @@ -2,3 +2,11 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "bamfk1.h" + +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { return false; } + uint8_t layer = get_highest_layer(layer_state); + uint16_t code = pgm_read_word(&(keymaps[layer][1][2 * index + clockwise])); + tap_code16(code); + return false; +} diff --git a/keyboards/keebio/bamfk1/bamfk1.h b/keyboards/keebio/bamfk1/bamfk1.h index 3aa64c9db562..be1fd0080884 100644 --- a/keyboards/keebio/bamfk1/bamfk1.h +++ b/keyboards/keebio/bamfk1/bamfk1.h @@ -5,14 +5,6 @@ #include "quantum.h" -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ #define LAYOUT( \ k00, e01, e02, \ e01a, e01b, e02a, e02b \ diff --git a/keyboards/keebio/bamfk1/keymaps/default/keymap.c b/keyboards/keebio/bamfk1/keymaps/default/keymap.c index 01ba8cc55c53..aa0780eafc1f 100644 --- a/keyboards/keebio/bamfk1/keymaps/default/keymap.c +++ b/keyboards/keebio/bamfk1/keymaps/default/keymap.c @@ -37,10 +37,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______ // Right encoder turns ) }; - -bool encoder_update_user(uint8_t index, bool clockwise) { - uint8_t layer = get_highest_layer(layer_state); - uint16_t code = pgm_read_word(&(keymaps[layer][1][2 * index + clockwise])); - tap_code16(code); - return true; -} diff --git a/keyboards/keebio/bamfk1/keymaps/via/keymap.c b/keyboards/keebio/bamfk1/keymaps/via/keymap.c index 869f4132e8df..bc2422328cb0 100644 --- a/keyboards/keebio/bamfk1/keymaps/via/keymap.c +++ b/keyboards/keebio/bamfk1/keymaps/via/keymap.c @@ -45,5 +45,5 @@ bool encoder_update_user(uint8_t index, bool clockwise) { } else { tap_code16(dynamic_keymap_get_keycode(layer, 1, 2 * index)); } - return true; + return false; } From bb6c7fa747c38ede48442aaedc9d2f908a3a33a1 Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Sun, 20 Feb 2022 16:17:55 -0500 Subject: [PATCH 06/10] Update info for configurator and README --- keyboards/keebio/bamfk1/info.json | 19 +++++++++---------- keyboards/keebio/bamfk1/readme.md | 16 ++++++++-------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/keyboards/keebio/bamfk1/info.json b/keyboards/keebio/bamfk1/info.json index 896aa20a7afa..817eb98af017 100644 --- a/keyboards/keebio/bamfk1/info.json +++ b/keyboards/keebio/bamfk1/info.json @@ -1,19 +1,18 @@ { - "keyboard_name": "bamfk1", - "url": "", + "keyboard_name": "BAMFK-1", + "url": "https://keeb.io", "maintainer": "nooges", "layouts": { "LAYOUT": { "layout": [ - {"label": "k00", "x": 0, "y": 0}, - {"label": "k01", "x": 1, "y": 0}, - {"label": "k02", "x": 2, "y": 0}, + {"label": "k00", "x": 1.5, "y": 0, "h":2, "w": 2}, + {"label": "k01", "x": 0.5, "y": 2.25}, + {"label": "k02", "x": 3.5, "y": 2.25}, - {"label": "k10", "x": 0, "y": 1, "w": 1.5}, - {"label": "k12", "x": 1.5, "y": 1, "w": 1.5} - - {"label": "k10", "x": 0, "y": 1, "w": 1.5}, - {"label": "k12", "x": 1.5, "y": 1, "w": 1.5} + {"label": "k10", "x": 0, "y": 3.5}, + {"label": "k11", "x": 1, "y": 3.5}, + {"label": "k12", "x": 3, "y": 3.5}, + {"label": "k13", "x": 4, "y": 3.5} ] } } diff --git a/keyboards/keebio/bamfk1/readme.md b/keyboards/keebio/bamfk1/readme.md index ceb808b89328..a90ee8ac8cd1 100644 --- a/keyboards/keebio/bamfk1/readme.md +++ b/keyboards/keebio/bamfk1/readme.md @@ -1,20 +1,20 @@ -# bamfk1 +# BAMFK-1 -![bamfk1](imgur.com image replace me!) +![bamfk1](https://cdn.shopify.com/s/files/1/1851/5125/products/bamfk-1-back_1100x.png?v=1635304218) -*A short description of the keyboard/project* +PCB for the Big Switch with support for horizontal rotary encoders. -* Keyboard Maintainer: [Danny Nguyen](https://github.com/nooges) -* Hardware Supported: *The PCBs, controllers supported* -* Hardware Availability: *Links to where you can find this hardware* +* Keyboard Maintainer: [Keebio](https://github.com/nooges) +* Hardware Supported: BAMFK-1 PCB +* Hardware Availability: [Keebio](https://keeb.io/) Make example for this keyboard (after setting up your build environment): - make bamfk1:default + make keebio/bamfk1:default Flashing example for this keyboard: - make bamfk1:default:flash + make keebio/bamfk1: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). From 96e0e29d8449b83147622eecdaad4738cba9307b Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Tue, 22 Feb 2022 18:52:36 -0500 Subject: [PATCH 07/10] Change way of using keymap to control encoders --- keyboards/keebio/bamfk1/bamfk1.c | 8 --- keyboards/keebio/bamfk1/config.h | 4 ++ keyboards/keebio/bamfk1/keymaps/via/keymap.c | 10 --- keyboards/keebio/bamfk1/rules.mk | 2 + keyboards/keebio/encoder_actions.c | 68 ++++++++++++++++++++ keyboards/keebio/encoder_actions.h | 21 ++++++ 6 files changed, 95 insertions(+), 18 deletions(-) create mode 100644 keyboards/keebio/encoder_actions.c create mode 100644 keyboards/keebio/encoder_actions.h diff --git a/keyboards/keebio/bamfk1/bamfk1.c b/keyboards/keebio/bamfk1/bamfk1.c index 0caaefab97b0..eddd7e624efb 100644 --- a/keyboards/keebio/bamfk1/bamfk1.c +++ b/keyboards/keebio/bamfk1/bamfk1.c @@ -2,11 +2,3 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "bamfk1.h" - -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { return false; } - uint8_t layer = get_highest_layer(layer_state); - uint16_t code = pgm_read_word(&(keymaps[layer][1][2 * index + clockwise])); - tap_code16(code); - return false; -} diff --git a/keyboards/keebio/bamfk1/config.h b/keyboards/keebio/bamfk1/config.h index 093dffce38a4..7d05d0827831 100644 --- a/keyboards/keebio/bamfk1/config.h +++ b/keyboards/keebio/bamfk1/config.h @@ -28,8 +28,12 @@ #ifdef AUDIO_ENABLE # define STARTUP_SONG SONG(STARTUP_SOUND) #endif + #define ENCODERS_PAD_A { C7, D7 } #define ENCODERS_PAD_B { B5, D4 } +#define ENCODERS 2 +#define ENCODERS_CW_KEY { { 1, 1 }, { 3, 1 } } +#define ENCODERS_CCW_KEY { { 0, 1 }, { 2, 1 } } #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN diff --git a/keyboards/keebio/bamfk1/keymaps/via/keymap.c b/keyboards/keebio/bamfk1/keymaps/via/keymap.c index bc2422328cb0..e7cde2d7ee55 100644 --- a/keyboards/keebio/bamfk1/keymaps/via/keymap.c +++ b/keyboards/keebio/bamfk1/keymaps/via/keymap.c @@ -37,13 +37,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______ // Right encoder turns ) }; - -bool encoder_update_user(uint8_t index, bool clockwise) { - uint8_t layer = get_highest_layer(layer_state); - if (clockwise) { - tap_code16(dynamic_keymap_get_keycode(layer, 1, 2 * index + 1)); - } else { - tap_code16(dynamic_keymap_get_keycode(layer, 1, 2 * index)); - } - return false; -} diff --git a/keyboards/keebio/bamfk1/rules.mk b/keyboards/keebio/bamfk1/rules.mk index 1bb75c0399b1..53eb2bf4eb75 100644 --- a/keyboards/keebio/bamfk1/rules.mk +++ b/keyboards/keebio/bamfk1/rules.mk @@ -20,3 +20,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = yes # Audio output ENCODER_ENABLE = yes + +SRC += encoder_actions.c diff --git a/keyboards/keebio/encoder_actions.c b/keyboards/keebio/encoder_actions.c new file mode 100644 index 000000000000..c4e49813f44b --- /dev/null +++ b/keyboards/keebio/encoder_actions.c @@ -0,0 +1,68 @@ +/* Copyright 2020 Neil Brian Ramirez + * Copyright 2021 drashna jael're (@drashna) + * + * 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 3 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 "encoder_actions.h" + +#if defined(ENCODER_ENABLE) + +# ifdef ENCODERS +static uint8_t encoder_state[ENCODERS] = {0}; +static keypos_t encoder_cw[ENCODERS] = ENCODERS_CW_KEY; +static keypos_t encoder_ccw[ENCODERS] = ENCODERS_CCW_KEY; +# endif + +void encoder_action_unregister(void) { +# ifdef ENCODERS + for (int index = 0; index < ENCODERS; ++index) { + if (encoder_state[index]) { + keyevent_t encoder_event = (keyevent_t) { + .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index], + .pressed = false, + .time = (timer_read() | 1) + }; + encoder_state[index] = 0; + action_exec(encoder_event); + } + } +# endif +} + +void encoder_action_register(uint8_t index, bool clockwise) { +# ifdef ENCODERS + keyevent_t encoder_event = (keyevent_t) { + .key = clockwise ? encoder_cw[index] : encoder_ccw[index], + .pressed = true, + .time = (timer_read() | 1) + }; + encoder_state[index] = (clockwise ^ 1) | (clockwise << 1); + action_exec(encoder_event); +# endif +} + +void matrix_scan_kb(void) { + encoder_action_unregister(); + matrix_scan_user(); +} + +bool encoder_update_kb(uint8_t index, bool clockwise) { + encoder_action_register(index, clockwise); + // don't return user actions, because they are in the keymap + // encoder_update_user(index, clockwise); + return true; +}; + +#endif diff --git a/keyboards/keebio/encoder_actions.h b/keyboards/keebio/encoder_actions.h new file mode 100644 index 000000000000..2484af52ae18 --- /dev/null +++ b/keyboards/keebio/encoder_actions.h @@ -0,0 +1,21 @@ +/* Copyright 2020 Neil Brian Ramirez + * + * 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 3 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 "quantum.h" + +void encoder_action_unregister(void); + +void encoder_action_register(uint8_t index, bool clockwise); From 1e9e6a6ef2b9be644a9e5cec7a7c50a757503e0d Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Tue, 22 Feb 2022 18:55:32 -0500 Subject: [PATCH 08/10] Explicitly define enabled animations --- keyboards/keebio/bamfk1/config.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/keyboards/keebio/bamfk1/config.h b/keyboards/keebio/bamfk1/config.h index 7d05d0827831..af9d48fa7866 100644 --- a/keyboards/keebio/bamfk1/config.h +++ b/keyboards/keebio/bamfk1/config.h @@ -43,8 +43,15 @@ # define RGBLIGHT_VAL_STEP 8 # define RGBLIGHT_LIMIT_VAL 255 /* 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 +# 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 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) From e7a260b8d2c5e616f5ed1b77a6bbbc7f8ffaf2b2 Mon Sep 17 00:00:00 2001 From: Danny Date: Fri, 11 Mar 2022 10:50:01 -0500 Subject: [PATCH 09/10] Update keyboards/keebio/bamfk1/config.h Co-authored-by: Ryan --- keyboards/keebio/bamfk1/config.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/keebio/bamfk1/config.h b/keyboards/keebio/bamfk1/config.h index af9d48fa7866..5cd86a9d163f 100644 --- a/keyboards/keebio/bamfk1/config.h +++ b/keyboards/keebio/bamfk1/config.h @@ -108,10 +108,6 @@ //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -/* disable these deprecated features by default */ -#define NO_ACTION_MACRO -#define NO_ACTION_FUNCTION - /* Bootmagic Lite key configuration */ //#define BOOTMAGIC_LITE_ROW 0 //#define BOOTMAGIC_LITE_COLUMN 0 From 05af7ea81f57430392215e35aaefc4bdd17b2d13 Mon Sep 17 00:00:00 2001 From: Danny Date: Fri, 11 Mar 2022 10:50:08 -0500 Subject: [PATCH 10/10] Update keyboards/keebio/bamfk1/rules.mk Co-authored-by: Ryan --- keyboards/keebio/bamfk1/rules.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/keyboards/keebio/bamfk1/rules.mk b/keyboards/keebio/bamfk1/rules.mk index 53eb2bf4eb75..abcf10c8716a 100644 --- a/keyboards/keebio/bamfk1/rules.mk +++ b/keyboards/keebio/bamfk1/rules.mk @@ -12,10 +12,7 @@ MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = yes # 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 +NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = yes # Audio output