From 79959f55e310c8f71bff49c432f0116af7c87c9e Mon Sep 17 00:00:00 2001
From: suikagiken <115451678+suikagiken@users.noreply.github.com>
Date: Tue, 19 Nov 2024 00:29:19 +0900
Subject: [PATCH 1/7] add keyboard suika27melo

---
 keyboards/suikagiken/suika27melo/config.h     |  5 ++
 .../suikagiken/suika27melo/keyboard.json      | 67 +++++++++++++++++++
 .../suika27melo/keymaps/default/keymap.json   | 12 ++++
 .../suika27melo/keymaps/midi/keymap.json      | 12 ++++
 keyboards/suikagiken/suika27melo/readme.md    | 48 +++++++++++++
 5 files changed, 144 insertions(+)
 create mode 100644 keyboards/suikagiken/suika27melo/config.h
 create mode 100644 keyboards/suikagiken/suika27melo/keyboard.json
 create mode 100644 keyboards/suikagiken/suika27melo/keymaps/default/keymap.json
 create mode 100644 keyboards/suikagiken/suika27melo/keymaps/midi/keymap.json
 create mode 100644 keyboards/suikagiken/suika27melo/readme.md

diff --git a/keyboards/suikagiken/suika27melo/config.h b/keyboards/suikagiken/suika27melo/config.h
new file mode 100644
index 000000000000..7d35e3c43699
--- /dev/null
+++ b/keyboards/suikagiken/suika27melo/config.h
@@ -0,0 +1,5 @@
+// Copyright 2025 @suikagiken
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+#define MIDI_ADVANCED
diff --git a/keyboards/suikagiken/suika27melo/keyboard.json b/keyboards/suikagiken/suika27melo/keyboard.json
new file mode 100644
index 000000000000..5387d3e7f984
--- /dev/null
+++ b/keyboards/suikagiken/suika27melo/keyboard.json
@@ -0,0 +1,67 @@
+{
+    "manufacturer": "suikagiken",
+    "keyboard_name": "suika27melo",
+    "maintainer": "suikagiken",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "midi":true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B4", "B5", "D7", "B6", "D6", "C6", "C7", "D0"],
+        "rows": ["F1", "F4", "D1", "D2"]
+    },
+    "url": "https://github.com/suikagiken/suika27melo",
+    "usb": {
+        "device_version": "1.1.0",
+        "vid": "0x4B48",
+        "pid": "0x0201"
+    },
+    "dynamic_keymap": {
+        "layer_count": 4
+    },
+    "build": {
+        "debounce_type": "sym_eager_pk"
+    },
+    "debounce": 50,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":2, "y":0},
+                {"matrix":[0, 2], "x":3, "y":0},
+                {"matrix":[0, 4], "x":5, "y":0},
+                {"matrix":[0, 5], "x":6, "y":0},
+                {"matrix":[0, 6], "x":7, "y":0},
+                {"matrix":[2, 1], "x":9, "y":0},
+                {"matrix":[2, 2], "x":10, "y":0},
+                {"matrix":[2, 4], "x":12, "y":0},
+                {"matrix":[2, 5], "x":13, "y":0},
+                {"matrix":[2, 6], "x":14, "y":0},
+                {"matrix":[1, 0], "x":0, "y":1},
+                {"matrix":[1, 1], "x":1.5, "y":1},
+                {"matrix":[1, 2], "x":2.5, "y":1},
+                {"matrix":[1, 3], "x":3.5, "y":1},
+                {"matrix":[1, 4], "x":4.5, "y":1},
+                {"matrix":[1, 5], "x":5.5, "y":1},
+                {"matrix":[1, 6], "x":6.5, "y":1},
+                {"matrix":[1, 7], "x":7.5, "y":1},
+                {"matrix":[3, 1], "x":8.5, "y":1},
+                {"matrix":[3, 2], "x":9.5, "y":1},
+                {"matrix":[3, 3], "x":10.5, "y":1},
+                {"matrix":[3, 4], "x":11.5, "y":1},
+                {"matrix":[3, 5], "x":12.5, "y":1},
+                {"matrix":[3, 6], "x":13.5, "y":1},
+                {"matrix":[3, 7], "x":14.5, "y":1},
+                {"matrix":[3, 8], "x":15.5, "y":1}
+           ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/suikagiken/suika27melo/keymaps/default/keymap.json b/keyboards/suikagiken/suika27melo/keymaps/default/keymap.json
new file mode 100644
index 000000000000..dadd846e48ea
--- /dev/null
+++ b/keyboards/suikagiken/suika27melo/keymaps/default/keymap.json
@@ -0,0 +1,12 @@
+{
+  "author": "@suikagiken",
+  "keyboard": "suikagiken/suika85ergo",
+  "keymap": "default",
+  "layout": "LAYOUT",
+  "layers": [
+    [
+        "KC_A",     "KC_D", "KC_F",         "KC_I", "KC_K", "KC_M",         "KC_P", "KC_R",         "KC_U", "KC_W", "KC_Y",  
+        "KC_B", "KC_C", "KC_E", "KC_G", "KC_H", "KC_J", "KC_L", "KC_N", "KC_O", "KC_Q", "KC_S", "KC_T", "KC_V", "KC_X", "KC_Z", "KC_SPC"  
+    ]
+  ]
+}
diff --git a/keyboards/suikagiken/suika27melo/keymaps/midi/keymap.json b/keyboards/suikagiken/suika27melo/keymaps/midi/keymap.json
new file mode 100644
index 000000000000..189665ddbfac
--- /dev/null
+++ b/keyboards/suikagiken/suika27melo/keymaps/midi/keymap.json
@@ -0,0 +1,12 @@
+{
+  "author": "@suikagiken",
+  "keyboard": "suikagiken/suika85ergo",
+  "keymap": "midi",
+  "layout": "LAYOUT",
+  "layers": [
+    [
+        "MI_OCTU",    "MI_Cs1", "MI_Ds1",        "MI_Fs1", "MI_Gs1", "MI_As1",       "MI_Cs2", "MI_Ds2",        "MI_Fs2", "MI_Gs2", "MI_As2", 
+        "MI_OCTD", "MI_C1", "MI_D1", "MI_E1", "MI_F1", "MI_G1", "MI_A1", "MI_B1", "MI_C2", "MI_D2", "MI_E2", "MI_F2", "MI_G2", "MI_A2", "MI_B2", "MI_C2"  
+    ]
+  ]
+}
diff --git a/keyboards/suikagiken/suika27melo/readme.md b/keyboards/suikagiken/suika27melo/readme.md
new file mode 100644
index 000000000000..0e0ca80b0cbe
--- /dev/null
+++ b/keyboards/suikagiken/suika27melo/readme.md
@@ -0,0 +1,48 @@
+# suika27melo
+(English Follows Japanese)
+
+## 概要
+![suika27melo1](https://github.com/suikagiken/suika27melo/blob/main/img/suika27melo_1.jpg)
+![suika27melo2](https://github.com/suikagiken/suika27melo/blob/main/img/suika27melo_2.jpg)
+
+suika27meloは2オクターブのピアノ鍵盤型マクロキーパッドです。
+通常のマクロキーパッドとしても使えるほか、MIDIキーボードとしてDAWソフトの入力や演奏に使用できます。
+VIA/REMAPに対応していますので、組み立て後すぐにキーアサインのカスタマイズが可能です。
+
+* 制作 : すいか技研 （Website: https://suikagiken.net GitHub: [suikagiken](https://github.com/suikagiken) ）
+* 販売 : すいか技研の[booth](https://suikagiken.booth.pm/)にて販売予定です
+
+## ビルドガイド
+
+[こちら](https://github.com/suikagiken/suika27melo/blob/main/buildguide_1.1.md)からご覧下さい。
+
+---
+
+## Overview
+
+suika27melo is a 2-octave piano shaped macro keypad.
+You can use it as a normal macro keypad, or use it as a MIDI keyboard for DAW software input and musical performance.
+It supports VIA/REMAP for changing key assignments, so it can be easily customized after assembly.
+
+* Keyboard Maintainer: [suikagiken](https://github.com/suikagiken)
+* Hardware Availability: Available at [booth](https://suikagiken.booth.pm/) soon.
+
+Make example for this keyboard (after setting up your build environment):
+
+    make suikagiken/suika27melo:default
+
+Flashing example for this keyboard:
+
+    make suikagiken/suika27melo:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (the top left key) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
+
+

From 95dffd1dd953fa2e03808da214869cc4167d7ca1 Mon Sep 17 00:00:00 2001
From: suikagiken <115451678+suikagiken@users.noreply.github.com>
Date: Tue, 19 Nov 2024 17:23:13 +0900
Subject: [PATCH 2/7] Update keyboards/suikagiken/suika27melo/keyboard.json

Co-authored-by: jack <jack@pngu.org>
---
 keyboards/suikagiken/suika27melo/keyboard.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/keyboards/suikagiken/suika27melo/keyboard.json b/keyboards/suikagiken/suika27melo/keyboard.json
index 5387d3e7f984..db8862f94eaa 100644
--- a/keyboards/suikagiken/suika27melo/keyboard.json
+++ b/keyboards/suikagiken/suika27melo/keyboard.json
@@ -24,9 +24,6 @@
         "vid": "0x4B48",
         "pid": "0x0201"
     },
-    "dynamic_keymap": {
-        "layer_count": 4
-    },
     "build": {
         "debounce_type": "sym_eager_pk"
     },

From 491d71551c669f5329783eb5434900737784fa8b Mon Sep 17 00:00:00 2001
From: suikagiken <115451678+suikagiken@users.noreply.github.com>
Date: Tue, 19 Nov 2024 17:23:22 +0900
Subject: [PATCH 3/7] Update keyboards/suikagiken/suika27melo/keyboard.json

Co-authored-by: jack <jack@pngu.org>
---
 keyboards/suikagiken/suika27melo/keyboard.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/suikagiken/suika27melo/keyboard.json b/keyboards/suikagiken/suika27melo/keyboard.json
index db8862f94eaa..cba256112968 100644
--- a/keyboards/suikagiken/suika27melo/keyboard.json
+++ b/keyboards/suikagiken/suika27melo/keyboard.json
@@ -10,7 +10,7 @@
         "command": false,
         "console": false,
         "extrakey": true,
-        "midi":true,
+        "midi": true,
         "mousekey": true,
         "nkro": true
     },

From c66cb38eaf7c569d23ad0f12270151986cede99e Mon Sep 17 00:00:00 2001
From: suikagiken <115451678+suikagiken@users.noreply.github.com>
Date: Tue, 19 Nov 2024 17:23:30 +0900
Subject: [PATCH 4/7] Update keyboards/suikagiken/suika27melo/readme.md

Co-authored-by: jack <jack@pngu.org>
---
 keyboards/suikagiken/suika27melo/readme.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/keyboards/suikagiken/suika27melo/readme.md b/keyboards/suikagiken/suika27melo/readme.md
index 0e0ca80b0cbe..c2bc67c6a53a 100644
--- a/keyboards/suikagiken/suika27melo/readme.md
+++ b/keyboards/suikagiken/suika27melo/readme.md
@@ -22,7 +22,6 @@ VIA/REMAPに対応していますので、組み立て後すぐにキーアサ
 
 suika27melo is a 2-octave piano shaped macro keypad.
 You can use it as a normal macro keypad, or use it as a MIDI keyboard for DAW software input and musical performance.
-It supports VIA/REMAP for changing key assignments, so it can be easily customized after assembly.
 
 * Keyboard Maintainer: [suikagiken](https://github.com/suikagiken)
 * Hardware Availability: Available at [booth](https://suikagiken.booth.pm/) soon.

From 866647326cb2fc69335f28667391d0bf4d640514 Mon Sep 17 00:00:00 2001
From: suikagiken <115451678+suikagiken@users.noreply.github.com>
Date: Tue, 19 Nov 2024 17:23:45 +0900
Subject: [PATCH 5/7] Update keyboards/suikagiken/suika27melo/readme.md

Co-authored-by: jack <jack@pngu.org>
---
 keyboards/suikagiken/suika27melo/readme.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/keyboards/suikagiken/suika27melo/readme.md b/keyboards/suikagiken/suika27melo/readme.md
index c2bc67c6a53a..1ae99ea5f2ce 100644
--- a/keyboards/suikagiken/suika27melo/readme.md
+++ b/keyboards/suikagiken/suika27melo/readme.md
@@ -43,5 +43,3 @@ Enter the bootloader in 3 ways:
 * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (the top left key) and plug in the keyboard
 * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
 * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
-
-

From 7db83e2df813bd66af51b106fe8f794cbcfeb850 Mon Sep 17 00:00:00 2001
From: suikagiken <115451678+suikagiken@users.noreply.github.com>
Date: Tue, 19 Nov 2024 17:35:43 +0900
Subject: [PATCH 6/7] change to imgur link

---
 keyboards/suikagiken/suika27melo/readme.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/keyboards/suikagiken/suika27melo/readme.md b/keyboards/suikagiken/suika27melo/readme.md
index 1ae99ea5f2ce..1aa46565f003 100644
--- a/keyboards/suikagiken/suika27melo/readme.md
+++ b/keyboards/suikagiken/suika27melo/readme.md
@@ -2,12 +2,11 @@
 (English Follows Japanese)
 
 ## 概要
-![suika27melo1](https://github.com/suikagiken/suika27melo/blob/main/img/suika27melo_1.jpg)
-![suika27melo2](https://github.com/suikagiken/suika27melo/blob/main/img/suika27melo_2.jpg)
+![suika27melo1](https://i.imgur.com/iFz3c1U.jpg)
+![suika27melo2](https://i.imgur.com/xR7KpVR.jpg)
 
 suika27meloは2オクターブのピアノ鍵盤型マクロキーパッドです。
 通常のマクロキーパッドとしても使えるほか、MIDIキーボードとしてDAWソフトの入力や演奏に使用できます。
-VIA/REMAPに対応していますので、組み立て後すぐにキーアサインのカスタマイズが可能です。
 
 * 制作 : すいか技研 （Website: https://suikagiken.net GitHub: [suikagiken](https://github.com/suikagiken) ）
 * 販売 : すいか技研の[booth](https://suikagiken.booth.pm/)にて販売予定です

From 555421e372373b285f111b58736859b86728606b Mon Sep 17 00:00:00 2001
From: suikagiken <115451678+suikagiken@users.noreply.github.com>
Date: Thu, 5 Dec 2024 20:47:23 +0900
Subject: [PATCH 7/7] fix keymap.json error

---
 keyboards/suikagiken/suika27melo/keymaps/default/keymap.json | 4 ++--
 keyboards/suikagiken/suika27melo/keymaps/midi/keymap.json    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/keyboards/suikagiken/suika27melo/keymaps/default/keymap.json b/keyboards/suikagiken/suika27melo/keymaps/default/keymap.json
index dadd846e48ea..48807b2b86d2 100644
--- a/keyboards/suikagiken/suika27melo/keymaps/default/keymap.json
+++ b/keyboards/suikagiken/suika27melo/keymaps/default/keymap.json
@@ -1,6 +1,6 @@
 {
-  "author": "@suikagiken",
-  "keyboard": "suikagiken/suika85ergo",
+  "author": "suikagiken",
+  "keyboard": "suikagiken/suika27melo",
   "keymap": "default",
   "layout": "LAYOUT",
   "layers": [
diff --git a/keyboards/suikagiken/suika27melo/keymaps/midi/keymap.json b/keyboards/suikagiken/suika27melo/keymaps/midi/keymap.json
index 189665ddbfac..5caad4597948 100644
--- a/keyboards/suikagiken/suika27melo/keymaps/midi/keymap.json
+++ b/keyboards/suikagiken/suika27melo/keymaps/midi/keymap.json
@@ -1,6 +1,6 @@
 {
-  "author": "@suikagiken",
-  "keyboard": "suikagiken/suika85ergo",
+  "author": "suikagiken",
+  "keyboard": "suikagiken/suika27melo",
   "keymap": "midi",
   "layout": "LAYOUT",
   "layers": [