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/bajjak | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/bajjak')
| -rw-r--r-- | keyboards/bajjak/bajjak.h | 10 | ||||
| -rw-r--r-- | keyboards/bajjak/config.h | 9 | ||||
| -rw-r--r-- | keyboards/bajjak/info.json | 3 | ||||
| -rw-r--r-- | keyboards/bajjak/rules.mk | 6 |
4 files changed, 3 insertions, 25 deletions
diff --git a/keyboards/bajjak/bajjak.h b/keyboards/bajjak/bajjak.h index 126df7932c..25c51273d1 100644 --- a/keyboards/bajjak/bajjak.h +++ b/keyboards/bajjak/bajjak.h @@ -117,16 +117,6 @@ inline void bajjak_led_all_set(uint8_t n) { bajjak_right_led_3_set(n); } -enum BAJJAK_ez_keycodes { - LED_LEVEL = SAFE_RANGE, - TOGGLE_LAYER_COLOR, - EZ_SAFE_RANGE, -}; - -#ifndef WEBUSB_ENABLE -# define WEBUSB_PAIR KC_NO -#endif - typedef union { uint32_t raw; struct { diff --git a/keyboards/bajjak/config.h b/keyboards/bajjak/config.h index d821bc0a8c..07f6dcaf50 100644 --- a/keyboards/bajjak/config.h +++ b/keyboards/bajjak/config.h @@ -21,7 +21,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 14 @@ -44,13 +43,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_WHEEL_DELAY 0 -#define DEBOUNCE 30 - #define TAPPING_TOGGLE 1 -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - #define TAPPING_TERM 200 #define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) @@ -65,9 +59,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \ ) -/* number of backlight levels */ -#define BACKLIGHT_LEVELS 3 - #ifndef LED_BRIGHTNESS_LO #define LED_BRIGHTNESS_LO 15 #endif diff --git a/keyboards/bajjak/info.json b/keyboards/bajjak/info.json index f3ebb4e159..ee519b01f6 100644 --- a/keyboards/bajjak/info.json +++ b/keyboards/bajjak/info.json @@ -2,11 +2,14 @@ "keyboard_name": "BAJJAK", "manufacturer": "garykong", "maintainer": "garykong", + "debounce": 30, "usb": { "vid": "0x1209", "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "halfkay", "layouts": { "LAYOUT_6x7": { "layout": [ diff --git a/keyboards/bajjak/rules.mk b/keyboards/bajjak/rules.mk index 6bbe7e3b28..9a93aea27f 100644 --- a/keyboards/bajjak/rules.mk +++ b/keyboards/bajjak/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = halfkay - # If you have Left LEDs (see # https://geekhack.org/index.php?topic=22780.msg873819#msg873819 for # details), include the following define: |