Merge remote-tracking branch 'origin/master' into develop

18 files changed, 444 insertions, 2 deletions

diff --git a/keyboards/kbdfans/bella/rgb/config.h b/keyboards/kbdfans/bella/rgb/config.h
index c4eae659e9..f56049690b 100644
--- a/keyboards/kbdfans/bella/rgb/config.h
+++ b/keyboards/kbdfans/bella/rgb/config.h
@@ -32,7 +32,7 @@
 
 #define DIODE_DIRECTION COL2ROW
 
-#define DEBOUNCE 3
+#define DEBOUNCE 5
 
 /* disable these deprecated features by default */
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/kbdfans/bella/rgb_iso/config.h b/keyboards/kbdfans/bella/rgb_iso/config.h
index c37a57a5c7..fc7a9d7c08 100644
--- a/keyboards/kbdfans/bella/rgb_iso/config.h
+++ b/keyboards/kbdfans/bella/rgb_iso/config.h
@@ -32,7 +32,7 @@
 
 #define DIODE_DIRECTION COL2ROW
 
-#define DEBOUNCE 3
+#define DEBOUNCE 5
 
 /* disable these deprecated features by default */
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/yynmt/acperience12/acperience12.c b/keyboards/yynmt/acperience12/acperience12.c
new file mode 100644
index 0000000000..783f87b094
--- /dev/null
+++ b/keyboards/yynmt/acperience12/acperience12.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 yynmt
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include "acperience12.h"
diff --git a/keyboards/yynmt/acperience12/acperience12.h b/keyboards/yynmt/acperience12/acperience12.h
new file mode 100644
index 0000000000..62102249e1
--- /dev/null
+++ b/keyboards/yynmt/acperience12/acperience12.h
@@ -0,0 +1,23 @@
+/* Copyright 2021 yynmt
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#ifdef KEYBOARD_yynmt_acperience12_rev1
+#    include "rev1.h"
+#endif
+
+#include "quantum.h"
diff --git a/keyboards/yynmt/acperience12/config.h b/keyboards/yynmt/acperience12/config.h
new file mode 100644
index 0000000000..b725cd2458
--- /dev/null
+++ b/keyboards/yynmt/acperience12/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2021 yynmt
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
diff --git a/keyboards/yynmt/acperience12/info.json b/keyboards/yynmt/acperience12/info.json
new file mode 100644
index 0000000000..034ed82488
--- /dev/null
+++ b/keyboards/yynmt/acperience12/info.json
@@ -0,0 +1,19 @@
+{
+    "keyboard_name": "Acperience12",
+    "url": "http://yynmt.com",
+    "maintainer": "yynmt",
+    "width": 2,
+    "height": 6,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x":0, "y":0}, {"x":1, "y":0},
+                {"x":0, "y":1}, {"x":1, "y":1},
+                {"x":0, "y":2}, {"x":1, "y":2},
+                {"x":0, "y":3}, {"x":1, "y":3},
+                {"x":0, "y":4}, {"x":1, "y":4},
+                {"x":0, "y":5}, {"x":1, "y":5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/yynmt/acperience12/keymaps/default/keymap.c b/keyboards/yynmt/acperience12/keymaps/default/keymap.c
new file mode 100644
index 0000000000..c806ef525f
--- /dev/null
+++ b/keyboards/yynmt/acperience12/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2021 yynmt
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+  _BASE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Base */
+  [_BASE] = LAYOUT(
+    KC_1, KC_2,
+    KC_3, KC_4,
+    KC_5, KC_6,
+    KC_7, KC_8,
+    KC_9, KC_A,
+    KC_B, KC_C
+  ),
+};
diff --git a/keyboards/yynmt/acperience12/keymaps/default/readme.md b/keyboards/yynmt/acperience12/keymaps/default/readme.md
new file mode 100644
index 0000000000..d820d9dbce
--- /dev/null
+++ b/keyboards/yynmt/acperience12/keymaps/default/readme.md
@@ -0,0 +1,25 @@
+# The default keymap for Acperience12
+
+This keymap is for operation verification.
+
+```
+,-------------.
+|  1   |  2   |
+|      |      |
+|------+------|
+|  4   |  3   |
+|      |      |
+|------+------|
+|  5   |  6   |
+|      |      |
+|------+------|
+|  7   |  8   |
+|      |      |
+|------+------|
+|  9   |  a   |
+|      |      |
+|------+------|
+|  b   |  c   |
+|      |      |
+`-------------'
+```
diff --git a/keyboards/yynmt/acperience12/keymaps/via/config.h b/keyboards/yynmt/acperience12/keymaps/via/config.h
new file mode 100644
index 0000000000..3754895422
--- /dev/null
+++ b/keyboards/yynmt/acperience12/keymaps/via/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2021 yynmt
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 12
diff --git a/keyboards/yynmt/acperience12/keymaps/via/keymap.c b/keyboards/yynmt/acperience12/keymaps/via/keymap.c
new file mode 100644
index 0000000000..01230a0e4d
--- /dev/null
+++ b/keyboards/yynmt/acperience12/keymaps/via/keymap.c
@@ -0,0 +1,116 @@
+/* Copyright 2021 yynmt
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+    KC_1, KC_2,
+    KC_3, KC_4,
+    KC_5, KC_6,
+    KC_7, KC_8,
+    KC_9, KC_A,
+    KC_B, KC_C
+  ),
+  [1] = LAYOUT(
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS
+  ),
+  [2] = LAYOUT(
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS
+  ),
+  [3] = LAYOUT(
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS
+  ),
+  [4] = LAYOUT(
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS
+  ),
+  [5] = LAYOUT(
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS
+  ),
+  [6] = LAYOUT(
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS
+  ),
+  [7] = LAYOUT(
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS
+  ),
+  [8] = LAYOUT(
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS
+  ),
+  [9] = LAYOUT(
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS
+  ),
+  [10] = LAYOUT(
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS
+  ),
+  [11] = LAYOUT(
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS
+  )
+};
diff --git a/keyboards/yynmt/acperience12/keymaps/via/rules.mk b/keyboards/yynmt/acperience12/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/yynmt/acperience12/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/yynmt/acperience12/readme.md b/keyboards/yynmt/acperience12/readme.md
new file mode 100644
index 0000000000..b08369ff02
--- /dev/null
+++ b/keyboards/yynmt/acperience12/readme.md
@@ -0,0 +1,21 @@
+# Acperience12
+
+![Acperience12](https://raw.githubusercontent.com/yynmt/Acperience12/main/images/main_image.jpg)
+
+Acperience12 is 12 keys macropad.
+
+* Keyboard Maintainer: [yynmt](https://github.com/yynmt)
+* Hardware Supported: The A12 PCB
+* Hardware Availability: [This repository](https://github.com/yynmt/Acperience12) has the plate files and other files.
+
+Enter the bootloader: Press the reset button. The reset button is located on the top side of the PCB between SW9,10 and SW11,12. Insert a long thin stick (e.g. SIM eject tool or paper clip) into the hole on the top plate.
+
+Make example for this macropad (after setting up your build environment):
+
+    make yynmt/acperience12:default
+
+Flashing example for this macropad:
+
+    make yynmt/acperience12: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).
diff --git a/keyboards/yynmt/acperience12/rev1/config.h b/keyboards/yynmt/acperience12/rev1/config.h
new file mode 100644
index 0000000000..7281f9bf7f
--- /dev/null
+++ b/keyboards/yynmt/acperience12/rev1/config.h
@@ -0,0 +1,50 @@
+/* Copyright 2021 yynmt
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x04D8 //Sublicense from Microchip Technology
+#define PRODUCT_ID      0xEA51 //Sublicense from Microchip Technology
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    yynmt
+#define PRODUCT         Acperience12
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 2
+
+#define DIRECT_PINS { { B5, D0 }, { B4, D1 }, { B3, D2 }, { B2, D3 }, { B1, D4 }, { B0, D5 } }
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/keyboards/yynmt/acperience12/rev1/readme.md b/keyboards/yynmt/acperience12/rev1/readme.md
new file mode 100644
index 0000000000..b08369ff02
--- /dev/null
+++ b/keyboards/yynmt/acperience12/rev1/readme.md
@@ -0,0 +1,21 @@
+# Acperience12
+
+![Acperience12](https://raw.githubusercontent.com/yynmt/Acperience12/main/images/main_image.jpg)
+
+Acperience12 is 12 keys macropad.
+
+* Keyboard Maintainer: [yynmt](https://github.com/yynmt)
+* Hardware Supported: The A12 PCB
+* Hardware Availability: [This repository](https://github.com/yynmt/Acperience12) has the plate files and other files.
+
+Enter the bootloader: Press the reset button. The reset button is located on the top side of the PCB between SW9,10 and SW11,12. Insert a long thin stick (e.g. SIM eject tool or paper clip) into the hole on the top plate.
+
+Make example for this macropad (after setting up your build environment):
+
+    make yynmt/acperience12:default
+
+Flashing example for this macropad:
+
+    make yynmt/acperience12: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).
diff --git a/keyboards/yynmt/acperience12/rev1/rev1.c b/keyboards/yynmt/acperience12/rev1/rev1.c
new file mode 100644
index 0000000000..f58e4a2b18
--- /dev/null
+++ b/keyboards/yynmt/acperience12/rev1/rev1.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 yynmt
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include "rev1.h"
diff --git a/keyboards/yynmt/acperience12/rev1/rev1.h b/keyboards/yynmt/acperience12/rev1/rev1.h
new file mode 100644
index 0000000000..78c6c0c8ca
--- /dev/null
+++ b/keyboards/yynmt/acperience12/rev1/rev1.h
@@ -0,0 +1,37 @@
+/* Copyright 2021 yynmt
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "acperience12.h"
+
+
+#define LAYOUT( \
+  K00, K01, \
+  K02, K03, \
+  K04, K05, \
+  K06, K07, \
+  K08, K09, \
+  K10, K11 \
+) \
+{ \
+  { K00, K01 }, \
+  { K02, K03 }, \
+  { K04, K05 }, \
+  { K06, K07 }, \
+  { K08, K09 }, \
+  { K10, K11 }, \
+}
diff --git a/keyboards/yynmt/acperience12/rev1/rules.mk b/keyboards/yynmt/acperience12/rev1/rules.mk
new file mode 100644
index 0000000000..6ab81f6b12
--- /dev/null
+++ b/keyboards/yynmt/acperience12/rev1/rules.mk
@@ -0,0 +1,5 @@
+# MCU name
+MCU = atmega32u2
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
diff --git a/keyboards/yynmt/acperience12/rules.mk b/keyboards/yynmt/acperience12/rules.mk
new file mode 100644
index 0000000000..bb8f6496c5
--- /dev/null
+++ b/keyboards/yynmt/acperience12/rules.mk
@@ -0,0 +1,18 @@
+# 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 = no            # 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
+
+DEFAULT_FOLDER = yynmt/acperience12/rev1