Commit Graph

4853 Commits

Author SHA1 Message Date
milestogo
2f677c24a8 working with preprocessor macros for babblepaste 2017-03-06 00:16:44 -08:00
Damien
24ec8f5097 Merge pull request #18 from qmk/master
Merge from qmk
2017-03-05 22:58:13 +01:00
Xyverz
fbbf618a46 Removed preceeding underscore from MASTER_RIGHT in config.h 2017-03-05 03:48:10 -08:00
skullydazed
615bfc4eca Merge pull request #1107 from qmk/clueboard_cleanup
Rework the clueboard keymaps
2017-03-04 10:34:01 -08:00
Xyverz
0d9bceb2fe Merge remote-tracking branch 'upstream/master' 2017-03-03 19:28:35 -08:00
Xyverz
68808b22c0 Final tweaks to my Kinesis keymap and readme 2017-03-03 19:27:24 -08:00
Jack Humbert
b042428d23 Merge pull request #1126 from folkert4/master
Various QOL changes to Espynn's keymap
2017-03-03 10:29:54 -05:00
Jack Humbert
4ab88f3a9e Merge pull request #1129 from unxmaal/unxmaal_spacefn
Layout: Spacebar long-press as fn, for GH60 and GH60 Satan boards
2017-03-03 10:29:19 -05:00
Jack Humbert
2a5d972004 Merge pull request #1130 from hot-leaf-juice/master
moar hotkeys
2017-03-03 10:28:55 -05:00
Trevor Joynson (trevorj)
515b4dd1f7 Allow to specify serial to dfu-util flash 2017-03-02 18:26:26 -08:00
Gabriel Young
0734f56940 add debug messages to audio 2017-03-02 12:28:12 -08:00
Gabriel Young
d11962aeb2 fix 'stop_all_notes' naming to be more consistent 2017-03-02 11:40:06 -08:00
Callum Oakley
61459ab5ba moar hotkeys 2017-03-02 11:40:25 +00:00
Eric Dodd
d35809a982 gh60 satan spacefn 2017-03-01 21:40:13 -05:00
Eric Dodd
a8a4927622 gh60 spacefn 2017-03-01 21:39:19 -05:00
milestogo
b80c97b712 clean up babblepaste 2017-02-28 23:27:49 -08:00
milestogo
0834c520c0 missed config.h stuck modifiers change 2017-02-28 21:54:35 -08:00
milestogo
748401e5c1 keymap and C6 audio testing 2017-02-28 21:53:42 -08:00
folkert4
71971e818f Various QOL changes:
Removed some unneeded keys from raise and lower layers
moved the + and = signs, backspace is now more intuitive
moved all the Function keys to CUSTOM layer
added ctrl alt del to CUSTOM layer
simplified the layout picture greatly
2017-02-28 17:49:42 -05:00
Jack Humbert
4c4cf3ca49 Merge pull request #1124 from jmdaly/roadkit_firmware
Add initial version of TheVan Keyboards Roadkit Firmware
2017-02-28 15:48:34 -05:00
Jack Humbert
72c5dd1c93 Merge pull request #1125 from cwhits/upstream
[Planck] Update default keymap for missing keys
2017-02-28 11:51:33 -05:00
Chris Helming
18ba21aa31 Update default maps for missing keys 2017-02-28 11:40:06 -05:00
John M Daly
e12b1a237c Add initial version of TheVan Keyboards Roadkit Firmware 2017-02-28 11:17:18 -05:00
Jack Humbert
4583955914 Merge pull request #1116 from hot-leaf-juice/master
keymap update
2017-02-27 22:18:55 -05:00
Jack Humbert
5bfeb229b8 Merge pull request #1119 from phongnh/master
Removes redundant {} which cause build failure when DEBUG_ACTION is set
2017-02-27 22:18:12 -05:00
Jack Humbert
b851b0b2ae Merge pull request #1121 from Leszek111/master
add layout
2017-02-27 22:17:36 -05:00
Gunther Gruber
38cf08697b small changes in guni.c keymap to work with new qmk_firmware packet 2017-02-27 09:55:24 +01:00
Gunther Gruber
c370c1e1f3 guni keymap 2017-02-27 09:49:06 +01:00
Xyverz
d91e09f116 Updates to the README.md 2017-02-26 19:49:10 -08:00
Xyverz
871ac5058a Minor changes to the keymap: Moved thumb-cluster ESC to Media and Keypad layers 2017-02-26 19:45:57 -08:00
bbbd49a175 Ammend readme.md 2017-02-27 00:27:57 +01:00
138b89e1a1 Add colemak_programmer 2017-02-27 00:16:55 +01: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
b911e1966f Fix redundant process_music.c in sources 2017-02-25 21:13:47 -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
nstickney
b69b214d52 making numbers more familiar 2017-02-25 22:04:21 -06:00
Gabriel Young
ea14ed122f Add basic layer to sample MIDI keycap 2017-02-25 19:37:33 -08:00
Gabriel Young
1000799d1e Factor basic note processing into respective processors 2017-02-25 19:25: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
Phong Nguyen
d0b4dcc82c Removes redundant {} which cause build failure when DEBUG_ACTION is set 2017-02-25 19:50:46 +07:00
nstickney
ebc6948e96 first two layers of ErgoDox Familiar completeC 2017-02-24 17:11:19 -06:00
nstickney
474f7ee3fd initial layer of familiar layout) 2017-02-23 22:24:32 -06:00
nstickney
498dfdd02c Merge https://github.com/qmk/qmk_firmware 2017-02-23 21:15:40 -06:00
nstickney
9b40dd796e familiar layout graphics, etc 2017-02-23 21:13:45 -06:00
Jack Humbert
c62f3bd74d Merge pull request #1118 from priyadi/promethium
Various keymap updates
2017-02-23 10:21:23 -05:00
Jack Humbert
352c0e7baa Merge pull request #1117 from priyadi/fix_unicode_map
Fix UNICODE_MAP input_mode problem
2017-02-23 10:20:47 -05:00
Priyadi Iman Nurcahyo
af29d0d094 Fix UNICODE_MAP input_mode problem 2017-02-23 18:17:12 +07:00
Priyadi Iman Nurcahyo
b27a8dea1b Merge branch 'master' into promethium 2017-02-23 18:11:59 +07:00
Priyadi Iman Nurcahyo
296b927e77 Fix UNICODE_MAP input_mode problem 2017-02-23 18:10:00 +07:00
Callum Oakley
b06961c38b updated readme 2017-02-22 12:26:13 +00:00