summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* remove unused enumHans Øyvind Laderud2019-03-271-13/+0
| | | | Signed-off-by: Hans Øyvind Laderud <hans@dx.no>
* Merge pull request #79 from numist/numist/numrow-keys-for-numpadGergely Nagy2019-03-151-4/+4
|\ | | | | Use numrow keys for numpad
| * Use numrow keys for numpadScott Perry2019-02-151-4/+4
| | | | | | | | Signed-off-by: Scott Perry <dev@numist.net>
* | Merge pull request #81 from noseglasses/pr_quick_buildsJesse Vincent2019-03-051-0/+17
|\ \ | | | | | | Fallback settings for BOARD_HARDWARE_PATH
| * | Makefile now checks for rules.mk when autodetecting BOARD_HARDWARE_PATHFlorian Fleissner2019-02-281-1/+8
| | | | | | | | | | | | Signed-off-by: Florian Fleissner <florian.fleissner@inpartik.de>
| * | Fallback settings for BOARD_HARDWARE_PATHFlorian Fleissner2019-02-271-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit allows the Makefile to check if the BOARD_HARDWARE_PATH it tried to determine based on the system specific Arduino installation is correct. This is done by checking for the Kaleidoscope library's existence. If Kaleidoscope is not found, the Makefile falls back to determining the hardware path relative to its own location. This even enables building from any location where a *.ino file lives without the requirement to checkout the kaleidoscope libraries into Arduino installation's hardware path or to symlink them there. The following now is possible > SOURCE_DIR=<place where the sources live> > cd $SOURCE_DIR > mkdir hardware > git clone --recursive <URL of the Kaleidoscope bundle> hardware/keyboardio > BUILD_DIR=<location where a *.ino file lives> > cd $BUILD_DIR > make -f $SOURCE_DIR/hardware/keyboardio/avr/libraries/Model01-Firmware/Makefile for quick builds > SOURCE_DIR=<place where the sources live> > cd $SOURCE_DIR > mkdir hardware > git clone --recursive <URL of the Kaleidoscope bundle> hardware/keyboardio > cd hardware/keyboardio/avr/libraries/Model01-Firmware make Signed-off-by: Florian Fleissner <florian.fleissner@inpartik.de>
* | | Merge pull request #80 from keyboardio/colormapJesse Vincent2019-02-271-0/+11
|\ \ \ | |/ / |/| | Enable the Colormap plugin too
| * | Enable the Colormap plugin tooGergely Nagy2019-02-271-0/+11
|/ / | | | | | | | | | | | | This is primarily so that one doesn't have to flash the "experimental" firmware from Chrysalis to be able to use the colormap editor there. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
* / First pass fix for our Makefile pulling the right shared makefile on anJesse Vincent2019-02-221-1/+1
|/ | | | unknown os.
* Merge pull request #77 from keyboardio/eeprom-keymap-deprecation-fixJesse Vincent2019-02-031-2/+3
|\ | | | | Update the EEPROMKeymap.setup() call to remove an obsolete argument
| * Update the EEPROMKeymap.setup() call to remove an obsolete argumentGergely Nagy2019-02-031-2/+3
|/ | | | | | | | EEPROM-Keymap was recently changed to work differently, and thus the mode argument became obsolete. This removes it from the call, and updates the comment above it to match current reality. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
* Merge pull request #76 from keyboardio/suspend-ledoff-fixJesse Vincent2019-01-201-1/+1
|\ | | | | Fix turning LEDs off on suspend
| * Fix turning LEDs off on suspendGergely Nagy2019-01-201-1/+1
|/ | | | | | | | | | | When suspending, we want to set all LEDs off & sync first, and only then pause LED operations. When the code was originally written, `LEDControl.syncLeds()` synced LEDs even when `LEDControl.paused` was set - it no longer does so, so we need to pause after we synced. This addresses keyboardio/Kaleidoscope#516, at least partially. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
* Merge pull request #75 from keyboardio/no-deprecated-apisJesse Vincent2019-01-191-12/+12
|\ | | | | Stop using deprecated (and now removed) APIs
| * Stop using deprecated (and now removed) APIsGergely Nagy2019-01-201-12/+12
|/ | | | Signed-off-by: Gergely Nagy <algernon@keyboard.io>
* Merge pull request #74 from jimt/patch-1Jesse Vincent2018-12-241-2/+2
|\ | | | | Correct location of Makefile for library updates
| * Correct location of Makefile for library updatesJim Tittsler2018-12-251-2/+2
|/ | | The `Makefile` is one directory higher than was indicated in the README.
* Merge pull request #72 from tych0/doc-fixupsJesse Vincent2018-12-091-4/+14
|\ | | | | Doc fixups
| * add a blurb about binding the PROG key to thingsTycho Andersen2018-12-091-1/+7
| | | | | | | | Signed-off-by: Tycho Andersen <tycho@tycho.ws>
| * wrap the *super* long linesTycho Andersen2018-12-091-3/+7
|/ | | | | | | | I hate to be that guy, but I was reading these on github's page when deciding whether or not to order a keyboard.io, and the extra long lines here are not automatically wrapped when browsing the repo on github. Signed-off-by: Tycho Andersen <tycho@tycho.ws>
* Merge pull request #71 from keyboardio/doc/link-updatesJesse Vincent2018-12-051-3/+3
|\ | | | | Update the URL of LED-Stalker, to point to the new docs
| * Update the URL of LED-Stalker, to point to the new docsGergely Nagy2018-12-051-3/+3
|/ | | | Signed-off-by: Gergely Nagy <algernon@keyboard.io>
* Merge pull request #68 from hustvedt/fix-anyGergely Nagy2018-10-301-2/+5
|\ | | | | Fix anyKeyMacro for new hid API
| * Fix anyKeyMacro for new hid APIAnders Hustvedt2018-10-291-2/+5
|/ | | | Signed-off-by: Anders Hustvedt <anders@computerfire.net>
* Merge pull request #67 from keyboardio/h/warning-fixesJesse Vincent2018-10-212-3/+2
|\ | | | | Two small warning fixes
| * src/Model01-Firmware.h: Add a #pragma once to make cpplint happyGergely Nagy2018-10-221-0/+2
| | | | | | | | Signed-off-by: Gergely Nagy <algernon@keyboard.io>
| * Drop the LED-Off.h include, the header is deprecatedGergely Nagy2018-10-221-3/+0
|/ | | | Signed-off-by: Gergely Nagy <algernon@keyboard.io>
* Travis cleanupGergely Nagy2018-10-101-7/+0
| | | | | | Remove the IRC notifications from Travis (we're not using IRC anymore). Signed-off-by: Gergely Nagy <algernon@keyboard.io>
* Merge pull request #65 from keyboardio/f/focusJesse Vincent2018-10-081-0/+29
|\ | | | | Support an EEPROM-based keymap overlay & Focus
| * Support an EEPROM-based keymap overlay & FocusGergely Nagy2018-10-091-0/+29
|/ | | | | | | | | | | This adds the necessary code to support having five additional layers in EEPROM. Also adds support for Focus, so these layers can be changed, and the default layer set, too. We also enable the EEPROM commands, which can be helpful in debugging and backing up one's EEPROM contents. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
* Merge pull request #63 from wesQ3/whitespace-fixJesse Vincent2018-09-211-5/+5
|\ | | | | Fix trailing whitespace and stray tab
| * Fix trailing whitespace and stray tabWes Malone2018-09-211-5/+5
|/ | | | Signed-off-by: Wes Malone <wes@mitsi.com>
* shellcheck should only be run in the Kaleidoscope repoJesse Vincent2018-09-041-5/+0
|
* Update travis.yml to point to new bundle repoJesse Vincent2018-09-041-2/+7
|
* Update README pointers to new keyboardio Kaleidoscope bundle.Jesse Vincent2018-09-041-2/+2
|
* Merge pull request #59 from keyboardio/more-featureful-defaultsJesse Vincent2018-07-191-4/+83
|\ | | | | More featureful defaults
| * astyleJesse Vincent2018-07-191-4/+4
| |
| * Make it easier to switch to COLEMAK/DVORAK/CUSTOM layoutsJesse Vincent2018-07-191-3/+82
| |
| * Add a Caps lock key on Fn-Let by default.Jesse Vincent2018-07-191-1/+1
|/ | | | | Enough customers want a caps lock that we ought to give them -something- in the default firmware
* Merge pull request #57 from TreTuna/patch-1Gergely Nagy2018-07-111-1/+1
|\ | | | | Fix typo in comments - chrods > chords
| * Fix typo in commentsTré Ammatuna2018-07-101-1/+1
|/
* Merge pull request #55 from keyboardio/f/usb-quirksJesse Vincent2018-07-021-1/+46
|\ | | | | Add a way to toggle between Boot and NKRO mode manually
| * Don't use an enum for MagicCombo.Gergely Nagy2018-07-021-4/+8
| | | | | | | | | | | | | | | | | | | | Since we use a dedicated function for the single magic combo we have, using an enum in this case is just more confusing than if we didn't. For this reason, drop the use of enum, and just specify the array directly. Thanks @obra for the suggestion! Signed-off-by: Gergely Nagy <algernon@keyboard.io>
| * Documentation fixupsGergely Nagy2018-07-011-9/+15
| | | | | | | | | | | | | | Fixed up some of the USBQuirks and MagicCombo-related documentation, based on feedback from @obra. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
| * Updated to use the new MagicCombo APIsGergely Nagy2018-06-091-38/+12
| | | | | | | | Signed-off-by: Gergely Nagy <algernon@keyboard.io>
| * Add a way to toggle between Boot and NKRO mode manuallyGergely Nagy2018-06-081-1/+62
|/ | | | | | | | Make use of the MagicCombo and USB-Quirks plugins in order to allow one to toggle between Boot and NKRO mode of the keyboard, simply by pressing Left Fn + Shift + Esc. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
* Drop the use of HostPowerManagement.enableWakeup()Gergely Nagy2018-06-041-5/+2
| | | | | | | | It is not necessary anymore, as BootKeyboard supports wakeup itself now. As such, also updated the comments regarding the plugin in KALEIDOSCOPE_INIT_PLUGINS. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 04:54:22 +0000