Skip to content

Impedance support #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 7, 2018
Merged

Impedance support #60

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1332ba
Fixing impedance issues. Now measured correctly.
Mar 6, 2018
3636ea6
correcting error handling
Mar 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions openbci/ganglion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ def handle_sample(sample):
except:
DefaultDelegate = object
STUB_BTLE = True
else:
from bluepy.btle import Scanner, DefaultDelegate, Peripheral


SAMPLE_RATE = 200.0 # Hz
scale_fac_uVolts_per_count = 1200 / (8388607.0 * 1.5 * 51.0)
Expand Down Expand Up @@ -78,7 +81,7 @@ def __init__(self, port=None, baud=0, filter_data=False,
self.timeout = timeout
self.max_packets_to_skip = max_packets_to_skip
self.scaling_output = scaled_output
self.impedance = False
self.impedance = impedance

# might be handy to know API
self.board_type = "ganglion"
Expand Down Expand Up @@ -562,11 +565,11 @@ def parse18bit(self, packet_id, packet):

def parseImpedance(self, packet_id, packet):
""" Dealing with impedance data. packet: ASCII data. NB: will take few packet (seconds) to fill"""
if packet[-2:] != "Z\n":
if packet[-2:] != b"Z\n":
print('Wrong format for impedance check, should be ASCII ending with "Z\\n"')

# convert from ASCII to actual value
imp_value = int(packet[:-2])
imp_value = int(packet[:-2]) / 2
# from 201 to 205 codes to the right array size
self.lastImpedance[packet_id- 201] = imp_value
self.pushSample(packet_id - 200, self.lastChannelData, self.lastAcceleromoter, self.lastImpedance)
Expand Down