Mercurial > hg > beaglert
changeset 486:7f8d1a3e4cef prerelease
Heavy scope can have arbitrary number of channels
| author | Giulio Moro <giuliomoro@yahoo.it> |
|---|---|
| date | Tue, 21 Jun 2016 15:18:13 +0100 |
| parents | 506a319c08cf |
| children | 7eefd4b3aec3 |
| files | examples/08-PureData/scope/_main.pd scripts/hvresources/heavy_render.cpp |
| diffstat | 2 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/examples/08-PureData/scope/_main.pd Tue Jun 21 15:17:38 2016 +0100 +++ b/examples/08-PureData/scope/_main.pd Tue Jun 21 15:18:13 2016 +0100 @@ -6,9 +6,9 @@ #X obj 267 175 noise~; #X obj 192 170 phasor~ 10; #X text 16 15 Bela Scope; -#X text 116 15 Make sure the IDE is running and then bring up the scope -in your browser http://192.168.7.2/scope/ You can log to the scope -by sending to dac~ 27 to 30; +#X text 11 46 Make sure the IDE is running ( ./ide.sh start ) and then +bring up the scope in your browser http://192.168.7.2/scope/ You can +log to the scope by sending to dac~ 27 to 30; #X connect 2 0 1 0; #X connect 3 0 1 1; #X connect 4 0 1 3;
--- a/scripts/hvresources/heavy_render.cpp Tue Jun 21 15:17:38 2016 +0100 +++ b/scripts/hvresources/heavy_render.cpp Tue Jun 21 15:18:13 2016 +0100 @@ -149,7 +149,6 @@ unsigned int hvMidiHashes[7]; // Bela Scope Scope scope; -const unsigned int gMaxScopeChannels = 4; unsigned int gScopeChannelsInUse; float* gScopeOut; @@ -394,7 +393,7 @@ for (k = 0, p1 = p0 + gLibpdBlockSize * gFirstScopeChannel; k < gScopeChannelsInUse; k++, p1 += gLibpdBlockSize) { gScopeOut[k] = *p1; } - scope.log(gScopeOut[0], gScopeOut[1], gScopeOut[2], gScopeOut[3]); + scope.log(gScopeOut); } }