Fixed code to reflect the changes in the FFatSensor library.

CelliesProjects · Nov 2, 2019 · 8d82364 · 8d82364
1 parent fb26627
commit 8d82364
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/webif/logs.htm b/webif/logs.htm
@@ -219,7 +219,8 @@
       ctx.textBaseline="middle";ctx.textAlign="center";ctx.font='20px Roboto';ctx.strokeStyle='rgba(255,255,255,1)';
       ctx.strokeText("No sensor data found",grapArea.width/2,grapArea.height/2);
     }
-    $('#datestr').html('<a href="'+url.substring(1)+'" target="_blank">'+new Date(measurements[0].substr(0,measurements[0].indexOf(',',0))*1000).toLocaleString(window.navigator.userLanguage||window.navigator.language,{weekday:'long',year:'numeric',month:'long',day:'numeric'})+'</a>');
+    var counter=0;while(measurements[counter].charAt(0)=='#')counter++;
+    $('#datestr').html('<a href="'+url.substring(1)+'" target="_blank">'+new Date(measurements[counter].substr(0,measurements[counter].indexOf(',',0))*1000).toLocaleString(window.navigator.userLanguage||window.navigator.language,{weekday:'long',year:'numeric',month:'long',day:'numeric'})+'</a>');
   });
 }
 function drawSingleChannel(sensor,data,canvas,color,mintemp,maxtemp){

diff --git a/webif/logs_htm.h b/webif/logs_htm.h
@@ -564,17 +564,24 @@ const uint8_t logs_htm[] = {
   0x72, 0x61, 0x70, 0x41, 0x72, 0x65, 0x61, 0x2e, 0x77, 0x69, 0x64, 0x74,
   0x68, 0x2f, 0x32, 0x2c, 0x67, 0x72, 0x61, 0x70, 0x41, 0x72, 0x65, 0x61,
   0x2e, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2f, 0x32, 0x29, 0x3b, 0x0a,
-  0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x24, 0x28,
+  0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61,
+  0x72, 0x20, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x3d, 0x30, 0x3b,
+  0x77, 0x68, 0x69, 0x6c, 0x65, 0x28, 0x6d, 0x65, 0x61, 0x73, 0x75, 0x72,
+  0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5b, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+  0x65, 0x72, 0x5d, 0x2e, 0x63, 0x68, 0x61, 0x72, 0x41, 0x74, 0x28, 0x30,
+  0x29, 0x3d, 0x3d, 0x27, 0x23, 0x27, 0x29, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+  0x65, 0x72, 0x2b, 0x2b, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x24, 0x28,
   0x27, 0x23, 0x64, 0x61, 0x74, 0x65, 0x73, 0x74, 0x72, 0x27, 0x29, 0x2e,
   0x68, 0x74, 0x6d, 0x6c, 0x28, 0x27, 0x3c, 0x61, 0x20, 0x68, 0x72, 0x65,
   0x66, 0x3d, 0x22, 0x27, 0x2b, 0x75, 0x72, 0x6c, 0x2e, 0x73, 0x75, 0x62,
   0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x28, 0x31, 0x29, 0x2b, 0x27, 0x22,
   0x20, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x3d, 0x22, 0x5f, 0x62, 0x6c,
   0x61, 0x6e, 0x6b, 0x22, 0x3e, 0x27, 0x2b, 0x6e, 0x65, 0x77, 0x20, 0x44,
   0x61, 0x74, 0x65, 0x28, 0x6d, 0x65, 0x61, 0x73, 0x75, 0x72, 0x65, 0x6d,
-  0x65, 0x6e, 0x74, 0x73, 0x5b, 0x30, 0x5d, 0x2e, 0x73, 0x75, 0x62, 0x73,
-  0x74, 0x72, 0x28, 0x30, 0x2c, 0x6d, 0x65, 0x61, 0x73, 0x75, 0x72, 0x65,
-  0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5b, 0x30, 0x5d, 0x2e, 0x69, 0x6e, 0x64,
+  0x65, 0x6e, 0x74, 0x73, 0x5b, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72,
+  0x5d, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x74, 0x72, 0x28, 0x30, 0x2c, 0x6d,
+  0x65, 0x61, 0x73, 0x75, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5b,
+  0x63, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x5d, 0x2e, 0x69, 0x6e, 0x64,
   0x65, 0x78, 0x4f, 0x66, 0x28, 0x27, 0x2c, 0x27, 0x2c, 0x30, 0x29, 0x29,
   0x2a, 0x31, 0x30, 0x30, 0x30, 0x29, 0x2e, 0x74, 0x6f, 0x4c, 0x6f, 0x63,
   0x61, 0x6c, 0x65, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x28, 0x77, 0x69,
@@ -763,4 +770,4 @@ const uint8_t logs_htm[] = {
   0x0a, 0x3c, 0x2f, 0x62, 0x6f, 0x64, 0x79, 0x3e, 0x0a, 0x3c, 0x2f, 0x68,
   0x74, 0x6d, 0x6c, 0x3e, 0x0a
 };
-const unsigned int logs_htm_len = 9149;
+const unsigned int logs_htm_len = 9233;