comparison projects/d-box/main.cpp @ 15:901d205d1a3c

Updated to latest PRU library; external PRU file no longer needed. Also catch SIGTERM as well as SIGINT to clean up gracefully.

 char* gPartialFilename = 0;					// name of the partials file to load
 bool gAudioIn = false;						// stereo audio in status
 
 int touchSensor0Address = 0x0C;				// I2C addresses of touch sensors
 int touchSensor1Address = 0x0B;
-bool useNewSensors = false;
+int sensorType = 0;
 
 char sdPath[256]			= "/dev/mmcblk0p2";			// system path of the SD, partition 2
 char mountPath[256]			= "/root/d-box/usersounds";	// mount point of SD partition 2 [where user files are]
 char gUserDirName[256] 		= "usersounds";				// Directory in which user analysis files can be found [dir of mountPath]
 char gDefaultDirName[256] 	= "sounds";					// Directory in which built in analysis files can be found

 		{"help", 0, NULL, 'h'},
 		{"audioin", 1, NULL, 'i'},
 		{"file", 1, NULL, 'f'},
 		{"keyboard", 1, NULL, 'k'},
 		{"audio-test", 0, NULL, 'T'},
-		{"new-sensors", 0, NULL, 'S'},
+		{"sensor-type", 1, NULL, 'S'},
 		{"sensor0", 1, NULL, 'Q'},
 		{"sensor1", 1, NULL, 'R'},
 		{"log", 1, NULL, 'l'},
 		{"usesd", 1, NULL, 'u'},
 		{"oversamp", 1, NULL, 'o'},

 	BeagleRT_defaultSettings(settings);
 
 	while (1)
 	{
 		int c;
-		if ((c = BeagleRT_getopt_long(args.argc, args.argv, "hf:ki:sTQ:R:Sl:u:o:n:g:", long_option, settings)) < 0)
+		if ((c = BeagleRT_getopt_long(args.argc, args.argv, "hf:ki:sTQ:R:S:l:u:o:n:g:", long_option, settings)) < 0)
 				break;
 		switch (c)
 		{
 		case 'h':
 				morehelp++;

 				break;
 		case 'T':
 				useAudioTest = true;
 				break;
 		case 'S':
-				useNewSensors = true;
+				sensorType = atoi(optarg);
 				break;
 		case 'Q':
 				touchSensor0Address = atoi(optarg);
 				break;
 		case 'R':

 	// Free file name string which is no longer needed
 	if(gPartialFilename != 0)
 		free(gPartialFilename);
 
 	if(!useAudioTest) {
-		if(initSensorLoop(touchSensor0Address, touchSensor1Address, useNewSensors) != 0)
+		if(initSensorLoop(touchSensor0Address, touchSensor1Address, sensorType) != 0)
 			return -1;
 	}
 
 	if(gVerbose == 1)
 		cout << "main() : creating audio thread" << endl;

 		  cout << "Error:unable to create keyboard thread" << endl;
 		  return -1;
 		}
 	}
 
-	// Set up interrupt handler to catch Control-C
+	// Set up interrupt handler to catch Control-C and SIGTERM
 	signal(SIGINT, interrupt_handler);
+	signal(SIGTERM, interrupt_handler);
 
 	// load all other files into oscBanks
 	loadAudioFiles(false);
 	cout << "Finished loading analysis files\n";
 	gIsLoading = false;