1
0

152 Commits

Author SHA1 Message Date
Jesse Vincent
717733ad64 Merge pull request #20 from Jennigma/patch-1
Adding a pointer to the wiki
2017-10-13 13:23:19 -07:00
Jennifer Leigh
165e479ac0 Adding a pointer to the wiki
put it up front where it would be super obvious.
2017-10-13 13:20:47 -07:00
Jesse Vincent
cd9780a309 Fix our arduino-ide package detection to work on OSX 2017-10-04 23:46:51 -07:00
Jesse Vincent
beb849f84f makefile: if there's an arduino boards-manager install of the kaleidoscope runtime, use it.. 2017-10-04 23:13:28 -07:00
Jesse Vincent
492dc5e70f Merge pull request #18 from Jennigma/patch-1
Added a couple "to be documented" items
2017-10-04 11:59:06 -07:00
Jennifer Leigh
1cdd90fbdc Added a couple "to be documented" items
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!
2017-10-04 11:29:48 -07:00
Jesse Vincent
b03bbae780 Merge pull request #17 from martinakcsilla/backslashless
Make the sketch use backslash less
2017-10-04 10:36:17 -07:00
Csilla Nagyné Martinák
f92e9943d7 Make the sketch use backslash less
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>
2017-10-04 17:19:20 +02:00
Jesse Vincent
c48e153ae6 Merge pull request #16 from cdisselkoen/master
Fix misleading indentation in all three layers' keymaps
2017-10-03 22:56:24 -07:00
Craig Disselkoen
a988fac811 Fix misleading indentation in all three layers' keymaps
plus add astyle directives to make astyle not complain about it
2017-10-03 22:52:31 -07:00
Jesse Vincent
bc81748391 Little bits of glue to make the Model01 Firwmare into a 'real' arduino library that the IDE doesn't hate 2017-10-03 22:10:38 -07:00
Jesse Vincent
0063537e04 update to shifttolayer and instead of the old keymap_n_momentary macros;
update doc
2017-10-03 22:10:38 -07:00
Jesse Vincent
fbcf8c4ec6 Merge pull request #15 from martinakcsilla/use-does-not-need-sentinel
Remove the NULL from the end of Kaleidoscope.use
2017-10-03 13:24:01 -07:00
Csilla Nagyné Martinák
22f5337c79 Remove the NULL from the end of Kaleidoscope.use
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>
2017-10-03 10:27:29 +02:00
Jesse Vincent
1f614f52c2 clean up indentation of keymaps 2017-10-02 23:58:41 -07:00
Jesse Vincent
b759e003af remove the special NUMPAD_ID definition; move the keymap definitions into the variable declaration.
This has the advantage of having one fewer construct to explain
2017-10-02 23:46:03 -07:00
Jesse Vincent
e99467aa48 Doc updates as suggested by @cdisselkoen++ 2017-10-02 23:26:33 -07:00
Jesse Vincent
50abef7b54 add notes about updating firmware and libraries to the README 2017-10-02 23:21:27 -07:00
Jesse Vincent
028b9c6dda Slightly simplify the default keymaps, removing some duplication 2017-10-02 23:01:26 -07:00
Jesse Vincent
d466c1fa63 Close a comment 2017-10-02 22:44:49 -07:00
Jesse Vincent
cb27773980 astyle 2017-10-02 22:43:48 -07:00
Jesse Vincent
c56b4da44b First pass at comments on the rest of the default sketch 2017-10-02 22:40:54 -07:00
Jesse Vincent
a10ddeaa50 comment much of the default sketch 2017-10-02 22:04:13 -07:00
Jesse Vincent
0e670bc7ab We're not actually exposing BootKeyboard yet. 2017-10-02 20:56:56 -07:00
Jesse Vincent
99c25e40da Move some LED color definitions to after the macro defnitions.
It seems a little clearer.
2017-10-02 20:01:34 -07:00
Jesse Vincent
556256aabe move the hopefully-going-away numpad keymap id definition closer to
where one can intuit why it's that number
2017-10-02 20:00:59 -07:00
Jesse Vincent
d84b937086 reorganize imports for a little more clarity 2017-10-02 20:00:25 -07:00
Jesse Vincent
d64810c9b2 whitespace 2017-10-02 19:56:01 -07:00
Jesse Vincent
ac0a2c5ab8 Refactor macro code to remove hand-coded numbers and make code a bit more readable 2017-10-02 19:34:57 -07:00
Jesse Vincent
2f0beee0db astyle 2017-10-02 19:00:25 -07:00
Jesse Vincent
3498d43e73 Remove a couple of C preprocessor macros involved in the definition of
keyboard macros, in the hope of making the code clearer
2017-10-02 18:59:44 -07:00
Jesse Vincent
55062b5382 DEBUG_SERIAL is unused. kill it 2017-10-02 18:58:54 -07:00
Jesse Vincent
6bdef3675b replace a magic seeming constant with a macro 2017-10-02 18:48:39 -07:00
Jesse Vincent
8bfd32d5b9 decompose a conditional to make it easier to read and refactor 2017-10-02 18:46:46 -07:00
Jesse Vincent
91ddf30b55 Kaleidoscope.setup no longer takes an argument 2017-10-02 18:46:17 -07:00
Jesse Vincent
f881a1b192 change the name of a compiler macro to make it clear that it's an id 2017-10-02 18:44:23 -07:00
Jesse Vincent
b0e1c32113 rename our keymaps to be more consistent.
I feel weird about putting the name before the word 'keymap', but this
seems less confusing than explaining why KEYMAP_QWERTY and
KEYMAP_STACKED are different kidns of entitites
2017-10-02 18:43:21 -07:00
Jesse Vincent
1257825f18 Merge pull request #14 from algernon/f/numlock-no-macro
Updated to use the new NumLock plugin.
2017-10-02 15:35:41 -07:00
Jesse Vincent
36796237bb add some notes to the end of the readme. Thanks to @Jennigma++ 2017-10-02 12:02:40 -07:00
Gergely Nagy
2a13e4a9c9 Updated to use the new NumLock plugin
The NumLock plugin works without a macro now, so we can simplify the factory
firmware by just using `Key_KeypadNumLock`.

Signed-off-by: Gergely Nagy <kaleidoscope@gergo.csillger.hu>
2017-10-01 01:18:59 +02:00
Jesse Vincent
0ee5a937a5 A couple explanatory notes suggested by Jennifer Leigh 2017-09-08 00:39:40 -04:00
Gergely Nagy
6f5cfeb9b3 Merge pull request #13 from cdisselkoen/improved-flashing-docs
Improve documentation related to flashing
2017-08-27 12:11:22 +02:00
Craig Disselkoen
2564d28fe3 Improve documentation related to flashing
In particular, add instructions for the Arduino IDE
2017-08-24 21:31:52 -07:00
Jesse Vincent
971236f64e Point Makefile to new make rules 2017-08-21 21:59:10 -07:00
Gergely Nagy
d0e5e80479 Merge pull request #12 from algernon/f/led-api-update
Updated to use the new LEDMode/LEDControl APIs
2017-08-17 00:27:15 +02:00
Jesse Vincent
0738d12c8c
add a note about customizing the location of the Arduino install on Linux 2017-08-16 13:26:57 -07:00
Jesse Vincent
2b740c403e
slight makefile tweaks 2017-08-16 13:26:57 -07:00
Jesse Vincent
487e97accd
a bit more tweaking to the readme 2017-08-16 13:26:57 -07:00
Jesse Vincent
f5254600c6
Reorganize makefile to avoid suggestions that Arduino lets you customize
your sketchbook directory
2017-08-16 13:26:57 -07:00
Jesse Vincent
4b2be6fc2f
fix a path in the makefile 2017-08-16 13:26:57 -07:00