From 8a2656f420de865e944139e8d07e74bb90748384 Mon Sep 17 00:00:00 2001 From: Devine Lu Linvega Date: Sun, 9 Dec 2018 07:40:12 +1200 Subject: Fixed issue with E# --- README.md | 5 +++++ desktop/core/library/_midi.js | 3 +++ desktop/sources/scripts/terminal.js | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f278688..bfd3d7d 100644 --- a/README.md +++ b/README.md @@ -123,6 +123,11 @@ Orca operates on a base of 36 increments. Operators using numeric values will ty | **P** | **Q** | **R** | **S** | **T** | **U** | **V** | **W** | **X** | **Y** | **Z** | **\*** | | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 | +## TODOs + +- Implement MIDI CC. +- Implement OSC. + ## Extras - This application supports the [Ecosystem Theme](https://github.com/hundredrabbits/Themes). diff --git a/desktop/core/library/_midi.js b/desktop/core/library/_midi.js index 1aa09d4..18987e4 100644 --- a/desktop/core/library/_midi.js +++ b/desktop/core/library/_midi.js @@ -26,6 +26,7 @@ function OperatorMidi (orca, x, y, passive) { this.draw = false const notes = ['C', 'c', 'D', 'd', 'E', 'F', 'f', 'G', 'g', 'A', 'a', 'B'] + // 0 - 16 const channel = clamp(rawChannel, 0, 15) // 1 - 9 @@ -37,6 +38,8 @@ function OperatorMidi (orca, x, y, passive) { // 0 - 16 const length = clamp(this.listen(this.ports.haste.length, true), 1, 16) + if (note < 0) { return } + terminal.io.sendMidi(channel, octave, note, velocity, length) } diff --git a/desktop/sources/scripts/terminal.js b/desktop/sources/scripts/terminal.js index 96bb9cd..8173727 100644 --- a/desktop/sources/scripts/terminal.js +++ b/desktop/sources/scripts/terminal.js @@ -274,7 +274,7 @@ function Terminal (orca, tile = { w: 20, h: 30 }) { this.align = function () { this.el.style.marginTop = (((window.innerHeight - (terminal.size.height * terminal.size.ratio)) / 2) - 20) + 'px' } - + this.resize = function () { this.size.width = tile.w * orca.w this.size.height = tile.h * orca.h + (tile.h * 3) -- cgit v1.2.3