Skip to content

Commit 5a20525

Browse files
author
William Schumacher
committed
Reverted AF7 and AF8 to AF3 and AF4, the docs are wrong.
Removed TP7 and TP8, the do not report values.
1 parent b1ab73a commit 5a20525

File tree

1 file changed

+12
-16
lines changed

1 file changed

+12
-16
lines changed

‎python/emotiv.py

+12-16
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
sensorBits = {
1818
'F3': [10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7],
1919
'FC5': [28, 29, 30, 31, 16, 17, 18, 19, 20, 21, 22, 23, 8, 9],
20-
'AF7': [46, 47, 32, 33, 34, 35, 36, 37, 38, 39, 24, 25, 26, 27],
20+
'AF3': [46, 47, 32, 33, 34, 35, 36, 37, 38, 39, 24, 25, 26, 27],
2121
'F7': [48, 49, 50, 51, 52, 53, 54, 55, 40, 41, 42, 43, 44, 45],
2222
'T7': [66, 67, 68, 69, 70, 71, 56, 57, 58, 59, 60, 61, 62, 63],
2323
'P7': [84, 85, 86, 87, 72, 73, 74, 75, 76, 77, 78, 79, 64, 65],
@@ -26,7 +26,7 @@
2626
'P8': [158, 159, 144, 145, 146, 147, 148, 149, 150, 151, 136, 137, 138, 139],
2727
'T8': [160, 161, 162, 163, 164, 165, 166, 167, 152, 153, 154, 155, 156, 157],
2828
'F8': [178, 179, 180, 181, 182, 183, 168, 169, 170, 171, 172, 173, 174, 175],
29-
'AF8': [196, 197, 198, 199, 184, 185, 186, 187, 188, 189, 190, 191, 176, 177],
29+
'AF4': [196, 197, 198, 199, 184, 185, 186, 187, 188, 189, 190, 191, 176, 177],
3030
'FC6': [214, 215, 200, 201, 202, 203, 204, 205, 206, 207, 192, 193, 194, 195],
3131
'F4': [216, 217, 218, 219, 220, 221, 222, 223, 208, 209, 210, 211, 212, 213],
3232
}
@@ -73,7 +73,7 @@ def handle_quality(self, sensors):
7373
elif sensor == 1:
7474
sensors['FC5']['quality'] = current_contact_quality
7575
elif sensor == 2:
76-
sensors['AF7']['quality'] = current_contact_quality
76+
sensors['AF3']['quality'] = current_contact_quality
7777
elif sensor == 3:
7878
sensors['F7']['quality'] = current_contact_quality
7979
elif sensor == 4:
@@ -91,21 +91,21 @@ def handle_quality(self, sensors):
9191
elif sensor == 10:
9292
sensors['F8']['quality'] = current_contact_quality
9393
elif sensor == 11:
94-
sensors['AF8']['quality'] = current_contact_quality
94+
sensors['AF4']['quality'] = current_contact_quality
9595
elif sensor == 12:
9696
sensors['FC6']['quality'] = current_contact_quality
9797
elif sensor == 13:
9898
sensors['F4']['quality'] = current_contact_quality
9999
elif sensor == 14:
100100
sensors['F8']['quality'] = current_contact_quality
101101
elif sensor == 15:
102-
sensors['AF8']['quality'] = current_contact_quality
102+
sensors['AF4']['quality'] = current_contact_quality
103103
elif sensor == 64:
104104
sensors['F3']['quality'] = current_contact_quality
105105
elif sensor == 65:
106106
sensors['FC5']['quality'] = current_contact_quality
107107
elif sensor == 66:
108-
sensors['AF7']['quality'] = current_contact_quality
108+
sensors['AF3']['quality'] = current_contact_quality
109109
elif sensor == 67:
110110
sensors['F7']['quality'] = current_contact_quality
111111
elif sensor == 68:
@@ -123,15 +123,15 @@ def handle_quality(self, sensors):
123123
elif sensor == 74:
124124
sensors['F8']['quality'] = current_contact_quality
125125
elif sensor == 75:
126-
sensors['AF8']['quality'] = current_contact_quality
126+
sensors['AF4']['quality'] = current_contact_quality
127127
elif sensor == 76:
128128
sensors['FC6']['quality'] = current_contact_quality
129129
elif sensor == 77:
130130
sensors['F4']['quality'] = current_contact_quality
131131
elif sensor == 78:
132132
sensors['F8']['quality'] = current_contact_quality
133133
elif sensor == 79:
134-
sensors['AF8']['quality'] = current_contact_quality
134+
sensors['AF4']['quality'] = current_contact_quality
135135
elif sensor == 80:
136136
sensors['FC6']['quality'] = current_contact_quality
137137
else:
@@ -216,14 +216,12 @@ def __init__(self, displayOutput=True, headsetId=0, research_headset=True):
216216
'F8': {'value': 0, 'quality': 0},
217217
'T7': {'value': 0, 'quality': 0},
218218
'P8': {'value': 0, 'quality': 0},
219-
'TP7': {'value': 0, 'quality': 0},
220-
'AF8': {'value': 0, 'quality': 0},
219+
'AF4': {'value': 0, 'quality': 0},
221220
'F4': {'value': 0, 'quality': 0},
222-
'AF7': {'value': 0, 'quality': 0},
221+
'AF3': {'value': 0, 'quality': 0},
223222
'O2': {'value': 0, 'quality': 0},
224223
'O1': {'value': 0, 'quality': 0},
225224
'FC5': {'value': 0, 'quality': 0},
226-
'TP8': {'value': 0, 'quality': 0},
227225
'X': {'value': 0, 'quality': 0},
228226
'Y': {'value': 0, 'quality': 0},
229227
'Unknown': {'value': 0, 'quality': 0}
@@ -250,14 +248,12 @@ def updateStdout(self):
250248
print "F8 Reading: %i Strength: %i" % (self.sensors['F8']['value'], self.sensors['F8']['quality'])
251249
print "T7 Reading: %i Strength: %i" % (self.sensors['T7']['value'], self.sensors['T7']['quality'])
252250
print "P8 Reading: %i Strength: %i" % (self.sensors['P8']['value'], self.sensors['P8']['quality'])
253-
print "AF8 Reading: %i Strength: %i" % (self.sensors['AF8']['value'], self.sensors['AF8']['quality'])
254-
print "TP7 Reading: %i Strength: %i" % (self.sensors['TP7']['value'], self.sensors['TP7']['quality'])
251+
print "AF4 Reading: %i Strength: %i" % (self.sensors['AF8']['value'], self.sensors['AF8']['quality'])
255252
print "F4 Reading: %i Strength: %i" % (self.sensors['F4']['value'], self.sensors['F4']['quality'])
256-
print "AF7 Reading: %i Strength: %i" % (self.sensors['AF7']['value'], self.sensors['AF7']['quality'])
253+
print "AF3 Reading: %i Strength: %i" % (self.sensors['AF7']['value'], self.sensors['AF7']['quality'])
257254
print "O2 Reading: %i Strength: %i" % (self.sensors['O2']['value'], self.sensors['O2']['quality'])
258255
print "O1 Reading: %i Strength: %i" % (self.sensors['O1']['value'], self.sensors['O1']['quality'])
259256
print "FC5 Reading: %i Strength: %i" % (self.sensors['FC5']['value'], self.sensors['FC5']['quality'])
260-
print "TP8 Reading: %i Strength: %i" % (self.sensors['TP8']['value'], self.sensors['TP8']['quality'])
261257
print "Unknown Reading: %i Strength: %i" % (self.sensors['Unknown']['value'], self.sensors['Unknown']['quality'])
262258
print "Gyro X: %i, Gyro Y: %i, Battery: %i" % (
263259
self.sensors['X']['value'], self.sensors['Y']['value'], g_battery)

0 commit comments

Comments
 (0)