Merge branch 'development' into adding_lfp_filtering

Author: admunkucsd

.github/workflows/linux.yml

@@ -25,7 +25,7 @@ jobs:
         cd Resources/Scripts
         sudo ./install_linux_dependencies.sh
         cd ../../Build && cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release ..
-        make all
+        make -j4
 #    - name: test
 #      run: cd build && ctest
     - name: deploy_dev

.github/workflows/windows.yml

@@ -27,7 +27,7 @@ jobs:
         cd Build 
         cmake -G "Visual Studio 16 2019" -A x64 ..
     - name: Add msbuild to PATH
-      uses: microsoft/setup-msbuild@v1.0.2
+      uses: microsoft/setup-msbuild@v1.1
     - name: build
       run: |
         msbuild Build/ALL_BUILD.vcxproj -p:Configuration=Release -p:Platform=x64

CMakeLists.txt

@@ -1,7 +1,7 @@
 #Open Ephys GUI main build file
 cmake_minimum_required(VERSION 3.15)
 
-set(GUI_VERSION 0.6.3)
+set(GUI_VERSION 0.6.4)
 
 string(REGEX MATCHALL "[0-9]+" VERSION_LIST ${GUI_VERSION})
 set(GUI_VERSION_HEX "0x")
@@ -12,7 +12,7 @@ foreach(_v ${VERSION_LIST})
 endforeach()
 string(REPLACE "." "," GUI_VERSION_COMMA ${GUI_VERSION})
 
-set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version")
+set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE)
 set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "Build architecture for Mac OS X" FORCE)
 set(CMAKE_OSX_SYSROOT "")
 if ((NOT ${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/Build ) AND (NOT OE_DONT_CHECK_BUILD_PATH))

JuceLibraryCode/modules/juce_audio_utils/native/juce_mac_BluetoothMidiDevicePairingDialogue.mm

@@ -161,13 +161,15 @@ static void receivedWindowWillClose (id self, SEL, NSNotification*)
 bool BluetoothMidiDevicePairingDialogue::open (ModalComponentManager::Callback* exitCallback,
                                                Rectangle<int>* bounds)
 {
-    new BluetoothMidiSelectorWindowHelper (exitCallback, bounds);
-    return true;
+    // new BluetoothMidiSelectorWindowHelper (exitCallback, bounds);
+    std::unique_ptr<ModalComponentManager::Callback> cb (exitCallback);
+    jassertfalse;
+    return false;
 }
 
 bool BluetoothMidiDevicePairingDialogue::isAvailable()
 {
-    return true;
+    return false;
 }
 
 #else

README.md

@@ -33,11 +33,11 @@ Our primary user base is scientists performing electrophysiology experiments wit
 
 The easiest way to get started is to download the installer for your platform of choice:
 
-- [Windows](https://openephysgui.jfrog.io/artifactory/Release-Installer/windows/Install-Open-Ephys-GUI-v0.6.3.exe)
-- [Ubuntu/Debian](https://openephysgui.jfrog.io/artifactory/Release-Installer/linux/open-ephys-gui-v0.6.3.deb)
-- [macOS](https://openephysgui.jfrog.io/artifactory/Release-Installer/mac/Open_Ephys_GUI_v0.6.3.dmg)
+- [Windows](https://openephysgui.jfrog.io/artifactory/Release-Installer/windows/Install-Open-Ephys-GUI-v0.6.4.exe)
+- [Ubuntu/Debian](https://openephysgui.jfrog.io/artifactory/Release-Installer/linux/open-ephys-gui-v0.6.4.deb)
+- [macOS](https://openephysgui.jfrog.io/artifactory/Release-Installer/mac/Open_Ephys_GUI_v0.6.4.dmg)
 
-It’s also possible to obtain the binaries as a .zip file for [Windows](https://openephysgui.jfrog.io/artifactory/Release/windows/open-ephys-v0.6.3-windows.zip), [Linux](https://openephysgui.jfrog.io/artifactory/Release/linux/open-ephys-v0.6.3-linux.zip), or [Mac](https://openephysgui.jfrog.io/artifactory/Release/mac/open-ephys-v0.6.3-mac.zip).
+It’s also possible to obtain the binaries as a .zip file for [Windows](https://openephysgui.jfrog.io/artifactory/Release/windows/open-ephys-v0.6.4-windows.zip), [Linux](https://openephysgui.jfrog.io/artifactory/Release/linux/open-ephys-v0.6.4-linux.zip), or [Mac](https://openephysgui.jfrog.io/artifactory/Release/mac/open-ephys-v0.6.4-mac.zip).
 
 Detailed installation instructions can be found [here](https://open-ephys.github.io/gui-docs/User-Manual/Installing-the-GUI.html).
 

Resources/Configs/acq_board_config.xml

@@ -2,7 +2,7 @@
 
 <SETTINGS>
   <INFO>
-    <VERSION>0.6.3</VERSION>
+    <VERSION>0.6.4</VERSION>
     <PLUGIN_API_VERSION>8</PLUGIN_API_VERSION>
     <DATE>unknown</DATE>
     <OS>Windows, Linux, or macOS</OS>

Resources/Configs/file_reader_config.xml

@@ -2,7 +2,7 @@
 
 <SETTINGS>
   <INFO>
-    <VERSION>0.6.3</VERSION>
+    <VERSION>0.6.4</VERSION>
     <PLUGIN_API_VERSION>8</PLUGIN_API_VERSION>
     <DATE>unknown</DATE>
     <OS>Windows, Linux, or macOS</OS>

Resources/Configs/neuropixels_pxi_config.xml

@@ -2,7 +2,7 @@
 
 <SETTINGS>
   <INFO>
-    <VERSION>0.6.3</VERSION>
+    <VERSION>0.6.4</VERSION>
     <PLUGIN_API_VERSION>8</PLUGIN_API_VERSION>
     <DATE>unknown</DATE>
     <OS>Windows</OS>

Resources/Installers/Linux/Open-Ephys_Installer/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: open-ephys
-Version: 0.6.3
+Version: 0.6.4
 Architecture: amd64
 Installed-Size: 18644
 Section: science

Resources/Installers/Windows/windows_installer_script.iss

@@ -1,7 +1,7 @@
 [Setup]
 AppName=Open Ephys
-AppVersion=0.6.3
-AppVerName=Open Ephys 0.6.3
+AppVersion=0.6.4
+AppVerName=Open Ephys 0.6.4
 AppCopyright=Copyright (C) 2010-2022, Open Ephys & Contributors
 AppPublisher=open-ephys.org
 AppPublisherURL=https://open-ephys.org/gui