Feature add logging csv

.gitignore

@@ -1,5 +1,14 @@
 */__pycache__
+__pycache__
+.vscode/*
+.vscode
 */.idea
+.idea
 *.pyc
+<<<<<<< HEAD
 /logs
 
+=======
+*/logs
+logs
+>>>>>>> feature_add_data_vis

WT_Server/CAN_Logger.py

@@ -0,0 +1,69 @@
+import os.path
+from datetime import datetime
+import time
+import sys
+import csv
+
+log_path = ''
+
+# Max resolution (ms) for data frames to be logged
+max_time_diff_ms = 10
+start_time = int(round(time.time() * 1000))
+last_time = start_time
+multi_frame_message = []
+
+def log_string(message):
+    global log_path
+    with open(log_path, 'a+') as logfile:
+        logfile.write(message)
+
+#Same concept as SensorDict's save_data_to_csv(    
+def log_csv(input_list):
+    global log_path
+    with open(log_path, 'a+') as fid:
+            logfile = csv.DictWriter(fid, 
+                                    fieldnames=["timestamp", "id", "data"],
+                                    extrasaction="ignore")
+            for dictionary in input_list:
+                logfile.writerow(dictionary)
+
+def create_logfile():
+    print("[INFO] Creating logfile...")
+    global log_path
+
+    start_date_time = datetime.now().strftime("%Y_%m_%d_%H_%M_%S")
+    start_path = os.path.abspath(os.path.dirname(__file__))
+
+    log_path = os.path.join(start_path, 'logs',
+                        start_date_time + '.csv')
+
+    #log_string(start_date_time)
+    log_csv([{"id": "id", "data": "data", "timestamp": "timestamp"}])
+
+    print("[INFO] Logfile created: {}.csv".format(start_date_time))
+
+
+# Logs a set of CAN frames in a time interval to a log file
+def log_CAN_data(can_id, message):
+
+    current_time = int(round(time.time() * 1000))
+
+    global start_time
+
+    # Wait for serial connection to stabilize, avoid garbage data
+    if current_time - start_time < 1500:
+        return
+
+    global last_time, multi_frame_message, log_path
+
+    delta_time = current_time - last_time
+    single_frame = {"id": str(can_id), "data": str(message), "timestamp": str(current_time-start_time)}
+
+    multi_frame_message.append(single_frame)
+
+    if(delta_time >= max_time_diff_ms):
+        log_csv(multi_frame_message)
+        last_time = current_time
+        print(str(multi_frame_message))
+        multi_frame_message.clear()
+

DAQ_Simulation.py → WT_Server/DAQ_Simulation.py

@@ -1,6 +1,7 @@
 import WirelessTelemServer as server
 import asyncio
 import random
+import time
 
 # This file simulates the job of the DAQ code.
 # A server is setup and broadcast on ip:port
@@ -9,6 +10,14 @@
 ip = '127.0.0.1'
 port = 5000
 
+possible_data = [
+    {
+        'i': '501',
+        'm': '0F900EBF02A0029F',
+        'ts': None
+    },
+]
+
 
 possible_data = [
     # {
@@ -47,12 +56,13 @@ async def send_data():
         await asyncio.sleep(0.01)
         index = int(random.random() * len(possible_data))
         data = possible_data[index]
-        await server.send_data(data)
+        data['ts'] = int(time.time()*1000)
+        await server.send_data([data])
 
 
 async def run_server(ip, port):
     wait_task = asyncio.ensure_future(send_data())
-    server_task = asyncio.ensure_future(server.get_server('127.0.0.1', 5000))
+    server_task = asyncio.ensure_future(server.get_server(ip, port))
 
     done, pending = await asyncio.wait(
         [wait_task, server_task],