Commit Graph

372 Commits (partial-rewrite)

Author SHA1 Message Date
Ben Blazak c6d9875d5d (working on key definitions) 2013-04-04 01:20:19 -07:00
Ben Blazak b1b04419e1 (working) 2013-04-03 15:58:46 -07:00
Ben Blazak fb55fcfb7d (nighttime checkin: going to sleep) 2013-04-01 02:59:12 -07:00
Ben Blazak 2964e68840 wrote kf__chord__*__progmem() :) 2013-04-01 01:49:36 -07:00
Ben Blazak e036276dd0 (going to change a function) 2013-04-01 00:38:47 -07:00
Ben Blazak 02fd5471ae (intermediate) 2013-03-29 15:48:39 -07:00
Ben Blazak 7eec5fb237 (lots of work) 2013-03-26 23:16:24 -07:00
Ben Blazak b37f69824c (removed some stuff) 2013-03-18 22:07:02 -07:00
Ben Blazak b63e4ef0f0 (about to remove some things) 2013-03-18 21:31:39 -07:00
Ben Blazak 38e3ff49f8 (still working) 2013-02-18 18:01:42 -08:00
Ben Blazak a4696d8641 (intermediate checkin) 2013-02-01 02:18:27 -08:00
Ben Blazak ad0ff14ca6 (intermediate checkin) 2013-01-29 21:59:20 -08:00
Ben Blazak 1db6d4dd37 (intermediate checkin) 2013-01-29 21:34:46 -08:00
Ben Blazak 94e18d611d (intermediate checkin) 2013-01-27 00:00:47 -08:00
Ben Blazak 35bfca3662 (intermediate checkin) 2013-01-25 00:04:05 -08:00
Ben Blazak 0129fcae47 (intermediate checkin; things are coming along!) 2013-01-22 16:33:07 -08:00
Ben Blazak be26a411f2 (intermediate checkin) 2013-01-21 23:33:08 -08:00
Ben Blazak f70568c1c0 intermediate checkin 2013-01-10 03:08:25 -08:00
Ben Blazak 9bb6198878 intermediate checkin 2013-01-09 02:29:30 -08:00
Ben Blazak c85dfd2aa6 intermediate checkin: LOTS of things still changing 2013-01-08 19:05:26 -08:00
Ben Blazak b409cf1b1e (still working on the rewrite) 2012-12-29 01:47:38 -08:00
Ben Blazak b5e3c41751 minor doc update 2012-12-26 21:34:02 -08:00
Ben Blazak f6aa18498a very much in progress, rewriting in C
- decided to see if i could keep it in just C... i think that'll be
  easier, long run.  it does need a rewrite though, in a few respects

- this mid-stride checkin is because i'm leaving to visit santa barbara
  tomorrow (just for the day) and i want to make sure 1) my code is
  backed up, and 2) my code is available in case i wish to show it to
  anyone (lol :) since i'm not bringing my laptop)
2012-12-26 21:25:17 -08:00
Ben Blazak 88111197c3 (still working) 2012-12-22 01:00:21 -08:00
Ben Blazak 5ed574cd85 removed some more of the old files
(i may put some back, eventually, but right now i'm trying to clean
stuff out)
2012-12-20 15:24:43 -08:00
Ben Blazak 778e400868 started rewriting in C++ :) 2012-12-20 15:04:13 -08:00
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 0bf6ae747a (small doc fix) 2012-12-11 18:33:05 -08:00
Ben Blazak 32826ccf5b (small doc update) 2012-12-11 18:28:13 -08:00
Ben Blazak d9b908b9d0 (minor doc update) 2012-12-11 17:54:33 -08:00
Ben Blazak df79ed4d81 updated docs: github depricated binary downloads 2012-12-11 17:52:11 -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 e9bde255ee candidate for release with keyboard :)
Merge branch 'dev'
(updated docs - added some basic howtos)
2012-12-11 11:54:31 -08:00
Ben Blazak 632a5d0ba1 update documentation (added some basic howtos) 2012-12-11 11:53:46 -08:00
Ben Blazak a213898345 (cleaning up some small thing with the repo...)
Merge branch 'dev' of github.com:benblazak/ergodox-firmware into dev
2012-12-11 11:08:44 -08:00
Ben Blazak e47c119b5f candidate for release with keyboard :)
Merge branch 'dev'
(small catch-up merge)

- there may be a lot of these little merges for a little while, as we near the
keyboard group buy
2012-12-11 11:02:32 -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 cd5015fd60 candidate for release with keyboard :)
Merge branch 'dev'
- documentation update (mostly ./readme.md)
2012-12-10 18:34:12 -08:00
Ben Blazak 4c2cc8e5e9 updating documentation :)
(and a few minor changes)
2012-12-10 18:30:39 -08:00
Ben Blazak 11c77a15f7 candidate for release with keyboard :)
Merge branch 'dev'

- changed the way layers are handled!
- reorganized a bunch
- updated some documentation and such
- updated USB IDs
- now compiling in OS X (though it *should* still work in linux and
  windows (except the toplevel build script is unix only) - it's a bug
  if it doens't)
- toplevel build script now generates a lot more, including a bunch of
  information in JSON meant for the UI, and an html file thats a
  currently-very-bad picture of the layout that was compiled
2012-12-06 12:29:00 -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