adjusted offset 1

src/humidity/tlogger.py

@@ -70,8 +70,9 @@ class T_logger:
             now = pd.Timestamp("now")
             period = now - pd.Timedelta(self.period)
             mask = (df.index >= period) & (df.index <= now)
-            df_24 = df.loc[mask]
-            cols = [col for col in df.columns if name in col]
+            df_avg = df.rolling(window="1min", min_periods=1)
+            df_24 = df_avg.loc[mask]
+            cols = [col for col in df_avg.columns if name in col]
             df_24.index = mdates.date2num(df_24.index)
             ax = df_24.plot(y=cols)
             ax.xaxis.set_major_formatter(self.myFmt)
@@ -84,30 +85,19 @@ class T_logger:
         fo.seek(0, 2)
 
     def write(self, fo, data, writer):
-        if self.csv_flag != True:
-            print("csv_flag != True")
-        if self.csv_flag:
         fo.seek(0)
-            if "SENSOR" in fo.name and len(fo.readlines()) > 1:
+        if len(fo.readlines()) > 1:
             self.plot_data(fo)
         else:
             fo.seek(0, 2)
         logging.info("writing csv  =", data)
         writer.writerow(data)
-        else:
-            try:
-                fo.write(data)
-            except BaseException as e:
-                logging.error("Error on_data: %s" % str(e))
-                return False
         self.__flushlogs(fo)
 
     def update_topic_counter(topic, count):
         pass
 
     def create_log_file(self, dir, topic, columns, fo="", count=0):
-        if self.csv_flag != True:
-            print("csv_flag != True")
         log_numbr = "{0:003d}".format(count)
         logging.info("log number " + str(log_numbr) + "  dir " + dir)
         filename = "log" + str(log_numbr) + ".csv"
@@ -145,8 +135,6 @@ class T_logger:
         self.log_data(jdata, topic)
 
     def log_data(self, data, topic=""):
-        if self.csv_flag != True:
-            print("csv_flag != True")
         columns = 0  # needed as json data causes error
         if topic == "":
             topic = data["topic"]
@@ -160,10 +148,10 @@ class T_logger:
 
             for bme_key in bme_keys:
                 for key, value in data[bme_key].items():
-                    if "BME280-77-1" in bme_key:
-                        value -= 0.35
+                    if "BME280-76-1" in bme_key:
+                        value -= 0.145
                     if "BME280-76-2" in bme_key:
-                        value -= 0.1
+                        value -= 0.025
                     new_dict[bme_key + "_" + key] = value
 
             data = new_dict
@@ -193,10 +181,7 @@ class T_logger:
                 self.append = False
         else:
             self.lock_writer = True
-            s_topics = topic.split("/")
             dir = self.log_root_dir
-            for t in s_topics:
-                dir = dir + "/" + t
             self.create_log_dir(dir)
             count = len(glob.glob(dir + "/log*.csv")) - 1
             fo, writer = self.create_log_file(dir, topic, columns, fo="", count=count)