diff options
author | fauxpark <fauxpark@gmail.com> | 2023-12-20 16:03:14 +1100 |
---|---|---|
committer | fauxpark <fauxpark@gmail.com> | 2023-12-20 16:03:14 +1100 |
commit | 2c191e21c280a78e71767a73f31cd7017382186c (patch) | |
tree | 9712dc3c8fb836c708ac67a2c4ab0dbf2fa6d674 /keyboards/1k | |
parent | 8812a095814fdad3ab245fa2c00e29cb50ee2e92 (diff) | |
parent | c8728880de198f5797463efbbba3eba7f1e4444a (diff) |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/1k')
-rw-r--r-- | keyboards/1k/keymaps/media/keymap.c | 22 | ||||
-rw-r--r-- | keyboards/1k/keymaps/media/rgblite.h | 23 | ||||
-rw-r--r-- | keyboards/1k/keymaps/media/rules.mk | 3 | ||||
-rw-r--r-- | keyboards/1k/keymaps/tap_dance/config.h | 7 | ||||
-rw-r--r-- | keyboards/1k/keymaps/tap_dance/keymap.c | 22 | ||||
-rw-r--r-- | keyboards/1k/keymaps/tap_dance/rules.mk | 1 |
6 files changed, 0 insertions, 78 deletions
diff --git a/keyboards/1k/keymaps/media/keymap.c b/keyboards/1k/keymaps/media/keymap.c deleted file mode 100644 index 6fd3eb92de..0000000000 --- a/keyboards/1k/keymaps/media/keymap.c +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2022 Makoto Kurauchi (@MakotoKurauchi) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H -#include "rgblite.h" - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_ortho_1x1( - KC_MUTE - ) -}; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - if (record->event.pressed) { - rgblite_increase_hue(); - } - return true; -} - -void keyboard_post_init_user(void) { - rgblite_increase_hue(); -} diff --git a/keyboards/1k/keymaps/media/rgblite.h b/keyboards/1k/keymaps/media/rgblite.h deleted file mode 100644 index 29d684ac08..0000000000 --- a/keyboards/1k/keymaps/media/rgblite.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2022 Makoto Kurauchi (@MakotoKurauchi) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "ws2812.h" -#include "color.h" - -static inline void rgblite_setrgb(RGB rgb) { - rgb_led_t leds[RGBLED_NUM] = {{.r = rgb.r, .g = rgb.g, .b = rgb.b}}; - ws2812_setleds(leds, RGBLED_NUM); -} - -static void rgblite_increase_hue(void) { - static uint8_t state = 0; - - HSV hsv = { 255, 255, 255 }; - hsv.h = state; - state = (state + 8) % 256; - - rgblite_setrgb(hsv_to_rgb(hsv)); - -} diff --git a/keyboards/1k/keymaps/media/rules.mk b/keyboards/1k/keymaps/media/rules.mk deleted file mode 100644 index 76db8f131e..0000000000 --- a/keyboards/1k/keymaps/media/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -WS2812_DRIVER_REQUIRED = yes -SRC += color.c -EXTRAKEY_ENABLE = yes diff --git a/keyboards/1k/keymaps/tap_dance/config.h b/keyboards/1k/keymaps/tap_dance/config.h deleted file mode 100644 index bd0163e447..0000000000 --- a/keyboards/1k/keymaps/tap_dance/config.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2022 Makoto Kurauchi (@MakotoKurauchi) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#define TAPPING_TERM 500 -#define PERMISSIVE_HOLD diff --git a/keyboards/1k/keymaps/tap_dance/keymap.c b/keyboards/1k/keymaps/tap_dance/keymap.c deleted file mode 100644 index 1044924978..0000000000 --- a/keyboards/1k/keymaps/tap_dance/keymap.c +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2022 Makoto Kurauchi (@MakotoKurauchi) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -enum layers { - _BASE = 0, -}; - -enum { - TD_AB = 0 -}; - -tap_dance_action_t tap_dance_actions[] = { - [TD_AB] = ACTION_TAP_DANCE_DOUBLE(KC_A, KC_B) -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT_ortho_1x1( - TD(TD_AB) - ) -}; diff --git a/keyboards/1k/keymaps/tap_dance/rules.mk b/keyboards/1k/keymaps/tap_dance/rules.mk deleted file mode 100644 index e5ddcae8d9..0000000000 --- a/keyboards/1k/keymaps/tap_dance/rules.mk +++ /dev/null @@ -1 +0,0 @@ -TAP_DANCE_ENABLE = yes |