Skip to content

Commit 3b45a1e

Browse files
author
David Medine
committed
updated version info
1 parent db80e2e commit 3b45a1e

File tree

8 files changed

+999
-16
lines changed

8 files changed

+999
-16
lines changed

.github/workflows/cppcmake.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ on:
1010
env:
1111
LSL_URL: 'https://github.com/sccn/liblsl/releases/tag/'
1212
LSL_RELEASE_PREFIX: ''
13-
LSL_TAG: '1.13.1'
14-
LSL_RELEASE: '1.13.1'
13+
LSL_TAG: '1.13.2'
14+
LSL_RELEASE: '1.13.2'
1515
LSL_RELEASE_SUFFIX: ''
16-
APP_VERSION: 'v1.13.1.1'
16+
APP_VERSION: 'v1.13.2'
1717

1818
jobs:
1919
build:

LibTalker.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -537,14 +537,14 @@ int64_t LibTalker::PullAmpData(BYTE* buffer, int nBufferSize, std::vector<float>
537537
return nSampleCnt;
538538
}
539539

540-
//bool LibTalker::CheckFDA(void)
541-
//{
542-
// int32_t nFDA = 0;
543-
// int res = 0;
544-
// res = ampGetProperty(m_Handle, PG_DEVICE, 0, DPROP_B32_FastDataAccess, &nFDA, sizeof(nFDA));
545-
// if (res != AMP_OK)
546-
// Error("Setup error getting FDA option: ", res);
547-
// return (nFDA == 1) ? true : false;
548-
//
549-
//}
540+
bool LibTalker::CheckFDA(void)
541+
{
542+
int32_t nFDA = 0;
543+
int res = 0;
544+
res = ampGetProperty(m_Handle, PG_DEVICE, 0, DPROP_B32_FastDataAccess, &nFDA, sizeof(nFDA));
545+
if (res != AMP_OK)
546+
Error("Setup error getting FDA option: ", res);
547+
return (nFDA == 1) ? true : false;
548+
549+
}
550550

LibTalker.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class LibTalker
6060
void Setup();
6161
void Close();
6262
void StopAcquisition(void);
63-
//bool CheckFDA(void); // for debugging
63+
bool CheckFDA(void); // for debugging
6464
//int64_t PullAmpData(BYTE* buffer, int nBufferSize, std::vector<float>& vfDataMultiplexed);
6565
int64_t PullAmpData(BYTE* buffer, int nBufferSize, std::vector<float>& vfDataMultiplexed, std::vector<int>& vnTriggers);
6666

0 commit comments

Comments
 (0)