diff options
Diffstat (limited to 'keymaps')
33 files changed, 117 insertions, 237 deletions
diff --git a/keymaps/beiwagon/keymap.c b/keymaps/beiwagon/keymap.c new file mode 100644 index 0000000..eaa9c44 --- /dev/null +++ b/keymaps/beiwagon/keymap.c @@ -0,0 +1,26 @@ +// Copyright 2025 [email protected] +// SPDX-License-Identifier: GPL-3.0-or-later +#include "jack.h" + +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT_jack( + G(KC_F), G(KC_Q), G(KC_R), + KC_VOLD, PNP, KC_VOLU, + REMOVE, XRGB_HUI, XRGB_NXT, + XRGB_TOG, XRGB_HUD, TG(_LOWER) + ), + [_LOWER] = LAYOUT_jack( + QK_BOOT, EE_CLR, QK_MAKE, + _______, _______, _______, + _______, _______, _______, + _______, _______, _______ + ) +}; +// clang-format on + +void keyboard_post_init_keymap(void) { + for (int i = 0; i < RGB_MATRIX_LED_COUNT; ++i) + if (g_led_config.flags[i] & LED_FLAG_UNDERGLOW) + g_led_config.flags[i] &= ~LED_FLAG_UNDERGLOW; +} diff --git a/keymaps/bully/keymap.c b/keymaps/bully/keymap.c index 927d588..cc4275d 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,9 +6,9 @@ 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 + KC_VOLD, UPDIR, KC_ESC, XXXXXXX, LWRSPC, XXXXXXX, PSTRSE, XXXXXXX, KC_VOLU ), [_LOWER] = LAYOUT_jack( _______, ___LOWER1___, _______, _______, 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..1e634ab 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) { @@ -131,12 +109,4 @@ void matrix_init_user(void) { 4, 4, 4, 2, 2, 2, 2, 2, 2, 1, 1, 1, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 2, 2, 2, 2, 2, 2}}; } - -bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { - rgb_matrix_sethsv_noeeprom(43, 255, 120); - 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_RED); - return false; -} #endif // rgb matrix 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..42387df 100644 --- a/keymaps/crkbd/rules.mk +++ b/keymaps/crkbd/rules.mk @@ -4,9 +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 POINTING_DEVICE_DRIVER = pimoroni_trackball 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 deleted file mode 100644 index 8244d1b..0000000 --- a/keymaps/f60/readme.md +++ /dev/null @@ -1,4 +0,0 @@ -### trio60 - - - diff --git a/keymaps/ferris/config.h b/keymaps/ferris/config.h deleted file mode 100644 index 1f624e5..0000000 --- a/keymaps/ferris/config.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2024 [email protected] -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#define WS2812_DI_PIN B0 -#define RGB_MATRIX_LED_COUNT 34 -#define RGB_MATRIX_SPLIT {17, 17} -#define __ NO_PIN -#undef DIRECT_PINS -#undef DIRECT_PINS_RIGHT -// clang-format off -#define DIRECT_PINS { \ - {D7,F7,F6,F5,F4}, \ - {B1,B3,B2,B6,D3}, \ - {D1,D0,D4,C6,E6}, \ - {B4,B5,__,__,__} \ -} -#define DIRECT_PINS_RIGHT { \ - {F4,F5,F6,F7,D7}, \ - {D3,B6,B2,B3,B1}, \ - {E6,C6,D4,D0,D1}, \ - {B5,B4,__,__,__} \ -} -// clang-format on diff --git a/keymaps/ferris/keymap.c b/keymaps/ferris/keymap.c deleted file mode 100644 index 71f2e14..0000000 --- a/keymaps/ferris/keymap.c +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright 2024 [email protected] -// SPDX-License-Identifier: GPL-2.0-or-later -#include "jack.h" -#define XX NO_LED - -// clang-format off -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT_jack( - ___BASE1___, - ___BASE2___, - ___BASE3___, - ESCLWR, KC_SPC, KC_BSPC, PSTRSE - ), - [_LOWER] = LAYOUT_jack( - ___LOWER1___, - ___LOWER2___, - ___LOWER3___, - XXXXXXX, XXXXXXX, XXXXXXX, PNP - ), - [_RAISE] = LAYOUT_jack( - ___RAISE1___, - ___RAISE2___, - ___RAISE3___, - UPDIR, XXXXXXX, XXXXXXX, XXXXXXX - ) -}; - -led_config_t g_led_config = {{ - {4, 3, 2, 1, 0 }, - {5, 6, 7, 8, 9 }, - {14, 13, 12, 11, 10}, - {XX, XX, XX, 15, 16}, - {17, 18, 19, 20, 21}, - {26, 25, 24, 23, 22}, - {27, 28, 29, 30, 31}, - {33, 32, XX, XX, XX} -}, { - {72,7}, {54,4}, {36,0}, {18,4}, {0,13}, - {0,27}, {18,18},{36,14},{54,18},{72,21}, - {72,35},{54,32},{36,28},{18,32},{0,41}, - {67,45},{90,62}, - {126,13},{144,4}, {162,0}, {180,4}, {198,7}, - {198,21},{180,18},{162,14},{144,18},{126,27}, - {126,41},{144,32},{162,28},{180,32},{198,35}, - {117,62},{135,45} -}, { - 4,4,4,4,4, - 4,4,4,4,4, - 4,4,4,4,4, - 4,4, - 4,4,4,4,4, - 4,4,4,4,4, - 4,4,4,4,4, - 4,4 -}}; -// clang-format on diff --git a/keymaps/ferris/readme.md b/keymaps/ferris/readme.md deleted file mode 100644 index c3ac9ca..0000000 --- a/keymaps/ferris/readme.md +++ /dev/null @@ -1,8 +0,0 @@ -### rgb ferris sweep - - - - -#### notes -an elite-c was required for this pcb, as it exposes an io pin where most pro-micro's have a raw power pin.\ -this means no diodes are required :^) diff --git a/keymaps/ferris/rules.mk b/keymaps/ferris/rules.mk deleted file mode 100644 index 15e72a1..0000000 --- a/keymaps/ferris/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -BOOTLOADER = atmel-dfu -RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = ws2812 diff --git a/keymaps/kyria/config.h b/keymaps/kyria/config.h index 25e13a2..d8acae0 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 @@ -10,8 +10,6 @@ #define CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE #define CIRQUE_PINNACLE_DIAMETER_MM 35 #define SPLIT_WATCHDOG_ENABLE -#define CRC8_USE_TABLE -#define CRC8_OPTIMIZE_SPEED #undef RGB_MATRIX_MAXIMUM_BRIGHTNESS #define I2C1_CLOCK_SPEED 1000000 #define BOOTMAGIC_LITE_ROW 0 diff --git a/keymaps/kyria/keymap.c b/keymaps/kyria/keymap.c index 99b9da3..dd70d52 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, UC_WIDE, UC_AUSSIE, UC_ZALGO, UC_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 - + #### parts & notes * microcontrollers: [boardsource blok](https://boardsource.xyz/store/628b95b494dfa308a6581622) diff --git a/keymaps/kyria/rules.mk b/keymaps/kyria/rules.mk index 2694171..cd88dc8 100644 --- a/keymaps/kyria/rules.mk +++ b/keymaps/kyria/rules.mk @@ -1,7 +1,5 @@ CONVERT_TO = blok RGBLIGHT_ENABLE = no 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 diff --git a/keymaps/onekey/f411_qfplib/config.h b/keymaps/onekey/f411_qfplib/config.h new file mode 100644 index 0000000..8fbef05 --- /dev/null +++ b/keymaps/onekey/f411_qfplib/config.h @@ -0,0 +1,12 @@ +// Copyright 2025 [email protected] +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once + +#undef ADC_PIN +#undef BACKLIGHT_PIN +#undef MATRIX_ROW_PINS +#undef MATRIX_COL_PINS + +// clang-format off +#define DIRECT_PINS {{A0}} +// clang-format on diff --git a/keymaps/onekey/stm32f411/keymap.c b/keymaps/onekey/f411_qfplib/keymap.c index 34b5279..36202c2 100644 --- a/keymaps/onekey/stm32f411/keymap.c +++ b/keymaps/onekey/f411_qfplib/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/stm32f411/qfplib/qfplib.h b/keymaps/onekey/f411_qfplib/qfplib/qfplib.h index d172da8..d172da8 100644 --- a/keymaps/onekey/stm32f411/qfplib/qfplib.h +++ b/keymaps/onekey/f411_qfplib/qfplib/qfplib.h diff --git a/keymaps/onekey/stm32f411/qfplib/qfplib.s b/keymaps/onekey/f411_qfplib/qfplib/qfplib.s index e035472..e035472 100644 --- a/keymaps/onekey/stm32f411/qfplib/qfplib.s +++ b/keymaps/onekey/f411_qfplib/qfplib/qfplib.s diff --git a/keymaps/onekey/stm32f411/rules.mk b/keymaps/onekey/f411_qfplib/rules.mk index 8b12a3d..8b12a3d 100644 --- a/keymaps/onekey/stm32f411/rules.mk +++ b/keymaps/onekey/f411_qfplib/rules.mk diff --git a/keymaps/onekey/rp2040/rules.mk b/keymaps/onekey/rp2040/rules.mk deleted file mode 100644 index a263ca2..0000000 --- a/keymaps/onekey/rp2040/rules.mk +++ /dev/null @@ -1,39 +0,0 @@ -CONSOLE_ENABLE = yes -OPT_DEFS += -UCRT0_EXTRA_CORES_NUMBER \ - -DCRT0_EXTRA_CORES_NUMBER=1 - -define WRAP - $(foreach FUNC,$1,$(eval EXTRALDFLAGS += -Wl,--wrap=$(FUNC))) -endef - -SRC += $(PICOSDKROOT)/src/rp2_common/pico_bit_ops/bit_ops_aeabi.S -BIT_FUNCTIONS := __clzsi2 __clzdi2 __ctzsi2 __ctzdi2 __popcountsi2 __popcountdi2 -$(call WRAP, $(BIT_FUNCTIONS)) - -VPATH += $(PICOSDKROOT)/src/rp2_common/pico_double/include -SRC += $(PICOSDKROOT)/src/rp2_common/pico_double/double_aeabi.S \ - $(PICOSDKROOT)/src/rp2_common/pico_double/double_init_rom.c \ - $(PICOSDKROOT)/src/rp2_common/pico_double/double_math.c \ - $(PICOSDKROOT)/src/rp2_common/pico_double/double_v1_rom_shim.S -DOUBLE_FUNCTIONS := __aeabi_dadd __aeabi_ddiv __aeabi_dmul __aeabi_drsub __aeabi_dsub __aeabi_cdcmpeq \ - __aeabi_cdrcmple __aeabi_cdcmple __aeabi_dcmpeq __aeabi_dcmplt __aeabi_dcmple \ - __aeabi_dcmpge __aeabi_dcmpgt __aeabi_dcmpun __aeabi_i2d __aeabi_l2d __aeabi_ui2d \ - __aeabi_ul2d __aeabi_d2iz __aeabi_d2lz __aeabi_d2uiz __aeabi_d2ulz __aeabi_d2f \ - sqrt cos sin tan atan2 exp log ldexp copysign trunc floor ceil round sincos asin \ - acos atan sinh cosh tanh asinh acosh atanh exp2 log2 exp10 log10 pow powint hypot \ - cbrt fmod drem remainder remquo expm1 log1p fma -$(call WRAP, $(DOUBLE_FUNCTIONS)) - -VPATH += $(PICOSDKROOT)/src/rp2_common/pico_float/include -SRC += $(PICOSDKROOT)/src/rp2_common/pico_float/float_aeabi.S \ - $(PICOSDKROOT)/src/rp2_common/pico_float/float_init_rom.c \ - $(PICOSDKROOT)/src/rp2_common/pico_float/float_math.c \ - $(PICOSDKROOT)/src/rp2_common/pico_float/float_v1_rom_shim.S -FLOAT_FUNCTIONS := __aeabi_fadd __aeabi_fdiv __aeabi_fmul __aeabi_frsub __aeabi_fsub __aeabi_cfcmpeq \ - __aeabi_cfrcmple __aeabi_cfcmple __aeabi_fcmpeq __aeabi_fcmplt __aeabi_fcmple \ - __aeabi_fcmpge __aeabi_fcmpgt __aeabi_fcmpun __aeabi_i2f __aeabi_l2f __aeabi_ui2f \ - __aeabi_ul2f __aeabi_f2iz __aeabi_f2lz __aeabi_f2uiz __aeabi_f2ulz __aeabi_f2d \ - sqrtf cosf sinf tanf atan2f expf logf ldexpf copysignf truncf floorf ceilf roundf \ - sincosf asinf acosf atanf sinhf coshf tanhf asinhf acoshf atanhf exp2f log2f exp10f \ - log10f powf powintf hypotf cbrtf fmodf dremf remainderf remquof expm1f log1pf fmaf -$(call WRAP, $(FLOAT_FUNCTIONS)) diff --git a/keymaps/onekey/rp2040/chconf.h b/keymaps/onekey/rp_smp/chconf.h index 5b38d53..8937db2 100644 --- a/keymaps/onekey/rp2040/chconf.h +++ b/keymaps/onekey/rp_smp/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/rp_smp/keymap.c index 07fb9fa..20372fd 100644 --- a/keymaps/onekey/rp2040/keymap.c +++ b/keymaps/onekey/rp_smp/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/rp_smp/mcuconf.h index abc250c..c35ba16 100644 --- a/keymaps/onekey/rp2040/mcuconf.h +++ b/keymaps/onekey/rp_smp/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/rp_smp/rules.mk b/keymaps/onekey/rp_smp/rules.mk new file mode 100644 index 0000000..790127f --- /dev/null +++ b/keymaps/onekey/rp_smp/rules.mk @@ -0,0 +1,3 @@ +CONSOLE_ENABLE = yes +OPT_DEFS += -UCRT0_EXTRA_CORES_NUMBER \ + -DCRT0_EXTRA_CORES_NUMBER=1 diff --git a/keymaps/onekey/stm32f411/config.h b/keymaps/onekey/stm32f411/config.h deleted file mode 100644 index 1b03659..0000000 --- a/keymaps/onekey/stm32f411/config.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright 2024 [email protected] -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#undef ADC_PIN -#undef BACKLIGHT_PIN -#undef MATRIX_ROW_PINS -#undef MATRIX_COL_PINS -#define DIRECT_PINS \ - { \ - { A0 } \ - } diff --git a/keymaps/relic/keymap.c b/keymaps/relic/keymap.c index 7f22e6f..ca296d8 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" @@ -8,13 +8,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ___BASE1___, PNP, ___BASE2___, ___BASE3___, - KC_VOLD, KC_ESC, _______, LWRSPC, _______, RSEBSP, _______, C(S(KC_V)), KC_VOLU + KC_VOLD, KC_ESC, XXXXXXX, LWRSPC, XXXXXXX, RSEBSP, XXXXXXX, C(S(KC_V)), KC_VOLU ), [_LOWER] = LAYOUT_jack_all( ___LOWER1___, _______, ___LOWER2___, ___LOWER3___, - _______, TABLE1, _______, _______, _______, _______, _______, TABLE2, _______ + _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [_RAISE] = LAYOUT_jack_all( ___RAISE1___, _______, diff --git a/keymaps/relic/readme.md b/keymaps/relic/readme.md deleted file mode 100644 index a8e6d47..0000000 --- a/keymaps/relic/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -### relic - - 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..10ee07f 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" @@ -8,16 +8,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ___BASE1___, XXXXXXX, ___BASE2___, ___BASE3___, - UPDIR, KC_ESC, LWRSPC, _______, RSEBSP, C(S(KC_V)), PNP + UPDIR, KC_ESC, LWRSPC, XXXXXXX, 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 deleted file mode 100644 index 15d1db4..0000000 --- a/keymaps/vault35/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -### vault35 - - |