Updated refresh logic to only rerender calendar, when contents changed.

This reverts commit 96b88624d9.

esphome/epaperframe.yaml

@@ -22,6 +22,8 @@ esp32:
   board: nodemcu-32s
   framework:
     type: esp-idf
+    advanced: 
+      minimum_chip_revision: "3.0"
 
 wifi:
   ssid: "Voltage-legacy"
@@ -49,6 +51,13 @@ api:
 # Include ArduinoJson support for the compact calendar event feed.
 json:
 
+# Avoid refreshing the panel when Home Assistant republishes unchanged calendar data.
+globals:
+  - id: last_rendered_calendar_entries
+    type: std::string
+    restore_value: no
+    initial_value: '""'
+
 ota:
   platform: esphome
   password: !secret ota
@@ -220,6 +229,17 @@ text_sensor:
     entity_id: sensor.epaper_kalenderdaten
     attribute: entries
     id: calendar_entries
+    on_value:
+      then:
+        - if:
+            condition:
+              and:
+                - display.is_displaying_page: calendar
+                - lambda: return x != id(last_rendered_calendar_entries);
+            then:
+              - lambda: id(last_rendered_calendar_entries) = x;
+              - component.update: epaper
+
 
   # Home Assistant selects one quote per day from its local quote library.
   - platform: homeassistant
@@ -241,14 +261,19 @@ time:
           - output.turn_on: power_key
           - delay: 0.5s
           - output.turn_off: power_key
-      # Every 10 minutes
+      # Refresh environmental readings every 10 minutes. The calendar page is
+      # redrawn only when its event feed actually changes.
       - seconds: 0
         minutes: /10
         then:
-          - logger.log:
+          - if:
-              level: INFO
+              condition:
-              format: "Timer based screen refresh"
+                display.is_displaying_page: environment
-          - component.update: epaper
+              then:
+                - logger.log:
+                    level: INFO
+                    format: "Timer based environment screen refresh"
+                - component.update: epaper
 
 # Font definitions
 font:
@@ -1289,7 +1314,7 @@ display:
           it.strftime(614, 380, id(footer_font), TextAlign::BASELINE_RIGHT,
                       "Aktualisiert um %d.%m.%Y %H:%M", now);
 
-          /* WiFi Signal Strenght */
+          /* WiFi Signal strength */
           if(id(wifisignal).has_state()) {
             int x = 630;
             int y = 384;

sensors.yaml

@@ -10,7 +10,8 @@
     unique_id: '3303381540758'
     host: !secret router_ip
     community: !secret router_community
-    baseoid: .1.3.6.1.2.1.31.1.1.1.6.511
+#    baseoid: .1.3.6.1.2.1.31.1.1.1.6.511
+    baseoid: .1.3.6.1.2.1.2.2.1.10.25
     version: 2c
     unit_of_measurement: "Octets"
   - platform: snmp
@@ -18,7 +19,8 @@
     unique_id: '1573258703922'
     host: !secret router_ip
     community: !secret router_community
-    baseoid: .1.3.6.1.2.1.31.1.1.1.10.511
+#    baseoid: .1.3.6.1.2.1.31.1.1.1.10.511
+    baseoid: .1.3.6.1.2.1.2.2.1.16.25
     version: 2c
     unit_of_measurement: "Octets"
 
@@ -38,13 +40,13 @@
     unique_id: '9081721471264'
     state_characteristic: mean
     entity_id: sensor.internet_speed_in
-    sampling_size: 10
+    sampling_size: 2
   - platform: statistics
     name: 'WAN Traffic Out'
     unique_id: '8688955223027'
     state_characteristic: mean
     entity_id: sensor.internet_speed_out
-    sampling_size: 10
+    sampling_size: 2
 
   # Sensor for Riemann sum of energy import (W -> Wh)
   - platform: integration

utility_meters.yaml

@@ -1,34 +1,40 @@
 # Internet traffic
   internet_usage_in_monthly:
-    source: sensor.snmp_wan_in
+    source: sensor.wan_in_derivative
     name: Monthly internet traffic in
     unique_id: monthly_internet_traffic_in
     cycle: monthly
+    delta_values: True
   internet_usage_out_monthly:
-    source: sensor.snmp_wan_out
+    source: sensor.wan_out_derivative
     name: Monthly internet traffic out
     unique_id: monthly_internet_traffic_out
     cycle: monthly
+    delta_values: True
   internet_usage_in_daily:
-    source: sensor.snmp_wan_in
+    source: sensor.wan_in_derivative
     name: Daily internet traffic in
     unique_id: daily_internet_traffic_in
     cycle: daily
+    delta_values: True
   internet_usage_out_daily:
-    source: sensor.snmp_wan_out
+    source: sensor.wan_out_derivative
     name: Daily internet traffic out
     unique_id: daily_internet_traffic_out
     cycle: daily
+    delta_values: True
   internet_usage_in_hourly:
-    source: sensor.snmp_wan_in
+    source: sensor.wan_in_derivative
     name: Hourly internet traffic in
     unique_id: hourly_internet_traffic_in
     cycle: hourly
+    delta_values: True
   internet_usage_out_hourly:
-    source: sensor.snmp_wan_out
+    source: sensor.wan_out_derivative
     name: Hourly internet traffic out
     unique_id: hourly_internet_traffic_out
     cycle: hourly
+    delta_values: True
 
 # Energy
   energy_import_daily: