aboutsummaryrefslogtreecommitdiff
path: root/keymaps
diff options
context:
space:
mode:
authorjack <[email protected]>2023-07-28 23:17:17 -0600
committerjack <[email protected]>2023-07-28 23:17:17 -0600
commit7976a931a0f1a65b54a34b74c5387b27e4d0ce86 (patch)
tree60e521c6a798cc57ad8b022aa836be4da35d3b5e /keymaps
parent3a489338559d2ab4f39763d9a191f0bde5eee736 (diff)
downloadqmk_me-7976a931a0f1a65b54a34b74c5387b27e4d0ce86.tar.gz
qmk_me-7976a931a0f1a65b54a34b74c5387b27e4d0ce86.zip
fixup combos + other things
Diffstat (limited to 'keymaps')
-rw-r--r--keymaps/crkbd/config.h11
-rw-r--r--keymaps/crkbd/keymap.c8
-rw-r--r--keymaps/crkbd/mcuconf.h6
-rw-r--r--keymaps/kyria/config.h6
-rw-r--r--keymaps/kyria/keymap.c53
-rw-r--r--keymaps/kyria/rules.mk1
6 files changed, 31 insertions, 54 deletions
diff --git a/keymaps/crkbd/config.h b/keymaps/crkbd/config.h
index be2c54b..1e8acc8 100644
--- a/keymaps/crkbd/config.h
+++ b/keymaps/crkbd/config.h
@@ -3,10 +3,7 @@
#pragma once
#undef SOFT_SERIAL_PIN
-#define SERIAL_USART_FULL_DUPLEX
-#define SERIAL_USART_TX_PIN D3
-#define SERIAL_USART_RX_PIN D2
-#define SERIAL_USART_PIN_SWAP
+#define SOFT_SERIAL_PIN D3
#define CRC8_USE_TABLE
#define CRC8_OPTIMIZE_SPEED
#define SERIAL_USART_SPEED 921600
@@ -18,8 +15,8 @@
#endif
#ifdef RGB_MATRIX_ENABLE
-# undef RGB_DI_PIN
-# define RGB_DI_PIN B5
+# undef WS2812_DI_PIN
+# define WS2812_DI_PIN B5
# define ENABLE_RGB_MATRIX_ALPHAS_MODS
# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
@@ -30,7 +27,7 @@
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_ALPHAS_MODS
+# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
# define WS2812_PWM_DRIVER PWMD3
diff --git a/keymaps/crkbd/keymap.c b/keymaps/crkbd/keymap.c
index 46aca4a..3b9fb1d 100644
--- a/keymaps/crkbd/keymap.c
+++ b/keymaps/crkbd/keymap.c
@@ -93,14 +93,6 @@ bool oled_task_keymap(void) {
}
#endif //oled
-#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
- [_BASE] = { { KC_VOLU, KC_VOLD }, { KC_MNXT, KC_MPRV } },
- [_LOWER] = { { RGB_SAI, RGB_SAD }, { RGB_HUI, RGB_HUD } },
- [_RAISE] = { { KC_LEFT, C(KC_RGHT) }, { C(S(KC_TAB)), C(KC_TAB) } }
-};
-#endif //encoder map
-
#ifdef RGB_MATRIX_ENABLE
void matrix_init_user(void) {
g_led_config = (led_config_t) { {
diff --git a/keymaps/crkbd/mcuconf.h b/keymaps/crkbd/mcuconf.h
new file mode 100644
index 0000000..d256af2
--- /dev/null
+++ b/keymaps/crkbd/mcuconf.h
@@ -0,0 +1,6 @@
+// Copyright 2022 jack (@waffle87)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+#include_next <mcuconf.h>
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
diff --git a/keymaps/kyria/config.h b/keymaps/kyria/config.h
index 8e95a60..335a06d 100644
--- a/keymaps/kyria/config.h
+++ b/keymaps/kyria/config.h
@@ -11,7 +11,11 @@
#define SPLIT_WATCHDOG_ENABLE
#define CRC8_USE_TABLE
#define CRC8_OPTIMIZE_SPEED
+#undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define ENABLE_RGB_MATRIX_BAND_SAT
#define ENABLE_RGB_MATRIX_RAINDROPS
#define I2C1_CLOCK_SPEED 1000000
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 6
+#define BOOTMAGIC_LITE_ROW_RIGHT 4
+#define BOOTMAGIC_LITE_COLUMN_RIGHT 6
diff --git a/keymaps/kyria/keymap.c b/keymaps/kyria/keymap.c
index 270a1f1..e6368ce 100644
--- a/keymaps/kyria/keymap.c
+++ b/keymaps/kyria/keymap.c
@@ -3,51 +3,28 @@
#include "waffle.h"
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_BASE] = LAYOUT_stack_of_waffles(
- KC_NO, KC_Q, KC_W, KC_E, KC_R, KC_T,
- KC_NO, HRML(KC_A, KC_S, KC_D, KC_F), KC_G,
- KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, LINKS, KC_NO,
- KC_NO, UPDIR, ESCLWR, QSPC, KC_NO,
-
- KC_Y, KC_U, KC_I, KC_O, KC_P, KC_NO,
- KC_H, HRMR(KC_J, KC_K, KC_L, KC_SCLN), KC_NO,
- KC_NO, NUKE, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO,
- KC_NO, KC_BSPC, RSE, PNP, KC_NO
+ [_BASE] = LAYOUT_waffle(
+ KC_NO, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_NO,
+ KC_NO, HRML(KC_A, KC_S, KC_D, KC_F), KC_G, KC_H, HRMR(KC_J, KC_K, KC_L, KC_SCLN), KC_NO,
+ KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, LINKS, KC_NO, KC_NO, NUKE, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO,
+ KC_NO, UPDIR, ESCLWR, QSPC, KC_NO, KC_NO, KC_BSPC, RSE, PNP, KC_NO
),
- [_LOWER] = LAYOUT_stack_of_waffles(
- _______, KC_1, KC_2 , KC_3, KC_4, KC_5,
- _______, HRML(KC_EXLM, KC_AT, KC_HASH, KC_DLR), KC_PERC,
- _______, _______, KC_TAB, KC_CAPS, KC_TILD, KC_GRV, _______, _______,
- _______, _______, _______, H_S, _______,
-
- KC_6, KC_7, KC_8, KC_9, DEG0, _______,
- KC_CIRC, HRMR(KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN), _______,
- _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______,
- _______, STAR, _______, _______, _______
+ [_LOWER] = LAYOUT_waffle(
+ _______, KC_1, KC_2 , KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, DEG0, _______,
+ _______, HRML(KC_EXLM, KC_AT, KC_HASH, KC_DLR), KC_PERC, KC_CIRC, HRMR(KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN), _______,
+ _______, _______, KC_TAB, KC_CAPS, KC_TILD, KC_GRV, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______,
+ _______, _______, _______, H_S, _______, _______, STAR, _______, _______, _______
),
- [_RAISE] = LAYOUT_stack_of_waffles(
- _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI,
- _______, _______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD,
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, RWORD, _______,
- _______, _______, _______, _______, _______,
-
- KC_NOMODE, KC_SCRIPT, KC_BLOCKS, KC_REGIONAL, QK_MAKE, _______,
- KC_WIDE, KC_AUSSIE, KC_ZALGO, KC_SUPER, QK_BOOT, _______,
- _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______,
- _______, _______, _______, _______, _______
+ [_RAISE] = LAYOUT_waffle(
+ _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NOMODE, KC_SCRIPT, KC_BLOCKS, KC_REGIONAL, QK_MAKE, _______,
+ _______, _______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_WIDE, KC_AUSSIE, KC_ZALGO, KC_SUPER, QK_BOOT, _______,
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, RWORD, _______, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
};
-#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
- [_BASE] = { { KC_VOLU, KC_VOLD }, { KC_MNXT, KC_MPRV } },
- [_LOWER] = { { RGB_SAI, RGB_SAD }, { RGB_HUI, RGB_HUD } },
- [_RAISE] = { { KC_LEFT, C(KC_RGHT) }, { C(S(KC_TAB)), C(KC_TAB) } }
-};
-#endif
-
#ifdef OLED_ENABLE
bool oled_task_keymap(void) {
if (is_keyboard_left()) {
diff --git a/keymaps/kyria/rules.mk b/keymaps/kyria/rules.mk
index e20602d..2694171 100644
--- a/keymaps/kyria/rules.mk
+++ b/keymaps/kyria/rules.mk
@@ -4,3 +4,4 @@ RGB_MATRIX_ENABLE = yes
ENCODER_MAP_ENABLE = yes
POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c
+PROGRAM_CMD = doas picotool load $(BUILD_DIR)/$(TARGET).uf2