diff --git a/software/apps/Processing/Music/Music_Controls_4/Controller_Functions.pde b/software/apps/Processing/Music/Music_Controls_4/Controller_Functions.pde index 92a5820..6546fe7 100644 --- a/software/apps/Processing/Music/Music_Controls_4/Controller_Functions.pde +++ b/software/apps/Processing/Music/Music_Controls_4/Controller_Functions.pde @@ -226,7 +226,7 @@ void detune1(int val) int knob = 2; if(knobValue[knob] != val) { knobValue[knob] = val; - if(printChange) println(knobName[knob] + " is: " + knobValue[knob]); + if(printChange) println(knobName[knob] + " is: " + map(knobValue[knob],0,127,-100,100)*0.0005946); sendControlChange((byte)0, (byte)knobMidiCC[knob], (byte)knobValue[knob]); } } @@ -236,7 +236,7 @@ void gain1(int val) int knob = 3; if(knobValue[knob] != val) { knobValue[knob] = val; - if(printChange) println(knobName[knob] + " is: " + knobValue[knob]); + if(printChange) println(knobName[knob] + " is: " + knobValue[knob]/127.0); sendControlChange((byte)0, (byte)knobMidiCC[knob], (byte)knobValue[knob]); } } @@ -288,7 +288,7 @@ void detune2(int val) int knob = 8; if(knobValue[knob] != val) { knobValue[knob] = val; - if(printChange) println(knobName[knob] + " is: " + knobValue[knob]); + if(printChange) println(knobName[knob] + " is: " + map(knobValue[knob],0,127,-100,100)*0.0005946); sendControlChange((byte)0, (byte)knobMidiCC[knob], (byte)knobValue[knob]); } } @@ -298,7 +298,7 @@ void gain2(int val) int knob = 9; if(knobValue[knob] != val) { knobValue[knob] = val; - if(printChange) println(knobName[knob] + " is: " + knobValue[knob]); + if(printChange) println(knobName[knob] + " is: " + knobValue[knob]/127.0); sendControlChange((byte)0, (byte)knobMidiCC[knob], (byte)knobValue[knob]); } } @@ -349,7 +349,7 @@ void detune3(int val) int knob = 14; if(knobValue[knob] != val) { knobValue[knob] = val; - if(printChange) println(knobName[knob] + " is: " + knobValue[knob]); + if(printChange) println(knobName[knob] + " is: " + map(knobValue[knob],0,127,-100,100)*0.0005946); sendControlChange((byte)0, (byte)knobMidiCC[knob], (byte)knobValue[knob]); } } @@ -359,7 +359,7 @@ void gain3(int val) int knob = 15; if(knobValue[knob] != val) { knobValue[knob] = val; - if(printChange) println(knobName[knob] + " is: " + knobValue[knob]); + if(printChange) println(knobName[knob] + " is: " + knobValue[knob]/127.0); sendControlChange((byte)0, (byte)knobMidiCC[knob], (byte)knobValue[knob]); } } diff --git a/software/apps/Processing/Music/Music_Controls_4/Music_Controls_4.pde b/software/apps/Processing/Music/Music_Controls_4/Music_Controls_4.pde index dbcb920..91ca968 100644 --- a/software/apps/Processing/Music/Music_Controls_4/Music_Controls_4.pde +++ b/software/apps/Processing/Music/Music_Controls_4/Music_Controls_4.pde @@ -33,8 +33,8 @@ void setup() { //println(RWMidi.getInputDeviceNames()); input = RWMidi.getInputDevices()[0].createInput(this); - //println(Serial.list()); - port0 = new Serial(this, Serial.list()[12], 9600); + println(Serial.list()); + port0 = new Serial(this, Serial.list()[0], 9600); } diff --git a/software/apps/Processing/Music/Music_Controls_4/knobValues.txt b/software/apps/Processing/Music/Music_Controls_4/knobValues.txt index 1ee6ed7..0a7593d 100644 Binary files a/software/apps/Processing/Music/Music_Controls_4/knobValues.txt and b/software/apps/Processing/Music/Music_Controls_4/knobValues.txt differ diff --git a/software/lib/MMM/examples/Music/_8_midi/_8_midi.ino b/software/lib/MMM/examples/Music/_8_midi/_8_midi.ino old mode 100644 new mode 100755