Skip to content

Commit 3768a97

Browse files
committed
tweaking mirror mode and installer build
1 parent 62277fa commit 3768a97

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

LibTalker.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,6 @@ bool LibTalker::setOutTriggerMode(t_TriggerOutputMode triggerMode, int nSyncPin,
560560
{
561561
Error("Error checking device type before setting trigger output mode, error code: ", res);
562562
}
563-
564563
if (strcmp(sVar, "5002"))
565564
{
566565
retVal = false;

Packaging.cmake

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ message(STATUS " + ZIP YES ")
4747

4848
set(PACKAGE_ICON "${CMAKE_SOURCE_DIR}/Resources/BV_LSL.ico")
4949
set(INSTALLER_HEADER "${CMAKE_SOURCE_DIR}/Resources/BV_LSL.ico")
50-
set(PREFERRED_INSTALL_DIR "C:\\\\Vision\\\\LSL-Apps\\\\")
50+
set(PREFERRED_INSTALL_DIR "C:\\\\Vision\\\\LSL-Apps")
5151
# NSIS windows installer
5252
find_program(NSIS_PATH nsis PATH_SUFFIXES nsis)
5353
if(NSIS_PATH)
@@ -56,10 +56,11 @@ if(NSIS_PATH)
5656

5757
set(CPACK_NSIS_DISPLAY_NAME ${CPACK_PACKAGE_NAME})
5858
# Icon of the installer
59-
#file(TO_CMAKE_PATH "${PACKAGE_ICON}" CPACK_NSIS_MUI_ICON)
60-
#file(TO_CMAKE_PATH "${PACKAGE_ICON}" CPACK_NSIS_MUI_UNIICON)
61-
#file(TO_CMAKE_PATH "${INSTALLER_HEADER}" CPACK_NSIS_MUI_HEADERIMAGE_BITMAP)
62-
#file(TO_CMAKE_PATH "${INSTALLER_HEADER}" CPACK_NSIS_MUI_WELCOMEFINISH_BITMAP)
59+
# Icon of the installer
60+
file(TO_CMAKE_PATH "${PACKAGE_ICON}" CPACK_NSIS_MUI_ICON)
61+
file(TO_CMAKE_PATH "${PACKAGE_ICON}" CPACK_NSIS_MUI_UNIICON)
62+
file(TO_CMAKE_PATH "${INSTALLER_HEADER}" CPACK_NSIS_MUI_HEADERIMAGE_BITMAP)
63+
file(TO_CMAKE_PATH "${INSTALLER_HEADER}" CPACK_NSIS_MUI_WELCOMEFINISH_BITMAP)
6364
message(STATUS dir: " ${PREFERRED_INSTALL_DIR}${INSTALL_DIR}\\actiCHamp\ LSL\ Connector.exe")
6465
set(CPACK_NSIS_INSTALLED_ICON_NAME "\\\\bin\\\\actiCHamp\ LSL\ Connector.exe")
6566
set(CPACK_NSIS_CONTACT "${CPACK_PACKAGE_CONTACT}")
@@ -68,10 +69,6 @@ if(NSIS_PATH)
6869
set(CPACK_NSIS_MODIFY_PATH ON)
6970
set(CPACK_CREATE_DESKTOP_LINKS "${PROJECT_NAME}.exe")
7071
set(CPACK_NSIS_BRANDING_TEXT "Copyright Brain Products 2022")
71-
set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}\\\\Resources\\\\BV_LSL.ico")
72-
set(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}\\\\Resources\\\\BV_LSL.ico")
73-
set(CPACK_NSIS_MUI_HEADERIMAGE_BITMAP "${CMAKE_SOURCE_DIR}\\\\Resources\\\\BV_LSL.ico")
74-
set(CPACK_NSIS_MUI_WELCOMEFINISH_BITMAP "${CMAKE_SOURCE_DIR}\\\\Resources\\\\BV_LSL.ico")
7572
else()
7673
message(STATUS " + NSIS NO ")
7774
endif()

mainwindow.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,7 @@ void MainWindow::Link()
352352
m_bStop = true;
353353
m_ptReadThread->join();
354354
m_ptReadThread.reset();
355+
m_LibTalker.setOutTriggerMode(TriggerOutputMode::TM_DEFAULT);
355356
}
356357
catch(std::exception &e)
357358
{

release_notes.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
v1.15.0
2+
-FEATURE: added mirror trigger output option
3+
-FEATURE: report bitness in Help->About
4+
-FEATURE: bumped lsl to version 1.15.2
5+
16
v1.14.0
27
-FEATURE: added simulation mode support
38

0 commit comments

Comments
 (0)