xhouse/EF3-Interface
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、合并master与2021.1

Browse Source
This commit is contained in:
xiejunjie
2021-12-03 11:25:35 +08:00
parent dc07b8879b
commit 4bd7d1b80b
981 changed files with 384342 additions and 6470 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PcDmis/Base/Interfac/Msi/Hsi/ART/ART_PCI8622.cpp
+11 -3
View File
@@ -118,9 +118,9 @@ BOOL CART_PCI8622::SetSamplePara(int _Mode,int _ReadDataSize)
m_ADPara.ADMode = PCI8622_ADMODE_GROUP; // AD模式为连续模式
m_ADPara.FirstChannel = m_iFirstChannel; // 首通道
m_ADPara.LastChannel = m_iLastChannel; // 末通道
m_ADPara.Frequency = 10000; // 采样频率(Hz)
m_ADPara.Frequency = 250000; // 采样频率(Hz)
m_ADPara.GroupInterval = 50; // 组间间隔(uS)
m_ADPara.LoopsOfGroup = 1; // 组内各通道点数
m_ADPara.LoopsOfGroup = 10; // 组内各通道点数
m_ADPara.Gains = PCI8622_GAINS_1MULT;
m_ADPara.InputRange = m_InputRange; // 模拟量输入量程范围
@@ -395,8 +395,16 @@ BOOL CART_PCI8622::GetData(double (*_Data)[HALF_SIZE_WORDS],int* _DataNumber)
break;
}
m_SegmentID=0;
LONG nReadSizeWords = m_iReadDataSize;
LONG nReadSizeWords = (m_iReadDataSize+1)*(1+m_iLastChannel-m_iFirstChannel)*10;
LONG nRetSizeWords(0);
//if (ADStatus.nRemainWords<nReadSizeWords)
//{
// nReadSizeWords=ADStatus.nRemainWords;
// rStatus=FALSE;
//}
PCI8622_ReadDeviceProAD_Npt(m_hDevice, ADBuffer[m_SegmentID], nReadSizeWords, &nRetSizeWords);
if(!PCI8622_GetDevStatusProAD(m_hDevice, &ADStatus))