Mercurial > hg > beaglert

comparison projects/basic_sensor/render.cpp @ 7:ab396a08e962

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Victor Zappi <victor.zappi@qmul.ac.uk>
date Tue, 11 Nov 2014 15:31:01 +0000
parents 09f03ac40fcc
children a6beeba3a648
comparison
equal deleted inserted replaced
6:db025ec86c41 7:ab396a08e962
62 // is twice as high 62 // is twice as high
63 63
64 for(int n = 0; n < numAudioFrames; n++) { 64 for(int n = 0; n < numAudioFrames; n++) {
65 if(!(n % 2)) { 65 if(!(n % 2)) {
66 // Even audio samples: update frequency and amplitude from the matrix 66 // Even audio samples: update frequency and amplitude from the matrix
67 frequency = map((float)matrixIn[gSensorInputFrequency], 0, MATRIX_MAX, 100, 1000); 67 frequency = map((float)analogRead(gSensorInputFrequency, n/2), 0, MATRIX_MAX, 100, 1000);
68 amplitude = (float)matrixIn[gSensorInputAmplitude] / MATRIX_MAX; 68 amplitude = (float)analogRead(gSensorInputAmplitude, n/2) / MATRIX_MAX;
69 } 69 }
70 70
71 float out = amplitude * sinf(gPhase); 71 float out = amplitude * sinf(gPhase);
72 72
73 for(int channel = 0; channel < gNumChannels; channel++) 73 for(int channel = 0; channel < gNumChannels; channel++)