diff options
| author | Stephan Bösebeck <sb@caluga.de> | 2016-04-01 23:54:16 +0200 |
|---|---|---|
| committer | Stephan Bösebeck <sb@caluga.de> | 2016-04-01 23:54:16 +0200 |
| commit | aee8715815544b076c123d4ed55c76e23a7e54d0 (patch) | |
| tree | ea5beb11e41bf0cc0257f1a098b2218b48a83b84 /quantum | |
| parent | c274699085b2f922a5e8b14b21aa377249e62d29 (diff) | |
| parent | de904af36072f53d2354bff0ed36b63014ad0d61 (diff) | |
| download | qmk_firmware-aee8715815544b076c123d4ed55c76e23a7e54d0.tar.gz qmk_firmware-aee8715815544b076c123d4ed55c76e23a7e54d0.zip | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/keymap_midi.c | 4 | ||||
| -rw-r--r-- | quantum/template/README.md | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/quantum/keymap_midi.c b/quantum/keymap_midi.c index e37ea31039..ac45d25892 100644 --- a/quantum/keymap_midi.c +++ b/quantum/keymap_midi.c @@ -99,11 +99,11 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) if (record->event.pressed) { // midi_send_noteon(&midi_device, record->event.key.row, starting_note + SCALE[record->event.key.col], 127); - midi_send_noteon(&midi_device, 0, (starting_note + SCALE[record->event.key.col + offset])+12*(MATRIX_ROWS - record->event.key.row), 127); + // midi_send_noteon(&midi_device, 0, (starting_note + SCALE[record->event.key.col + offset])+12*(MATRIX_ROWS - record->event.key.row), 127); play_note(((double)261.626)*pow(2.0, -1.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)), 0xF); } else { // midi_send_noteoff(&midi_device, record->event.key.row, starting_note + SCALE[record->event.key.col], 127); - midi_send_noteoff(&midi_device, 0, (starting_note + SCALE[record->event.key.col + offset])+12*(MATRIX_ROWS - record->event.key.row), 127); + // midi_send_noteoff(&midi_device, 0, (starting_note + SCALE[record->event.key.col + offset])+12*(MATRIX_ROWS - record->event.key.row), 127); stop_note(((double)261.626)*pow(2.0, -1.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row))); } }
\ No newline at end of file diff --git a/quantum/template/README.md b/quantum/template/README.md index dc163a2f4b..39f9f59d10 100644 --- a/quantum/template/README.md +++ b/quantum/template/README.md @@ -15,7 +15,7 @@ Depending on which keymap you would like to use, you will have to compile slight To build with the default keymap, simply run `make`. ### Other Keymaps -Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create file named `<name>.c` and see keymap document (you can find in top README.md) and existent keymap files. +Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create file named `<name>.c` in the keymaps folder, and see keymap document (you can find in top README.md) and existent keymap files. To build the firmware binary hex file with a keymap just do `make` with `KEYMAP` option like: ``` |