Заменил функцию считывания аналогового сигнала

на функцию предусматривающую ожидание установления значения аналогового сигнала. Это необходимо для предотвращения наложения сигналов при мультипликсировании каналов.

Заменил функцию считывания аналогового сигнала
8929597c · draft · Vinogradov Aleksei · be0be678 · 8929597c · 8929597c
Commit 8929597c authored Dec 11, 2017 by draft Committed by Vinogradov Aleksei Mar 29, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

ComediInterface.cc extensions/IOControl/ComediInterface.cc +1 -1

iocalibr.cc extensions/IOControl/iocalibr.cc +1 -1

iotest.cc extensions/IOControl/iotest.cc +1 -1

No files found.
--- a/extensions/IOControl/ComediInterface.cc
+++ b/extensions/IOControl/ComediInterface.cc
@@ -45,7 +45,7 @@ ComediInterface::~ComediInterface()
 int ComediInterface::getAnalogChannel( int subdev, int channel, int range, int aref ) const
 {
 	lsampl_t data = 0;
-	int ret = comedi_data_read(card, subdev, channel, range, aref, &data);
+	int ret = comedi_data_read_delayed(card, subdev, channel, range, aref, &data, 10000);
 	if( ret < 0 )
 	{

--- a/extensions/IOControl/iocalibr.cc
+++ b/extensions/IOControl/iocalibr.cc
@@ -202,7 +202,7 @@ int main(int argc, char* argv[])
 	while(1)
 	{
-		if(comedi_data_read(card, subdev, chan, range, aref, &data) < 0)
+		if(comedi_data_read_delayed(card, subdev, chan, range, aref, &data, 10000) < 0)
 		{
 			fprintf(stderr, "can't read from channel %d\n", chan);
 			exit(EXIT_FAILURE);

--- a/extensions/IOControl/iotest.cc
+++ b/extensions/IOControl/iotest.cc
@@ -312,7 +312,7 @@ int main(int argc, char* argv[])
 				if( autoconf )
 					insn_config(card, subdev, chan[k], 100, range, aref);
-				int ret = comedi_data_read(card, subdev, chan[k], range, aref, &data);
+				int ret = comedi_data_read_delayed(card, subdev, chan[k], range, aref, &data, 10000);
 				if( ret < 0)
 				{