Merge branch 'develop' of https://github.com/benjaminmikiten/qmk_firm…

…ware into develop

* 'develop' of https://github.com/benjaminmikiten/qmk_firmware: (42 commits)
  userspace work
  preonic edits
  work
  update dvorak
  add hexpad, bootmagic
  split version of xd75
  rewrite XD75 lauyout for left-hand keypad
  add enter, clicky toggle, switch song
  redo preonic
  Update keymap.c
  restore songs
  swap lower, raise
  create preonic layout
  add xd75 keymap
  fix plaid adjust layer
  update gitignore
  [Keyboard] Remove file with same name and different case (qmk#6028)
  Ignore VSCode ipsh folder (qmk#5741)
  add infinity ergodox
  customize keymap some
  ...

# Conflicts:
#	keyboards/preonic/keymaps/benjaminmikiten/config.h
#	keyboards/preonic/keymaps/benjaminmikiten/keymap.c
#	keyboards/preonic/keymaps/benjaminmikiten/rules.mk
#	keyboards/romac/rules.mk
#	keyboards/xd75/keymaps/benjaminmikiten/keymap.c
#	keyboards/xd75/keymaps/benjaminmikiten/rules.mk
#	users/benjaminmikiten/benjaminmikiten.h
#	users/benjaminmikiten/readme.md

keyboards/xd75/keymaps/benjaminmikiten-split/config.h

@@ -0,0 +1,19 @@
+/* Copyright 2017 Benjamin Kesselring
+ *
+ * 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
+
+// place overrides here

keyboards/xd75/keymaps/benjaminmikiten-split/keymap.c

@@ -0,0 +1,115 @@
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _QWERTY,
+    _DVORAK,
+    _RAISE,
+    _LOWER,
+    _ADJUST
+};
+enum keycodes{
+  QWERTY = SAFE_RANGE,
+  DVORAK,
+};
+
+
+
+#define KC_V_DN KC__VOLDOWN
+#define KC_V_UP KC__VOLUP
+
+#define SCN_SHT LSFT(LGUI(LCTL(KC_4)))  // Take a screenshot (MacOS)
+#define LCK_SCN LGUI(LCTL(KC_Q)) // lock screen
+
+#define SFT_ENT SFT_T(KC_ENT)
+#define CTL_ESC CTL_T(KC_ESC)
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+#define MOUSE MO(_MOUSE)
+#define FN MO(_FN)
+
+#define GESC_SWP MAGIC_SWAP_GRAVE_ESC
+#define GESC_USWP MAGIC_UNSWAP_GRAVE_ESC
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[_QWERTY] = LAYOUT_ortho_5x15(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_P7,   KC_P8,   KC_P9,   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV, \
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_P4,   KC_P5,   KC_P6,   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
+        CTL_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_P1,   KC_P2,   KC_P3,   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_PDOT, KC_P0,   KC_PENT, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT, \
+        _______, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_ENT,  KC_VOLD, KC_VOLU, KC_MPLY, KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
+    ),
+    [_DVORAK] = LAYOUT_ortho_5x15(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_P7,   KC_P8,   KC_P9,   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV, \
+        KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_P4,   KC_P5,   KC_P6,   KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC, \
+        CTL_ESC, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_P1,   KC_P2,   KC_P3,   KC_D,    KC_H,    KC_T,    KC_N,    KC_S,   KC_SLSH, \
+        KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_PDOT, KC_P0,   KC_PENT, KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,  SFT_ENT, \
+        _______, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_ENT,  KC_VOLD, KC_VOLU, KC_MPLY, KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
+    ),
+    [_RAISE] = LAYOUT_ortho_5x15(
+        _______, _______, _______, _______, _______, _______, KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, _______, _______, \
+        _______, KC_BTN2, KC_MS_U, KC_BTN1, KC_WH_U, _______, KC_F7,   KC_F8,   KC_F9,   _______, _______, _______, _______, _______, KC_DEL,  \
+        _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_F4,   KC_F5,   KC_F6,   _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, \
+        _______, KC_ACL2, KC_ACL1, KC_ACL0, _______, _______, KC_F1,   KC_F2,   KC_F3,   _______, _______, _______, KC_PGUP, KC_PGDN, _______, \
+        _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY  \
+    ),
+    [_LOWER] = LAYOUT_ortho_5x15(
+        _______, _______, _______, _______, _______, _______, KC_D,    KC_E,    KC_F,    _______, _______, _______, _______, _______, _______, \
+        _______, _______, _______, _______, _______, _______, KC_A,    KC_B,    KC_C,    _______, _______, _______, _______, _______, _______, \
+        _______, _______, _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, \
+        _______, _______, _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   _______, _______, _______, _______, _______, _______, \
+        _______, _______, _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, _______, _______, _______, _______, _______  \
+    ),
+
+    [_ADJUST] = LAYOUT_ortho_5x15(
+        _______, AG_TOGG, CG_TOGG, GESC_SWP, _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, \
+        _______, _______, _______, GESC_USWP, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI,  _______, _______, _______, _______, _______, _______, \
+        _______, QWERTY,  DVORAK,  _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, \
+        _______, _______, _______, _______, _______, _______, RGB_M_B, RGB_M_R, RGB_M_SW,_______, _______, _______, _______, _______, _______, \
+        RESET,   _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, RGB_M_G, _______, _______, _______, _______, _______, _______  \
+    )
+};
+
+uint32_t layer_state_set_user(uint32_t state) {
+  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+        case QWERTY:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_QWERTY);
+          }
+          return false;
+          break;
+        case DVORAK:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_DVORAK);
+          }
+          return false;
+          break;
+        case LOWER:
+          if (record->event.pressed) {
+            layer_on(_LOWER);
+            update_tri_layer(_LOWER, _RAISE, _ADJUST);
+          } else {
+            layer_off(_LOWER);
+            update_tri_layer(_LOWER, _RAISE, _ADJUST);
+          }
+          return false;
+          break;
+        case RAISE:
+          if (record->event.pressed) {
+            layer_on(_RAISE);
+            update_tri_layer(_LOWER, _RAISE, _ADJUST);
+          } else {
+            layer_off(_RAISE);
+            update_tri_layer(_LOWER, _RAISE, _ADJUST);
+          }
+          return false;
+          break;
+
+      }
+    return true;
+};

keyboards/xd75/keymaps/benjaminmikiten-split/layers.json

@@ -0,0 +1 @@
+[["KC_ESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_F10", "KC_F11", "KC_F12", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_GRV", "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_F7", "KC_F8", "KC_F9", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_BSPC", "KC_LCTL", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_F4", "KC_F5", "KC_F6", "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_F1", "KC_F2", "KC_F3", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_NO", "KC_LCTL", "KC_LALT", "KC_LGUI", "KC_ENT", "MO(2)", "MO(3)", "KC_NO", "KC_NO", "MO(1)", "KC_SPC", "KC_RGUI", "KC_RALT", "KC_RCTL", "KC_NO"], ["KC_TRNS", "RGB_M_B", "RGB_M_R", "RGB_M_K", "BL_INC", "BL_INC", "RGB_M_P", "RGB_M_B", "RGB_M_K", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_RMOD", "RGB_VAD", "RGB_VAI", "RGB_M_G", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_TRNS", "KC_TRNS", "KC__VOLDOWN", "KC__VOLUP", "KC__MUTE", "RGB_SPD", "RGB_SPI", "KC_NO", "KC_NO", "KC_NO", "KC_MINS", "KC_EQL", "KC_LCBR", "KC_RCBR", "KC_BSLS", "KC_TRNS", "KC_TRNS", "EEP_RST", "DEBUG", "RESET", "KC_NO", "KC_NO", "RGB_HUI", "RGB_SAI", "RGB_VAI", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_TRNS", "RESET", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_NO", "RGB_HUD", "RGB_SAD", "RGB_VAD", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_NO", "KC_NO"], ["KC_TRNS", "KC_NO", "KC_P7", "KC_P8", "KC_P9", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_TRNS", "KC_TRNS", "KC_NO", "KC_P4", "KC_P5", "KC_P6", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_TRNS", "KC_TRNS", "KC_NO", "KC_P1", "KC_P2", "KC_P3", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_LEFT", "KC_DOWN", "KC_UP", "KC_RGHT", "KC_NO", "KC_TRNS", "KC_TRNS", "KC_NO", "KC_P0", "KC_PDOT", "KC_PENT", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_TRNS", "KC_NO", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_NO", "KC_NO", "KC_NO", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_NO"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_ACL0", "KC_ACL1", "KC_ACL2", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_WH_D", "KC_BTN1", "KC_MS_U", "KC_BTN2", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_WH_U", "KC_MS_L", "KC_MS_D", "KC_MS_R", "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_TRNS", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"]]

keyboards/xd75/keymaps/benjaminmikiten-split/readme.md

@@ -0,0 +1,13 @@
+# Generated Keymap Layout
+
+This layout was generated by the QMK API. You can find the JSON data used to
+generate this keymap in the file layers.json.
+
+To make use of this file you will need follow the following steps:
+
+* Download or Clone QMK Firmware: <https://github.com/qmk/qmk_firmware/>
+* Extract QMK Firmware to a location on your hard drive
+* Copy this folder into %s
+* You are now ready to compile or use your keymap with the source
+
+More information can be found in the QMK docs: <https://docs.qmk.fm>

keyboards/xd75/keymaps/benjaminmikiten-split/rules.mk

@@ -0,0 +1,16 @@
+# Copyright 2013 Jun Wako <[email protected]>
+#
+# 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/>.
+
+BOOTMAGIC_ENABLE = full

users/benjaminmikiten/readme.md

@@ -38,4 +38,4 @@ Base
 | Lower
 | Adjust
 
-## Layer Descriptons
+## Layer Descriptons