Merge branch 'master' into taamas

9 files changed, 127 insertions, 0 deletions

diff --git a/keyboards/1k/keymaps/default/keymap.c b/keyboards/1k/keymaps/default/keymap.c
new file mode 100644
index 0000000000..b64d4d8c76
--- /dev/null
+++ b/keyboards/1k/keymaps/default/keymap.c
@@ -0,0 +1,25 @@
+// 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(
+    RGB_HUI
+  )
+};
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  if (record->event.pressed) {
+    switch (keycode) {
+      case RGB_HUI:
+        rgblite_increase_hue();
+        break;
+    }
+  }
+  return true;
+}
+
+void keyboard_post_init_user(void) {
+  rgblite_increase_hue();
+}
diff --git a/keyboards/1k/keymaps/default/rgblite.h b/keyboards/1k/keymaps/default/rgblite.h
new file mode 100644
index 0000000000..e64f49ee0a
--- /dev/null
+++ b/keyboards/1k/keymaps/default/rgblite.h
@@ -0,0 +1,23 @@
+// 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) {
+    LED_TYPE 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/default/rules.mk b/keyboards/1k/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ff480ff890
--- /dev/null
+++ b/keyboards/1k/keymaps/default/rules.mk
@@ -0,0 +1,2 @@
+SRC += ws2812.c
+SRC += color.c
diff --git a/keyboards/1k/keymaps/media/keymap.c b/keyboards/1k/keymaps/media/keymap.c
new file mode 100644
index 0000000000..6fd3eb92de
--- /dev/null
+++ b/keyboards/1k/keymaps/media/keymap.c
@@ -0,0 +1,22 @@
+// 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
new file mode 100644
index 0000000000..e64f49ee0a
--- /dev/null
+++ b/keyboards/1k/keymaps/media/rgblite.h
@@ -0,0 +1,23 @@
+// 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) {
+    LED_TYPE 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
new file mode 100644
index 0000000000..2368727640
--- /dev/null
+++ b/keyboards/1k/keymaps/media/rules.mk
@@ -0,0 +1,3 @@
+SRC += ws2812.c
+SRC += color.c
+EXTRAKEY_ENABLE = yes
diff --git a/keyboards/1k/keymaps/tap_dance/config.h b/keyboards/1k/keymaps/tap_dance/config.h
new file mode 100644
index 0000000000..5df7869537
--- /dev/null
+++ b/keyboards/1k/keymaps/tap_dance/config.h
@@ -0,0 +1,6 @@
+// Copyright 2022 Makoto Kurauchi (@MakotoKurauchi)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define TAPPING_TERM 500
diff --git a/keyboards/1k/keymaps/tap_dance/keymap.c b/keyboards/1k/keymaps/tap_dance/keymap.c
new file mode 100644
index 0000000000..c2a8cf1aea
--- /dev/null
+++ b/keyboards/1k/keymaps/tap_dance/keymap.c
@@ -0,0 +1,22 @@
+// 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
+};
+
+qk_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
new file mode 100644
index 0000000000..e5ddcae8d9
--- /dev/null
+++ b/keyboards/1k/keymaps/tap_dance/rules.mk
@@ -0,0 +1 @@
+TAP_DANCE_ENABLE = yes