localhots
/
qmk_firmware
1
0
Fork 0
Code Releases Activity
2,469 Commits 1 Branch 0 Tags 108 MiB
Commit Graph

89 Commits

Author SHA1 Message Date
Joshua T 77377e2784 Fixed a merge conflict 2016-07-15 17:44:39 -05:00
Joshua T 42843d9b62 Merge remote-tracking branch 'upstream/master' 2016-07-15 01:01:19 -05:00
Joshua T 92e7291ad7 Corrected merge conflict 2016-07-13 22:41:02 -05:00
Joshua T f90d89458c Created replicaJunction keymaps. 2016-07-13 22:37:34 -05:00
Joshua Colbeck 68ceffe53e Merge pull request #2 from jackhumbert/master 
Pull from upstream
 2016-07-12 23:14:30 -05:00
Joshua T 32725dae5b Created replicaJunction keymaps. 2016-07-11 17:49:12 -05: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
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
Max Whittingham df958a2dbc Update keymap.c 2016-07-09 18:58:16 -05:00
Max Whittingham 1ab527a4db Cleaning up repo 2016-07-09 03:20:58 -05: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
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
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
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
Fred Sundvik 0bfb608615 Remove unhandled KC_BTLD, RESET should be used instead 2016-07-07 19:56:55 +03:00
Jack Humbert 57e08eb8ba updates rgblight implementation, makes non-timer stuff compatible with audio 2016-07-07 11:33:34 -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
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 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
Jack Humbert a4bf46f9b1 default keymap, reset sorted out for now, added serial to makefile 2016-07-06 22:48:19 -04:00
Josh Colbeck 5ed673d82d Changed layer switching to momentary 
corrected macro
 2016-07-06 20:24:57 -05:00
Jack Humbert c88207884b Merge branch 'master' into lets-split-support 2016-07-06 18:05:50 -04:00
Fred Sundvik 70797bb8f2 Makefile changes and files to compile Visualizer 2016-07-07 00:20:20 +03:00
Fred Sundvik a7e3e4e652 Add serial_link compilation to Infinity Ergodox 2016-07-06 16:06:53 +03:00
Jack Humbert eb6e17be6f adds eep, removes usbconfig.h 2016-07-06 09:04:04 -04:00
Jack Humbert 3577e26fd9 fix/annotate wait_us lines 2016-07-06 00:24:31 -04:00
Jack Humbert cb410729e6 remove uno_slave for now, even though it's freakin cool 2016-07-05 23:56:42 -04:00
Jack Humbert dd2522ba8b add options to config.h 2016-07-05 23:52:18 -04:00
Jack Humbert 22ad6459b1 Merge branch 'master' into lets-split-support 2016-07-05 23:40:58 -04:00
Jack Humbert ce01f88c43 images, docks, clean-up [skip ci] 2016-07-05 23:40:54 -04:00
Jack Humbert d707738616 i2c working 2016-07-05 23:27:10 -04:00
Jack Humbert 96f44e1202 one half working 2016-07-05 18:36:02 -04:00
Jack Humbert 7d28d6a7bc Merge pull request #480 from fredizzimo/add_infinity_ergodox 
Add infinity ergodox
 2016-07-05 13:12:01 -04:00
Fred Sundvik b4cd0cfd15 Infinity Ergodox - Add matrix.c and led.c 2016-07-05 16:50:30 +03:00
Fred Sundvik 74847a84f8 First version of Infinity Ergodox 
Mostly just adding the files from the fredizzimo repository. Still
needs some fixing until it works
 2016-07-05 16:45:29 +03:00
Fred Sundvik cf6cd15920 Fix typo in teensy_lc_onkey.h 2016-07-05 15:54:59 +03:00
Fred Sundvik 6e4f2e18e6 Don't include common_config.h for ChibiOS test 2016-07-05 15:53:40 +03:00
Fred Sundvik 0a040a89e8 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
 2016-07-05 15:34:35 +03:00
Fred Sundvik b11657d1c8 Suprojects for ChibiOS testing 2016-07-05 14:56:34 +03:00