comparison core/RTAudio.cpp @ 16:670be80463a3 matrix_gpio

- analog matrixIn/matrixOut are now mapped as floats from 0 to 1
- use of an external PRU code can be enabled with -P <filename>
- 16 channels of programmable GPIO can be accessed straight from render() either writing directly to the matrixGpio[] array or using digitalWrite(),
digitalRead(), setDigitalDirection() macros from Utilities.h .

 
 // Flag which tells the audio task to stop
 bool gShouldStop = false;
 
 // general settings
+char *gPRUFilename;//[256]	 = "pru_rtaudio.bin"; 	// path to PRU binary file
 int gRTAudioVerbose = 0;   						// Verbosity level for debugging
 int gAmplifierMutePin = -1;
 int gAmplifierShouldBeginMuted = 0;
 
 // Number of audio and matrix channels, globally accessible
-// At least gNumMatrixChannels needs to be global to be used
-// by the analogRead() and analogWrite() macros without creating
+// At least gNumMatrixChannels and gNumMatrixGpioChannels need to be global to be used
+// by the analogRead() and analogWrite() and the digital macros without creating
 // extra confusion in their use cases by passing this argument
 int gNumAudioChannels = 0;
 int gNumMatrixChannels = 0;
+int gNumMatrixGpioChannels = 0;
 
 // initAudio() prepares the infrastructure for running PRU-based real-time
 // audio, but does not actually start the calculations.
 // periodSize indicates the number of _sensor_ frames per period: the audio period size
 // is twice this value. In total, the audio latency in frames will be 4*periodSize,

 
 int BeagleRT_initAudio(RTAudioSettings *settings, void *userData)
 {
 	rt_print_auto_init(1);
 	setVerboseLevel(settings->verbose);
-
+	gPRUFilename=settings->pruFilename;
 	if(gRTAudioVerbose == 1)
 		rt_printf("Running with Xenomai\n");
 
 	if(gRTAudioVerbose) {
 		cout << "Starting with period size " << settings->periodSize << "; ";

 		gAmplifierMutePin = settings->ampMutePin;
 		gAmplifierShouldBeginMuted = settings->beginMuted;
 
 		if(gpio_export(settings->ampMutePin)) {
 			if(gRTAudioVerbose)
-				cout << "Warning: couldn't export amplifier mute pin\n";
+				cout << "Warning: couldn't export amplifier mute pin " << settings-> ampMutePin << "\n";
 		}
 		if(gpio_set_dir(settings->ampMutePin, OUTPUT_PIN)) {
 			if(gRTAudioVerbose)
 				cout << "Couldn't set direction on amplifier mute pin\n";
 			return -1;

 
 	// Use PRU for audio
 	gPRU = new PRU();
 	gAudioCodec = new I2c_Codec();
 
-	if(gPRU->prepareGPIO(settings->useMatrix, 1, 1)) {
+	gNumMatrixGpioChannels = settings->useMatrixGpio ? settings->numMatrixGpioChannels : 0; //this is called here to make sure prepareGPIO initializes the appropriate GPIO pins
+	if(gPRU->prepareGPIO(settings->useMatrix, settings->useMatrixGpio, 1, 1)) {
 		cout << "Error: unable to prepare GPIO for PRU audio\n";
 		return 1;
 	}
 	if(gPRU->initialise(0, settings->periodSize, settings->numMatrixChannels, true)) {
 		cout << "Error: unable to initialise PRU\n";

 		matrixSampleRate = audioSampleRate * 4.0 / (float)settings->numMatrixChannels;
 	}
 
 	gNumAudioChannels = 2;
 	gNumMatrixChannels = settings->useMatrix ? settings->numMatrixChannels : 0;
-
-	if(!initialise_render(gNumMatrixChannels, gNumAudioChannels,
+	if(!initialise_render(gNumMatrixChannels, gNumMatrixGpioChannels, gNumAudioChannels,
 				          settings->useMatrix ? settings->periodSize : 0, /* matrix period size */
 				          audioPeriodSize,
 				          matrixSampleRate, audioSampleRate,
 				          userData)) {
 		cout << "Couldn't initialise audio rendering\n";

 	if(gAudioCodec->startAudio(0)) {
 		rt_printf("Error: unable to start I2C audio codec\n");
 		gShouldStop = 1;
 	}
 	else {
-		if(gPRU->start()) {
-			rt_printf("Error: unable to start PRU\n");
+		if(gPRU->start(gPRUFilename)) {
+			rt_printf("Error: unable to start PRU from file %s\n", gPRUFilename);
 			gShouldStop = 1;
 		}
 		else {
 			// All systems go. Run the loop; it will end when gShouldStop is set to 1