Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fixed brackets | Fabian Topfstedt | 2017-06-27 | 1 | -1/+1 |
| | |||||
* | my layout | Fabian Topfstedt | 2017-06-27 | 1 | -6/+6 |
| | |||||
* | Merge https://github.com/qmk/qmk_firmware | Fabian Topfstedt | 2017-06-27 | 3 | -1/+32 |
|\ | |||||
| * | Allow mod swapping for mod tap (MT) (#1202) | Jack Humbert | 2017-06-26 | 3 | -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 | ||||
* | | removed wrong readme | Fabian Topfstedt | 2017-06-27 | 1 | -88/+0 |
| | | |||||
* | | my layout | Fabian Topfstedt | 2017-06-27 | 1 | -22/+23 |
| | | |||||
* | | clone smt layout | Fabian Topfstedt | 2017-06-26 | 3 | -0/+341 |
|/ | |||||
* | Merge pull request #1431 from rai-suta/master | Jack Humbert | 2017-06-25 | 5 | -1/+147 |
|\ | | | | | Bugg fix and add keymap for testing JIS_KEYCODE switch. | ||||
| * | Add a keymap for testing JIS_KEYCODE. | rai-suta | 2017-06-26 | 4 | -0/+146 |
| | | |||||
| * | Fix bug. | rai-suta | 2017-06-26 | 1 | -1/+1 |
| | | |||||
* | | Whitefox LED control (#1432) | Ethan Madden | 2017-06-25 | 17 | -36/+1080 |
| | | | | | | | | | | | | * use new grave_esc functionality * Port LED control from Ergodox Infinity to Whitefox | ||||
* | | add support for Orthodox keyboard (#1436) | Art Ortenburger | 2017-06-25 | 26 | -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. | ||||
* | | updates olkb readmes #1362 | Jack Humbert | 2017-06-25 | 3 | -68/+30 |
|/ | |||||
* | Merge pull request #1427 from blakedietz/master | Jack Humbert | 2017-06-25 | 9 | -0/+1086 |
|\ | | | | | Add keymaps for ergodox ez, hhkb and jd45 under user blakedietz | ||||
| * | Add keymaps for ergodox ez, hhkb and jd45 under user blakedietz | Blake Dietz | 2017-06-24 | 9 | -0/+1086 |
| | | |||||
* | | Merge pull request #1429 from fredizzimo/fixes_for_emulator | Jack Humbert | 2017-06-25 | 10 | -28/+10 |
|\ \ | |/ |/| | Minor fixes to support the emulator | ||||
| * | Change M_2_PI to 2 * PI as it should be | Fred Sundvik | 2017-06-25 | 1 | -1/+1 |
| | | |||||
| * | Update the ugfx submodule | Fred Sundvik | 2017-06-24 | 1 | -0/+0 |
| | | |||||
| * | Change inline to static inline | Fred Sundvik | 2017-06-24 | 2 | -2/+2 |
| | | |||||
| * | Delete emulator drivers | Fred Sundvik | 2017-06-24 | 4 | -24/+0 |
| | | |||||
| * | Add function for getting the LCD backlight brightness | Fred Sundvik | 2017-06-24 | 2 | -0/+5 |
| | | |||||
| * | Include config.h from visualizer.h | Fred Sundvik | 2017-06-24 | 1 | -0/+1 |
| | | |||||
| * | Change remote url of uGFX to relative path | Fred Sundvik | 2017-06-24 | 1 | -0/+0 |
| | | |||||
| * | Include config.h before visualizer.h | Fred Sundvik | 2017-06-24 | 1 | -1/+1 |
| | | |||||
* | | Remove the DIODE_DIRECTION defines from lets_split so we can close #1067 | skullY | 2017-06-24 | 2 | -7/+1 |
| | | |||||
* | | Fix #1135 by changing the default to at90usb1286 | skullY | 2017-06-24 | 1 | -1/+1 |
| | | |||||
* | | Update _summary.md | Jack Humbert | 2017-06-24 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #1425 from kynikos/patch-1 | Jack Humbert | 2017-06-24 | 1 | -1/+1 |
|\ \ | | | | | | | Fix typo | ||||
| * | | Fix typo | Dario Giovannetti | 2017-06-24 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1426 from rai-suta/master | Jack Humbert | 2017-06-24 | 1 | -22/+120 |
|\ \ \ | |/ / |/| | | Add JIS_KEYCODE layout for send_string() | ||||
| * | | Add JIS_KEYCODE layout for send_string() | rai-suta | 2017-06-24 | 1 | -22/+120 |
|/ / | |||||
* | | update docs for isp | Jack Humbert | 2017-06-23 | 2 | -2/+2 |
| | | |||||
* | | Merge branch 'master' of https://github.com/qmk/qmk_firmware | Jack Humbert | 2017-06-23 | 34 | -322/+2615 |
|\ \ | |||||
| * \ | Merge pull request #1422 from nstickney/master | Jack Humbert | 2017-06-23 | 3 | -63/+82 |
| |\ \ | | | | | | | | | update ErgoDox "Familiar" layout | ||||
| | * | | updated README.md | Stick | 2017-06-23 | 2 | -5/+3 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'upstream/master' | Stick | 2017-06-23 | 18 | -259/+738 |
| | |\| | |||||
| | * | | added media keys; many bug fixes | Stick | 2017-06-23 | 2 | -27/+26 |
| | | | | |||||
| | * | | added tapdance locking | Stick | 2017-06-22 | 2 | -44/+66 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'upstream/master' | Stick | 2017-06-22 | 485 | -25863/+9757 |
| | |\ \ | |||||
| | * | | | Revert "ugly workaround for ErgoDoxEZ LED bugs: turn 'em all off" | Stick | 2017-06-08 | 3 | -23/+24 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit f397402e101774eedd1748b1e31c7386f927d4ed. | ||||
| | * | | | trying to fix LEDs | Stick | 2017-06-08 | 1 | -21/+21 |
| | | | | | |||||
| | * | | | Merge remote-tracking branch 'upstream/master' | Stick | 2017-06-08 | 12 | -3/+361 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge remote-tracking branch 'upstream/master' | Stick | 2017-06-07 | 11 | -28/+279 |
| | |\ \ \ \ | |||||
| | * | | | | | ugly workaround for ErgoDoxEZ LED bugs: turn 'em all off | Stick | 2017-06-02 | 3 | -45/+44 |
| | | | | | | | |||||
| | * | | | | | moved alt out from under space | Stick | 2017-06-02 | 1 | -7/+7 |
| | | | | | | | |||||
| | * | | | | | Merge remote-tracking branch 'upstream/master' | Stick | 2017-06-02 | 376 | -684/+16127 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | small changes | Stick | 2017-04-18 | 2 | -6/+6 |
| | | | | | | | | |||||
| * | | | | | | | Update _summary.md | Jack Humbert | 2017-06-23 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Create isp_flashing_guide.md | Jack Humbert | 2017-06-23 | 1 | -0/+106 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #1418 from npoirey/master | Jack Humbert | 2017-06-23 | 11 | -0/+1688 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | Frenchdev v1 |