Mercurial > hg > beaglert

diff projects/d-box/sensors.cpp @ 15:901d205d1a3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated to latest PRU library; external PRU file no longer needed. Also catch SIGTERM as well as SIGINT to clean up gracefully.
author andrewm
date Sat, 07 Feb 2015 16:41:56 +0000
parents 8a575ba3ab52
children 18d03901f866
line wrap: on
line diff
--- a/projects/d-box/sensors.cpp	Fri Jan 23 15:35:10 2015 +0000
+++ b/projects/d-box/sensors.cpp	Sat Feb 07 16:41:56 2015 +0000
@@ -56,7 +56,7 @@
 
 using namespace std;
 
-int initSensorLoop(int sensorAddress0, int sensorAddress1, bool useNewSensors)
+int initSensorLoop(int sensorAddress0, int sensorAddress1, int sensorType)
 {
 	int tk0_bus			= 1;
 	int tk0_address		= sensorAddress0;
@@ -69,7 +69,7 @@
 	if(gVerbose==1)
 		cout << "---------------->Init Control Thread" << endl;
 
-	if(Sensors.initSensors(tk0_bus, tk0_address, tk1_bus, tk1_address, tk_file, fsr_pinNum, fsr_max, useNewSensors)>0)
+	if(Sensors.initSensors(tk0_bus, tk0_address, tk1_bus, tk1_address, tk_file, fsr_pinNum, fsr_max, sensorType)>0)
 	{
 		gShouldStop = 1;
 		cout << "control cannot start" << endl;