diff --git a/keyboards/ash_xiix/ash_xiix.c b/keyboards/ash_xiix/ash_xiix.c
new file mode 100644
index 000000000..56e6f48d0
--- /dev/null
+++ b/keyboards/ash_xiix/ash_xiix.c
@@ -0,0 +1,25 @@
+/* Copyright 2020 sh_xguitar
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+#include "ash_xiix.h"
+
+bool led_update_kb(led_t led_state) {
+ if (led_update_user(led_state)) {
+ writePin(NUM_LOCK_LED_PIN, led_state.num_lock);
+ writePin(CAPS_LOCK_LED_PIN, led_state.caps_lock);
+ writePin(SCROLL_LOCK_LED_PIN, led_state.scroll_lock);
+ }
+ return true;
+}
diff --git a/keyboards/ash_xiix/ash_xiix.h b/keyboards/ash_xiix/ash_xiix.h
new file mode 100644
index 000000000..48f9a31a2
--- /dev/null
+++ b/keyboards/ash_xiix/ash_xiix.h
@@ -0,0 +1,51 @@
+/* Copyright 2020 sh_xguitar
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+#pragma once
+
+#include "quantum.h"
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_all( \
+ k00, k01, k02, k03, k60, k61, k62, k63, k04, k05, k06, k07, k08, k54, k55, k56, k57, \
+ k64, k65, k66, k67, \
+ k10, k11, k12, k13, k70, k71, k72, k73, k14, k15, k16, k17, k18, k19, k74, k75, k76, k77, \
+ k20, k21, k22, k23, k80, k81, k82, k83, k24, k25, k26, k27, k28, k29, k84, k85, k86, k87, \
+ k30, k31, k32, k33, k90, k91, k92, k93, k34, k35, k36, k37, k38, k94, k95, k96, k97, \
+ k40, k41, k42, k43, ka0, ka1, ka2, ka3, k44, k45, k46, k47, k48, ka9, ka4, ka5, ka6, ka7, \
+ k50, k51, k52, k53, kb4, kb7, ka8, kb8, kb9, kb5, kb6 \
+) \
+{ \
+ { k00, k01, k02, k03, k04, k05, k06, k07, k08, KC_NO }, \
+ { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
+ { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
+ { k30, k31, k32, k33, k34, k35, k36, k37, k38, KC_NO }, \
+ { k40, k41, k42, k43, k44, k45, k46, k47, k48, KC_NO }, \
+ { k50, k51, k52, k53, k54, k55, k56, k57, KC_NO, KC_NO }, \
+ { k60, k61, k62, k63, k64, k65, k66, k67, KC_NO, KC_NO }, \
+ { k70, k71, k72, k73, k74, k75, k76, k77, KC_NO, KC_NO }, \
+ { k80, k81, k82, k83, k84, k85, k86, k87, KC_NO, KC_NO }, \
+ { k90, k91, k92, k93, k94, k95, k96, k97, KC_NO, KC_NO }, \
+ { ka0, ka1, ka2, ka3, ka4, ka5, ka6, ka7, ka8, ka9 }, \
+ { KC_NO, KC_NO, KC_NO, KC_NO, kb4, kb5, kb6, kb7, kb8, kb9 } \
+}
+
diff --git a/keyboards/ash_xiix/config.h b/keyboards/ash_xiix/config.h
new file mode 100644
index 000000000..bcfdaeef7
--- /dev/null
+++ b/keyboards/ash_xiix/config.h
@@ -0,0 +1,56 @@
+/*
+Copyright 2020 sh_xguitar
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see .
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0xFEED
+#define PRODUCT_ID 0x14BC
+#define DEVICE_VER 0x0001
+#define MANUFACTURER ASH
+#define PRODUCT XIIX
+
+/* key matrix size */
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 10
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, D0, D1, D2, D3, D5, D4, D6 }
+#define MATRIX_COL_PINS { F1, F4, F5, F6, B0, B2, B1, B3, B7, C7 }
+#define UNUSED_PINS
+
+#define NUM_LOCK_LED_PIN E6
+#define CAPS_LOCK_LED_PIN F0
+#define SCROLL_LOCK_LED_PIN F7
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/ash_xiix/info.json b/keyboards/ash_xiix/info.json
new file mode 100644
index 000000000..c81eb0a6b
--- /dev/null
+++ b/keyboards/ash_xiix/info.json
@@ -0,0 +1,540 @@
+{
+ "keyboard_name": "ASH-XIIX",
+ "url": "config.qmk.fm",
+ "maintainer": "qmk",
+ "width": 19.5,
+ "height": 7.25,
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {
+ "label": "Esc",
+ "x": 0,
+ "y": 0
+ },
+ {
+ "label": "F1",
+ "x": 1.25,
+ "y": 0
+ },
+ {
+ "label": "F2",
+ "x": 2.25,
+ "y": 0
+ },
+ {
+ "label": "F3",
+ "x": 3.25,
+ "y": 0
+ },
+ {
+ "label": "F4",
+ "x": 4.25,
+ "y": 0
+ },
+ {
+ "label": "F5",
+ "x": 5.5,
+ "y": 0
+ },
+ {
+ "label": "F6",
+ "x": 6.5,
+ "y": 0
+ },
+ {
+ "label": "F7",
+ "x": 7.5,
+ "y": 0
+ },
+ {
+ "label": "F8",
+ "x": 8.5,
+ "y": 0
+ },
+ {
+ "label": "F9",
+ "x": 9.75,
+ "y": 0
+ },
+ {
+ "label": "F10",
+ "x": 10.75,
+ "y": 0
+ },
+ {
+ "label": "F11",
+ "x": 11.75,
+ "y": 0
+ },
+ {
+ "label": "F12",
+ "x": 12.75,
+ "y": 0
+ },
+ {
+ "label": "Insert",
+ "x": 15.5,
+ "y": 0
+ },
+ {
+ "label": "Home",
+ "x": 16.5,
+ "y": 0
+ },
+ {
+ "label": "PgUp",
+ "x": 17.5,
+ "y": 0
+ },
+ {
+ "label": "PrtSc",
+ "x": 18.5,
+ "y": 0
+ },
+ {
+ "label": "Del",
+ "x": 15.5,
+ "y": 1
+ },
+ {
+ "label": "End",
+ "x": 16.5,
+ "y": 1
+ },
+ {
+ "label": "PgDn",
+ "x": 17.5,
+ "y": 1
+ },
+ {
+ "label": "Scroll Lock",
+ "x": 18.5,
+ "y": 1
+ },
+ {
+ "label": "~",
+ "x": 0,
+ "y": 2
+ },
+ {
+ "label": "!",
+ "x": 1,
+ "y": 2
+ },
+ {
+ "label": "@",
+ "x": 2,
+ "y": 2
+ },
+ {
+ "label": "#",
+ "x": 3,
+ "y": 2
+ },
+ {
+ "label": "$",
+ "x": 4,
+ "y": 2
+ },
+ {
+ "label": "%",
+ "x": 5,
+ "y": 2
+ },
+ {
+ "label": "^",
+ "x": 6,
+ "y": 2
+ },
+ {
+ "label": "&",
+ "x": 7,
+ "y": 2
+ },
+ {
+ "label": "",
+ "x": 8,
+ "y": 2
+ },
+ {
+ "label": "(",
+ "x": 9,
+ "y": 2
+ },
+ {
+ "label": ")",
+ "x": 10,
+ "y": 2
+ },
+ {
+ "label": "_",
+ "x": 11,
+ "y": 2
+ },
+ {
+ "label": "+",
+ "x": 12,
+ "y": 2
+ },
+ {
+ "label": "Backspace",
+ "x": 13,
+ "y": 2,
+ "w": 2
+ },
+ {
+ "label": "Num Lock",
+ "x": 15.5,
+ "y": 2
+ },
+ {
+ "label": "/",
+ "x": 16.5,
+ "y": 2
+ },
+ {
+ "x": 17.5,
+ "y": 2
+ },
+ {
+ "label": "Pause",
+ "x": 18.5,
+ "y": 2
+ },
+ {
+ "label": "Tab",
+ "x": 0,
+ "y": 3,
+ "w": 1.5
+ },
+ {
+ "label": "Q",
+ "x": 1.5,
+ "y": 3
+ },
+ {
+ "label": "W",
+ "x": 2.5,
+ "y": 3
+ },
+ {
+ "label": "E",
+ "x": 3.5,
+ "y": 3
+ },
+ {
+ "label": "R",
+ "x": 4.5,
+ "y": 3
+ },
+ {
+ "label": "T",
+ "x": 5.5,
+ "y": 3
+ },
+ {
+ "label": "Y",
+ "x": 6.5,
+ "y": 3
+ },
+ {
+ "label": "U",
+ "x": 7.5,
+ "y": 3
+ },
+ {
+ "label": "I",
+ "x": 8.5,
+ "y": 3
+ },
+ {
+ "label": "O",
+ "x": 9.5,
+ "y": 3
+ },
+ {
+ "label": "P",
+ "x": 10.5,
+ "y": 3
+ },
+ {
+ "label": "{",
+ "x": 11.5,
+ "y": 3
+ },
+ {
+ "label": "}",
+ "x": 12.5,
+ "y": 3
+ },
+ {
+ "label": "|",
+ "x": 13.5,
+ "y": 3,
+ "w": 1.5
+ },
+ {
+ "label": "7",
+ "x": 15.5,
+ "y": 3
+ },
+ {
+ "label": "8",
+ "x": 16.5,
+ "y": 3
+ },
+ {
+ "label": "9",
+ "x": 17.5,
+ "y": 3
+ },
+ {
+ "label": "-",
+ "x": 18.5,
+ "y": 3
+ },
+ {
+ "label": "Caps Lock",
+ "x": 0,
+ "y": 4,
+ "w": 1.75
+ },
+ {
+ "label": "A",
+ "x": 1.75,
+ "y": 4
+ },
+ {
+ "label": "S",
+ "x": 2.75,
+ "y": 4
+ },
+ {
+ "label": "D",
+ "x": 3.75,
+ "y": 4
+ },
+ {
+ "label": "F",
+ "x": 4.75,
+ "y": 4
+ },
+ {
+ "label": "G",
+ "x": 5.75,
+ "y": 4
+ },
+ {
+ "label": "H",
+ "x": 6.75,
+ "y": 4
+ },
+ {
+ "label": "J",
+ "x": 7.75,
+ "y": 4
+ },
+ {
+ "label": "K",
+ "x": 8.75,
+ "y": 4
+ },
+ {
+ "label": "L",
+ "x": 9.75,
+ "y": 4
+ },
+ {
+ "label": ":",
+ "x": 10.75,
+ "y": 4
+ },
+ {
+ "label": "\"",
+ "x": 11.75,
+ "y": 4
+ },
+ {
+ "label": "Enter",
+ "x": 12.75,
+ "y": 4,
+ "w": 2.25
+ },
+ {
+ "label": "4",
+ "x": 15.5,
+ "y": 4
+ },
+ {
+ "label": "5",
+ "x": 16.5,
+ "y": 4
+ },
+ {
+ "label": "6",
+ "x": 17.5,
+ "y": 4
+ },
+ {
+ "label": "+",
+ "x": 18.5,
+ "y": 4
+ },
+ {
+ "label": "Shift",
+ "x": 0,
+ "y": 5,
+ "w": 1.25
+ },
+ {
+ "label": "ISO1",
+ "x": 1.25,
+ "y": 5
+ },
+ {
+ "label": "Z",
+ "x": 2.25,
+ "y": 5
+ },
+ {
+ "label": "X",
+ "x": 3.25,
+ "y": 5
+ },
+ {
+ "label": "C",
+ "x": 4.25,
+ "y": 5
+ },
+ {
+ "label": "V",
+ "x": 5.25,
+ "y": 5
+ },
+ {
+ "label": "B",
+ "x": 6.25,
+ "y": 5
+ },
+ {
+ "label": "N",
+ "x": 7.25,
+ "y": 5
+ },
+ {
+ "label": "M",
+ "x": 8.25,
+ "y": 5
+ },
+ {
+ "label": "<",
+ "x": 9.25,
+ "y": 5
+ },
+ {
+ "label": ">",
+ "x": 10.25,
+ "y": 5
+ },
+ {
+ "label": "?",
+ "x": 11.25,
+ "y": 5
+ },
+ {
+ "label": "Shift",
+ "x": 12.25,
+ "y": 5,
+ "w": 1.75
+ },
+ {
+ "label": "up",
+ "x": 14.25,
+ "y": 5.25
+ },
+ {
+ "label": "1",
+ "x": 15.5,
+ "y": 5
+ },
+ {
+ "label": "2",
+ "x": 16.5,
+ "y": 5
+ },
+ {
+ "label": "3",
+ "x": 17.5,
+ "y": 5
+ },
+ {
+ "label": "Enter",
+ "x": 18.5,
+ "y": 5,
+ "h": 2
+ },
+ {
+ "label": "Ctrl",
+ "x": 0,
+ "y": 6,
+ "w": 1.25
+ },
+ {
+ "label": "OS",
+ "x": 1.25,
+ "y": 6,
+ "w": 1.25
+ },
+ {
+ "label": "Alt",
+ "x": 2.5,
+ "y": 6,
+ "w": 1.25
+ },
+ {
+ "x": 3.75,
+ "y": 6,
+ "w": 6.25
+ },
+ {
+ "label": "Alt",
+ "x": 10,
+ "y": 6,
+ "w": 1.5
+ },
+ {
+ "label": "Ctrl",
+ "x": 11.5,
+ "y": 6,
+ "w": 1.5
+ },
+ {
+ "label": "left",
+ "x": 13.25,
+ "y": 6.25
+ },
+ {
+ "label": "down",
+ "x": 14.25,
+ "y": 6.25
+ },
+ {
+ "label": "right",
+ "x": 15.25,
+ "y": 6.25
+ },
+ {
+ "label": "0",
+ "x": 16.5,
+ "y": 6
+ },
+ {
+ "label": ".",
+ "x": 17.5,
+ "y": 6
+ }
+ ]
+ }
+ }
+}
diff --git a/keyboards/ash_xiix/keymaps/default/keymap.c b/keyboards/ash_xiix/keymaps/default/keymap.c
new file mode 100644
index 000000000..2127dc590
--- /dev/null
+++ b/keyboards/ash_xiix/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2020 sh_xguitar
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_all ( /* Base */
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_HOME, KC_PGUP, KC_PSCR,
+ KC_DEL, KC_END, KC_PGDN, KC_SLCK,
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, MO(1),
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PMNS,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT, KC_P0, KC_PDOT
+ ),
+ [1] = LAYOUT_all (
+ RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, KC_MUTE, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______, _______, _______, _______,
+ _______, _______, _______, KC_MPLY, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______
+ ),
+};
diff --git a/keyboards/ash_xiix/readme.md b/keyboards/ash_xiix/readme.md
new file mode 100644
index 000000000..1fbecfaac
--- /dev/null
+++ b/keyboards/ash_xiix/readme.md
@@ -0,0 +1,15 @@
+# ASH-XIIX
+
+
+
+In mission to fill my Cherry 1800 case. So I continue developing 1800 PCB (ASH-1800) to fit G80-1800 case. It has some update to make ASH-XIIX more user friendly.
+
+* Keyboard Maintainer: [sh_xguitar](https://github.com/sh-xguitar)
+* Keyboard Specification: ATmega32u4, 5P TH MINI USB, JST-PH 5P, Larger ISP Header.
+* Hardware Availability: Sold in Indonesia only
+
+Make example for this keyboard (after setting up your build environment):
+
+ make ash_xiix:default
+
+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).
diff --git a/keyboards/ash_xiix/rules.mk b/keyboards/ash_xiix/rules.mk
new file mode 100644
index 000000000..32981133b
--- /dev/null
+++ b/keyboards/ash_xiix/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = no # Console for debug
+COMMAND_ENABLE = no # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes # USB Nkey Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no # Enable Bluetooth
+AUDIO_ENABLE = no # Audio output