comparison projects/d-box/DboxSensors.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.

 
 using namespace std;
 
 
 
-int DboxSensors::initSensors(int tk0_bus, int tk0_address, int tk1_bus, int tk1_address, int tk_file, int fsr_pin, int fsrmax, bool useNewSensors, int gpio_0, int gpio_1)
+int DboxSensors::initSensors(int tk0_bus, int tk0_address, int tk1_bus, int tk1_address, int tk_file, int fsr_pin, int fsrmax, int sensorTypeToUse, int gpio_0, int gpio_1)
 {
-	newSensors = useNewSensors;
+	sensorType = sensorTypeToUse;
 	// init first touch key on i2c bus
 	if(tk0_address >= 0) {
 		if(TK0.initI2C_RW(tk0_bus, tk0_address, tk_file)>0)
 			return 1;
-		if(TK0.initTouchKey(newSensors)>0)
+		if(TK0.initTouchKey(sensorType)>0)
 			return 2;
 	}
 
 	// init second touch key on i2c bus
 	if(tk1_address >= 0) {
 		if(TK1.initI2C_RW(tk1_bus, tk1_address, tk_file)>0)
 			return 1;
-		if(TK1.initTouchKey(newSensors)>0)
+		if(TK1.initTouchKey(sensorType)>0)
 			return 2;
 	}
 
 	// init fsr on analog input pin
 	fsr_pinNum	= fsr_pin;

 	else
 		tk1_touchCnt = 0;
 
 
 	int max = 3;
-	if(newSensors)
+	if(sensorType != kSensorTypeTouchKey)
 		max = 5;
 	// if touches detected on main touch key
 	if(tk0_touchCnt == 0 && tk1_touchCnt == 0)
 		resetSensorsData();
 	else

 
 // idle values
 void DboxSensors::resetSensorsData()
 {
 	int max = 3;
-	if(newSensors)
+	if(sensorType != kSensorTypeTouchKey)
 		max = 5;
 
 	for(int i=0; i<max; i++)
 	{
 		tk0_touchPosX[i] = -1;