9f5b4e1d7a
Merge branch 'master' of https://github.com/qmk/qmk_firmware into dual_audio
2017-06-27 14:21:42 -04:00
b82604dada
no glide
2017-06-27 14:20:53 -04:00
bfc73e90cf
working duopholy
2017-06-27 14:20:44 -04:00
eabf530a0e
b5 audio
2017-06-27 14:20:14 -04:00
b2979eba23
Adds parenthesis where they might be needed
...
Addresses #764
2017-06-27 12:55:18 -04:00
a25dbaad32
Create sv_SE Qwerty layout for ErgoDox
...
*NOTE:* it might still be desirable to set the software layout to sv_SE in your
OS.
Swedish (sv_SE) Qwerty layout for ErgoDox, based on the Default configuration
I have tried making this as close of a match I could between the [default
ErgoDox EZ configuration](https://ergodox-ez.com/pages/our-firmware ) and a
standard Swedish Qwerty layout.
Notable differences from default:
=================================
* There are three special character buttons (acute accent, circumflex/tilde and
apostrophe/asterisk) that don't have any buttons to map to naturally. I've put
these at other places:
* Acute accent (´) can be found in the lower left corner, conveniently
placed to reach for making an é.
* Apostrophe (') was put in the lower left corner, close to acute accent.
* Circumflex (^) and asterisk (*) was placed in the lower right corner.
* Tilde (~) and diaeresis (¨) I couldn't find a good place for, so I left
those out. I could only get the buttons to produce a single one of the
characters. How can I get it to work properly?
* The Alt button on right thumb was exchanged for AltGr (RAlt).
* I changed the backslash in the numpad (layer 1) for a minus. Thought it was
more sensible.
* I didn't find a good place for the "<>|" button, so that one was left out.
That is a problem that really needs to be resolved. Pipe can be found on layer
one, however.
2017-06-27 15:17:21 +02:00
61cdc9aaa4
Allow mod swapping for mod tap (MT) ( #1202 )
...
* allow mod swapping for mod tap
* quick include
* fix the mod swapping
* make changes consistent with action code
* fix bug
* re-enable no gui, etc
* fix binary comps
* solid logic
2017-06-26 18:54:01 -04:00
d1fb8d2296
Merge pull request #1431 from rai-suta/master
...
Bugg fix and add keymap for testing JIS_KEYCODE switch.
2017-06-25 21:31:10 -04:00
42e6ecc36b
Whitefox LED control ( #1432 )
...
* use new grave_esc functionality
* Port LED control from Ergodox Infinity to Whitefox
2017-06-25 21:30:40 -04:00
e740520b3f
Fix bug.
2017-06-26 00:24:32 +09:00
de833659ae
Merge pull request #1429 from fredizzimo/fixes_for_emulator
...
Minor fixes to support the emulator
2017-06-25 10:29:00 -04:00
1e6a3f9e17
Change M_2_PI to 2 * PI as it should be
2017-06-25 12:55:18 +03:00
582a6ac75c
Fix #1135 by changing the default to at90usb1286
2017-06-24 15:28:13 -07:00
5dae013ff8
Add JIS_KEYCODE layout for send_string()
2017-06-24 18:29:37 +09:00
f912c74fe7
Change inline to static inline
2017-06-24 00:34:16 +03:00
da19852964
Add function for getting the LCD backlight brightness
2017-06-24 00:34:16 +03:00
ff49259a1a
Include config.h from visualizer.h
2017-06-24 00:34:16 +03:00
6c9b4743f7
Include config.h before visualizer.h
2017-06-24 00:33:23 +03:00
51a86b85f3
Merge pull request #1361 from fredizzimo/ergodox_infinity_backlight
...
Add Ergodox Infinity backlight support
2017-06-18 10:15:02 -04:00
98316ef017
Added Grave Escape ( #1391 )
...
* added QK_GRAVE_ESC and KC_GESC
* fixed name
* Fixed keycode emnu
* Removed layer check, added left and right GUI mod detection for OSX GUI+~
2017-06-16 14:56:50 -07:00
7d5606085f
Correctly calculate backlight level
2017-06-16 02:05:15 +03:00
21fa16651c
Rename ES_RCRB to ES_RCBR for consistency reasons (left curly bracket is defined as ES_LCBR)
2017-06-12 21:44:40 +02:00
2c404cca12
Fix keymap definitions referencing inexistent macros
2017-06-12 21:43:34 +02:00
945f2f5916
Fixed rgblight_types.h
2017-06-11 12:30:48 -04:00
d4cd5dda5c
Added a build flag for using a custom rgblight driver
2017-06-11 12:30:48 -04:00
b51a0db6ed
Add backlight support to the default Ergodox Infinity animations
2017-06-03 22:04:10 +03:00
effffa33a5
Backlight level handling for the visualizer
2017-06-03 21:14:26 +03:00
a916f4e8b8
Let BACKLIGHT_ENABLE control the Infinity LEDs
2017-06-03 14:34:50 +03:00
606e13a47e
Prevent the recording of looping dynamic macros.
...
If a macro play key is inadvertently recorded in a dynamic macro
a loop is created and the macro will not terminate when played.
This should be prevented.
2017-06-01 16:29:58 +01:00
5393bc6f4e
switched to uint8 and 16
2017-05-29 21:25:50 -04:00
b3144112d3
removed need to set customtapping term 0. defaults to 0 already
2017-05-25 16:38:06 -04:00
7c8b166cce
changed -1 to 0 can't have negative unsigned ints 🤔
2017-05-25 16:29:57 -04:00
aeb3a34636
moved specific tap term to its own function
...
included custom_tapping_term in action struct
2017-05-25 16:26:30 -04:00
e695b5a33b
Added per case tapping term, updated FF-nikchi keymap.
2017-05-25 00:41:00 -04:00
eb660ef218
emoji support but
2017-05-15 01:52:45 -04:00
a1e156a3d2
dynamic_macro.h: Do not use backlight_toggle if backlight is disabled
...
Fixes #1199 .
2017-05-05 00:11:24 +02:00
10a7cd7e5a
dynamic_macro.h: Add debug logs
2017-05-04 23:57:22 +02:00
8e94c9b4cb
dynamic_macro.h: Make the documentation more clear
2017-05-04 22:39:02 +02:00
4b50ea15a9
dynamic_macro.h: Do not save the keys being held when stopping the recording
...
More specifically, we save them and then place the `macro_end` pointer
before them so they are essentially ignored and the other macro may
freely overwrite them.
2017-05-04 01:42:09 +02:00
436d661775
dynamic_macro.h: Fix an off-by-two error
...
We need to check whether we just passed the after-the-end point of the
other macro. Instead we were checking whether we are going to reach it
now.
2017-05-04 01:26:35 +02:00
5e2a999278
dynamic_macro.h: Always toggle the backlight twice as a notification
...
Apparently sometimes the backlight was toggled only once and it was left on.
2017-05-04 00:58:01 +02:00
40fe30e4d6
dynamic_macro.h: Ignore all the initial key releases
...
Right after the user initiates the macro recording, they usually need
to release some keys used to access the DYN_REC_START layers. It makes
sense to ignore them.
Note: The keys used to access the DYN_REC_STOP key are *not* ignored.
2017-05-04 00:14:38 +02:00
4ff40a551a
Add `DYN_REC_STOP` to dynamic macros
...
Dynamic macro functionality is modified to check for `DYN_REC_STOP`, so
that macro recording can be stopped with a designated key combination
(e.g. `qs` or anything) instead of mandating the use of a `_DYN` layer.
`_DYN` layer stopping can still be done by passing `DYN_REC_STOP` within
`process_record_user()`:
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
uint16_t macro_kc = (keycode == MO(_DYN) ? DYN_REC_STOP : keycode);
if (!process_record_dynamic_macro(macro_kc, record)) {
return false;
}
return true;
}
2017-04-30 19:21:44 +10:00
ffa4c72a89
Faux clicky bug fixes
2017-04-19 01:40:16 +07:00
5c251b5575
Fix buffer overrun in lcd_keyframes
...
This would often cause the keyboard to crash when restarting the
computer.
2017-04-13 21:40:06 +03:00
109ae2f1e8
Fix warnings in process_printer
2017-04-13 16:00:29 +03:00
f7b59427fa
Fix name collision between ChibiOS and keymap_german
2017-04-13 16:00:29 +03:00
6535804776
Disable array bounds warning in keymap_function_id_to_action
2017-04-13 16:00:29 +03:00
a4ef86034c
Fix undefined eeprom warnings in unicode processing
2017-04-13 16:00:29 +03:00
c5d2b7ff16
Rename led test to led_keyframes and move animation to Ergodox
2017-04-09 18:34:59 +03:00
c6ca996f4e
Combine startup and resume animations
2017-04-09 18:34:59 +03:00
3074269c4a
Move the logo drawing keyframe to lcd_keyframes
2017-04-09 18:34:59 +03:00
df67169d42
Move LCD logo to visualizer resources
2017-04-09 18:34:59 +03:00
3eb8785e87
Add automatic flush for the LCD screen
2017-04-09 18:34:59 +03:00
b7041d06ae
Move common visualizer keyframes into visualizer_keyframes.h
2017-04-09 18:34:59 +03:00
64d63ab422
Remove the need to manually enable the visualizer
2017-04-09 18:34:59 +03:00
1e7585e767
Separated backlight and LCD disable/enable
...
Also moved them to correct places
2017-04-09 18:34:59 +03:00
5ba228b684
Move LCD backlight keyframes to its own file
2017-04-09 18:34:59 +03:00
5815c5d317
Move LCD keyframes to its own file
2017-04-09 18:34:59 +03:00
05530b193f
Delete visualizer example integration
...
It's much better to refer to the actual code than to to try to
keep some examples up to date.
2017-04-09 18:34:59 +03:00
05bc4880dd
Tweaks to the Ergodox default visualizer
...
No animation, display led statuses and layer name on the same screen
Don't display layer bitmap
Fully saturated colors for caps, less saturated ones normally
2017-04-09 18:34:59 +03:00
5fbaf31dc2
Brightness for Ergodox Infinity emulated LEDs
2017-04-09 18:34:59 +03:00
39385144e7
Emulate Ergodox EZ leds by LCD colors
2017-04-09 18:34:59 +03:00
9a4ce28683
Display layer bitmap and keyboard led states on the LCD
2017-04-09 18:34:59 +03:00
f113f95440
Move CIE1931 and breathing tables to its own file
2017-04-09 18:34:59 +03:00
503565d174
Only re-send matrix every 5ms
...
The previous 1ms value was too often, and wouldn't always leave
time for the visualizer
2017-04-09 18:34:59 +03:00
f5c8941652
UGFX is compiled once per keyboard instead of keymap
2017-04-09 18:34:59 +03:00
aee9b10e92
Add a keyboard specific visualizer
2017-04-09 18:34:59 +03:00
de52bd5d89
quick fix for space cadet shift
2017-04-03 12:42:58 -04:00
d1e66e2e07
Worked around some new Makefile issues.
2017-03-30 20:10:34 -07:00
7e54332890
Pulling and pushing troubles
2017-03-30 19:15:43 -07:00
3a1ee48cda
Typo fix
2017-03-30 19:08:15 -07:00
2366ebfbbd
Merge branch 'master' into to_push
2017-03-29 12:00:38 -07:00
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
7e37daa2ce
Merge pull request #1112 from newsboytko/newsboytko/midi-keycodes
...
Flesh out MIDI support
2017-03-28 09:26:54 -04:00
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
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
683754bce8
added custom tones
2017-03-16 04:11:47 +00:00
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
2aa079d93e
Left control and alt
...
Use the left control and the left alt key.
2017-03-08 20:41:35 +01:00
0734f56940
add debug messages to audio
2017-03-02 12:28:12 -08:00
d11962aeb2
fix 'stop_all_notes' naming to be more consistent
2017-03-02 11:40:06 -08:00
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
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
ea14ed122f
Add basic layer to sample MIDI keycap
2017-02-25 19:37:33 -08:00
1000799d1e
Factor basic note processing into respective processors
2017-02-25 19:25:33 -08:00
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
352c0e7baa
Merge pull request #1117 from priyadi/fix_unicode_map
...
Fix UNICODE_MAP input_mode problem
2017-02-23 10:20:47 -05:00
296b927e77
Fix UNICODE_MAP input_mode problem
2017-02-23 18:10:00 +07:00
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
d1fe24ad9f
Allow customization of the number of tone keycodes and add example keymap
2017-02-19 17:18:05 -08:00
ae0752dff5
expose midi_config
2017-02-19 16:43:45 -08:00
5e6097f015
add keycodes for transpose range
2017-02-19 16:43:43 -08:00
dd8f8e6bae
implement modulation
2017-02-19 16:43:02 -08:00
7c5e510fe2
add support for pedal cc messages
2017-02-19 16:42:45 -08:00
f67aefc522
remove disabled code
2017-02-19 16:42:04 -08:00
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
f2b2e05f12
clean up commented code
2017-02-19 16:42:04 -08:00
e405ab4bc6
initial implementation of polyphony using variable length array of notes on
2017-02-19 16:41:59 -08:00
5ae1411fc3
Expand MIDI key codes
2017-02-19 16:41:10 -08:00
Jack Humbert
Andreas Lindhé
Ethan Madden
rai-suta
Fred Sundvik
skullY
jamesofarrell
Víctor
Luiz Ribeiro
Daniel Shields
Nick Choi
Wojciech Siewierski
Weiyi Lou
Priyadi Iman Nurcahyo
nielsenz
nielsenz
Osamu Aoki
Zay950
skullydazed
Travis La Marr
Dylan Khor
Lukas Stiebig
Gabriel Young