Will now produce table containing chain temperature readings combined with the

box reading

Author: pjb304

data_dump.py

@@ -43,7 +43,8 @@ def get_battery_readings(self):
         nodes = self.get_nodes()
         self.logger.info("Using nodes %s", nodes)
         header = ["timestamp"]
-        header.extend(nodes)
+        for node in nodes:
+            header.append(self.database.get_node_name(node))
         data = [header]
         data_raw = {}
         self.logger.debug(data)
@@ -63,7 +64,8 @@ def get_adc_readings(self, adc):
         nodes = self.get_nodes()
         self.logger.info("Using nodes %s", nodes)
         header = ["timestamp"]
-        header.extend(nodes)
+        for node in nodes:
+            header.append(self.database.get_node_name(node))
         data = [header]
         data_raw = {}
         self.logger.debug(data)
@@ -83,7 +85,8 @@ def get_moisture_readings(self):
         nodes = self.get_nodes()
         self.logger.info("Using nodes %s", nodes)
         header = ["timestamp"]
-        header.extend(nodes)
+        for node in nodes:
+            header.append(self.database.get_node_name(node))
         data = [header]
         data_raw = {}
         self.logger.debug(data)
@@ -103,7 +106,8 @@ def get_rain_readings(self):
         nodes = self.get_nodes()
         self.logger.info("Using nodes %s", nodes)
         header = ["timestamp"]
-        header.extend(nodes)
+        for node in nodes:
+            header.append(self.database.get_node_name(node))
         data = [header]
         data_raw = {}
         self.logger.debug(data)
@@ -167,6 +171,15 @@ def get_chain_readings(self, node):
             data.append([i[0], i[1], i[2], i[3], i[4], i[5], i[6], i[7], i[8], i[9], i[10], i[11], i[12]])
         return data
 
+    def get_chain_temperature_readings(self, node):
+        raw = self.database.get_chain_temperatures(node)
+        header = [
+            "timestamp", "Ambient", "t1", "t2", "t3", "t4"]
+        data = [header]
+        for i in raw:
+            data.append([i[0], i[1], i[2], i[3], i[4], i[5]])
+        return data
+
 def merge_data(output, node, values):
     timestamp = values[0]
     value = values[1]

feshiedb.py

@@ -412,6 +412,14 @@ def get_chain_readings(self, node):
         raw = self.db.store_result().fetch_row(0)
         return raw
 
+    def get_chain_temperatures(self, node):
+        if self.db is None:
+            raise FeshieDbError()
+        self.db.query(
+            "SELECT timestamp, ambient, t1, t2, t3, t4 FROM chain_temperatures WHERE device_id = \"%s\";"
+            % node)
+        return self.db.store_result().fetch_row(0)
+
     def get_moisture_readings(self, node):
         if self.db is None:
             raise FeshieDbError()