Преглед на файлове

修改模拟量通信部分代码

limengqi преди 3 месеца
родител
ревизия
bfeb284491
променени са 2 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 1 1
      src/localization/localization.cpp
  2. 2 2
      src/localization/localization.h

+ 1 - 1
src/localization/localization.cpp

@@ -279,7 +279,7 @@ else if(car_input_mode == "pci"){
   ros::Rate loop_rate(rate);
   while(ros::ok())
   {
-    if (kbhit()) continue;
+//    if (kbhit()) continue;
     if (!ACTS2110_AI_ReadAnalog(hDevice, fVoltArray, nReadSampsPerChan, &nSampsPerChanRead, &nReadableSamps, fTimeout))
     {
       LOG(ERROR) << Name() <<"PCI Read Data Timeout nSampsPerChanRead=" << nSampsPerChanRead;

+ 2 - 2
src/localization/localization.h

@@ -155,12 +155,12 @@ private:
   //_____
 
   //----------pci
-  #define CH_PERCHAN 102400
+  #define CH_PERCHAN 1
   F64 fVoltArray[CH_PERCHAN];
   ACTS2110_AI_PARAM AIParam;
   U32 nReadSampsPerChan = CH_PERCHAN;	// 每通道读取点数
   U32 nSampsPerChanRead = 0;
-  F64 fTimeout = 1.0; // 1秒钟超时
+  F64 fTimeout = 1; // 1秒钟超时
   U32 nReadableSamps = 0;
   HANDLE hDevice = NULL;
   ACTS2110_MAIN_INFO MainInfo;