]> git.donarmstrong.com Git - qmk_firmware.git/log
qmk_firmware.git
8 years agoAdjusted Atreus KEYMAP() function.
Joshua T [Tue, 19 Jul 2016 22:33:10 +0000 (17:33 -0500)]
Adjusted Atreus KEYMAP() function.

This change adjusts the KEYMAP() function to provide a more visual representation of the key positions on the keyboard. Previously, keymaps have been defined directly using arrays for the Atreus keyboard. While this works, it doesn't utilize the helpful KEYMAP() function at all to allow the user to visually position the key codes for ease of editing. See the Ergodox-EZ KEYMAP() function and layouts for a great example of how this can work.

This change should not break any existing Atreus layouts. At the time of this commit, there are two existing layouts for the Atreus board, and neither use the KEYMAP() function.

8 years agoMerge pull request #489 from Skrymir/master
Jack Humbert [Thu, 14 Jul 2016 14:59:23 +0000 (10:59 -0400)]
Merge pull request #489 from Skrymir/master

New ergodox-ez layout

8 years agoMerge pull request #515 from pvinis/reset-function
Jack Humbert [Thu, 14 Jul 2016 14:53:51 +0000 (10:53 -0400)]
Merge pull request #515 from pvinis/reset-function

extract reset keyboard into a function

8 years agoextract reset keyboard into a function
Pavlos Vinieratos [Wed, 13 Jul 2016 14:38:02 +0000 (16:38 +0200)]
extract reset keyboard into a function

that makes it easy to call reset_keyboard() from a function in a keymap

8 years agoMerge pull request #2 from jackhumbert/master
Joshua Colbeck [Wed, 13 Jul 2016 04:14:30 +0000 (23:14 -0500)]
Merge pull request #2 from jackhumbert/master

Pull from upstream

8 years agoMerge pull request #477 from Smilliam/master
Jack Humbert [Mon, 11 Jul 2016 13:14:43 +0000 (09:14 -0400)]
Merge pull request #477 from Smilliam/master

Canceling Space Cadet state with opposite shift key

8 years agoMerge pull request #506 from stanleylai/master
Jack Humbert [Mon, 11 Jul 2016 13:14:11 +0000 (09:14 -0400)]
Merge pull request #506 from stanleylai/master

Added my custom keymap for Satan

8 years agoMerge pull request #507 from ruiqimao/master
skullydazed [Mon, 11 Jul 2016 09:01:17 +0000 (02:01 -0700)]
Merge pull request #507 from ruiqimao/master

fixed clueboard LED pin assignments and matrix documentation

8 years agofixed clueboard LED pin assignments and matrix documentation
Ruiqi Mao [Mon, 11 Jul 2016 08:18:07 +0000 (01:18 -0700)]
fixed clueboard LED pin assignments and matrix documentation

8 years agoamended extraneous file edits
Smilliam [Mon, 11 Jul 2016 02:10:00 +0000 (19:10 -0700)]
amended extraneous file edits

8 years agoMade rollover behavior for space cadet optional
Smilliam [Mon, 11 Jul 2016 02:04:01 +0000 (19:04 -0700)]
Made rollover behavior for space cadet optional

8 years agoAdded my custom keymap for Satan
Stanley Lai [Sun, 10 Jul 2016 19:07:56 +0000 (12:07 -0700)]
Added my custom keymap for Satan

8 years agoMerge pull request #505 from fredizzimo/documentation_fix
Jack Humbert [Sun, 10 Jul 2016 18:02:10 +0000 (14:02 -0400)]
Merge pull request #505 from fredizzimo/documentation_fix

Remove out of place documentation, caused by ChibiOS merge

8 years agoRemove out of place documentation, caused by ChibiOS merge
Fred Sundvik [Sun, 10 Jul 2016 17:00:04 +0000 (20:00 +0300)]
Remove out of place documentation, caused by ChibiOS merge

8 years agoMerge pull request #502 from robotmaxtron/master
Jack Humbert [Sun, 10 Jul 2016 00:55:58 +0000 (20:55 -0400)]
Merge pull request #502 from robotmaxtron/master

Adding robotmaxtron's GH60 Keymap

8 years agoUpdate keymap.c
Max Whittingham [Sat, 9 Jul 2016 23:58:16 +0000 (18:58 -0500)]
Update keymap.c

8 years agoMerge pull request #500 from TerryMathews/master
Jack Humbert [Sat, 9 Jul 2016 23:19:05 +0000 (19:19 -0400)]
Merge pull request #500 from TerryMathews/master

Establish Poker clone keymap for Satan

8 years agoMerge pull request #1 from jackhumbert/master
TerryMathews [Sat, 9 Jul 2016 20:46:00 +0000 (16:46 -0400)]
Merge pull request #1 from jackhumbert/master

Catch up with jack's master

8 years agoEstablish Poker clone keymap for Satan
TerryMathews [Sat, 9 Jul 2016 20:42:26 +0000 (16:42 -0400)]
Establish Poker clone keymap for Satan

Maps all of the side-print legends on the stock Poker II keycaps that
are feasible (doesn't support repeat rate toggling, Pmode recording).

8 years agoCleaning up repo
Max Whittingham [Sat, 9 Jul 2016 08:20:58 +0000 (03:20 -0500)]
Cleaning up repo

8 years agoDocuments tap dance
Erez Zukerman [Sat, 9 Jul 2016 01:40:57 +0000 (21:40 -0400)]
Documents tap dance

8 years agoMerge pull request #498 from fredizzimo/fix_make_dependencies
Jack Humbert [Fri, 8 Jul 2016 20:44:18 +0000 (16:44 -0400)]
Merge pull request #498 from fredizzimo/fix_make_dependencies

Fix make dependencies

8 years agoUse order only prerequisites to avoid re-linking
Fred Sundvik [Fri, 8 Jul 2016 20:19:48 +0000 (23:19 +0300)]
Use order only prerequisites to avoid re-linking

The prerequisites at the start of the build process are order-only
so that the trget don't link again. Also added as a dependency to
the compilation to force the messages to be printed at the start

8 years agoFix name of makefile dep files
Fred Sundvik [Fri, 8 Jul 2016 19:59:09 +0000 (22:59 +0300)]
Fix name of makefile dep files

The files can't start with a .dot, as the wildcard function wont
find them. So this is fixed by removing the BUILD_DIR from the
name.

8 years agoMerge pull request #496 from fredizzimo/makefile_optimization
Jack Humbert [Fri, 8 Jul 2016 16:01:32 +0000 (12:01 -0400)]
Merge pull request #496 from fredizzimo/makefile_optimization

Makefile optimization

8 years agoFix the link target
Fred Sundvik [Fri, 8 Jul 2016 15:18:33 +0000 (18:18 +0300)]
Fix the link target

8 years agoDon't run git describe for ever file that is built
Fred Sundvik [Fri, 8 Jul 2016 14:44:41 +0000 (17:44 +0300)]
Don't run git describe for ever file that is built

8 years agoSpeed up compilation by not using recusive make
Fred Sundvik [Fri, 8 Jul 2016 14:20:37 +0000 (17:20 +0300)]
Speed up compilation by not using recusive make

The cleaning is done outside the targets, by checking the
requested target name.

8 years agoMerge pull request #494 from robbiegill/master
Jack Humbert [Fri, 8 Jul 2016 12:35:24 +0000 (08:35 -0400)]
Merge pull request #494 from robbiegill/master

Port support for hhkb-jp from tmk

8 years agoMerge pull request #493 from TerryMathews/master
Jack Humbert [Fri, 8 Jul 2016 12:34:27 +0000 (08:34 -0400)]
Merge pull request #493 from TerryMathews/master

Create keycodes for RGB control functions

8 years agoFix a function mismatch that was causing LEDs to not properly initialize
TerryMathews [Fri, 8 Jul 2016 07:40:05 +0000 (03:40 -0400)]
Fix a function mismatch that was causing LEDs to not properly initialize

See #430. Name of function being called at init was updated to
led_init_ports(), but the call itself wasn't renamed.

8 years agoMove return out of event if block
TerryMathews [Fri, 8 Jul 2016 07:32:28 +0000 (03:32 -0400)]
Move return out of event if block

According to Jack, this makes the return case not be processed. Doesn't
break anything in the firmware.

8 years agoport missing support for hhkb-jp from tmk
Robbie Gill [Fri, 8 Jul 2016 04:03:20 +0000 (21:03 -0700)]
port missing support for hhkb-jp from tmk

8 years agoFix cluepad and planck
TerryMathews [Fri, 8 Jul 2016 03:57:11 +0000 (23:57 -0400)]
Fix cluepad and planck

8 years agoFix compile error on Clueboard
TerryMathews [Fri, 8 Jul 2016 03:50:04 +0000 (23:50 -0400)]
Fix compile error on Clueboard

8 years agoCreate keycodes for RGB control functions
TerryMathews [Fri, 8 Jul 2016 03:34:33 +0000 (23:34 -0400)]
Create keycodes for RGB control functions

Moves RGB controls out of the macro function and assigns them their own
keycodes:
RGB_TOG (toggle on/off)
RGB_MOD (mode step)
RGB_HUI (increase hue)
RGB_HUD (decrease hue)
RGB_SAI (increase saturation)
RGB_SAD (decrease saturation)
RGB_VAI (increase brightness)
RGB_VAD (decrease brightness)

8 years agoMerge pull request #491 from fredizzimo/keycode_fixes
Jack Humbert [Thu, 7 Jul 2016 17:57:39 +0000 (13:57 -0400)]
Merge pull request #491 from fredizzimo/keycode_fixes

Some fixes for keycode processing

8 years agoFix IS_CONSUMER macro
Fred Sundvik [Thu, 7 Jul 2016 17:04:27 +0000 (20:04 +0300)]
Fix IS_CONSUMER macro

8 years agoRemove unhandled KC_BTLD, RESET should be used instead
Fred Sundvik [Thu, 7 Jul 2016 16:56:55 +0000 (19:56 +0300)]
Remove unhandled KC_BTLD, RESET should be used instead

8 years agoFix the range for consumer keys
Fred Sundvik [Thu, 7 Jul 2016 16:48:39 +0000 (19:48 +0300)]
Fix the range for consumer keys

8 years agofixes quantum template (actually)
Jack Humbert [Thu, 7 Jul 2016 16:22:10 +0000 (12:22 -0400)]
fixes quantum template (actually)

8 years agoupdates rgblight implementation, makes non-timer stuff compatible with audio
Jack Humbert [Thu, 7 Jul 2016 15:33:32 +0000 (11:33 -0400)]
updates rgblight implementation, makes non-timer stuff compatible with audio

8 years agoMerge pull request #490 from fredizzimo/integrate_visualizer
Jack Humbert [Thu, 7 Jul 2016 13:59:33 +0000 (09:59 -0400)]
Merge pull request #490 from fredizzimo/integrate_visualizer

Integrate visualizer for ChibiOS and Infinity Ergodox

8 years agocorrects quantum template
Jack Humbert [Thu, 7 Jul 2016 13:58:44 +0000 (09:58 -0400)]
corrects quantum template

8 years agoMove the visualizer_user file to keymap folder
Fred Sundvik [Thu, 7 Jul 2016 11:42:16 +0000 (14:42 +0300)]
Move the visualizer_user file to keymap folder

Also rename it to visualizer.c

8 years agoDelete lcd_backlight_hal.c
Fred Sundvik [Thu, 7 Jul 2016 11:29:53 +0000 (14:29 +0300)]
Delete lcd_backlight_hal.c

The functionality can now be found in the infinity_erogodox.c file
instead.

8 years agoAdd suspend support to the ChibiOS visualizer
Fred Sundvik [Thu, 7 Jul 2016 11:22:45 +0000 (14:22 +0300)]
Add suspend support to the ChibiOS visualizer

8 years agoFix the SERIAL_LINK_ENABLE macro in Visualizer
Fred Sundvik [Thu, 7 Jul 2016 11:12:56 +0000 (14:12 +0300)]
Fix the SERIAL_LINK_ENABLE macro in Visualizer

Rename from USE_SERIAL_LINK -> SERIAL_LINK_ENABLE

8 years agoFix visualizer crash at startup
Fred Sundvik [Thu, 7 Jul 2016 11:01:20 +0000 (14:01 +0300)]
Fix visualizer crash at startup

Visualizer and serial link initialized in the wrong order.
The LED_ENABLED define wasn't set properly
uGfx is always initialized

8 years agoMakefile fixes and update of Visualizer
Fred Sundvik [Thu, 7 Jul 2016 09:46:10 +0000 (12:46 +0300)]
Makefile fixes and update of Visualizer

8 years agoAdd Infinity Ergodox display drivers
Fred Sundvik [Thu, 7 Jul 2016 09:45:34 +0000 (12:45 +0300)]
Add Infinity Ergodox display drivers

8 years agoMerge branch 'master' of https://github.com/Skrymir/qmk_firmware
Josh Colbeck [Thu, 7 Jul 2016 04:38:58 +0000 (23:38 -0500)]
Merge branch 'master' of https://github.com/Skrymir/qmk_firmware

8 years agoMerge pull request #484 from jackhumbert/lets-split-support
Jack Humbert [Thu, 7 Jul 2016 03:44:22 +0000 (23:44 -0400)]
Merge pull request #484 from jackhumbert/lets-split-support

Add Let's Split support

8 years agodefault keymap, reset sorted out for now, added serial to makefile
Jack Humbert [Thu, 7 Jul 2016 02:48:19 +0000 (22:48 -0400)]
default keymap, reset sorted out for now, added serial to makefile

8 years agoMerge pull request #1 from Skrymir/patch-1
Joshua Colbeck [Thu, 7 Jul 2016 01:29:29 +0000 (20:29 -0500)]
Merge pull request #1 from Skrymir/patch-1

add ergodox layout

8 years agoChanged layer switching to momentary
Josh Colbeck [Thu, 7 Jul 2016 01:24:57 +0000 (20:24 -0500)]
Changed layer switching to momentary

corrected macro

8 years agoMerge branch 'master' into lets-split-support
Jack Humbert [Wed, 6 Jul 2016 22:05:50 +0000 (18:05 -0400)]
Merge branch 'master' into lets-split-support

8 years agoMakefile changes and files to compile Visualizer
Fred Sundvik [Wed, 6 Jul 2016 21:20:20 +0000 (00:20 +0300)]
Makefile changes and files to compile Visualizer

8 years agoAdd ugfx submodule
Fred Sundvik [Wed, 6 Jul 2016 21:17:32 +0000 (00:17 +0300)]
Add ugfx submodule

8 years agoMerge pull request #488 from fredizzimo/add_visualizer
Jack Humbert [Wed, 6 Jul 2016 19:02:51 +0000 (15:02 -0400)]
Merge pull request #488 from fredizzimo/add_visualizer

Add visualizer library

8 years agoMerge commit '73d890a2c9c34b905cd5e74e7146fdd4578dcb96' into add_visualizer
Fred Sundvik [Wed, 6 Jul 2016 17:30:58 +0000 (20:30 +0300)]
Merge commit '73d890a2c9c34b905cd5e74e7146fdd4578dcb96' into add_visualizer

8 years agoDelete .gitmodules from visualizer
Fred Sundvik [Wed, 6 Jul 2016 17:17:16 +0000 (20:17 +0300)]
Delete .gitmodules from visualizer

8 years agoAdd 'quantum/visualizer/' from commit 'bde869aa7ec8601459bc63b9636081d21108d1be'
Fred Sundvik [Wed, 6 Jul 2016 17:15:45 +0000 (20:15 +0300)]
Add 'quantum/visualizer/' from commit 'bde869aa7ec8601459bc63b9636081d21108d1be'

git-subtree-dir: quantum/visualizer
git-subtree-mainline: 19f480992c015aec0a15dca43e740bad8b7834e6
git-subtree-split: bde869aa7ec8601459bc63b9636081d21108d1be

8 years agoMerge pull request #487 from fredizzimo/serial_link_ergodox
Jack Humbert [Wed, 6 Jul 2016 13:48:58 +0000 (09:48 -0400)]
Merge pull request #487 from fredizzimo/serial_link_ergodox

Integrate serial link support for ChibiOS and Infinity Ergodox

8 years agoAdd setting of the master side to the makefile
Fred Sundvik [Wed, 6 Jul 2016 12:36:45 +0000 (15:36 +0300)]
Add setting of the master side to the makefile

8 years agoEnable serial_link support for ChibiOS
Fred Sundvik [Wed, 6 Jul 2016 12:22:34 +0000 (15:22 +0300)]
Enable serial_link support for ChibiOS

8 years agoAdd serial_link compilation to Infinity Ergodox
Fred Sundvik [Wed, 6 Jul 2016 11:29:46 +0000 (14:29 +0300)]
Add serial_link compilation to Infinity Ergodox

8 years agoadds eep, removes usbconfig.h
Jack Humbert [Wed, 6 Jul 2016 13:04:04 +0000 (09:04 -0400)]
adds eep, removes usbconfig.h

8 years agoMerge pull request #482 from fredizzimo/serial_link
Jack Humbert [Wed, 6 Jul 2016 12:56:57 +0000 (08:56 -0400)]
Merge pull request #482 from fredizzimo/serial_link

Add serial link library

8 years agoRemove extra serial_link subdirectory
Fred Sundvik [Wed, 6 Jul 2016 10:26:20 +0000 (13:26 +0300)]
Remove extra serial_link subdirectory

8 years agoRemove CGreen make files
Fred Sundvik [Wed, 6 Jul 2016 10:10:30 +0000 (13:10 +0300)]
Remove CGreen make files

8 years agoRemove serial_link .gitignore and .gitmodules
Fred Sundvik [Wed, 6 Jul 2016 10:09:51 +0000 (13:09 +0300)]
Remove serial_link .gitignore and .gitmodules

8 years agofix/annotate wait_us lines
Jack Humbert [Wed, 6 Jul 2016 04:24:31 +0000 (00:24 -0400)]
fix/annotate wait_us lines

8 years agoremove uno_slave for now, even though it's freakin cool
Jack Humbert [Wed, 6 Jul 2016 03:56:42 +0000 (23:56 -0400)]
remove uno_slave for now, even though it's freakin cool

8 years agoadd options to config.h
Jack Humbert [Wed, 6 Jul 2016 03:52:18 +0000 (23:52 -0400)]
add options to config.h

8 years agoMerge branch 'master' into lets-split-support
Jack Humbert [Wed, 6 Jul 2016 03:40:58 +0000 (23:40 -0400)]
Merge branch 'master' into lets-split-support

8 years agoimages, docks, clean-up [skip ci]
Jack Humbert [Wed, 6 Jul 2016 03:40:54 +0000 (23:40 -0400)]
images, docks, clean-up [skip ci]

8 years agoi2c working
Jack Humbert [Wed, 6 Jul 2016 03:27:10 +0000 (23:27 -0400)]
i2c working

8 years agoone half working
Jack Humbert [Tue, 5 Jul 2016 22:36:02 +0000 (18:36 -0400)]
one half working

8 years agoAdd 'quantum/serial_link/' from commit 'a20d513e3cdacbf6e0e70a80402497ad10166434'
Fred Sundvik [Tue, 5 Jul 2016 20:27:47 +0000 (23:27 +0300)]
Add 'quantum/serial_link/' from commit 'a20d513e3cdacbf6e0e70a80402497ad10166434'

git-subtree-dir: quantum/serial_link
git-subtree-mainline: 7d28d6a7bc81578bb5a83f1d55810ee3d1458e96
git-subtree-split: a20d513e3cdacbf6e0e70a80402497ad10166434

8 years agoMerge pull request #480 from fredizzimo/add_infinity_ergodox
Jack Humbert [Tue, 5 Jul 2016 17:12:01 +0000 (13:12 -0400)]
Merge pull request #480 from fredizzimo/add_infinity_ergodox

Add infinity ergodox

8 years agoAdd dfu-util command for programming
Fred Sundvik [Tue, 5 Jul 2016 16:28:17 +0000 (19:28 +0300)]
Add dfu-util command for programming

Also add .bin generation, which is needed for dfu-util.

8 years agoMerge pull request #471 from Chipairon/patch-1
Jack Humbert [Tue, 5 Jul 2016 15:05:14 +0000 (11:05 -0400)]
Merge pull request #471 from Chipairon/patch-1

Fix for '~' in spanish layout

8 years agoMerge pull request #478 from fredizzimo/chibios_subprojects
Jack Humbert [Tue, 5 Jul 2016 15:04:54 +0000 (11:04 -0400)]
Merge pull request #478 from fredizzimo/chibios_subprojects

Suprojects for ChibiOS testing

8 years agoInfinity Ergodox - Add matrix.c and led.c
Fred Sundvik [Tue, 5 Jul 2016 13:50:30 +0000 (16:50 +0300)]
Infinity Ergodox - Add matrix.c and led.c

8 years agoFirst version of Infinity Ergodox
Fred Sundvik [Tue, 5 Jul 2016 13:45:29 +0000 (16:45 +0300)]
First version of Infinity Ergodox

Mostly just adding the files from the fredizzimo repository. Still
needs some fixing until it works

8 years agoFix typo in teensy_lc_onkey.h
Fred Sundvik [Tue, 5 Jul 2016 12:54:59 +0000 (15:54 +0300)]
Fix typo in teensy_lc_onkey.h

8 years agoDon't include common_config.h for ChibiOS test
Fred Sundvik [Tue, 5 Jul 2016 12:53:40 +0000 (15:53 +0300)]
Don't include common_config.h for ChibiOS test

8 years agoMove ChibiOS test board and ld
Fred Sundvik [Tue, 5 Jul 2016 12:34:35 +0000 (15:34 +0300)]
Move ChibiOS test board and ld

Move the ChibiOS test subproject board and ld files to the kebyoard
folder, so that the build system can find them

8 years agoSuprojects for ChibiOS testing
Fred Sundvik [Tue, 5 Jul 2016 10:48:12 +0000 (13:48 +0300)]
Suprojects for ChibiOS testing

8 years agoMerge remote-tracking branch 'jackhumbert/master' into patch-1
Josh Colbeck [Tue, 5 Jul 2016 03:44:26 +0000 (22:44 -0500)]
Merge remote-tracking branch 'jackhumbert/master' into patch-1

8 years agofixed indentation.
Smilliam [Tue, 5 Jul 2016 02:58:26 +0000 (19:58 -0700)]
fixed indentation.

8 years agoAllow Space Cadet state to be canceled by alternate Shift key
Smilliam [Tue, 5 Jul 2016 02:56:08 +0000 (19:56 -0700)]
Allow Space Cadet state to be canceled by alternate Shift key

Allows you to press RSHIFT to cancel the insertion of a "(" when holding down LSHIFT. Alternatively, allows you to press LSHIFT to cancel the insertion of a ")" when holding down RSHIFT. This change enables you to renege from outputting a character should you press a shift key erroneously.

8 years agocorrect break/return order for planck and preonic defaults
Jack Humbert [Tue, 5 Jul 2016 02:06:22 +0000 (22:06 -0400)]
correct break/return order for planck and preonic defaults

8 years agoMerge remote-tracking branch 'jackhumbert/master' into patch-1
Josh Colbeck [Mon, 4 Jul 2016 20:41:58 +0000 (15:41 -0500)]
Merge remote-tracking branch 'jackhumbert/master' into patch-1

8 years agoAdded macro and readme
Josh Colbeck [Mon, 4 Jul 2016 20:22:13 +0000 (15:22 -0500)]
Added macro and readme

macros to for often used eclipse shortcuts

8 years agoAdded new keymap
Josh Colbeck [Mon, 4 Jul 2016 17:00:06 +0000 (12:00 -0500)]
Added new keymap

8 years agoFixes typos in keycode.txt
Jack Humbert [Mon, 4 Jul 2016 16:19:01 +0000 (12:19 -0400)]
Fixes typos in keycode.txt

8 years agoAdds wait to i2c (debounce)
Jack Humbert [Mon, 4 Jul 2016 16:13:41 +0000 (12:13 -0400)]
Adds wait to i2c (debounce)

8 years agoImproves debounce
Jack Humbert [Mon, 4 Jul 2016 16:01:10 +0000 (12:01 -0400)]
Improves debounce