From 4515881aea0a6bdd330230a4a5b85713dccb33bf Mon Sep 17 00:00:00 2001
From: Torsten <torsten@rubydesign.fi>
Date: Sun, 25 Jul 2021 19:47:29 +0300
Subject: [PATCH] repeat last data when full set not available

---
 fan_control/data/index.html       |  2 +-
 fan_control/include/collector.hpp |  2 ++
 fan_control/src/collector.cpp     | 34 ++++++++++++++++++-------------
 fan_control/src/server.cpp        |  2 +-
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/fan_control/data/index.html b/fan_control/data/index.html
index e171db7..faae002 100644
--- a/fan_control/data/index.html
+++ b/fan_control/data/index.html
@@ -26,7 +26,7 @@
     <div class="ct-chart chart2"></div>
   </div>
   <div class="right">
-    <h1> Log 1.0.1 </h1>
+    <h1> Log 1.0.2 </h1>
     <div id="log"></div>
   </div>
   <script >
diff --git a/fan_control/include/collector.hpp b/fan_control/include/collector.hpp
index 659e47e..2f88a83 100644
--- a/fan_control/include/collector.hpp
+++ b/fan_control/include/collector.hpp
@@ -25,6 +25,8 @@ protected:
   int week_counter = 0;
   int month_counter = 0;
 
+  int max_week = 0;
+  int max_month = 0;
   
   void add_month(int from ) ;
   void switch_logic(float in , float out);
diff --git a/fan_control/src/collector.cpp b/fan_control/src/collector.cpp
index 26758df..5c01674 100644
--- a/fan_control/src/collector.cpp
+++ b/fan_control/src/collector.cpp
@@ -61,6 +61,20 @@ void Collector::add(float in , float out)
   }
 }
 
+void Collector::add_week(float in , float out){
+  switch_logic(in , out);
+  week_in[week_counter] = in;
+  week_out[week_counter] = out;
+  if((week_counter % PER_HOUR) == 0){
+    add_month( week_counter - PER_HOUR);
+  }
+  if(week_counter > max_week) max_week = week_counter ;
+  week_counter++ ;
+  if(week_counter >= WEEK) {
+    week_counter = 0;
+  }
+}
+
 void Collector::switch_logic(float in , float out){
   if(out > (in + 1.0) ){
     digitalWrite( RELAY_BUILTIN , HIGH);
@@ -73,19 +87,6 @@ void Collector::switch_logic(float in , float out){
   }
 }
 
-void Collector::add_week(float in , float out){
-  switch_logic(in , out);
-  week_in[week_counter] = in;
-  week_out[week_counter] = out;
-  if((week_counter % PER_HOUR) == 0){
-    add_month( week_counter - PER_HOUR);
-  }
-  week_counter++ ;
-  if(week_counter >= WEEK) {
-    week_counter = 0;
-  }
-}
-
 void Collector::add_month(int from){
   if( from < 0) return;
   if( from + PER_HOUR > WEEK) return ;
@@ -97,6 +98,7 @@ void Collector::add_month(int from){
   }
   month_in[month_counter] = month_i / PER_HOUR;
   month_out[month_counter] = month_o / PER_HOUR ;
+  if( month_counter > max_month) max_month = month_counter ;
   month_counter++ ;
   if(month_counter >= MONTH) {
     month_counter = 0;
@@ -106,17 +108,21 @@ void Collector::add_month(int from){
 
 String Collector::week_data(int at){
   if( at < WEEK){
+    if( at > max_week ) at = max_week;
     return String(week_in[at] , 2) ;
   }else{
-    return String(week_out[at - WEEK] , 2) ;
+  if( at > (max_week + WEEK) ) at = max_week + WEEK;
+  return String(week_out[at - WEEK] , 2) ;
   }
 }
 
 
 String Collector::month_data(int at){
   if( at < MONTH){
+    if(at > max_month) at = max_month ;
     return String(month_in[at] , 2) ;
   }else{
+    if(at > (max_month + MONTH)) at = max_month + MONTH ;
     return String(month_out[at - MONTH] , 2) ;
   }
 }
\ No newline at end of file
diff --git a/fan_control/src/server.cpp b/fan_control/src/server.cpp
index c8b8833..c2c8ee8 100644
--- a/fan_control/src/server.cpp
+++ b/fan_control/src/server.cpp
@@ -4,7 +4,7 @@
 
 #include <FS.h>
 
-static String FAN_VERSION = "1.0.1" ;
+static String FAN_VERSION = "1.0.2" ;
 
 String getContentType(String filename){
   if(filename.indexOf(".htm") > 0) return "text/html";