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

10 files changed, 368 insertions, 1 deletions

diff --git a/keyboards/rart/rart45/info.json b/keyboards/rart/rart45/info.json
index d3fc5aa7cf..3be536562b 100644
--- a/keyboards/rart/rart45/info.json
+++ b/keyboards/rart/rart45/info.json
@@ -1,5 +1,5 @@
 {
-  "keyboard_name": "Rartlice",
+  "keyboard_name": "Rart45",
   "url": "",
   "maintainer": "Alabahuy",
   "width": 13,
diff --git a/keyboards/rart/rartand/config.h b/keyboards/rart/rartand/config.h
new file mode 100644
index 0000000000..841b63b639
--- /dev/null
+++ b/keyboards/rart/rartand/config.h
@@ -0,0 +1,47 @@
+/* Copyright 2021 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      0x5050
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Alabahuy
+#define PRODUCT         Rartand
+
+/* key matrix size */
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 7
+
+#define MATRIX_ROW_PINS { C3, B2, C2, B1, C1, D7, C0, B0 }
+#define MATRIX_COL_PINS { D0, D1, B4, B5, B3, D4, D6 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+#define LED_CAPS_LOCK_PIN D5
+#define LED_PIN_ON_STATE 0
+
+/* 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
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/rart/rartand/info.json b/keyboards/rart/rartand/info.json
new file mode 100644
index 0000000000..34ca66072b
--- /dev/null
+++ b/keyboards/rart/rartand/info.json
@@ -0,0 +1,68 @@
+{
+  "keyboard_name": "Rartand",
+  "url": "",
+  "maintainer": "Alabahuy",
+  "width": 15,
+  "height": 4,
+  "layouts": {
+    "LAYOUT_all": {
+      "layout": [
+        { "x": 0, "y": 0, "w":1.5 },
+        { "x": 1.5, "y": 0 },
+        { "x": 2.5, "y": 0 },
+        { "x": 3.5, "y": 0 },
+        { "x": 4.5, "y": 0 },
+        { "x": 5.5, "y": 0 },
+        { "x": 6.5, "y": 0 },
+        { "x": 7.5, "y": 0 },
+        { "x": 8.5, "y": 0 },
+        { "x": 9.5, "y": 0 },
+        { "x": 10.5, "y": 0 },
+        { "x": 11.5, "y": 0 },
+        { "x": 12.5, "y": 0 },
+        { "x": 13.5, "y": 0, "w":1.5 },
+
+        {"x": 0, "y": 1, "w":1.75 },
+        {"x": 1.75, "y": 1 },
+        {"x": 2.75, "y": 1 },
+        {"x": 3.75, "y": 1 },
+        {"x": 4.75, "y": 1 },
+        {"x": 5.75, "y": 1 },
+        {"x": 6.75, "y": 1 },
+        {"x": 7.75, "y": 1 },
+        {"x": 8.75, "y": 1 },
+        {"x": 9.75, "y": 1 },
+        {"x": 10.75, "y": 1 },
+        {"x": 11.75, "y": 1 },
+        {"x": 12.75, "y": 1, "w":2.25 },
+
+        {"x": 0, "y": 2, "w":1.25 },
+        {"x": 1.25, "y": 2 },
+        {"x": 2.25, "y": 2 },
+        {"x": 3.25, "y": 2 },
+        {"x": 4.25, "y": 2 },
+        {"x": 5.25, "y": 2 },
+        {"x": 6.25, "y": 2 },
+        {"x": 7.25, "y": 2 },
+        {"x": 8.25, "y": 2 },
+        {"x": 9.25, "y": 2 },
+        {"x": 10.25, "y": 2 },
+        {"x": 11.25, "y": 2, "w":1.75 },
+        {"x": 13, "y": 2 },
+        {"x": 14, "y": 2 },
+
+        {"x": 0, "y": 3, "w":1.25 },
+        {"x": 1.25, "y": 3, "w":1.25 },
+        {"x": 2.5, "y": 3, "w":1.25 },
+        {"x": 3.75, "y": 3, "w":2.25 },
+        {"x": 6, "y": 3, "w":1.25 },
+        {"x": 7.25, "y": 3, "w":2.75 },
+        {"x": 10, "y": 3 },
+        {"x": 11, "y": 3 },
+        {"x": 12, "y": 3 },
+        {"x": 13, "y": 3 },
+        {"x": 14, "y": 3 }
+      ]
+    }
+  }
+}
diff --git a/keyboards/rart/rartand/keymaps/default/keymap.c b/keyboards/rart/rartand/keymaps/default/keymap.c
new file mode 100644
index 0000000000..1b3c7c6af4
--- /dev/null
+++ b/keyboards/rart/rartand/keymaps/default/keymap.c
@@ -0,0 +1,78 @@
+/* Copyright 2021 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_all(    
+        KC_ESC,  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_BSPC,
+        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_LSFT, KC_SLSH, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   KC_BSLS,
+        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,      MO(1),        KC_SPC,           MO(2),   KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT        
+  ),
+
+  [1] = LAYOUT_all(
+        KC_TAB,  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_DEL,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,          _______,      _______,     _______,          _______, _______, _______, _______, _______
+  ),
+
+  [2] = LAYOUT_all(
+        RESET,   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_DEL,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,          _______,      _______,     _______,          _______, _______, _______, _______, _______
+  ),
+
+  [3] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,          _______,      _______,     _______,          _______, _______, _______, _______, _______
+  )
+
+};
+
+#ifdef OLED_DRIVER_ENABLE
+void oled_task_user(void) {
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("* R A R T A N D *\n  Powered by QMK\nLayer: "), false);
+
+    switch (get_highest_layer(layer_state)) {
+        case 0:
+            oled_write_P(PSTR("Default\n"), false);
+            break;
+        case 1:
+            oled_write_P(PSTR("Fn row\n"), false);
+            break;
+        case 2:
+            oled_write_P(PSTR("Number row\n"), false);
+            break;
+        case 3:
+            oled_write_P(PSTR("Layer 4\n"), false);
+            break;
+        default:
+            // Or use the write_ln shortcut over adding '\n' to the end of your string
+            oled_write_ln_P(PSTR("Undifined\n"), false);
+    }
+
+    // Host Keyboard LED Status
+    led_t led_state = host_keyboard_led_state();
+    oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false);
+    oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR("    "), false);
+    oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("    "), false);
+}
+#endif
diff --git a/keyboards/rart/rartand/keymaps/via/keymap.c b/keyboards/rart/rartand/keymaps/via/keymap.c
new file mode 100644
index 0000000000..1b3c7c6af4
--- /dev/null
+++ b/keyboards/rart/rartand/keymaps/via/keymap.c
@@ -0,0 +1,78 @@
+/* Copyright 2021 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_all(    
+        KC_ESC,  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_BSPC,
+        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_LSFT, KC_SLSH, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   KC_BSLS,
+        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,      MO(1),        KC_SPC,           MO(2),   KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT        
+  ),
+
+  [1] = LAYOUT_all(
+        KC_TAB,  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_DEL,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,          _______,      _______,     _______,          _______, _______, _______, _______, _______
+  ),
+
+  [2] = LAYOUT_all(
+        RESET,   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_DEL,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,          _______,      _______,     _______,          _______, _______, _______, _______, _______
+  ),
+
+  [3] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,          _______,      _______,     _______,          _______, _______, _______, _______, _______
+  )
+
+};
+
+#ifdef OLED_DRIVER_ENABLE
+void oled_task_user(void) {
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("* R A R T A N D *\n  Powered by QMK\nLayer: "), false);
+
+    switch (get_highest_layer(layer_state)) {
+        case 0:
+            oled_write_P(PSTR("Default\n"), false);
+            break;
+        case 1:
+            oled_write_P(PSTR("Fn row\n"), false);
+            break;
+        case 2:
+            oled_write_P(PSTR("Number row\n"), false);
+            break;
+        case 3:
+            oled_write_P(PSTR("Layer 4\n"), false);
+            break;
+        default:
+            // Or use the write_ln shortcut over adding '\n' to the end of your string
+            oled_write_ln_P(PSTR("Undifined\n"), false);
+    }
+
+    // Host Keyboard LED Status
+    led_t led_state = host_keyboard_led_state();
+    oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false);
+    oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR("    "), false);
+    oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("    "), false);
+}
+#endif
diff --git a/keyboards/rart/rartand/keymaps/via/rules.mk b/keyboards/rart/rartand/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/rart/rartand/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/rart/rartand/rartand.c b/keyboards/rart/rartand/rartand.c
new file mode 100644
index 0000000000..e9cff88ba5
--- /dev/null
+++ b/keyboards/rart/rartand/rartand.c
@@ -0,0 +1,15 @@
+/* Copyright 2021 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 "rartand.h"
diff --git a/keyboards/rart/rartand/rartand.h b/keyboards/rart/rartand/rartand.h
new file mode 100644
index 0000000000..c2750822e8
--- /dev/null
+++ b/keyboards/rart/rartand/rartand.h
@@ -0,0 +1,34 @@
+/* Copyright 2021 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"
+
+#define LAYOUT_all( \
+    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, \
+    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35,      K36, \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, \
+    K60, K70, K61,      K62,   K63,    K64,      K74, K65, K75, K66, K76 \
+) \
+{ \
+    { K00, K01,   K02,   K03,   K04, K05, K06   }, \
+    { K10, K11,   K12,   K13,   K14, K15, K16   }, \
+    { K20, K21,   K22,   K23,   K24, K25, KC_NO }, \
+    { K30, K31,   K32,   K33,   K34, K35, K36   }, \
+    { K40, K41,   K42,   K43,   K44, K45, K46   }, \
+    { K50, K51,   K52,   K53,   K54, K55, K56   }, \
+    { K60, K61,   K62,   K63,   K64, K65, K66   }, \
+    { K70, KC_NO, KC_NO, KC_NO, K74, K75, K76   }, \
+}
diff --git a/keyboards/rart/rartand/readme.md b/keyboards/rart/rartand/readme.md
new file mode 100644
index 0000000000..69fe845fba
--- /dev/null
+++ b/keyboards/rart/rartand/readme.md
@@ -0,0 +1,23 @@
+# Rartand
+
+![Top](https://user-images.githubusercontent.com/30220306/107148148-4b9b4a80-6984-11eb-9e2b-d0f6be4419de.png)
+
+A 50% Mechanical Keyboard ( 60% exclude number row ) with Atmega328p with trough hole component, based on [IMKG](https://www.facebook.com/groups/indomechanicalkeyboard/) (Indonesia Mechanical Keyboard Group).
+
+* Keyboard Maintainer: [Alabahuy](https://github.com/alabahuy)
+* Hardware Supported: RARTAND PCB, Mini USB, OLED, ATMEGA328p with vusb
+* Hardware Availability: Private GB 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make rart/rartand:default
+
+Flashing example for this keyboard:
+
+    make rart/rartand:default:flash
+
+## Bootloader
+use usbasploader in hgsw repository.
+https://github.com/hsgw/USBaspLoader/tree/plaid
+
+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/rartand/rules.mk b/keyboards/rart/rartand/rules.mk
new file mode 100644
index 0000000000..0d494fa6bd
--- /dev/null
+++ b/keyboards/rart/rartand/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega328p
+
+# Bootloader selection
+BOOTLOADER = USBasp
+
+# 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
+OLED_DRIVER_ENABLE = yes