summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #52 from keyboardio/f/plugin-v2Gergely Nagy2018-05-151-49/+48
|\ | | | | Updated to use the new plugin APIs
| * Updated to use the new plugin APIsGergely Nagy2018-05-081-49/+48
|/ | | | Signed-off-by: Gergely Nagy <algernon@keyboard.io>
* Merge pull request #45 from ryansb/fix-installed-envGergely Nagy2018-04-291-1/+1
|\ | | | | Match wildcard usage between manual- and arduino-installed environments
| * Match wildcard usage between manual- and arduino-installed environmentsRyan S. Brown2018-03-051-1/+1
| | | | | | | | | | | | | | Finding the base-dir of installed environments use a wildcard causing [dir]/packages/keyboardio/hardware/avr/toolchain to be the interpreted as the installed env, breaking use of that variable later when it informs paths for the boards.txt and other files.
* | Merge pull request #39 from gedankenexperimenter/f/keymapsGergely Nagy2018-04-051-2/+2
|\ \ | | | | | | Updated definition of keymaps[] to use KEYMAPS() macro
| * | Updated definition of keymaps[] to use KEYMAPS() macroMichael Richters2017-11-301-2/+2
| | | | | | | | | | | | | | | This change will enable the `layer_count` variable for preventing reading past the end of the `keymaps[]` array.
* | | Merge pull request #49 from algernon/h/numlock/quote-transparentGergely Nagy2018-03-121-1/+1
|\ \ \ | | | | | | | | Make the Quote transparent on the NUMPAD layer.
| * | | Make the Quote transparent on the NUMPAD layer.Gergely Nagy2018-03-101-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because the key two rows below `NumLock` is `Key_Quote` on the base layer too, and is not a numpad-specific key either, make it transparent, so it does not get highlighted erroneously. Thanks to @ImmaculatePotato and Eddie Jinks for reporting the issue, and proposing the fix. Fixes #48. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
* | | Merge pull request #47 from danbernier/alpha-square-colorJesse Vincent2018-03-081-1/+1
|\ \ \ | |_|/ |/| | Use CRGB type for AlphaSquare color, so ints are in common order
| * | Use CRGB type for AlphaSquare color, so ints are in common orderDan Bernier2018-03-081-1/+1
|/ /
* | Merge pull request #41 from algernon/f/host-powermanagementJesse Vincent2017-12-161-1/+36
|\ \ | | | | | | Add support for host power management (suspend & wakeup)
| * | Add support for host power management (suspend & wakeup)Gergely Nagy2017-12-161-1/+36
|/ / | | | | | | Signed-off-by: Gergely Nagy <algernon@keyboard.io>
* / Add a big warning when you build by hand and have multiple copies ofJesse Vincent2017-12-151-4/+32
|/ | | | kaleidoscope installed
* Now that 'Consumer_Mute' is no longer blocked by 'is_internal', we canJesse Vincent2017-11-131-1/+1
| | | | | switch back to using it, to get a working mute toggle on linux, windows and osx.
* astyle fixesJesse Vincent2017-11-131-1/+1
|
* Swap the order of the Numpad and Fn layers, so it's possible to get toJesse Vincent2017-11-131-16/+18
| | | | arrow keys if you have the numpad on.
* Merge pull request #34 from Jennigma/patch-3Jesse Vincent2017-11-121-2/+6
|\ | | | | Make the pointer to the wiki LOUD
| * Make the pointer to the wiki LOUDJennifer Leigh2017-11-051-2/+6
| | | | | | We just had a new person who found the forums but didn't see the note to use the wiki at the top of this file. I'm making it louder. :-)
* | Switch from the NumLock library to the NumPad library.Jesse Vincent2017-11-121-7/+7
|/ | | | | | This new plugin lets us use a more standard layer lock to get into the numpad mode and doesn't depend on the system numlock feature quite as much
* Merge pull request #31 from gedankenexperimenter/merlinJesse Vincent2017-10-311-2/+2
|\ | | | | Changed minimum Arduino version to 1.6.10, as discussed on forums
| * Changed minimum Arduino version to 1.6.10, as disussed on forumsMichael Richters2017-10-311-2/+2
|/
* Quiet down a warning in the makefileJesse Vincent2017-10-241-1/+1
|
* Merge pull request #25 from ackintosh/trailing-slashGergely Nagy2017-10-221-1/+1
|\ | | | | Fix trailing slash
| * Fix trailing slashakihito.nakano2017-10-221-1/+1
|/
* Merge pull request #24 from malsyned/patch-1Gergely Nagy2017-10-191-1/+1
|\ | | | | Fix link to Linux Arduino install instructions
| * Fix link to Linux Arduino install instructionsDennis Lambe Jr2017-10-191-1/+1
|/
* Merge pull request #20 from Jennigma/patch-1Jesse Vincent2017-10-131-0/+1
|\ | | | | Adding a pointer to the wiki
| * Adding a pointer to the wikiJennifer Leigh2017-10-131-0/+1
|/ | | put it up front where it would be super obvious.
* Fix our arduino-ide package detection to work on OSXJesse Vincent2017-10-041-8/+10
|
* makefile: if there's an arduino boards-manager install of the kaleidoscope ↵Jesse Vincent2017-10-041-0/+11
| | | | runtime, use it..
* Merge pull request #18 from Jennigma/patch-1Jesse Vincent2017-10-041-0/+2
|\ | | | | Added a couple "to be documented" items
| * Added a couple "to be documented" itemsJennifer Leigh2017-10-041-0/+2
|/ | | | | | | I added a couple items to the list of things that should be documented. I also realize I have no idea what the ANY key does, but I'm intrigued. I don't understand from these code comments, and don't have time to puzzle it out now. Otherwise, though, this is so much better than the file I've been poking at for weeks! It's clear and clean and much more welcoming. Thanks for all the behind the scenes work that made this possible, and thank you Jesse for the work writing up comments!
* Merge pull request #17 from martinakcsilla/backslashlessJesse Vincent2017-10-041-36/+36
|\ | | | | Make the sketch use backslash less
| * Make the sketch use backslash lessCsilla Nagyné Martinák2017-10-041-36/+36
|/ | | | | | | This lass is not fond of backslash, so she made the sketch use backslash less, so much so that it is now backslash-less. Signed-off-by: Csilla Nagyné Martinák <csilla@csillger.hu>
* Merge pull request #16 from cdisselkoen/masterJesse Vincent2017-10-031-3/+10
|\ | | | | Fix misleading indentation in all three layers' keymaps
| * Fix misleading indentation in all three layers' keymapsCraig Disselkoen2017-10-031-3/+10
|/ | | | plus add astyle directives to make astyle not complain about it
* Little bits of glue to make the Model01 Firwmare into a 'real' arduino ↵Jesse Vincent2017-10-032-0/+10
| | | | library that the IDE doesn't hate
* update to shifttolayer and instead of the old keymap_n_momentary macros;Jesse Vincent2017-10-031-9/+15
| | | | update doc
* Merge pull request #15 from martinakcsilla/use-does-not-need-sentinelJesse Vincent2017-10-031-2/+2
|\ | | | | Remove the NULL from the end of Kaleidoscope.use
| * Remove the NULL from the end of Kaleidoscope.useCsilla Nagyné Martinák2017-10-031-2/+2
|/ | | | | | | | For a while now, `Kaleidoscope.use` does not require a NULL sentinel at the end. This drops the sentinel instead of adding documentation that would explain why that NULL is there. Signed-off-by: Csilla Nagyné Martinák <csilla@csillger.hu>
* clean up indentation of keymapsJesse Vincent2017-10-021-46/+45
|
* remove the special NUMPAD_ID definition; move the keymap definitions into ↵Jesse Vincent2017-10-021-72/+60
| | | | | | the variable declaration. This has the advantage of having one fewer construct to explain
* Doc updates as suggested by @cdisselkoen++Jesse Vincent2017-10-021-6/+7
|
* add notes about updating firmware and libraries to the READMEJesse Vincent2017-10-021-2/+27
|
* Slightly simplify the default keymaps, removing some duplicationJesse Vincent2017-10-021-5/+5
|
* Close a commentJesse Vincent2017-10-021-1/+1
|
* astyleJesse Vincent2017-10-021-35/+35
|
* First pass at comments on the rest of the default sketchJesse Vincent2017-10-021-16/+54
|
* comment much of the default sketchJesse Vincent2017-10-021-3/+140
|
* We're not actually exposing BootKeyboard yet.Jesse Vincent2017-10-021-1/+0
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 07:37:49 +0000