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

3 files changed, 109 insertions, 0 deletions

diff --git a/keyboards/idobo/keymaps/gkbd_orthon/config.h b/keyboards/idobo/keymaps/gkbd_orthon/config.h
new file mode 100644
index 0000000000..e8fc39faad
--- /dev/null
+++ b/keyboards/idobo/keymaps/gkbd_orthon/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2021 Giorgi Chavchanidze
+ *
+ * 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
+
+#define TAPPING_TERM 200
+#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/idobo/keymaps/gkbd_orthon/keymap.c b/keyboards/idobo/keymaps/gkbd_orthon/keymap.c
new file mode 100644
index 0000000000..a603eae657
--- /dev/null
+++ b/keyboards/idobo/keymaps/gkbd_orthon/keymap.c
@@ -0,0 +1,78 @@
+/* Copyright 2021 Giorgi Chavchanidze
+ *
+ * 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
+
+#define MIN_PROXIMITY 8000
+
+uint16_t predecessor_key = KC_NO;
+uint16_t adaptive_key = KC_NO;
+
+static uint16_t vowel_proximity;
+
+enum custom_keycodes {
+    ON = SAFE_RANGE,
+};
+
+bool promote_consonants(void) {
+	return predecessor_key == KC_O && timer_elapsed(vowel_proximity) < MIN_PROXIMITY && !(get_mods() & ~MOD_MASK_SHIFT & MOD_MASK_CAG);
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+
+    if (keycode == ON) {
+		
+        if (record->event.pressed) {
+
+			keycode = promote_consonants()?KC_N:KC_O;	
+			register_code(keycode);
+			adaptive_key = keycode;
+
+		}
+		else {
+			unregister_code(adaptive_key);
+		}
+	}
+
+	if (!IS_MOD(keycode) && record->event.pressed) {
+		if(keycode == KC_E || keycode == KC_A || keycode == KC_O || keycode == KC_I || keycode == KC_U) {
+			predecessor_key = KC_O;
+			vowel_proximity = timer_read();
+		}
+		else {
+			predecessor_key = keycode;
+		}
+	}
+
+    return true;
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT_ortho_5x15(/* Base */
+			KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LBRC, KC_APP, KC_RBRC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL,
+			KC_QUOT, KC_Z, KC_Y, KC_U, KC_F, KC_W, KC_LCBR, KC_PSCR, KC_RCBR, KC_G, KC_M, KC_P, KC_N, KC_J, KC_MINS,
+			KC_ESC, KC_H, KC_I, KC_E, KC_A, KC_C, KC_LPRN, MO(1), KC_RPRN, KC_L, KC_R, KC_T, KC_S, KC_D, KC_ENT,
+			KC_TAB, KC_SCLN, KC_X, KC_O, KC_COMM, KC_DOT, KC_SLSH, KC_LGUI, KC_BSLS, KC_K, KC_V, KC_B, RSFT_T(KC_Q), KC_UP, KC_INS,
+			KC_CAPS, KC_HOME, KC_END, KC_DEL, KC_BSPC, ON, KC_LSFT, KC_RCTL, KC_RALT, KC_SPC, KC_PGDN, KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT
+		),
+	[1] = LAYOUT_ortho_5x15(/* Function keys */
+			KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+			KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+			KC_SLCK, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NO, KC_TRNS, KC_NO, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_PAUS,
+			KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+			RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_F11, KC_TRNS, KC_TRNS, KC_TRNS, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO, RGB_TOG
+		)
+};
diff --git a/keyboards/idobo/keymaps/gkbd_orthon/readme.md b/keyboards/idobo/keymaps/gkbd_orthon/readme.md
new file mode 100644
index 0000000000..36479ff9ba
--- /dev/null
+++ b/keyboards/idobo/keymaps/gkbd_orthon/readme.md
@@ -0,0 +1,11 @@
+![Orthon layout](https://lykt.xyz/rtsd/orthon.svg)
+
+# Orthon layout
+
+Ortholinear carpalx optimized layout with adaptive thumb key.
+
+Adaptive key is
+ * **n** after **eaoiu** vowels
+ * **o** otherwise
+
+Some documentation and resources (carpalx report, json configuration) are available at [https://lykt.xyz/rtsd/#orthon](https://lykt.xyz/rtsd/#orthon)