Commit Graph

113 Commits (ad73553aa9b33fca0276d250a2b47d8d6e809fd4)

Author SHA1 Message Date
Joe Wasson 8e1c3f410d Add split layout to more keyboards. 2017-08-26 10:34:07 -04:00
Jack Humbert d2ff66a985 Creates a layouts/ folder for keymaps shared between keyboards (#1609)
* include variables and .h files as pp directives

* start layout compilation

* split ergodoxes up

* don't compile all layouts for everything

* might seg fault

* reset layouts variable

* actually reset layouts

* include rules.mk instead

* remove includes from rules.mk

* update variable setting

* load visualizer from path

* adds some more examples

* adds more layouts

* more boards added

* more boards added

* adds documentation for layouts

* use lowercase names for LAYOUT_

* add layout.json files for each layout

* add community folder, default keymaps for layouts

* touch-up default layouts

* touch-up layouts, some keyboard rules.mk

* update documentation for layouts

* fix up serial/i2c switches
2017-08-23 22:29:07 -04:00
Mark Spanbroek 36709d6a30 Use cmd-left and cmd-right instead of ctrl-a and ctrl-e for home and end
The ctrl commands only seem to work well in terminal, not in other apps.
2017-08-21 17:01:27 -04:00
Mark Spanbroek 1ab9e5d1c9 Remove COMPACT_KEYMAP, use full KC_ keycodes instead. 2017-08-21 17:01:27 -04:00
Mark Spanbroek f4b3b576a0 Revert "Add COMPACT_KEYMAP macro to Satan GH60"
9a1826598a1a06d87459c5bbef9db9be277bdae9
2017-08-21 17:01:27 -04:00
Mark Spanbroek dc1d24a4fe Add screen lock key 2017-08-21 17:01:27 -04:00
Mark Spanbroek 0be483c762 Fix power; use keyboard shortcut for Mac 2017-08-21 17:01:27 -04:00
Mark Spanbroek cb719757c2 Reverse the split shift/fn
Turns out that 3c and 3d are not reversed when splitting the right
shift in the way that the Mark I layout does. Reversing it here, rather
than in the generic satan.h to avoid breaking the other layouts.
2017-08-21 17:01:27 -04:00
Mark Spanbroek d172d6bec6 Add Mark I layout 2017-08-21 17:01:27 -04:00
Mark Spanbroek 90b07a5be4 Add COMPACT_KEYMAP macro to Satan GH60 2017-08-21 17:01:27 -04:00
Mark Spanbroek af21fa63e5 Fix: add missing keys to Satan GH60 KEYMAP macro 2017-08-21 17:01:27 -04:00
Ben James 48e79cbe29 Create readme.md 2017-08-20 20:57:22 -04:00
Ben James 68dafc8382 Create Makefile 2017-08-20 20:57:22 -04:00
Ben James e0d9cc945f Create config.h 2017-08-20 20:57:22 -04:00
Ben James 7aa839915e Create keymap.c 2017-08-20 20:57:22 -04:00
skullY 4e73b0b8d7 Make the bulk of our keyboards match the readme.md standard 2017-08-16 20:36:59 -04:00
Gareth Pye 1fc9eabd08 Fixed a layout comment to match layout array 2017-08-06 20:08:37 -04:00
Jack Humbert b476d65b9c Update keyboards' rules.mk/Makefiles (#1442)
this may change some of the keyboards' default settings - if you experience anything odd, please check back to this commit
2017-06-30 16:09:52 -04:00
Jack Humbert 23c448b21d remove .hex, .PNG, .jpg 2017-06-11 22:16:42 -04:00
Jack Humbert a7ce482d14 remove the rest of the .pngs 2017-06-11 21:24:23 -04:00
Jack Humbert 04069c94cc Merge pull request #1297 from khogeland/satan-colemak
Colemak layout for GH60 Satan
2017-05-12 16:24:51 -04:00
Kevin Hogeland b767719fc8 Colemak layout GH60 Satan 2017-05-12 12:03:09 -07:00
Nikolaus Wittenstein 8ddbf7f59f Fix spelling of "persistent"
Fixes #1201.
2017-05-11 15:32:35 -04:00
Ole Anders 6de7e5d8dc typo removed {3 ... 2017-03-28 18:45:26 +02:00
Ole Anders 85cac39529 fixed capitalization issue (checkTime => checktime) 2017-03-28 18:41:04 +02:00
Ole Anders 411cd4fae2 moved checktime out of function 2017-03-28 17:30:15 +02:00
Ole Anders f504082f7f declaring checktime before the function it is used in. 2017-03-28 17:17:08 +02:00
Ole Anders 256abc64d5 fixed function to not accept any arguments.
As per Pramod's comment on stack overflow:

In C int foo() and int foo(void) are different functions. int foo()
accepts an arbitrary number of arguments, while int foo(void) accepts 0
arguments. In C++ they mean the same thing. I suggest that you use void
consistently when you mean no arguments.
2017-03-28 17:08:01 +02:00
Ole Anders 1b821eca66 removed varable trace option from makefile 2017-03-28 16:55:25 +02:00
Ole Anders 37b7539af3 slight cleanup as per recommendation 2017-03-28 16:52:56 +02:00
Ole Anders c72ca58528 Moved key_timer out of function. 2017-03-28 16:50:44 +02:00
Ole Anders 48dfc77718 removed a carriage return 2017-03-28 15:58:46 +02:00
Ole Anders 62faa20ef6 Merge remote-tracking branch 'refs/remotes/qmk/master' 2017-03-28 15:55:33 +02:00
Ole Anders d5ee0194ab fixed #1139 issues
A fix described by jackhumbert has been sorted out now.
2017-03-28 15:43:04 +02:00
Jack Humbert 7e37daa2ce Merge pull request #1112 from newsboytko/newsboytko/midi-keycodes
Flesh out MIDI support
2017-03-28 09:26:54 -04:00
Stephen Tudor dce3847ebb Use single _FUNC layer. Move RESET and base layout-changing keys to _FUNC. 2017-03-20 14:12:43 -04:00
Stephen Tudor 34c5f8094e Remove tap-dance. Raise will be accessed via holding shift while lower is active 2017-03-20 07:43:45 -04:00
Stephen Tudor b10d950708 Use normal backtick in ESC spot - I've mapped ESC to caps lock 2017-03-20 07:43:24 -04:00
Stephen Tudor 3399e39297 Fix shift tap-dance (can't use one-shot layer) 2017-03-20 07:26:28 -04:00
Stephen Tudor b19e34c81e Forsake spacefn in favor of left shift tapdance. Move media controls. 2017-03-10 16:10:05 -05:00
Stephen Tudor 5ae0cfeef5 Add smt keymap for Satan 'GH60' 2017-03-09 13:58:33 -05:00
Ole Anders 1968ec4c24 changed definitions on keymap.c in admiral strokers
Made a few changes to my own keymaps. (organisation)
2017-03-07 19:40:18 +01:00
Eric Dodd d35809a982 gh60 satan spacefn 2017-03-01 21:40:13 -05:00
Gabriel Young 976c856966 Update size estimates in the Makefile
MIDI_ENABLE = no

   text    data     bss     dec     hex filename
      0   17080       0   17080    42b8 satan_midi.hex

MIDI_ENABLE = yes
MIDI_BASIC undefined
MIDI_ADVANCED undefined

   text    data     bss     dec     hex filename
      0   19494       0   19494    4c26 satan_midi.hex

      +2414 bytes (vs. MIDI_ENABLE = no)

MIDI_ENABLE = yes
      0   20846       0   20846    516e satan_midi.hex

      +1352 bytes (vs. MIDI_ENABLE = yes, MIDI_BASIC off, MIDI_ADVANCED
off)

MIDI_ENABLE = yes
#define MIDI_BASIC
#define MIDI_ADVANCED

   text    data     bss     dec     hex filename
      0   21292       0   21292    532c satan_midi.hex

      +1798 bytes (vs. MIDI_ENABLE = yes, MIDI_BASIC off, MIDI_ADVANCED
off)

Conclusion:
    +2400 to 4200, depending on config
2017-02-25 21:38:35 -08:00
Gabriel Young a64ae10662 Update existing keymaps
Update existing keymaps to enable MIDI_BASIC functionality.  Also added
an option MIDI_ENABLE_STRICT to be strict about keycode use (which also
reduces memory footprint at runtime)
2017-02-25 20:41:13 -08:00
Gabriel Young ea14ed122f Add basic layer to sample MIDI keycap 2017-02-25 19:37:33 -08:00
Gabriel Young 525be99ee9 Split MIDI functionality into MIDI_BASIC and MIDI_ADVANCED
MIDI_ENABLE = no

   text	   data	    bss	    dec	    hex	filename
      0	  17080	      0	  17080	   42b8	satan_midi.hex

MIDI_ENABLE = yes
MIDI_BASIC undefined
MIDI_ADVANCED undefined

   text	   data	    bss	    dec	    hex	filename
      0	  19494	      0	  19494	   4c26	satan_midi.hex

MIDI_ENABLE = yes
#define MIDI_BASIC
MIDI_ADVANCED undefined

   text	   data	    bss	    dec	    hex	filename
      0	  19788	      0	  19788	   4d4c	satan_midi.hex

MIDI_ENABLE = yes
MIDI_BASIC undefined
#define MIDI_ADVANCED

   text	   data	    bss	    dec	    hex	filename
      0	  20846	      0	  20846	   516e	satan_midi.hex

MIDI_ENABLE = yes
#define MIDI_BASIC
#define MIDI_ADVANCED

   text	   data	    bss	    dec	    hex	filename
      0	  21140	      0	  21140	   5294	satan_midi.hex
2017-02-25 15:02:43 -08:00
Gabriel Young 64eecfc530 fix typos in keymap 2017-02-19 22:23:32 -08:00
Gabriel Young ed15973a3f Document size added by MIDI_ENABLE (~3800 bytes according to my experiments)
satan/keymaps/midi

MIDI_ENABLE = no

   text	   data	    bss	    dec	    hex	filename
      0	  17080	      0	  17080	   42b8	satan_midi.hex

MIDI_ENABLE = yes
#define MIDI_TONE_KEYCODE_OCTAVES 3 // default

   text	   data	    bss	    dec	    hex	filename
      0	  20846	      0	  20846	   516e	satan_midi.hex

MIDI_ENABLE = yes
#define MIDI_TONE_KEYCODE_OCTAVES 2 // fewer octaves

   text	   data	    bss	    dec	    hex	filename
      0	  20846	      0	  20846	   516e	satan_midi.hex
2017-02-19 17:45:08 -08:00
Gabriel Young d1fe24ad9f Allow customization of the number of tone keycodes and add example keymap 2017-02-19 17:18:05 -08:00