Osamu Aoki
3a1ee48cda
Typo fix
2017-03-30 19:08:15 -07:00
Zay950
2366ebfbbd
Merge branch 'master' into to_push
2017-03-29 12:00:38 -07:00
skullydazed
23839b8c6d
Clarify the quantum license ( #1042 )
...
* Clarify the license for files we have signoff on
* Update against the currently signed off files
* Remove unused and not clearly licensed headers
* Replace an #endif I accidentally removed while resolving merge conflicts
2017-03-28 15:20:36 -07: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
Jack Humbert
fa09189195
Merge pull request #1162 from Khord/master
...
My customized keymap + some tunes for the song list
2017-03-28 09:17:16 -04:00
Travis La Marr
ddc036b69e
Refactor Bluetooth Handling
...
Refactored Bluetooth support to make adding new Bluetooth modules
easier in the future.
* Remove `OUT_BLE` key from QMK's keymap. `OUT_BT` is all we need now
as there's no difference anymore.
* Made BLUETOOTH_ENABLE build option legacy as not to break existing
keymaps (Falls back to existing EZ Key support if on)
* Removed `ADAFRUIT_BLE_ENABLE` build option
* Created new build option `BLUETOOTH` with module option (Currently
`AdafruitEZKey` & `AdafruitBLE`)
* Moved all LUFA bluetooth key/mouse events under `BLUETOOTH_ENABLE`
ifdef with selected modules output.
2017-03-24 12:53:55 -04:00
Dylan Khor
683754bce8
added custom tones
2017-03-16 04:11:47 +00:00
Jack Humbert
b794719952
Merge pull request #1090 from qmk/backlight_softpwm
...
Adds soft PWM backlight for non-timed ports
2017-03-15 11:17:07 -04:00
Lukas Stiebig
2aa079d93e
Left control and alt
...
Use the left control and the left alt key.
2017-03-08 20:41:35 +01: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
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
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
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
296b927e77
Fix UNICODE_MAP input_mode problem
2017-02-23 18:10:00 +07: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
Gabriel Young
ae0752dff5
expose midi_config
2017-02-19 16:43:45 -08:00
Gabriel Young
5e6097f015
add keycodes for transpose range
2017-02-19 16:43:43 -08:00
Gabriel Young
dd8f8e6bae
implement modulation
2017-02-19 16:43:02 -08:00
Gabriel Young
7c5e510fe2
add support for pedal cc messages
2017-02-19 16:42:45 -08:00
Gabriel Young
f67aefc522
remove disabled code
2017-02-19 16:42:04 -08:00
Gabriel Young
a4163466cb
Alternative version with a tone array
...
tone array:
text data bss dec hex filename
0 25698 0 25698 6462 satan_newsboytko.hex
0x6480 bytes written into 0x7000 bytes memory (89.73%).
note on array:
text data bss dec hex filename
0 25802 0 25802 64ca satan_newsboytko.hex
0x6500 bytes written into 0x7000 bytes memory (90.18%).
2017-02-19 16:42:04 -08:00
Gabriel Young
f2b2e05f12
clean up commented code
2017-02-19 16:42:04 -08:00
Gabriel Young
e405ab4bc6
initial implementation of polyphony using variable length array of notes on
2017-02-19 16:41:59 -08:00
Gabriel Young
5ae1411fc3
Expand MIDI key codes
2017-02-19 16:41:10 -08:00
Jack Humbert
db1e9a469a
helps to save before committing
2017-02-19 00:11:55 -05:00
Jack Humbert
c2239e6b96
merging
2017-02-19 00:04:14 -05:00
Jack Humbert
49e72632d2
remove more warnings
2017-02-16 13:13:38 -05:00
Jack Humbert
1ac5dc9e52
fix travis and reduce warnings
2017-02-16 11:37:46 -05:00
Jack Humbert
58823b4e03
fix weirdness with arm and mods
2017-02-15 23:20:35 -05:00
Jack Humbert
f89499e255
unique variable name
2017-02-15 18:14:07 -05:00
Jack Humbert
c2a9acffd7
publicise variables
2017-02-15 17:39:51 -05:00
Jack Humbert
1bb574fe48
add unicode common file, get names right
2017-02-15 17:09:47 -05:00
Jack Humbert
09add35e7f
add unicode common file, get names right
2017-02-15 17:09:35 -05:00
Jack Humbert
cbabb4d417
split up unicode systems into different files
2017-02-15 16:36:31 -05:00
Jack Humbert
6788cbd762
give error if both unicode/map are enabled
2017-02-15 12:39:58 -05:00
Jack Humbert
69ea10f9a9
adds layer tap toggle
2017-02-15 11:25:33 -05:00
Priyadi Iman Nurcahyo
8c93c5d9ab
Add keycodes to turn on, turn off and toggle faux clicky
2017-02-13 14:55:35 +07:00
Priyadi Iman Nurcahyo
c68e596f32
Implement faux-clicky feature
2017-02-13 08:03:07 +07:00
Jack Humbert
8d0fdf1008
adds soft pwm for non-timed ports
2017-02-12 11:29:42 -05:00
Jack Humbert
3f0b491fc0
Merge pull request #1082 from priyadi/right-side-dual-function
...
Implement tap mod dual role for right side mods.
2017-02-11 11:50:32 -05:00
Priyadi Iman Nurcahyo
b92515f139
Make room for 'loose keycodes' by halving UNICODE_MAP range
2017-02-11 00:36:08 +07:00
Priyadi Iman Nurcahyo
97816df7e7
Implement tap mod dual role for right side mods.
2017-02-10 06:06:59 +07:00
Jack Humbert
b4e30d3929
added functionality for just a port
2017-02-07 15:23:56 -05:00
Jack Humbert
13c394fba4
Merge pull request #1071 from dungdung/rgb_tweaks
...
RGB tweaks
2017-02-07 13:32:31 -05:00
Jack Humbert
c0c69a1a7c
Merge pull request #1068 from adzenith/master
...
Minor cleanup
2017-02-07 13:27:41 -05:00