annotate-output now accepts a datetime format, so let's use it

[toast/airingbutler.git] / plot_mhz19.py

diff --git a/plot_mhz19.py b/plot_mhz19.py
index 4d3b90ab0b01e77a1348160cc7e3aef96e1c6512..7d53481d34b141b33198380d6b5d86ab249b89d0 100755 (executable)
--- a/plot_mhz19.py
+++ b/plot_mhz19.py
@@ -5,35 +5,30 @@ import argparse
 from datetime import datetime, date, timedelta
 from matplotlib import pyplot as plt
 
 from datetime import datetime, date, timedelta
 from matplotlib import pyplot as plt
 

-filename = 'log.csv'

 '''
 '''

+# annotate-output +"%F %T" ./log_mhz19.py -d /dev/arduino | tee -a log
+filename = 'log.csv'

 Time,TS,CO2,Temp
 Time,TS,CO2,Temp

-21:02:02,0,661,24
-21:02:08,5021,657,24
-
+2024-09-22 01:08:15,279472,1578,24
+2024-09-22 01:08:20,284518,1577,24

 '''
 
 '''
 

-def parsedatetime(timevalue, currentdate):
-    dt = datetime.strptime(timevalue, '%H:%M:%S')
-    return datetime.combine(currentdate, dt.time())
-

 def main():
     parser = argparse.ArgumentParser('Plot log.csv.')
 def main():
     parser = argparse.ArgumentParser('Plot log.csv.')

-    parser.add_argument('--temperature', '-t', action='store_true', help='Include temperature plot')
+    parser.add_argument('filename', nargs='?', default='log.csv', help='Name of csv file')
+    parser.add_argument('-t', '--temperature', action='store_true', help='Include temperature plot')

     args = parser.parse_args()
 
     args = parser.parse_args()
 

-    with open(filename) as f:
+    with open(args.filename) as f:

         reader = csv.reader(f)
         headers = next(reader)
 
         time = []
         co2 = []
         temp = []
         reader = csv.reader(f)
         headers = next(reader)
 
         time = []
         co2 = []
         temp = []

-        startdate = date(2020, 10, 22)

         for row in reader:
         for row in reader:

-            dt = parsedatetime(row[0], startdate)
+            dt = datetime.strptime(row[0], '%Y-%m-%d %H:%M:%S')

             if len(time) > 0 and dt - time[-1] < timedelta(hours=-2): # DST switch!
             if len(time) > 0 and dt - time[-1] < timedelta(hours=-2): # DST switch!

-                startdate += timedelta(days=1)

                 dt += timedelta(days=1)
             time.append(dt)
             co2.append(int(row[2]))
                 dt += timedelta(days=1)
             time.append(dt)
             co2.append(int(row[2]))