fix collector logic

fan_control/include/collector.hpp

@@ -8,25 +8,37 @@ void collector_setup();
 
 void collector_loop();
 
-#define WEEK 1500
-#define MONTH 750
+// Set delay between sensor readings.
+#define DELAY 3000 //3s , longer and the web requests time-out
+#define MINUTE 120  // 6 min average
+#define WEEK  1000  // 4 days worth of 6min sample
+#define MONTH 750   // 1 month of hourly sample
+#define PER_HOUR 10
 
 class Collector
 {
 protected:
-  float week_in[WEEK]; // 10 per hour, 1 week
-  float week_out[1500]; // 10 per hour, 1 week
-  float month_in[750]; // 1 per hour, about a month
-  float month_out[750]; // 1 per hour, about a month
-  float minute = 0 ;
-  int counter = 0;
+  float minute_in = 0 ;
+  float minute_out = 0 ;
+
+  float week_in[WEEK];
+  float week_out[WEEK];
+
+  float month_in[MONTH];
+  float month_out[MONTH];
+
+  int minute_counter = 0;
+  int week_counter = 0;
+  int month_counter = 0;
 
   String one_week( float[] );
   String one_month( float[] );
 
-public:
-  const int bucket = 30; // sampling every 2 sec
+  void add_month(int from ) ;
 
+public:
+
+  void add_week(float in , float out) ;
   void add(float in , float out) ;
   String week_data();
   String month_data();