Cian-H/qmk_firmware
1
0
Fork 0
mirror of https://github.com/Cian-H/qmk_firmware.git synced 2026-08-17 03:12:50 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,783 Commits 1 Branch 0 Tags
02ef122cbbf7b9f94de5f1248fd7f8ec0351f4b4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Humbert ffffd1b6c1 Merge pull request #1207 from bigtunaIO/master 
Add Bigtuna.io Miuni32
 2017-04-04 13:41:50 -04:00
Jack Humbert d75a44a02b Merge pull request #1206 from Dan-Saunders/patch-2 
Create twolayer.c
 2017-04-03 21:13:29 -04:00
Jack Humbert 53951ee086 Merge pull request #1203 from ishtob/master 
Updated ssd1306.c fix issues for people not using OLED
 2017-04-03 21:12:53 -04:00
Jack Humbert 27aa185222 Merge branch 'master' into master 2017-04-03 21:06:40 -04:00
Jack Humbert 3ac9259742 Merge pull request #1204 from nooges/lets-split-fixes 
Let's split fixes
 2017-04-03 16:17:55 -04:00
Jack Humbert de52bd5d89 quick fix for space cadet shift 2017-04-03 12:42:58 -04:00
Jack Humbert da53f3a529 Merge pull request #1194 from tong92/master 
Adds tong92's keymap to tv44
 2017-04-02 22:30:11 -04:00
Jack Humbert 8b3fa01667 Merge pull request #1195 from fudanchii/kbod 
Handwired 60% keyboard with 8x8 matrix
 2017-04-02 22:29:54 -04:00
Jack Humbert ef4a7a0aa0 Merge pull request #1196 from Dbroqua/master 
GH60 - MX HHKB with 7U spacebar
 2017-04-02 22:29:24 -04:00
Jack Humbert 1d8e3da233 Merge pull request #1197 from Xyverz/master 
Revisions to Xyverz's keymaps
 2017-04-02 22:29:07 -04:00
Jack Humbert e2e8b7b799 Merge pull request #1198 from iamschaefer/patch-1 
Update readme.md
 2017-04-02 22:28:34 -04:00
Jack Humbert 3448d5d487 Merge pull request #1132 from akatrevorjay/pr/dfu-serial 
Allow to specify serial to dfu-util flash
 2017-03-31 18:28:26 -04:00
Jack Humbert ec35fea264 Merge pull request #1190 from osamuaoki/master 
Fix typo
 2017-03-31 18:28:14 -04:00
Jack Humbert 2b4efaba53 Merge pull request #1189 from Zay950/to_push 
Unicode input_mode presistance
 2017-03-31 18:27:44 -04:00
Jack Humbert b441468795 Merge pull request #1188 from hot-leaf-juice/master 
changed hotkey cluster to accomodate awkward software... again
 2017-03-30 10:24:37 -04:00
Jack Humbert 8994fca4ee Merge pull request #1187 from hot-leaf-juice/master 
changed hotkey cluster to acommodate awkward software
 2017-03-30 08:46:55 -04:00
Jack Humbert d359b55520 Merge pull request #1185 from exiva/rn42_bluetooth 
Add RN42 Bluetooth module support
 2017-03-30 08:46:38 -04:00
Jack Humbert 338edcabd7 Merge pull request #1184 from osamuaoki/master 
Update keymap.md to QMK
 2017-03-30 08:45:56 -04:00
Jack Humbert 942f2ccee4 Merge pull request #1183 from Rovanion/real-master 
Added instructions for how to build and flash the firmware with teensy_cli
 2017-03-29 09:45:22 -04:00
Jack Humbert b83ae5ae5c Merge pull request #1182 from henxing/default_atreus_layout 
Default atreus layout
 2017-03-28 14:12:41 -04:00
Jack Humbert 49f547dd8e Merge pull request #1139 from Swoy/master 
Satan Board "Admiral Strokers" keymap and config
 2017-03-28 14:12:21 -04:00
Jack Humbert 5e4daf1c6d Merge pull request #1174 from nooges/atreus50 
Add Atreus50 keyboard
 2017-03-28 09:34:26 -04:00
Jack Humbert 7e37daa2ce Merge pull request #1112 from newsboytko/newsboytko/midi-keycodes 
Flesh out MIDI support
 2017-03-28 09:26:54 -04:00
Jack Humbert 216f669276 Merge pull request #1098 from lambdalisue/tapping-force-hold 
Add TAPPING_FORCE_HOLD to regulate behaviour
 2017-03-28 09:24:22 -04:00
Jack Humbert cc2fb56ed8 Merge pull request #1167 from smt/smt/satan 
Add smt keymap for Satan 'GH60'
 2017-03-28 09:18:55 -04:00
Jack Humbert fa09189195 Merge pull request #1162 from Khord/master 
My customized keymap + some tunes for the song list
 2017-03-28 09:17:16 -04:00
Jack Humbert 6e688ad5c2 Merge pull request #1172 from nooges/hexwire-fixes 
Let's Split hexwire keymap fixes
 2017-03-28 09:16:47 -04:00
Jack Humbert 99b7b50130 Merge pull request #1157 from jtbarrett/tada68_default 
Update readme and default layout for TADA68
 2017-03-28 09:15:57 -04:00
Jack Humbert c948404739 Merge pull request #1180 from mattdibi/master 
Italian layout for ergodox keyboard
 2017-03-28 09:14:03 -04:00
Jack Humbert 8a0cf32cf5 Merge pull request #1171 from ishtob/master 
SSD1306 I2C OLED display support for let's split
 2017-03-28 09:13:41 -04:00
Jack Humbert 0f986a1951 Merge pull request #1168 from newsboytko/newsboytko/frosty-flake 
Support Frosty Flake Controller (CM Storm QFR)
 2017-03-28 09:10:55 -04:00
Jack Humbert a7811781c5 Merge pull request #1178 from cheesemacfly/master 
XD60 different layout
 2017-03-28 09:10:02 -04:00
Jack Humbert 417202109b Merge pull request #1163 from jprMesh/atreus62_KC_KEYMAP 
Added KC_KEYMAP macro for old style keymaps in Atreus62
 2017-03-28 09:09:35 -04:00
Jack Humbert ee6fbaaad8 Merge pull request #1177 from exiva/bluetooth_refactor 
Refactor Bluetooth Handling
 2017-03-28 09:08:10 -04:00
Jack Humbert c36a4496eb Update config.h 2017-03-15 23:51:56 -04:00
Jack Humbert c043d1cc47 Update config.h 2017-03-15 23:49:38 -04:00
Jack Humbert 335b398a5d Merge pull request #1152 from UnintendedFeature/bugfix/issue1151 
readme keymap.h to quantum_keycodes.h
 2017-03-15 11:18:32 -04:00
Jack Humbert b794719952 Merge pull request #1090 from qmk/backlight_softpwm 
Adds soft PWM backlight for non-timed ports
 2017-03-15 11:17:07 -04:00
Jack Humbert ce6dcc2b5d Merge pull request #1146 from khogeland/master 
Colemak layout for Clueboard
 2017-03-15 11:13:16 -04:00
Jack Humbert 71d6d7b22c Merge pull request #1147 from nooges/numpad20 
Add handwired 20-key Numpad
 2017-03-15 11:12:52 -04:00
Jack Humbert 8c184847f7 Merge pull request #1150 from nooges/ortho5x13 
Add handwired 5x13 ortholinear keyboard
 2017-03-15 11:12:30 -04:00
Jack Humbert 8685d73893 Merge pull request #1148 from nooges/hexwire-lets-split 
Add Hexwire layout for Let's Split
 2017-03-15 11:12:01 -04:00
Jack Humbert 09ee922a63 Merge pull request #1155 from deadcyclo/master 
Worked on deadcyclo layout
 2017-03-15 11:11:35 -04:00
Jack Humbert b4a3e5ebea Merge pull request #1145 from smt/smt/lets_split 
Add smt keymap for Let's Split (based on serial)
 2017-03-15 11:00:06 -04:00
Jack Humbert 3554b93cbd Merge pull request #1144 from milestogo/sculpt2 
Microsoft sculpt mobile handwire and new shortcuts macro library
 2017-03-15 10:59:34 -04:00
Jack Humbert 2e34d4bd85 update for infinity 2017-03-15 10:57:24 -04:00
Jack Humbert ec9210959f Update readme.md 2017-03-13 12:12:09 -04:00
Jack Humbert bfa7e6ce04 Merge pull request #1137 from Skrymir/patch-1 
Fixed minor error in ergodox infinity section.
 2017-03-08 18:37:30 -05:00
Jack Humbert 8d81667fbe Merge pull request #1138 from nooges/magicforce68 
Add Handwired Magicforce68
 2017-03-08 18:37:09 -05:00
Jack Humbert 97c4c570e2 Merge pull request #1140 from stites/freebsd 
Add FreeBSD support in "util/install_dependencies.sh"
 2017-03-08 18:36:34 -05:00
Jack Humbert 85121ec50e Merge pull request #1142 from guni77/my_keymap 
My keymap
 2017-03-08 18:35:37 -05:00
Jack Humbert f392f245f9 Merge pull request #1143 from UnintendedFeature/feature/keymap-german-lukas 
keymap german lukas
 2017-03-08 18:30:23 -05:00
Jack Humbert b042428d23 Merge pull request #1126 from folkert4/master 
Various QOL changes to Espynn's keymap
 2017-03-03 10:29:54 -05:00
Jack Humbert 4ab88f3a9e Merge pull request #1129 from unxmaal/unxmaal_spacefn 
Layout: Spacebar long-press as fn, for GH60 and GH60 Satan boards
 2017-03-03 10:29:19 -05:00
Jack Humbert 2a5d972004 Merge pull request #1130 from hot-leaf-juice/master 
moar hotkeys
 2017-03-03 10:28:55 -05:00
Jack Humbert 4c4cf3ca49 Merge pull request #1124 from jmdaly/roadkit_firmware 
Add initial version of TheVan Keyboards Roadkit Firmware
 2017-02-28 15:48:34 -05:00
Jack Humbert 72c5dd1c93 Merge pull request #1125 from cwhits/upstream 
[Planck] Update default keymap for missing keys
 2017-02-28 11:51:33 -05:00
Jack Humbert 4583955914 Merge pull request #1116 from hot-leaf-juice/master 
keymap update
 2017-02-27 22:18:55 -05:00
Jack Humbert 5bfeb229b8 Merge pull request #1119 from phongnh/master 
Removes redundant {} which cause build failure when DEBUG_ACTION is set
 2017-02-27 22:18:12 -05:00
Jack Humbert b851b0b2ae Merge pull request #1121 from Leszek111/master 
add layout
 2017-02-27 22:17:36 -05:00
Jack Humbert c62f3bd74d Merge pull request #1118 from priyadi/promethium 
Various keymap updates
 2017-02-23 10:21:23 -05:00
Jack Humbert 352c0e7baa Merge pull request #1117 from priyadi/fix_unicode_map 
Fix UNICODE_MAP input_mode problem
 2017-02-23 10:20:47 -05:00
Jack Humbert 84b2f86f24 Merge pull request #1113 from kesslern/master 
Add dvorak_emacs_software layout for ergodox
 2017-02-21 23:35:09 -05:00
Jack Humbert da41cd1adf Merge pull request #1115 from Skrymir/master 
Update from upstream
 2017-02-21 23:34:23 -05:00
Jack Humbert 7ff41df32c Merge pull request #1097 from stanleylai/master 
Added support for LED backlight, XD60v2's RGB underglow LED
 2017-02-20 11:10:20 -05:00
Jack Humbert db1e9a469a helps to save before committing 2017-02-19 00:11:55 -05:00
Jack Humbert c2239e6b96 merging 2017-02-19 00:04:14 -05:00
Jack Humbert 49e72632d2 remove more warnings 2017-02-16 13:13:38 -05:00
Jack Humbert 1ac5dc9e52 fix travis and reduce warnings 2017-02-16 11:37:46 -05:00
Jack Humbert 15dc540cac ignore PRs in versioning 2017-02-16 10:06:02 -05:00
Jack Humbert e34c3936b7 Merge pull request #1105 from nrrkeene/master 
The Ordinary Layout v5
 2017-02-16 09:49:24 -05:00
Jack Humbert 0b76f4f508 Merge pull request #1103 from priyadi/promethium 
My keymap updates
 2017-02-16 09:48:58 -05:00
Jack Humbert 77b6ac831e Merge pull request #1104 from qmk/layer_tap_toggle 
Adds layer tap toggle as TT(layer)
 2017-02-15 23:46:31 -05:00
Jack Humbert 58823b4e03 fix weirdness with arm and mods 2017-02-15 23:20:35 -05:00
Jack Humbert f89499e255 unique variable name 2017-02-15 18:14:07 -05:00
Jack Humbert c2a9acffd7 publicise variables 2017-02-15 17:39:51 -05:00
Jack Humbert 1bb574fe48 add unicode common file, get names right 2017-02-15 17:09:47 -05:00
Jack Humbert 09add35e7f add unicode common file, get names right 2017-02-15 17:09:35 -05:00
Jack Humbert cbabb4d417 split up unicode systems into different files 2017-02-15 16:36:31 -05:00
Jack Humbert 6788cbd762 give error if both unicode/map are enabled 2017-02-15 12:39:58 -05:00
Jack Humbert 69ea10f9a9 adds layer tap toggle 2017-02-15 11:25:33 -05:00
Jack Humbert 7bef285553 Merge pull request #1101 from priyadi/layer_state_set_kb 
Add weak layer_state_set_kb hook
 2017-02-14 21:33:04 -05:00
Jack Humbert fd2925efba Merge pull request #1094 from priyadi/faux_clicky 
Implement faux-clicky feature
 2017-02-13 10:58:50 -05:00
Jack Humbert 21ad0c5bcd Merge pull request #1095 from Mauin/gonnerd/reset_documentation 
GON NerD: Add reset button to documentation and default keymap
 2017-02-13 10:56:47 -05:00
Jack Humbert 4010360912 adds planck/rev3 makefile so subproject is found 2017-02-12 23:58:44 -05:00
Jack Humbert 1e97f77278 update travis badge 2017-02-12 20:01:04 -05:00
Jack Humbert 68970679e7 Merge pull request #1092 from lucwastiaux/master 
updated ergodox/dvorak_programmer keymap
 2017-02-12 19:38:59 -05:00
Jack Humbert 4505db5d0e Merge pull request #1091 from smt/smt/tv44 
Add smt keymap for tv44 (MiniVan)
 2017-02-12 18:42:44 -05:00
Jack Humbert a773124537 send travis stuff to gitter 2017-02-12 12:23:03 -05:00
Jack Humbert 8d0fdf1008 adds soft pwm for non-timed ports 2017-02-12 11:29:42 -05:00
Jack Humbert a0c2305bd1 Merge pull request #1089 from priyadi/fix_ps2_mouse_warning 
Suppress warnings from ps2_mouse.h
 2017-02-11 13:18:42 -05:00
Jack Humbert 6d6b3ee9fb Merge pull request #1065 from milestogo/master 
Update to kinesis keymaps
 2017-02-11 11:51:06 -05:00
Jack Humbert 3f0b491fc0 Merge pull request #1082 from priyadi/right-side-dual-function 
Implement tap mod dual role for right side mods.
 2017-02-11 11:50:32 -05:00
Jack Humbert 6bb479ea45 Merge pull request #1085 from priyadi/promethium 
Promethium keyboard layout update
 2017-02-11 11:49:00 -05:00
Jack Humbert 5bdddb7821 Merge pull request #1087 from mneme/master 
Updated keymap for atreus62/mneme
 2017-02-11 11:48:39 -05:00
Jack Humbert 199458378b Merge pull request #1088 from Mauin/gon_nerd 
add GON NerD
 2017-02-11 11:48:11 -05:00
Jack Humbert bfc33a56d7 don't try to build the readme 2017-02-11 11:39:57 -05:00
Jack Humbert 835556da91 Merge pull request #1083 from VoodaGod/bone2planck 
fixed readme (i swear)
 2017-02-10 11:03:43 -05:00
Jack Humbert 6c462e0c01 Merge pull request #1073 from qmk/backlight_changes 
Open backlight functionality to all ports
 2017-02-09 20:14:35 -05:00
Jack Humbert d537120eab Merge pull request #1078 from VoodaGod/bone2planck 
updated Bone2Planck Keymap, Readme & fixed Makefile
 2017-02-09 10:38:46 -05:00