summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #110 from The-Compiler/patch-1Jesse Vincent2021-09-031-1/+1
|\ | | | | Add build date/time to default version info
| * Add build date/time to default version infoFlorian Bruhin2021-09-031-1/+1
|/ | | | Signed-off-by: Florian Bruhin <me@the-compiler.org>
* Merge pull request #108 from gedankenexperimenter/key-event-handlersGergely Nagy2021-05-291-15/+10
|\ | | | | Update for `KeyEvent` changes
| * Update for KeyEvent changesMichael Richters2021-04-271-15/+10
|/ | | | | | | | This updates the default sketch's Macros code to match the changes in PR 1024, using the new version of `macroAction()` that takes a `KeyEvent` reference parameter instead of a key state bitfield. Signed-off-by: Michael Richters <gedankenexperimenter@gmail.com>
* Update Model01 Firmware to new build systemJesse Vincent2020-12-023-57/+36
|
* Merge pull request #106 from aoeu/aoeu.refactor.macro-definition-orderingJesse Vincent2020-10-121-1/+1
|\ | | | | Match macro definition order to conditional groups
| * Match macro definition order to conditional groupsTravis snɯǝᗡɔW2020-10-121-1/+1
|/ | | | For consistency, make the keymap macro definitions match the ordering of their respective conditional groups (i.e. ifdef blocks).
* Some additional expository prose in the install instructions.Jesse Vincent2020-06-151-1/+7
|
* Point users at the Arduino and Kaleidoscope documentation on the wiki ↵Jesse Vincent2020-06-081-62/+3
| | | | instead of reproducing an incomplete, obsolete version here.
* Merge pull request #96 from blovett/patch-1Jesse Vincent2020-01-151-5/+5
|\ | | | | Correct links to reference headers and doc.
| * Also update LED-Stalker doc link.ben lovett2020-01-151-1/+1
| |
| * Fix links to keyboard definitions.ben lovett2020-01-151-4/+4
|/
* Merge pull request #95 from keyboardio/update-to-use-new-apisJesse Vincent2020-01-081-6/+3
|\ | | | | Update to use new apis
| * Use the new LEDControl.disable/LEDControl.enable methodsGergely Nagy2020-01-081-5/+2
| | | | | | | | | | | | | | To toggle LEDs on suspend/resume, use the new LEDControl methods instead of the old `LEDControl.paused` property. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
| * Use the new HID driver instead of the old facadeGergely Nagy2020-01-081-1/+1
|/ | | | | | | While the old facade is still available, it is not included by default anymore. Instead of adding then include, just use the new APIs. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
* Merge pull request #92 from CapeLeidokos/pr_key_APIGergely Nagy2019-11-291-1/+1
|\ | | | | Adapted the sketch to changes in the Key API
| * Adapted the sketch to changes in the Key APIFlorian Fleissner2019-11-121-1/+1
|/ | | | Signed-off-by: Florian Fleissner <florian.fleissner@inpartik.de>
* A full implementation of the new HardwareTestMode.Jesse Vincent2019-07-291-4/+36
| | | | Signed-off-by: Jesse Vincent <jesse@keyboard.io>
* Revert "Replaced Kaleidoscope-Model01-TestMode"Jesse Vincent2019-07-291-2/+2
| | | | | This reverts commit ccf992aa09ccc50539523015a91505743fb97116, which was an incomplete implementation
* Merge pull request #88 from keyboardio/colormap/led-palette-themeJesse Vincent2019-07-121-0/+7
|\ | | | | Include and initalize LEDPaletteTheme too
| * Include and initalize LEDPaletteTheme tooGergely Nagy2019-07-091-0/+7
|/ | | | | | | | | Without the `LEDPaletteTheme` plugin, `Colormap` doesn't work either, since the palette is not initialized. Lets include and initialize the palette plugin too. Fixes #86. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
* Merge pull request #85 from CapeLeidokos/pr_virtual_build_fixJesse Vincent2019-06-101-2/+2
|\ | | | | Replaced Kaleidoscope-Model01-TestMode
| * Replaced Kaleidoscope-Model01-TestModeFlorian Fleissner2019-06-061-2/+2
|/ | | | | | | | ... with the more general Kaleidoscope-HardwareTestMode. By this means, the stock firmware can be build with the virtual hardware. Signed-off-by: Florian Fleissner <florian.fleissner@inpartik.de>
* Merge pull request #83 from afreakk/unusedJesse Vincent2019-03-271-13/+0
|\ | | | | remove unused enum
| * 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 11:17:59 +0000