so many freaking changes!

esphome/bed-presence-c175a4.yaml

@@ -1,7 +1,14 @@
-esphome:
+substitutions:
   name: bed-presence-c175a4
+  devicename: bed-presence-c175a4
   friendly_name: Bed Presence c175a4
   comment: Master Bed Sensor
+  static_ip: !secret master-bed-ip
+
+esphome:
+  name: ${name}
+  friendly_name: ${friendly_name}
+  comment: ${comment}
   min_version: 2024.6.0
   name_add_mac_suffix: false
   project:
@@ -18,27 +25,11 @@ esp32:
       CONFIG_BT_BLE_42_FEATURES_SUPPORTED: y
       CONFIG_BT_BLE_50_FEATURES_SUPPORTED: n
 
-# Enable logging
-logger:
-
-# Enable Home Assistant API
-api:
-
-# Enable wifi
-wifi:
-  # Set up a wifi access point
-  ap: {}
-
-# In combination with the `ap` this allows the user
-# to provision wifi credentials to the device via WiFi AP.
-captive_portal:
-
-# Enable esphome OTA updates
-ota:
-- platform: esphome
 
 ################################################################################
 packages:
+  base: !include common/device_base.yaml
+  network: !include common/wifi.yaml
   remote_package:
     url: https://github.com/ElevatedSensors/sensor-configs
     ref: main
@@ -47,6 +38,14 @@ packages:
     - bed-presence-mk1/base.yaml
     - esphome-common/bluetooth-proxy.yaml
 
+binary_sensor:
+  - id: !remove bed_presence_status
+
+button:
+  - id: !remove btn_restart
+
+sensor:
+  - id: !remove bed_presence_uptime
 # See https://github.com/ElevatedSensors/sensor-configs/blob/main/bed-presence-mk1/sensor.yaml for a detailed
 # description of available substitutions.
 #