Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

5 files changed, 0 insertions, 299 deletions

diff --git a/keyboard/planck/keymaps/cbbrowne/.gitignore b/keyboard/planck/keymaps/cbbrowne/.gitignore
deleted file mode 100644
index 0cf0c6cc56..0000000000
--- a/keyboard/planck/keymaps/cbbrowne/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-compiled.hex
diff --git a/keyboard/planck/keymaps/cbbrowne/Makefile b/keyboard/planck/keymaps/cbbrowne/Makefile
deleted file mode 100644
index 581e08cd02..0000000000
--- a/keyboard/planck/keymaps/cbbrowne/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
-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 = yes           # 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 this with audio at the same time.
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
\ No newline at end of file
diff --git a/keyboard/planck/keymaps/cbbrowne/config.h b/keyboard/planck/keymaps/cbbrowne/config.h
deleted file mode 100644
index 58cd2cc5bc..0000000000
--- a/keyboard/planck/keymaps/cbbrowne/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-/* cbbrowne user configuration */
-
-#define randadd 53
-#define randmul 181
-#define randmod 167
-
-/* Filler to make layering a bit clearer *
- * borrowed from basic keymap            */
-
-#define _______ KC_TRNS
-
-#endif
-
-
-
diff --git a/keyboard/planck/keymaps/cbbrowne/keymap.c b/keyboard/planck/keymaps/cbbrowne/keymap.c
deleted file mode 100644
index 55385acd6b..0000000000
--- a/keyboard/planck/keymaps/cbbrowne/keymap.c
+++ /dev/null
@@ -1,175 +0,0 @@
-#include "planck.h"
-#ifdef BACKLIGHT_ENABLE
-#include "backlight.h"
-#endif
-#include "config.h"
-#include "quantum.h"
-
-/* Each layer is given a name to aid in readability, which is then
-   used in the keymap matrix below.  The underscores do not denote 
-   anything - you can have a layer called STUFF or any other name.
-
-   Layer names don't all need to be of the same length, obviously, and
-   you could also skip them entirely and just use numbers, though that
-   means needing to manage the numbers.
-
-   It is preferable to keep the symbols short so that a line worth of
-   key mappings fits compactly onto a line of code. */
-
-/* This was originally based on planck/keymaps/default/default.c, and
-   then cbbrowne has revised things */
-
-/* Things I did not like about the default mapping 
-
-   - I found control too hard to get to.  I use it more than Tab, so
-     switched it there.
-   - Having dash on [lower-j] is a bit nonintuitive, but may be OK
-   - I'll bet I should switch ESC/TAB
-   - I'm suspicious that I want to shift M(0) from [4][1] to [4][2],
-     and shift ESC off the first column so KC_LCTL and KC_LALT can
-     be on the first column.
-   - I needed to swap ' and ENTER
-
-   - All of the above are done :-)
-
-   - Dropped out support for Dvorak and friends.  They aren't 
-     improvements to me
-*/
-
-
-/* Some interesting things implemented
-
-   - There is a macro that writes out "cbbrowne" to show that I could
-   - There is a (somewhat cruddy) linear congruential random number
-     generator.
-     - I would like to be seeding it with clock info to make it look
-       more random
-   - There are two macros that use the random number generators
-     - one, M_RANDDIGIT, generates a random digit based on state
-       of the random number generator
-     - the other, M_RANDLETTER, generates a random letter based on state
-       of the random number generator
-     - in both, note the use of register_code()/unregister_code()
-       to indicate the desired key
-   - I do indeed want a sweet number pad!
-*/
-
-/* Other things to do...
-
-   - Need to think about what zsh and readline actions I use lots
-   - Ought to ensure that Control-Alt-Delete is convenient enough
-   - How about Alt-F1 thru Alt-F8?
-   - What's the keystroke to get from X to console these days?
-   - A layer for doing console switching would not be a bad idea
-*/
-
-enum layers {
-  _QW = 0,  /* Qwerty mapping */
-  _LW, /* Lower layer, where top line has symbols !@#$%^&*() */
-  _RS, /* Raised layer, where top line has digits 1234567890 */
-  _KP, /* Key pad */
-};
-
-enum macro_id {
-  M_LED = 0,
-  M_USERNAME,
-  M_RANDDIGIT,
-  M_RANDLETTER,
-  M_VERSION
-};
-
-/* Note that Planck has dimensions 4 rows x 12 columns */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_QW] = { /* Qwerty */
-  {KC_ESC,  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_ENT},
-  {KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT },
-  {KC_TAB,  M(M_LED), KC_LALT, KC_LGUI, MO(_LW), KC_SPC,  KC_SPC,  MO(_RS), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT}
-  /* Note that KC_SPC is recorded TWICE, so that either matrix position can activate it */
-},
-[_RS] = { /* RAISE */
-  {KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC},
-  {_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS},
-  {_______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  DF(_QW), DF(_KP), DF(_KP), RESET,   _______},
-  {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY}
-},
-[_LW] = { /* LOWER */
-  {KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC},
-  {_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE},
-  {_______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  DF(_QW), DF(_KP), DF(_KP), RESET,   _______},
-  {_______, DF(_KP), _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY}
-},
-[_KP] = { /* Key Pad */
-  {KC_ESC,  M(M_USERNAME),    M(M_VERSION),   KC_F10,   KC_F11,  KC_F12,   KC_PGUP, KC_KP_ENTER, KC_7, KC_8, KC_9, KC_BSPC},
-  {KC_LCTL, M(M_RANDDIGIT),   KC_F5,   KC_F6,    KC_F7,   KC_F8,    KC_PGDN, KC_KP_MINUS, KC_4, KC_5, KC_6, KC_PIPE},
-  {KC_LSFT, M(M_RANDLETTER),  KC_F1,   KC_F2,    KC_F3,   KC_F4,    KC_DEL,  KC_KP_PLUS,  KC_1, KC_2,  KC_3, KC_ENTER},
-  {BL_STEP, M(M_LED), KC_LALT, KC_LGUI, KC_NO, KC_SPC,  KC_SPC,  DF(_QW),   KC_LEFT, KC_DOWN, KC_UP,  KC_RIGHT}
-}
-};
-
-/* What is fn_actions actually used for??? */
-const uint16_t PROGMEM fn_actions[] = {
-};
-
-/* This bit of logic seeds a wee linear congruential random number generator */
-/* lots of prime numbers everywhere... */
-static uint16_t random_value = 157;
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  uint8_t clockbyte=0;
-  clockbyte = TCNT1 % 256;
-  uint8_t rval;
-  // MACRODOWN only works in this function
-  switch(id) {
-  case M_LED:
-    if (record->event.pressed) {
-      register_code(KC_RSFT);
-#ifdef BACKLIGHT_ENABLE
-      backlight_step();
-#endif
-    } else {
-      unregister_code(KC_RSFT);
-    }
-    break;	    
-  case M_USERNAME:
-    if (record->event.pressed) {
-      SEND_STRING("cbbrowne");
-    }
-    break;
-  case M_VERSION:
-    if (record->event.pressed) {
-      SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP "@" QMK_VERSION "@" QMK_BUILDDATE);
-    }
-    break;
-  case M_RANDDIGIT:
-    /* Generate, based on random number generator, a keystroke for
-       a numeric digit chosen at random */
-    random_value = ((random_value + randadd) * randmul) % randmod;
-    if (record->event.pressed) {
-      /* Here, we mix the LCRNG with low bits from one of the system
-         clocks via XOR in the theory that this may be more random
-         than either separately */ 
-      rval = (random_value ^ clockbyte) % 10;
-      /* Note that KC_1 thru KC_0 are a contiguous range */
-      register_code (KC_1 + rval);
-      unregister_code (KC_1 + rval);
-    }
-    break;
-  case M_RANDLETTER:
-    /* Generate, based on random number generator, a keystroke for
-       a letter chosen at random */
-    /* Here, we mix the LCRNG with low bits from one of the system
-       clocks via XOR in the theory that this may be more random
-       than either separately */ 
-    random_value = ((random_value + randadd) * randmul) % randmod;
-    if (record->event.pressed) {
-      rval = (random_value ^ clockbyte) % 26;
-      register_code (KC_A + rval);
-      unregister_code (KC_A + rval);
-    }
-    break;
-  }
-  return MACRO_NONE;
-};
diff --git a/keyboard/planck/keymaps/cbbrowne/readme.md b/keyboard/planck/keymaps/cbbrowne/readme.md
deleted file mode 100644
index 5f08530f46..0000000000
--- a/keyboard/planck/keymaps/cbbrowne/readme.md
+++ /dev/null
@@ -1,78 +0,0 @@
-cbbrowne custom keyboard
-==============================
-
-Due to cbbrowne@acm.org
-Christopher Browne
-
-This was originally based on the default keyboard map, but I have been
-doing sundry experimentation:
-
-1. Experiments
-----------------------------------------
-
- * To figure things out about the toolset
- * I'm an Emacs guy, so will be needing a fair bit of tuning
- * It made sense to mess around some with keyboard maps.
-   - I tried added Workman alongside Dvorak and Colemak
-     - Boy, oh boy, these don't help!!!
-     - I have done 30 years of learning of Emacs key mappings, and
-       these alternative keyboards massively mess me up
-   - I added a keypad, originally based on keymaps/numpad.c, but
-     mighty substantially revised, as that one seems to be rotated 90
-     degrees from usual conventions for number pads
- * The keypad layer also includes some sample "hacks" of cool things,
-   all using actions attached in using the function action_get_macro()
-   - Key [1][2] aka "q" types out my name, cbbrowne, as a fun example
-     of a key generating a bunch of keystrokes.  The keystroke is
-     sufficiently inconvenient that it isn't terribly practical for me
-     to use it, but hey, it shows how others might use this facility
-     in a more useful context.
-   - Key [2][2] aka "a" uses a random number generator to select a digit 0-9 at random
-   - Key [3][2] aka "z" uses a random number generator to select a letter a-z at random
-   - Key [1][3] aka "e" spits out the keymap version number
-
-2. Some code structure ideas
----------------------------------------------------
-
-   Each layer is given a name to aid in readability, which is then
-   used in the keymap matrix below.  The underscores do not denote
-   anything - you can have a layer called STUFF or any other name.
-
-   Layer names don't all need to be of the same length, obviously, and
-   you could also skip them entirely and just use numbers, though that
-   means needing to manage the numbers.
-
-   It is preferable to keep the symbols short so that a line worth of
-   key mappings fits compactly onto a line of code.  It might be an
-   interesting idea to express the maps rotated 90%, so that you
-   only need to fit 4 symbols onto each line, rather than 12.
-
-   I used enums to manage layer IDs and macro IDs so that I don't need
-   to care (beyond "start at 0", and arguably that's not needed) about
-   their values.
-
-3. Things I did not like about the default mapping
----------------------------------------------------------
-
-   * I found control too hard to get to.  I use it more than Tab, so
-     switched it there.
-   * Having dash on [lower-j] is a bit nonintuitive, but may be OK
-   * I switched ESC/TAB/M(0) around
-   * I'm suspicious that I want to shift M(0) from [4][1] to [4][2],
-     and shift ESC off the first column so KC_LCTL and KC_LALT can
-     be on the first column.
-   * I needed to swap ' and ENTER
-
-4. TODO
----------------------------------------------------------
-
-  * I use tmux quite a lot; the mollat keymap seems to have some
-    interesting helpers.  It might be interesting to add a "tmux
-    layer"
-  * The mollat tmux layer also suggests some thoughts about Emacs
-    helpers.
-  * I do not presently have anything that handles X11 screen
-    switching, as with Control-Alt-various
-	
-
-