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

9 files changed, 298 insertions, 0 deletions

diff --git a/keyboards/rart/rart4x4/config.h b/keyboards/rart/rart4x4/config.h
new file mode 100644
index 0000000000..0d79e31403
--- /dev/null
+++ b/keyboards/rart/rart4x4/config.h
@@ -0,0 +1,62 @@
+/*
+Copyright 2020 Alabahuy
+
+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"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x414C 
+#define PRODUCT_ID      0x0004
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Alabahuy
+#define PRODUCT         RART4X4
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 4
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { F4, B6, B3, B1 }
+#define MATRIX_COL_PINS { F7, B2, B5, B4 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* 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
+
+#define ENCODERS_PAD_A { F6, D7 }
+#define ENCODERS_PAD_B { F5, E6 }
+
+#define RGB_DI_PIN D3
+#ifdef RGB_DI_PIN
+#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 5
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_LIMIT_VAL 240
+#define RGBLIGHT_SLEEP
+#endif
diff --git a/keyboards/rart/rart4x4/info.json b/keyboards/rart/rart4x4/info.json
new file mode 100644
index 0000000000..a115f3a644
--- /dev/null
+++ b/keyboards/rart/rart4x4/info.json
@@ -0,0 +1,32 @@
+{
+  "keyboard_name": "RART4X4",
+  "url": "",
+  "maintainer": "Alabahuy",
+  "width": 4,
+  "height": 4,
+  "layouts": {
+      "LAYOUT_ortho_4x4": {
+            "layout": [
+                {"label": "Numlock", "x": 0, "y": 0},
+                {"label": "/", "x": 1, "y": 0},
+                {"label": "*", "x": 2, "y": 0},
+                {"label": "-", "x": 3, "y": 0},
+                
+                {"label": "7", "x": 0, "y": 1},
+                {"label": "8", "x": 1, "y": 1},
+                {"label": "9", "x": 2, "y": 1},
+                {"label": "=", "x": 3, "y": 1},
+                
+                {"label": "4", "x": 0, "y": 2},
+                {"label": "5", "x": 1, "y": 2},
+                {"label": "6", "x": 2, "y": 2},
+                {"label": "+", "x": 3, "y": 2},
+                
+                {"label": "1", "x": 0, "y": 3},
+                {"label": "2", "x": 1, "y": 3},
+                {"label": "3", "x": 2, "y": 3},
+                {"label": "Esc", "x": 3, "y": 3},
+            ]
+      }
+  }
+}
diff --git a/keyboards/rart/rart4x4/keymaps/default/keymap.c b/keyboards/rart/rart4x4/keymaps/default/keymap.c
new file mode 100644
index 0000000000..36680e357b
--- /dev/null
+++ b/keyboards/rart/rart4x4/keymaps/default/keymap.c
@@ -0,0 +1,51 @@
+/*
+Copyright 2020 Alabahuy
+
+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_ortho_4x4(
+        KC_NLCK, KC_PSLS, KC_PAST, MO(1),
+        KC_P7,   KC_P8,   KC_P9,   KC_PEQL,
+        KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        KC_P1,   KC_P2,   KC_P3,   KC_PENT
+    ),
+ 
+    [1] = LAYOUT_ortho_4x4(
+        KC_TRNS, RGB_HUI, RGB_HUD,  KC_TRNS, 
+        RGB_SAI, RGB_SAD, KC_MNXT,  KC_MPRV, 
+        RGB_VAI, RGB_VAD, KC_MSTP,  KC_MPLY, 
+        KC_COPY, KC_PSTE, KC_MYCM,  RGB_TOG
+    )
+};
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) { /* First encoder */
+        if (clockwise) {
+            tap_code(KC_VOLD);
+        } else {
+            tap_code(KC_VOLU);
+        }
+    } else if (index == 1) { /* Second encoder */
+        if (clockwise) {
+            tap_code(KC_WH_D);
+        } else {
+            tap_code(KC_WH_U);
+        }
+    }
+}
diff --git a/keyboards/rart/rart4x4/keymaps/via/keymap.c b/keyboards/rart/rart4x4/keymaps/via/keymap.c
new file mode 100644
index 0000000000..9407b5f332
--- /dev/null
+++ b/keyboards/rart/rart4x4/keymaps/via/keymap.c
@@ -0,0 +1,61 @@
+/*
+Copyright 2020 Alabahuy
+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_ortho_4x4(
+    KC_NLCK, KC_PSLS, KC_PAST, MO(1),
+    KC_P7,   KC_P8,   KC_P9,   KC_PEQL,
+    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+    KC_P1,   KC_P2,   KC_P3,   KC_PMNS
+    ),
+ 
+  [1] = LAYOUT_ortho_4x4(
+    KC_TRNS, RGB_HUI, RGB_HUD,  RESET, 
+    RGB_SAI, RGB_SAD, KC_MNXT,  KC_MPRV, 
+    RGB_VAI, RGB_VAD, KC_MSTP,  KC_MPLY, 
+    KC_COPY, KC_PSTE, KC_MYCM,  RGB_TOG
+    ),
+    
+  [2] = LAYOUT_ortho_4x4(
+    _______, _______, _______, _______,
+    _______, _______, _______, _______,
+    _______, _______, _______, _______,
+    _______, _______, _______, _______
+    ),
+    
+  [3] = LAYOUT_ortho_4x4(
+    _______, _______, _______, _______,
+    _______, _______, _______, _______,
+    _______, _______, _______, _______,
+    _______, _______, _______, _______
+    )
+};
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) { /* First encoder */
+        if (clockwise) {
+            tap_code(KC_WH_U);
+        } else {
+            tap_code(KC_WH_D);
+        }
+    } else if (index == 1) { /* Second encoder */
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+}
diff --git a/keyboards/rart/rart4x4/keymaps/via/rules.mk b/keyboards/rart/rart4x4/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/rart/rart4x4/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/rart/rart4x4/rart4x4.c b/keyboards/rart/rart4x4/rart4x4.c
new file mode 100644
index 0000000000..0d5e2dbade
--- /dev/null
+++ b/keyboards/rart/rart4x4/rart4x4.c
@@ -0,0 +1,15 @@
+/* Copyright 2020 Alabahuy
+ * 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 "rart4x4.h"
diff --git a/keyboards/rart/rart4x4/rart4x4.h b/keyboards/rart/rart4x4/rart4x4.h
new file mode 100644
index 0000000000..8160420aa2
--- /dev/null
+++ b/keyboards/rart/rart4x4/rart4x4.h
@@ -0,0 +1,37 @@
+/*
+Copyright 2020 Alabahuy
+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"
+
+/* 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_ortho_4x4( \
+    K00, K01, K02, K03, \
+    K10, K11, K12, K13, \
+    K20, K21, K22, K23, \
+    K30, K31, K32, K33  \
+) \
+{ \
+    { K00,   K01,   K02,   K03 }, \
+    { K10,   K11,   K12,   K13 }, \
+    { K20,   K21,   K22,   K23 }, \
+    { K30,   K31,   K32,   K33 }, \
+}
diff --git a/keyboards/rart/rart4x4/readme.md b/keyboards/rart/rart4x4/readme.md
new file mode 100644
index 0000000000..4908f2667d
--- /dev/null
+++ b/keyboards/rart/rart4x4/readme.md
@@ -0,0 +1,14 @@
+# [RART4X4](https://github.com/alabahuy/RART/blob/master/RART4X4/readme.md)
+
+![rartpad](https://user-images.githubusercontent.com/30220306/100748142-8aa5a080-3415-11eb-9b22-77f38d4dd891.png)
+4x4 Macropad pcb with double encoder, based on IMKG (Indonesia Mechanical Keyboard Group)
+
+* Keyboard Maintainer: [Alabahuy](https://github.com/alabahuy)
+* Hardware Supported: RART4X4 PCB, Promicro, Mini USB, Encoders
+* Hardware Availability: Private GB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make rart/rart4x4: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/rart/rart4x4/rules.mk b/keyboards/rart/rart4x4/rules.mk
new file mode 100644
index 0000000000..773b586008
--- /dev/null
+++ b/keyboards/rart/rart4x4/rules.mk
@@ -0,0 +1,25 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# 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 = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
+
+LAYOUTS = ortho_4x4