Merge branch 'master' into meteor

3 files changed, 85 insertions, 0 deletions

diff --git a/keyboards/keebio/quefrency/keymaps/joestrong/README.md b/keyboards/keebio/quefrency/keymaps/joestrong/README.md
new file mode 100644
index 000000000..717b9ecd5
--- /dev/null
+++ b/keyboards/keebio/quefrency/keymaps/joestrong/README.md
@@ -0,0 +1,17 @@
+# JoeStrong's Quefrency layout - 60% ISO
+
+* Standard UK ISO qwerty layout
+* Function key in place of Caps Lock
+* Function layer provides vim-like arrows and various function keys
+
+## Default layer
+
+![Default layer layout](https://i.imgur.com/HXeKSGN.png)
+
+([KLE](http://www.keyboard-layout-editor.com/#/gists/f606625fbc4b84a0e9f82fff308aad29))
+
+## Function layer
+
+![Function layer layout](https://i.imgur.com/cVKl9tB.png)
+
+([KLE](http://www.keyboard-layout-editor.com/#/gists/b75402b2838f36e319f1c0a7fef07dd6))
diff --git a/keyboards/keebio/quefrency/keymaps/joestrong/config.h b/keyboards/keebio/quefrency/keymaps/joestrong/config.h
new file mode 100644
index 000000000..f9efe78c5
--- /dev/null
+++ b/keyboards/keebio/quefrency/keymaps/joestrong/config.h
@@ -0,0 +1,27 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+Copyright 2018 Danny Nguyen <danny@keeb.io>
+
+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
+
+/* Use I2C or Serial, not both */
+
+#define USE_SERIAL
+// #define USE_I2C
diff --git a/keyboards/keebio/quefrency/keymaps/joestrong/keymap.c b/keyboards/keebio/quefrency/keymaps/joestrong/keymap.c
new file mode 100644
index 000000000..ead47592c
--- /dev/null
+++ b/keyboards/keebio/quefrency/keymaps/joestrong/keymap.c
@@ -0,0 +1,41 @@
+/* Copyright 2020 Joseph Strong
+ *
+ * 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
+#include "keymap_uk.h"
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN1
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_60_iso(
+        KC_GESC, 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_BSPC,
+        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,
+        MO(_FN1),KC_A,    KC_S,     KC_D,    KC_F,    KC_G,                 KC_H,    KC_J,    KC_K,    KC_L,     KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+        KC_LSFT, UK_BSLS, KC_Z,     KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,          KC_RSFT, _______,
+        KC_LCTL, KC_LGUI, MO(_FN1), KC_LALT,          KC_SPC,               _______, KC_SPC,  KC_RALT, MO(_FN1), _______,          KC_LGUI, KC_RCTL
+    ),
+
+    [_FN1] = LAYOUT_60_iso(
+        KC_GRV,  KC_F1,   KC_F2,       KC_F3,     KC_F4,    KC_F5,   KC_F6,       KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
+        RGB_TOG, RGB_MOD, _______,     _______,   _______,  _______,              _______, KC_PGDN, KC_PGUP, _______, _______, _______, _______,
+        _______, _______, KC__VOLDOWN, KC__VOLUP, KC__MUTE, _______,              KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_DEL,  _______, _______, _______,
+        _______, _______, _______,     _______,   _______,  _______, _______,     _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,     _______,             _______,              _______, _______, _______, _______, _______,          _______, _______
+    )
+};