Merge branch 'kitchen_sink' into 'master'

Kitchen sink

See merge request wjoe/scarecrow!1

1 files changed, 5 insertions, 2 deletions

diff --git a/views/index.erb b/views/index.erb
index f22328b..c366141 100644
--- a/views/index.erb
+++ b/views/index.erb
@@ -8,12 +8,15 @@
         <h1>thebluegarden</h1>
 
         <p>Basement: <%= @temp_air %>°C and <%= @humidity_air %>% humidity at <%= @time_formatted_air %></p>
-        <p>Propagator: <%= @temp_prop %>°C and <%= @humidity_prop %>% humidity at <%= @time_formatted_prop %></p>
+        <p>Propagator (Chillis): <%= @temp_prop %>°C and <%= @humidity_prop %>% humidity at <%= @time_formatted_prop %></p>
+        <p>Kitchen (Peas & Spinach): <%= @temp_kitchen %>°C, <%= @humidity_kitchen %>% humidity and <%= @moisture_kitchen %>% moisture at <%= @time_formatted_kitchen %></p>
         <p>
             <img src="photos/current.png">
         </p>
         <p>
-            <img src="photos/previous.png">
+            <video width="1280" height="720" controls>
+                <source src="videos/timelapse.mp4" type="video/mp4">
+            </video>
         </p>
     </body>
 </html>