Merge remote-tracking branch 'origin/develop'

8 files changed, 254 insertions, 0 deletions

diff --git a/keyboards/omkbd/runner3680/4x6/.noci b/keyboards/omkbd/runner3680/4x6/.noci
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/keyboards/omkbd/runner3680/4x6/.noci
diff --git a/keyboards/omkbd/runner3680/4x6/4x6.c b/keyboards/omkbd/runner3680/4x6/4x6.c
new file mode 100644
index 0000000000..5e68c1a9fa
--- /dev/null
+++ b/keyboards/omkbd/runner3680/4x6/4x6.c
@@ -0,0 +1 @@
+#include "4x6.h"
diff --git a/keyboards/omkbd/runner3680/4x6/4x6.h b/keyboards/omkbd/runner3680/4x6/4x6.h
new file mode 100644
index 0000000000..dfc3a977b7
--- /dev/null
+++ b/keyboards/omkbd/runner3680/4x6/4x6.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "runner3680.h"
+
+#include "quantum.h"
+
+#define LAYOUT( \
+   L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
+   L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
+   L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
+   L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35  \
+   ) \
+   { \
+     { L00, L01, L02, L03, L04, L05 }, \
+     { L10, L11, L12, L13, L14, L15 }, \
+     { L20, L21, L22, L23, L24, L25 }, \
+     { L30, L31, L32, L33, L34, L35 }, \
+     { R05, R04, R03, R02, R01, R00 }, \
+     { R15, R14, R13, R12, R11, R10 }, \
+     { R25, R24, R23, R22, R21, R20 }, \
+     { R35, R34, R33, R32, R31, R30 }  \
+   }
diff --git a/keyboards/omkbd/runner3680/4x6/config.h b/keyboards/omkbd/runner3680/4x6/config.h
new file mode 100644
index 0000000000..12596acd9a
--- /dev/null
+++ b/keyboards/omkbd/runner3680/4x6/config.h
@@ -0,0 +1,69 @@
+/* Copyright 2019 omkbd
+ *
+ * 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       0xFEED
+#define PRODUCT_ID      0x0000
+#define DEVICE_VER      0x0005
+#define MANUFACTURER    Omkbd
+#define PRODUCT         runner3680
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 6
+
+// wiring of each half
+#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
+#define MATRIX_COL_PINS { F6, F7, B1, B3, B2 ,B6 }
+// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6} //uncomment this line and comment line above if you need to reverse left-to-right key order
+
+#define DIODE_DIRECTION COL2ROW
+
+/* define tapping term */
+#define TAPPING_TERM 120
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* ws2812 RGB LED */
+#define RGB_DI_PIN D3
+#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 48
+#define RGBLIGHT_SPLIT
+#define RGBLED_SPLIT { 24, 24 }    // Number of LEDs
+#define RGBLIGHT_LIMIT_VAL 100
+
+#define SOFT_SERIAL_PIN D2
+#define SELECT_SOFT_SERIAL_SPEED 1
+/*Sets the protocol speed when using serial communication*/
+//Speeds:
+//0: about 189kbps (Experimental only)
+//1: about 137kbps (default)
+//2: about 75kbps
+//3: about 39kbps
+//4: about 26kbps
+//5: about 20kbps
diff --git a/keyboards/omkbd/runner3680/4x6/info.json b/keyboards/omkbd/runner3680/4x6/info.json
new file mode 100644
index 0000000000..41ea3e0061
--- /dev/null
+++ b/keyboards/omkbd/runner3680/4x6/info.json
@@ -0,0 +1,62 @@
+{
+    "keyboard_name": "runner3680 4x6",
+    "url": "",
+    "maintainer": "omkbd",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+
+                {"x":0, "y":1},
+                {"x":1, "y":1},
+                {"x":2, "y":1},
+                {"x":3, "y":1},
+                {"x":4, "y":1},
+                {"x":5, "y":1},
+                {"x":7, "y":1},
+                {"x":8, "y":1},
+                {"x":9, "y":1},
+                {"x":10, "y":1},
+                {"x":11, "y":1},
+                {"x":12, "y":1},
+
+                {"x":0, "y":2},
+                {"x":1, "y":2},
+                {"x":2, "y":2},
+                {"x":3, "y":2},
+                {"x":4, "y":2},
+                {"x":5, "y":2},
+                {"x":7, "y":2},
+                {"x":8, "y":2},
+                {"x":9, "y":2},
+                {"x":10, "y":2},
+                {"x":11, "y":2},
+                {"x":12, "y":2},
+
+                {"x":0, "y":3},
+                {"x":1, "y":3},
+                {"x":2, "y":3},
+                {"x":3, "y":3},
+                {"x":4, "y":3},
+                {"x":5, "y":3},
+                {"x":7, "y":3},
+                {"x":8, "y":3},
+                {"x":9, "y":3},
+                {"x":10, "y":3},
+                {"x":11, "y":3},
+                {"x":12, "y":3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/omkbd/runner3680/4x6/keymaps/default/config.h b/keyboards/omkbd/runner3680/4x6/keymaps/default/config.h
new file mode 100644
index 0000000000..43a82f38a0
--- /dev/null
+++ b/keyboards/omkbd/runner3680/4x6/keymaps/default/config.h
@@ -0,0 +1,9 @@
+#pragma once
+
+//#define USE_MATRIX_I2C
+
+/* Select hand configuration */
+
+#define MASTER_LEFT
+// #define MASTER_RIGHT
+// #define EE_HANDS
diff --git a/keyboards/omkbd/runner3680/4x6/keymaps/default/keymap.c b/keyboards/omkbd/runner3680/4x6/keymaps/default/keymap.c
new file mode 100644
index 0000000000..d0c07ddd04
--- /dev/null
+++ b/keyboards/omkbd/runner3680/4x6/keymaps/default/keymap.c
@@ -0,0 +1,91 @@
+#include QMK_KEYBOARD_H
+
+
+#ifdef RGBLIGHT_ENABLE
+//Following line allows macro to read current RGB settings
+extern rgblight_config_t rgblight_config;
+rgblight_config_t RGB_current_config;
+#endif
+
+enum layer_number {
+    _QWERTY = 0,
+    _ADJUST
+};
+
+enum custom_keycodes {
+  QWERTY = SAFE_RANGE,
+  ADJUST,
+  RGBRST
+};
+
+// Fillers to make layering more clear
+#define EISU LALT(KC_GRV)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* QWERTY
+     * ,-----------------------------------------.      ,-----------------------------------------.
+     * | Tab  |   Q  |   W  |   E  |   R  |   T  |      |   Y  |   U  |   I  |   O  |   P  |   [  |
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------|
+     * | Esc  |   A  |   S  |   D  |   F  |   G  |      |   H  |   J  |   K  |   L  |   ;  |   "  |
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------|
+     * | Shift|   Z  |   X  |   C  |   V  |   B  |      |   N  |   M  |   ,  |   .  |   /  |   \  |
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------|
+     * | Ctrl | GUI  | Alt  | EISU |  Del | Space|      | Enter| Bksp | EISU |  ESC |Adjust| Left |
+     * `-----------------------------------------'      `-----------------------------------------'
+     */
+  [_QWERTY] = LAYOUT(
+      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_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,       KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,       KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_BSLS,
+      KC_LCTL, KC_LGUI, KC_LALT, EISU,    KC_DEL,  KC_SPC,     KC_ENT,  KC_BSPC, EISU,    KC_ESC,  ADJUST,  KC_LEFT
+      ),
+
+    /* Adjust
+     * ,-----------------------------------------.      ,-----------------------------------------.
+     * |      |RGBRST| RESET|      |      |      |      |      |      |      |      |      |      |
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------|
+     * |      |  TOG |  HUI |  SAI |  VAI |      |      |      |      |      |      |      |      |
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------|
+     * |      |  MOD |  HUD |  SAD |  VAD |      |      |      |      |      |      |      |      |
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------|
+     * |      |      |      |      |      |      |      |      |      |      |      |      |      |
+     * `-----------------------------------------'      `-----------------------------------------'
+     */
+  [_ADJUST] =  LAYOUT(
+      _______, RGBRST,  RESET,   _______, _______, _______,    _______, _______, _______, _______, _______, _______,
+      _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______,    _______, _______, _______, _______, _______, _______,
+      _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______,    _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______  
+      )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+      case QWERTY:
+        if (record->event.pressed) {
+           print("mode just switched to qwerty and this is a huge string\n");
+          set_single_persistent_default_layer(_QWERTY);
+        }
+        break;
+
+      case ADJUST:
+        if (record->event.pressed) {
+          layer_on(_ADJUST);
+        } else {
+          layer_off(_ADJUST);
+        }
+        break;
+
+      case RGBRST:
+        #ifdef RGBLIGHT_ENABLE
+          if (record->event.pressed) {
+            eeconfig_update_rgblight_default();
+            rgblight_enable();
+            RGB_current_config = rgblight_config;
+          }
+        #endif
+        break;
+  }
+  return true;
+}
diff --git a/keyboards/omkbd/runner3680/4x6/rules.mk b/keyboards/omkbd/runner3680/4x6/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/keyboards/omkbd/runner3680/4x6/rules.mk