aboutsummaryrefslogtreecommitdiff
path: root/keymaps
diff options
context:
space:
mode:
Diffstat (limited to 'keymaps')
-rw-r--r--keymaps/crkbd/keymap.c37
-rw-r--r--keymaps/crkbd/readme.md2
-rw-r--r--keymaps/crkbd/rules.mk1
-rw-r--r--keymaps/f60/keymap.c2
-rw-r--r--keymaps/ferris/keymap.c2
-rw-r--r--keymaps/kyria/keymap.c12
6 files changed, 23 insertions, 33 deletions
diff --git a/keymaps/crkbd/keymap.c b/keymaps/crkbd/keymap.c
index 70ecc63..a7c4fa6 100644
--- a/keymaps/crkbd/keymap.c
+++ b/keymaps/crkbd/keymap.c
@@ -4,43 +4,43 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT_waffle_3x6(
- STAR, ___BASE1___, H_S,
- LINKS, ___BASE2___, RWORD,
- TABLE1, ___BASE3___, TABLE2,
- ___BASE4___
+ KC_NO, ___BASE1___, KC_NO,
+ LINKS, ___BASE2___, RWORD,
+ KC_NO, ___BASE3___, KC_NO,
+ ___BASE4___
),
[_LOWER] = LAYOUT_waffle_3x6(
KC_NO, ___LOWER1___, KC_NO,
KC_NO, ___LOWER2___, KC_NO,
KC_NO, ___LOWER3___, KC_NO,
- ___LOWER4___
+ ___LOWER4___
),
[_RAISE] = LAYOUT_waffle_3x6(
KC_NO, ___RAISE1___, KC_NO,
KC_NO, ___RAISE2___, KC_NO,
KC_NO, ___RAISE3___, KC_NO,
- ___RAISE4___
+ ___RAISE4___
)
};
-void housekeeping_task_user(void) {
- if (last_input_activity_elapsed() > 5000) {
+void housekeeping_task_keymap(void) {
+ if (last_input_activity_elapsed() > 15000) {
const pin_t row_pins[] = MATRIX_ROW_PINS, col_pins[] = MATRIX_COL_PINS;
- for (int i = 0; i < ARRAY_SIZE(col_pins); ++i) {
+ for (uint8_t i = 0; i < ARRAY_SIZE(col_pins); ++i) {
setPinOutput(col_pins[i]);
writePinLow(col_pins[i]);
}
- for (int i = 0; i < ARRAY_SIZE(row_pins); ++i) {
+ for (uint8_t i = 0; i < ARRAY_SIZE(row_pins); ++i) {
setPinInputHigh(row_pins[i]);
palEnableLineEvent(row_pins[i], PAL_EVENT_MODE_BOTH_EDGES);
}
__WFI();
- for (int i = 0; i < ARRAY_SIZE(row_pins); ++i) {
+ for (uint8_t i = 0; i < ARRAY_SIZE(row_pins); ++i) {
palDisableLineEvent(row_pins[i]);
writePinHigh(row_pins[i]);
setPinInputHigh(row_pins[i]);
}
- for (int i = 0; i < ARRAY_SIZE(col_pins); ++i) {
+ for (uint8_t i = 0; i < ARRAY_SIZE(col_pins); ++i) {
writePinHigh(col_pins[i]);
setPinInputHigh(col_pins[i]);
}
@@ -53,7 +53,7 @@ void keyboard_pre_init_user(void) { //thank you to @sigprof for this
palSetLineMode(B1, PAL_MODE_INPUT_ANALOG);
}
-void keyboard_post_init_user(void) {
+void keyboard_post_init_keymap(void) {
// enable OPAMP1 as A5 → B1 follower
OPAMP3->CSR = OPAMP3_CSR_VMSEL_1 | OPAMP3_CSR_VMSEL_0 | OPAMP3_CSR_VPSEL_0 | OPAMP3_CSR_OPAMP3EN;
}
@@ -124,15 +124,4 @@ void matrix_init_user(void) {
2, 2, 2, 2, 2
} };
}
-
-extern rgb_led_t rgb_matrix_ws2812_array[RGB_MATRIX_LED_COUNT];
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-#ifdef POINTING_DEVICE_ENABLE
- pimoroni_trackball_set_rgbw(rgb_matrix_ws2812_array[29].r, rgb_matrix_ws2812_array[29].g, rgb_matrix_ws2812_array[29].b, 0);
-#endif
- for (uint8_t i = led_min; i <= led_max; i++)
- if (g_led_config.flags[i] & LED_FLAG_UNDERGLOW)
- rgb_matrix_set_color(i, RGB_YELLOW);
- return false;
-}
#endif //rgb matrix
diff --git a/keymaps/crkbd/readme.md b/keymaps/crkbd/readme.md
index 308791e..5a47a50 100644
--- a/keymaps/crkbd/readme.md
+++ b/keymaps/crkbd/readme.md
@@ -14,4 +14,4 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
return false;
}
```
-above snippet aligns pimoronic trackball rgb led with the active rgb matrix animation, & sets the underglow leds to yellow.
+above snippet aligns pimoroni trackball rgb led with the active rgb matrix animation, & sets the underglow leds to yellow.
diff --git a/keymaps/crkbd/rules.mk b/keymaps/crkbd/rules.mk
index c7ab7d4..d8f79a0 100644
--- a/keymaps/crkbd/rules.mk
+++ b/keymaps/crkbd/rules.mk
@@ -4,6 +4,7 @@ WS2812_DRIVER = pwm
OLED_ENABLE = yes
AUDIO_ENABLE = yes
AUDIO_DRIVER = dac_basic
+RGBLIGHT_ENABLE = no
RGB_MATRIX_ENABLE = yes
ENCODER_ENABLE = yes
ENCODER_MAP_ENABLE = yes
diff --git a/keymaps/f60/keymap.c b/keymaps/f60/keymap.c
index de8b686..74e8ec7 100644
--- a/keymaps/f60/keymap.c
+++ b/keymaps/f60/keymap.c
@@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, ___BASE1___, KC_BSPC, _______, PNP,
LINKS, ___BASE2___, _______, _______,
_______, ___BASE3___, _______,
- _______, _______, KC_ESC, LWRSPC, RSE, _______, _______
+ _______, _______, KC_ESC, LWRSPC, RSEPST, _______, _______
),
[_LOWER] = LAYOUT_waffle_60_ts(
_______, ___NONE___,
diff --git a/keymaps/ferris/keymap.c b/keymaps/ferris/keymap.c
index 9813fc2..7191507 100644
--- a/keymaps/ferris/keymap.c
+++ b/keymaps/ferris/keymap.c
@@ -8,7 +8,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
___BASE1___,
___BASE2___,
___BASE3___,
- ESCLWR, QSPC, KC_BSPC, RSE
+ ESCLWR, KC_SPC, KC_BSPC, RSEPST
),
[_LOWER] = LAYOUT_waffle(
___LOWER1___,
diff --git a/keymaps/kyria/keymap.c b/keymaps/kyria/keymap.c
index e6368ce..c262ba2 100644
--- a/keymaps/kyria/keymap.c
+++ b/keymaps/kyria/keymap.c
@@ -4,17 +4,17 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_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
+ 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, KC_SPC, KC_NO, KC_NO, KC_BSPC, RSEPST, PNP, KC_NO
),
[_LOWER] = LAYOUT_waffle(
- _______, KC_1, KC_2 , KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, DEG0, _______,
+ _______, 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_TAB, KC_CAPS, KC_TILD, KC_GRV, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______,
- _______, _______, _______, H_S, _______, _______, STAR, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[_RAISE] = LAYOUT_waffle(