bugfixes for v1.15.1

Author: dmedine

.github/workflows/cppcmake.yml

@@ -13,7 +13,7 @@ env:
   LSL_TAG: '1.15.2'
   LSL_RELEASE: '1.15.2'
   LSL_RELEASE_SUFFIX: ''
-  APP_VERSION: 'v1.15.0'
+  APP_VERSION: 'v1.15.1'
 
 jobs:
   build:

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5)
 
 set(PROJECT_VERSION_MAJOR 1)
 set(PROJECT_VERSION_MINOR 15)
-set(PROJECT_VERSION_PATCH 0)
+set(PROJECT_VERSION_PATCH 1)
 
 project(actiCHamp
 	LANGUAGES CXX

LibTalker.cpp

@@ -554,21 +554,19 @@ bool LibTalker::CheckFDA(void)
 bool LibTalker::setOutTriggerMode(t_TriggerOutputMode triggerMode, int nSyncPin, int nFreq, int nPulseWidth)
 {
 	char sVar[20];
-	bool retVal = true;
+ 	bool retVal = true;
 	int res = ampGetProperty(m_Handle, PG_DEVICE, 0, DPROP_CHR_Type, sVar, sizeof(sVar));
 	if (res != AMP_OK)
 	{
 		Error("Error checking device type before setting trigger output mode, error code:  ", res);
 	}
-	if (strcmp(sVar, "5002"))
+	if (!strcmp(sVar, "5002"))
 	{
-		retVal = false;
-		triggerMode = t_TriggerOutputMode::TM_DEFAULT;
-	}
-	res = ampSetProperty(m_Handle, PG_MODULE, 0, MPROP_I32_TriggerOutMode, &triggerMode, sizeof(triggerMode));
-	if (res != AMP_OK)
-	{
-		Error("Error setting trigger output mode, error code:  ", res);
+		res = ampSetProperty(m_Handle, PG_MODULE, 0, MPROP_I32_TriggerOutMode, &triggerMode, sizeof(triggerMode));
+		if (res != AMP_OK)
+		{
+			Error("Error setting trigger output mode, error code:  ", res);
+		}
 	}
 	return retVal;
 }

mainwindow.cpp

@@ -30,12 +30,11 @@ MainWindow::MainWindow(QWidget *parent, const char* config_file): QMainWindow(pa
 {
 	m_AppVersion.Major = 1;
 	m_AppVersion.Minor = 15;
-	m_AppVersion.Bugfix = 0;
+	m_AppVersion.Bugfix = 1;
 
 	ui->setupUi(this);
 	m_bUseActiveShield = false;
 	m_bOverrideAutoUpdate = false;
-	LoadConfig(config_file);
 
 	// make GUI connections
 	QObject::connect(ui->actionQuit, SIGNAL(triggered()), this, SLOT(close()));
@@ -52,6 +51,33 @@ MainWindow::MainWindow(QWidget *parent, const char* config_file): QMainWindow(pa
 	QObject::connect(ui->rbDefault, SIGNAL(clicked(bool)), this, SLOT(RadioButtonBehavior(bool)));
 	QObject::connect(ui->rbMirror, SIGNAL(clicked(bool)), this, SLOT(RadioButtonBehavior(bool)));
 	SetSamplingRate();
+	QString cfgfilepath = find_config_file(config_file);
+	LoadConfig(cfgfilepath);
+}
+
+QString MainWindow::find_config_file(const char* filename) {
+	if (filename) {
+		QString qfilename(filename);
+		if (!QFileInfo::exists(qfilename))
+			QMessageBox(QMessageBox::Warning, "Config file not found",
+				QStringLiteral("The file '%1' doesn't exist").arg(qfilename), QMessageBox::Ok,
+				this);
+		else
+			return qfilename;
+	}
+	QFileInfo exeInfo(QCoreApplication::applicationFilePath());
+	QString defaultCfgFilename(exeInfo.completeBaseName() + ".cfg");
+	qInfo() << defaultCfgFilename;
+	QStringList cfgpaths;
+	cfgpaths << QDir::currentPath()
+		<< QStandardPaths::standardLocations(QStandardPaths::ConfigLocation) << exeInfo.path();
+	for (auto path : cfgpaths) {
+		QString cfgfilepath = path + QDir::separator() + defaultCfgFilename;
+		if (QFileInfo::exists(cfgfilepath)) return cfgfilepath;
+	}
+	QMessageBox::warning(this, "No config file not found",
+		QStringLiteral("No default config file could be found"), "Continue with default config");
+	return "";
 }
 
 void MainWindow::VersionsDialog()

mainwindow.h

@@ -58,7 +58,7 @@ class MainWindow : public QMainWindow
     ~MainWindow();
 
 private slots:
-
+    QString find_config_file(const char* filename);
     void LoadConfigDialog();
     void SaveConfigDialog();
     void Link();

release_notes.txt

@@ -1,3 +1,7 @@
+v1.15.1
+-BUGFIX: removed trigger mode setting error for old actiCHamp (not plus) 
+-BUGFIX: config file loading properly
+
 v1.15.0
 -FEATURE: added mirror trigger output option
 -FEATURE: report bitness in Help->About