Skip to content

Commit ef9ca31

Browse files
author
David Medine
committed
ready for beta release
1 parent 871db82 commit ef9ca31

File tree

4 files changed

+119
-8
lines changed

4 files changed

+119
-8
lines changed

‎LibTalker.cpp‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,93 @@ void LibTalker::Error(const std::string& sError, int nErrorNum)
3333
break;
3434
// TODO:
3535
case -2:
36+
sErrorFromAmp = "AMP_ERR_PARAM";
37+
break;
38+
case -3:
39+
sErrorFromAmp = "AMP_ERR_VERSION";
40+
break;
41+
case -4:
42+
sErrorFromAmp = "AMP_ERR_MEMORY";
43+
break;
44+
case -5:
45+
sErrorFromAmp = "AMP_ERR_BUSY";
46+
break;
47+
case -6:
48+
sErrorFromAmp = "AMP_ERR_NODEVICE";
49+
break;
50+
case -7:
51+
sErrorFromAmp = "AMP_ERR_NOSUPPORT";
52+
break;
53+
case -8:
54+
sErrorFromAmp = "AMP_ERR_EXCEPTION";
55+
break;
56+
case -9:
57+
sErrorFromAmp = "AMP_ERR_FWVERSION";
58+
break;
59+
case -10:
60+
sErrorFromAmp = "AMP_ERR_TIMEOUT";
61+
break;
62+
case -11:
63+
sErrorFromAmp = "AMP_ERR_BUFFERSIZE";
64+
break;
65+
66+
case -101:
67+
sErrorFromAmp = "IF_ERR_FAIL";
68+
break;
69+
case -102:
70+
sErrorFromAmp = "IF_ERR_BT_SERVICE";
71+
break;
72+
case -103:
73+
sErrorFromAmp = "IF_ERR_MEMORY";
74+
break;
75+
case -104:
76+
sErrorFromAmp = "IF_ERR_NODEVICE";
77+
break;
78+
case -105:
79+
sErrorFromAmp = "IF_ERR_CONNECT";
80+
break;
81+
case -106:
82+
sErrorFromAmp = "IF_ERR_DISCONNECTED";
83+
break;
84+
case -107:
85+
sErrorFromAmp = "IF_ERR_TIMEOUT";
86+
break;
87+
case -108:
88+
sErrorFromAmp = "IF_ERR_ALREADYOPEN";
89+
break;
90+
case -109:
91+
sErrorFromAmp = "IF_ERR_PARAMETER";
92+
break;
93+
case -110:
94+
sErrorFromAmp = "IF_ERR_ATCOMMAND";
95+
break;
96+
97+
case -200:
98+
sErrorFromAmp = "DEVICE_ERR_BASE";
99+
break;
100+
case -201:
101+
sErrorFromAmp = "DEVICE_ERR_FAIL";
102+
break;
103+
case -202:
104+
sErrorFromAmp = "DEVICE_ERR_PARAM";
105+
break;
106+
case -203:
107+
sErrorFromAmp = "DEVICE_ERR_VERSION";
108+
break;
109+
case -204:
110+
sErrorFromAmp = "DEVICE_ERR_MEMORY";
111+
break;
112+
case -205:
113+
sErrorFromAmp = "DEVICE_ERR_BUSY";
114+
break;
115+
case -206:
116+
sErrorFromAmp = "DEVICE_ERR_SDWRITE";
117+
break;
118+
case -207:
119+
sErrorFromAmp = "DEVICE_ERR_SDREAD";
120+
break;
121+
case -208:
122+
sErrorFromAmp = "DEVICE_ERR_NOSD";
36123
break;
37124
}
38125
sFullError.append(sErrorFromAmp);

‎actiCHamp/actiCHamp.vcxproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
<AdditionalIncludeDirectories>C:\local\boost_1_71_0;C:\Users\david.medine\LSL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
109109
</ClCompile>
110110
<Link>
111-
<SubSystem>Windows</SubSystem>
111+
<SubSystem>Console</SubSystem>
112112
<OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
113113
<GenerateDebugInformation>true</GenerateDebugInformation>
114114
<AdditionalLibraryDirectories>C:\Users\david.medine\LSL\lib;C:\Users\david.medine\Devel\SDK\Amplifiers\actiCHamp\actiCHampLib\Betas\actiCHampLib 1.19.11.28\Win32\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -176,10 +176,10 @@ echo F| xcopy /y "C:\Qt\Qt5.13.1\5.13.1\msvc2017\bin\Qt5Gui.dll" "$(SolutionDir)
176176
echo F| xcopy /y "C:\Qt\Qt5.13.1\5.13.1\msvc2017\bin\Qt5Widgets.dll" "$(SolutionDir)bin\$(Platform)\$(Configuration)\Qt5Widgets.dll"
177177
echo F| xcopy /y "$(SolutionDir)..\actiCHamp_config.cfg" "$(SolutionDir)bin\$(Platform)\$(Configuration)\actiCHamp_config.cfg"
178178
echo F| xcopy /y "C:\Users\David.Medine\LSL\bin\liblsl32.dll" "$(SolutionDir)bin\$(Platform)\$(Configuration)\liblsl32.dll"
179-
echo F| xcopy /y "C:\Users\david.medine\Devel\SDK\Amplifiers\actiCHamp\actiCHampLib\Betas\actiCHampLib 1.19.11.28\x64\Release\actiCHampLib.dll" "$(SolutionDir)bin\$(Platform)\$(Configuration)\actiCHampLib.dll"
180-
echo F| xcopy /y "C:\Users\david.medine\Devel\SDK\Amplifiers\actiCHamp\actiCHampLib\Betas\actiCHampLib 1.19.11.28\x64\Release\ActiChamp_x64.dll" "$(SolutionDir)bin\$(Platform)\$(Configuration)\ActiChamp_x64.dll"
181-
echo F| xcopy /y "C:\Users\david.medine\Devel\SDK\Amplifiers\actiCHamp\actiCHampLib\Betas\actiCHampLib 1.19.11.28\x64\Release\ActiChamp.bit" "$(SolutionDir)bin\$(Platform)\$(Configuration)\ActiChamp.bit"
182-
echo F| xcopy /y "C:\Users\david.medine\Devel\SDK\Amplifiers\actiCHamp\actiCHampLib\Betas\actiCHampLib 1.19.11.28\x64\Release\ActiChampX.bit" "$(SolutionDir)bin\$(Platform)\$(Configuration)\ActiChampX.bit"
179+
echo F| xcopy /y "C:\Users\david.medine\Devel\SDK\Amplifiers\actiCHamp\actiCHampLib\Betas\actiCHampLib 1.19.11.28\Win32\Release\actiCHampLib.dll" "$(SolutionDir)bin\$(Platform)\$(Configuration)\actiCHampLib.dll"
180+
echo F| xcopy /y "C:\Users\david.medine\Devel\SDK\Amplifiers\actiCHamp\actiCHampLib\Betas\actiCHampLib 1.19.11.28\Win32\Release\ActiChamp_x86.dll" "$(SolutionDir)bin\$(Platform)\$(Configuration)\ActiChamp_x86.dll"
181+
echo F| xcopy /y "C:\Users\david.medine\Devel\SDK\Amplifiers\actiCHamp\actiCHampLib\Betas\actiCHampLib 1.19.11.28\Win32\Release\ActiChamp.bit" "$(SolutionDir)bin\$(Platform)\$(Configuration)\ActiChamp.bit"
182+
echo F| xcopy /y "C:\Users\david.medine\Devel\SDK\Amplifiers\actiCHamp\actiCHampLib\Betas\actiCHampLib 1.19.11.28\Win32\Release\ActiChampX.bit" "$(SolutionDir)bin\$(Platform)\$(Configuration)\ActiChampX.bit"
183183
echo F| xcopy /y "$(SolutionDir)..\explanation_of_trigger_marker_types.pdf" "$(SolutionDir)bin\$(Platform)\$(Configuration)\explanation_of_trigger_marker_types.pdf"
184184
echo F| xcopy /y "$(SolutionDir)..\LICENSE.txt" "$(SolutionDir)bin\$(Platform)\$(Configuration)\LICENSE.txt"
185185
mkdir "$(SolutionDir)bin\$(Platform)\actiCHamp_Win32"

‎mainwindow.cpp‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <boost/lexical_cast.hpp>
1212
#include <boost/shared_ptr.hpp>
1313
#include <boost/foreach.hpp>
14+
#include <iostream>
1415

1516
const int m_pnBaseSamplingRates[] = {10000,50000,100000};
1617
const int m_pnSubSampleDivisors[] = { 1,2,5,10,20,50,100 };
@@ -40,10 +41,25 @@ MainWindow::MainWindow(QWidget *parent, const std::string &config_file): QMainWi
4041
QObject::connect(ui->actionSave_Configuration, SIGNAL(triggered()), this, SLOT(save_config_dialog()));
4142
QObject::connect(ui->baseSamplingRate, SIGNAL(currentIndexChanged(int)), this, SLOT(setSamplingRate()));
4243
QObject::connect(ui->subSampleDivisor, SIGNAL(currentIndexChanged(int)), this, SLOT(setSamplingRate()));
44+
QObject::connect(ui->actionVersions, SIGNAL(triggered()), this, SLOT(versionsDialog()));
4345

4446
setSamplingRate();
4547
}
4648

49+
void MainWindow::versionsDialog()
50+
{
51+
t_VersionNumber libVersion;
52+
GetLibraryVersion(&libVersion);
53+
int32_t lslProtocolVersion = lsl::protocol_version();
54+
int32_t lslLibVersion = lsl::library_version();
55+
std::stringstream ss;
56+
ss << "Amplifier_LIB: " << LIBVERSIONSTREAM(libVersion) << "\n" <<
57+
"lsl protocol: " << LSLVERSIONSTREAM(lslProtocolVersion) << "\n" <<
58+
"liblsl: " << LSLVERSIONSTREAM(lslLibVersion) << "\n" <<
59+
"App: " << APPVERSIONSTREAM(m_AppVersion) << "_beta";
60+
QMessageBox::information(this, "Versions", ss.str().c_str(), QMessageBox::Ok);
61+
}
62+
4763
void MainWindow::setSamplingRate()
4864
{
4965
int nNum = m_pnBaseSamplingRates[ui->baseSamplingRate->currentIndex()];
@@ -304,7 +320,7 @@ void MainWindow::link()
304320
// background data reader thread
305321
void MainWindow::read_thread(const std::vector<std::string>& channelLabels)
306322
{
307-
int res = SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS);
323+
//int res = SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS);
308324
int nEnabledChannelCnt = m_nEEGChannelCount + ((m_bUseAUX) ? 8 : 0);
309325
int nExtraEEGChannelCnt = 0;
310326
if (m_bSampledMarkersEEG) nExtraEEGChannelCnt+=1;
@@ -313,7 +329,13 @@ void MainWindow::read_thread(const std::vector<std::string>& channelLabels)
313329
try
314330
{
315331
// setup LSL
316-
lsl::stream_outlet* poutMarkerOutlet;
332+
lsl::stream_outlet* poutMarkerOutlet = NULL;
333+
std::cout << std::string("actiCHamp" + m_LibTalker.getSerialNumber());
334+
std::cout << "EEG";
335+
std::cout << nEnabledChannelCnt + nEnabledChannelCnt;
336+
std::cout << (double)m_nSamplingRate;
337+
std::cout << lsl::cf_float32;
338+
std::cout << m_LibTalker.getSerialNumber();
317339
lsl::stream_info infoData("actiCHamp-" + m_LibTalker.getSerialNumber(),
318340
"EEG",
319341
nEnabledChannelCnt + nExtraEEGChannelCnt,
@@ -395,7 +417,7 @@ void MainWindow::read_thread(const std::vector<std::string>& channelLabels)
395417
.append_child_value("manufacturer", "Brain Products");
396418

397419
infoMarkers.desc().append_child("versions")
398-
.append_child_value("Amplifier_LIB", ssLib.str())
420+
.append_child_value("Amplifier_LIB", ssLib.str() + "_beta")
399421
.append_child_value("lsl_protocol", ssProt.str())
400422
.append_child_value("liblsl", ssLSL.str())
401423
.append_child_value("App", ssApp.str());

‎mainwindow.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ private slots:
4949
// set the min chunk size according sampling rate
5050
void setMinChunk();
5151

52+
void versionsDialog();
53+
5254
private:
5355

5456
// background data reader thread

0 commit comments

Comments
 (0)