comparison projects/basic_analog_output/render.cpp @ 13:6adb088196a7

Fixed ADC bug; added a simple passthrough test

 const float kAmplitudeRange = MATRIX_MAX - kMinimumAmplitude;
 
 float gFrequency;
 float gPhase;
 float gInverseSampleRate;
-
-int gMatrixChannels;
 
 // initialise_render() is called once before the audio rendering starts.
 // Use it to perform any initialisation and allocation which is dependent
 // on the period size or sample rate.
 //

 	if(numMatrixFramesPerPeriod == 0) {
 		rt_printf("Error: this example needs the matrix enabled\n");
 		return false;
 	}
 
-	gMatrixChannels = numMatrixChannels;
 	gInverseSampleRate = 1.0 / matrixSampleRate;
 	gPhase = 0.0;
 
 	return true;
 }

 			uint16_t *matrixIn, uint16_t *matrixOut)
 {
 	for(int n = 0; n < numMatrixFrames; n++) {
 		// Set LED to different phase for each matrix channel
 		float relativePhase = 0.0;
-		for(int channel = 0; channel < gMatrixChannels; channel++) {
+		for(int channel = 0; channel < gNumMatrixChannels; channel++) {
 			float out = kMinimumAmplitude + kAmplitudeRange * 0.5f * (1.0f + sinf(gPhase + relativePhase));
 			if(out > MATRIX_MAX)
 				out = MATRIX_MAX;
 
-			matrixOut[n * gMatrixChannels + channel] = (uint16_t)out;
-			//analogWrite(channel, n, out);
+			analogWrite(channel, n, out);
 
 			// Advance by pi/4 (1/8 of a full rotation) for each channel
 			relativePhase += M_PI * 0.25;
 		}