Skip to content

Commit

Permalink
Merge remote-tracking branch 'openbci/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrey1994 committed Jan 31, 2020
2 parents 4cd841e + 949198b commit e413c87
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions python-package/brainflow/board_shim.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def __init__ (self):
self.other_info = ''

def to_json (self):
return json.dumps (self, default = lambda o: o.__dict__,
return json.dumps (self, default = lambda o: o.__dict__,
sort_keys = True, indent = 4)

class BrainFlowError (Exception):
Expand Down Expand Up @@ -379,7 +379,7 @@ def enable_dev_board_logger (cls):
@classmethod
def log_message (cls, log_level, message):
"""write your own log message to BrainFlow logger, use it if you wanna have single logger for your own code and BrainFlow's code
:param log_level: log level
:type log_file: int
:param message: message
Expand Down Expand Up @@ -451,7 +451,7 @@ def get_battery_channel (cls, board_id):
:raises BrainFlowError: If this board has no such data exit code is UNSUPPORTED_BOARD_ERROR
"""
battery_channel = numpy.zeros (1).astype (numpy.int32)
res = BoardControllerDLL.get_instance ().get_package_num_channel (board_id, battery_channel)
res = BoardControllerDLL.get_instance ().get_battery_channel (board_id, battery_channel)
if res != BrainflowExitCodes.STATUS_OK.value:
raise BrainFlowError ('unable to request info about this board', res)
return int (battery_channel[0])
Expand Down

0 comments on commit e413c87

Please sign in to comment.