summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-06-27Merge branch 'master' of https://github.com/qmk/qmk_firmware into dual_audioJack Humbert56-40/+4466
2017-06-27no glideJack Humbert1-1/+1
2017-06-27working duopholyJack Humbert1-4/+58
2017-06-27b5 audioJack Humbert1-20/+240
2017-06-27Add eclipse to the _summaryJack Humbert1-0/+1
2017-06-27Adds parenthesis where they might be neededJack Humbert1-2/+2
Addresses #764
2017-06-27Merge pull request #1441 from lindhe/swedishErez Zukerman3-0/+335
Create sv_SE Qwerty layout for ErgoDox EZ
2017-06-27Create sv_SE Qwerty layout for ErgoDoxAndreas Lindhé3-0/+335
*NOTE:* it might still be desirable to set the software layout to sv_SE in your OS. Swedish (sv_SE) Qwerty layout for ErgoDox, based on the Default configuration I have tried making this as close of a match I could between the [default ErgoDox EZ configuration](https://ergodox-ez.com/pages/our-firmware) and a standard Swedish Qwerty layout. Notable differences from default: ================================= * There are three special character buttons (acute accent, circumflex/tilde and apostrophe/asterisk) that don't have any buttons to map to naturally. I've put these at other places: * Acute accent (´) can be found in the lower left corner, conveniently placed to reach for making an é. * Apostrophe (') was put in the lower left corner, close to acute accent. * Circumflex (^) and asterisk (*) was placed in the lower right corner. * Tilde (~) and diaeresis (¨) I couldn't find a good place for, so I left those out. I could only get the buttons to produce a single one of the characters. How can I get it to work properly? * The Alt button on right thumb was exchanged for AltGr (RAlt). * I changed the backslash in the numpad (layer 1) for a minus. Thought it was more sensible. * I didn't find a good place for the "<>|" button, so that one was left out. That is a problem that really needs to be resolved. Pipe can be found on layer one, however.
2017-06-27Allow mod swapping for mod tap (MT) (#1202)Jack Humbert3-1/+32
* allow mod swapping for mod tap * quick include * fix the mod swapping * make changes consistent with action code * fix bug * re-enable no gui, etc * fix binary comps * solid logic
2017-06-26Merge pull request #1431 from rai-suta/masterJack Humbert5-1/+147
Bugg fix and add keymap for testing JIS_KEYCODE switch.
2017-06-26Whitefox LED control (#1432)Ethan Madden17-36/+1080
* use new grave_esc functionality * Port LED control from Ergodox Infinity to Whitefox
2017-06-26add support for Orthodox keyboard (#1436)Art Ortenburger26-0/+2869
* Added orthodox * Modified readme * Modified readme * Modified readme * Updated makefile * Fixed keymap issues * Modified serial communications to allow for over 8 columns * Fixed sizeof command * Fixed some typing issues * Testing issue #1191 (n-column split i2c slave) Based on initial OrthoDox (serial) config by @reddragond and others, this attempts to add TWI (I2C) support. Relevant: <https://github.com/qmk/qmk_firmware/issues/1191> - per @ahtn recommendation, using memcpy for moving slave matrix into slave sending buffer - slave buffer has been enlarged using sizeof(matrix_row_t) - note: i2c.h now includes matrix.h - note: matrix.c includes <string.h> * Added i2c keymap - right col still not working * orthodox: re-added i2c keymap, based on serial * orthodox / issue #1191: trying 9-bit serial - orthodox serial protocol now sends 9 bits per row, instead of 16. Technically it's using MATRIX_COLS, so it might work generically. - ROW_MASK is #defined in serial.c to truncate the checksums to prevent overflows causing false errors. This macro should be renamed if it's kept. * Revert "Fixed sizeof command" This reverts commit f62a5b9939d6a9c0e442ec403de00c14431a55f9. Changes had been made to the lets_split serial driver for testing which mirrored the multi-byte-row changes made to support the orthodox. As the lets_split does not require these changes, and new improvements had been added to the orthodox port only, this commit reverts them. Because the new code could potentially reduce latency over the serial transport, it may be desirable to re-add in the future, by backporting the current working orthodox code. * orthodox: default serial keymap improvements - formatting has been improved - a few keys have been shifted, mainly in Raise and Lower layers, to be more like the default Planck layout - Now available: F12, Home, End, PgUp, PgDn, Media-Next, Media-Play Still To Do: - duplicate for TWI - Alt modifier - GUI modifier * orthodox: failed attempt at 16b/row TWI - duplicated updated serial keymap for "i2c" - removed string.h/memcpy, instead - hardcoded copying of six bytes per update - still doesn't work; master reports interconnect errors on txled * orthodox: adjusted default keymap - this is applied to both 'serial' and 'i2c' keymaps - Alt and GUI have been added, as they were missing - comma and period persist across more layers; Home/PgUp and End/PgDn have been moved slightly to accommodate * orthodox: revert TWI support to minimum to debug - disabled ssd1306 and hardware locking in build configuration - increased TWI buffer from 0x10 to 0x20 bytes - decreased TWI clock from 400000 to 100000 - removed hardcoded TWI multi-byte sending/receiving An 'i2c' build of this was found to work on a rev1 Orthodox, although slave-side col9 was understandably not working. When testing-time permits, features will be gradually re-enabled towards getting the full matrix supported over TWI. * orthodox: TWI (i2c) is working, kludge for col9 The TWI interconnect ("i2c" in directories and build config) is now working for the Orthodox, including the slave half's column #9. This is intended as an interim solution, as it's a kludge, not a fix. Rather than a working multi-byte implementation, the two col9 keys' bits are packed-into and unpacked-from the two unused bits in row1. Furthermore, the TWI clock constant has been reduced to 100000 from 400000, as testing revealed the higher value just didn't work. Testing also found that (with this kludge) increasing the TWI buffer was not necessary. This commit leaves many commented-out lines in matrix.c from previous testing, which will be removed in a future commit once the interconnects' multi-byte problems have been debugged more thoroughly. * orthodox: updated readme.md The readme for the Orthodox now includes a description of the keyboard, allusions to its author and availability, a linked photo, and links to the evolving build guide and the current keymap on KLE. This update has been prepared with /u/Deductivemonkee's assistance.
2017-06-25updates olkb readmes #1362Jack Humbert3-68/+30
2017-06-25Add a keymap for testing JIS_KEYCODE.rai-suta4-0/+146
2017-06-25Fix bug.rai-suta1-1/+1
2017-06-25Merge pull request #1427 from blakedietz/masterJack Humbert9-0/+1086
Add keymaps for ergodox ez, hhkb and jd45 under user blakedietz
2017-06-25Merge pull request #1429 from fredizzimo/fixes_for_emulatorJack Humbert10-28/+10
Minor fixes to support the emulator
2017-06-25Change M_2_PI to 2 * PI as it should beFred Sundvik1-1/+1
2017-06-25Add keymaps for ergodox ez, hhkb and jd45 under user blakedietzBlake Dietz9-0/+1086
2017-06-25Remove the DIODE_DIRECTION defines from lets_split so we can close #1067skullY2-7/+1
2017-06-25Fix #1135 by changing the default to at90usb1286skullY1-1/+1
2017-06-24Update _summary.mdJack Humbert1-0/+1
2017-06-24Merge pull request #1425 from kynikos/patch-1Jack Humbert1-1/+1
Fix typo
2017-06-24Merge pull request #1426 from rai-suta/masterJack Humbert1-22/+120
Add JIS_KEYCODE layout for send_string()
2017-06-24Add JIS_KEYCODE layout for send_string()rai-suta1-22/+120
2017-06-24Fix typoDario Giovannetti1-1/+1
2017-06-24update docs for ispJack Humbert2-2/+2
2017-06-24Merge branch 'master' of https://github.com/qmk/qmk_firmwareJack Humbert34-322/+2615
2017-06-24add other mcu bootloadersJack Humbert3-0/+540
2017-06-24Merge pull request #1422 from nstickney/masterJack Humbert3-63/+82
update ErgoDox "Familiar" layout
2017-06-24Update _summary.mdJack Humbert1-0/+1
2017-06-24Create isp_flashing_guide.mdJack Humbert1-0/+106
2017-06-24Merge pull request #1418 from npoirey/masterJack Humbert11-0/+1688
Frenchdev v1
2017-06-23Updated frenchdev readmenpoirey1-10/+48
2017-06-23Update the ugfx submoduleFred Sundvik1-0/+0
2017-06-23Change inline to static inlineFred Sundvik2-2/+2
2017-06-23Delete emulator driversFred Sundvik4-24/+0
2017-06-23Add function for getting the LCD backlight brightnessFred Sundvik2-0/+5
2017-06-23Include config.h from visualizer.hFred Sundvik1-0/+1
2017-06-23Change remote url of uGFX to relative pathFred Sundvik1-0/+0
2017-06-23Include config.h before visualizer.hFred Sundvik1-1/+1
2017-06-23updated README.mdStick2-5/+3
2017-06-23Merge remote-tracking branch 'upstream/master'Stick18-259/+738
2017-06-23added media keys; many bug fixesStick2-27/+26
2017-06-23Refactoring frenchdevnpoirey5-59/+61
2017-06-23Moved frenchdev to handwirednpoirey16-167/+77
2017-06-23Merge pull request #1421 from 333fred/update-layoutJack Humbert4-61/+106
Update my layout
2017-06-23Merge pull request #1419 from Wraul/phantom-improvementsJack Humbert14-198/+632
Phantom improvements
2017-06-23Doc updatesFredric Silberberg2-18/+22
2017-06-23Copy/paste additions.Fredric Silberberg2-15/+17