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

10 files changed, 206 insertions, 0 deletions

diff --git a/keyboards/jadookb/jkb2/config.h b/keyboards/jadookb/jkb2/config.h
new file mode 100644
index 000000000..ac5808f23
--- /dev/null
+++ b/keyboards/jadookb/jkb2/config.h
@@ -0,0 +1,32 @@
+ /* Copyright 2021 Wizard-GG
+ *
+ * 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"
+
+#define VENDOR_ID       0x4A4B // "JK"
+#define PRODUCT_ID      0x3225 // "2%"
+#define DEVICE_VER      0x0001
+#define MANUFACTURER JadooKB
+#define PRODUCT      JKB2
+
+#define MATRIX_ROWS 1
+#define MATRIX_COLS 2
+
+#define MATRIX_ROW_PINS { B1 }
+#define MATRIX_COL_PINS { B3 ,B2}
+#define UNUSED_PINS
+
+#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/jadookb/jkb2/info.json b/keyboards/jadookb/jkb2/info.json
new file mode 100644
index 000000000..ed818d641
--- /dev/null
+++ b/keyboards/jadookb/jkb2/info.json
@@ -0,0 +1,10 @@
+{
+  "keyboard_name": "jkb2",
+  "url": "https://jadookb.com/",
+  "maintainer": "Wizard-GG",
+  "layouts": {
+    "LAYOUT": {
+      "layout": [ {"label":"z","x": 0, "y": 0 }, {"label":"x","x": 1, "y": 0 }]
+    }
+  }
+}
diff --git a/keyboards/jadookb/jkb2/jkb2.c b/keyboards/jadookb/jkb2/jkb2.c
new file mode 100644
index 000000000..3ac90e97e
--- /dev/null
+++ b/keyboards/jadookb/jkb2/jkb2.c
@@ -0,0 +1,16 @@
+ /* Copyright 2021 Wizard-GG
+ *
+ * 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 "jkb2.h"
diff --git a/keyboards/jadookb/jkb2/jkb2.h b/keyboards/jadookb/jkb2/jkb2.h
new file mode 100644
index 000000000..1bddef45d
--- /dev/null
+++ b/keyboards/jadookb/jkb2/jkb2.h
@@ -0,0 +1,25 @@
+ /* Copyright 2021 Wizard-GG
+ *
+ * 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 "quantum.h"
+
+#define LAYOUT( \
+ K01, K02 \
+) \
+{ \
+ { K01, K02 }, \
+}
diff --git a/keyboards/jadookb/jkb2/keymaps/default/keymap.c b/keyboards/jadookb/jkb2/keymaps/default/keymap.c
new file mode 100644
index 000000000..f2470c083
--- /dev/null
+++ b/keyboards/jadookb/jkb2/keymaps/default/keymap.c
@@ -0,0 +1,23 @@
+ /* Copyright 2021 Wizard-GG
+  *
+  * 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_Z,  KC_X
+  )
+};
diff --git a/keyboards/jadookb/jkb2/keymaps/via/config.h b/keyboards/jadookb/jkb2/keymaps/via/config.h
new file mode 100644
index 000000000..ecd00aced
--- /dev/null
+++ b/keyboards/jadookb/jkb2/keymaps/via/config.h
@@ -0,0 +1,20 @@
+
+ /* Copyright 2021 Wizard-GG
+  *
+  * 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 USB_POLLING_INTERVAL_MS 1
+#define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/jadookb/jkb2/keymaps/via/keymap.c b/keyboards/jadookb/jkb2/keymaps/via/keymap.c
new file mode 100644
index 000000000..fc10bc32b
--- /dev/null
+++ b/keyboards/jadookb/jkb2/keymaps/via/keymap.c
@@ -0,0 +1,34 @@
+
+ /* Copyright 2021 Wizard-GG
+  *
+  * 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_Z, KC_X
+      ),
+      [1] = LAYOUT(
+          _______, _______
+      ),
+      [2] = LAYOUT(
+          _______, _______
+      ),
+      [3] = LAYOUT(
+          _______, _______
+      )
+};
diff --git a/keyboards/jadookb/jkb2/keymaps/via/rules.mk b/keyboards/jadookb/jkb2/keymaps/via/rules.mk
new file mode 100644
index 000000000..36b7ba9cb
--- /dev/null
+++ b/keyboards/jadookb/jkb2/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/jadookb/jkb2/readme.md b/keyboards/jadookb/jkb2/readme.md
new file mode 100644
index 000000000..09f01a6cd
--- /dev/null
+++ b/keyboards/jadookb/jkb2/readme.md
@@ -0,0 +1,23 @@
+# JKB2 osu! Macropad 
+
+![JKB2](https://i.imgur.com/9f0HETUh.jpg)
+
+A 2% hotswap osu! Macropad from JadooKB.
+
+* Keyboard Maintainer: [Wizard-GG](https://github.com/wizard-gg)
+* Hardware Supported: JKB2 OSU
+* Hardware Availability: [Jadoo Keyboard](https://jadookb.com/jkb2)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make jadookb/jkb2:default
+
+Flashing example for this keyboard:
+
+    make jadookb/jkb2:default:flash
+
+To reset the board into bootloader mode, do the following step:
+
+* Hold the **left** key while connecting the USB cable
+
+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/jadookb/jkb2/rules.mk b/keyboards/jadookb/jkb2/rules.mk
new file mode 100644
index 000000000..10e9616d6
--- /dev/null
+++ b/keyboards/jadookb/jkb2/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # 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
+AUDIO_ENABLE = no           # Audio output