add notion 1 and 2

Signed-off-by: Andrey Parfenov <[email protected]>
brainflow-dev · Sep 24, 2020 · 81cdb18 · 81cdb18
1 parent 1112827
commit 81cdb18
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 12 deletions.
diff --git a/csharp-package/brainflow/brainflow/board_controller_library.cs b/csharp-package/brainflow/brainflow/board_controller_library.cs
@@ -58,7 +58,8 @@ public enum BoardIds
         CALLIBRI_EMG_BOARD = 10,
         CALLIBRI_ECG_BOARD = 11,
         FASCIA_BOARD = 12,
-        NOTION_OSC_BOARD = 13
+        NOTION_1_BOARD = 13,
+        NOTION_2_BOARD = 14
     };
 
 

diff --git a/docs/SupportedBoards.rst b/docs/SupportedBoards.rst
@@ -21,7 +21,8 @@ To create an instance of BoardShim class for your board check required inputs in
    "CallibriEEG", "BoardIds.CALLIBRI_EEG_BOARD (9)", "-", "-", "-", "-", "-", "Optional: ExternalSwitchInputMioUSB (default is ExternalSwitchInputMioElectrodes)", "Timeout for device discovery(default 15sec)", "-"
    "CallibriEMG", "BoardIds.CALLIBRI_EMG_BOARD (10)", "-", "-", "-", "-", "-", "Optional: ExternalSwitchInputMioUSB (default is ExternalSwitchInputMioElectrodes)", "Timeout for device discovery(default 15sec)", "-"
    "CallibriECG", "BoardIds.CALLIBRI_ECG_BOARD (11)", "-", "-", "-", "-", "-", "Optional: ExternalSwitchInputMioUSB (default is ExternalSwitchInputMioElectrodes)", "Timeout for device discovery(default 15sec)", "-"
-   "NotionOSC", "BoardIds.NOTION_OSC_BOARD (13)", "-", "-", "-", "Optional: IP Port(default 9000)", "-", "-", "-", "Optional: seial number"
+   "Notion 1", "BoardIds.NOTION_1_BOARD (13)", "-", "-", "-", "-", "-", "-", "-", "Optional: serial number"
+   "Notion 2", "BoardIds.NOTION_2_BOARD (14)", "-", "-", "-", "-", "-", "-", "-", "Optional: serial number"
 
 
 Streaming Board
@@ -391,20 +392,49 @@ Board Spec:
 Neurosity
 ----------
 
-Notion
-~~~~~~~
+Notion 1
+~~~~~~~~~
 
 .. image:: https://live.staticflickr.com/65535/50093731531_68f2183bb3_o.jpg
     :width: 250px
     :height: 250px
 
 `Notion website <https://neurosity.co/>`_
 
+`Link to Neurosity Tutorial <https://dev.to/neurosity/using-brainflow-with-the-neurosity-headset-2kof>`_
+
 To choose this board in BoardShim constructor please specify:
 
 - board_id: 13
 - optional: Serial Number field of BrainFlowInputParams structure, important if you have multiple devices in the same place
-- optional: IP Port field of BrainFlowInputParams structure, default is 9000
+
+Supported platforms:
+
+- Windows
+- Linux
+- MacOS
+
+Board Spec:
+
+- num eeg channels: 8
+- sampling rate: 250
+- communication: UDP BroadCast
+
+Notion 2
+~~~~~~~~~
+
+.. image:: https://live.staticflickr.com/65535/50093731531_68f2183bb3_o.jpg
+    :width: 250px
+    :height: 250px
+
+`Notion website <https://neurosity.co/>`_
+
+`Link to Neurosity Tutorial <https://dev.to/neurosity/using-brainflow-with-the-neurosity-headset-2kof>`_
+
+To choose this board in BoardShim constructor please specify:
+
+- board_id: 14
+- optional: Serial Number field of BrainFlowInputParams structure, important if you have multiple devices in the same place
 
 Supported platforms:
 

diff --git a/java-package/brainflow/src/main/java/brainflow/BoardIds.java b/java-package/brainflow/src/main/java/brainflow/BoardIds.java
@@ -23,7 +23,8 @@ public enum BoardIds
     CALLIBRI_EMG_BOARD (10),
     CALLIBRI_ECG_BOARD (11),
     FASCIA_BOARD (12),
-    NOTION_OSC_BOARD (13);
+    NOTION_1_BOARD (13),
+    NOTION_2_BOARD (14);
 
     private final int board_id;
     private static final Map<Integer, BoardIds> bi_map = new HashMap<Integer, BoardIds> ();

diff --git a/julia-package/brainflow/src/board_shim.jl b/julia-package/brainflow/src/board_shim.jl
@@ -21,7 +21,8 @@ AnyIntType = Union{Int8, Int32, Int64, Int128, Int}
     CALLIBRI_EMG_BOARD = 10
     CALLIBRI_ECG_BOARD = 11
     FASCIA_BOARD = 12
-    NOTION_OSC_BOARD = 13
+    NOTION_1_BOARD = 13
+    NOTION_2_BOARD = 14
 
 end
 

diff --git a/matlab-package/brainflow/BoardIDs.m b/matlab-package/brainflow/BoardIDs.m
@@ -15,6 +15,7 @@
         CALLIBRI_EMG_BOARD (10)
         CALLIBRI_ECG_BOARD (11)
         FASCIA_BOARD (12)
-        NOTION_OSC_BOARD (13)
+        NOTION_1_BOARD (13)
+        NOTION_2_BOARD (14)
     end
 end
diff --git a/python-package/brainflow/board_shim.py b/python-package/brainflow/board_shim.py
@@ -33,7 +33,8 @@ class BoardIds (enum.Enum):
     CALLIBRI_EMG_BOARD = 10 #:
     CALLIBRI_ECG_BOARD = 11 #:
     FASCIA_BOARD = 12 #:
-    NOTION_OSC_BOARD = 13 #:
+    NOTION_1_BOARD = 13 #:
+    NOTION_2_BOARD = 14 #:
 
 
 class LogLevels (enum.Enum):

diff --git a/src/board_controller/board_controller.cpp b/src/board_controller/board_controller.cpp
@@ -117,7 +117,11 @@ int prepare_session (int board_id, char *json_brainflow_input_params)
         case BoardIds::FASCIA_BOARD:
             board = std::shared_ptr<Board> (new Fascia (params));
             break;
-        case BoardIds::NOTION_OSC_BOARD:
+        // notion 1 and notion 2 have the same class, the only difference is get_eeg_names
+        case BoardIds::NOTION_1_BOARD:
+            board = std::shared_ptr<Board> (new NotionOSC (params));
+            break;
+        case BoardIds::NOTION_2_BOARD:
             board = std::shared_ptr<Board> (new NotionOSC (params));
             break;
         default:

diff --git a/src/board_controller/inc/brainflow_boards.h b/src/board_controller/inc/brainflow_boards.h
@@ -196,6 +196,16 @@ json brainflow_boards_json = {
             {"eeg_channels", {1, 2, 3, 4, 5, 6, 7, 8}},
             {"eeg_names", "CP6,F6,C4,CP4,CP3,F5,C3,CP5"},
             {"other_channels", {9}}
+        }},
+        {"14",
+            {{"name", "NotionOSC"},
+            {"sampling_rate", 250},
+            {"timestamp_channel", 10},
+            {"package_num_channel", 0},
+            {"num_rows", 11},
+            {"eeg_channels", {1, 2, 3, 4, 5, 6, 7, 8}},
+            {"eeg_names", "CP5,F5,C3,CP3,CP6,F6,C4,CP4"},
+            {"other_channels", {9}}
         }}
     }
 }};

diff --git a/src/board_controller/neurosity/notion_osc.cpp b/src/board_controller/neurosity/notion_osc.cpp
@@ -13,7 +13,7 @@ constexpr int NotionOSC::num_channels;
 
 
 NotionOSC::NotionOSC (struct BrainFlowInputParams params)
-    : Board ((int)BoardIds::NOTION_OSC_BOARD, params)
+    : Board ((int)BoardIds::NOTION_1_BOARD, params)
 {
     socket = NULL;
     keep_alive = false;

diff --git a/src/utils/inc/brainflow_constants.h b/src/utils/inc/brainflow_constants.h
@@ -45,7 +45,8 @@ enum class BoardIds : int
     CALLIBRI_EMG_BOARD = 10,
     CALLIBRI_ECG_BOARD = 11,
     FASCIA_BOARD = 12,
-    NOTION_OSC_BOARD = 13
+    NOTION_1_BOARD = 13,
+    NOTION_2_BOARD = 14
 };
 
 enum class FilterTypes : int