Merge remote-tracking branch 'origin/develop'

2 files changed, 94 insertions, 0 deletions

diff --git a/keyboards/omkbd/runner3680/3x7/keymaps/default/config.h b/keyboards/omkbd/runner3680/3x7/keymaps/default/config.h
new file mode 100644
index 0000000000..43a82f38a0
--- /dev/null
+++ b/keyboards/omkbd/runner3680/3x7/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/3x7/keymaps/default/keymap.c b/keyboards/omkbd/runner3680/3x7/keymaps/default/keymap.c
new file mode 100644
index 0000000000..795999cf5b
--- /dev/null
+++ b/keyboards/omkbd/runner3680/3x7/keymaps/default/keymap.c
@@ -0,0 +1,85 @@
+#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
+     * ,------------------------------------------------.      ,------------------------------------------------.
+     * |  F4  | Tab  |   Q  |   W  |   E  |   R  |   T  |      |   Y  |   U  |   I  |   O  |   P  |   [  |   ]  |
+     * |------+------+------+------+------+------+------|      |------+------+------+------+------+------+------|
+     * |  F6  | Esc  |   A  |   S  |   D  |   F  |   G  |      |   H  |   J  |   K  |   L  |   ;  |   "  | Enter|
+     * |------+------+------+------+------+------+------|      |------+------+------+------+------+------+------|
+     * |  F8  | Shift|   Z  |   X  |   C  |   V  |   B  |      |   N  |   M  |   ,  |   .  |   /  |   \  |  Up  |
+     * `------------------------------------------------'      `------------------------------------------------'
+     */
+  [_QWERTY] = LAYOUT(
+      KC_F4,   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_RBRC,
+      KC_F6,   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_ENT,
+      KC_F8,   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_UP
+      ),
+
+    /* 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;
+}