aboutsummaryrefslogtreecommitdiff
path: root/keymaps
diff options
context:
space:
mode:
Diffstat (limited to 'keymaps')
-rw-r--r--keymaps/bully/keymap.c4
-rw-r--r--keymaps/crkbd/config.h8
-rw-r--r--keymaps/crkbd/halconf.h2
-rw-r--r--keymaps/crkbd/keymap.c46
-rw-r--r--keymaps/crkbd/mcuconf.h2
-rw-r--r--keymaps/crkbd/rules.mk2
-rw-r--r--keymaps/f60/keymap.c8
-rw-r--r--keymaps/f60/readme.md6
-rw-r--r--keymaps/ferris/config.h2
-rw-r--r--keymaps/ferris/keymap.c6
-rw-r--r--keymaps/kyria/config.h2
-rw-r--r--keymaps/kyria/keymap.c46
-rw-r--r--keymaps/kyria/readme.md2
-rw-r--r--keymaps/onekey/rp2040/chconf.h2
-rw-r--r--keymaps/onekey/rp2040/keymap.c2
-rw-r--r--keymaps/onekey/rp2040/mcuconf.h2
-rw-r--r--keymaps/onekey/stm32f411/config.h2
-rw-r--r--keymaps/onekey/stm32f411/keymap.c2
-rw-r--r--keymaps/relic/keymap.c4
-rw-r--r--keymaps/relic/readme.md4
-rw-r--r--keymaps/vault35/config.h2
-rw-r--r--keymaps/vault35/keymap.c6
-rw-r--r--keymaps/vault35/readme.md4
23 files changed, 85 insertions, 81 deletions
diff --git a/keymaps/bully/keymap.c b/keymaps/bully/keymap.c
index 927d588..bd9ef4d 100644
--- a/keymaps/bully/keymap.c
+++ b/keymaps/bully/keymap.c
@@ -1,4 +1,4 @@
-// Copyright 2024 [email protected]
+// Copyright 2025 [email protected]
// SPDX-License-Identifier: GPL-3.0-or-later
#include "jack.h"
@@ -6,7 +6,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT_jack(
XXXXXXX, ___BASE1___, KC_BSPC, KC_BSPC,
- NUKE, ___BASE2___, PNP,
+ REMOVE, ___BASE2___, PNP,
XXXXXXX, ___BASE3___, XXXXXXX,
KC_VOLD, UPDIR, KC_ESC, _______, LT(_LOWER, KC_SPC), _______, PSTRSE, XXXXXXX, KC_VOLU
),
diff --git a/keymaps/crkbd/config.h b/keymaps/crkbd/config.h
index 1516e0b..f93a586 100644
--- a/keymaps/crkbd/config.h
+++ b/keymaps/crkbd/config.h
@@ -1,4 +1,4 @@
-// Copyright 2024 [email protected]
+// Copyright 2025 [email protected]
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
@@ -13,9 +13,9 @@
#define WS2812_DI_PIN B5
#define WS2812_PWM_DRIVER PWMD3
#define WS2812_PWM_CHANNEL 3
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#define WS2812_DMA_CHANNEL 3
-#define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM3_UP
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_PWM_DMA_CHANNEL 3
+#define WS2812_PWM_DMAMUX_ID STM32_DMAMUX1_TIM3_UP
#endif
#ifdef ENCODER_ENABLE
diff --git a/keymaps/crkbd/halconf.h b/keymaps/crkbd/halconf.h
index 547b9db..81505ac 100644
--- a/keymaps/crkbd/halconf.h
+++ b/keymaps/crkbd/halconf.h
@@ -1,4 +1,4 @@
-// Copyright 2024 [email protected]
+// Copyright 2025 [email protected]
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
diff --git a/keymaps/crkbd/keymap.c b/keymaps/crkbd/keymap.c
index 54fd197..eca3a2a 100644
--- a/keymaps/crkbd/keymap.c
+++ b/keymaps/crkbd/keymap.c
@@ -1,4 +1,4 @@
-// Copyright 2024 [email protected]
+// Copyright 2025 [email protected]
// SPDX-License-Identifier: GPL-2.0-or-later
#include "jack.h"
@@ -6,21 +6,21 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT_jack_3x6(
XXXXXXX, ___BASE1___, XXXXXXX,
- XXXXXXX, ___BASE2___, RWORD,
+ XXXXXXX, ___BASE2___, XXXXXXX,
XXXXXXX, ___BASE3___, XXXXXXX,
- ___BASE4___
+ ___BASE4___
),
[_LOWER] = LAYOUT_jack_3x6(
- XXXXXXX, ___LOWER1___, XXXXXXX,
- XXXXXXX, ___LOWER2___, XXXXXXX,
- XXXXXXX, ___LOWER3___, XXXXXXX,
- ___LOWER4___
+ _______, ___LOWER1___, _______,
+ _______, ___LOWER2___, _______,
+ _______, ___LOWER3___, _______,
+ ___LOWER4___
),
[_RAISE] = LAYOUT_jack_3x6(
- XXXXXXX, ___RAISE1___, XXXXXXX,
- XXXXXXX, ___RAISE2___, XXXXXXX,
- XXXXXXX, ___RAISE3___, XXXXXXX,
- ___RAISE4___
+ _______, ___RAISE1___, _______,
+ _______, ___RAISE2___, _______,
+ _______, ___RAISE3___, _______,
+ ___RAISE4___
)
};
// clang-format on
@@ -62,31 +62,9 @@ void keyboard_post_init_keymap(void) {
}
#endif // audio
-#ifdef POINTING_DEVICE_ENABLE
-uint8_t red = 255, green = 0, blue = 0;
-
-void trackball_hue(void) {
- if (red != 255 && green != 255 && blue != 255)
- red = 255;
- if (red == 255 && green < 255 && !blue)
- green += 15;
- else if (green == 255 && !blue && red)
- red -= 15;
- else if (!red && blue < 255 && green == 255)
- blue += 15;
- else if (blue == 255 && green && !red)
- green -= 15;
- else if (!green && blue == 255 && red < 255)
- red += 15;
- else if (!green && blue && red == 255)
- blue -= 15;
- pimoroni_trackball_set_rgbw(red, green, blue, 0);
-}
-#endif // pointing device
-
#ifdef OLED_ENABLE
oled_rotation_t oled_init_user(oled_rotation_t rotation) {
- return is_keyboard_master() ? 2 : 3;
+ return is_keyboard_master() ? OLED_ROTATION_180 : OLED_ROTATION_270;
}
bool oled_task_keymap(void) {
diff --git a/keymaps/crkbd/mcuconf.h b/keymaps/crkbd/mcuconf.h
index 871c3e7..db028e0 100644
--- a/keymaps/crkbd/mcuconf.h
+++ b/keymaps/crkbd/mcuconf.h
@@ -1,4 +1,4 @@
-// Copyright 2024 [email protected]
+// Copyright 2025 [email protected]
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
diff --git a/keymaps/crkbd/rules.mk b/keymaps/crkbd/rules.mk
index b1fff61..a0d37aa 100644
--- a/keymaps/crkbd/rules.mk
+++ b/keymaps/crkbd/rules.mk
@@ -4,8 +4,6 @@ WS2812_DRIVER = pwm
OLED_ENABLE = yes
AUDIO_ENABLE = no
AUDIO_DRIVER = dac_basic
-RGBLIGHT_ENABLE = no
-RGB_MATRIX_ENABLE = yes
ENCODER_ENABLE = yes
ENCODER_MAP_ENABLE = yes
POINTING_DEVICE_ENABLE = no
diff --git a/keymaps/f60/keymap.c b/keymaps/f60/keymap.c
index c730bd5..5f14df5 100644
--- a/keymaps/f60/keymap.c
+++ b/keymaps/f60/keymap.c
@@ -1,4 +1,4 @@
-// Copyright 2024 [email protected]
+// Copyright 2025 [email protected]
// SPDX-License-Identifier: GPL-2.0-or-later
#include "jack.h"
#define ___NONE___ \
@@ -12,21 +12,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, ___BASE1___, KC_BSPC, _______, PNP,
_______, ___BASE2___, _______, _______,
_______, ___BASE3___, _______,
- _______, _______, KC_ESC, LWRSPC, PSTRSE, _______, _______
+ _______, _______, KC_ESC, LWRSPC, PSTRSE, _______, _______
),
[_LOWER] = LAYOUT_jack_60_ts(
_______, ___NONE___,
_______, ___LOWER1___, _______, _______, _______,
_______, ___LOWER2___, _______, _______,
_______, ___LOWER3___, _______,
- _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______
),
[_RAISE] = LAYOUT_jack_60_ts(
_______, ___NONE___,
_______, ___RAISE1___, _______, _______, _______,
_______, ___RAISE2___, _______, _______,
_______, ___RAISE3___, _______,
- _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______
)
};
// clang-format on
diff --git a/keymaps/f60/readme.md b/keymaps/f60/readme.md
index 8244d1b..81b06f6 100644
--- a/keymaps/f60/readme.md
+++ b/keymaps/f60/readme.md
@@ -1,4 +1,4 @@
### trio60
-![front](https://i.imgur.com/MsKEbeBh.jpeg)
-![back](https://i.imgur.com/1D9xUYTh.jpeg)
-![rear](https://i.imgur.com/x6MBDMdh.jpeg)
+![front](https://i.imgur.com/MsKEbeB.jpeg)
+![back](https://i.imgur.com/1D9xUYT.jpeg)
+![rear](https://i.imgur.com/x6MBDMd.jpeg)
diff --git a/keymaps/ferris/config.h b/keymaps/ferris/config.h
index 1f624e5..d56921a 100644
--- a/keymaps/ferris/config.h
+++ b/keymaps/ferris/config.h
@@ -1,4 +1,4 @@
-// Copyright 2024 [email protected]
+// Copyright 2025 [email protected]
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
diff --git a/keymaps/ferris/keymap.c b/keymaps/ferris/keymap.c
index 71f2e14..e3e6b36 100644
--- a/keymaps/ferris/keymap.c
+++ b/keymaps/ferris/keymap.c
@@ -1,4 +1,4 @@
-// Copyright 2024 [email protected]
+// Copyright 2025 [email protected]
// SPDX-License-Identifier: GPL-2.0-or-later
#include "jack.h"
#define XX NO_LED
@@ -15,13 +15,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
___LOWER1___,
___LOWER2___,
___LOWER3___,
- XXXXXXX, XXXXXXX, XXXXXXX, PNP
+ _______, _______, _______, PNP
),
[_RAISE] = LAYOUT_jack(
___RAISE1___,
___RAISE2___,
___RAISE3___,
- UPDIR, XXXXXXX, XXXXXXX, XXXXXXX
+ UPDIR, _______, _______, _______
)
};
diff --git a/keymaps/kyria/config.h b/keymaps/kyria/config.h
index 25e13a2..3898f61 100644
--- a/keymaps/kyria/config.h
+++ b/keymaps/kyria/config.h
@@ -1,4 +1,4 @@
-// Copyright 2024 [email protected]
+// Copyright 2025 [email protected]
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
diff --git a/keymaps/kyria/keymap.c b/keymaps/kyria/keymap.c
index 99b9da3..3612228 100644
--- a/keymaps/kyria/keymap.c
+++ b/keymaps/kyria/keymap.c
@@ -1,28 +1,28 @@
-// Copyright 2024 [email protected]
+// Copyright 2025 [email protected]
// SPDX-License-Identifier: GPL-2.0-or-later
#include "jack.h"
// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT_jack(
- XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, XXXXXXX,
- XXXXXXX, HRML(KC_A, KC_S, KC_D, KC_F), KC_G, KC_H, HRMR(KC_J, KC_K, KC_L, KC_SCLN), XXXXXXX,
- XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, RWORD, XXXXXXX, XXXXXXX, NUKE, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, XXXXXXX,
+ XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, XXXXXXX,
+ XXXXXXX, HRML(KC_A, KC_S, KC_D, KC_F), KC_G, KC_H, HRMR(KC_J, KC_K, KC_L, KC_SCLN), XXXXXXX,
+ XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_SPC, XXXXXXX, XXXXXXX, KC_BSPC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, XXXXXXX,
XXXXXXX, UPDIR, ESCLWR, KC_SPC, XXXXXXX, XXXXXXX, KC_BSPC, PSTRSE, PNP, XXXXXXX
),
[_LOWER] = LAYOUT_jack(
_______, KC_1, KC_2 , KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
_______, HRML(KC_EXLM, KC_AT, KC_HASH, KC_DLR), KC_PERC, KC_CIRC, HRMR(KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN), _______,
- _______, KC_VOLD, KC_TAB, KC_CAPS, KC_TILD, KC_GRV, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_VOLU, _______,
+ _______, KC_VOLD, KC_TAB, KC_CAPS, REMOVE, KC_GRV, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_VOLU, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[_RAISE] = LAYOUT_jack(
- _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXXMODE, 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, _______, _______, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, UC_NOMODE, UC_SCRIPT, UC_BLOCKS, UC_REGIONAL, QK_MAKE, _______,
+ _______, M_JIGGLE, 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, _______, _______, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
};
// clang-format on
@@ -36,3 +36,31 @@ bool oled_task_keymap(void) {
return false;
}
#endif
+
+#ifdef POINTING_DEVICE_ENABLE
+static bool scrolling = false;
+layer_state_t layer_state_set_user(layer_state_t state) {
+ switch (get_highest_layer(state)) {
+ case _LOWER:
+ scrolling = true;
+ pointing_device_set_cpi(64);
+ break;
+ default:
+ if (scrolling) {
+ scrolling = false;
+ pointing_device_set_cpi(1024);
+ }
+ }
+ return state;
+}
+
+report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) {
+ if (scrolling) {
+ mouse_report.h = mouse_report.x;
+ mouse_report.v = -mouse_report.y;
+ mouse_report.x = 0;
+ mouse_report.y = 0;
+ }
+ return mouse_report;
+}
+#endif
diff --git a/keymaps/kyria/readme.md b/keymaps/kyria/readme.md
index 517429a..06b8f31 100644
--- a/keymaps/kyria/readme.md
+++ b/keymaps/kyria/readme.md
@@ -1,5 +1,5 @@
### rp2040 kyria rev2
-![photo](https://i.imgur.com/P0urp7nh.jpeg)
+![photo](https://i.imgur.com/P0urp7n.jpeg)
#### parts & notes
* microcontrollers: [boardsource blok](https://boardsource.xyz/store/628b95b494dfa308a6581622)
diff --git a/keymaps/onekey/rp2040/chconf.h b/keymaps/onekey/rp2040/chconf.h
index 5b38d53..8937db2 100644
--- a/keymaps/onekey/rp2040/chconf.h
+++ b/keymaps/onekey/rp2040/chconf.h
@@ -1,4 +1,4 @@
-// Copyright 2024 [email protected]
+// Copyright 2025 [email protected]
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
diff --git a/keymaps/onekey/rp2040/keymap.c b/keymaps/onekey/rp2040/keymap.c
index 07fb9fa..20372fd 100644
--- a/keymaps/onekey/rp2040/keymap.c
+++ b/keymaps/onekey/rp2040/keymap.c
@@ -1,4 +1,4 @@
-// Copyright 2024 [email protected]
+// Copyright 2025 [email protected]
// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
diff --git a/keymaps/onekey/rp2040/mcuconf.h b/keymaps/onekey/rp2040/mcuconf.h
index abc250c..c35ba16 100644
--- a/keymaps/onekey/rp2040/mcuconf.h
+++ b/keymaps/onekey/rp2040/mcuconf.h
@@ -1,4 +1,4 @@
-// Copyright 2024 [email protected]
+// Copyright 2025 [email protected]
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include_next <mcuconf.h>
diff --git a/keymaps/onekey/stm32f411/config.h b/keymaps/onekey/stm32f411/config.h
index 1b03659..668ebfb 100644
--- a/keymaps/onekey/stm32f411/config.h
+++ b/keymaps/onekey/stm32f411/config.h
@@ -1,4 +1,4 @@
-// Copyright 2024 [email protected]
+// Copyright 2025 [email protected]
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
diff --git a/keymaps/onekey/stm32f411/keymap.c b/keymaps/onekey/stm32f411/keymap.c
index 34b5279..36202c2 100644
--- a/keymaps/onekey/stm32f411/keymap.c
+++ b/keymaps/onekey/stm32f411/keymap.c
@@ -1,4 +1,4 @@
-// Copyright 2024 [email protected]
+// Copyright 2025 [email protected]
// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
diff --git a/keymaps/relic/keymap.c b/keymaps/relic/keymap.c
index 7f22e6f..88decb2 100644
--- a/keymaps/relic/keymap.c
+++ b/keymaps/relic/keymap.c
@@ -1,4 +1,4 @@
-// Copyright 2024 [email protected]
+// Copyright 2025 [email protected]
// SPDX-License-Identifier: GPL-3.0-or-later
#include "jack.h"
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
___LOWER1___, _______,
___LOWER2___,
___LOWER3___,
- _______, TABLE1, _______, _______, _______, _______, _______, TABLE2, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[_RAISE] = LAYOUT_jack_all(
___RAISE1___, _______,
diff --git a/keymaps/relic/readme.md b/keymaps/relic/readme.md
index a8e6d47..efab677 100644
--- a/keymaps/relic/readme.md
+++ b/keymaps/relic/readme.md
@@ -1,3 +1,3 @@
### relic
-![front](https://i.imgur.com/FMkKVs0h.jpeg)
-![back](https://i.imgur.com/s1HrBumh.jpeg)
+![front](https://i.imgur.com/FMkKVs0.jpeg)
+![back](https://i.imgur.com/s1HrBum.jpeg)
diff --git a/keymaps/vault35/config.h b/keymaps/vault35/config.h
index 392a9d4..7fefbd9 100644
--- a/keymaps/vault35/config.h
+++ b/keymaps/vault35/config.h
@@ -1,4 +1,4 @@
-// Copyright 2024 [email protected]
+// Copyright 2025 [email protected]
// SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
diff --git a/keymaps/vault35/keymap.c b/keymaps/vault35/keymap.c
index e78c59d..92d9b83 100644
--- a/keymaps/vault35/keymap.c
+++ b/keymaps/vault35/keymap.c
@@ -1,4 +1,4 @@
-// Copyright 2024 [email protected]
+// Copyright 2025 [email protected]
// SPDX-License-Identifier: GPL-3.0-or-later
#include "jack.h"
@@ -11,13 +11,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
UPDIR, KC_ESC, LWRSPC, _______, RSEBSP, C(S(KC_V)), PNP
),
[_LOWER] = LAYOUT_jack_all(
- ___LOWER1___, XXXXXXX,
+ ___LOWER1___, _______,
___LOWER2___,
___LOWER3___,
_______, _______, _______, _______, _______, _______, _______
),
[_RAISE] = LAYOUT_jack_all(
- ___RAISE1___, XXXXXXX,
+ ___RAISE1___, _______,
___RAISE2___,
___RAISE3___,
_______, _______, _______, _______, _______, _______, _______
diff --git a/keymaps/vault35/readme.md b/keymaps/vault35/readme.md
index 15d1db4..876e6fa 100644
--- a/keymaps/vault35/readme.md
+++ b/keymaps/vault35/readme.md
@@ -1,3 +1,3 @@
### vault35
-![w/o keycaps](https://i.imgur.com/AHwhQdDh.jpeg)
-![w/ keycaps](https://i.imgur.com/lXP50ITh.jpeg)
+![w/o keycaps](https://i.imgur.com/AHwhQdD.jpeg)
+![w/ keycaps](https://i.imgur.com/lXP50IT.jpeg)