Merge upstream master

4 files changed, 0 insertions, 390 deletions

diff --git a/keyboards/planck/keymaps/ab/keyboard-layout.json b/keyboards/planck/keymaps/ab/keyboard-layout.json
deleted file mode 100644
index 29ca73fb6f..0000000000
--- a/keyboards/planck/keymaps/ab/keyboard-layout.json
+++ /dev/null
@@ -1,199 +0,0 @@
-[
-  {
-    "name": "AB's Practical Keymap for Planck",
-    "author": "Anand Babu Periasamy"
-  },
-  [
-    {
-      "fa": [
-        2,
-        2,
-        0,
-        2
-      ]
-    },
-    "F1\n1\n\n!\n\n\n\n\n\nTab",
-    "F2\n2\n\n@\n\n\n\n\n\nQ",
-    "F3\n3\n\n#\n\n\n\n\n\nW",
-    "F4\n4\n\n$\n\n\n\n\n\nE",
-    "F5\n5\n\n%\n\n\n\n\n\nR",
-    "F6\n6\n\n^\n\n\n\n\n\nT",
-    "F7\n7\n\n&\n\n\n\n\n\nY",
-    "F8\n8\n\n*\n\n\n\n\n\nU",
-    "F9\n9\n\n(\n\n\n\n\n\nI",
-    "F10\n0\n\n)\n\n\n\n\n\nO",
-    "F11\n-\n\n_\n\n\n\n\n\nP",
-    "F12\n=\n\n+\n\n\n\n\n\n<i class=\"fa fa-chevron-circle-left\" aria-hidden=\"true\"></i>"
-  ],
-  [
-    {
-      "a": 7,
-      "f": 3
-    },
-    "Ctrl",
-    {
-      "f": 3
-    },
-    "A",
-    {
-      "f": 3
-    },
-    "S",
-    {
-      "f": 3
-    },
-    "D",
-    {
-      "c": "#c4bcbc",
-      "a": 4,
-      "f": 3
-    },
-    "\n(\n\n\n\n\n\n\n\nF",
-    {
-      "c": "#cccccc",
-      "f": 3
-    },
-    "\n)\n\n\n\n\n\n\n\nG",
-    {
-      "f": 3
-    },
-    "\\\n\n\n\n\n\n\n\n\nH",
-    {
-      "c": "#c4bcbc",
-      "f": 3
-    },
-    "|\n\n\n\n\n\n\n\n\nJ",
-    {
-      "c": "#cccccc",
-      "a": 7,
-      "f": 3
-    },
-    "K",
-    {
-      "f": 3
-    },
-    "L",
-    {
-      "a": 6,
-      "f": 3
-    },
-    ";\n\n:",
-    {
-      "f": 3
-    },
-    "'\n\n\""
-  ],
-  [
-    {
-      "a": 7,
-      "f": 3
-    },
-    "Shift",
-    {
-      "f": 3
-    },
-    "Z",
-    {
-      "f": 3
-    },
-    "X",
-    {
-      "f": 3
-    },
-    "C",
-    {
-      "a": 4,
-      "fa": [
-        2,
-        2,
-        0,
-        2,
-        0,
-        0,
-        0,
-        0,
-        0,
-        2
-      ]
-    },
-    "\n[\n\n\n\n\n\n\n\nV",
-    "\n]\n\n\n\n\n\n\n\nB",
-    {
-      "fa": [
-        0,
-        2,
-        0,
-        2,
-        0,
-        0,
-        0,
-        0,
-        0,
-        2
-      ]
-    },
-    "`\n{\n\n\n\n\n\n\n\nN",
-    "~\n}\n\n\n\n\n\n\n\nM",
-    {
-      "a": 6
-    },
-    ",\n\n<",
-    ".\n\n>",
-    "/\n\n?",
-    {
-      "a": 7
-    },
-    "Shift ↵"
-  ],
-  [
-    {
-      "a": 4,
-      "fa": [
-        2,
-        2
-      ]
-    },
-    "<i class='fa fa-download'></i>\n<i class='fa fa-lightbulb-o'></i>\n\n\n\n\n\n\n\nCtrl",
-    "\n<i class=\"fa fa-search\" aria-hidden=\"true\"></i>\n\n\n\n\n\n\n\nEsc",
-    "\n<i class=\"fa fa-search-minus\" aria-hidden=\"true\"></i>\n\n\n\n\n\n\n\n<i class='fa fa-linux'></i>",
-    "\n<i class=\"fa fa-search-plus\" aria-hidden=\"true\"></i>\n\n\n\n\n\n\n\nAlt",
-    {
-      "a": 7,
-      "f": 3
-    },
-    "<i class='fa fa-sort-down'></i>",
-    {
-      "a": 4,
-      "fa": [
-        1,
-        1
-      ],
-      "w": 2
-    },
-    "PgUp\nPgDn\n\n\n\n\n\n\n\nSpace",
-    {
-      "a": 7,
-      "f": 3
-    },
-    "<i class='fa fa-sort-up'></i>",
-    {
-      "a": 4,
-      "fa": [
-        2
-      ]
-    },
-    "<i class=\"fa fa-undo\" aria-hidden=\"true\"></i>\n\n\n\n\n\n\n\n\n<i class=\"fa fa-long-arrow-left\" aria-hidden=\"true\"></i>",
-    {
-      "f": 3
-    },
-    "<i class='fa fa-volume-down'></i>\n\n\n\n\n\n\n\n\n<i class=\"fa fa-long-arrow-down\" aria-hidden=\"true\"></i>",
-    {
-      "f": 3
-    },
-    "<i class='fa fa-volume-up'></i>\n\n\n\n\n\n\n\n\n<i class=\"fa fa-long-arrow-up\" aria-hidden=\"true\"></i>",
-    {
-      "f": 3
-    },
-    "<i class='fa fa-volume-off'></i>\n\n\n\n\n\n\n\n\n<i class=\"fa fa-long-arrow-right\" aria-hidden=\"true\"></i>"
-  ]
-]
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/ab/keymap.c b/keyboards/planck/keymaps/ab/keymap.c
deleted file mode 100644
index e10d5e4422..0000000000
--- a/keyboards/planck/keymaps/ab/keymap.c
+++ /dev/null
@@ -1,113 +0,0 @@
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// Symbolic names for macro IDs.
-#define _QWERTY  0 // QUERTY layer
-#define _LOWER   1 // Lower layer
-#define _RAISE   2 // Raise layer
-#define _CUSTOM  3 // Custom layer (LOWER + RAISE)
-#define _BL      4 // Backlight
-#define _MOB     5 // Mobile#
-#define _CUS1    6 // Custom macro 1
-#define _CUS2    7 // Custom macro 2
-
-// Macro shortcuts.
-#define QWERTY  M(_LOWER)
-#define LOWER   M(_LOWER)
-#define RAISE   M(_RAISE)
-#define CUSTOM  M(_CUSTOM)
-#define BL      M(_BL)
-#define MOB     M(_MOB)
-#define CUS1    M(_CUS1)
-#define CUS2    M(_CUS2)
-
-// Func macro definitions.
-#define LWR_PGDN LT(_LOWER, KC_PGDN) // Tap for PgDn, hold for LOWER
-#define RSE_PGUP LT(_RAISE, KC_PGUP) // Tap for PgUp, hold for RAISE
-#define CTL_CAPS MT(MOD_LCTL, KC_CAPS) // Tap for Caps, hold for Ctrl (DOESN'T SEEM TO WORK)
-#define SFT_ENT  MT(MOD_RSFT, KC_ENT) // Tap for Enter, hold for Shift
-#define ZM_NRM   C(KC_0) // Zoom normal
-#define ZM_IN    C(KC_MINS) // Zoom out
-#define ZM_OUT   C(KC_PLUS) // Zoom in
-#define EM_UNDO  C(KC_UNDS) // Emacs Undo
-
-// This config can be found at Keyboard layout editor site: http://goo.gl/zjXL2l
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_QWERTY] = LAYOUT_planck_grid( /* QWERTY */
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    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_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, SFT_ENT,
-    KC_LCTL, KC_ESC,  KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-[_LOWER] = LAYOUT_planck_grid( /* LOWER */
-    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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LPRN, KC_RPRN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    BL,      ZM_NRM,  ZM_IN,   ZM_OUT,  KC_TRNS, KC_PGDN, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-),
-[_RAISE] = LAYOUT_planck_grid( /* RAISE */
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, KC_PIPE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_GRV,  KC_TILD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGUP, KC_TRNS, EM_UNDO, KC_VOLD, KC_VOLU, KC_MUTE
-),
-[_CUSTOM] = LAYOUT_planck_grid( /* CUSTOM */
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MOB,     KC_TRNS, CUS1,    CUS2,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-)
-};
-
-// Set a layer persistently.
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-// Macro actions for each corresponding ID.
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-    switch(id) {
-    case _RAISE: // Raised layer.
-	if (record->event.pressed) {
-	    layer_on(_RAISE);
-	    update_tri_layer(_LOWER, _RAISE, _CUSTOM);
-	} else {
-	    layer_off(_RAISE);
-	    update_tri_layer(_LOWER, _RAISE, _CUSTOM);
-	}
-	break;
-    case _LOWER: // Lowered layer.
-	if (record->event.pressed) {
-	    layer_on(_LOWER);
-	    update_tri_layer(_LOWER, _RAISE, _CUSTOM);
-	} else {
-	    layer_off(_LOWER);
-	    update_tri_layer(_LOWER, _RAISE, _CUSTOM);
-	}
-	break;
-    case _BL: // Backlight
-	if (record->event.pressed) {
-	    register_code(KC_RSFT);
-#ifdef BACKLIGHT_ENABLE
-	    backlight_step();
-#endif
-	} else {
-	    unregister_code(KC_RSFT);
-	}
-	break;
-    case _MOB: // Your mobile# here.
-	return MACRODOWN(T(1), T(2), T(3), T(MINS),
-			 T(1), T(2), T(3), T(MINS),
-			 T(1), T(2), T(3), T(4),
-			 END);
-    case _CUS1: // Your custom macro 1
-	return MACRODOWN(T(E), T(M), T(A), T(C), T(S), T(SPC), END);
-    case _CUS2: // Your custom macro 2
-	return MACRODOWN(T(L), T(S), T(SPC), T(MINS), T(L), T(ENT), END);
-    };
-    return MACRO_NONE;
-}
diff --git a/keyboards/planck/keymaps/ab/readme.md b/keyboards/planck/keymaps/ab/readme.md
deleted file mode 100644
index 5f52e4436a..0000000000
--- a/keyboards/planck/keymaps/ab/readme.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Practical keymap for Planck Ortholinear 40% Mechanical Keyboard
-A practical keymap that emulates standard QWERTY keyboard for Planck. Once you get comfortable with this keymap, you may fork and customize it for your own needs. 
-
-![Layout](https://i.imgur.com/xnlaiZd.png "Practical Keymap")
-![Photo](https://i.imgur.com/1kQPbLv.jpg "Planck Keyboard")
-
-* Online keyboard layout editor: http://www.keyboard-layout-editor.com/#/gists/bda299020baaafe6a2a4a82e615e3cfc
-
-# Programming Instructions:
-Enter into programming mode and run the following command.
-```
-$ sudo KEYMAP=ab make dfu
-```
-# Notes
-* Simultaneous RAISE+LOWER enters CUSTOM layer. You may add your own macros and custom keys here.
-* RAISE and LOWER also acts as PgUp and PgDn when tapped.
-* [CapsLock] also acts as [Ctrl] key when you press and hold. It is convenient for GNU Emacs users.
-* Bracket keys are placed in the center of the keyboard for programmer's convenience.
diff --git a/keyboards/planck/keymaps/ab/rules.mk b/keyboards/planck/keymaps/ab/rules.mk
deleted file mode 100644
index 4c79e946e6..0000000000
--- a/keyboards/planck/keymaps/ab/rules.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#----------------------------------------------------------------------------
-# On command line:
-#
-# make all = Make software.
-#
-# make clean = Clean out built project files.
-#
-# make coff = Convert ELF to AVR COFF.
-#
-# make extcoff = Convert ELF to AVR Extended COFF.
-#
-# make program = Download the hex file to the device.
-#                Please customize your programmer settings(PROGRAM_CMD)
-#
-# make teensy = Download the hex file to the device, using teensy_loader_cli.
-#               (must have teensy_loader_cli installed).
-#
-# make dfu = Download the hex file to the device, using dfu-programmer (must
-#            have dfu-programmer installed).
-#
-# make flip = Download the hex file to the device, using Atmel FLIP (must
-#             have Atmel FLIP installed).
-#
-# make dfu-ee = Download the eeprom file to the device, using dfu-programmer
-#               (must have dfu-programmer installed).
-#
-# make flip-ee = Download the eeprom file to the device, using Atmel FLIP
-#                (must have Atmel FLIP installed).
-#
-# make debug = Start either simulavr or avarice as specified for debugging,
-#              with avr-gdb or avr-insight as the front end for debugging.
-#
-# make filename.s = Just compile filename.c into the assembler code only.
-#
-# make filename.i = Create a preprocessed source file for use in submitting
-#                   bug reports to the GCC project.
-#
-# To rebuild project do "make clean" then "make all".
-#----------------------------------------------------------------------------
-
-# Build Options
-#   change to "no" to disable the options, or define them in the makefile.mk in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-