Christopher Browne
f4fbfe6e54
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-07-12 11:57:15 -04:00
Christopher Browne
477ed703c8
I did not like Space Cadet paren; it jumps in in way too many extra cases
2016-07-12 11:57:05 -04:00
Jack Humbert
a998a48673
Merge pull request #477 from Smilliam/master
...
Canceling Space Cadet state with opposite shift key
2016-07-11 09:14:43 -04:00
Jack Humbert
076de6fa75
Merge pull request #506 from stanleylai/master
...
Added my custom keymap for Satan
2016-07-11 09:14:11 -04:00
skullydazed
d5102c7715
Merge pull request #507 from ruiqimao/master
...
fixed clueboard LED pin assignments and matrix documentation
2016-07-11 02:01:17 -07:00
Ruiqi Mao
cb0e102adb
fixed clueboard LED pin assignments and matrix documentation
2016-07-11 01:18:35 -07:00
Smilliam
5e58e2281a
amended extraneous file edits
2016-07-10 19:10:00 -07:00
Smilliam
b12fe6abb2
Made rollover behavior for space cadet optional
2016-07-10 19:04:01 -07:00
Stanley Lai
753cbee5c0
Added my custom keymap for Satan
2016-07-10 12:07:56 -07:00
Jack Humbert
4081fc4d8f
Merge pull request #505 from fredizzimo/documentation_fix
...
Remove out of place documentation, caused by ChibiOS merge
2016-07-10 14:02:10 -04:00
Fred Sundvik
c7728780de
Remove out of place documentation, caused by ChibiOS merge
2016-07-10 20:00:04 +03:00
Jack Humbert
b0300d8d8f
Merge pull request #502 from robotmaxtron/master
...
Adding robotmaxtron's GH60 Keymap
2016-07-09 20:55:58 -04:00
Max Whittingham
df958a2dbc
Update keymap.c
2016-07-09 18:58:16 -05:00
Jack Humbert
9dc6dfbf96
Merge pull request #500 from TerryMathews/master
...
Establish Poker clone keymap for Satan
2016-07-09 19:19:05 -04:00
TerryMathews
4decdd2b18
Merge pull request #1 from jackhumbert/master
...
Catch up with jack's master
2016-07-09 16:46:00 -04:00
TerryMathews
979a0d25f0
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).
2016-07-09 16:42:26 -04:00
Max Whittingham
1ab527a4db
Cleaning up repo
2016-07-09 03:20:58 -05:00
Erez Zukerman
c444f4f702
Documents tap dance
2016-07-08 21:40:57 -04:00
Jack Humbert
4139841e9d
Merge pull request #498 from fredizzimo/fix_make_dependencies
...
Fix make dependencies
2016-07-08 16:44:18 -04:00
Fred Sundvik
6911ead027
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
2016-07-08 23:19:48 +03:00
Fred Sundvik
e8e300d5c4
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.
2016-07-08 22:59:09 +03:00
Jack Humbert
8610481c37
Merge pull request #496 from fredizzimo/makefile_optimization
...
Makefile optimization
2016-07-08 12:01:32 -04:00
Fred Sundvik
1e3db59097
Fix the link target
2016-07-08 18:18:33 +03:00
Fred Sundvik
ccebceeb6f
Don't run git describe for ever file that is built
2016-07-08 17:44:41 +03:00
Fred Sundvik
b86b0480d5
Speed up compilation by not using recusive make
...
The cleaning is done outside the targets, by checking the
requested target name.
2016-07-08 17:20:37 +03:00
Jack Humbert
b6e47f7a5f
Merge pull request #494 from robbiegill/master
...
Port support for hhkb-jp from tmk
2016-07-08 08:35:24 -04:00
Jack Humbert
a9979c6f42
Merge pull request #493 from TerryMathews/master
...
Create keycodes for RGB control functions
2016-07-08 08:34:27 -04:00
TerryMathews
564c743aa0
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.
2016-07-08 03:40:05 -04:00
TerryMathews
f7a8682226
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.
2016-07-08 03:32:28 -04:00
Robbie Gill
66ffb1cb3a
port missing support for hhkb-jp from tmk
2016-07-07 21:03:20 -07:00
TerryMathews
e2ec45a755
Fix cluepad and planck
2016-07-07 23:57:11 -04:00
TerryMathews
ccfa7351ad
Fix compile error on Clueboard
2016-07-07 23:50:04 -04:00
TerryMathews
50c686587e
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)
2016-07-07 23:34:33 -04:00
Jack Humbert
e8719e10c4
Merge pull request #491 from fredizzimo/keycode_fixes
...
Some fixes for keycode processing
2016-07-07 13:57:39 -04:00
Fred Sundvik
a2eae81927
Fix IS_CONSUMER macro
2016-07-07 20:04:27 +03:00
Fred Sundvik
0bfb608615
Remove unhandled KC_BTLD, RESET should be used instead
2016-07-07 19:56:55 +03:00
Fred Sundvik
9870082a06
Fix the range for consumer keys
2016-07-07 19:48:39 +03:00
Jack Humbert
c1dfb636ef
fixes quantum template (actually)
2016-07-07 12:22:10 -04:00
Jack Humbert
57e08eb8ba
updates rgblight implementation, makes non-timer stuff compatible with audio
2016-07-07 11:33:34 -04:00
Christopher Browne
97dfbd1afc
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-07-07 11:13:22 -04:00
Jack Humbert
ad43d450ca
Merge pull request #490 from fredizzimo/integrate_visualizer
...
Integrate visualizer for ChibiOS and Infinity Ergodox
2016-07-07 09:59:33 -04:00
Jack Humbert
589df84d6c
corrects quantum template
2016-07-07 09:58:44 -04:00
Fred Sundvik
caedec92d2
Move the visualizer_user file to keymap folder
...
Also rename it to visualizer.c
2016-07-07 14:42:16 +03:00
Fred Sundvik
aaac254ebc
Delete lcd_backlight_hal.c
...
The functionality can now be found in the infinity_erogodox.c file
instead.
2016-07-07 14:29:53 +03:00
Fred Sundvik
bcbd8f1c50
Add suspend support to the ChibiOS visualizer
2016-07-07 14:22:45 +03:00
Fred Sundvik
dae7c9bfb3
Fix the SERIAL_LINK_ENABLE macro in Visualizer
...
Rename from USE_SERIAL_LINK -> SERIAL_LINK_ENABLE
2016-07-07 14:12:56 +03:00
Fred Sundvik
7229751ba9
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
2016-07-07 14:01:20 +03:00
Fred Sundvik
07d0d5cbe4
Makefile fixes and update of Visualizer
2016-07-07 12:46:10 +03:00
Fred Sundvik
9772e697a0
Add Infinity Ergodox display drivers
2016-07-07 12:45:34 +03:00
Josh Colbeck
ac978a50a2
Merge branch 'master' of https://github.com/Skrymir/qmk_firmware
2016-07-06 23:38:58 -05:00