]> git.donarmstrong.com Git - qmk_firmware.git/log
qmk_firmware.git
7 years agoMerge pull request #597 from Jiehong/feature/basic_keyboard_doc
Jack Humbert [Mon, 1 Aug 2016 06:25:20 +0000 (02:25 -0400)]
Merge pull request #597 from Jiehong/feature/basic_keyboard_doc

feature: add basic doc about how a keyboard works on USB

7 years agoMerge pull request #596 from fredizzimo/rid_of_quick
Jack Humbert [Mon, 1 Aug 2016 06:24:53 +0000 (02:24 -0400)]
Merge pull request #596 from fredizzimo/rid_of_quick

Fix the makefile dependencies and remove quick targets

7 years agofeature: add basic doc about how a keyboard works on USB
Jiehong Ma [Sun, 31 Jul 2016 14:49:31 +0000 (16:49 +0200)]
feature: add basic doc about how a keyboard works on USB

This comes from the discussion on #520

7 years agoTravis calls the normal build target, instead of quick
Fred Sundvik [Sun, 31 Jul 2016 11:18:51 +0000 (14:18 +0300)]
Travis calls the normal build target, instead of quick

7 years agoFix the readme for the removed quick target
Fred Sundvik [Sun, 31 Jul 2016 11:18:00 +0000 (14:18 +0300)]
Fix the readme for the removed quick target

7 years agoRemove the quick commands and add proper clean
Fred Sundvik [Sun, 31 Jul 2016 11:17:32 +0000 (14:17 +0300)]
Remove the quick commands and add proper clean

7 years agoAlso depend on the gcc version
Fred Sundvik [Sun, 31 Jul 2016 10:49:04 +0000 (13:49 +0300)]
Also depend on the gcc version

7 years agoGenerate version information to version.h
Fred Sundvik [Sat, 30 Jul 2016 20:41:26 +0000 (23:41 +0300)]
Generate version information to version.h

So that only the files that really needs a version are recompiled.

7 years agoForce compilation and linking when options changes
Fred Sundvik [Sat, 30 Jul 2016 19:07:01 +0000 (22:07 +0300)]
Force compilation and linking when options changes

7 years agoMore reliable .d file generation
Fred Sundvik [Sat, 30 Jul 2016 15:16:34 +0000 (18:16 +0300)]
More reliable .d file generation

Also generated inside the obj dir instead of separate deps folder.

7 years agoPut the build output inside the root/.build directory
Fred Sundvik [Sun, 31 Jul 2016 10:25:49 +0000 (13:25 +0300)]
Put the build output inside the root/.build directory

7 years agoEnable vpath seraching for source files only
Fred Sundvik [Sun, 31 Jul 2016 10:24:25 +0000 (13:24 +0300)]
Enable vpath seraching for source files only

7 years agoBetter "include guards" for the makefiles
Fred Sundvik [Sun, 31 Jul 2016 10:22:18 +0000 (13:22 +0300)]
Better "include guards" for the makefiles

Checking for ARCH is not good enough, since some subprojects define it.
Ergodox Ez for example. The leads to running the make from
keyboards/ergodox/ez failing. The keyboard makefile will not be included
in that case, and therefore not the CUSTOM_MATRIX either.

Furthermore the output files are read from many different .build
directories, so it doesn't fail deterministically. For example on the
Travis CI the compilation passes, since there's no outdated objects that
needs recompilation.

7 years agoMerge pull request #594 from jeebak/jeebak
Jack Humbert [Sun, 31 Jul 2016 05:30:31 +0000 (01:30 -0400)]
Merge pull request #594 from jeebak/jeebak

Jeebak's keymap for planck

7 years agoMerge pull request #590 from jeebak/in-like-flint
Jack Humbert [Sun, 31 Jul 2016 05:30:09 +0000 (01:30 -0400)]
Merge pull request #590 from jeebak/in-like-flint

Add IN_LIKE_FLINT song

7 years agoUpdate readme.md
JeeBak Kim [Sat, 30 Jul 2016 20:09:49 +0000 (13:09 -0700)]
Update readme.md

7 years agoAdd additional shortcut keymaps to TOUCHCURSOR layer
JeeBak Kim [Sat, 30 Jul 2016 19:50:13 +0000 (12:50 -0700)]
Add additional shortcut keymaps to TOUCHCURSOR layer

7 years agoAdd additional maps for [, and ], to LOWER
JeeBak Kim [Sat, 30 Jul 2016 19:26:51 +0000 (12:26 -0700)]
Add additional maps for [, and ], to LOWER

7 years agoMake RAISE layer an all numbers/arithmatic layer
JeeBak Kim [Sat, 30 Jul 2016 19:21:04 +0000 (12:21 -0700)]
Make RAISE layer an all numbers/arithmatic layer

7 years agoMove reset to a less accessible location
JeeBak Kim [Sat, 30 Jul 2016 01:02:31 +0000 (18:02 -0700)]
Move reset to a less accessible location

7 years agoAdd -, +, and . to RAISE
JeeBak Kim [Fri, 29 Jul 2016 18:21:43 +0000 (11:21 -0700)]
Add -, +, and . to RAISE

7 years agoChange calls from persistant_default_layer_set() to default_layer_set()
JeeBak Kim [Fri, 29 Jul 2016 17:43:59 +0000 (10:43 -0700)]
Change calls from persistant_default_layer_set() to default_layer_set()

7 years agoPrintScreen and RGUI replace BACKLIT and Ctrl. Move BACKLIT to LOWER/RAISE layers
JeeBak Kim [Thu, 28 Jul 2016 22:13:22 +0000 (15:13 -0700)]
PrintScreen and RGUI replace BACKLIT and Ctrl. Move BACKLIT to LOWER/RAISE layers

7 years agoMedia keys for all the "regular" layers
JeeBak Kim [Thu, 28 Jul 2016 19:29:06 +0000 (12:29 -0700)]
Media keys for all the "regular" layers

7 years agoAdd mouse layer, and remove default arrow keys (touchcursor only, now)
JeeBak Kim [Thu, 28 Jul 2016 05:48:27 +0000 (22:48 -0700)]
Add mouse layer, and remove default arrow keys (touchcursor only, now)

7 years agoAdd numbers to _RAISE
JeeBak Kim [Wed, 27 Jul 2016 06:49:11 +0000 (23:49 -0700)]
Add numbers to _RAISE

7 years agoMove _RAISE symbols to _LOWER
JeeBak Kim [Wed, 27 Jul 2016 03:14:09 +0000 (20:14 -0700)]
Move _RAISE symbols to _LOWER

7 years agoTap for Enter, hold for Shift
JeeBak Kim [Tue, 26 Jul 2016 20:34:01 +0000 (13:34 -0700)]
Tap for Enter, hold for Shift

7 years agoAdd personalized TouchCursor layer
JeeBak Kim [Tue, 26 Jul 2016 03:25:03 +0000 (20:25 -0700)]
Add personalized TouchCursor layer

7 years agoTap for Esc, hold for Control
JeeBak Kim [Sun, 24 Jul 2016 02:59:22 +0000 (19:59 -0700)]
Tap for Esc, hold for Control

7 years agoAdd IN_LIKE_FLINT song
JeeBak Kim [Sat, 30 Jul 2016 08:52:33 +0000 (01:52 -0700)]
Add IN_LIKE_FLINT song

7 years agoAdd "jeebak" keymap folder as a copy of the "default" folder
JeeBak Kim [Sun, 24 Jul 2016 02:06:19 +0000 (19:06 -0700)]
Add "jeebak" keymap folder as a copy of the "default" folder

7 years agoMerge pull request #589 from algernon/h/ergodox_ez-vs-ergodox
Jack Humbert [Sat, 30 Jul 2016 06:53:29 +0000 (02:53 -0400)]
Merge pull request #589 from algernon/h/ergodox_ez-vs-ergodox

Update some obsolete references

7 years agoUpdate some obsolete references
Gergely Nagy [Sat, 30 Jul 2016 06:37:30 +0000 (08:37 +0200)]
Update some obsolete references

Some links were still pointing to `/keyboards/ergodox_ez`, while the
directory is `/keyboards/erdogox` now.

Not all references have been updated, and some of the text here and
there may need updating to mention the ErgoDox Infinity too, but that's
out of the scope for this quick fix.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
7 years agoMerge pull request #587 from fredizzimo/documentation_quick_fix
Jack Humbert [Sat, 30 Jul 2016 02:33:29 +0000 (22:33 -0400)]
Merge pull request #587 from fredizzimo/documentation_quick_fix

Fix the quick aliases documentation section

7 years agoMerge pull request #503 from fredizzimo/ergodox_subproject
Jack Humbert [Sat, 30 Jul 2016 02:32:27 +0000 (22:32 -0400)]
Merge pull request #503 from fredizzimo/ergodox_subproject

Add both Ergodox EZ and Infinity Ergodox as sub-projects of Ergodox

7 years agoFix the quick aliases documentation section
Fred Sundvik [Fri, 29 Jul 2016 19:38:06 +0000 (22:38 +0300)]
Fix the quick aliases documentation section

Also move all keyboard customization documentation under the
"Going Beyond the keycodes" heading.

7 years agoSmall fix for infinity include guard
Fred Sundvik [Tue, 12 Jul 2016 14:50:06 +0000 (17:50 +0300)]
Small fix for infinity include guard

7 years agoFix typo in the readme.
Fred Sundvik [Sun, 10 Jul 2016 20:07:00 +0000 (23:07 +0300)]
Fix typo in the readme.

7 years agoA couple of more Ergodox readme fixes
Fred Sundvik [Sun, 10 Jul 2016 19:55:20 +0000 (22:55 +0300)]
A couple of more Ergodox readme fixes

7 years agoUnify the ErgoDox EZ and Infinity documentation
Fred Sundvik [Sun, 10 Jul 2016 19:52:26 +0000 (22:52 +0300)]
Unify the ErgoDox EZ and Infinity documentation

7 years agoRefer to the right path in the readme
Fred Sundvik [Sun, 10 Jul 2016 19:08:01 +0000 (22:08 +0300)]
Refer to the right path in the readme

7 years agoMove Ergodox readme from ez subfolder to parent
Fred Sundvik [Sun, 10 Jul 2016 18:49:48 +0000 (21:49 +0300)]
Move Ergodox readme from ez subfolder to parent

7 years agoInclude the main Makefile before including Ergodox infinity drivers
Fred Sundvik [Sun, 10 Jul 2016 11:46:18 +0000 (14:46 +0300)]
Include the main Makefile before including Ergodox infinity drivers

7 years agoMove Infinity Ergodox drivers to subproject, and fix makefile
Fred Sundvik [Sun, 10 Jul 2016 11:29:00 +0000 (14:29 +0300)]
Move Infinity Ergodox drivers to subproject, and fix makefile

7 years agoRemove the Infinity Ergodox default keymap
Fred Sundvik [Sun, 10 Jul 2016 09:05:34 +0000 (12:05 +0300)]
Remove the Infinity Ergodox default keymap

7 years agoCleanup the townk_osx config.h and make files
Fred Sundvik [Sun, 10 Jul 2016 09:02:56 +0000 (12:02 +0300)]
Cleanup the townk_osx config.h and make files

7 years agoRename supercoder config_user to config.h
Fred Sundvik [Sun, 10 Jul 2016 09:02:17 +0000 (12:02 +0300)]
Rename supercoder config_user to config.h

Also fixup the include path of parent config

7 years agoFix config.h include guards
Fred Sundvik [Sun, 10 Jul 2016 09:01:28 +0000 (12:01 +0300)]
Fix config.h include guards

7 years agoDefine weak matrix user function for Infinity Ergodox
Fred Sundvik [Sat, 9 Jul 2016 18:24:02 +0000 (21:24 +0300)]
Define weak matrix user function for Infinity Ergodox

So that a few keyboards, which don't use them, links properly.

7 years agoSpeed up ChibiOS keymap compilation
Fred Sundvik [Sat, 9 Jul 2016 17:58:19 +0000 (20:58 +0300)]
Speed up ChibiOS keymap compilation

By sharing the external library object files between the whole
keyboard, instead of re-compiling them for each keymap.

7 years agoChange _delay_ms to wait_ms in algernon keymap
Fred Sundvik [Sat, 9 Jul 2016 08:27:06 +0000 (11:27 +0300)]
Change _delay_ms to wait_ms in algernon keymap

7 years agoMove some of the Ergodox config settings to shared
Fred Sundvik [Sat, 9 Jul 2016 08:26:15 +0000 (11:26 +0300)]
Move some of the Ergodox config settings to shared

7 years agoAdd empty led control functions to Infinity Ergodox
Fred Sundvik [Fri, 8 Jul 2016 22:38:58 +0000 (01:38 +0300)]
Add empty led control functions to Infinity Ergodox

So that most keymaps compiles and links

7 years agoMost ergodox keymaps compiles on Infinity
Fred Sundvik [Fri, 8 Jul 2016 21:41:15 +0000 (00:41 +0300)]
Most ergodox keymaps compiles on Infinity

There are linker errors due to missing led funcitonality though

7 years agoAll Ez keymaps compiles
Fred Sundvik [Fri, 8 Jul 2016 06:09:31 +0000 (09:09 +0300)]
All Ez keymaps compiles

7 years agoInitial structure for Ergodox as subprojects
Fred Sundvik [Thu, 7 Jul 2016 19:28:28 +0000 (22:28 +0300)]
Initial structure for Ergodox as subprojects

Only the EZ default keymaps compiles at the moment though.

7 years agoMerge pull request #584 from algernon/ergodox-ez/algernon
Erez Zukerman [Fri, 29 Jul 2016 12:11:37 +0000 (08:11 -0400)]
Merge pull request #584 from algernon/ergodox-ez/algernon

ergodox_ez: Upgrade my keymap to v1.4

7 years agoMerge pull request #583 from coderkun/coderkun_neo2
Erez Zukerman [Fri, 29 Jul 2016 12:10:46 +0000 (08:10 -0400)]
Merge pull request #583 from coderkun/coderkun_neo2

Ergodox EZ: update keymap “coderkun_neo2”

7 years agoMerge pull request #580 from MatsLanGoH/patch-1
Erez Zukerman [Fri, 29 Jul 2016 12:09:05 +0000 (08:09 -0400)]
Merge pull request #580 from MatsLanGoH/patch-1

Fixed a typo

7 years agoergodox_ez: Upgrade my keymap to v1.4
Gergely Nagy [Fri, 29 Jul 2016 10:24:33 +0000 (12:24 +0200)]
ergodox_ez: Upgrade my keymap to v1.4

* When toggling the key logging on or off, the LEDs will do a little dance.
* The keylogger is now optional, but enabled by default. Use `KEYLOGGER_ENABLE=no` on the `make` command line to disable it.
* The `TAB`/`ARRW` key was turned into a tap-dance key, allowing one to toggle the **ARROW** layer on by double-tapping, and as such, avoid the need to hold the key.
* The `-`/`_` key was turned into a tap-dance key too.
* There is now a way to travel time with the keyboard, toggle the feature on by hitting `LEAD t`.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
7 years agodisable sleep LED
coderkun [Fri, 29 Jul 2016 09:28:37 +0000 (11:28 +0200)]
disable sleep LED

7 years agocomplete labels for modifiers in keymap schema
coderkun [Sun, 22 May 2016 11:00:52 +0000 (13:00 +0200)]
complete labels for modifiers in keymap schema

7 years agouse Ergodox EZ’s third LED for “scroll lock”
coderkun [Sun, 22 May 2016 10:58:54 +0000 (12:58 +0200)]
use Ergodox EZ’s third LED for “scroll lock”

7 years agofix grave (GRV) and acute (ACUT) accents
coderkun [Sun, 22 May 2016 10:56:39 +0000 (12:56 +0200)]
fix grave (GRV) and acute (ACUT) accents

7 years agoFixed a typo
Matthias [Fri, 29 Jul 2016 01:02:59 +0000 (10:02 +0900)]
Fixed a typo

Fixed a typo in line 738 'void martix_init' to 'void matrix_init'

7 years agoMerge pull request #578 from 0xdec/master
Jack Humbert [Thu, 28 Jul 2016 20:34:34 +0000 (16:34 -0400)]
Merge pull request #578 from 0xdec/master

0xdec Preonic keymap

7 years agoMerge pull request #577 from hot-leaf-juice/master
Jack Humbert [Thu, 28 Jul 2016 20:34:16 +0000 (16:34 -0400)]
Merge pull request #577 from hot-leaf-juice/master

Pull request to include my keymap if you want it!

7 years agoMerge pull request #573 from algernon/f/make-all-stop-on-error
Jack Humbert [Thu, 28 Jul 2016 20:32:37 +0000 (16:32 -0400)]
Merge pull request #573 from algernon/f/make-all-stop-on-error

tmk_core/rules.mk: Make PRINT_ERROR* stop on error

7 years agoCreate 0xdec Preonic keymap
Jordi Orlando [Thu, 28 Jul 2016 19:36:20 +0000 (14:36 -0500)]
Create 0xdec Preonic keymap

An ergonomically optimized Colemak keymap for the grid-layout Preonic

7 years agoMerge pull request #572 from algernon/f/tap-dance-debug
Jack Humbert [Thu, 28 Jul 2016 16:28:30 +0000 (12:28 -0400)]
Merge pull request #572 from algernon/f/tap-dance-debug

tap-dance: Add some debugging support

7 years agoMerge pull request #570 from sethbc/fix_bone2planck_build
Jack Humbert [Thu, 28 Jul 2016 16:27:46 +0000 (12:27 -0400)]
Merge pull request #570 from sethbc/fix_bone2planck_build

Fix bone2planck build

7 years agoMerge pull request #569 from sethbc/fix_stanleylai_warnings
Jack Humbert [Thu, 28 Jul 2016 16:27:11 +0000 (12:27 -0400)]
Merge pull request #569 from sethbc/fix_stanleylai_warnings

kill warnings filling up travis buildlog

7 years agoMerge pull request #568 from sethbc/fix-colemak-osx-pc-no
Jack Humbert [Thu, 28 Jul 2016 16:26:43 +0000 (12:26 -0400)]
Merge pull request #568 from sethbc/fix-colemak-osx-pc-no

update NO_AMP to NO_AMPR

7 years agoMerge pull request #566 from SmackleFunky/master
Jack Humbert [Thu, 28 Jul 2016 16:26:11 +0000 (12:26 -0400)]
Merge pull request #566 from SmackleFunky/master

Allow toggling out of plover layer

7 years agoMerge pull request #559 from Talljoe/fix-compiler-warning
Jack Humbert [Thu, 28 Jul 2016 16:24:42 +0000 (12:24 -0400)]
Merge pull request #559 from Talljoe/fix-compiler-warning

Fix compiler warning when PREVENT_STUCK_MODIFIERS is enabled.

7 years agoMerge pull request #564 from mazinbokhari/master
Jack Humbert [Thu, 28 Jul 2016 16:24:03 +0000 (12:24 -0400)]
Merge pull request #564 from mazinbokhari/master

Move to keyboards

7 years agoAdded readme.md for custom layout.
Callum Oakley [Thu, 28 Jul 2016 11:15:55 +0000 (12:15 +0100)]
Added readme.md for custom layout.

7 years agoAdded custom keymap.
Callum Oakley [Wed, 27 Jul 2016 20:18:19 +0000 (21:18 +0100)]
Added custom keymap.

Added custom keymap.

7 years agotap-dance: Add some debugging support
Gergely Nagy [Wed, 27 Jul 2016 06:42:09 +0000 (08:42 +0200)]
tap-dance: Add some debugging support

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
7 years agotmk_core/rules.mk: Make PRINT_ERROR* stop on error
Gergely Nagy [Wed, 27 Jul 2016 06:53:05 +0000 (08:53 +0200)]
tmk_core/rules.mk: Make PRINT_ERROR* stop on error

Instead of `&& false`, explicitly `exit 1` to make the rules using these macros
fail. This fixes #571, and likely breaks Travis badly.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
7 years agoremove unnecessary includes
Seth Chandler [Wed, 27 Jul 2016 06:32:15 +0000 (02:32 -0400)]
remove unnecessary includes

7 years agofix numerous errors in bone2planck keymap
Seth Chandler [Wed, 27 Jul 2016 06:30:17 +0000 (02:30 -0400)]
fix numerous errors in bone2planck keymap

7 years agokill warnings filling up travis buildlog
Seth Chandler [Wed, 27 Jul 2016 06:21:09 +0000 (02:21 -0400)]
kill warnings filling up travis buildlog

7 years agoupdate NO_AMP to NO_AMPR
Seth Chandler [Wed, 27 Jul 2016 06:06:19 +0000 (02:06 -0400)]
update NO_AMP to NO_AMPR

7 years agoAllow toggling out of plover layer
SmackleFunky [Wed, 27 Jul 2016 04:44:24 +0000 (04:44 +0000)]
Allow toggling out of plover layer

7 years agoMove to keyboards
Mazin Bokhari [Wed, 27 Jul 2016 03:43:04 +0000 (22:43 -0500)]
Move to keyboards

7 years agoMerge pull request #562 from michaelklos/doc
Erez Zukerman [Wed, 27 Jul 2016 01:54:10 +0000 (21:54 -0400)]
Merge pull request #562 from michaelklos/doc

Added Tap Dance Example

7 years agoMerge pull request #533 from mazinbokhari/master
Erez Zukerman [Wed, 27 Jul 2016 01:52:39 +0000 (21:52 -0400)]
Merge pull request #533 from mazinbokhari/master

Add my layout optimized for working in emacs, vim, command line, etc.

7 years agoAdded Tap Dance Example
Michael Klos [Tue, 26 Jul 2016 22:41:35 +0000 (18:41 -0400)]
Added Tap Dance Example

Added (simple) Tap Dance example implementation steps.

7 years agodisable midi by default
Jack Humbert [Tue, 26 Jul 2016 19:59:26 +0000 (15:59 -0400)]
disable midi by default

7 years agoDelete default.png
erlo muvman [Tue, 26 Jul 2016 01:16:11 +0000 (20:16 -0500)]
Delete default.png

7 years agoDelete default_highres.png
erlo muvman [Tue, 26 Jul 2016 01:16:07 +0000 (20:16 -0500)]
Delete default_highres.png

7 years agoUpdate readme.md
erlo muvman [Tue, 26 Jul 2016 01:14:19 +0000 (20:14 -0500)]
Update readme.md

7 years agoUpdate readme.md
erlo muvman [Tue, 26 Jul 2016 01:12:48 +0000 (20:12 -0500)]
Update readme.md

7 years agoUpdate readme.md
erlo muvman [Tue, 26 Jul 2016 01:06:58 +0000 (20:06 -0500)]
Update readme.md

7 years agoMerge pull request #558 from lindhe/master
Jack Humbert [Mon, 25 Jul 2016 15:16:54 +0000 (11:16 -0400)]
Merge pull request #558 from lindhe/master

Fix misspelled command in Norwegian helper

7 years agoChange Nordic ampersand code to match the English
Andreas Lindhé [Mon, 25 Jul 2016 10:50:27 +0000 (12:50 +0200)]
Change Nordic ampersand code to match the English

Changed from "NO_AMP" to "NO_AMPR" since the KC one is "KC_AMPR"

7 years agoFix misspelled command in Norwegian helper
Andreas Lindhé [Mon, 25 Jul 2016 09:29:54 +0000 (11:29 +0200)]
Fix misspelled command in Norwegian helper

7 years agoFixes midi functionality
Jack Humbert [Mon, 25 Jul 2016 02:07:43 +0000 (22:07 -0400)]
Fixes midi functionality