From 5d9aa17f23cccaf037939cc6945ba17b293089d6 Mon Sep 17 00:00:00 2001 From: sam Date: Fri, 9 Oct 2020 17:37:15 +0200 Subject: [PATCH] Add Led on for Launchpad --- libs/__pycache__/midix.cpython-38.pyc | Bin 14547 -> 14840 bytes libs/midix.py | 18 +++++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/libs/__pycache__/midix.cpython-38.pyc b/libs/__pycache__/midix.cpython-38.pyc index ebdb656abaf315dc30a298e08a3fa5e21766c88d..7337f112a9a37be05325e7dd7d53a516b7f95b71 100644 GIT binary patch delta 3316 zcmaJ@eQaA-6@T}>XZzW)oivGKJ9Zqq`LYwWO_MaFRXfJoLQx@wZi6YXMp3TYL{6RL z`b8S!nRE+-4p`Urlx8bPOIWwG`#_8g2-{#;8QY}sQMPGajZ}mL5{Qq#CQ%_FIOjg+ zqg6$u{NB0eo^$T`y65`c$?JvS-GP8l!@s_nV}oD1^Hea-cD&GWo_j{bUh(m-GI);z z8(kdHKU&Rt;6mt*P&{uiE&sml7Oto!SWZ95WE}n*>YKJr+bb$;kMKW&B9>>)6amX? zduCWz!>>8RL{L#);>>eVnd9<9%O|ST*CjTr$&2b0ov^lEYlfrcigj|1MYJ8BzEO~& zpkL?_4LxO1&Cql$r=hPqMGbum6L~UqD~UtGKnX6pRHTq2Qvz#LxSCpghjX84if=6*DGm4_ztjev=jmk$* zL~M`Up$Hr}!L9G};UKHDXJwnAc~RY!6TKc>a-#G)=LixpN-G{JB* zbZ^*-9OgMU%Ksbre&n|t(NqOpqLs2)_AQFO88R)}luWuT<5U^>n4pZxy=w;jn5-4r zom!?Ho{#Pil#GcXQOGbkiMM?5dNj;fJygY#X35<@Ze0 zgS%sIv-=?xk8fgCdYYN6T~EjE(t|9>{oG{u)f3Fe67FimTBDi!^_{$qgNScqC*WMX zfi1&QJk8F+ALHBh9=8nJh-z~#o6j@h%IWgBJO9Z_a?Wh7|L`CmUKratggHc|SEYl^-6#Amu%{hVh0kx5;Bjy~H%FP>qD9o2(XH zt7i3jJ*(&SOzjWr@L5l!^)VE%G>gr!J=(qBDC!osu_xzro8f^t-eeEDphJHm`U!E< z9+!glC?pI-6TIxaX)_!lT$(HL!li5($RS%_Nrb1}{mNa5PHOT|0*XeSM96sLDWXpk z0Kpl8Zxfs)@E~Lixu0lBK&6$l1hG{}5%mDVWy(Vk3C*A!)L{Vqj?_?w|3pq0NSMrY%g11Q>R&bFaK=|M@K*0!Naln}Vey{{v5MoQ+(d-HQkpjgme*Rv0iu7W?B_ zIM~#}OsMP#!=p_H19Xslj>H)H{?Dcus{vngs`q=uf0E!l!43jtl4Kqvq8!8lz zX04HNAzvW&ixg{&OkSs0{YaSH%?xfwVp}S-owU`@0B$fp_u<`^mmsrs5}MQPYzYpecRR`I zNBs=PGoMIzME8)EYAlo|9Un~uF5kfFeh#*07KT=J>sH*d=U<{L*jYb{yxD?twHG;#kwDA{~=Ns!J6g8TZq4i zJPT$!66{B+swDk+igsO91FEWTF8;OSGo1Ydc5L3tehOooH+8&>!UL5@veuxwCxg`9 z1$ha%rNHXtQ9XYKUf zx+q0F*%{W(oQA)5-`0GJm=6*x5v`w-Dqf9G zY8_r0H@-<#@I+5919-nD9jMe%P{q&XHK^FO-Tev~yn@Xb?kKs2N3z4Y5Xn$pG@LT> z5BSA5K6=B4!9&}i>etAVl?3k*JOk<81MDrhuQz?0a##hSd{sfH!d@mx6~u3dqMjV^ zt~Rgy6){i4wcdXAE^PY9UDFQ{vuC!8rjQc^*9a)$m1_=T&3^FrJ)LUt)%j|xYJ*8LX1dJ^vnH4_Z#PY( Lf@Y=JX1f0e5(4Xa delta 3184 zcmaJ@du&_P8NcVg?D&CFD9jH;>x2)8ku) z%FR3xwm;Sag>SqjtxHw{q@eMLpj)?Yr9l6HZH!G6@G_yX{Z(l~l`3ufi+$g*^C;>T zDZhKpcfa@R`rr9K9|_#!_j?rlv*O=N1n+t*5Md*)_B^W^U*mfpQsA-*YeQ; z3LcP8gI8|w^QtwOkg{27US*2y*~C}Uh`PVT$5=tJyj0ZM-I}qb{d>GaHmSSJqd))zZx|3tS5;b8g$uO>tB1Vp;^oMBfvI=1Q-tgt2~@O|~7f-#n;M%qB?3A={hWY-d3 ziQc3%VJ7A@?w|A8J|3M?WKj&>O8F@}QCDRLC)Kox3N9g|&-Ots92%;ZzFp%TMB!V@ zqNRFj;u_|sQzqG%M>metapi6$)&+kL-?4H_V~9mVVh0YZs3zErP&D!x%bFD?5pG3* z2bx-3Vt}p&{JiNsX2Y>aq*Lo+Zq}`JH673bETH;SHw$Pj%)?sD8pJxiUG-_VYVcNM zh#iOjM4H(N2sL-H3E0y-RNZdtjviJP3`bpL+(>J1t~ttFu-d#8LM;yzispFEw)SVw zGDXP;(6*wvSsiMuVU1cN6F)*qN+o*vPs1mw(6*8Omi3- z!xbY2(L7NM+jJDJPH9xUBW{Or4R?v#E?h4_q#FvzWa{JM+h|artBN>*5Oax#>HG-6 zqXZ`j9wT_1z=aUg#2s`N1VGTV4$;SbMnooHa`IiufLy3LMPEP4Of|TmMx{qA^cV&n6FB;#uMc=xJ-~ zIE}}mE0sH%wJjkVD5i_2>HQKxne)vpwFViv2FKf;YIu&`Jdd!f7qwI-AJ@5+17cC32;QG5TyAuDBnwfuH`*&`N6 zbdlg^1Um_&Nm3`sjiNV|N#^s1Eqgl0#mhu~jiPTNtDjT!K0LTplj*A4t1^#AoL+G{ z+VCp@3tRW?l0~Na#w&8ORyHx46Sn9fHPUTrgqRkuOx~BA$s{K-mSo76%DzP9@m8Sc zqq*$l%v2?ec1F!}D3Vg(WP1ZV*x6Mj)kwc+B*hY(>x@-)Q{+?@1;cJrv7od9k5%9&j*&DDUHX4-L#!*L1 zl{(_&DqP)OztuNpW$-*^-8Yl6ZXs22Qc(#h@-W&9;%)4fZ$Y&C`B16!q{x3=FMQe^ z+_~NX;ss<7%LMNb$P!V^)S*P!)J1fSz*;Na4SRdQe36JRNg}1|ARKHDL7?~RHLu_e zBiK;-s$_Z%$!RF`wy+ghaC$#Zp=>I+Ul#nGl@EHqp|aPZbz46>3kSA+rRSH(9Iu?R zY#c2dq6E!CUR*$G(SLY`OJZIQ$Vqr<+sH0y9F;5LIKhvJu_ABTV@d09E-N~SCgq!@mHxzgv$>&GYnPl;YCyu{E6TNxO2yTb_ss6qw6;5ybMVCEdzR=nEpVJ zBlsNwwPL(ty=TR{M0^Cak#Y6`d~@VL;XxuiMDRm`?-TrhKz1^Hj>QuMzbBw?MrrfW z8WZOUE)cv;AlriaR$M0dh~Q&_PY5WTVwHeGUHd4)a<32iZ+^~b_0+nnVfE&)*6ud{ E3q+mdu>b%7 diff --git a/libs/midix.py b/libs/midix.py index 8424b24..346f8b9 100644 --- a/libs/midix.py +++ b/libs/midix.py @@ -298,6 +298,7 @@ def MidinProcess(inqueue, portname): print() #print(debug) print("NOTE ON :", "Channel", MidiChannel, "note :", MidiNote, 'velocity :', MidiVel ) + NoteOn(MidiNote, MidiVel, "pads" , midichannel=MidiChannel) # redis key : "/midi/noteon/midichannel" value : "note/velocity" if r.set("/midi/noteon/"+str(MidiChannel), str(MidiNote)+"/"+str(MidiVel))==True: @@ -342,6 +343,7 @@ def MidinProcess(inqueue, portname): MidiNote = msg[1] print("NOTE_off channel :", MidiChannel, "note :", MidiNote) + NoteOff(MidiNote, "pads" , midichannel=MidiChannel) # redis key : "/midi/noteon/midichannel" value : "note" if r.set("/midi/noteoff/"+str(MidiChannel), str(MidiNote)) ==True: @@ -365,6 +367,7 @@ def MidinProcess(inqueue, portname): #print("channel", MidiChannel, "CC :", msg[1], msg[2]) print("CC channel : "+str(msg[0]-175-1)+" CC :"+str(msg[1])+" value : "+str(msg[2])) + cc(MidiChannel, msg[1], msg[2], "pads" ) # redis key : "/midi/cc/midichannel/ccnumber" value : "ccvalue" if r.set("/midi/cc/"+str(MidiChannel)+"/"+str(msg[1]),str(msg[2]))==True: if debug == "True": @@ -452,10 +455,13 @@ def NoteOn(note, color, mididest, midichannel=0): elif mididest == "all" and midiname[port].find(mididest) != 0: midiport[port].send_message([NOTE_ON+midichannel, note, color]) + elif mididest == "pads" and midiname[port].find("Launchpad") > -1: + midiport[port].send_message([NOTE_ON+midichannel, note, color]) -def NoteOff(note, mididest): + +def NoteOff(note, mididest, midichannel=0): global MidInsNumber @@ -467,7 +473,10 @@ def NoteOff(note, mididest): # To All elif mididest == "all" and midiname[port].find(mididest) == -1: - midiport[port].send_message([NOTE_OFF, note, 0]) + midiport[port].send_message([NOTE_OFF, note, 0]) + + elif mididest == "pads" and midiname[port].find("Launchpad") > -1: + midiport[port].send_message([NOTE_OFF, note, 0]) @@ -737,7 +746,7 @@ def MidiMsg(midimsg, mididest): desterror = -1 - print("jamidi3 got midimsg", midimsg, "for", mididest) + print("midi3 got midimsg", midimsg, "for", mididest) for port in range(len(OutDevice)): # To mididest @@ -747,6 +756,9 @@ def MidiMsg(midimsg, mididest): midiport[port].send_message(midimsg) desterror = 0 + elif mididest == "pads" and midiname[port].find("Launchpad") > -1: + midiport[port].send_message(midimsg) + if desterror == -1: print("mididest",mididest, ": ** This midi destination doesn't exists **")