wxcafe/Model01-Firmware
1
0
Fork 0
Code Releases Activity
174 Commits 1 Branch 0 Tags
Commit Graph

174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gergely Nagy
bf5dc6a151
Merge pull request #49 from algernon/h/numlock/quote-transparent 
Make the Quote transparent on the NUMPAD layer.
 2018-03-12 21:12:08 +01:00
Gergely Nagy
3b91ecfbf8 Make the Quote transparent on the NUMPAD layer. 
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>
 2018-03-10 14:37:51 +01:00
Jesse Vincent
af407cb51a
Merge pull request #47 from danbernier/alpha-square-color 
Use CRGB type for AlphaSquare color, so ints are in common order
 2018-03-08 18:49:26 -08:00
Dan Bernier
b6c8974487 Use CRGB type for AlphaSquare color, so ints are in common order 2018-03-08 21:21:25 -05:00
Ryan S. Brown
b446ec2ce6 Match wildcard usage between manual- and arduino-installed environments 
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.
 2018-03-05 09:29:17 -05:00
Jesse Vincent
b745a26c5a
Merge pull request #41 from algernon/f/host-powermanagement 
Add support for host power management (suspend & wakeup)
 2017-12-16 11:42:38 -08:00
Gergely Nagy
72035c14d0 Add support for host power management (suspend & wakeup) 
Signed-off-by: Gergely Nagy <algernon@keyboard.io>
 2017-12-16 20:31:53 +01:00
Jesse Vincent
709aaa2354 Add a big warning when you build by hand and have multiple copies of 
kaleidoscope installed
 2017-12-15 21:07:30 -08:00
Michael Richters
6f7a9d09f5 Updated definition of keymaps[] to use KEYMAPS() macro 
This change will enable the `layer_count` variable for preventing
reading past the end of the `keymaps[]` array.
 2017-11-30 12:59:58 -06:00
Jesse Vincent
cd2f939adc Now that 'Consumer_Mute' is no longer blocked by 'is_internal', we can 
switch back to using it, to get a working mute toggle on linux, windows
and osx.
 2017-11-13 18:14:08 -08:00
Jesse Vincent
8e1c9d0111 astyle fixes 2017-11-13 18:06:11 -08:00
Jesse Vincent
7d141644a6 Swap the order of the Numpad and Fn layers, so it's possible to get to 
arrow keys if you have the numpad on.
 2017-11-13 17:56:23 -08:00
Jesse Vincent
b11b839b08
Merge pull request #34 from Jennigma/patch-3 
Make the pointer to the wiki LOUD
 2017-11-12 23:54:28 -08:00
Jesse Vincent
a457f37155 Switch from the NumLock library to the NumPad library. 
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
 2017-11-12 23:23:47 -08:00
Jennifer Leigh
27a44faaaf
Make the pointer to the wiki LOUD 
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. :-)
 2017-11-05 05:43:12 -08:00
Jesse Vincent
8f5851138c
Merge pull request #31 from gedankenexperimenter/merlin 
Changed minimum Arduino version to 1.6.10, as discussed on forums
 2017-10-31 19:33:40 -07:00
Michael Richters
fbea981057 Changed minimum Arduino version to 1.6.10, as disussed on forums 2017-10-31 21:23:56 -05:00
Jesse Vincent
76f5a59a78 Quiet down a warning in the makefile 2017-10-24 22:59:23 -07:00
Gergely Nagy
e6f5423a12 Merge pull request #25 from ackintosh/trailing-slash 
Fix trailing slash
 2017-10-22 13:16:12 +02:00
akihito.nakano
7b54271566 Fix trailing slash 2017-10-22 20:03:49 +09:00
Gergely Nagy
8ab156655a Merge pull request #24 from malsyned/patch-1 
Fix link to Linux Arduino install instructions
 2017-10-19 23:12:04 +02:00
Dennis Lambe Jr
2549b852d4 Fix link to Linux Arduino install instructions 2017-10-19 17:00:57 -04:00
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