diff options
author | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
---|---|---|
committer | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
commit | bacec14073b2e897d5a52caf12de5a6a1f7b4078 (patch) | |
tree | d4e3e57aac1a829a191831efd2e62c8a43217885 /keyboards/baguette | |
parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/baguette')
-rw-r--r-- | keyboards/baguette/baguette.c | 4 | ||||
-rw-r--r-- | keyboards/baguette/config.h | 51 | ||||
-rw-r--r-- | keyboards/baguette/info.json | 8 | ||||
-rw-r--r-- | keyboards/baguette/rules.mk | 6 |
4 files changed, 11 insertions, 58 deletions
diff --git a/keyboards/baguette/baguette.c b/keyboards/baguette/baguette.c index 99305cf2de..42c8435b66 100644 --- a/keyboards/baguette/baguette.c +++ b/keyboards/baguette/baguette.c @@ -15,6 +15,10 @@ */ #include "baguette.h" +#ifndef DEBOUNCE +# define DEBOUNCE 5 +#endif + void bootmagic_lite(void) { // The lite version of TMK's bootmagic made by Wilba. diff --git a/keyboards/baguette/config.h b/keyboards/baguette/config.h index d34356c467..c4bc59fe7c 100644 --- a/keyboards/baguette/config.h +++ b/keyboards/baguette/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 16 /* * Keyboard Matrix Assignments @@ -39,57 +34,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 5 - -// #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 -// #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 - -/* number of backlight levels */ - /* 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 userful 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. diff --git a/keyboards/baguette/info.json b/keyboards/baguette/info.json index 3fc5221f71..2714366c0e 100644 --- a/keyboards/baguette/info.json +++ b/keyboards/baguette/info.json @@ -3,12 +3,18 @@ "manufacturer": "Yiancar", "url": "", "maintainer": "qmk", - "bootloader": "atmel-dfu", "usb": { "vid": "0xFEED", "pid": "0x5050", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5, + "breathing": true + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/baguette/rules.mk b/keyboards/baguette/rules.mk index 6c3cc413f9..a949e5d4d9 100644 --- a/keyboards/baguette/rules.mk +++ b/keyboards/baguette/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # |