Consistent package structure in unit files.

prod/domain/http_request_idf.yaml

@@ -0,0 +1,6 @@
+defaults:
+  timeout: 3s
+
+http_request:
+  useragent: esphome
+  timeout: ${timeout}

prod/framework/esp32_idf.yaml

@@ -0,0 +1,26 @@
+defaults:
+  board: esp01_1m
+  version: recommended
+
+esp32:
+  framework:
+    type: esp-idf
+    version: ${version}
+    sdkconfig_options:
+      CONFIG_COMPILER_DISABLE_GCC12_WARNINGS: "y"
+      CONFIG_COMPILER_OPTIMIZATION_PERF: "y"
+      CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS: "n"
+      CONFIG_ESP_WIFI_MBEDTLS_CRYPTO: "n"
+      CONFIG_LWIP_DHCP_DOES_ARP_CHECK: "n"
+      CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES: "n"
+      CONFIG_MBEDTLS_PEM_PARSE_C: "n"
+      CONFIG_MBEDTLS_PEM_WRITE_C: "n"
+      CONFIG_MBEDTLS_X509_CRL_PARSE_C: "n"
+      CONFIG_MBEDTLS_X509_CSR_PARSE_C: "n"
+      CONFIG_MQTT_PROTOCOL_311: "n"
+      CONFIG_MQTT_PROTOCOL_5: "n"
+      CONFIG_MQTT_TRANSPORT_SSL: "n"
+      CONFIG_MQTT_TRANSPORT_WEBSOCKET: "n"
+      CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE: "n"
+      CONFIG_SPI_FLASH_SHARE_SPI1_BUS: "n"
+      CONFIG_WS_TRANSPORT: "n"

prod/hpwh.yaml

@@ -1,15 +1,31 @@
 substitutions:
   node_name: hpwh
   node_friendly_name: Water Heater
-  http_timeout: 3s
+  node_area: Basement
 
 packages:
-  - !include ../common/esp32-idf.yaml
-  - !include ../common/esp32-poe.yaml
-  - !include ../common/base-influxdb.yaml
-  - !include ../common/http-request-idf.yaml
-  - !include ../common/sntp-time.yaml
-  - !include ../common/influxdb.yaml
+  - !include
+    file: framework/esp32_idf.yaml
+
+  - !include
+    file: unit/olimex_esp32_poe.yaml
+
+  - !include
+    file: domain/base.yaml
+  - !include
+    file: domain/influxdb_v2_oss/base.yaml
+
+  - !include
+    file: domain/time/sntp.yaml
+
+  - !include
+    file: domain/http_request_idf.yaml
+
+  - !include
+    file: domain/influxdb_v2_oss/core.yaml
+
+  - !include
+    file: domain/uart.yaml
 
 external_components:
   - source:
@@ -21,11 +37,13 @@ external_components:
       - econet
 
 uart:
-  id: _uart
-  baud_rate: 38400
-  rx_buffer_size: 1500
-  tx_pin: GPIO4
-  rx_pin: GPIO36
+  - id: !extend _uart
+    baud_rate: 38400
+    rx_buffer_size: 1500
+    tx_pin:
+      number: GPIO4
+    rx_pin:
+      number: GPIO36
 
 econet:
   id: _econet

prod/unit/olimex_esp32_poe.yaml

@@ -0,0 +1,17 @@
+esphome:
+  platformio_options:
+    upload_speed: 460800
+
+esp32:
+  board: esp32-poe
+
+ethernet:
+  type: LAN8720
+  mdc_pin: GPIO23
+  mdio_pin: GPIO18
+  clk_mode: GPIO17_OUT
+  phy_addr: 0
+  power_pin:
+    number: GPIO12
+    ignore_strapping_warning: true
+  use_address: ${node_name}.km6g.us

prod/unit/sonoff_s31_lite.yaml

@@ -11,18 +11,26 @@ packages:
   - !include
     file: ../domain/button/restart.yaml
 
-  - !include ../domain/base.yaml
-  - !include ../domain/influxdb_v2_oss/base.yaml
+  - !include
+    file: ../domain/base.yaml
+  - !include
+    file: ../domain/influxdb_v2_oss/base.yaml
 
-  - !include ../domain/network/wifi.yaml
-  - !include ../domain/influxdb_v2_oss/wifi.yaml
-  - !include ../domain/network/wifi_km6g_iot.yaml
+  - !include
+    file: ../domain/network/wifi.yaml
+  - !include
+    file: ../domain/influxdb_v2_oss/wifi.yaml
+  - !include
+    file: ../domain/network/wifi_km6g_iot.yaml
 
-  - !include ../domain/time/sntp.yaml
+  - !include
+    file: ../domain/time/sntp.yaml
 
-  - !include ../domain/http_request.yaml
+  - !include
+    file: ../domain/http_request.yaml
 
-  - !include ../domain/influxdb_v2_oss/core.yaml
+  - !include
+    file: ../domain/influxdb_v2_oss/core.yaml
 
 switch:
   - id: relay

prod/unit/sonoff_s31_meter_only.yaml

@@ -2,8 +2,10 @@ packages:
   - !include
     file: sonoff_s31_lite.yaml
 
-  - !include ../domain/globals/active.yaml
-  - !include ../domain/binary_sensor/active.yaml
+  - !include
+    file: ../domain/globals/active.yaml
+  - !include
+    file: ../domain/binary_sensor/active.yaml
 
   - !include
     file: ../domain/uart.yaml