Now adds dumpers for new power board data

Author: pjb304

data_dump.py

@@ -60,6 +60,69 @@ def get_battery_readings(self):
         data.extend(sorted_data)
         return data
 
+    def get_mppt_readings(self):
+        nodes = self.get_nodes()
+        self.logger.info("Using nodes %s", nodes)
+        header = ["timestamp"]
+        for node in nodes:
+            header.append(self.database.get_node_name(node))
+        data = [header]
+        data_raw = {}
+        self.logger.debug(data)
+        for node in nodes:
+            self.logger.debug("Processing node %s", node)
+            values = self.database.get_mppt_readings(node)
+            self.logger.debug("Got %d readings", len(values))
+            for value in values:
+                data_raw = merge_data(data_raw, node, value)
+        self.logger.info("%d timestamps in data", len(data_raw))
+        sorted_data = sort_data(data_raw, nodes)
+        self.logger.debug("%d timestamps in sorted data", len(sorted_data))
+        data.extend(sorted_data)
+        return data
+
+    def get_soc_readings(self):
+        nodes = self.get_nodes()
+        self.logger.info("Using nodes %s", nodes)
+        header = ["timestamp"]
+        for node in nodes:
+            header.append(self.database.get_node_name(node))
+        data = [header]
+        data_raw = {}
+        self.logger.debug(data)
+        for node in nodes:
+            self.logger.debug("Processing node %s", node)
+            values = self.database.get_soc_readings(node)
+            self.logger.debug("Got %d readings", len(values))
+            for value in values:
+                data_raw = merge_data(data_raw, node, value)
+        self.logger.info("%d timestamps in data", len(data_raw))
+        sorted_data = sort_data(data_raw, nodes)
+        self.logger.debug("%d timestamps in sorted data", len(sorted_data))
+        data.extend(sorted_data)
+        return data
+
+    def get_solar_current_readings(self):
+        nodes = self.get_nodes()
+        self.logger.info("Using nodes %s", nodes)
+        header = ["timestamp"]
+        for node in nodes:
+            header.append(self.database.get_node_name(node))
+        data = [header]
+        data_raw = {}
+        self.logger.debug(data)
+        for node in nodes:
+            self.logger.debug("Processing node %s", node)
+            values = self.database.get_solar_current_readings(node)
+            self.logger.debug("Got %d readings", len(values))
+            for value in values:
+                data_raw = merge_data(data_raw, node, value)
+        self.logger.info("%d timestamps in data", len(data_raw))
+        sorted_data = sort_data(data_raw, nodes)
+        self.logger.debug("%d timestamps in sorted data", len(sorted_data))
+        data.extend(sorted_data)
+        return data
+
     def get_adc_readings(self, adc):
         nodes = self.get_nodes()
         self.logger.info("Using nodes %s", nodes)

feshiedb.py

@@ -433,7 +433,7 @@ def get_soc_readings(self, node):
         raw = self.db.store_result().fetch_row(0)
         return raw
 
-    def get_solor_current_readings(self, node):
+    def get_solar_current_readings(self, node):
         if self.db is None:
             raise FeshieDbError()
         self.db.query("SELECT DATE_FORMAT( timestamp, \"%%Y-%%m-%%d %%H:%%i:00\"), value FROM solar_current_readings WHERE device_id = \"%s\" AND timestamp > \"%s\" AND timestamp <= NOW();" %  (node, DATE_LIMIT))