diff --git a/laundry_status.R b/laundry_status.R index 9d6d947..ee513c7 100644 --- a/laundry_status.R +++ b/laundry_status.R @@ -3,7 +3,11 @@ library(tidyverse) library(influxdbclient) library(rmarkdown) -setwd("/laundry_status") +if(test) { + setwd("~/Documents/dataProjects/laundry_status") +} else { + setwd("/laundry_status") +} Sys.setenv(TZ='America/Chicago') # parameters needed to make connection to Database token <- substr(read_file("data/api_key"), 1, 88) @@ -33,6 +37,9 @@ update_data <- function(){ washer_last_on <- values %>% filter(entity_id == entities$entity_id[1], value > 5) %>% tail(1) %>% pull(time) washer_last_off <- values %>% filter(entity_id == entities$entity_id[1], value < 5) %>% tail(1) %>% pull(time) + + dryer_last_on <- values %>% filter(entity_id == entities$entity_id[2], value > 5) %>% tail(1) %>% pull(time) + dryer_last_off <- values %>% filter(entity_id == entities$entity_id[2], value < 5) %>% tail(1) %>% pull(time) # ---- generate html current_status <- as.list(NULL) for (entity in entities$entity_id){ diff --git a/laundry_status.Rmd b/laundry_status.Rmd index 0847657..b91608a 100644 --- a/laundry_status.Rmd +++ b/laundry_status.Rmd @@ -10,14 +10,20 @@ this site updates every `r update_interval` minutes ## The washing machine is currently: `r current_status[["lamp_a_power"]]` -The washing machine `r ifelse(current_status$lamp_a_power=="on", "started", "ended")` its most recent cycle at `r ifelse(current_status$lamp_a_power=="on", strftime(washer_last_off, format = "%A %I:%M %p", tz = "America/Chicago"), strftime(washer_last_on, format = "%A %I:%M %p", tz = "America/Chicago"))` +The washer `r ifelse(current_status$lamp_a_power=="on", "started", "ended")` its most recent cycle at `r ifelse(current_status$lamp_a_power=="on", strftime(washer_last_off, format = "%A %I:%M %p", tz = "America/Chicago"), strftime(washer_last_on, format = "%A %I:%M %p", tz = "America/Chicago"))` : -`r ifelse(current_status$lamp_a_power=="on", difftime(Sys.Time(), washer_last_on), difftime(Sys.Time(), washer_last_off)` -ago +`r ifelse(current_status$lamp_a_power=="on", round(difftime(Sys.time(), washer_last_off, unit = "mins"),0), round(difftime(Sys.time(), washer_last_on, units = "mins"),0))` +minutes ago ## The dryer is currently: `r current_status[["lamp_b_power"]]` + +The dryer `r ifelse(current_status$lamp_b_power=="on", "started", "ended")` its most recent cycle at `r ifelse(current_status$lamp_b_power=="on", strftime(dryer_last_off, format = "%A %I:%M %p", tz = "America/Chicago"), strftime(dryer_last_on, format = "%A %I:%M %p", tz = "America/Chicago"))` +: +`r ifelse(current_status$lamp_b_power=="on", round(difftime(Sys.time(), dryer_last_off, unit = "mins"),0), round(difftime(Sys.time(), dryer_last_on, units = "mins"),0))` +minutes ago + -------- ```{r setup, include=FALSE} knitr::opts_chunk$set(echo = TRUE) diff --git a/laundry_status.html b/laundry_status.html index c301b59..45f9476 100644 --- a/laundry_status.html +++ b/laundry_status.html @@ -353,18 +353,30 @@ display: none; -

updated: Monday 05:44 PM this site updates every 5 minutes

+

updated: Monday 10:14 PM

+

this site updates every 5 minutes

The washing machine is currently: off

+
+
The washer ended its most recent cycle at Monday 10:13 PM
+
+1 minutes ago +
+
-
-

The dryer is currently: off

+
+

The dryer is currently: on

+
+
The dryer started its most recent cycle at Monday 09:42 PM
+
+33 minutes ago +
+
-

This site tracks the washing machine and dryer of our building. It is -just a suggestion of when the machines might be free, not a -guarantee.

-

-

+

This site tracks the washing machine and dryer of our building. My +hope is that it helps people find good times to do laundry.

+

+

If you have any issues or questions, please email admin@dendroalsia.net