add ganglion native ble scan (#3)

* add ganglion native ble scan

Signed-off-by: Andrey Parfenov <a1994ndrey@gmail.com>

Author: Andrey1994

.travis.yml

@@ -1,11 +1,11 @@
 sudo: required
-dist: xenial
+dist: jammy
 
 os:
   - linux
   - osx
 
-osx_image: xcode9.4
+osx_image: xcode14.1
 
 services:
   - docker
@@ -24,19 +24,23 @@ addons:
       - python3
       - python3-setuptools
       - python3-pip
+      - ninja-build
 
 install:
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-      docker pull dockcross/manylinux-x64 ;
+      docker pull dockcross/manylinux2014-x64:20210708-94745ff ;
+    fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+      brew install ninja ;
     fi
 
 script:
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-      docker run -e TRAVIS_BUILD_DIR=$TRAVIS_BUILD_DIR -v $TRAVIS_BUILD_DIR:$TRAVIS_BUILD_DIR dockcross/manylinux-x64 /bin/bash -c "/opt/python/cp36-cp36m/bin/pip3.6 install cmake==3.13.0 && cd $TRAVIS_BUILD_DIR && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/installed_docker -DCMAKE_BUILD_TYPE=Release .. && make" ;
+      docker run -e TRAVIS_BUILD_DIR=$TRAVIS_BUILD_DIR -v $TRAVIS_BUILD_DIR:$TRAVIS_BUILD_DIR dockcross/manylinux2014-x64:20210708-94745ff /bin/bash -c "yum install -y bluez-libs-devel dbus-devel && /opt/python/cp36-cp36m/bin/pip3.6 install cmake==3.21.4 && cd $TRAVIS_BUILD_DIR && mkdir build && cd build && /opt/_internal/cpython-3.6.14/bin/cmake -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/installed_docker -DCMAKE_BUILD_TYPE=Release .. && make" ;
     fi
   # build for mac
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-      cd $TRAVIS_BUILD_DIR && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/installed -DCMAKE_BUILD_TYPE=Release .. && make ;
+      cd $TRAVIS_BUILD_DIR && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/installed -DCMAKE_BUILD_TYPE=Release -G Ninja -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 .. && ninja ;
     fi
   - cd $TRAVIS_BUILD_DIR && cd java-package/openbci_gui_helpers && mvn package
 

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 3.10)
 project (OpenBCI_GUI_Helpers)
 
-set (CMAKE_CXX_STANDARD 11)
+set (CMAKE_CXX_STANDARD 17)
 set (CMAKE_VERBOSE_MAKEFILE ON)
 set (BRAINFLOW_VERSION 2.1.0)
 
@@ -51,6 +51,8 @@ endmacro ()
 # link msvc runtime statically
 configure_msvc_runtime ()
 
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/third_party/SimpleBLE/simpleble)
+
 SET (GANGLION_LIB "GanglionScan")
 set (GANGLION_SOURCE_LIB
     ${CMAKE_HOME_DIRECTORY}/src/callbacks.cpp
@@ -80,4 +82,34 @@ set_target_properties (${GANGLION_LIB}
     ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/java-package/openbci_gui_helpers/src/main/resources/
     LIBRARY_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/java-package/openbci_gui_helpers/src/main/resources/
     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/java-package/openbci_gui_helpers/src/main/resources/
+)
+
+SET (GANGLION_NATIVE_LIB "GanglionNativeScan")
+set (GANGLION_NATIVE_SOURCE_LIB
+    ${CMAKE_HOME_DIRECTORY}/src/openbci_gui_native_helpers.cpp
+)
+
+add_library (${GANGLION_NATIVE_LIB} SHARED ${GANGLION_NATIVE_SOURCE_LIB})
+
+target_include_directories (${GANGLION_NATIVE_LIB} PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_HOME_DIRECTORY}/src/inc>
+    $<BUILD_INTERFACE:${CMAKE_HOME_DIRECTORY}/third_party/json>
+    $<BUILD_INTERFACE:${CMAKE_HOME_DIRECTORY}/third_party/SimpleBLE/simpleble/include/simpleble>
+)
+
+target_link_libraries (${GANGLION_NATIVE_LIB} PRIVATE simpleble)
+
+set_property (TARGET ${GANGLION_NATIVE_LIB} PROPERTY POSITION_INDEPENDENT_CODE ON)
+
+set_target_properties (${GANGLION_NATIVE_LIB}
+    PROPERTIES
+    ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_HOME_DIRECTORY}/java-package/openbci_gui_helpers/src/main/resources/
+    LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_HOME_DIRECTORY}/java-package/openbci_gui_helpers/src/main/resources/
+    RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_HOME_DIRECTORY}/java-package/openbci_gui_helpers/src/main/resources/
+    ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_HOME_DIRECTORY}/java-package/openbci_gui_helpers/src/main/resources/
+    LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_HOME_DIRECTORY}/java-package/openbci_gui_helpers/src/main/resources/
+    RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_HOME_DIRECTORY}/java-package/openbci_gui_helpers/src/main/resources/
+    ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/java-package/openbci_gui_helpers/src/main/resources/
+    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/java-package/openbci_gui_helpers/src/main/resources/
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/java-package/openbci_gui_helpers/src/main/resources/
 )

appveyor.yml

@@ -1,5 +1,5 @@
 image:
-- Visual Studio 2017
+- Visual Studio 2019
 
 stack: python 3
 
@@ -23,7 +23,7 @@ init:
   - cmd: set JAVA_HOME=C:\Program Files\Java\jdk1.8.0
 
 install:
-  - mkdir %APPVEYOR_BUILD_FOLDER%\build64 && cd %APPVEYOR_BUILD_FOLDER%\build64 && cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_SYSTEM_VERSION=8.1 -DCMAKE_INSTALL_PREFIX=..\installed64\ .. && cmake --build . --config Release > build64_stdout.txt
+  - mkdir %APPVEYOR_BUILD_FOLDER%\build64 && cd %APPVEYOR_BUILD_FOLDER%\build64 && cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_SYSTEM_VERSION=10.0.19041.0 -DCMAKE_INSTALL_PREFIX=..\installed64\ .. && cmake --build . --config Release > build64_stdout.txt
   # mvn package for java
   - cd %APPVEYOR_BUILD_FOLDER%\java-package\openbci_gui_helpers && mvn package > maven_package_stdout.txt
 deploy_script:

java-package/openbci_gui_helpers/pom.xml

@@ -59,6 +59,9 @@
           <include>GanglionScan.dll</include>
           <include>libGanglionScan.so</include>
           <include>libGanglionScan.dylib</include>
+          <include>GanglionNativeScan.dll</include>
+          <include>libGanglionNativeScan.so</include>
+          <include>libGanglionNativeScan.dylib</include>
         </includes>
       </resource>
     </resources>

java-package/openbci_gui_helpers/src/main/java/openbci_gui_helpers/GUIHelper.java

@@ -1,21 +1,17 @@
 package openbci_gui_helpers;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.Type;
 import java.nio.file.Files;
-import java.util.Arrays;
-import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.lang3.SystemUtils;
 
-import com.sun.jna.Library;
-import com.sun.jna.Native;
-
-import java.lang.reflect.Type;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
+import com.sun.jna.Library;
+import com.sun.jna.Native;
 
 public class GUIHelper
 {
@@ -24,24 +20,35 @@ private interface DllInterface extends Library
         int scan_for_ganglions (String serial_port, int timeout_sec, byte[] output, int[] output_len);
     }
 
+    private interface DllNativeInterface extends Library
+    {
+        int scan_for_ganglions (int timeout_sec, byte[] output, int[] output_len);
+    }
+
     private static DllInterface instance;
+    private static DllNativeInterface instance_native;
 
     static
     {
         String lib_name = "libGanglionScan.so";
+        String lib_native_name = "libGanglionNativeScan.so";
         if (SystemUtils.IS_OS_WINDOWS)
         {
             lib_name = "GanglionScan.dll";
+            lib_native_name = "GanglionNativeScan.dll";
 
         } else if (SystemUtils.IS_OS_MAC)
         {
             lib_name = "libGanglionScan.dylib";
+            lib_native_name = "libGanglionNativeScan.dylib";
         }
 
         // need to extract libraries from jar
         unpack_from_jar (lib_name);
+        unpack_from_jar (lib_native_name);
 
         instance = (DllInterface) Native.loadLibrary (lib_name, DllInterface.class);
+        instance_native = (DllNativeInterface) Native.loadLibrary (lib_native_name, DllNativeInterface.class);
     }
 
     private static void unpack_from_jar (String lib_name)
@@ -77,4 +84,22 @@ public static Map<String, String> scan_for_ganglions (String port_name, int time
         return map;
     }
 
+    public static Map<String, String> scan_for_ganglions (int timeout_sec) throws GanglionError
+    {
+        int[] len = new int[1];
+        byte[] output_json = new byte[10240];
+        int ec = instance_native.scan_for_ganglions (timeout_sec, output_json, len);
+        if (ec != GanglionExitCodes.STATUS_OK.get_code ())
+        {
+            throw new GanglionError ("Error in scan for ganglions", ec);
+        }
+        String json = new String (output_json, 0, len[0]);
+        Gson gson = new Gson ();
+        Type type = new TypeToken<Map<String, String>> ()
+        {
+        }.getType ();
+        Map<String, String> map = gson.fromJson (json, type);
+        return map;
+    }
+
 }

java-package/openbci_gui_helpers/src/main/java/openbci_gui_helpers/examples/TestNativeDiscovery.java

@@ -0,0 +1,20 @@
+package openbci_gui_helpers.examples;
+
+import java.util.Map;
+
+import openbci_gui_helpers.GUIHelper;
+import openbci_gui_helpers.GanglionError;
+
+public class TestNativeDiscovery
+{
+
+    public static void main (String[] args) throws GanglionError
+    {
+        Map<String, String> map = GUIHelper.scan_for_ganglions (3);
+        for (Map.Entry<String, String> entry : map.entrySet ())
+        {
+            System.out.println ("Key = " + entry.getKey () + ", Value = " + entry.getValue ());
+        }
+        System.out.println ("Completed");
+    }
+}

src/inc/openbci_gui_native_helpers.h

@@ -0,0 +1,29 @@
+#pragma once
+
+#ifdef _WIN32
+#define SHARED_EXPORT __declspec(dllexport)
+#define CALLING_CONVENTION __cdecl
+#else
+#define SHARED_EXPORT __attribute__ ((visibility ("default")))
+#define CALLING_CONVENTION
+#endif
+
+typedef enum
+{
+    STATUS_OK = 0,
+    PORT_OPEN_ERROR,
+    GENERAL_ERROR,
+    SYNC_ERROR
+} GanglionScanExitCodes;
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+    SHARED_EXPORT int CALLING_CONVENTION scan_for_ganglions (
+        int timeout_sec, char *output, int *output_len);
+
+#ifdef __cplusplus
+}
+#endif

src/openbci_gui_helpers.cpp

@@ -22,7 +22,7 @@ using json = nlohmann::json;
 namespace GanglionDetails
 {
     int exit_code = (int)GanglionScanExitCodes::STATUS_OK;
-    std::map<std::string, std::string> devices; // mac_addr, name
+    std::map<std::string, std::string> devices;
 
     void output (uint8 len1, uint8 *data1, uint16 len2, uint8 *data2)
     {

src/openbci_gui_native_helpers.cpp

@@ -0,0 +1,48 @@
+#include <chrono>
+#include <ctype.h>
+#include <map>
+#include <stdlib.h>
+#include <string.h>
+#include <string>
+
+#include "SimpleBLE.h"
+#include "openbci_gui_native_helpers.h"
+
+#include "json.hpp"
+
+using json = nlohmann::json;
+
+
+int scan_for_ganglions (int timeout_sec, char *output_json, int *output_len)
+{
+    std::map<std::string, std::string> devices;
+    auto adapter_list = SimpleBLE::Adapter::get_adapters ();
+    if (adapter_list.empty ())
+    {
+        return (int)GanglionScanExitCodes::PORT_OPEN_ERROR;
+    }
+
+    adapter_list[0].set_callback_on_scan_found (
+        [&devices] (SimpleBLE::Peripheral peripheral)
+        {
+            std::string identifier = peripheral.identifier ();
+            std::string mac_address = peripheral.address ();
+            if (strncmp (identifier.c_str (), "Ganglion", 8) == 0)
+            {
+                devices[identifier] = mac_address;
+            }
+            else if (strncmp (identifier.c_str (), "Simblee", 7) == 0)
+            {
+                devices[identifier] = mac_address;
+            }
+        });
+
+    adapter_list[0].scan_for (timeout_sec * 1000);
+
+    json result (devices);
+    std::string s = result.dump ();
+    strcpy (output_json, s.c_str ());
+    *output_len = s.length ();
+
+    return (int)GanglionScanExitCodes::STATUS_OK;
+}