Skip to content

Commit 6697cfb

Browse files
committed
updated brainflow integration, adds support for new devices
1 parent 4e25583 commit 6697cfb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+360
-17393
lines changed

Setup_BrainBay.exe

-3.29 MB
Binary file not shown.

bin/BoardController32.dll

107 KB
Binary file not shown.

bin/BrainBitLib32.dll

0 Bytes
Binary file not shown.

bin/BrainFlowBluetooth32.dll

0 Bytes
Binary file not shown.

bin/DataHandler32.dll

512 Bytes
Binary file not shown.

bin/GanglionLib32.dll

0 Bytes
Binary file not shown.

bin/MLModule32.dll

-3.73 MB
Binary file not shown.

bin/MuseLib32.dll

-512 Bytes
Binary file not shown.

bin/brainBay.exe

1.5 KB
Binary file not shown.

lib/Brainflow/inc/board_controller.h

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,39 +7,42 @@
77
extern "C"
88
{
99
#endif
10-
// I dont use const char * because I am not sure that all
11-
// languages support passing const char * instead char *
12-
1310
// data acquisition methods
1411
SHARED_EXPORT int CALLING_CONVENTION prepare_session (
15-
int board_id, char *json_brainflow_input_params);
16-
SHARED_EXPORT int CALLING_CONVENTION start_stream (
17-
int buffer_size, char *streamer_params, int board_id, char *json_brainflow_input_params);
12+
int board_id, const char *json_brainflow_input_params);
13+
SHARED_EXPORT int CALLING_CONVENTION start_stream (int buffer_size, const char *streamer_params,
14+
int board_id, const char *json_brainflow_input_params);
1815
SHARED_EXPORT int CALLING_CONVENTION stop_stream (
19-
int board_id, char *json_brainflow_input_params);
16+
int board_id, const char *json_brainflow_input_params);
2017
SHARED_EXPORT int CALLING_CONVENTION release_session (
21-
int board_id, char *json_brainflow_input_params);
22-
SHARED_EXPORT int get_current_board_data (int num_samples, double *data_buf,
23-
int *returned_samples, int board_id, char *json_brainflow_input_params);
18+
int board_id, const char *json_brainflow_input_params);
19+
SHARED_EXPORT int get_current_board_data (int num_samples, int preset, double *data_buf,
20+
int *returned_samples, int board_id, const char *json_brainflow_input_params);
2421
SHARED_EXPORT int CALLING_CONVENTION get_board_data_count (
25-
int *result, int board_id, char *json_brainflow_input_params);
26-
SHARED_EXPORT int CALLING_CONVENTION get_board_data (
27-
int data_count, double *data_buf, int board_id, char *json_brainflow_input_params);
28-
SHARED_EXPORT int CALLING_CONVENTION config_board (char *config, char *response,
29-
int *response_len, int board_id, char *json_brainflow_input_params);
22+
int preset, int *result, int board_id, const char *json_brainflow_input_params);
23+
SHARED_EXPORT int CALLING_CONVENTION get_board_data (int data_count, int preset,
24+
double *data_buf, int board_id, const char *json_brainflow_input_params);
25+
SHARED_EXPORT int CALLING_CONVENTION config_board (const char *config, char *response,
26+
int *response_len, int board_id, const char *json_brainflow_input_params);
3027
SHARED_EXPORT int CALLING_CONVENTION is_prepared (
31-
int *prepared, int board_id, char *json_brainflow_input_params);
28+
int *prepared, int board_id, const char *json_brainflow_input_params);
3229
SHARED_EXPORT int CALLING_CONVENTION insert_marker (
33-
double marker_value, int board_id, char *json_brainflow_input_params);
30+
double marker_value, int preset, int board_id, const char *json_brainflow_input_params);
31+
SHARED_EXPORT int CALLING_CONVENTION add_streamer (
32+
const char *streamer, int preset, int board_id, const char *json_brainflow_input_params);
33+
SHARED_EXPORT int CALLING_CONVENTION release_all_sessions ();
3434

3535
// logging methods
36-
SHARED_EXPORT int CALLING_CONVENTION set_log_level (int log_level);
37-
SHARED_EXPORT int CALLING_CONVENTION set_log_file (char *log_file);
38-
SHARED_EXPORT int CALLING_CONVENTION log_message (int log_level, char *message);
36+
SHARED_EXPORT int CALLING_CONVENTION set_log_level_board_controller (int log_level);
37+
SHARED_EXPORT int CALLING_CONVENTION set_log_file_board_controller (const char *log_file);
38+
SHARED_EXPORT int CALLING_CONVENTION log_message_board_controller (
39+
int log_level, char *message);
3940

4041
// platform types and methods
4142
typedef const struct JNINativeInterface *JNIEnv; // A handle to use Java's JNI
4243
SHARED_EXPORT int CALLING_CONVENTION java_set_jnienv (JNIEnv *java_jnienv);
44+
SHARED_EXPORT int CALLING_CONVENTION get_version_board_controller (
45+
char *version, int *num_chars, int max_chars);
4346

4447
#ifdef __cplusplus
4548
}

0 commit comments

Comments
 (0)