Code

Merge from upstream#2

Code

Merged

VadimBrodsky merged 121 commits intoVadimBrodsky:masterVadimBrodsky/qmk_firmware:masterfrom qmk:masterqmk/qmk_firmware:masterCopy head branch name to clipboardOct 12, 2017

+24,420-5,468

Commits

Commits on Jun 11, 2017

• rgblight support for ps2avrGB

  luizribeiro

  committed
  6037ced

  Copy full SHA for 6037ced

• Simplified ps2avrGB rgblight_set logic a bit

  luizribeiro

  committed
  964d706

  Copy full SHA for 964d706

• Added a build flag for using a custom rgblight driver

  luizribeiro

  committed
  d4cd5dd

  Copy full SHA for d4cd5dd

• Fixed rgblight_types.h

  luizribeiro

  committed
  945f2f5

  Copy full SHA for 945f2f5

• Always send 3 * RGBLED_NUM bytes through I2C on ps2avrGB

  Show description for 60153e7
  luizribeiro

  committed
  60153e7

  Copy full SHA for 60153e7

Commits on Jul 4, 2017

• Fixed indentation and now using quantum keycodes for rgblight

  luizribeiro

  committed
  738b072

  Copy full SHA for 738b072

• Merge branch 'master' into ps2avrGB

  luizribeiro

  committed
  d548626

  Copy full SHA for d548626

Commits on Sep 10, 2017

• adds a default ergodox_infinity keymap

  jackhumbert

  committed
  f10e958

  Copy full SHA for f10e958

Commits on Sep 11, 2017

• fix for toggle tap dance

  

  Ptomerty

  authored and

  jackhumbert

  committed
  68b6de6

  Copy full SHA for 68b6de6

• Basic support for JM60 keyboard

  Show description for 349e001
  

  mkninc

  authored and

  jackhumbert

  committed
  349e001

  Copy full SHA for 349e001

• Use KC_GESC keycode instead of custom function

  

  mkninc

  authored and

  jackhumbert

  committed
  d331e27

  Copy full SHA for d331e27

• Changed USB manufacturer to "JMWS"

  Show description for 63cde00
  

  mkninc

  authored and

  jackhumbert

  committed
  63cde00

  Copy full SHA for 63cde00

• Update tv44-belak keymap

  

  belak

  authored and

  jackhumbert

  committed
  a4ff8b9

  Copy full SHA for a4ff8b9

Commits on Sep 12, 2017

• Updates send_string functionality, adds terminal feature (#1657)

  Show description for 7ad924b
  jackhumbert

  authored
  7ad924b

  Copy full SHA for 7ad924b

Commits on Sep 13, 2017

• Add jojiichan keymap

  

  nooges

  authored and

  jackhumbert

  committed
  63028dd

  Copy full SHA for 63028dd

• [planck] Adds Sean Hunter keymap(#1706)

  Show description for cf00130
  

  huntse

  authored and

  jackhumbert

  committed
  cf00130

  Copy full SHA for cf00130

• updated read.md file

  

  Goel

  authored and

  jackhumbert

  committed
  7da5859

  Copy full SHA for 7da5859

• Add support for MF68 replacement PCB for Magicforce 68 (#1698)

  Show description for 4549dcd
  

  nooges

  authored and

  jackhumbert

  committed
  4549dcd

  Copy full SHA for 4549dcd

Commits on Sep 14, 2017

• Further updated ergodone readme.md (#1714)

  Show description for 23ce0b4
  

  harshitgoel96

  authored and

  jackhumbert

  committed
  23ce0b4

  Copy full SHA for 23ce0b4

• Some revisions to cbbrowne Planck keymap, and a preliminary xd75 keymap (#1715)

  Show description for a07d1f2
  

  cbbrowne

  authored and

  jackhumbert

  committed
  a07d1f2

  Copy full SHA for a07d1f2

Commits on Sep 15, 2017

• Adapt build instructions to new keyboard name

  

  florentc

  authored and

  jackhumbert

  committed
  17c84f2

  Copy full SHA for 17c84f2

• Remove accidentally pasted line in MF68 readme

  

  nooges

  authored and

  jackhumbert

  committed
  c02de09

  Copy full SHA for c02de09

• "New" Atreus Keymap (#1717)

  Show description for 19f48fa
  

  henxing

  authored and

  jackhumbert

  committed
  19f48fa

  Copy full SHA for 19f48fa

• Add Levinson keyboard (#1723)

  Show description for 5eb5b60
  

  nooges

  authored and

  jackhumbert

  committed
  5eb5b60

  Copy full SHA for 5eb5b60

• Cleaned, revised, and updated my keymaps to reflect new changes/defaults (#1712)

  Show description for ee9a20f
  

  khord

  authored and

  jackhumbert

  committed
  ee9a20f

  Copy full SHA for ee9a20f

Commits on Sep 16, 2017

• Update Mechmini keymap, reduce reported power consumption for iOS Camera Adapter compatibility

  

  krusli

  authored and

  jackhumbert

  committed
  afcf3a2

  Copy full SHA for afcf3a2

• update to driver separation

  jackhumbert

  committed
  dc7d0c7

  Copy full SHA for dc7d0c7

• Merge branch 'luizribeiro-ps2avrGB'

  jackhumbert

  committed
  5ad5c23

  Copy full SHA for 5ad5c23

• Wording changes for the WSL install script

  

  Rob Rogers

  authored and

  jackhumbert

  committed
  7bcf3e2

  Copy full SHA for 7bcf3e2

• Adding Ergodox EZ and Atreus Dvorak 42-key layouts (#1705)

  Show description for 3e1f388
  

  luc-vocab

  authored and

  jackhumbert

  committed
  3e1f388

  Copy full SHA for 3e1f388

• Updated README in ergodox_infinity keyboard (#1702)

  Show description for 6198fed
  

  insipx

  authored and

  jackhumbert

  committed
  6198fed

  Copy full SHA for 6198fed

• [core] fix rgb source include

  jackhumbert

  committed
  024f045

  Copy full SHA for 024f045

• Got luizribeiro's ps2avrgb implementation working for Mechmini

  

  krusli

  authored and

  jackhumbert

  committed
  69ab37f

  Copy full SHA for 69ab37f

• Change max brightness level for iOS

  

  krusli

  authored and

  jackhumbert

  committed
  d281cd5

  Copy full SHA for d281cd5

• Update on/off toggle behaviour for RGB LEDs

  

  krusli

  authored and

  jackhumbert

  committed
  0b7df9f

  Copy full SHA for 0b7df9f

• Fixes for RGB, more colours

  

  krusli

  authored and

  jackhumbert

  committed
  6cfb85f

  Copy full SHA for 6cfb85f

• Keymap updates

  

  krusli

  authored and

  jackhumbert

  committed
  a8a0245

  Copy full SHA for a8a0245

• Add RGB code (from ps2avrgb and luizribeiro/qmk_firmware)

  

  krusli

  authored and

  jackhumbert

  committed
  c7ebb0f

  Copy full SHA for c7ebb0f

• Updated RGB code to use event.pressed

  

  krusli

  authored and

  jackhumbert

  committed
  25aa474

  Copy full SHA for 25aa474

Commits on Sep 17, 2017

• Improve readme and PID codes for Atreus.

  

  technomancy

  authored and

  jackhumbert

  committed
  2a02df8

  Copy full SHA for 2a02df8

• Address issue #1713 (#1728)

  

  khord

  authored and

  skullydazed

  committed
  da887ea

  Copy full SHA for da887ea

Commits on Sep 18, 2017

• Remove redundant Makefile.

  

  shieldsd

  authored and

  jackhumbert

  committed
  8702137

  Copy full SHA for 8702137

• Added Auto Shift, tap key = normal, hold key = shifted state.

  

  jcowgar

  authored and

  jackhumbert

  committed
  abba393

  Copy full SHA for abba393

• KC_TILD should not have been listed as an auto shift key

  

  jcowgar

  authored and

  jackhumbert

  committed
  d0ca713

  Copy full SHA for d0ca713

• Fixed a few typos and spelling errors in auto shift feature document

  

  jcowgar

  authored and

  jackhumbert

  committed
  a891835

  Copy full SHA for a891835

• Adding a new layout for the planck that helps when coming from the pok3r (#1701)

  Show description for 3173924
  

  cheesemacfly

  authored and

  jackhumbert

  committed
  3173924

  Copy full SHA for 3173924

Commits on Sep 19, 2017

• Fixed uk78 and turned Bootmagic off (#1725)

  Show description for 62a02af
  

  Rozakiin

  authored and

  jackhumbert

  committed
  62a02af

  Copy full SHA for 62a02af

• convert to unix line-endings [skip ci]

  qmk-bot

  committed
  0c33527

  Copy full SHA for 0c33527

• adds DZ60 support (#1734)

  Show description for 32d6a8b
  jackhumbert

  authored
  32d6a8b

  Copy full SHA for 32d6a8b

Commits on Sep 21, 2017

• Instruct VSCode to indent using spaces, also ignore two temp files created by VSCode.

  

  jcowgar

  authored and

  jackhumbert

  committed
  064f682

  Copy full SHA for 064f682

• add layout mitosis-datagrok (workman variant)

  

  datagrok

  authored and

  jackhumbert

  committed
  b1d6005

  Copy full SHA for b1d6005

• Adding my keymap with Colemak Mod-DH

  

  tuesdayjohn

  authored and

  jackhumbert

  committed
  ea7792b

  Copy full SHA for ea7792b

• Turkish planck keymap (#1675)

  Show description for 31e78d2
  

  bbaserdem

  authored and

  jackhumbert

  committed
  31e78d2

  Copy full SHA for 31e78d2

• move keymap to rules.mk

  jackhumbert

  committed
  d77e55d

  Copy full SHA for d77e55d

• add filess

  jackhumbert

  committed
  4c75285

  Copy full SHA for 4c75285

• Clone Nyquist keyboard for Viterbi

  

  nooges

  authored and

  jackhumbert

  committed
  72e9939

  Copy full SHA for 72e9939

• Rename cloned Nyquist files to Viterbi, create temporary keymaps

  Show description for 92b74e2
  

  nooges

  authored and

  jackhumbert

  committed
  92b74e2

  Copy full SHA for 92b74e2

• Adjust Viterbi pinout

  

  nooges

  authored and

  jackhumbert

  committed
  9482317

  Copy full SHA for 9482317

• Update default Viterbi layout

  

  nooges

  authored and

  jackhumbert

  committed
  37b9715

  Copy full SHA for 37b9715

• Update Viterbi keymaps

  

  nooges

  authored and

  jackhumbert

  committed
  8c02748

  Copy full SHA for 8c02748

• Contribute a DZ60 keymap for 67 key configuration

  

  yanfali

  authored and

  jackhumbert

  committed
  878774b

  Copy full SHA for 878774b

Commits on Sep 25, 2017

• add conditional for planck-mitch keymap

  jackhumbert

  committed
  aef36ad

  Copy full SHA for aef36ad

• updated keycodes media descriptions

  Show description for 957e442
  

  surlyjake

  authored and

  jackhumbert

  committed
  957e442

  Copy full SHA for 957e442

• platform descriptions to match master keycodes.md documentation

  

  surlyjake

  authored and

  jackhumbert

  committed
  c8d365f

  Copy full SHA for c8d365f

• Fixed typo of "multually" to "mutually"

  

  burchill

  authored and

  jackhumbert

  committed
  809c925

  Copy full SHA for 809c925

• Add shell.nix for NixOS users

  

  lluchs

  authored and

  jackhumbert

  committed
  1ad941e

  Copy full SHA for 1ad941e

• Add my gherkin keymap, and update readme and config

  

  itsaferbie

  authored and

  jackhumbert

  committed
  169d46c

  Copy full SHA for 169d46c

• Removed unneeded code from keymap

  

  itsaferbie

  authored and

  jackhumbert

  committed
  56d7506

  Copy full SHA for 56d7506

• XD75RE Custom layout, and clarification in readme.md (#1754)

  Show description for a67c930
  

  skewwhiffy

  authored and

  jackhumbert

  committed
  a67c930

  Copy full SHA for a67c930

• Update Viterbi default layout (#1753)

  Show description for 5dab2ef
  

  nooges

  authored and

  jackhumbert

  committed
  5dab2ef

  Copy full SHA for 5dab2ef

• Move work from pinky fingers to thumbs and index fingers (#1749)

  Show description for a005327
  

  phreed

  authored and

  jackhumbert

  committed
  a005327

  Copy full SHA for a005327

• New layout for XD60/64 (#1748)

  Show description for f1c7b81
  

  cideM

  authored and

  jackhumbert

  committed
  f1c7b81

  Copy full SHA for f1c7b81

• Added Obelus

  Show description for 692c4e7
  

  jetpacktuxedo

  authored and

  jackhumbert

  committed
  692c4e7

  Copy full SHA for 692c4e7

• ?= -> =

  

  Ethan Madden

  authored and

  jackhumbert

  committed
  e2480a2

  Copy full SHA for e2480a2

Commits on Sep 27, 2017

• remove all makefiles from keyboard directories

  jackhumbert

  committed
  791b9cc

  Copy full SHA for 791b9cc

Commits on Sep 29, 2017

• Support for KBP V60 Type R 60% keyboard (#1770)

  Show description for 6ec7cce
  

  mechmerlin

  authored and

  jackhumbert

  committed
  6ec7cce

  Copy full SHA for 6ec7cce

• updated drashna's keymaps (#1769)

  Show description for d28fb63
  

  drashna

  authored and

  jackhumbert

  committed
  d28fb63

  Copy full SHA for d28fb63

• added matrixman layout

  

  Matt

  authored and

  jackhumbert

  committed
  b736f25

  Copy full SHA for b736f25

• Clueboard 60% support (#1746)

  Show description for 5fd6826
  skullydazed

  authored
  5fd6826

  Copy full SHA for 5fd6826

• Fix HSV Color Wheel image on RGB Light page (#1773)

  Show description for f1451b4
  

  kavu

  authored and

  skullydazed

  committed
  f1451b4

  Copy full SHA for f1451b4

Commits on Sep 30, 2017

• Don't process keycodes on the slave

  

  fredizzimo

  authored and

  jackhumbert

  committed
  25285a1

  Copy full SHA for 25285a1

• Fix dynamic macros on ChibiOS keyboards

  

  fredizzimo

  authored and

  jackhumbert

  committed
  67eeb88

  Copy full SHA for 67eeb88

Commits on Oct 3, 2017

• Add new planck layout (#1778)

  Show description for efbc4d2
  

  tehwalris

  authored and

  jackhumbert

  committed
  efbc4d2

  Copy full SHA for efbc4d2

• code_friendly_qwerty keymap

  

  ideasman42

  authored and

  jackhumbert

  committed
  cc52ac5

  Copy full SHA for cc52ac5

• ergodox: Update algernon's layout to v1.11

  Show description for 1cd336d
  

  algernon

  authored and

  jackhumbert

  committed
  1cd336d

  Copy full SHA for 1cd336d

• Reference to rules.mk in tap dance docs added

  Show description for 03de0c8
  

  Daniel Gordon

  authored and

  jackhumbert

  committed
  03de0c8

  Copy full SHA for 03de0c8

• Mbsurfer Let's Split keymap updates (#1787)

  Show description for 01bf8e1
  

  coryshaw1

  authored and

  jackhumbert

  committed
  01bf8e1

  Copy full SHA for 01bf8e1

Commits on Oct 5, 2017

• Edited a minor typo in feature_bootmagic.md.

  

  Sebb767

  authored and

  jackhumbert

  committed
  29bcffb

  Copy full SHA for 29bcffb

• Minor typo

  

  khord

  authored and

  jackhumbert

  committed
  0cc6245

  Copy full SHA for 0cc6245

• Adding my Roadkit keymap (#1798)

  Show description for e446edd
  

  khord

  authored and

  jackhumbert

  committed
  e446edd

  Copy full SHA for e446edd

• [cleanup] consistent 2 space indentation

  Show description for c206650
  

  ideasman42

  authored and

  jackhumbert

  committed
  c206650

  Copy full SHA for c206650

• Update Let's Split readme

  Show description for e0834cf
  

  khord

  authored and

  jackhumbert

  committed
  e0834cf

  Copy full SHA for e0834cf

Commits on Oct 6, 2017

• Add new 4x12 ortho layout & add credit to XD75 port (#1782)

  Show description for ea81926
  

  BenKesselring

  authored and

  jackhumbert

  committed
  ea81926

  Copy full SHA for ea81926

• Generic Pointing Device (#1767)

  

  Snipeye

  authored and

  jackhumbert

  committed
  ee13228

  Copy full SHA for ee13228

• Increase one-shot timeout for planck/keymaps/dshields and remove unused includes.

  

  shieldsd

  authored and

  jackhumbert

  committed
  d2bbfb9

  Copy full SHA for d2bbfb9

• Consistent fabian layouts for amj40, let's split, planck and xd75 (#1812)

  Show description for 120089d
  

  fabiant7t

  authored and

  jackhumbert

  committed
  120089d

  Copy full SHA for 120089d

• Fix Clueboard readme links (#1816)

  

  johu

  authored and

  skullydazed

  committed
  18f78b6

  Copy full SHA for 18f78b6

• correct layer numbers in keymaps

  

  r2d2rogers

  authored and

  jackhumbert

  committed
  8d7cc11

  Copy full SHA for 8d7cc11

• correct extraneous t

  

  r2d2rogers

  authored and

  jackhumbert

  committed
  357d930

  Copy full SHA for 357d930

Commits on Oct 7, 2017

• Fixed typo in docs. (#1818)

  

  lyuts

  authored and

  skullydazed

  committed
  d8c62e4

  Copy full SHA for d8c62e4

Commits on Oct 10, 2017

• Add my layouts (#1822)

  Show description for 6d2cb1d
  

  KMontag42

  authored and

  jackhumbert

  committed
  6d2cb1d

  Copy full SHA for 6d2cb1d

• Contribute GH60 layout (#1820)

  Show description for 20031ab
  

  agarciadom

  authored and

  jackhumbert

  committed
  20031ab

  Copy full SHA for 20031ab

• Added Dichotemy Keyboard, updated docs for Pointing Device (#1817)

  Show description for cfd118d
  

  Snipeye

  authored and

  jackhumbert

  committed
  cfd118d

  Copy full SHA for cfd118d

• Added ISO Hungarian friendly keymap (#1808)

  Show description for 31808df
  

  Pittyolo

  authored and

  jackhumbert

  committed
  31808df

  Copy full SHA for 31808df

• Qwerty Code Friendly: relocate insert key

  Show description for d6a446b
  

  ideasman42

  authored and

  jackhumbert

  committed
  d6a446b

  Copy full SHA for d6a446b

• neue Datei: keyboards/lets_split/keymaps/DE_simple/Makefile

  Show description for c5f847a
  

  DerMeerkamp

  authored and

  jackhumbert

  committed
  c5f847a

  Copy full SHA for c5f847a

• geändert: keyboards/lets_split/keymaps/DE_simple/keymap.c

  

  DerMeerkamp

  authored and

  jackhumbert

  committed
  56c2487

  Copy full SHA for 56c2487

• neue Datei: readme.md

  

  DerMeerkamp

  authored and

  jackhumbert

  committed
  951285d

  Copy full SHA for 951285d

• geändert: keymap.c

  

  DerMeerkamp

  authored and

  jackhumbert

  committed
  2cda124

  Copy full SHA for 2cda124

• geändert: readme.md

  

  DerMeerkamp

  authored and

  jackhumbert

  committed
  f3e61af

  Copy full SHA for f3e61af

• geändert: readme.md

  

  DerMeerkamp

  authored and

  jackhumbert

  committed
  34084b4

  Copy full SHA for 34084b4

• Cleanup of my keymaps (#1802)

  Show description for e0e80c0
  

  drashna

  authored and

  jackhumbert

  committed
  e0e80c0

  Copy full SHA for e0e80c0

• Updated my Gherkin Keymap

  

  itsaferbie

  authored and

  jackhumbert

  committed
  f88f042

  Copy full SHA for f88f042

• ErgoDone keyboard: Improved structure of readme and augmented it with important information. Updated links to moved content.

  

  marcostrauss

  authored and

  jackhumbert

  committed
  01ac8a6

  Copy full SHA for 01ac8a6

• #1792 added in waits from tmk for locking switches

  Show description for b91ffba
  

  Joe Martin

  authored and

  jackhumbert

  committed
  b91ffba

  Copy full SHA for b91ffba

• Fix missing teensy path

  

  keisuke333

  authored and

  jackhumbert

  committed
  109b2ae

  Copy full SHA for 109b2ae

• Add option to reverse PS2 mouse axes and scrolling

  

  Jesper Brix Rosenkilde

  authored and

  jackhumbert

  committed
  966e266

  Copy full SHA for 966e266

• add stock layout for xd75 (#1731)

  Show description for ee8860a
  

  Wunder

  authored and

  jackhumbert

  committed
  ee8860a

  Copy full SHA for ee8860a

• newkb-atreus-xk

  

  Jacob Chapman

  authored and

  jackhumbert

  committed
  b3ad561

  Copy full SHA for b3ad561

Commits on Oct 11, 2017

• Write a contributing guide. (#1827)

  skullydazed

  authored
  2db4ad2

  Copy full SHA for 2db4ad2

• Fix the presentation of the contribution guide

  skullydazed

  committed
  db5afb0

  Copy full SHA for db5afb0