Merge branch 'master' of https://github.com/narcode/codeklavier-python

Author: narcode

ACTIVITIES.md

@@ -7,7 +7,7 @@ September 2018: Performance at the [Huygens Festival](https://huygensfestival.nl
 August 2018: CodeKlavier paper and performance will be presented at the [International Computer Music Conference](https://icmc2018.org/) in Daegu, Korea! In the proceedings you can find our first CodeKlavier published paper.
 
 June 2018: Performance and lecture-demonstration at MuSA 2018 at IMWI Karlsruhe, Germany. Our presentation includes a special CodeKlavier "presentation mode" where we use various CodeKlavier piano techniques to live code the presentation. This event will also feature a performance of Huygbrid and a more developed version of the CKalculator.
-There was also a performance of Huygbrid (previously Hybrid) and CKalculator at Ephemere in Studio Loos, Netherlands.
+There was also a performance of Huygbrid (previously Hybrid) and CKalculator at Ephemere in Studio Loos, Netherlands. Watch the video of CKalculator [here](https://youtu.be/Ea4pUYqb8BA).
 
 May 2018: Performance of two new prototypes, Hybrid and CKalculator at WORM in Rotterdam as part of the Algo~rhythms series. 
 

default_setup.ini

@@ -1,11 +1,11 @@
 [midi]
 port: 2
-device_id: 176
-noteoff_id: 0
+device_id: 144
+noteoff_id: 128
 
 [snippets]
 #Ndef(~name.next,{|pitch=420,fx=88| SinOsc.ar(456*LFTri.kr(fx).range(100, pitch)) * EnvGen.kr(Env.perc) * ev.amp}).play(0,2);(1/ev.rit).wait;}}).play(~ts, quant:0).envir = (rit: ~tremoloL, amp: 0.036);
-snippet1 : ~snippet1 = Ndef(\piano_fx, {|dec=40, amp=0.01, rate=1| GVerb.ar(HPF.ar(SoundIn.ar(0,2), 9), 109, dec)*LFTri.kr(rate)*amp}).play(0,2)
+snippet1 : ~snippet1 = Ndef(\piano_fx, {|dec=40, amp=0.01, rate=1| GVerb.ar(HPF.ar(SoundIn.ar(2,2), 9), 109, dec)*LFTri.kr(rate)*amp}).play(0,2)
 
 
 mini_snippet_hi_1: Ndef(\piano_fx).map(\dec, Ndef(\krm1_d)); ~tremoloH1;

hybrid/hybrid.py

@@ -479,7 +479,7 @@ def ck_loop(prototype='hello world'):
     codeK_thread.open_port(myPort)
 
     print('port', myPort)
-    
+
     #go to the end of the codespace screen
     mapping.goDown()
 
@@ -491,7 +491,7 @@ def ck_loop(prototype='hello world'):
                 if msg:
                     message, deltatime = msg
 
-                    if message [0] != 254:
+                    if message[0] != 254 and message[0] != 208:
                         if message[2] > 0: #only noteOn
                             if (message[0] == device_id):