Changeset 291
- Timestamp:
- 09/27/11 14:38:21 (10 years ago)
- Location:
- trunk/Puzzlebox/Synapse
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Puzzlebox/Synapse/Interface.py
r290 r291 907 907 908 908 909 header = 'Date,Time,Delta,Theta,Low Alpha,High Alpha,Low Beta,High Beta,Low Gamma,Mid Gamma,Attention,Meditation,Signal Level' 910 911 for each in target.customDataHeaders: 912 header = header + ',%s' % each 913 914 header = header + '\n' 909 headers = 'Date,Time,Delta,Theta,Low Alpha,High Alpha,Low Beta,High Beta,Low Gamma,Mid Gamma,Attention,Meditation,Signal Level' 910 911 customDataHeaders = [] 912 for header in target.customDataHeaders: 913 customDataHeaders.append(header) 914 for plugin in target.activePlugins: 915 for header in plugin.customDataHeaders: 916 customDataHeaders.append(header) 917 918 for each in customDataHeaders: 919 headers = headers + ',%s' % each 920 921 headers = headers + '\n' 915 922 916 923 csv = {} … … 943 950 csv[timestamp]['Signal Level'] = '' 944 951 945 for each in target.customDataHeaders:946 csv[timestamp][ each] = ''952 for header in customDataHeaders: 953 csv[timestamp][header] = '' 947 954 948 955 … … 974 981 csv[timestamp]['Signal Level'] = packet['poorSignalLevel'] 975 982 976 for each in target.customDataHeaders:983 for header in customDataHeaders: 977 984 if 'custom' in packet.keys() and \ 978 eachin packet['custom'].keys():979 csv[timestamp][ each] = packet['custom'][each]985 header in packet['custom'].keys(): 986 csv[timestamp][header] = packet['custom'][header] 980 987 981 988 … … 984 991 985 992 986 output = header 993 output = headers 987 994 988 995 csv_keys = csv.keys() … … 1006 1013 csv[key]['Signal Level']) 1007 1014 1008 for each in target.customDataHeaders:1009 row = row + ',%s' % csv[key][ each]1015 for header in customDataHeaders: 1016 row = row + ',%s' % csv[key][header] 1010 1017 1011 1018 row = row + '\n' -
trunk/Puzzlebox/Synapse/Protocol.py
r286 r291 765 765 self.session_start_timestamp = time.time() 766 766 767 self.parseStream() 767 if self.device != None: 768 self.parseStream() 768 769 769 770 … … 1049 1050 def run(self): 1050 1051 1052 if self.device == None: 1053 self.keep_running = False 1054 1051 1055 self.buffer = '' 1052 1056 -
trunk/Puzzlebox/Synapse/Server.py
r284 r291 187 187 188 188 self.serial_device.start() 189 190 self.protocol = \ 191 serial_interface.ProtocolHandler( \ 192 self.log, \ 193 self.serial_device, \ 194 self.device_id, \ 195 DEBUG=self.DEBUG, \ 196 parent=self) 197 198 self.protocol.start() 189 190 else: 191 self.serial_device = None 192 193 194 self.protocol = \ 195 serial_interface.ProtocolHandler( \ 196 self.log, \ 197 self.serial_device, \ 198 self.device_id, \ 199 DEBUG=self.DEBUG, \ 200 parent=self) 201 202 self.protocol.start() 199 203 200 204
Note: See TracChangeset
for help on using the changeset viewer.