Fix esphome button config

esphome/devices/670a54.yaml

@@ -2,5 +2,5 @@ substitutions:
   macsuffix: 670a54
 
 <<: !include ../includes/d1_mini.yaml
-<<: !include ../includes/all-sensors.yaml
+<<: !include ../includes/scd41.yaml
 <<: !include ../includes/base.yaml

esphome/devices/670dbe.yaml

@@ -2,5 +2,5 @@ substitutions:
   macsuffix: 670dbe
 
 <<: !include ../includes/d1_mini.yaml
-<<: !include ../includes/only-bme280.yaml
+<<: !include ../includes/bme280.yaml
 <<: !include ../includes/base.yaml

esphome/devices/670dcb.yaml

@@ -2,5 +2,5 @@ substitutions:
   macsuffix: 670dcb
 
 <<: !include ../includes/d1_mini.yaml
-<<: !include ../includes/only-bme280.yaml
+<<: !include ../includes/bme280.yaml
 <<: !include ../includes/base.yaml

esphome/devices/671af9.yaml

@@ -2,5 +2,5 @@ substitutions:
   macsuffix: 671af9
 
 <<: !include ../includes/d1_mini.yaml
-<<: !include ../includes/all-sensors.yaml
+<<: !include ../includes/scd41.yaml
 <<: !include ../includes/base.yaml

esphome/includes/all-sensors.yaml

@@ -1,12 +0,0 @@
-sensor:
-  - !include sensor/scd41-dewpoint.yaml
-  - !include sensor/scd41.yaml
-
-button:
-  - platform: template
-    name: "${macsuffix}_scd41_force_calibration"
-    on_press:
-      - scd4x.perform_forced_calibration:
-          # https://www.co2.earth/daily-co2, maybe find a more local value?
-          value: 415
-          id: scd41

esphome/includes/bme280.yaml

@@ -1,3 +1,6 @@
 sensor:
   - !include sensor/bme280-dewpoint.yaml
   - !include sensor/bme280.yaml
+
+button:
+  - !include button/restart.yaml

esphome/includes/button/calibrate.yaml

@@ -0,0 +1,7 @@
+platform: template
+name: "${macsuffix}_scd41_force_calibration"
+on_press:
+  - scd4x.perform_forced_calibration:
+      # https://www.co2.earth/daily-co2, maybe find a more local value?
+      value: 415
+      id: scd41

esphome/includes/button/restart.yaml

@@ -0,0 +1,2 @@
+platform: restart
+name: restart-${macsuffix}

esphome/includes/scd41.yaml

@@ -0,0 +1,7 @@
+sensor:
+  - !include sensor/scd41-dewpoint.yaml
+  - !include sensor/scd41.yaml
+
+button:
+  - !include button/restart.yaml
+  - !include button/calibrate.yaml