Merge pull request #5 from jepefe/instanttim

An import of all instantim changes and fixes from before this project was on github

web/monitormate3cfg.php → Web Server/config/config.sample.php

@@ -12,11 +12,18 @@
 GNU General Public License at <http://www.gnu.org/licenses/>
 for more details.
 */
-$dbhost="localhost";			//Database host
-$dbuser=""; 			//Database user
+
+// DATABASE
+$dbhost="";			//Database host
+$dbuser=""; 		//Database user
 $dbpass=""; 		//Database password
 $dbname="";			//Database name
-$reg_interval=10;			//Time between each record in minutes
-$token="";				//Token
-$timezone=""		//See http://www.php.net/manual/en/timezones.php, example for Spain: Europe/Madrid
+
+//UPDATES
+$reg_interval=10;	//Time between each record in minutes
+$token="";			//Token
+
+// GENERAL
+$timezone="";		//See http://www.php.net/manual/en/timezones.php, example for Spain: Europe/Madrid
+
 ?> 

web/database.sql → Web Server/config/database.sql

@@ -1,88 +1,109 @@
-
-CREATE TABLE IF NOT EXISTS `monitormate3_flexnet` (
-  `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `address` int(11) NOT NULL DEFAULT '0',
-  `device_id` int(11) DEFAULT NULL,
-  `shunt_a_amps` float DEFAULT NULL,
-  `shunt_b_amps` float DEFAULT NULL,
-  `shunt_c_amps` float DEFAULT NULL,
-  `accumulated_ah_shunt_a` int(11) DEFAULT NULL,
-  `accumulated_kwh_shunt_a` float DEFAULT NULL,
-  `accumulated_ah_shunt_b` int(11) DEFAULT NULL,
-  `accumulated_kwh_shunt_b` float DEFAULT NULL,
-  `accumulated_ah_shunt_c` int(11) DEFAULT NULL,
-  `accumulated_kwh_shunt_c` float DEFAULT NULL,
-  `days_since_full` float DEFAULT NULL,
-  `today_min_soc` int(11) DEFAULT NULL,
-  `today_net_input_ah` int(11) DEFAULT NULL,
-  `today_net_output_ah` int(11) DEFAULT NULL,
-  `today_net_input_kwh` float DEFAULT NULL,
-  `today_net_output_kwh` float DEFAULT NULL,
-  `charge_factor_corrected_net_batt_ah` float DEFAULT NULL,
-  `charge_factor_corrected_net_batt_kwh` float DEFAULT NULL,
-  `charge_params_met` varchar(3) DEFAULT NULL,
-  `relay_mode` varchar(10) DEFAULT NULL,
-  `relay_status` varchar(10) DEFAULT NULL,
-  `battery_volt` float DEFAULT NULL,
-  `soc` int(11) DEFAULT NULL,
-  `shunt_enabled_a` varchar(3) DEFAULT NULL,
-  `shunt_enabled_b` varchar(3) DEFAULT NULL,
-  `shunt_enabled_c` varchar(3) DEFAULT NULL,
-  `battery_temp` int(11) DEFAULT NULL,
-  PRIMARY KEY (`date`,`address`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-
-CREATE TABLE IF NOT EXISTS `monitormate3_fmmx` (
-  `date` datetime NOT NULL,
-  `address` int(11) NOT NULL,
-  `device_id` int(11) NOT NULL,
-  `charge_current` int(11) NOT NULL,
-  `pv_current` int(11) NOT NULL,
-  `pv_voltage` float NOT NULL,
-  `daily_kwh` float NOT NULL,
-  `aux_mode` varchar(15) NOT NULL,
-  `error_modes` varchar(45) NOT NULL,
-  `charge_mode` varchar(10) NOT NULL,
-  `battery_volts` float NOT NULL,
-  `daily_ah` int(11) NOT NULL,
-  PRIMARY KEY (`date`,`address`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-
-CREATE TABLE IF NOT EXISTS `monitormate3_fxinv` (
-  `date` datetime NOT NULL,
-  `address` int(11) NOT NULL,
-  `device_id` int(11) NOT NULL,
-  `inverter_current` int(11) NOT NULL,
-  `charge_current` int(11) NOT NULL,
-  `buy_current` int(11) NOT NULL,
-  `ac_input_voltage` int(11) NOT NULL,
-  `ac_output_voltage` int(11) NOT NULL,
-  `sell_current` int(11) NOT NULL,
-  `operational_mode` varchar(14) NOT NULL,
-  `error_modes` varchar(100) NOT NULL,
-  `ac_mode` varchar(8) NOT NULL,
-  `battery_volt` float NOT NULL,
-  `misc` varchar(13) NOT NULL,
-  `warning_modes` varchar(100) NOT NULL,
-  PRIMARY KEY (`date`,`address`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-
-CREATE TABLE IF NOT EXISTS `monitormate3_summary` (
-  `date` date NOT NULL,
-  `kwh_in` float NOT NULL,
-  `kwh_out` float NOT NULL,
-  `ah_in` int(11) NOT NULL,
-  `ah_out` int(11) NOT NULL,
-  `max_temp` int(11) NOT NULL,
-  `min_temp` int(11) NOT NULL,
-  `max_soc` int(11) NOT NULL,
-  `min_soc` int(11) NOT NULL,
-  `max_pv_voltage` int(11) NOT NULL,
-  PRIMARY KEY (`date`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+--
+-- Table setup SQL for importing into your database to use Monitor Mate.
+--
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `monitormate3_flexnet`
+--
+
+CREATE TABLE IF NOT EXISTS `monitormate3_flexnet` (
+  `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `address` int(11) NOT NULL DEFAULT '0',
+  `device_id` int(11) DEFAULT NULL,
+  `shunt_a_amps` float DEFAULT NULL,
+  `shunt_b_amps` float DEFAULT NULL,
+  `shunt_c_amps` float DEFAULT NULL,
+  `accumulated_ah_shunt_a` int(11) DEFAULT NULL,
+  `accumulated_kwh_shunt_a` float DEFAULT NULL,
+  `accumulated_ah_shunt_b` int(11) DEFAULT NULL,
+  `accumulated_kwh_shunt_b` float DEFAULT NULL,
+  `accumulated_ah_shunt_c` int(11) DEFAULT NULL,
+  `accumulated_kwh_shunt_c` float DEFAULT NULL,
+  `days_since_full` float DEFAULT NULL,
+  `today_min_soc` int(11) DEFAULT NULL,
+  `today_net_input_ah` int(11) DEFAULT NULL,
+  `today_net_output_ah` int(11) DEFAULT NULL,
+  `today_net_input_kwh` float DEFAULT NULL,
+  `today_net_output_kwh` float DEFAULT NULL,
+  `charge_factor_corrected_net_batt_ah` float DEFAULT NULL,
+  `charge_factor_corrected_net_batt_kwh` float DEFAULT NULL,
+  `charge_params_met` varchar(3) DEFAULT NULL,
+  `relay_mode` varchar(10) DEFAULT NULL,
+  `relay_status` varchar(10) DEFAULT NULL,
+  `battery_volt` float DEFAULT NULL,
+  `soc` int(11) DEFAULT NULL,
+  `shunt_enabled_a` varchar(3) DEFAULT NULL,
+  `shunt_enabled_b` varchar(3) DEFAULT NULL,
+  `shunt_enabled_c` varchar(3) DEFAULT NULL,
+  `battery_temp` int(11) DEFAULT NULL,
+  PRIMARY KEY (`date`,`address`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `monitormate3_fmmx`
+--
+
+CREATE TABLE IF NOT EXISTS `monitormate3_fmmx` (
+  `date` datetime NOT NULL,
+  `address` int(11) NOT NULL,
+  `device_id` int(11) NOT NULL,
+  `charge_current` int(11) NOT NULL,
+  `pv_current` int(11) NOT NULL,
+  `pv_voltage` float NOT NULL,
+  `daily_kwh` float NOT NULL,
+  `aux_mode` varchar(15) NOT NULL,
+  `error_modes` varchar(45) NOT NULL,
+  `charge_mode` varchar(10) NOT NULL,
+  `battery_volts` float NOT NULL,
+  `daily_ah` int(11) NOT NULL,
+  PRIMARY KEY (`date`,`address`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `monitormate3_fxinv`
+--
+
+CREATE TABLE IF NOT EXISTS `monitormate3_fxinv` (
+  `date` datetime NOT NULL,
+  `address` int(11) NOT NULL,
+  `device_id` int(11) NOT NULL,
+  `inverter_current` int(11) NOT NULL,
+  `charge_current` int(11) NOT NULL,
+  `buy_current` int(11) NOT NULL,
+  `ac_input_voltage` int(11) NOT NULL,
+  `ac_output_voltage` int(11) NOT NULL,
+  `sell_current` int(11) NOT NULL,
+  `operational_mode` varchar(14) NOT NULL,
+  `error_modes` varchar(100) NOT NULL,
+  `ac_mode` varchar(8) NOT NULL,
+  `battery_volt` float NOT NULL,
+  `misc` varchar(13) NOT NULL,
+  `warning_modes` varchar(100) NOT NULL,
+  PRIMARY KEY (`date`,`address`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `monitormate3_summary`
+--
+
+CREATE TABLE IF NOT EXISTS `monitormate3_summary` (
+  `date` date NOT NULL,
+  `kwh_in` float NOT NULL,
+  `kwh_out` float NOT NULL,
+  `ah_in` int(11) NOT NULL,
+  `ah_out` int(11) NOT NULL,
+  `max_temp` int(11) NOT NULL,
+  `min_temp` int(11) NOT NULL,
+  `max_soc` int(11) NOT NULL,
+  `min_soc` int(11) NOT NULL,
+  `max_pv_voltage` int(11) NOT NULL,
+  PRIMARY KEY (`date`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;

Web Server/config/labels.sample.js

@@ -0,0 +1,22 @@
+/*
+This is a configuration file to apply custom labels to devices and shunts
+*/
+
+// if you leave it blank a name will be automatically generated.
+var deviceLabel = new Array();
+deviceLabel[1] = "";
+deviceLabel[2] = "";
+deviceLabel[3] = "";
+deviceLabel[4] = "";
+deviceLabel[5] = "";
+deviceLabel[6] = "";
+deviceLabel[7] = "";
+deviceLabel[8] = "";
+deviceLabel[9] = "";
+deviceLabel[10] = "";
+
+// no automatic names can be generated for shunts, please don't leave these blank.
+var shuntLabel = new Array();
+shuntLabel[1] = "Shunt A";
+shuntLabel[2] = "Shunt B";
+shuntLabel[3] = "Shunt C";

Web Server/css/monitormate.css

@@ -0,0 +1,91 @@
+body {
+	margin: 20px;
+	font-family: Verdana;
+	font-size: 11px;
+}
+
+/*
+	STYLE
+*/
+
+#left-col table {
+	width: 100%;
+	table-layout: fixed;
+}
+
+caption {
+	font-weight: bold;
+	font-size: 12px;
+	text-align: left;
+	padding: 4px;
+	border-bottom: 1px solid black;
+}
+
+caption div {
+	display: inline-block;
+	float: right;
+}
+
+th.subhead {
+	text-align: right;
+	color: #aaaaaa;
+}
+
+td {
+	padding-left: 4px;
+}
+
+td.label {
+	text-align: right;
+	color: #aaaaaa;
+}
+
+/*
+	LAYOUT 
+*/
+
+#left-col {
+	float: left;
+	width: 320px; /* if you change this, change top chart's left margin. */
+	margin-bottom: 20px;
+}
+
+.top-chart {
+	height: 260px;
+	min-width: 380px; /* should be double-wide width minus left margin (below) - */	
+	margin-left: 340px; /* shoud be 20px more than the left-col width. */
+	margin-right: 0px;
+	margin-bottom: 20px;	
+}
+
+
+.bottom-wide-chart {
+	clear: both;
+	width: 100%;
+	min-width: 720px;
+	height: 260px;
+	margin-top: 20px;	
+}
+
+.bottom-double-charts {
+	position: relative;
+	height: 10px;  /* just so you can see it */
+	margin: 20px 0px;
+	min-width: 720px;
+}
+
+.left-chart {
+	position: absolute;
+	left: 0px;
+	width: 48%;
+	height: 260px;
+	margin-right: 20px;
+}
+
+.right-chart {
+	position: absolute;
+	right: 0px;
+	width: 48%;
+	height: 260px;
+	margin-left: 20px;
+}