diff --git a/README.md b/README.md
index 5943e52d..1dbd11a3 100644
--- a/README.md
+++ b/README.md
@@ -57,8 +57,8 @@ Also using Grafana/Influx for graphing, both running in Docker containers on NUC
## Some statistics about my installation:
Description | value
-- | --
-Lines of ESPHome YAML | 2342
-Lines of Home Assistant YAML | 7008
+Lines of ESPHome YAML | 2364
+Lines of Home Assistant YAML | 7036
[Integrations](https://www.home-assistant.io/integrations/) in use | 45
Zigbee devices in [`zha`](https://www.home-assistant.io/integrations/zha/) | 26
Z-Wave devices in [`zwave_js`](https://www.home-assistant.io/integrations/zwave_js/) | 37
@@ -67,7 +67,7 @@ Description | value
-- | --
Entities in the [`alarm_control_panel`](https://www.home-assistant.io/components/alarm_control_panel) domain | 3
Entities in the [`automation`](https://www.home-assistant.io/components/automation) domain | 104
-Entities in the [`binary_sensor`](https://www.home-assistant.io/components/binary_sensor) domain | 101
+Entities in the [`binary_sensor`](https://www.home-assistant.io/components/binary_sensor) domain | 102
Entities in the [`button`](https://www.home-assistant.io/components/button) domain | 64
Entities in the [`calendar`](https://www.home-assistant.io/components/calendar) domain | 1
Entities in the [`camera`](https://www.home-assistant.io/components/camera) domain | 15
@@ -92,17 +92,17 @@ Entities in the [`remote`](https://www.home-assistant.io/components/remote) doma
Entities in the [`scene`](https://www.home-assistant.io/components/scene) domain | 2
Entities in the [`script`](https://www.home-assistant.io/components/script) domain | 46
Entities in the [`select`](https://www.home-assistant.io/components/select) domain | 22
-Entities in the [`sensor`](https://www.home-assistant.io/components/sensor) domain | 377
+Entities in the [`sensor`](https://www.home-assistant.io/components/sensor) domain | 382
Entities in the [`setter`](https://www.home-assistant.io/components/setter) domain | 1
Entities in the [`siren`](https://www.home-assistant.io/components/siren) domain | 1
Entities in the [`sun`](https://www.home-assistant.io/components/sun) domain | 1
-Entities in the [`switch`](https://www.home-assistant.io/components/switch) domain | 157
+Entities in the [`switch`](https://www.home-assistant.io/components/switch) domain | 155
Entities in the [`timer`](https://www.home-assistant.io/components/timer) domain | 1
Entities in the [`update`](https://www.home-assistant.io/components/update) domain | 25
Entities in the [`vacuum`](https://www.home-assistant.io/components/vacuum) domain | 1
Entities in the [`weather`](https://www.home-assistant.io/components/weather) domain | 2
Entities in the [`zone`](https://www.home-assistant.io/components/zone) domain | 6
-**Total state objects** | **1180**
+**Total state objects** | **1184**
## The HACS integrations/plugins that I use:
**Appdaemon**:
[aneisch/follow_me_appdaemon](https://github.com/aneisch/follow_me_appdaemon)
diff --git a/extras/esphome/door_nfc.yaml b/extras/esphome/door_nfc.yaml
new file mode 100644
index 00000000..a2a2aaaa
--- /dev/null
+++ b/extras/esphome/door_nfc.yaml
@@ -0,0 +1,32 @@
+substitutions:
+ name: door_nfc
+ friendly_name: "Door NFC"
+
+esphome:
+ name: ${name}
+
+esp32:
+ board: lolin_s2_mini
+ framework:
+ type: ESP-IDF
+
+<<: !include common.yaml
+
+pn532_i2c:
+ update_interval: 1s
+
+i2c:
+ sda: 39
+ scl: 40
+ scan: true
+ id: bus_a
+
+binary_sensor:
+ - platform: pn532
+ uid: !secret andrew_fitbit_id
+ name: "${friendly_name} Andrew's Fitbit"
+
+switch:
+ - platform: restart
+ id: restart_device
+ name: "${friendly_name} Restart"
\ No newline at end of file
diff --git a/extras/esphome/door_sensor_s2.yaml b/extras/esphome/door_sensor_s2.yaml
index 0a9e6e8d..d9bc7eb1 100644
--- a/extras/esphome/door_sensor_s2.yaml
+++ b/extras/esphome/door_sensor_s2.yaml
@@ -9,12 +9,10 @@ esp32:
board: lolin_s2_mini
variant: ESP32S2
framework:
- type: arduino
- version: 2.0.3
- platform_version: 5.0.0
+ type: ESP-IDF
<<: !include common.yaml
-T
+
binary_sensor:
- platform: gpio
pin:
diff --git a/images/nodered_1.png b/images/nodered_1.png
index 69d384da..556c6e8c 100644
Binary files a/images/nodered_1.png and b/images/nodered_1.png differ
diff --git a/images/nodered_2.png b/images/nodered_2.png
index 122a5d6b..44c123fc 100644
Binary files a/images/nodered_2.png and b/images/nodered_2.png differ
diff --git a/sensors.yaml b/sensors.yaml
index 44a58506..e020f563 100644
--- a/sensors.yaml
+++ b/sensors.yaml
@@ -94,6 +94,30 @@
scan_interval: 5
command: "if $(lsusb | grep -q 1e0e); then echo on; else echo off; fi"
+- platform: statistics
+ name: "Neighbor 5in1 Rain Last 24 Hours"
+ entity_id: sensor.neighbor_5in1_rain_total
+ state_characteristic: change
+ max_age:
+ hours: 24
+ precision: 3
+
+- platform: statistics
+ name: "Neighbor 5in1 Rain Last 1 Hour"
+ entity_id: sensor.neighbor_5in1_rain_total
+ state_characteristic: change
+ max_age:
+ hours: 1
+ precision: 3
+
+- platform: statistics
+ name: "Neighbor 5in1 Wind 5 Minute Average"
+ entity_id: sensor.neighbor_5in1_wind
+ state_characteristic: mean
+ max_age:
+ minutes: 5
+
+
#############
# TEMPLATES #
#############
diff --git a/ui-lovelace/01-home.yaml b/ui-lovelace/01-home.yaml
index 121b10cf..22142711 100644
--- a/ui-lovelace/01-home.yaml
+++ b/ui-lovelace/01-home.yaml
@@ -184,9 +184,15 @@ cards:
- sensor.moon
# - sensor.rain_total
# - sensor.rain_rate
+ - sensor.neighbor_5in1_wind
+ - sensor.neighbor_5in1_wind_5_minute_average
+ - sensor.neighbor_5in1_rain_total
+ - sensor.neighbor_5in1_rain_last_1_hour
+ - sensor.neighbor_5in1_rain_last_24_hours
- sensor.neighbor_rain_total
- sensor.netatmo_home_rain_sum_rain_last_hour_inches
- sensor.netatmo_home_rain_sum_rain_today_inches
+
- sensor.compost_external_temperature
- sensor.compost_internal_temperature
- sensor.garage_temperature
diff --git a/ui-lovelace/11-irrigation.yaml b/ui-lovelace/11-irrigation.yaml
index dd0cc4f5..e06217b0 100644
--- a/ui-lovelace/11-irrigation.yaml
+++ b/ui-lovelace/11-irrigation.yaml
@@ -17,8 +17,11 @@ cards:
- sensor.precip_probability
- sensor.nws_wind_speed
- sensor.neighbor_5in1_wind
+ - sensor.neighbor_5in1_wind_5_minute_average
- sensor.netatmo_home_rain_sum_rain_today_inches
- sensor.neighbor_5in1_rain_total
+ - sensor.neighbor_5in1_rain_last_1_hour
+ - sensor.neighbor_5in1_rain_last_24_hours
- type: markdown
content: |