summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1445 from qmk/dual_audioJack Humbert2017-06-276-22/+303
|\ | | | | Allow for duophony (C6 and B5) and B5 audio
| * don't let timer1 exist without b5 being enabledJack Humbert2017-06-272-0/+4
| |
| * add new arguements, docsJack Humbert2017-06-274-2/+5
| |
| * Merge branch 'master' of https://github.com/qmk/qmk_firmware into dual_audioJack Humbert2017-06-2756-40/+4466
| |\ | |/ |/|
* | Add eclipse to the _summaryJack Humbert2017-06-271-0/+1
| |
* | Adds parenthesis where they might be neededJack Humbert2017-06-271-2/+2
| | | | | | Addresses #764
* | Merge pull request #1441 from lindhe/swedishErez Zukerman2017-06-273-0/+335
|\ \ | | | | | | Create sv_SE Qwerty layout for ErgoDox EZ
| * | Create sv_SE Qwerty layout for ErgoDoxAndreas Lindhé2017-06-273-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.
* | Allow mod swapping for mod tap (MT) (#1202)Jack Humbert2017-06-263-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
* | Merge pull request #1431 from rai-suta/masterJack Humbert2017-06-255-1/+147
|\ \ | | | | | | Bugg fix and add keymap for testing JIS_KEYCODE switch.
| * | Add a keymap for testing JIS_KEYCODE.rai-suta2017-06-264-0/+146
| | |
| * | Fix bug.rai-suta2017-06-261-1/+1
| | |
* | | Whitefox LED control (#1432)Ethan Madden2017-06-2517-36/+1080
| | | | | | | | | | | | | | | | | | * use new grave_esc functionality * Port LED control from Ergodox Infinity to Whitefox
* | | add support for Orthodox keyboard (#1436)Art Ortenburger2017-06-2526-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.
| | * no glideJack Humbert2017-06-271-1/+1
| | |
| | * working duopholyJack Humbert2017-06-271-4/+58
| | |
| | * b5 audioJack Humbert2017-06-271-20/+240
| |/ |/|
* | updates olkb readmes #1362Jack Humbert2017-06-253-68/+30
|/
* Merge pull request #1427 from blakedietz/masterJack Humbert2017-06-259-0/+1086
|\ | | | | Add keymaps for ergodox ez, hhkb and jd45 under user blakedietz
| * Add keymaps for ergodox ez, hhkb and jd45 under user blakedietzBlake Dietz2017-06-249-0/+1086
| |
* | Merge pull request #1429 from fredizzimo/fixes_for_emulatorJack Humbert2017-06-2510-28/+10
|\ \ | |/ |/| Minor fixes to support the emulator
| * Change M_2_PI to 2 * PI as it should beFred Sundvik2017-06-251-1/+1
| |
| * Update the ugfx submoduleFred Sundvik2017-06-241-0/+0
| |
| * Change inline to static inlineFred Sundvik2017-06-242-2/+2
| |
| * Delete emulator driversFred Sundvik2017-06-244-24/+0
| |
| * Add function for getting the LCD backlight brightnessFred Sundvik2017-06-242-0/+5
| |
| * Include config.h from visualizer.hFred Sundvik2017-06-241-0/+1
| |
| * Change remote url of uGFX to relative pathFred Sundvik2017-06-241-0/+0
| |
| * Include config.h before visualizer.hFred Sundvik2017-06-241-1/+1
| |
* | Remove the DIODE_DIRECTION defines from lets_split so we can close #1067skullY2017-06-242-7/+1
| |
* | Fix #1135 by changing the default to at90usb1286skullY2017-06-241-1/+1
| |
* | Update _summary.mdJack Humbert2017-06-241-0/+1
| |
* | Merge pull request #1425 from kynikos/patch-1Jack Humbert2017-06-241-1/+1
|\ \ | | | | | | Fix typo
| * | Fix typoDario Giovannetti2017-06-241-1/+1
| | |
* | | Merge pull request #1426 from rai-suta/masterJack Humbert2017-06-241-22/+120
|\ \ \ | |/ / |/| | Add JIS_KEYCODE layout for send_string()
| * | Add JIS_KEYCODE layout for send_string()rai-suta2017-06-241-22/+120
|/ /
* | update docs for ispJack Humbert2017-06-232-2/+2
| |
* | Merge branch 'master' of https://github.com/qmk/qmk_firmwareJack Humbert2017-06-2334-322/+2615
|\ \
| * \ Merge pull request #1422 from nstickney/masterJack Humbert2017-06-233-63/+82
| |\ \ | | | | | | | | update ErgoDox "Familiar" layout
| | * | updated README.mdStick2017-06-232-5/+3
| | | |
| | * | Merge remote-tracking branch 'upstream/master'Stick2017-06-2318-259/+738
| | |\|
| | * | added media keys; many bug fixesStick2017-06-232-27/+26
| | | |
| | * | added tapdance lockingStick2017-06-222-44/+66
| | | |
| | * | Merge remote-tracking branch 'upstream/master'Stick2017-06-22485-25863/+9757
| | |\ \
| | * | | Revert "ugly workaround for ErgoDoxEZ LED bugs: turn 'em all off"Stick2017-06-083-23/+24
| | | | | | | | | | | | | | | | | | | | This reverts commit f397402e101774eedd1748b1e31c7386f927d4ed.
| | * | | trying to fix LEDsStick2017-06-081-21/+21
| | | | |
| | * | | Merge remote-tracking branch 'upstream/master'Stick2017-06-0812-3/+361
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'upstream/master'Stick2017-06-0711-28/+279
| | |\ \ \ \
| | * | | | | ugly workaround for ErgoDoxEZ LED bugs: turn 'em all offStick2017-06-023-45/+44
| | | | | | |
| | * | | | | moved alt out from under spaceStick2017-06-021-7/+7
| | | | | | |