summaryrefslogtreecommitdiffstats
path: root/keyboards
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2023-05-31 11:44:06 -0700
committerGitHub <noreply@github.com>2023-05-31 11:44:06 -0700
commit3a3e5abac992712a8bb4e9b61430f5fc62dc6043 (patch)
tree832d14c0ca63e13ca1b97e2cbfe94d75d6bb89c7 /keyboards
parent1411c79aefc989f5fae138b795f53f3b10863ec9 (diff)
[Keymap] Drashna Keymap updates for 0.21.0 (#21073)
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/adafruit/macropad/keymaps/drashna/config.h7
-rw-r--r--keyboards/adafruit/macropad/keymaps/drashna/keymap.c100
-rw-r--r--keyboards/adafruit/macropad/keymaps/drashna/rules.mk3
-rw-r--r--keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c26
-rw-r--r--keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk2
-rw-r--r--keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h2
-rw-r--r--keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c24
-rw-r--r--keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk11
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/config.h2
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c10
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/rules.mk1
-rw-r--r--keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/rules.mk1
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h4
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/f411/post_config.h20
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h16
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c81
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk6
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h2
-rw-r--r--keyboards/handwired/tractyl_manuform/post_config.h16
-rwxr-xr-xkeyboards/maple_computing/c39/keymaps/drashna/keymap.c83
-rwxr-xr-xkeyboards/maple_computing/c39/keymaps/drashna/readme.md3
-rw-r--r--keyboards/maple_computing/c39/keymaps/drashna/rules.mk19
-rw-r--r--keyboards/moonlander/keymaps/drashna/keymap.c2
-rw-r--r--keyboards/moonlander/keymaps/drashna/rules.mk2
-rw-r--r--keyboards/splitkb/kyria/keymaps/drashna/chconf.h (renamed from keyboards/maple_computing/c39/keymaps/drashna/config.h)22
-rw-r--r--keyboards/splitkb/kyria/keymaps/drashna/config.h43
-rw-r--r--keyboards/splitkb/kyria/keymaps/drashna/halconf.h24
-rw-r--r--keyboards/splitkb/kyria/keymaps/drashna/keymap.c60
-rw-r--r--keyboards/splitkb/kyria/keymaps/drashna/mcuconf.h35
-rw-r--r--keyboards/splitkb/kyria/keymaps/drashna/rules.mk13
-rw-r--r--keyboards/splitkb/zima/keymaps/drashna/keymap.c10
-rw-r--r--keyboards/splitkb/zima/keymaps/drashna/readme.md7
-rw-r--r--keyboards/work_louder/work_board/keymaps/drashna/keymap.c23
-rw-r--r--keyboards/work_louder/work_board/keymaps/drashna/rules.mk8
34 files changed, 334 insertions, 354 deletions
diff --git a/keyboards/adafruit/macropad/keymaps/drashna/config.h b/keyboards/adafruit/macropad/keymaps/drashna/config.h
new file mode 100644
index 0000000000..4d85f039be
--- /dev/null
+++ b/keyboards/adafruit/macropad/keymaps/drashna/config.h
@@ -0,0 +1,7 @@
+// Copyright 2023 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
+#define TAPPING_TERM 499
diff --git a/keyboards/adafruit/macropad/keymaps/drashna/keymap.c b/keyboards/adafruit/macropad/keymaps/drashna/keymap.c
new file mode 100644
index 0000000000..d87e4afd66
--- /dev/null
+++ b/keyboards/adafruit/macropad/keymaps/drashna/keymap.c
@@ -0,0 +1,100 @@
+// Copyright 2023 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "drashna.h"
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ LT(1,KC_MUTE),
+ KC_ENT, KC_0, KC_BSPC,
+ KC_7, KC_8, KC_9,
+ KC_4, KC_5, KC_6,
+ KC_1, KC_2, KC_3
+ ),
+ [1] = LAYOUT(
+ _______,
+ CK_TOGG, AU_TOGG, _______,
+ _______, _______, _______,
+ _______, _______, _______,
+ _______, _______, _______
+ ),
+};
+// clang-format on
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+ [0] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+ [1] = {ENCODER_CCW_CW(RGB_RMOD, RGB_MOD)},
+};
+#endif
+
+void render_oled_title(bool side) {
+ oled_write_P(PSTR(" Macropad "), true);
+}
+
+void render_rgb_mode(uint8_t col, uint8_t line);
+
+void l_render_keylock_status(led_t led_usb_state, uint8_t col, uint8_t line) {
+ oled_set_cursor(col, line);
+#ifdef CAPS_WORD_ENABLE
+ led_usb_state.caps_lock |= is_caps_word_on();
+#endif
+ oled_write_P(PSTR(OLED_RENDER_LOCK_NUML), led_usb_state.num_lock);
+ oled_write_P(PSTR(" "), false);
+ oled_write_P(PSTR(OLED_RENDER_LOCK_CAPS), led_usb_state.caps_lock);
+ oled_write_P(PSTR(" "), false);
+ oled_write_P(PSTR(OLED_RENDER_LOCK_SCLK), led_usb_state.scroll_lock);
+}
+
+bool oled_task_keymap(void) {
+ oled_write_raw_P(header_image, sizeof(header_image));
+ oled_set_cursor(0, 1);
+ oled_write_raw_P(row_2_image, sizeof(row_2_image));
+ oled_set_cursor(4, 0);
+ render_oled_title(false);
+
+ render_kitty(0, 2);
+ render_matrix_scan_rate(1, 7, 2);
+
+#ifdef AUDIO_ENABLE
+ oled_set_cursor(7, 4);
+ bool l_is_audio_on = is_audio_on();
+
+ static const char PROGMEM audio_status[2][3] = {{0xE0, 0xE1, 0}, {0xE2, 0xE3, 0}};
+ oled_write_P(audio_status[l_is_audio_on], false);
+
+# ifdef AUDIO_CLICKY
+ bool l_is_clicky_on = is_clicky_on();
+ static const char PROGMEM audio_clicky_status[2][3] = {{0xF4, 0xF5, 0}, {0xF6, 0xF7, 0}};
+ oled_write_P(audio_clicky_status[l_is_clicky_on && l_is_audio_on], false);
+# endif
+#endif
+
+ static const char PROGMEM cat_mode[3] = {0xF8, 0xF9, 0};
+ oled_write_P(cat_mode, get_keyboard_lock());
+
+#ifdef RGB_MATIRX_ENABLE
+ static const char PROGMEM rgb_layer_status[2][3] = {{0xEE, 0xEF, 0}, {0xF0, 0xF1, 0}};
+ oled_write_P(rgb_layer_status[rgb_matrix_is_enabled()], false);
+#endif
+
+#ifdef HAPTIC_ENABLE
+ static const char PROGMEM nukem_good[2] = {0xFA, 0};
+ oled_write_P(haptic_get_enable() ? nukem_good : PSTR(" "), false);
+#endif
+
+ l_render_keylock_status(host_keyboard_led_state(), 7, 5);
+ render_rgb_mode(1, 6);
+
+ for (uint8_t i = 1; i < 7; i++) {
+ oled_set_cursor(0, i);
+ oled_write_raw_P(display_border, sizeof(display_border));
+ oled_set_cursor(21, i);
+ oled_write_raw_P(display_border, sizeof(display_border));
+ }
+ oled_set_cursor(0, 7);
+ oled_write_raw_P(footer_image, sizeof(footer_image));
+
+ return false;
+}
diff --git a/keyboards/adafruit/macropad/keymaps/drashna/rules.mk b/keyboards/adafruit/macropad/keymaps/drashna/rules.mk
new file mode 100644
index 0000000000..ea090a5756
--- /dev/null
+++ b/keyboards/adafruit/macropad/keymaps/drashna/rules.mk
@@ -0,0 +1,3 @@
+ENCODER_MAP_ENABLE = yes
+DEBUG_MATRIX_SCAN_RATE_ENABLE = api
+WPM_ENABLE = yes
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c
index 02cb89fe65..e458a84373 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c
@@ -82,29 +82,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
EE_CLR, KC_NUKE, _______, _______, QK_BOOT
),
};
-
-#if defined(KEYBOARD_bastardkb_charybdis_3x5_blackpill)
-void keyboard_pre_init_keymap(void) {
- setPinInputHigh(A0);
-}
-
-void housekeeping_task_keymap(void) {
- if (!readPin(A0)) {
- reset_keyboard();
- }
-}
-
-# ifdef USB_VBUS_PIN
-bool usb_vbus_state(void) {
- setPinInputLow(USB_VBUS_PIN);
- wait_us(5);
- return readPin(USB_VBUS_PIN);
-}
-# endif
-
-void matrix_output_unselect_delay(uint8_t line, bool key_pressed) {
- for (int32_t i = 0; i < 40; i++) {
- __asm__ volatile("nop" ::: "memory");
- }
-}
-#endif
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk
index ff4ede45ca..029b4a498b 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk
@@ -40,6 +40,4 @@ ifeq ($(strip $(OVERLOAD_FEATURES)), yes)
CUSTOM_UNICODE_ENABLE = yes
CUSTOM_POINTING_DEVICE = yes
CUSTOM_SPLIT_TRANSPORT_SYNC = yes
-
- DEBOUNCE_TYPE = asym_eager_defer_pk
endif
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
index 07c4bfc008..7fa9826125 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
@@ -65,3 +65,5 @@
#define BOOTMAGIC_LITE_EEPROM_COLUMN 0
#define BOOTMAGIC_LITE_EEPROM_ROW_RIGHT 1
#define BOOTMAGIC_LITE_EEPROM_COLUMN_RIGHT 0
+
+#define DEBOUNCE 15
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c
index 85bb2bc77f..31d1e92a7f 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
SFT_T(KC_SPACE), ALT_T(KC_Q), _______
),
[_MOUSE] = LAYOUT_charybdis_4x6(
- _______, _______, _______, _______, _______, _______, _______, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD, _______,
+ _______, _______, _______, _______, _______, _______, _______, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD, PD_JIGGLER,
_______, _______, _______, _______, _______, _______, KC_WH_U, _______, _______, _______, _______, DRGSCRL,
_______, _______, _______, _______, _______, _______, KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, SNIPING,
_______, _______, _______, _______, _______, _______, KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______, _______,
@@ -130,28 +130,6 @@ void keyboard_post_init_keymap(void) {
void keyboard_pre_init_keymap(void) {
setPinInputHigh(A0);
}
-
-void housekeeping_task_keymap(void) {
- if (!readPin(A0)) {
- reset_keyboard();
- }
-}
-#endif
-
-#ifdef USB_VBUS_PIN
-bool usb_vbus_state(void) {
- setPinInputLow(USB_VBUS_PIN);
- wait_us(5);
- return readPin(USB_VBUS_PIN);
-}
-#endif
-
-#if defined(KEYBOARD_bastardkb_charybdis_4x6_blackpill)
-void matrix_output_unselect_delay(uint8_t line, bool key_pressed) {
- for (int32_t i = 0; i < 40; i++) {
- __asm__ volatile("nop" ::: "memory");
- }
-}
#endif
#ifdef SWAP_HANDS_ENABLE
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk
index 0b7759f156..ef6b7cd24b 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk
@@ -1,6 +1,7 @@
CUSTOM_UNICODE_ENABLE = no
CUSTOM_POINTING_DEVICE = no
CUSTOM_SPLIT_TRANSPORT_SYNC = no
+PER_KEY_TAPPING = yes
ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/4x6/blackpill)
# MCU name
@@ -16,16 +17,13 @@ ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/4x6/blackpill)
OVERLOAD_FEATURES = yes
endif
-ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/4x6/v2/stemcell)
- OVERLOAD_FEATURES = yes
-endif
-ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/4x6/v2/splinky)
- OVERLOAD_FEATURES = yes
-endif
ifeq ($(strip $(MCU)), atmega32u4)
LTO_ENABLE = yes
BOOTLOADER = qmk-hid
BOOTLOADER_SIZE = 512
+ EXTRAKEY_ENABLE = no
+else
+ OVERLOAD_FEATURES = yes
endif
ifeq ($(strip $(OVERLOAD_FEATURES)), yes)
@@ -43,7 +41,6 @@ ifeq ($(strip $(OVERLOAD_FEATURES)), yes)
CAPS_WORD_ENABLE = yes
SWAP_HANDS_ENABLE = yes
TAP_DANCE_ENABLE = yes
- DEBOUNCE_TYPE = asym_eager_defer_pk
WPM_ENABLE = yes
LTO_ENABLE = no
# OPT = 3
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/config.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/config.h
index d7b1351d89..7c46c83310 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/config.h
@@ -6,3 +6,5 @@
#define CIRQUE_PINNACLE_TAP_ENABLE
#define POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE
#define POINTING_DEVICE_GESTURES_SCROLL_ENABLE
+
+#define OLED_DISPLAY_128X128
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c
index d80d006796..bf75e97841 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c
@@ -84,14 +84,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
};
-
-void matrix_output_unselect_delay(uint8_t line, bool key_pressed) {
- for (int32_t i = 0; i < 40; i++) {
- __asm__ volatile("nop" ::: "memory");
- }
-}
-
-
#if defined(OLED_ENABLE) && defined(OLED_DISPLAY_128X128)
# ifdef UNICODE_COMMON_ENABLE
# include "process_unicode_common.h"
@@ -100,8 +92,6 @@ void matrix_output_unselect_delay(uint8_t line, bool key_pressed) {
extern const char PROGMEM display_border[3];
-
-extern uint32_t oled_timer;
extern bool is_oled_enabled;
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/rules.mk
index 41d73bc49a..a1be9cb8fd 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/rules.mk
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/rules.mk
@@ -5,4 +5,3 @@ CONSOLE_ENABLE = yes
KEYLOGGER_ENABLE = no
WPM_ENABLE = yes
OLED_ENABLE = yes
-OLED_DRIVER = custom
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/rules.mk b/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/rules.mk
index 7fef013a38..d2d2a9b874 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/rules.mk
@@ -6,4 +6,3 @@ TAP_DANCE_ENABLE = yes
UNICODE_ENABLE = yes
OLED_ENABLE = yes
WPM_ENABLE = yes
-# DEBOUNCE_TYPE = sym_eager_pk
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
index 2ab49de9fa..73ea40fb76 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
@@ -32,10 +32,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_PWM_TARGET_PERIOD 800000
-#define RGBLED_NUM 52
+#define RGBLED_NUM 57
#define RGBLIGHT_SPLIT
#define RGBLED_SPLIT \
- { 26, 26 }
+ { 26, 31 }
#define DEBUG_LED_PIN C13
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/post_config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/post_config.h
deleted file mode 100644
index 0e33129e1a..0000000000
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/post_config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#ifndef RGBLIGHT_LIMIT_VAL
-# if defined(OLED_ENABLE)
-# define RGBLIGHT_LIMIT_VAL 100
-# else
-# define RGBLIGHT_LIMIT_VAL 150
-# endif
-#endif
-
-#ifndef OLED_BRIGHTNESS
-# ifdef RGBLIGHT_ENABLE
-# define OLED_BRIGHTNESS 80
-# else
-# define OLED_BRIGHTNESS 150
-# endif
-#endif
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
index f159a69174..a449a126d6 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
@@ -16,21 +16,21 @@
#pragma once
-#define DEBOUNCE 45
-
-#ifdef OLED_DRIVER_SH1107
-# undef OLED_DISPLAY_128X64
-#endif
+#undef OLED_DISPLAY_128X64
+#define OLED_DISPLAY_128X128
+#define OLED_BRIGHTNESS 200
#define CHARYBDIS_MINIMUM_DEFAULT_DPI 1200
#define CHARYBDIS_DEFAULT_DPI_CONFIG_STEP 200
#define CHARYBDIS_MINIMUM_SNIPING_DPI 400
#define CHARYBDIS_SNIPING_DPI_CONFIG_STEP 200
-#define ENCODER_DEFAULT_POS 0x3
-
-
#define BOOTMAGIC_LITE_EEPROM_ROW 1
#define BOOTMAGIC_LITE_EEPROM_COLUMN 0
#define BOOTMAGIC_LITE_EEPROM_ROW_RIGHT 7
#define BOOTMAGIC_LITE_EEPROM_COLUMN_RIGHT 5
+
+
+#define FB_ERM_LRA 0
+#define DRV_GREETING alert_750ms
+#define DRV_MODE_DEFAULT buzz
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
index 93d3529edb..380e17fb09 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
@@ -90,8 +90,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_V, _______, _______
),
[_MOUSE] = LAYOUT_5x6_right(
- _______, _______, _______, _______, _______, _______, DRGSCRL, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD, SNP_TOG,
- _______, _______, _______, _______, _______, _______, KC_WH_U, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD, PD_JIGGLER,
+ _______, _______, _______, _______, _______, _______, KC_WH_U, _______, _______, _______, _______, DRGSCRL,
_______, _______, _______, _______, _______, _______, KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, SNIPING,
_______, _______, _______, _______, _______, _______, KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______, _______,
_______, _______, _______, _______,
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _________________RAISE_L2__________________, _________________RAISE_R2__________________, KC_BSLS,
_______, _________________RAISE_L3__________________, _________________RAISE_R3__________________, _______,
_______, _______, _______, _______,
- _______, _______, _______,
+ OL_LOCK, _______, _______,
_______, _______, _______,
_______, _______, _______, _______
),
@@ -126,96 +126,35 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
UC_NEXT, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, KC_MPLY,
TG(_DIABLOII), AUTO_CTN, TG_GAME, TG_DBLO,
_______, QK_RBT, KC_NUKE,
- _______, _______, _______,
+ HF_TOGG, _______, _______,
_______, _______, KC_NUKE, _______
),
};
// clang-format on
-#ifdef ENCODER_ENABLE
-# ifdef ENCODER_MAP_ENABLE
+#ifdef ENCODER_MAP_ENABLE
// clang-format off
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [_DEFAULT_LAYER_1] = { ENCODER_CCW_CW( KC_VOLD, KC_VOLU ), ENCODER_CCW_CW( KC_WH_D, KC_WH_U ) },
+ [_DEFAULT_LAYER_1] = { ENCODER_CCW_CW( KC_VOLU, KC_VOLD ), ENCODER_CCW_CW( KC_WH_U, KC_WH_D ) },
[_DEFAULT_LAYER_2] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) },
[_DEFAULT_LAYER_3] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) },
[_DEFAULT_LAYER_4] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) },
[_GAMEPAD] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) },
[_DIABLO] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) },
- [_MOUSE] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( KC_WH_D, KC_WH_U ) },
+ [_MOUSE] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) },
[_MEDIA] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) },
- [_RAISE] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( KC_PGDN, KC_PGUP ) },
- [_LOWER] = { ENCODER_CCW_CW( RGB_MOD, RGB_RMOD), ENCODER_CCW_CW( RGB_HUD, RGB_HUI ) },
- [_ADJUST] = { ENCODER_CCW_CW( CK_DOWN, CK_UP ), ENCODER_CCW_CW( _______, _______ ) },
+ [_RAISE] = { ENCODER_CCW_CW( OL_BINC, OL_BDEC ), ENCODER_CCW_CW( KC_PGDN, KC_PGUP ) },
+ [_LOWER] = { ENCODER_CCW_CW( RGB_MOD, RGB_RMOD), ENCODER_CCW_CW( RGB_HUI, RGB_HUD ) },
+ [_ADJUST] = { ENCODER_CCW_CW( CK_UP, CK_DOWN ), ENCODER_CCW_CW( _______, _______ ) },
};
// clang-format on
-# else
-
-deferred_token encoder_token = INVALID_DEFERRED_TOKEN;
-static int8_t last_direction = -1;
-
-static uint32_t encoder_callback(uint32_t trigger_time, void *cb_arg) {
- unregister_code(last_direction ? KC_WH_D : KC_WH_U);
- last_direction = -1;
- return 0;
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-# ifdef SWAP_HANDS_ENABLE
- if (swap_hands) {
- index ^= 1;
- }
-# endif
- if (index == 0) {
- tap_code_delay(clockwise ? KC_VOLD : KC_VOLU, 5);
- } else if (index == 1) {
- if (last_direction != clockwise || encoder_token == INVALID_DEFERRED_TOKEN) {
- uint8_t keycode = clockwise ? KC_WH_D : KC_WH_U;
- last_direction = clockwise;
- if (encoder_token != INVALID_DEFERRED_TOKEN) {
- if (cancel_deferred_exec(encoder_token)) {
- encoder_token = INVALID_DEFERRED_TOKEN;
- }
- unregister_code(clockwise ? KC_WH_U : KC_WH_D);
- }
- register_code(keycode);
- encoder_token = defer_exec(MOUSEKEY_WHEEL_DELAY + MOUSEKEY_WHEEL_INTERVAL, encoder_callback, NULL);
- } else {
- extend_deferred_exec(encoder_token, MOUSEKEY_WHEEL_INTERVAL);
- }
- }
- return false;
-}
-# endif
#endif
#ifdef OLED_ENABLE
-# include "keyrecords/unicode.h"
-
oled_rotation_t oled_init_keymap(oled_rotation_t rotation) {
return OLED_ROTATION_180;
}
-void oled_render_large_display(bool side) {
- if (side) {
- render_wpm_graph(56, 64);
- } else {
- oled_advance_page(true);
- oled_advance_page(true);
-
- // clang-format off
- static const char PROGMEM logo[] = {
- 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94,
- 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4,
- 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00
- };
- // clang-format on
- oled_write_P(logo, false);
-
- render_unicode_mode(1, 14);
- }
-}
-
void render_oled_title(bool side) {
oled_write_P(side ? PSTR(" Tractyl ") : PSTR(" Manuform "), true);
}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
index acec28fa6e..9f5341e973 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
@@ -5,7 +5,6 @@ CUSTOM_BOOTMAGIC_ENABLE = no
CUSTOM_UNICODE_ENABLE = no
HAPTIC_ENABLE = no
OLED_ENABLE = no
-OLED_DRIVER = custom
RGBLIGHT_ENABLE = no
SWAP_HANDS_ENABLE = no
TAP_DANCE_ENABLE = no
@@ -16,12 +15,14 @@ ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/elite_c)
BOOTLOADER_SIZE = 512
CUSTOM_SPLIT_TRANSPORT_SYNC = no
LTO_ENABLE = yes
+ MOUSEKEY_ENABLE = no
endif
ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/arduinomicro)
BOOTLOADER = qmk-hid
BOOTLOADER_SIZE = 512
CUSTOM_SPLIT_TRANSPORT_SYNC = no
LTO_ENABLE = yes
+ MOUSEKEY_ENABLE = no
endif
ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/teensy2pp)
AUTOCORRECT_ENABLE = no
@@ -33,8 +34,9 @@ ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/f411)
AUTOCORRECT_ENABLE = yes
LTO_SUPPORTED = no
OVERLOAD_FEATURES = yes
+ HAPTIC_ENABLE = yes
+ HAPTIC_DRIVER = DRV2605L
endif
-# DEBOUNCE_TYPE = sym_eager_pk
ifeq ($(strip $(OVERLOAD_FEATURES)), yes)
AUDIO_ENABLE = yes
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h
index dd5da75821..ce8e65e924 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h
@@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_SPLIT
#define RGBLED_SPLIT \
{ 10, 10 }
-#define OLED_BRIGHTNESS 50
+#define RGBLIGHT_LIMIT_VAL 80
#define DEBUG_LED_PIN D6
diff --git a/keyboards/handwired/tractyl_manuform/post_config.h b/keyboards/handwired/tractyl_manuform/post_config.h
index c48518ddd3..b5d67132b2 100644
--- a/keyboards/handwired/tractyl_manuform/post_config.h
+++ b/keyboards/handwired/tractyl_manuform/post_config.h
@@ -94,3 +94,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef DEBOUNCE
# define DEBOUNCE 5
#endif
+
+#if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_LIMIT_VAL)
+# if defined(OLED_ENABLE)
+# define RGBLIGHT_LIMIT_VAL 100
+# else
+# define RGBLIGHT_LIMIT_VAL 150
+# endif
+#endif
+
+#if !defined(OLED_BRIGHTNESS)
+# if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
+# define OLED_BRIGHTNESS 80
+# else
+# define OLED_BRIGHTNESS 150
+# endif
+#endif
diff --git a/keyboards/maple_computing/c39/keymaps/drashna/keymap.c b/keyboards/maple_computing/c39/keymaps/drashna/keymap.c
deleted file mode 100755
index 0c923983eb..0000000000
--- a/keyboards/maple_computing/c39/keymaps/drashna/keymap.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-#include "drashna.h"
-
-/*
- * The `LAYO