Commit Graph

114 Commits (43ee200b2b6e2e234ee8d13d8824e1d5068ba7d0)

Author SHA1 Message Date
Ben Blazak 8ea3ea5230 fixed layout bug ('period' on numpad layer)
'_dec_kp' (the keydoce for keypad decimal) doesn't appear to work...
2012-12-20 00:22:06 -08:00
Ben Blazak 0f474132f5 fixed layer bug 2012-12-11 17:20:42 -08:00
Ben Blazak b102e2bd4f updated toplevel build script :)
- also fixed a small error in the colmak layout, which was there because
  it had been in the qwerty and dvorak layouts until *very* recently.
2012-12-11 16:39:27 -08:00
Ben Blazak a6846f7e68 Merge branch 'master' of git://github.com/jjt/ergodox-firmware into dev
------- jjt -------
I increased the spacing of the layout sections and made all layers follow the
spacing for consistency.

I also made changes to the positions of the layer keys, added a number symbol
row on layer 1 (I found it easier to reach) and made a QWERTY layer, mostly for
gaming. And I switched the primary thumb buttons, also for gaming.
-------------------
2012-12-11 15:32:16 -08:00
Ben Blazak 63f1ee22df improved the svg/html layout description generator output 2012-12-11 15:10:45 -08:00
Jason Trill ba158565dc Converted tabs to spaces 2012-12-11 13:51:16 -08:00
Jason Trill c122a67db9 Added Colemak layout 2012-12-11 13:30:06 -08:00
Ben Blazak 8d3d17bb20 rotated the layout and matrix thumb groups 90 deg.
- per a suggestion from Jason Trill (jjt on github); after looking at it
  a while, i think it is a bit more natural.. :)
2012-12-11 11:01:18 -08:00
Ben Blazak 371ffad691 rotated the layout and matrix thumb groups 90 deg.
- per a suggestion from Jason Trill (jjt on github); after looking at it
  a while, i think it is a bit more natural.. :)
2012-12-11 10:50:47 -08:00
Ben Blazak 4c2cc8e5e9 updating documentation :)
(and a few minor changes)
2012-12-10 18:30:39 -08:00
Ben Blazak 27569dbb74 added dvorak layout (modified from the QWERTY one) 2012-12-06 12:24:41 -08:00
Ben Blazak 51e81d0b1c layout modifications
- and added a 'shift+press|release' kbfun
2012-12-04 16:11:01 -08:00
Ben Blazak 1b41491115 fixed layer and numpad bugs - appears to work!
- rewrote the layer functions in main() (easiest way to get the to
  work.. :) )
- fixed the keymap (i had the numpad keys pushing layer 2 instead of
  layer 3)
- changed the numlock keycode.. i was using the wrong one, lol
- and some minor aesthetic changes
2012-12-03 16:19:12 -08:00
Ben Blazak 52200b262f added a keyboard function layer; fixed small layer bug 2012-11-30 16:28:40 -08:00
Ben Blazak 7fa2155e05 changed the way layers are handled
note: NOT YET TESTED, only compiled
2012-11-30 12:06:41 -08:00
Ben Blazak dacc54fa1a layout/qwerty -> layout/qwerty-kinesis-mod
- NOT TESTED YET. still need to do that
- also, got an idea for layer masking...

possible future changes:
- i'd like to make the layer matrices just '_kb_layout_values', and
  '_kb_layout_functions'.
- i'd like to make layer masks implemented with a special function
  'kbfun_layermask_transparent' or something similar.  a function that
  looks up what would have been pressed if that layer wasn't active.
  they could be chainable, i.e. a lookup for such a function could end
  up calling the same function (if two layermasks were active on top of
  on another), which would then call a real key.  these wouldn't be
  allowed on the base layer, of course...  and then, all i'd have to do
  to keep track of layers would be keep a variable length array (or
  not...  maybe an array of length 10 or something) of which layer is
  active... :)
- i'd like to have a thing (this isn't a very complete thought yet)
  where keypresses are looked up first in the EEPROM, to see if there's
  a definition there.  if there isn't (which should usually be the case)
  then the standard definition for that key from the matrices would be
  used.  this would allow macros (and redefinitions) without reflashing.
  this would also be convenient, once the mechanism was implemented, for
  assigning keys multiple decomposable actions...  dunno exactly how
  it'll work out yet though.  layer stuff comes first.
2012-10-16 16:54:03 -07:00
Ben Blazak 467886299b made LED_BRIGHTNESS a makefile option 2012-10-12 10:29:50 -07:00
Ben Blazak df7bb3a7d2 working on layout graphic generator; almost there!
- also, additions to the ui-info.json file generator
- and probably some other small but useful things
2012-10-08 18:01:06 -07:00
Ben Blazak c330126076 misc; now compiling in os x
- also starting work on a new build script (to make an svg of the
  current layout, so it's easier to visualize)
2012-10-07 00:18:59 -07:00
Ben Blazak fe603948a9 wrote the ui-info generating script for Ben (aka OrangeJewce)
- also changed the kbfun function comments to be easier to parse
- also added running the generating script to the toplevel build process
2012-08-23 01:31:25 -07:00
Ben Blazak ee6481d97d (modified TODO) 2012-08-19 21:36:54 -07:00
Ben Blazak 10c1ef23c5 (adding options.h; somehow it got lost before...) 2012-08-19 21:35:44 -07:00
Ben Blazak b11d8780d9 updated matrix to match PCB; made pin direction an option
- rows are now 0..6, cols now 0..D (matching the pics Fredrik posted of
  his first flippable PCB)
- either rows or columns can now be the driving pins.  the option is in
  ".../keyboard/.../options.h"
2012-08-19 21:16:52 -07:00
Ben Blazak ff1708796b (changed the name of a header) 2012-08-19 13:42:43 -07:00
Ben Blazak 6e094a86d5 (updated TODO) 2012-08-11 17:14:57 -07:00
Ben Blazak a0fca378d5 (modified TODO) 2012-08-07 19:15:10 -07:00
Ben Blazak d7c1ffe0c4 removed linked lists; changed KBFUN_FUNCTION_ARGS handling
- linked lists need to be rewritten to be more memory efficient
- all kbfun functions are now of type `(void kbfun_...(void))`, and the
  arguments they need are passed via a group of global `main_arg_...`
  variables (and other `main_...` variables)
2012-08-06 15:57:23 -07:00
Ben Blazak ddade5b5dc reorganization (large one) (mostly moving files) 2012-07-31 14:48:31 -07:00
Ben Blazak f9b46c32bf (small doc change) 2012-07-22 21:08:01 -07:00
Ben Blazak 3328f02a62 modified for flippable PCB (as of 2012-07-15) 2012-07-22 19:30:20 -07:00
Ben Blazak 9e7af882a4 finished linked lists in lib!
and moved the header for common data types (from lib/data-types.h to
lib/data-types/common.h)
2012-07-16 18:45:04 -07:00
Ben Blazak 813569cfe0 updated toplevel license and readme
- new ergodox website
- clarification in licence indicating that parts of the project may not
  be under that license/copyright
  - currently the stuff in src/lib, and soon the stuff in contrib,
    (are|will be) under different copyrights, and possibly different
    licenses.
  - also, just so it's written down somewhere: some of my documentation
    may be considered derivative works of the specs|docs i was taking
    things from, but i hope i'm safe (fair use?).  i tried to make clear
    in each file where i got stuff though.
2012-07-15 17:45:58 -07:00
Ben Blazak b8224d25de updated USB vendor and product IDs 2012-07-15 17:16:15 -07:00
Ben Blazak a31b0fa507 modified docs a little about row/col assignments
and linked-list stuff still in progress
2012-07-11 16:06:08 -07:00
Ben Blazak 018b763423 changed numpad functions; linked-lists, etc. in progress
- the numpad functions are reorganized, and there are more of them now,
  so the numpad can be treated either as something that's toggled or
  something that's locked
- the numpad functions may need to be split into a separate file, to
  keep things pretty.  i'll look into it later.
- the linked-list functions are being written so that hopefully i can
  change the concept of how layers (with transitions and masking) are
  handled.  they're incomplete in this check in because i took a break
  to fix the numpad functions for dox
2012-07-08 17:54:23 -07:00
Ben Blazak b257e21a15 working on linked-lists (going to remove some functions) 2012-07-07 21:49:47 -07:00
Ben Blazak 4c23dbaf59 updated the ergodox circuit diagram svg 2012-07-06 01:52:54 -07:00
Ben Blazak ea56a08981 added linked lists in lib/data-types 2012-07-06 00:35:01 -07:00
Ben Blazak d4b9d88464 added a jump to bootloader key-function 2012-07-05 17:10:18 -07:00
Ben Blazak 039aba752b added numpad (and a private key-function for layer masking)
tested on breadboard.  appears to work!
2012-07-05 15:48:18 -07:00
Ben Blazak 6e087c7dd4 removed `kbfun_layer_set()` since it was redundant
it had no effective difference from `kbfun_layer_inc()`, because values
in the keycode matrix can only be positive (of type uint8_t)
2012-06-22 17:43:12 -07:00
Ben Blazak 49e3b5208a (small bug/typo fix) 2012-06-21 22:09:26 -07:00
Ben Blazak 06bfe3c037 separated kbfun_layer_inc_exec() and ...dec_exec()
also added another layer to _kb_layout_release[][][], mostly NULL, but
including at least one of each available kbfun*().  this way, all the
functions appear to be used, and none of them get optimised out by the
compiler
2012-06-21 20:42:56 -07:00
Ben Blazak d1fa583bb3 mostly kbfun*() changes and additions
- changed KBFUN_FUNCTION_ARGS again

- changed kbfun's
  - condensed `kbfun_press()` and `kbfun_release()` to `kbfun_press_release()`
  - added `kbfun_toggle()`, which toggles keycodes on or off
  - added `kbfun_layer_inc_dec_press_release()` which is like
    ...press_release(), except it increments the layer first (and
    decrements it on keyrelease)
  - added `_kbfun_exec_key()` (which is a public kbfun*(), but not for
    assignment to keycodes) for convenience.  used by main(), and
    currently 1 of the kbfun*()s.  it doesn't save a lot of code, but i
    think it makes things slightly easier to read.  not quite as elegant
    a solution as i'd like, but it might have to do

- changed keymap accordingly

- changed main()
  - now using `_kbfun_exec_key()` (instead of essentially inlining the code)
  - now sending the USB report once every cycle.  i was sending once for
    every keypress (lol, by mistake: what i meant to do was only send it
    if any keys had been pressed).
2012-06-20 16:56:24 -07:00
Ben Blazak 9f357ede2a ((removed something i'd forgotten)) 2012-06-16 23:21:20 -07:00
Ben Blazak 33b6cf6f47 (reverting after test)
i did want to save the test code though
2012-06-15 16:50:02 -07:00
Ben Blazak fe545d83d6 test: using indices to an array of fn ptrs in layout matrices
so that _kb_layout_press... and ...release... are of type uint8_t
instead of kbfun_funptr_t (saving 1 byte per key per layer per matrix =
40% of the total layout size).

this brings the total firmware size with 10 layers to 6574 bytes instead
of 8302 bytes.  the teensy 2.0 has 32256 bytes of flash.

i'm going to revert to the old way.  partly because the space savings
don't seem consequential compared to what we have to work with.  mostly
because doing it with an array separates the function pointer to macro
(or const var) correlation in qwerty.c, and because i then have to
extern the _kb_layout_functions[6] array in layout.h (or qwerty.h).

also, using an enum instead of macros with manually assigned numbers
corresponding to the array indices would be more error prone, i think,
because (since it has to be visible outside qwerty.c) it would have to
be declared in a header.

hopefully all that makes sense.  i'm in a bit of a hurry.  but look at
the code: i think, even with a bit of formatting help, it'd still look
less clean
2012-06-15 16:39:33 -07:00
Ben Blazak 068a3546f6 bug fixes, mostly; and other things
- addition to references.md

- keymap modification
  - now using 2 shifts => capslock
  - the previous capslock key -> tab
  - the previous tab key -> left bracket

- bug and omission fixes; notably:
  - _is_pressed() no longer changes the value of
    `keyboard_modifier_keys`, lol
  - kbfun_2_keys_capslock_press_release() now works.  (capslock doesn't
    register if left or right shift is pressed, so the shift state has
    to be stored, cleared, capslock pressed, and shift state restored)
  - main() no longer locally overwrites the value of `current_layer`
    before sending it to the kbfun.  (i didn't realize i was using the
    same variable name for two different things)

- improvements
  - kbfun_layer_inc() and ...dec() are now variable
2012-06-15 14:36:50 -07:00
Ben Blazak d1f17133c9 added lib/key-functions private header 2012-06-14 22:03:47 -07:00
Ben Blazak 28e198ee72 added set layer function; more lib/keyfunctions* changes 2012-06-14 22:02:57 -07:00